Index: lams_tool_sbmt/web/monitoring/mark/allmarks.jsp =================================================================== diff -u -r955ea2e56ab29f6953d79efbddb1b8406a57aa05 -rff591854d7e1415de33ce6719f7d2a83548ec268 --- lams_tool_sbmt/web/monitoring/mark/allmarks.jsp (.../allmarks.jsp) (revision 955ea2e56ab29f6953d79efbddb1b8406a57aa05) +++ lams_tool_sbmt/web/monitoring/mark/allmarks.jsp (.../allmarks.jsp) (revision ff591854d7e1415de33ce6719f7d2a83548ec268) @@ -1,22 +1,11 @@ - <%@include file="/common/taglibs.jsp"%> - - - - - - + + - - - <fmt:message key="activity.title" /> - - - - - - + + + - - - - +
+

+ ${title} +

- -
- - -
- - - - - <%@include file="fileinfo.jsp"%> -
+ + + + + + + +
+ + <%@include file="fileinfo.jsp"%> + + +
+ + +
-
- - - - - - - - - - - - \ No newline at end of file +
+ +
+
+ Index: lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp =================================================================== diff -u -r94b2225ee897f0a10318b17e1c692f2ccbb1e36b -rff591854d7e1415de33ce6719f7d2a83548ec268 --- lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp (.../fileinfo.jsp) (revision 94b2225ee897f0a10318b17e1c692f2ccbb1e36b) +++ lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp (.../fileinfo.jsp) (revision ff591854d7e1415de33ce6719f7d2a83548ec268) @@ -2,90 +2,108 @@ + -
  
+
+   +   +
-
+
+
- -
- : -
-
- -
- - -
- : -
-
- - - -
- - - - "> - + +
+ : +
+
+ - + - - download/?uuid=${fileInfo.displayUuid}&versionID=${fileInfo.versionID}&preferDownload=false - - - "> - - - download/?uuid=${fileInfo.displayUuid}&versionID=${fileInfo.versionID}&preferDownload=true - - - "> - - - - "> - - +
+ : +
+
+ - -
-
+ + +
+ + + + + + + + download/?uuid=${fileInfo.displayUuid}&versionID=${fileInfo.versionID}&preferDownload=false + + + + + download/?uuid=${fileInfo.displayUuid}&versionID=${fileInfo.versionID}&preferDownload=true + + + "> + + + + + + + + +
+
+
+
+ +
+ : +
+
+ + +
+ +
+ + + + + +
+ +
- -
- : -
-
- - - - - - - - -
- - - -${fileInfo.removed?"style=\"margin-bottom: 5px; border-bottom: 5px solid #ddd\"":""} -
+
+ ${fileInfo.removed?"style=\"margin-bottom: 5px; border-bottom: 5px solid #ddd\"":""} +
: -
-
+ +
-
+ + - + <%@include file="filelist.jsp"%> -
+ + - + + -
+
+
: -
-
- -
- - download/?uuid=${fileInfo.markFileDisplayUuid}&versionID=${fileInfo.markFileVersionID}&preferDownload=false - - - "> - - - download/?uuid=${fileInfo.markFileDisplayUuid}&versionID=${fileInfo.markFileVersionID}&preferDownload=true - - - "> - -
-
+ +
+ + +
+ + download/?uuid=${fileInfo.markFileDisplayUuid}&versionID=${fileInfo.markFileVersionID}&preferDownload=false + + + + + download/?uuid=${fileInfo.markFileDisplayUuid}&versionID=${fileInfo.markFileVersionID}&preferDownload=true + + + "> + +
+
+ - Index: lams_tool_sbmt/web/monitoring/mark/mark.jsp =================================================================== diff -u -r955ea2e56ab29f6953d79efbddb1b8406a57aa05 -rff591854d7e1415de33ce6719f7d2a83548ec268 --- lams_tool_sbmt/web/monitoring/mark/mark.jsp (.../mark.jsp) (revision 955ea2e56ab29f6953d79efbddb1b8406a57aa05) +++ lams_tool_sbmt/web/monitoring/mark/mark.jsp (.../mark.jsp) (revision ff591854d7e1415de33ce6719f7d2a83548ec268) @@ -1,22 +1,11 @@ - <%@include file="/common/taglibs.jsp"%> - - - - - - + + - - - <fmt:message key="activity.title" /> - - - - - - + + + - + +
+

+ ${title} +

