Index: lams_learning/web/error.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/error.jsp,v diff -u -r1.5 -r1.6 --- lams_learning/web/error.jsp 23 Jun 2006 07:58:00 -0000 1.5 +++ lams_learning/web/error.jsp 28 Jun 2006 23:10:03 -0000 1.6 @@ -35,15 +35,8 @@ %> - - - - - +

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

+ +

+ Index: lams_learning/web/exit.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/Attic/exit.jsp,v diff -u -r1.1 -r1.2 --- lams_learning/web/exit.jsp 27 Apr 2006 07:36:44 -0000 1.1 +++ lams_learning/web/exit.jsp 28 Jun 2006 23:10:03 -0000 1.2 @@ -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/exportWaitingPage.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/exportWaitingPage.jsp,v diff -u -r1.6 -r1.7 --- lams_learning/web/exportWaitingPage.jsp 18 Jun 2006 04:55:53 -0000 1.6 +++ lams_learning/web/exportWaitingPage.jsp 28 Jun 2006 23:10:03 -0000 1.7 @@ -121,7 +121,10 @@ - -
+
+
+
+
+
Index: lams_learning/web/lessonComplete.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/lessonComplete.jsp,v diff -u -r1.10 -r1.11 --- lams_learning/web/lessonComplete.jsp 19 Jun 2006 03:48:29 -0000 1.10 +++ lams_learning/web/lessonComplete.jsp 28 Jun 2006 23:10:03 -0000 1.11 @@ -26,10 +26,9 @@ <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-lams" prefix="lams" %> -
-

-

+

+

 

+

-
Index: lams_learning/web/loadToolActivity.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/loadToolActivity.jsp,v diff -u -r1.15 -r1.16 --- lams_learning/web/loadToolActivity.jsp 28 Jun 2006 06:33:47 -0000 1.15 +++ lams_learning/web/loadToolActivity.jsp 28 Jun 2006 23:10:03 -0000 1.16 @@ -62,15 +62,7 @@ //--> -
- - - - - -
-

-
-
+

+ Index: lams_learning/web/optionsActivity.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/optionsActivity.jsp,v diff -u -r1.15 -r1.16 --- lams_learning/web/optionsActivity.jsp 19 Jun 2006 07:12:57 -0000 1.15 +++ lams_learning/web/optionsActivity.jsp 28 Jun 2006 23:10:03 -0000 1.16 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/partialCompleted.jsp,v diff -u -r1.6 -r1.7 --- lams_learning/web/partialCompleted.jsp 24 Apr 2006 04:26:35 -0000 1.6 +++ lams_learning/web/partialCompleted.jsp 28 Jun 2006 23:10:03 -0000 1.7 @@ -25,9 +25,6 @@ <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-fmt" prefix="fmt" %> -
-
+

-

-
-
+ Index: lams_learning/web/previewDefineLater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/Attic/previewDefineLater.jsp,v diff -u -r1.2 -r1.3 --- lams_learning/web/previewDefineLater.jsp 15 Jun 2006 01:07:16 -0000 1.2 +++ lams_learning/web/previewDefineLater.jsp 28 Jun 2006 23:10:03 -0000 1.3 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/welcome.jsp,v diff -u -r1.8 -r1.9 --- lams_learning/web/welcome.jsp 11 Jun 2006 02:48:35 -0000 1.8 +++ lams_learning/web/welcome.jsp 28 Jun 2006 23:10:03 -0000 1.9 @@ -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_learning/web/exportPortfolio/main.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/exportPortfolio/main.jsp,v diff -u -r1.2 -r1.3 --- lams_learning/web/exportPortfolio/main.jsp 21 Jun 2006 12:03:17 -0000 1.2 +++ lams_learning/web/exportPortfolio/main.jsp 28 Jun 2006 23:10:03 -0000 1.3 @@ -38,24 +38,34 @@ -

- -

+
+

+ +

+
+
- - - +

- - -
    + + - - -
- - - + + +
    + + + + +
+ + + +
+ +
+ +< \ No newline at end of file Index: lams_learning/web/exportPortfolio/notSupported.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/exportPortfolio/Attic/notSupported.jsp,v diff -u -r1.1 -r1.2 --- lams_learning/web/exportPortfolio/notSupported.jsp 18 Jun 2006 04:55:53 -0000 1.1 +++ lams_learning/web/exportPortfolio/notSupported.jsp 28 Jun 2006 23:10:03 -0000 1.2 @@ -41,13 +41,19 @@ +
+
+

