Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java =================================================================== diff -u -r752da4bc77129305245c4c8cf9f63f5f6c6deb4e -r1c7084d36b0332efa632440c93c18308adc27c71 --- lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java (.../LessonDetailsDTO.java) (revision 752da4bc77129305245c4c8cf9f63f5f6c6deb4e) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java (.../LessonDetailsDTO.java) (revision 1c7084d36b0332efa632440c93c18308adc27c71) @@ -34,8 +34,7 @@ private Long lessonID; private String lessonName; - private String lessonIntro;; - private String learningDesignDescription; + private String lessonInstructions; private Integer lessonStateID; private Date createDateTime; private String createDateTimeStr; @@ -73,8 +72,7 @@ public LessonDetailsDTO(Lesson lesson) { this.lessonID = lesson.getLessonId(); this.lessonName = lesson.getLessonName(); - this.lessonIntro = lesson.getLessonDescription(); - this.learningDesignDescription = lesson.getLearningDesign().getDescription(); + this.lessonInstructions = lesson.getLearningDesign().getDescription(); this.lessonStateID = lesson.getLessonStateId(); this.createDateTime = lesson.getCreateDateTime(); this.createDateTimeStr = null; @@ -268,18 +266,14 @@ this.numberStartedLearners = numberStartedLearners; } - public String getLearningDesignDescription() { - return learningDesignDescription; - } - - public String getLessonIntro() { - return lessonIntro; - } - public String getLessonName() { return lessonName; } + public String getLessonInstructions() { + return lessonInstructions; + } + public Integer getNumberPossibleLearners() { return numberPossibleLearners; } @@ -325,8 +319,8 @@ this.lessonName = lessonName; } - public void setLearningDesignDescription(String lessonDescription) { - this.learningDesignDescription = lessonDescription; + public void setLessonInstructions(String lessonInstructions) { + this.lessonInstructions = lessonInstructions; } public void setLessonStateID(Integer lessonStateID) { Index: lams_monitoring/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r717fc6ec6e44935a49000b894629318d8eab3532 -r1c7084d36b0332efa632440c93c18308adc27c71 --- lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 717fc6ec6e44935a49000b894629318d8eab3532) +++ lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 1c7084d36b0332efa632440c93c18308adc27c71) @@ -173,7 +173,6 @@ email.notifications = Notifications button.email = Email lesson.name = Name: -lesson.description = Instructions: lesson.state = Status: lesson.learners = Learners lesson.class = Class: @@ -238,6 +237,7 @@ tab.lesson = Lesson tab.sequence = Sequence tab.learners = Learners +tab.instructions = Instructions force.complete.click = Click on an activity to move learners [0] or click outside any activity to cancel. force.complete.end.lesson.confirm = Are you sure you want to move learners [0] to the end of lesson? force.complete.activity.confirm = Are you sure you want to move learners [0] to activity "[1]"? Please note that moving one learner takes several seconds. @@ -484,4 +484,4 @@ # Tooltip for a button which leads to an open gate status page button.task.gate.opened.tooltip = See gate status button.force.complete.all = Move all learners to... -lesson.intro = Intro: +tab.instructions.title = Teaching Instructions Index: lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r6316ff7fc5ef4c6d3d8bc2d80f283b29d10f17ec -r1c7084d36b0332efa632440c93c18308adc27c71 --- lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 6316ff7fc5ef4c6d3d8bc2d80f283b29d10f17ec) +++ lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 1c7084d36b0332efa632440c93c18308adc27c71) @@ -173,7 +173,6 @@ email.notifications = Notifications button.email = Email lesson.name = Name: -lesson.description = Description: lesson.state = Status: lesson.learners = Learners lesson.class = Class: @@ -484,4 +483,3 @@ # Tooltip for a button which leads to an open gate status page button.task.gate.opened.tooltip = See gate status button.force.complete.all = Move all learners to... -lesson.intro = Intro: Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java =================================================================== diff -u -r752da4bc77129305245c4c8cf9f63f5f6c6deb4e -r1c7084d36b0332efa632440c93c18308adc27c71 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision 752da4bc77129305245c4c8cf9f63f5f6c6deb4e) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision 1c7084d36b0332efa632440c93c18308adc27c71) @@ -1117,8 +1117,7 @@ responseJSON.put("lessonStateID", lesson.getLessonStateId()); responseJSON.put("lessonName", HtmlUtils.htmlEscape(lesson.getLessonName())); - responseJSON.put("lessonIntro", lesson.getLessonDescription()); - responseJSON.put("learningDesignDescription", learningDesign.getDescription()); + responseJSON.put("lessonInstructions", learningDesign.getDescription()); Date startOrScheduleDate = lesson.getStartDateTime() == null ? lesson.getScheduleStartDate() : lesson.getStartDateTime(); Index: lams_monitoring/web/css/_monitorLesson_base.scss =================================================================== diff -u -r752da4bc77129305245c4c8cf9f63f5f6c6deb4e -r1c7084d36b0332efa632440c93c18308adc27c71 --- lams_monitoring/web/css/_monitorLesson_base.scss (.../_monitorLesson_base.scss) (revision 752da4bc77129305245c4c8cf9f63f5f6c6deb4e) +++ lams_monitoring/web/css/_monitorLesson_base.scss (.../_monitorLesson_base.scss) (revision 1c7084d36b0332efa632440c93c18308adc27c71) @@ -361,6 +361,7 @@ } /********** LEARNERS TAB STYLES **********/ + #tabLearnerControlTable td { padding: 0px; text-align: center; @@ -413,6 +414,12 @@ line-height: 1 !important; } +/********** INSTRUCTIONS TAB STYLES **********/ + +#lesson-instructions { + padding-bottom: 20px; +} + /********** BOOTSTRAP ADDITIONS **********/ .contributeActivityCell { Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -r752da4bc77129305245c4c8cf9f63f5f6c6deb4e -r1c7084d36b0332efa632440c93c18308adc27c71 --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 752da4bc77129305245c4c8cf9f63f5f6c6deb4e) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 1c7084d36b0332efa632440c93c18308adc27c71) @@ -487,8 +487,7 @@ updateContributeActivities(response.contributeActivities); $('#lesson-name-strong').html(response.lessonName); - $('#description').html(response.learningDesignDescription); - $('#intro').html(response.lessonIntro); + $('#lesson-instructions').html(response.lessonInstructions); } }); Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -r717fc6ec6e44935a49000b894629318d8eab3532 -r1c7084d36b0332efa632440c93c18308adc27c71 --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 717fc6ec6e44935a49000b894629318d8eab3532) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 1c7084d36b0332efa632440c93c18308adc27c71) @@ -245,12 +245,6 @@ initLearnersTab(); initGradebookTab(); refreshMonitor(); - - $('#description').readmore({ - speed: 500, - collapsedHeight: 85 - }); - // remove "loading..." screen $('#loadingOverlay').remove(); @@ -315,10 +309,13 @@ + + + - +
- +
@@ -577,7 +566,7 @@ src="images/pedag_down_arrow.gif" /> - +
@@ -633,7 +622,7 @@ - +
@@ -646,7 +635,25 @@
- + + +
+
+

+ +

+
+
+
+
+
+ +
+
+
+
+
+