Index: lams_learning/web/error.jsp =================================================================== diff -u -rdff0b0618eea86d86bdf3d5d3f56d85c8569f6fe -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/error.jsp (.../error.jsp) (revision dff0b0618eea86d86bdf3d5d3f56d85c8569f6fe) +++ lams_learning/web/error.jsp (.../error.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -35,15 +35,8 @@ %> - - - - - +

<fmt:message key="error.title"/>

+ +

+ Index: lams_learning/web/exit.jsp =================================================================== diff -u -rd61e53f3f98df777cb3006fe79f844214d40d073 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/exit.jsp (.../exit.jsp) (revision d61e53f3f98df777cb3006fe79f844214d40d073) +++ lams_learning/web/exit.jsp (.../exit.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -22,13 +22,6 @@ <%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -
- <fmt:message key="error.title"/> - - -
- -
- - - -
-
-

-

-
-
+

+

 

+

Index: lams_learning/web/exportPortfolio/main.jsp =================================================================== diff -u -r250486f86b66ac04cece0001879c3dc39c96ed98 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/exportPortfolio/main.jsp (.../main.jsp) (revision 250486f86b66ac04cece0001879c3dc39c96ed98) +++ lams_learning/web/exportPortfolio/main.jsp (.../main.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -38,24 +38,34 @@ -

- -

+
+

+ +

+
+
- - - +

- - -
    + + - - -
- - - + + +
    + + + + +
+ + + +
+ +
+ +< \ No newline at end of file Index: lams_learning/web/exportPortfolio/notSupported.jsp =================================================================== diff -u -r6f11dd80335ff2b8a2d06d21f1a49b307ed233c1 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/exportPortfolio/notSupported.jsp (.../notSupported.jsp) (revision 6f11dd80335ff2b8a2d06d21f1a49b307ed233c1) +++ lams_learning/web/exportPortfolio/notSupported.jsp (.../notSupported.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -41,13 +41,19 @@ +
+
+

+
+
+ \ No newline at end of file Index: lams_learning/web/exportWaitingPage.jsp =================================================================== diff -u -r6f11dd80335ff2b8a2d06d21f1a49b307ed233c1 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/exportWaitingPage.jsp (.../exportWaitingPage.jsp) (revision 6f11dd80335ff2b8a2d06d21f1a49b307ed233c1) +++ lams_learning/web/exportWaitingPage.jsp (.../exportWaitingPage.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -121,7 +121,10 @@ - -
+
+
+
+
+
Index: lams_learning/web/gate/gateNext.jsp =================================================================== diff -u -re5049e0948ac38f849ed086dfa9b8b7dfd8d76ae -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/gate/gateNext.jsp (.../gateNext.jsp) (revision e5049e0948ac38f849ed086dfa9b8b7dfd8d76ae) +++ lams_learning/web/gate/gateNext.jsp (.../gateNext.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -1,23 +1,17 @@ +

- - - - -  -&force=true - - - -  +

 

+ &force=true +

+

 

- - - - - - - + +

+ +

+ + \ No newline at end of file Index: lams_learning/web/gate/permissionGateContent.jsp =================================================================== diff -u -r57e83f8443e586e862dae836429599459eade2c0 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/gate/permissionGateContent.jsp (.../permissionGateContent.jsp) (revision 57e83f8443e586e862dae836429599459eade2c0) +++ lams_learning/web/gate/permissionGateContent.jsp (.../permissionGateContent.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -25,9 +25,6 @@ <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> - -

- - - - +

+

 

+

Index: lams_learning/web/gate/scheduleGateContent.jsp =================================================================== diff -u -r57e83f8443e586e862dae836429599459eade2c0 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/gate/scheduleGateContent.jsp (.../scheduleGateContent.jsp) (revision 57e83f8443e586e862dae836429599459eade2c0) +++ lams_learning/web/gate/scheduleGateContent.jsp (.../scheduleGateContent.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -25,15 +25,10 @@ <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> - -

- - - - +

+

 

+

- - - +

 \ No newline at end of file Index: lams_learning/web/gate/synchGateContent.jsp =================================================================== diff -u -r57e83f8443e586e862dae836429599459eade2c0 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/gate/synchGateContent.jsp (.../synchGateContent.jsp) (revision 57e83f8443e586e862dae836429599459eade2c0) +++ lams_learning/web/gate/synchGateContent.jsp (.../synchGateContent.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -25,22 +25,11 @@ <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> - -

- - - - - -   - - - - - - - - - +

+

+

 

+

+ + +

- Index: lams_learning/web/grouping/show.jsp =================================================================== diff -u -r250486f86b66ac04cece0001879c3dc39c96ed98 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/grouping/show.jsp (.../show.jsp) (revision 250486f86b66ac04cece0001879c3dc39c96ed98) +++ lams_learning/web/grouping/show.jsp (.../show.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -25,41 +25,34 @@ <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -
+
+
- +

- +
- - - - - - - - -
+ - - - - - - -
- -
+ 		+ +
+
  - -
+ +

+ +

+ + +
\ No newline at end of file Index: lams_learning/web/grouping/wait.jsp =================================================================== diff -u -re5049e0948ac38f849ed086dfa9b8b7dfd8d76ae -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/grouping/wait.jsp (.../wait.jsp) (revision e5049e0948ac38f849ed086dfa9b8b7dfd8d76ae) +++ lams_learning/web/grouping/wait.jsp (.../wait.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -26,33 +26,19 @@ <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-lams" prefix="lams" %> -
- /grouping.do?method=performGrouping&activityID=${activity.activityId}

- - - - +

 

+

&force=true - - - - - +

- - - -
 
 
- - - -
+ +

+ -
\ No newline at end of file Index: lams_learning/web/layout/activityLayout.jsp =================================================================== diff -u -rfdf1bec458e3ecbd8c76a098b865f7656d39bf5b -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/layout/activityLayout.jsp (.../activityLayout.jsp) (revision fdf1bec458e3ecbd8c76a098b865f7656d39bf5b) +++ lams_learning/web/layout/activityLayout.jsp (.../activityLayout.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -48,13 +48,11 @@ - - - - -
- -
+
+
+ +
+
Index: lams_learning/web/layout/gateLayout.jsp =================================================================== diff -u -re5049e0948ac38f849ed086dfa9b8b7dfd8d76ae -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/layout/gateLayout.jsp (.../gateLayout.jsp) (revision e5049e0948ac38f849ed086dfa9b8b7dfd8d76ae) +++ lams_learning/web/layout/gateLayout.jsp (.../gateLayout.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -41,12 +41,14 @@ - - - - - <%@ include file="../gate/gateNext.jsp" %> -
 
+
+
+ + <%@ include file="../gate/gateNext.jsp" %> +
+ +
+ Index: lams_learning/web/layout/groupWaitLayout.jsp =================================================================== diff -u -r250486f86b66ac04cece0001879c3dc39c96ed98 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/layout/groupWaitLayout.jsp (.../groupWaitLayout.jsp) (revision 250486f86b66ac04cece0001879c3dc39c96ed98) +++ lams_learning/web/layout/groupWaitLayout.jsp (.../groupWaitLayout.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -40,7 +40,12 @@ - + +
+
+ +
+
Index: lams_learning/web/layout/layout.jsp =================================================================== diff -u -r8f18cfdb071443d71e7f5c5ae3d728c762e2ebc3 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/layout/layout.jsp (.../layout.jsp) (revision 8f18cfdb071443d71e7f5c5ae3d728c762e2ebc3) +++ lams_learning/web/layout/layout.jsp (.../layout.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -42,16 +42,24 @@ - - - - - - - - - - + + +
+
+ +
+
+ + + + +
+
+ +
+
+ + \ No newline at end of file Index: lams_learning/web/lessonComplete.jsp =================================================================== diff -u -rd52b0a9ea260d27335a647fc2fba615c8e2e228e -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/lessonComplete.jsp (.../lessonComplete.jsp) (revision d52b0a9ea260d27335a647fc2fba615c8e2e228e) +++ lams_learning/web/lessonComplete.jsp (.../lessonComplete.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -26,10 +26,9 @@ <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-lams" prefix="lams" %> -
-

-

+

+

 

+

-
Index: lams_learning/web/loadToolActivity.jsp =================================================================== diff -u -r37be103193ed4c0be7c796bb92d5423bf13c612a -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/loadToolActivity.jsp (.../loadToolActivity.jsp) (revision 37be103193ed4c0be7c796bb92d5423bf13c612a) +++ lams_learning/web/loadToolActivity.jsp (.../loadToolActivity.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -62,15 +62,7 @@ //--> -
- - - - - -
-

-
-
+

+ Index: lams_learning/web/optionsActivity.jsp =================================================================== diff -u -rbefed36cce945b0a4636f97ff4635ec9312fa3ca -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/optionsActivity.jsp (.../optionsActivity.jsp) (revision befed36cce945b0a4636f97ff4635ec9312fa3ca) +++ lams_learning/web/optionsActivity.jsp (.../optionsActivity.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -6,7 +6,6 @@ <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-lams" prefix="lams" %> -
- +
+
+ + - - - - - - - +

+

 

+

+

+ + + +

+ +
- - - - - - - - - - - - - - - - - - - - - - - - - - - "> - - - -
  -
- -
- 		 
 
-

 

-
-
- - - - -
-
 
- - )"> - - - - -
- - - <%--html:img page="/images/tick.gif" /--%> - - - " /> - - - - -
-
-
- - - - - - - - - -
-

-

-

 

-
- <%--input name="submit" type="button" id="submit" class="button" onClick="validateSubmit()" onMouseOver="pviiClassNew(this,'buttonover')" onMouseOut="pviiClassNew(this,'button')" value="Finish"--%> - <%--html:submit value="Choose" styleClass="button" onmouseover="setClass(this,'buttonover')" onmouseout="setClass(this,'button')" /--%> - "> -   - - "> - -
-
+ + )"> + + + + +
+ + + <%--html:img page="/images/tick.gif" /--%> + + + " /> + + + + +
+ +

+

 

+ +

+ "> + + "> + +

+ + " />
+
Index: lams_learning/web/partialCompleted.jsp =================================================================== diff -u -r66f147e9d94ea10fa2c2cea70a78d6479096ddc7 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/partialCompleted.jsp (.../partialCompleted.jsp) (revision 66f147e9d94ea10fa2c2cea70a78d6479096ddc7) +++ lams_learning/web/partialCompleted.jsp (.../partialCompleted.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -25,9 +25,6 @@ <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -
-
+

-

-
-
+ Index: lams_learning/web/previewDefineLater.jsp =================================================================== diff -u -r1290c6550e900eba41bd51803e59f2a7af0b521b -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/previewDefineLater.jsp (.../previewDefineLater.jsp) (revision 1290c6550e900eba41bd51803e59f2a7af0b521b) +++ lams_learning/web/previewDefineLater.jsp (.../previewDefineLater.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -26,19 +26,10 @@ <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-lams" prefix="lams" %> - -

- - - - - - - - - - - - - +

+

+ + +

+

\ No newline at end of file Index: lams_learning/web/welcome.jsp =================================================================== diff -u -r5aff7aa069793bc34e60b304e69e9e9fceb996f5 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_learning/web/welcome.jsp (.../welcome.jsp) (revision 5aff7aa069793bc34e60b304e69e9e9fceb996f5) +++ lams_learning/web/welcome.jsp (.../welcome.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -19,15 +19,6 @@ http://www.gnu.org/licenses/gpl.txt --%> -<%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> - - - - -
-
-

-
-
+

Index: lams_monitoring/web/WEB-INF/struts/tiles-defs.xml =================================================================== diff -u -r6b2751bb0a75d2d7d73b3297262dffd574d6b313 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_monitoring/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision 6b2751bb0a75d2d7d73b3297262dffd574d6b313) +++ lams_monitoring/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -22,9 +22,7 @@ - - @@ -43,9 +41,6 @@ - - - Fisheye: Tag d75aa108e0bacdd8466dc0a533856c6f5d089c68 refers to a dead (removed) revision in file `lams_monitoring/web/footer.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_monitoring/web/gate/gateInfo.jsp =================================================================== diff -u -rd6359233b82413b67f4b8eede396f6bf95a9c162 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_monitoring/web/gate/gateInfo.jsp (.../gateInfo.jsp) (revision d6359233b82413b67f4b8eede396f6bf95a9c162) +++ lams_monitoring/web/gate/gateInfo.jsp (.../gateInfo.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -19,20 +19,17 @@ http://www.gnu.org/licenses/gpl.txt --%> - - - - - - -  - + + +

+ + - - +

- - \ No newline at end of file + +

+ Index: lams_monitoring/web/gate/gateStatus.jsp =================================================================== diff -u -rd6359233b82413b67f4b8eede396f6bf95a9c162 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_monitoring/web/gate/gateStatus.jsp (.../gateStatus.jsp) (revision d6359233b82413b67f4b8eede396f6bf95a9c162) +++ lams_monitoring/web/gate/gateStatus.jsp (.../gateStatus.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -19,9 +19,11 @@ http://www.gnu.org/licenses/gpl.txt --%> +
+

\ No newline at end of file Index: lams_monitoring/web/gate/permissionGateContent.jsp =================================================================== diff -u -r250486f86b66ac04cece0001879c3dc39c96ed98 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_monitoring/web/gate/permissionGateContent.jsp (.../permissionGateContent.jsp) (revision 250486f86b66ac04cece0001879c3dc39c96ed98) +++ lams_monitoring/web/gate/permissionGateContent.jsp (.../permissionGateContent.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -25,34 +25,21 @@ <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> - - - - - - - - - <%@ include file="gateInfo.jsp" %> - - - - - - - - -
 

 
 
+

+

 

- <%-- set to read only if in export portfolio --%> - - - - - - - -
<%@ include file="gateStatus.jsp" %>
- - - \ No newline at end of file + <%@ include file="gateInfo.jsp" %> +

+ + <%-- set to read only if in export portfolio --%> + + + +

+ + + + +

+ + <%@ include file="gateStatus.jsp" %> \ No newline at end of file Index: lams_monitoring/web/gate/scheduleGateContent.jsp =================================================================== diff -u -r8fa171aaf2db16ecb39d3e35ab96143bad6a40e9 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_monitoring/web/gate/scheduleGateContent.jsp (.../scheduleGateContent.jsp) (revision 8fa171aaf2db16ecb39d3e35ab96143bad6a40e9) +++ lams_monitoring/web/gate/scheduleGateContent.jsp (.../scheduleGateContent.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -24,33 +24,14 @@ <%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> - - - - - - - - - <%@ include file="gateInfo.jsp" %> - - - - - - - - - - +

+

 

+ <%@ include file="gateInfo.jsp" %> +

- - - -
 

 
 
-
-
<%@ include file="gateStatus.jsp" %>
- - - \ No newline at end of file + +

+ + + <%@ include file="gateStatus.jsp" %> \ No newline at end of file Index: lams_monitoring/web/gate/sychGateContent.jsp =================================================================== diff -u -rd6359233b82413b67f4b8eede396f6bf95a9c162 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_monitoring/web/gate/sychGateContent.jsp (.../sychGateContent.jsp) (revision d6359233b82413b67f4b8eede396f6bf95a9c162) +++ lams_monitoring/web/gate/sychGateContent.jsp (.../sychGateContent.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -25,23 +25,9 @@ <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> - - - - - - - - - <%@ include file="gateInfo.jsp" %> - - - - - -
 

 
 
<%@ include file="gateStatus.jsp" %>
- - - +

+

 

+<%@ include file="gateInfo.jsp" %> +<%@ include file="gateStatus.jsp" %> Index: lams_monitoring/web/grouping/chosenGrouping.jsp =================================================================== diff -u -r6b2751bb0a75d2d7d73b3297262dffd574d6b313 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_monitoring/web/grouping/chosenGrouping.jsp (.../chosenGrouping.jsp) (revision 6b2751bb0a75d2d7d73b3297262dffd574d6b313) +++ lams_monitoring/web/grouping/chosenGrouping.jsp (.../chosenGrouping.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -410,10 +410,16 @@ +
+ +
+ +

+ +

+
-

-

@@ -423,41 +429,45 @@

- +
- - - + + + - - -
- +

- " onclick="removeGroup()" disabled=true class="nav" /> + " onclick="removeGroup()" disabled=true />

- - " onclick="addGroup()" class="nav" /> + + " onclick="addGroup()" />

- +

- " onclick="addMembersToGroup()" disabled=true class="nav" /> + " onclick="addMembersToGroup()" disabled=true />

- +

- " onclick="removeMembersFromGroup()" disabled=true class="nav" /> + " onclick="removeMembersFromGroup()" disabled=true />

- +

+ +
+
+ Fisheye: Tag d75aa108e0bacdd8466dc0a533856c6f5d089c68 refers to a dead (removed) revision in file `lams_monitoring/web/header.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_monitoring/web/notsupported.jsp =================================================================== diff -u -r6b2751bb0a75d2d7d73b3297262dffd574d6b313 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_monitoring/web/notsupported.jsp (.../notsupported.jsp) (revision 6b2751bb0a75d2d7d73b3297262dffd574d6b313) +++ lams_monitoring/web/notsupported.jsp (.../notsupported.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -22,8 +22,4 @@ <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-core" prefix="c" %> - -
-

-
- \ No newline at end of file +

Index: lams_monitoring/web/template/template.jsp =================================================================== diff -u -r6b2751bb0a75d2d7d73b3297262dffd574d6b313 -rd75aa108e0bacdd8466dc0a533856c6f5d089c68 --- lams_monitoring/web/template/template.jsp (.../template.jsp) (revision 6b2751bb0a75d2d7d73b3297262dffd574d6b313) +++ lams_monitoring/web/template/template.jsp (.../template.jsp) (revision d75aa108e0bacdd8466dc0a533856c6f5d089c68) @@ -45,17 +45,12 @@ - - - - - - - - - - - -
+ +
+
+ +
+ +