Index: lams_tool_forum/web/includes/layout.jsp =================================================================== diff -u -r0c3d585b0228e4b6913ca6f6a547e76f367c6d8b -rdf638eb558ae2d18b300343911aa8e07e66e9697 --- lams_tool_forum/web/includes/layout.jsp (.../layout.jsp) (revision 0c3d585b0228e4b6913ca6f6a547e76f367c6d8b) +++ lams_tool_forum/web/includes/layout.jsp (.../layout.jsp) (revision df638eb558ae2d18b300343911aa8e07e66e9697) @@ -6,21 +6,27 @@ - - <bean:message key="activity.title" /> - - <%@ include file="/common/header.jsp"%> + <bean:message key="activity.title" /> + <%@ include file="/common/header.jsp"%> - - - - -

- -

- +

+ + + +

+ +

+ - + + +

+ +

+ + +

Index: lams_tool_forum/web/jsps/authoring/definelater.jsp =================================================================== diff -u -rcc9e4f5a2ded59de3f23baa5dda20c7867df1888 -rdf638eb558ae2d18b300343911aa8e07e66e9697 --- lams_tool_forum/web/jsps/authoring/definelater.jsp (.../definelater.jsp) (revision cc9e4f5a2ded59de3f23baa5dda20c7867df1888) +++ lams_tool_forum/web/jsps/authoring/definelater.jsp (.../definelater.jsp) (revision df638eb558ae2d18b300343911aa8e07e66e9697) @@ -6,16 +6,20 @@ <%Set tabs = new HashSet(); tabs.add("authoring.tab.basic"); pageContext.setAttribute("tabs", tabs); + %> - + +

+ +

@@ -25,5 +29,4 @@

- Index: lams_tool_forum/web/jsps/authoring/definelaterforbid.jsp =================================================================== diff -u -red34ad93e720126f7473b282585c411c8acf7dbe -rdf638eb558ae2d18b300343911aa8e07e66e9697 --- lams_tool_forum/web/jsps/authoring/definelaterforbid.jsp (.../definelaterforbid.jsp) (revision ed34ad93e720126f7473b282585c411c8acf7dbe) +++ lams_tool_forum/web/jsps/authoring/definelaterforbid.jsp (.../definelaterforbid.jsp) (revision df638eb558ae2d18b300343911aa8e07e66e9697) @@ -1,4 +1,4 @@ <%@ include file="/common/taglibs.jsp"%> -

- -

+ +

Index: lams_tool_forum/web/jsps/monitoring/editactivity.jsp =================================================================== diff -u -r6852794f79069c9b70ee194f74677323d0bf14b7 -rdf638eb558ae2d18b300343911aa8e07e66e9697 --- lams_tool_forum/web/jsps/monitoring/editactivity.jsp (.../editactivity.jsp) (revision 6852794f79069c9b70ee194f74677323d0bf14b7) +++ lams_tool_forum/web/jsps/monitoring/editactivity.jsp (.../editactivity.jsp) (revision df638eb558ae2d18b300343911aa8e07e66e9697) @@ -1,45 +1,46 @@ <%@ include file="/includes/taglibs.jsp"%> -

- - - - - +

- - : -

- -

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

+ + : +	+ +
- - : -	- -
- - - - - - - - - - - - - - -

+ + + + : + + + + + + + + + + + + + + + + + + + +

+ +

+ + + + + + Index: lams_tool_forum/web/jsps/monitoring/instructions.jsp =================================================================== diff -u -r907a7ec20d8251fde30699bc3b52d64ed9071ea4 -rdf638eb558ae2d18b300343911aa8e07e66e9697 --- lams_tool_forum/web/jsps/monitoring/instructions.jsp (.../instructions.jsp) (revision 907a7ec20d8251fde30699bc3b52d64ed9071ea4) +++ lams_tool_forum/web/jsps/monitoring/instructions.jsp (.../instructions.jsp) (revision df638eb558ae2d18b300343911aa8e07e66e9697) @@ -1,43 +1,32 @@ <%@ include file="/includes/taglibs.jsp"%> - -

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

- - : - - -

- -

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

