Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_flex/LamsAuthor/LearningLibrary2.mxml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_flex/LamsAuthor/LearningLibraryEntryComponent.as'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_flex/LamsAuthor/ToolActivityComponent.as'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_flex/LamsAuthor/bin-debug/assets/css/learningLibrary.css
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/bin-debug/assets/css/learningLibrary.css,v
diff -u -r1.2 -r1.3
--- lams_flex/LamsAuthor/bin-debug/assets/css/learningLibrary.css 15 Jan 2010 04:11:45 -0000 1.2
+++ lams_flex/LamsAuthor/bin-debug/assets/css/learningLibrary.css 19 Jan 2010 03:15:33 -0000 1.3
@@ -1,5 +1,10 @@
/* CSS file */
+.learningLibrary {
+ background-color:#C2D5FE;
+ color:#000000;
+}
+
.linkButtonWindowShade {
headerClass:ClassReference('mx.controls.LinkButton');
header-style-name: linkButtonStyle;
@@ -36,7 +41,6 @@
use-roll-over: false;
roll-over-color:#FFEEC8;
selectionColor:#FFEEC8;
-
}
.reflective {
Index: lams_flex/LamsAuthor/src/LamsAuthor.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/LamsAuthor.mxml,v
diff -u -r1.3 -r1.4
--- lams_flex/LamsAuthor/src/LamsAuthor.mxml 15 Jan 2010 03:41:19 -0000 1.3
+++ lams_flex/LamsAuthor/src/LamsAuthor.mxml 19 Jan 2010 03:15:33 -0000 1.4
@@ -4,11 +4,14 @@
verticalAlign="left"
xmlns:components="org.lamsfoundation.lams.author.components.*"
xmlns:maps="org.lamsfoundation.lams.author.maps.*"
+ xmlns:flexlib="http://code.google.com/p/flexlib/"
preinitialize="preInit()"
>
@@ -55,29 +81,11 @@
height="50"
/>-->
-
-
+
+
-
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_flex/LamsAuthor/src/assets/css/activities.css'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_flex/LamsAuthor/src/assets/css/learningLibrary.css
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/assets/css/learningLibrary.css,v
diff -u -r1.2 -r1.3
--- lams_flex/LamsAuthor/src/assets/css/learningLibrary.css 15 Jan 2010 03:41:19 -0000 1.2
+++ lams_flex/LamsAuthor/src/assets/css/learningLibrary.css 19 Jan 2010 03:15:33 -0000 1.3
@@ -1,5 +1,10 @@
/* CSS file */
+.learningLibrary {
+ background-color:#C2D5FE;
+ color:#000000;
+}
+
.linkButtonWindowShade {
headerClass:ClassReference('mx.controls.LinkButton');
header-style-name: linkButtonStyle;
@@ -36,7 +41,6 @@
use-roll-over: false;
roll-over-color:#FFEEC8;
selectionColor:#FFEEC8;
-
}
.reflective {
Index: lams_flex/LamsAuthor/src/assets/css/toolBar.css
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/assets/css/toolBar.css,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_flex/LamsAuthor/src/assets/css/toolBar.css 19 Jan 2010 03:15:33 -0000 1.1
@@ -0,0 +1,6 @@
+/* CSS file */
+
+.toolBar {
+ background-color:#C2D5FE;
+ color:#000000;
+}
Index: lams_flex/LamsAuthor/src/assets/icons/copy.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/assets/icons/copy.png,v
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/flow.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/assets/icons/flow.png,v
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/group.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/assets/icons/group.png,v
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/new.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/assets/icons/new.png,v
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/open.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/assets/icons/open.png,v
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/optional.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/assets/icons/optional.png,v
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/paste.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/assets/icons/paste.png,v
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/preview.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/assets/icons/preview.png,v
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/save.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/assets/icons/save.png,v
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/transition.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/assets/icons/transition.png,v
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/zoom_in.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/assets/icons/zoom_in.png,v
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/assets/icons/zoom_out.png
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/assets/icons/zoom_out.png,v
diff -u
Binary files differ
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml,v
diff -u -r1.3 -r1.4
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml 15 Jan 2010 03:41:19 -0000 1.3
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasArea.mxml 19 Jan 2010 03:15:33 -0000 1.4
@@ -6,6 +6,7 @@
-
+
-
+
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml,v
diff -u -r1.3 -r1.4
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml 15 Jan 2010 04:11:45 -0000 1.3
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml 19 Jan 2010 03:15:33 -0000 1.4
@@ -8,6 +8,8 @@
@@ -58,23 +61,23 @@
+ label="All" width="100%" paddingLeft="10" paddingBottom="20" shadowDirection="right">
+ label="Informative" width="100%" paddingLeft="10" paddingBottom="20" backgroundColor="#FFEEC8" shadowDirection="right">
+ label="Reflective" width="100%" paddingLeft="10" paddingBottom="20" backgroundColor="#DDFCB1" shadowDirection="right" >
+ label="Collaborative" width="100%" paddingLeft="10" paddingBottom="20" backgroundColor="#FFFDBE" shadowDirection="right" >
+ label="Asessment" width="100%" paddingLeft="10" paddingBottom="20" backgroundColor="#E9E2F5" shadowDirection="right" >
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml,v
diff -u -r1.1 -r1.2
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml 15 Jan 2010 03:41:19 -0000 1.1
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/LearningLibraryEntryComponent.mxml 19 Jan 2010 03:15:33 -0000 1.2
@@ -1,5 +1,9 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml,v
diff -u -r1.2 -r1.3
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml 15 Jan 2010 04:11:45 -0000 1.2
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml 19 Jan 2010 03:15:33 -0000 1.3
@@ -144,7 +144,14 @@
transitionOut.graphics.clear();
parent.removeChild(transitionOut);
transitionOut = null;
+
+
}
+ else {
+ // Return cursor state to normal
+ Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);
+
+ }
}
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as,v
diff -u -r1.2 -r1.3
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as 14 Jan 2010 04:38:33 -0000 1.2
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as 19 Jan 2010 03:15:33 -0000 1.3
@@ -30,7 +30,7 @@
// Set the application learning library
Application.application.learningLibrary = learningLibrary;
Application.application.canvasArea.compLearningLibrary.loadLearningLibrary();
- Application.application.canvasArea.compLearningLibrary2.loadLearningLibrary();
+ //Application.application.canvasArea.compLearningLibrary2.loadLearningLibrary();
}