+
+
+ \ No newline at end of file Index: lams_learning/web/gate/gateNext.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/gate/gateNext.jsp,v diff -u -r1.3 -r1.4 --- lams_learning/web/gate/gateNext.jsp 18 Jun 2006 13:06:55 -0000 1.3 +++ lams_learning/web/gate/gateNext.jsp 28 Jun 2006 23:10:03 -0000 1.4 @@ -1,23 +1,17 @@ +

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

 

+ &force=true +

+

 

- - - - - - - + +

+ +

+ + \ No newline at end of file Index: lams_learning/web/gate/permissionGateContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/gate/permissionGateContent.jsp,v diff -u -r1.1 -r1.2 --- lams_learning/web/gate/permissionGateContent.jsp 17 May 2006 07:25:02 -0000 1.1 +++ lams_learning/web/gate/permissionGateContent.jsp 28 Jun 2006 23:10:03 -0000 1.2 @@ -25,9 +25,6 @@ <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> - -

- - - - +

+

 

+

Index: lams_learning/web/gate/scheduleGateContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/gate/scheduleGateContent.jsp,v diff -u -r1.1 -r1.2 --- lams_learning/web/gate/scheduleGateContent.jsp 17 May 2006 07:25:02 -0000 1.1 +++ lams_learning/web/gate/scheduleGateContent.jsp 28 Jun 2006 23:10:03 -0000 1.2 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/gate/synchGateContent.jsp,v diff -u -r1.1 -r1.2 --- lams_learning/web/gate/synchGateContent.jsp 17 May 2006 07:25:02 -0000 1.1 +++ lams_learning/web/gate/synchGateContent.jsp 28 Jun 2006 23:10:03 -0000 1.2 @@ -25,22 +25,11 @@ <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> - -

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

+

+

 

+

+ + +

- Index: lams_learning/web/grouping/show.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/grouping/show.jsp,v diff -u -r1.4 -r1.5 --- lams_learning/web/grouping/show.jsp 21 Jun 2006 12:03:17 -0000 1.4 +++ lams_learning/web/grouping/show.jsp 28 Jun 2006 23:10:03 -0000 1.5 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/grouping/wait.jsp,v diff -u -r1.3 -r1.4 --- lams_learning/web/grouping/wait.jsp 18 Jun 2006 13:06:55 -0000 1.3 +++ lams_learning/web/grouping/wait.jsp 28 Jun 2006 23:10:03 -0000 1.4 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/layout/Attic/activityLayout.jsp,v diff -u -r1.11 -r1.12 --- lams_learning/web/layout/activityLayout.jsp 23 Jun 2006 08:28:30 -0000 1.11 +++ lams_learning/web/layout/activityLayout.jsp 28 Jun 2006 23:10:03 -0000 1.12 @@ -48,13 +48,11 @@ - - - - -
- -
+
+
+ +
+
Index: lams_learning/web/layout/gateLayout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/layout/gateLayout.jsp,v diff -u -r1.2 -r1.3 --- lams_learning/web/layout/gateLayout.jsp 18 Jun 2006 13:06:54 -0000 1.2 +++ lams_learning/web/layout/gateLayout.jsp 28 Jun 2006 23:10:03 -0000 1.3 @@ -41,12 +41,14 @@ - - - - - <%@ include file="../gate/gateNext.jsp" %> -
 
