Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java =================================================================== diff -u -r44f25ff763552baf103b1bb4ed7d1d2466a937dc -r752da4bc77129305245c4c8cf9f63f5f6c6deb4e --- lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java (.../LessonDetailsDTO.java) (revision 44f25ff763552baf103b1bb4ed7d1d2466a937dc) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java (.../LessonDetailsDTO.java) (revision 752da4bc77129305245c4c8cf9f63f5f6c6deb4e) @@ -34,7 +34,8 @@ private Long lessonID; private String lessonName; - private String lessonDescription; + private String lessonIntro;; + private String learningDesignDescription; private Integer lessonStateID; private Date createDateTime; private String createDateTimeStr; @@ -72,8 +73,8 @@ public LessonDetailsDTO(Lesson lesson) { this.lessonID = lesson.getLessonId(); this.lessonName = lesson.getLessonName(); - this.lessonDescription = lesson.getLessonDescription(); - + this.lessonIntro = lesson.getLessonDescription(); + this.learningDesignDescription = lesson.getLearningDesign().getDescription(); this.lessonStateID = lesson.getLessonStateId(); this.createDateTime = lesson.getCreateDateTime(); this.createDateTimeStr = null; @@ -100,13 +101,16 @@ : null; this.workspaceFolderID = lesson.getLearningDesign().getWorkspaceFolder() != null - ? lesson.getLearningDesign().getWorkspaceFolder().getWorkspaceFolderId() : null; + ? lesson.getLearningDesign().getWorkspaceFolder().getWorkspaceFolderId() + : null; this.contentFolderID = lesson.getLearningDesign().getContentFolderID() != null - ? lesson.getLearningDesign().getContentFolderID() : null; + ? lesson.getLearningDesign().getContentFolderID() + : null; this.licenseID = lesson.getLearningDesign().getLicense() != null - ? lesson.getLearningDesign().getLicense().getLicenseID() : null; + ? lesson.getLearningDesign().getLicense().getLicenseID() + : null; this.licenseText = lesson.getLearningDesign().getLicenseText(); @@ -121,7 +125,7 @@ this.liveEditEnabled = lesson.getLiveEditEnabled(); this.lockedForEdit = lesson.getLockedForEdit(); - if ( this.lockedForEdit && lesson.getLearningDesign().getEditOverrideUser() != null ) { + if (this.lockedForEdit && lesson.getLearningDesign().getEditOverrideUser() != null) { this.lockedForEditUserId = lesson.getLearningDesign().getEditOverrideUser().getUserId(); this.lockedForEditUsername = lesson.getLearningDesign().getEditOverrideUser().getFullName(); } @@ -264,10 +268,14 @@ this.numberStartedLearners = numberStartedLearners; } - public String getLessonDescription() { - return lessonDescription; + public String getLearningDesignDescription() { + return learningDesignDescription; } + public String getLessonIntro() { + return lessonIntro; + } + public String getLessonName() { return lessonName; } @@ -317,8 +325,8 @@ this.lessonName = lessonName; } - public void setLessonDescription(String lessonDescription) { - this.lessonDescription = lessonDescription; + public void setLearningDesignDescription(String lessonDescription) { + this.learningDesignDescription = lessonDescription; } public void setLessonStateID(Integer lessonStateID) { @@ -414,11 +422,11 @@ } public Boolean getGradebookOnComplete() { - return gradebookOnComplete; + return gradebookOnComplete; } public void setGradebookOnComplete(Boolean gradebookOnComplete) { - this.gradebookOnComplete = gradebookOnComplete; + this.gradebookOnComplete = gradebookOnComplete; } public Integer getLockedForEditUserId() { @@ -430,10 +438,10 @@ } public String getLockedForEditUsername() { - return lockedForEditUsername; + return lockedForEditUsername; } public void setLockedForEditUsername(String lockedForEditUsername) { - this.lockedForEditUsername = lockedForEditUsername; + this.lockedForEditUsername = lockedForEditUsername; } } Index: lams_monitoring/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r06890c4feb9daa16dcea27bc2d38a31c42b33a59 -r752da4bc77129305245c4c8cf9f63f5f6c6deb4e --- lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 06890c4feb9daa16dcea27bc2d38a31c42b33a59) +++ lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 752da4bc77129305245c4c8cf9f63f5f6c6deb4e) @@ -173,6 +173,7 @@ email.notifications = Notifications button.email = Email lesson.name = Name: +lesson.intro = Intro: lesson.description = Description: lesson.state = Status: lesson.learners = Learners Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java =================================================================== diff -u -r2c74285f2768b9de8e18c685f6de2c1feec36b1e -r752da4bc77129305245c4c8cf9f63f5f6c6deb4e --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision 2c74285f2768b9de8e18c685f6de2c1feec36b1e) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision 752da4bc77129305245c4c8cf9f63f5f6c6deb4e) @@ -1117,7 +1117,8 @@ responseJSON.put("lessonStateID", lesson.getLessonStateId()); responseJSON.put("lessonName", HtmlUtils.htmlEscape(lesson.getLessonName())); - responseJSON.put("lessonDescription", lesson.getLessonDescription()); + responseJSON.put("lessonIntro", lesson.getLessonDescription()); + responseJSON.put("learningDesignDescription", learningDesign.getDescription()); Date startOrScheduleDate = lesson.getStartDateTime() == null ? lesson.getScheduleStartDate() : lesson.getStartDateTime(); Index: lams_monitoring/web/css/_monitorLesson_base.scss =================================================================== diff -u -rf18741b5a62481b01d469935b3c32ad4cb62fe54 -r752da4bc77129305245c4c8cf9f63f5f6c6deb4e --- lams_monitoring/web/css/_monitorLesson_base.scss (.../_monitorLesson_base.scss) (revision f18741b5a62481b01d469935b3c32ad4cb62fe54) +++ lams_monitoring/web/css/_monitorLesson_base.scss (.../_monitorLesson_base.scss) (revision 752da4bc77129305245c4c8cf9f63f5f6c6deb4e) @@ -299,7 +299,7 @@ } } -#lessonDetails #description { +#lessonDetails #description, #lessonDetails #intro { overflow: hidden; } Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -rac26a838efe95d62b8cdb2a44f59fd029feb5f5b -r752da4bc77129305245c4c8cf9f63f5f6c6deb4e --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision ac26a838efe95d62b8cdb2a44f59fd029feb5f5b) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 752da4bc77129305245c4c8cf9f63f5f6c6deb4e) @@ -487,7 +487,8 @@ updateContributeActivities(response.contributeActivities); $('#lesson-name-strong').html(response.lessonName); - $('#description').html(response.lessonDescription); + $('#description').html(response.learningDesignDescription); + $('#intro').html(response.lessonIntro); } }); Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -r8586f7c0085f91a846b7a75ea18a8614cce9c48f -r752da4bc77129305245c4c8cf9f63f5f6c6deb4e --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 8586f7c0085f91a846b7a75ea18a8614cce9c48f) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 752da4bc77129305245c4c8cf9f63f5f6c6deb4e) @@ -245,7 +245,13 @@ initLearnersTab(); initGradebookTab(); refreshMonitor(); - + + $('#intro').readmore({ + speed: 500, + collapsedHeight: 85 + }); + + $('#description').readmore({ speed: 500, collapsedHeight: 85 @@ -342,14 +348,22 @@
- +
- +
+ +
+
+
+ +
+
+