+ + : +	+ +
+ + - - - - + - - - - + @@ -46,26 +35,24 @@ - -
- - : -	- -
- -	- +
+ + : +	+ +
+ + @@ -89,14 +76,15 @@ - -
- -

+ + +

+ +

+ Index: lams_tool_forum/web/jsps/monitoring/message/topicview.jsp =================================================================== diff -u -r6852794f79069c9b70ee194f74677323d0bf14b7 -rdf638eb558ae2d18b300343911aa8e07e66e9697 --- lams_tool_forum/web/jsps/monitoring/message/topicview.jsp (.../topicview.jsp) (revision 6852794f79069c9b70ee194f74677323d0bf14b7) +++ lams_tool_forum/web/jsps/monitoring/message/topicview.jsp (.../topicview.jsp) (revision df638eb558ae2d18b300343911aa8e07e66e9697) @@ -1,39 +1,36 @@ -

-
- +

+ - + + - - - -

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

+ + Index: lams_tool_forum/web/jsps/monitoring/monitoring.jsp =================================================================== diff -u -r6852794f79069c9b70ee194f74677323d0bf14b7 -rdf638eb558ae2d18b300343911aa8e07e66e9697 --- lams_tool_forum/web/jsps/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 6852794f79069c9b70ee194f74677323d0bf14b7) +++ lams_tool_forum/web/jsps/monitoring/monitoring.jsp (.../monitoring.jsp) (revision df638eb558ae2d18b300343911aa8e07e66e9697) @@ -1,16 +1,18 @@ <%@ include file="/common/taglibs.jsp"%> + + +

+ + + + +

Index: lams_tool_forum/web/jsps/monitoring/statistic.jsp =================================================================== diff -u -r907a7ec20d8251fde30699bc3b52d64ed9071ea4 -rdf638eb558ae2d18b300343911aa8e07e66e9697 --- lams_tool_forum/web/jsps/monitoring/statistic.jsp (.../statistic.jsp) (revision 907a7ec20d8251fde30699bc3b52d64ed9071ea4) +++ lams_tool_forum/web/jsps/monitoring/statistic.jsp (.../statistic.jsp) (revision df638eb558ae2d18b300343911aa8e07e66e9697) @@ -2,81 +2,82 @@ -

- - - - - - - - - - - - - - : + + + + + + + + + + + + + - +

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

+ + : + +

- - - - - - - - - - - - - -

- -	- -	- -
- - - - - - -	- -	- -

+ + + + + + + + + + + + + +

+ +	+ +	+ +
+ + + + + + +	+ +	+ +

-
- -

- -

+ + + + + + + + + + + + + + + + + + + Index: lams_tool_forum/web/jsps/monitoring/summary.jsp =================================================================== diff -u -r6852794f79069c9b70ee194f74677323d0bf14b7 -rdf638eb558ae2d18b300343911aa8e07e66e9697 --- lams_tool_forum/web/jsps/monitoring/summary.jsp (.../summary.jsp) (revision 6852794f79069c9b70ee194f74677323d0bf14b7) +++ lams_tool_forum/web/jsps/monitoring/summary.jsp (.../summary.jsp) (revision df638eb558ae2d18b300343911aa8e07e66e9697) @@ -1,90 +1,83 @@ <%@ include file="/includes/taglibs.jsp"%> -

- - - - -
+ + + + - +

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

+ + : + +
- : - -			+ + +	+ +	+ + + + + + + +
- - -	- -	- - - - - - - -
- -
- +
- - - - - - - -	- - - - - - -	- - - - - - -
+ + + + + + + +	+ + + + + + +	+ + + + + + +

+ - - - -
- - + +

- -

+ + Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp =================================================================== diff -u -r6852794f79069c9b70ee194f74677323d0bf14b7 -rdf638eb558ae2d18b300343911aa8e07e66e9697 --- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp (.../updatemarks.jsp) (revision 6852794f79069c9b70ee194f74677323d0bf14b7) +++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp (.../updatemarks.jsp) (revision df638eb558ae2d18b300343911aa8e07e66e9697) @@ -2,19 +2,28 @@ " /> - , -

