Index: lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_chat/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -111,19 +111,19 @@ - + - + - + Index: lams_tool_chat/web/layouts/defaultLayout.jsp =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_chat/web/layouts/defaultLayout.jsp (.../defaultLayout.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_chat/web/layouts/defaultLayout.jsp (.../defaultLayout.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -6,17 +6,16 @@ -
- - -

- -

-
+
+ + +

+ +

-
+ Index: lams_tool_chat/web/pages/monitoring/summary.jsp =================================================================== diff -u -r395383498aa7d3ef716883f2b53816eee8b356f6 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_chat/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 395383498aa7d3ef716883f2b53816eee8b356f6) +++ lams_tool_chat/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -101,7 +101,7 @@ - + Index: lams_tool_forum/web/common/header.jsp =================================================================== diff -u -r5e11c5798ffe74e3a798f13d4a082a7ae91c01a6 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_forum/web/common/header.jsp (.../header.jsp) (revision 5e11c5798ffe74e3a798f13d4a082a7ae91c01a6) +++ lams_tool_forum/web/common/header.jsp (.../header.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -32,7 +32,6 @@ - <%@ include file="/common/fckeditorheader.jsp"%> Index: lams_tool_forum/web/common/tabbedheader.jsp =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_forum/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_forum/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -32,7 +32,6 @@ - <%@ include file="/common/fckeditorheader.jsp"%> Fisheye: Tag f393908c737e5401dda3b995bacb6e4c4a5e5a50 refers to a dead (removed) revision in file `lams_tool_forum/web/includes/javascript/forum.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/web/includes/layout.jsp =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_forum/web/includes/layout.jsp (.../layout.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_forum/web/includes/layout.jsp (.../layout.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -10,23 +10,21 @@ <%@ include file="/common/header.jsp"%> -
- - - -

- -

- - -
+ + + +

+ +

+ +
-
+ Index: lams_tool_forum/web/jsps/monitoring/notebook.jsp =================================================================== diff -u -re32edf3f59266506e8fdbd10f7b61175111fc4dc -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_forum/web/jsps/monitoring/notebook.jsp (.../notebook.jsp) (revision e32edf3f59266506e8fdbd10f7b61175111fc4dc) +++ lams_tool_forum/web/jsps/monitoring/notebook.jsp (.../notebook.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -1,6 +1,7 @@ <%@ include file="/common/taglibs.jsp"%> - ${userDTO.fullName} +

${userDTO.fullName}

+
Fisheye: Tag f393908c737e5401dda3b995bacb6e4c4a5e5a50 refers to a dead (removed) revision in file `lams_tool_laqa/web/includes/javascript/common.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/monitoring/LearnerNotebook.jsp =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_laqa/web/monitoring/LearnerNotebook.jsp (.../LearnerNotebook.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_laqa/web/monitoring/LearnerNotebook.jsp (.../LearnerNotebook.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -33,24 +33,22 @@ - + + <bean:message key="activity.title" /> -

- -

- - - -
+

+ +

+ - + Index: lams_tool_sbmt/web/monitoring/mark/filelist.jsp =================================================================== diff -u -re7f9f5772bf6f3cf2786a65e78d7de441d348c37 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_sbmt/web/monitoring/mark/filelist.jsp (.../filelist.jsp) (revision e7f9f5772bf6f3cf2786a65e78d7de441d348c37) +++ lams_tool_sbmt/web/monitoring/mark/filelist.jsp (.../filelist.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -13,7 +13,11 @@ - + + + + Index: lams_tool_sbmt/web/monitoring/mark/mark.jsp =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_sbmt/web/monitoring/mark/mark.jsp (.../mark.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_sbmt/web/monitoring/mark/mark.jsp (.../mark.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -5,7 +5,8 @@ <fmt:message key="activity.title" /> - + + +

-
Index: lams_tool_laqa/web/monitoring/Reflections.jsp =================================================================== diff -u -r8640cefdf8862cb87ca9847afbf05b1e388f5ff7 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_laqa/web/monitoring/Reflections.jsp (.../Reflections.jsp) (revision 8640cefdf8862cb87ca9847afbf05b1e388f5ff7) +++ lams_tool_laqa/web/monitoring/Reflections.jsp (.../Reflections.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -50,7 +50,7 @@ - + Index: lams_tool_larsrc/web/includes/javascript/rsrccommon.js =================================================================== diff -u -rf644eb2a669882b4938c6b49bb0441e70bb7adb9 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_larsrc/web/includes/javascript/rsrccommon.js (.../rsrccommon.js) (revision f644eb2a669882b4938c6b49bb0441e70bb7adb9) +++ lams_tool_larsrc/web/includes/javascript/rsrccommon.js (.../rsrccommon.js) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -1,11 +1,3 @@ - function launchPopup(url,title) { - var wd = null; - if(wd && wd.open && !wd.closed){ - wd.close(); - } - wd = window.open(url,title,'resizable,width=796,height=570,scrollbars'); - wd.window.focus(); - } function showBusy(targetDiv){ if($(targetDiv+"_Busy") != null){ Element.show(targetDiv+"_Busy"); Index: lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js =================================================================== diff -u -r8d06fff29ec080cfdbfe976fe31379903e51e389 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js (.../rsrcresourceitem.js) (revision 8d06fff29ec080cfdbfe976fe31379903e51e389) +++ lams_tool_larsrc/web/includes/javascript/rsrcresourceitem.js (.../rsrcresourceitem.js) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -96,16 +96,6 @@ hideBusy(instructionTargetDiv); } - function showBusy(targetDiv){ - if($(targetDiv+"_Busy") != null){ - Element.show(targetDiv+"_Busy"); - } - } - function hideBusy(targetDiv){ - if($(targetDiv+"_Busy") != null){ - Element.hide(targetDiv+"_Busy"); - } - } function submitResourceItem(){ $("instructionList").value = Form.serialize("instructionForm"); Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp (.../instructionsnav.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp (.../instructionsnav.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -64,7 +64,7 @@

- Step ${instructions.current} of ${instructions.total} + Step ${instructions.current} of ${instructions.total}

Index: lams_tool_larsrc/web/pages/monitoring/userlist.jsp =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_larsrc/web/pages/monitoring/userlist.jsp (.../userlist.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_larsrc/web/pages/monitoring/userlist.jsp (.../userlist.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -9,11 +9,13 @@ + +

+

- -
+ Index: lams_tool_nb/web/monitoring/monitoring.jsp =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_nb/web/monitoring/monitoring.jsp (.../monitoring.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_nb/web/monitoring/monitoring.jsp (.../monitoring.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -39,30 +39,32 @@
+ + + + + + + + + + +

- +
- - - - - - - - - - @@ -72,6 +74,7 @@
Index: lams_tool_nb/web/monitoring/reflection.jsp =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_nb/web/monitoring/reflection.jsp (.../reflection.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_nb/web/monitoring/reflection.jsp (.../reflection.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -1,13 +1,11 @@ <%@ include file="/includes/taglibs.jsp"%> +
+

- - -
-
Index: lams_tool_nb/web/monitoring/m_Summary.jsp =================================================================== diff -u -r4aae0391a4892385de3df761a655e0ab8b1c0183 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_nb/web/monitoring/m_Summary.jsp (.../m_Summary.jsp) (revision 4aae0391a4892385de3df761a655e0ab8b1c0183) +++ lams_tool_nb/web/monitoring/m_Summary.jsp (.../m_Summary.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -1,5 +1,7 @@ <%@ include file="/includes/taglibs.jsp"%> +

 

+

@@ -26,8 +28,8 @@ - 		- + +
Index: lams_tool_sbmt/web/authoring/authoring.jsp =================================================================== diff -u -rca73a51b45e6071a6a9edd5da8b0d61bf3a39929 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_sbmt/web/authoring/authoring.jsp (.../authoring.jsp) (revision ca73a51b45e6071a6a9edd5da8b0d61bf3a39929) +++ lams_tool_sbmt/web/authoring/authoring.jsp (.../authoring.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -18,7 +18,7 @@ - + + +

-
@@ -33,9 +36,8 @@
-
-
+ \ No newline at end of file Index: lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp =================================================================== diff -u -ref38d157274561b47c07a3d8cf5a5b0379b60ed4 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp (.../fileinfo.jsp) (revision ef38d157274561b47c07a3d8cf5a5b0379b60ed4) +++ lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp (.../fileinfo.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -10,7 +10,7 @@ :
@@ -22,11 +22,11 @@ -   +   - +
@@ -34,10 +38,6 @@
- - -
<%@include file="filelist.jsp"%> Index: lams_tool_sbmt/web/monitoring/mark/updatemark.jsp =================================================================== diff -u -re32edf3f59266506e8fdbd10f7b61175111fc4dc -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_sbmt/web/monitoring/mark/updatemark.jsp (.../updatemark.jsp) (revision e32edf3f59266506e8fdbd10f7b61175111fc4dc) +++ lams_tool_sbmt/web/monitoring/mark/updatemark.jsp (.../updatemark.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -5,16 +5,15 @@ <fmt:message key="activity.title" /> - - - + + +

-
Index: lams_tool_sbmt/web/monitoring/notebook.jsp =================================================================== diff -u -re32edf3f59266506e8fdbd10f7b61175111fc4dc -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_sbmt/web/monitoring/notebook.jsp (.../notebook.jsp) (revision e32edf3f59266506e8fdbd10f7b61175111fc4dc) +++ lams_tool_sbmt/web/monitoring/notebook.jsp (.../notebook.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -14,7 +14,7 @@

- ${userDTO.firstName} ${userDTO.lastName}

+

${userDTO.firstName} ${userDTO.lastName}

Index: lams_tool_survey/web/common/header.jsp =================================================================== diff -u -r0020cbe23ed34775811ceab0779d065243444dcb -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_survey/web/common/header.jsp (.../header.jsp) (revision 0020cbe23ed34775811ceab0779d065243444dcb) +++ lams_tool_survey/web/common/header.jsp (.../header.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -21,7 +21,6 @@ - Index: lams_tool_survey/web/common/tabbedheader.jsp =================================================================== diff -u -r825e32a1131e134c0e2d560418cc349973b3702f -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_survey/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 825e32a1131e134c0e2d560418cc349973b3702f) +++ lams_tool_survey/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -21,7 +21,6 @@ - Fisheye: Tag f393908c737e5401dda3b995bacb6e4c4a5e5a50 refers to a dead (removed) revision in file `lams_tool_survey/web/includes/javascript/surveycommon.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/web/monitoring/LearnerNotebook.jsp =================================================================== diff -u -r825e32a1131e134c0e2d560418cc349973b3702f -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_vote/web/monitoring/LearnerNotebook.jsp (.../LearnerNotebook.jsp) (revision 825e32a1131e134c0e2d560418cc349973b3702f) +++ lams_tool_vote/web/monitoring/LearnerNotebook.jsp (.../LearnerNotebook.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -34,24 +34,22 @@ - + + <bean:message key="activity.title" /> -

- -

- - - -
+

+ +

+
Index: lams_tool_vote/web/monitoring/LearnerRep.jsp =================================================================== diff -u -r825e32a1131e134c0e2d560418cc349973b3702f -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_vote/web/monitoring/LearnerRep.jsp (.../LearnerRep.jsp) (revision 825e32a1131e134c0e2d560418cc349973b3702f) +++ lams_tool_vote/web/monitoring/LearnerRep.jsp (.../LearnerRep.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -52,6 +52,7 @@ +
@@ -147,6 +148,9 @@
+
+ + Index: lams_tool_vote/web/monitoring/Reflections.jsp =================================================================== diff -u -r00759d7592ccc90e8769763524afb69546f641d4 -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_vote/web/monitoring/Reflections.jsp (.../Reflections.jsp) (revision 00759d7592ccc90e8769763524afb69546f641d4) +++ lams_tool_vote/web/monitoring/Reflections.jsp (.../Reflections.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -50,7 +50,7 @@ - + Index: lams_tool_vote/web/monitoring/VoteNominationViewer.jsp =================================================================== diff -u -r825e32a1131e134c0e2d560418cc349973b3702f -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_vote/web/monitoring/VoteNominationViewer.jsp (.../VoteNominationViewer.jsp) (revision 825e32a1131e134c0e2d560418cc349973b3702f) +++ lams_tool_vote/web/monitoring/VoteNominationViewer.jsp (.../VoteNominationViewer.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -35,7 +35,7 @@ -
+
@@ -54,5 +54,6 @@
+ Index: lams_tool_vote/web/monitoring/editNominationBox.jsp =================================================================== diff -u -r825e32a1131e134c0e2d560418cc349973b3702f -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_vote/web/monitoring/editNominationBox.jsp (.../editNominationBox.jsp) (revision 825e32a1131e134c0e2d560418cc349973b3702f) +++ lams_tool_vote/web/monitoring/editNominationBox.jsp (.../editNominationBox.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -41,6 +41,9 @@ + +
+ @@ -102,5 +105,8 @@
+
+ + Index: lams_tool_vote/web/monitoring/newNominationBox.jsp =================================================================== diff -u -r825e32a1131e134c0e2d560418cc349973b3702f -rf393908c737e5401dda3b995bacb6e4c4a5e5a50 --- lams_tool_vote/web/monitoring/newNominationBox.jsp (.../newNominationBox.jsp) (revision 825e32a1131e134c0e2d560418cc349973b3702f) +++ lams_tool_vote/web/monitoring/newNominationBox.jsp (.../newNominationBox.jsp) (revision f393908c737e5401dda3b995bacb6e4c4a5e5a50) @@ -41,6 +41,9 @@ + +
+ @@ -100,5 +103,8 @@
+
+ +