Index: lams_central/src/flash/lams_monitoring_v1.fla
===================================================================
diff -u -r4934bb5de86188031f2112ebe11dfc597d40876d -rc13b691876fa0016646ec446a6d68c63f6a23234
Binary files differ
Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -rf8ae23a255f2a224b01f00ec6c0407df8564e06f -rc13b691876fa0016646ec446a6d68c63f6a23234
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision f8ae23a255f2a224b01f00ec6c0407df8564e06f)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as (.../CanvasController.as) (revision c13b691876fa0016646ec446a6d68c63f6a23234)
@@ -111,7 +111,7 @@
Debugger.log('activityRelease CanvasActivity:'+ca.activity.activityUIID,Debugger.GEN,'activityRelease','CanvasController');
if (_canvasModel.isTransitionToolActive()){
_canvasModel.getCanvas().stopTransitionTool();
- //_canvasModel.getCanvas().view.removeTempTrans();
+ _canvasModel.getCanvas().view.removeTempTrans();
app.controlKeyPressed = "";
}
_canvasModel.getCanvas().stopActiveTool();
Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as
===================================================================
diff -u -r1a175bfe9b4bc5309f3319accf2068eba3a9e902 -rc13b691876fa0016646ec446a6d68c63f6a23234
--- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as (.../LessonTabView.as) (revision 1a175bfe9b4bc5309f3319accf2068eba3a9e902)
+++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as (.../LessonTabView.as) (revision c13b691876fa0016646ec446a6d68c63f6a23234)
@@ -97,19 +97,22 @@
private var start_date_lbl:Label;
private var schedule_date_lbl:Label;
private var btnLabel:String;
- private var learner_expp_cb:CheckBox;
+ private var learner_expp_cb:CheckBox;
+ private var learner_expp_cb_lbl:Label;
+
+ private var LSTitle_lbl:Label;
+ private var LSDescription_lbl:Label;
- //Text Items
- private var LSTitle_txt:TextField;
- private var LSDescription_txt:TextField;
private var sessionStatus_txt:Label;
private var numLearners_txt:Label;
private var class_txt:Label;
private var duration_txt:TextField;
private var startMsg_txt:TextField;
private var lessonManager:TextField;
- private var taskManager:TextField;
+ private var taskManager:TextField;
+ private var lessonManager_lbl:Label;
+ private var taskManager_lbl:Label;
//Button
private var viewLearners_btn:Button;
@@ -381,27 +384,39 @@
private function rearrangeAll():Void{
learnerURL_lbl.visible = false;
learnerURL_txt.visible = false;
+
class_lbl._y = class_lbl._y - 30
class_txt._y = class_txt._y - 30
+
lessonManager._y = lessonManager._y - 30
taskManager._y = taskManager._y - 30
+
+ lessonManager_lbl._x = lessonManager._x + 2
+ lessonManager_lbl._y = lessonManager._y
+ taskManager_lbl._x = taskManager._x + 2
+ taskManager_lbl._y = taskManager._y
+
manageClass_lbl._y = manageClass_lbl._y - 30
manageStatus_lbl._y = manageStatus_lbl._y - 30
manageStart_lbl._y = manageStart_lbl._y - 30
manageDate_lbl._y = manageDate_lbl._y - 30
manageTime_lbl._y = manageTime_lbl._y - 30
+
start_date_lbl._y = start_date_lbl._y - 30
schedule_date_lbl._y = schedule_date_lbl._y - 30
scheduleDate_dt._y = scheduleDate_dt._y - 30
scheduleTime._y = scheduleTime._y - 30
+
viewLearners_btn._y = viewLearners_btn._y - 30
editClass_btn._y = editClass_btn._y - 30
changeStatus_cmb._y = changeStatus_cmb._y - 30
statusApply_btn._y = statusApply_btn._y - 30
schedule_btn._y = schedule_btn._y - 30
start_btn._y = start_btn._y - 30
+
reqTasks_scp._y = reqTasks_scp._y - 30
learner_expp_cb._y = learner_expp_cb._y - 30
+ learner_expp_cb_lbl._y = learner_expp_cb_lbl._y - 30
}
/**
@@ -410,9 +425,13 @@
private function populateLessonDetails():Void{
var s:Object = mm.getSequence();
+ var limit:Number = 120;
- LSTitle_txt.text = s.name;
- LSDescription_txt.text = s.description;
+ LSTitle_lbl.text = "" + s.name + "";
+ LSDescription_lbl.text = String(s.description).substr(0, limit);
+
+ if(s.description.length > limit) { LSDescription_lbl.text += "..."; }
+
sessionStatus_txt.text = showStatus(s.state);
numLearners_txt.text = String(s.noStartedLearners) + " " + Dictionary.getValue('ls_of_text')+" "+String(s.noPossibleLearners);
trace("current logged in learners are: "+mm.allLearnersProgress.length)
@@ -755,8 +774,6 @@
}
public function setupLabels(){
- //max_lbl.text = Dictionary.getValue('pi_max_act');
-
//populate the synch type combo:
status_lbl.text = ""+Dictionary.getValue('ls_status_lbl')+"";
learner_lbl.text = ""+Dictionary.getValue('ls_learners_lbl')+"";
@@ -768,27 +785,32 @@
manageStart_lbl.text = ""+Dictionary.getValue('ls_manage_start_lbl')+"";
manageDate_lbl.text = Dictionary.getValue('ls_manage_date_lbl');
manageTime_lbl.text = Dictionary.getValue('ls_manage_time_lbl');
- learner_expp_cb.label = Dictionary.getValue('ls_manage_learnerExpp_lbl');
+ learner_expp_cb_lbl.text = Dictionary.getValue('ls_manage_learnerExpp_lbl');
+
//Button
viewLearners_btn.label = Dictionary.getValue('ls_manage_learners_btn');
editClass_btn.label = Dictionary.getValue('ls_manage_editclass_btn');
statusApply_btn.label = Dictionary.getValue('ls_manage_apply_btn');
schedule_btn.label = Dictionary.getValue('ls_manage_schedule_btn');
start_btn.label = Dictionary.getValue('ls_manage_start_btn');
- //_lessonStateArr = ["CREATED", "NOT_STARTED", "STARTED", "SUSPENDED", "FINISHED", "ARCHIVED", "DISABLED"];
-
- taskManager.border = true
+ taskManager.border = true;
taskManager.borderColor = 0x003366;
- taskManager.text = Dictionary.getValue('ls_tasks_txt');
- lessonManager.border = true
+ taskManager_lbl.text = Dictionary.getValue('ls_tasks_txt');
+ taskManager_lbl._x = taskManager._x + 2;
+ taskManager_lbl._y = taskManager._y;
+
+ lessonManager.border = true;
lessonManager.borderColor = 0x003366;
- lessonManager.text = Dictionary.getValue('ls_manage_txt');
- taskManager.background = true
+ lessonManager_lbl.text = Dictionary.getValue('ls_manage_txt');
+ lessonManager_lbl._x = lessonManager._x + 2;
+ lessonManager_lbl._y = lessonManager._y;
+
+ taskManager.background = true;
taskManager.backgroundColor = 0xEAEAEA;
- lessonManager.background = true
+ lessonManager.background = true;
lessonManager.backgroundColor = 0xEAEAEA;
delete this.onEnterFrame;
@@ -839,13 +861,18 @@
manageClass_lbl.setStyle('styleName',styleObj);
manageStatus_lbl.setStyle('styleName',styleObj);
manageStart_lbl.setStyle('styleName',styleObj);
- learner_expp_cb.setStyle('styleName',styleObj);
+ //learner_expp_cb.setStyle('styleName',styleObj);
schedule_date_lbl.setStyle('styleName', styleObj);
sessionStatus_txt.setStyle('styleName', styleObj);
numLearners_txt.setStyle('styleName', styleObj);
class_txt.setStyle('styleName', styleObj);
+ lessonManager_lbl.setStyle('styleName', styleObj);
+ taskManager_lbl.setStyle('styleName', styleObj);
+ // Check box label
+ learner_expp_cb_lbl.setStyle('styleName', styleObj);
+
//SMALL LABELS
styleObj = _tm.getStyleObject('PIlabel');
manageDate_lbl.setStyle('styleName',styleObj);
Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rd9f9e33ff90f8ff1a0077688ad3ee5dbc233c209 -rc13b691876fa0016646ec446a6d68c63f6a23234
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rd9f9e33ff90f8ff1a0077688ad3ee5dbc233c209 -rc13b691876fa0016646ec446a6d68c63f6a23234
Binary files differ
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -r334594da3c43d84ed7882d0f04f2b0f93c6b5cad -rc13b691876fa0016646ec446a6d68c63f6a23234
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -r334594da3c43d84ed7882d0f04f2b0f93c6b5cad -rc13b691876fa0016646ec446a6d68c63f6a23234
Binary files differ