- - - - -
- + -
+ - - <%@include file="fileinfo.jsp"%> -
- +
+ + <%@include file="fileinfo.jsp"%> + + +
+ + +
- - - - - - - - - \ No newline at end of file +
+ +
+
+ Index: lams_tool_sbmt/web/monitoring/mark/updatemark.jsp =================================================================== diff -u -r955ea2e56ab29f6953d79efbddb1b8406a57aa05 -rff591854d7e1415de33ce6719f7d2a83548ec268 --- lams_tool_sbmt/web/monitoring/mark/updatemark.jsp (.../updatemark.jsp) (revision 955ea2e56ab29f6953d79efbddb1b8406a57aa05) +++ lams_tool_sbmt/web/monitoring/mark/updatemark.jsp (.../updatemark.jsp) (revision ff591854d7e1415de33ce6719f7d2a83548ec268) @@ -6,28 +6,17 @@ <%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%> <%=FileValidatorUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%> <%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%> + - - - - - - - - - - <fmt:message key="activity.title" /> - - - - - + + + - - - - - - - - +
+

+ ${title} +

+ + - @@ -68,74 +54,83 @@ - <%@include file="fileinfo.jsp"%> + - - -
-
- : -
-
- -
+
+ <%@include file="fileinfo.jsp"%> -
-
-
-
- : -
- - -
- -
- - -
- - -
- - download/?uuid=${fileInfo.markFileDisplayUuid}&versionID=${fileInfo.markFileVersionID}&preferDownload=false - - - "> - - - - download/?uuid=${fileInfo.markFileDisplayUuid}&versionID=${fileInfo.markFileVersionID}&preferDownload=true - - - "> - - - - "> - -
- -
- -
-
- - - -
- - +
+
+ : +
+
+ +
+
+ +
+
+ : +
+ +
+ + +
+ +
+ + + + +
+ + download/?uuid=${fileInfo.markFileDisplayUuid}&versionID=${fileInfo.markFileVersionID}&preferDownload=false + + + + + download/?uuid=${fileInfo.markFileDisplayUuid}&versionID=${fileInfo.markFileVersionID}&preferDownload=true + + + "> + + + +
+ +
+ +
+ + +
+
+ +
+
+ +
+
+ +
+
+ +
- - -
-
+
+ + ?userID=${fileInfo.owner.userID}&toolSessionID=${toolSessionID} @@ -146,17 +141,11 @@ ?&toolSessionID=${toolSessionID} - + -
- - - - - \ No newline at end of file +
+ Index: lams_tool_sbmt/web/monitoring/monitoring.jsp =================================================================== diff -u -rbbdddbe61d1b08c08a0dbae70d8d19bdfe357307 -rff591854d7e1415de33ce6719f7d2a83548ec268 --- lams_tool_sbmt/web/monitoring/monitoring.jsp (.../monitoring.jsp) (revision bbdddbe61d1b08c08a0dbae70d8d19bdfe357307) +++ lams_tool_sbmt/web/monitoring/monitoring.jsp (.../monitoring.jsp) (revision ff591854d7e1415de33ce6719f7d2a83548ec268) @@ -1,83 +1,16 @@ - <%@include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.tool.sbmt.SbmtConstants"%> - - - - - - + + - - - <fmt:message key="activity.title" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp =================================================================== diff -u -rbe33897898483fec39439cf31c304bdb80c198f9 -rff591854d7e1415de33ce6719f7d2a83548ec268 --- lams_tool_sbmt/web/monitoring/parts/summary.jsp (.../summary.jsp) (revision be33897898483fec39439cf31c304bdb80c198f9) +++ lams_tool_sbmt/web/monitoring/parts/summary.jsp (.../summary.jsp) (revision ff591854d7e1415de33ce6719f7d2a83548ec268) @@ -2,6 +2,10 @@ + + + + + + + + + + + -
+

-
+
- + - + -
- - + + + +
+
+ + + + + + +
+ +
+ + + +
+ +
+ + - - -
-
- - - : + + + + + + +
+ +
+
+
+ +
style="display:none;"> + + + - -
+ +
+ + + + -
- -
- - -
- + +
- - - - - - - - - -

-

style="display:none;"> - - - -
- - - - - - - - -
- - - " class="btn btn-default loffset5 voffset10" /> -
-

- - -
-
- - ${ !isGroupedActivity || ! status.last ? '
 
' : ''} - - + + + +
+
+ + +
+ + + -<%@ include file="advanceoptions.jsp"%> - - - -
+ <%@ include file="advanceoptions.jsp"%> + +
+
\ No newline at end of file