Index: lams_monitoring/web/css/monitorLesson.css =================================================================== diff -u -r91717fbb4a049a8928d97d06c382344b95a3cc3f -ra7d55f08b4e6d9ddf60e077a6ffa25030d031962 --- lams_monitoring/web/css/monitorLesson.css (.../monitorLesson.css) (revision 91717fbb4a049a8928d97d06c382344b95a3cc3f) +++ lams_monitoring/web/css/monitorLesson.css (.../monitorLesson.css) (revision a7d55f08b4e6d9ddf60e077a6ffa25030d031962) @@ -58,6 +58,7 @@ .dialogContainer { display: none; -webkit-overflow-scrolling: touch !important; + overflow: auto; } .dialogContainer iframe { @@ -69,12 +70,14 @@ .dialogContainer .dialogList { overflow: auto; padding: 5px; + padding-bottom: 2px; } .dialogContainer .modal-body { height : 100%; max-height: calc(100% - 56px); padding: 10px; + overflow: auto; } div.dialogListItem { @@ -225,18 +228,22 @@ border: none; } -#classLearnerTable { - border-right: thin solid black; -} - #classLearnerTable #addAllLearnersButton { margin-right: 10px; } -#classMonitorTable { - margin-left: 10px; +#leftLearnerTable { + float: left; + width: 250px; + height: 100%; } +#rightMonitorTable { + margin-top: 4px; + height: 100%; + width: 250px; +} + .dialogSearchPhrase { width: 90%; } Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -r0fcaff7d845d4e5425f636a4e9cba28e8857a2cd -ra7d55f08b4e6d9ddf60e077a6ffa25030d031962 --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 0fcaff7d845d4e5425f636a4e9cba28e8857a2cd) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision a7d55f08b4e6d9ddf60e077a6ffa25030d031962) @@ -103,7 +103,7 @@ // sets up dialog for editing class var classDialog = showDialog('classDialog',{ 'autoOpen' : false, - 'width' : 550, + 'width' : 510, 'title' : LABELS.LESSON_EDIT_CLASS, 'resizable' : true, 'open' : function(){ Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -rb747b6b2d2ebfafab63da52fef672b33e7675a59 -ra7d55f08b4e6d9ddf60e077a6ffa25030d031962 --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision b747b6b2d2ebfafab63da52fef672b33e7675a59) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision a7d55f08b4e6d9ddf60e077a6ffa25030d031962) @@ -3,43 +3,65 @@ <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-function" prefix="fn" %> -<%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %> +<%@ taglib uri="tags-function" prefix="fn"%> +<%@ page import="org.lamsfoundation.lams.util.Configuration" + import="org.lamsfoundation.lams.util.ConfigurationKeys"%> - - - - - - - - - - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + + - + - + <%-- "loading..." screen, gets removed on page full load --%>
- + @@ -240,195 +263,249 @@
- - - - + + +

- -
- +

- +
-
+
+ +
- +
-
-
- - +
+ +
+
+ + +
- -
+ +
- + -
+ onClick="javascript:changeLessonState()" + title=''> + + +
- -
:
+ +
+ + : +
- + - - + + ${serverURL}/ - -
-
- - + +
+ +
+
+
-
:
+
+ + : +
-
- - - - - - - - +
+ + + + + + + +
- + -
:
+
+ + : +
-
- - - - +
-
+
-
+
+ +
- + - + - +
- +
- +
-
+
- + - + - -
+ +
- +