+
+
+ + <%@ include file="../gate/gateNext.jsp" %> +
+ +
+ Index: lams_learning/web/layout/groupWaitLayout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/layout/groupWaitLayout.jsp,v diff -u -r1.2 -r1.3 --- lams_learning/web/layout/groupWaitLayout.jsp 21 Jun 2006 12:03:17 -0000 1.2 +++ lams_learning/web/layout/groupWaitLayout.jsp 28 Jun 2006 23:10:03 -0000 1.3 @@ -40,7 +40,12 @@ - + +
+
+ +
+
Index: lams_learning/web/layout/layout.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/layout/layout.jsp,v diff -u -r1.7 -r1.8 --- lams_learning/web/layout/layout.jsp 27 Jun 2006 03:15:18 -0000 1.7 +++ lams_learning/web/layout/layout.jsp 28 Jun 2006 23:10:03 -0000 1.8 @@ -42,16 +42,24 @@ - - - - - - - - - - + + +
+
+ +
+
+ + + + +
+
+ +
+
+ + \ No newline at end of file Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_monitoring/web/footer.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6 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 =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/notsupported.jsp,v diff -u -r1.1 -r1.2 --- lams_monitoring/web/notsupported.jsp 6 Jun 2006 06:06:25 -0000 1.1 +++ lams_monitoring/web/notsupported.jsp 28 Jun 2006 23:10:26 -0000 1.2 @@ -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/WEB-INF/struts/tiles-defs.xml =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/struts/Attic/tiles-defs.xml,v diff -u -r1.5 -r1.6 --- lams_monitoring/web/WEB-INF/struts/tiles-defs.xml 6 Jun 2006 06:06:25 -0000 1.5 +++ lams_monitoring/web/WEB-INF/struts/tiles-defs.xml 28 Jun 2006 23:10:26 -0000 1.6 @@ -22,9 +22,7 @@ - - @@ -43,9 +41,6 @@ - - - Index: lams_monitoring/web/gate/gateInfo.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/gate/gateInfo.jsp,v diff -u -r1.5 -r1.6 --- lams_monitoring/web/gate/gateInfo.jsp 17 May 2006 00:58:26 -0000 1.5 +++ lams_monitoring/web/gate/gateInfo.jsp 28 Jun 2006 23:10:26 -0000 1.6 @@ -19,20 +19,17 @@ http://www.gnu.org/licenses/gpl.txt --%> - - - - - - -  - + + +

+ + - - +

- - \ No newline at end of file + +

+ Index: lams_monitoring/web/gate/gateStatus.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/gate/gateStatus.jsp,v diff -u -r1.1 -r1.2 --- lams_monitoring/web/gate/gateStatus.jsp 17 May 2006 00:58:26 -0000 1.1 +++ lams_monitoring/web/gate/gateStatus.jsp 28 Jun 2006 23:10:26 -0000 1.2 @@ -19,9 +19,11 @@ http://www.gnu.org/licenses/gpl.txt --%> +
+

\ No newline at end of file Index: lams_monitoring/web/gate/permissionGateContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/gate/permissionGateContent.jsp,v diff -u -r1.8 -r1.9 --- lams_monitoring/web/gate/permissionGateContent.jsp 21 Jun 2006 12:02:41 -0000 1.8 +++ lams_monitoring/web/gate/permissionGateContent.jsp 28 Jun 2006 23:10:26 -0000 1.9 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/gate/scheduleGateContent.jsp,v diff -u -r1.9 -r1.10 --- lams_monitoring/web/gate/scheduleGateContent.jsp 17 May 2006 05:41:15 -0000 1.9 +++ lams_monitoring/web/gate/scheduleGateContent.jsp 28 Jun 2006 23:10:26 -0000 1.10 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/gate/sychGateContent.jsp,v diff -u -r1.7 -r1.8 --- lams_monitoring/web/gate/sychGateContent.jsp 17 May 2006 00:58:26 -0000 1.7 +++ lams_monitoring/web/gate/sychGateContent.jsp 28 Jun 2006 23:10:26 -0000 1.8 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/grouping/chosenGrouping.jsp,v diff -u -r1.2 -r1.3 --- lams_monitoring/web/grouping/chosenGrouping.jsp 6 Jun 2006 06:06:25 -0000 1.2 +++ lams_monitoring/web/grouping/chosenGrouping.jsp 28 Jun 2006 23:10:26 -0000 1.3 @@ -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 />

- +

+ +
+
+ Index: lams_monitoring/web/template/template.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/template/template.jsp,v diff -u -r1.8 -r1.9 --- lams_monitoring/web/template/template.jsp 6 Jun 2006 06:06:25 -0000 1.8 +++ lams_monitoring/web/template/template.jsp 28 Jun 2006 23:10:26 -0000 1.9 @@ -45,17 +45,12 @@ - - - - - - - - - - - -
+ +
+
+ +
+ +