- + +

- + + + + -

+	+ + + , + + +
	+	"> @@ -31,46 +40,46 @@

- +

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

- * - : +	+ + * :	+
- - : +	+			- - - -	+

+
+			" style="width:120px" class="buttonStyle" />

+ + Index: lams_tool_forum/web/jsps/monitoring/usermarklist.jsp =================================================================== diff -u -r6852794f79069c9b70ee194f74677323d0bf14b7 -rdf638eb558ae2d18b300343911aa8e07e66e9697 --- lams_tool_forum/web/jsps/monitoring/usermarklist.jsp (.../usermarklist.jsp) (revision 6852794f79069c9b70ee194f74677323d0bf14b7) +++ lams_tool_forum/web/jsps/monitoring/usermarklist.jsp (.../usermarklist.jsp) (revision df638eb558ae2d18b300343911aa8e07e66e9697) @@ -1,8 +1,6 @@ <%@ include file="/common/taglibs.jsp"%> - , -

- +

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

@@ -12,17 +10,28 @@

+ + , + + + +

+ + "> @@ -38,13 +47,13 @@

+ : + @@ -56,11 +65,11 @@

+ : + @@ -72,8 +81,7 @@

-
+

> > Index: lams_tool_forum/web/jsps/monitoring/viewactivity.jsp =================================================================== diff -u -r907a7ec20d8251fde30699bc3b52d64ed9071ea4 -rdf638eb558ae2d18b300343911aa8e07e66e9697 --- lams_tool_forum/web/jsps/monitoring/viewactivity.jsp (.../viewactivity.jsp) (revision 907a7ec20d8251fde30699bc3b52d64ed9071ea4) +++ lams_tool_forum/web/jsps/monitoring/viewactivity.jsp (.../viewactivity.jsp) (revision df638eb558ae2d18b300343911aa8e07e66e9697) @@ -1,38 +1,33 @@ <%@ include file="/includes/taglibs.jsp"%> - + -

- - - - - - - - - - - - - - - - -

- - : -	- -
- - : -	- -
- - - -	- -

+ + + + + + + + + + + + + + + +

+ + : +	+ +
+ + : +	+ +
+ + + +

Index: lams_tool_forum/web/jsps/monitoring/viewallmarks.jsp =================================================================== diff -u -r6852794f79069c9b70ee194f74677323d0bf14b7 -rdf638eb558ae2d18b300343911aa8e07e66e9697 --- lams_tool_forum/web/jsps/monitoring/viewallmarks.jsp (.../viewallmarks.jsp) (revision 6852794f79069c9b70ee194f74677323d0bf14b7) +++ lams_tool_forum/web/jsps/monitoring/viewallmarks.jsp (.../viewallmarks.jsp) (revision df638eb558ae2d18b300343911aa8e07e66e9697) @@ -1,6 +1,6 @@ <%@ include file="/includes/taglibs.jsp"%> - +

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

@@ -15,30 +15,29 @@ - - - -
- - - , - - , - -
+ + + , + + , + +
+		+	"> @@ -54,13 +53,13 @@
+	:	+		@@ -72,11 +71,11 @@
+	:	+		@@ -89,7 +88,7 @@
+		> > @@ -98,7 +97,7 @@

Index: lams_tool_forum/web/jsps/monitoring/viewtopic.jsp =================================================================== diff -u -r6852794f79069c9b70ee194f74677323d0bf14b7 -rdf638eb558ae2d18b300343911aa8e07e66e9697 --- lams_tool_forum/web/jsps/monitoring/viewtopic.jsp (.../viewtopic.jsp) (revision 6852794f79069c9b70ee194f74677323d0bf14b7) +++ lams_tool_forum/web/jsps/monitoring/viewtopic.jsp (.../viewtopic.jsp) (revision df638eb558ae2d18b300343911aa8e07e66e9697) @@ -1,7 +1,14 @@ - <%@ include file="/common/taglibs.jsp"%> -

- <%@ include file="message/topicview.jsp"%> -
- close -

+ +<%@ include file="message/topicview.jsp"%> + + + + + + +

+ close +

+ +