Index: lams_tool_sbmt/build.xml =================================================================== diff -u -ra5dedf21f819d7ddb55e6355209d0d7976db181b -rd7aed7203c6ebc9f86f1577f3f037c8a0899d409 --- lams_tool_sbmt/build.xml (.../build.xml) (revision a5dedf21f819d7ddb55e6355209d0d7976db181b) +++ lams_tool_sbmt/build.xml (.../build.xml) (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -279,7 +279,7 @@ - + Index: lams_tool_sbmt/conf/xdoclet/servlet-mappings.xml =================================================================== diff -u -r0143d3bea1acd1be0bee19158b639fe85027bea1 -rd7aed7203c6ebc9f86f1577f3f037c8a0899d409 --- lams_tool_sbmt/conf/xdoclet/servlet-mappings.xml (.../servlet-mappings.xml) (revision 0143d3bea1acd1be0bee19158b639fe85027bea1) +++ lams_tool_sbmt/conf/xdoclet/servlet-mappings.xml (.../servlet-mappings.xml) (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -6,4 +6,11 @@ Connector /editor/filemanager/browser/default/connectors/jsp/connector - \ No newline at end of file + + + + + download + /download/* + + \ No newline at end of file Index: lams_tool_sbmt/conf/xdoclet/servlets.xml =================================================================== diff -u -r0143d3bea1acd1be0bee19158b639fe85027bea1 -rd7aed7203c6ebc9f86f1577f3f037c8a0899d409 --- lams_tool_sbmt/conf/xdoclet/servlets.xml (.../servlets.xml) (revision 0143d3bea1acd1be0bee19158b639fe85027bea1) +++ lams_tool_sbmt/conf/xdoclet/servlets.xml (.../servlets.xml) (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -38,4 +38,14 @@ false 1 - \ No newline at end of file + + + + + Instructions Download + Instructions Download + download + org.lamsfoundation.lams.contentrepository.client.ToolDownload + 3 + + \ No newline at end of file Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties =================================================================== diff -u -r917358423e83fc323518885887537421fd0afafb -rd7aed7203c6ebc9f86f1577f3f037c8a0899d409 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties (.../SbmtResources.properties) (revision 917358423e83fc323518885887537421fd0afafb) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties (.../SbmtResources.properties) (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -1,3 +1,6 @@ +#=========================Common labels===========================# +label.view=View +label.download=Download #=========================labels===========================# #-------------------------Authoring Labels-----------------# label.authoring.heading.basic=Submission @@ -20,6 +23,8 @@ label.authoring.choosefile.button=Choose file label.authoring.upload.online.button=Upload Online label.authoring.upload.offline.button=Upload Offline +label.authoring.online.delete=Delete +label.authoring.offline.delete=Delete authoring.exception= There is a problem submitting content, the reason is {0} #-------------------------Learners Labels-----------------# Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java =================================================================== diff -u -rb9ef7102d5de177b2caeaa920e9cfce8996267ed -rd7aed7203c6ebc9f86f1577f3f037c8a0899d409 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java (.../ISubmitFilesService.java) (revision b9ef7102d5de177b2caeaa920e9cfce8996267ed) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java (.../ISubmitFilesService.java) (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -165,4 +165,5 @@ */ public boolean releaseMarksForSession(Long sessionID); + public void deleteFromRepository(Long uuid, Long versionID); } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java =================================================================== diff -u -r917358423e83fc323518885887537421fd0afafb -rd7aed7203c6ebc9f86f1577f3f037c8a0899d409 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java (.../AuthoringAction.java) (revision 917358423e83fc323518885887537421fd0afafb) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java (.../AuthoringAction.java) (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -147,13 +147,58 @@ return mapping.getInputForward(); } + /** + * Delete online file + * @param mapping + * @param form + * @param request + * @param response + * @return + */ + public ActionForward deleteOffline(ActionMapping mapping, ActionForm form, + HttpServletRequest request, HttpServletResponse response) { + return deleteFile(mapping, form, IToolContentHandler.TYPE_OFFLINE,request); + } + /** + * Delete offline file + * @param mapping + * @param form + * @param request + * @param response + * @return + */ + public ActionForward deleteOnline(ActionMapping mapping, ActionForm form, + HttpServletRequest request, HttpServletResponse response) { + return deleteFile(mapping, form, IToolContentHandler.TYPE_ONLINE,request); + } + + private ActionForward deleteFile(ActionMapping mapping, ActionForm form, String type, HttpServletRequest request) { + SubmitFilesContent content = getContent(form); + submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this + .getServlet().getServletContext()); + + Long uuid = new Long(WebUtil.readLongParam(request,"uuid")); + Long versionID = new Long(WebUtil.readLongParam(request,"versionID")); + submitFilesService.deleteFromRepository(uuid,versionID); + + //send back the upload file list and display them on page + SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(content.getContentID()); + content.setInstructionFiles(persistContent.getInstructionFiles()); + AuthoringDTO authorDto = new AuthoringDTO(content); + request.setAttribute(SbmtConstants.AUTHORING_DTO,authorDto); + return mapping.getInputForward(); + + } + protected Map getKeyMethodMap() { Map map = new HashMap(); map.put("label.authoring.upload.online.button", "uploadOnline"); map.put("label.authoring.upload.offline.button", "uploadOffline"); map.put("label.authoring.save.button", "updateContent"); - + map.put("label.authoring.online.delete","deleteOnline"); + map.put("label.authoring.offline.delete","deleteOffline"); + return map; } Index: lams_tool_sbmt/web/WEB-INF/web.xml =================================================================== diff -u -re25aeb7cab3254a415d2de6674b1012c129660f5 -rd7aed7203c6ebc9f86f1577f3f037c8a0899d409 --- lams_tool_sbmt/web/WEB-INF/web.xml (.../web.xml) (revision e25aeb7cab3254a415d2de6674b1012c129660f5) +++ lams_tool_sbmt/web/WEB-INF/web.xml (.../web.xml) (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -80,6 +80,15 @@ 1 + + + Instructions Download + Instructions Download + download + org.lamsfoundation.lams.contentrepository.client.ToolDownload + 3 + + action *.do @@ -90,6 +99,11 @@ /editor/filemanager/browser/default/connectors/jsp/connector + + download + /download/* + + 120 Index: lams_tool_sbmt/web/allLearners.jsp =================================================================== diff -u -r935874a247d4ff466784941891be3b56d59d8509 -rd7aed7203c6ebc9f86f1577f3f037c8a0899d409 --- lams_tool_sbmt/web/allLearners.jsp (.../allLearners.jsp) (revision 935874a247d4ff466784941891be3b56d59d8509) +++ lams_tool_sbmt/web/allLearners.jsp (.../allLearners.jsp) (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -13,7 +13,7 @@ All Learner Submission Details - + Index: lams_tool_sbmt/web/authoring/authoring.jsp =================================================================== diff -u -r917358423e83fc323518885887537421fd0afafb -rd7aed7203c6ebc9f86f1577f3f037c8a0899d409 --- lams_tool_sbmt/web/authoring/authoring.jsp (.../authoring.jsp) (revision 917358423e83fc323518885887537421fd0afafb) +++ lams_tool_sbmt/web/authoring/authoring.jsp (.../authoring.jsp) (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -13,7 +13,8 @@ Submit Files - + + @@ -62,7 +63,17 @@ -
  • +
  • + + + + + + + + + +
  • @@ -92,6 +103,15 @@
  • + + + + + + + + +
    Fisheye: Tag d7aed7203c6ebc9f86f1577f3f037c8a0899d409 refers to a dead (removed) revision in file `lams_tool_sbmt/web/css/aqua.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d7aed7203c6ebc9f86f1577f3f037c8a0899d409 refers to a dead (removed) revision in file `lams_tool_sbmt/web/css/base.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d7aed7203c6ebc9f86f1577f3f037c8a0899d409 refers to a dead (removed) revision in file `lams_tool_sbmt/web/css/default.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d7aed7203c6ebc9f86f1577f3f037c8a0899d409 refers to a dead (removed) revision in file `lams_tool_sbmt/web/css/xp.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_sbmt/web/includes/css/aqua.css =================================================================== diff -u --- lams_tool_sbmt/web/includes/css/aqua.css (revision 0) +++ lams_tool_sbmt/web/includes/css/aqua.css (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -0,0 +1,140 @@ +/* +This is a theme CSS file. Which one will be loaded into the JSP depends on a variable passed in from FLASH. +*/ + +body { + font-family: Verdana, Arial, Helvetica, sans-serif; + background-color: #A2BCF9; + font-size: small; +} +h1 { + font-size: large; + background-color: #B4C8FE; + border-top-width: 1px; + border-top-style: solid; + border-top-color: #999999; + border-left-width: 1px; + border-left-style: solid; + border-left-color: #999999; +} +h2 { + font-size: small; + border-bottom-style: solid; + border-bottom-width: 1px; + border-bottom-color: #666666; + margin-bottom: 1px; + + +} + +th { + font-size: small; + color: #FFFFFF; + background-color: #075A8B; + text-align: left; +} + +#formtablecontainer{ + width: auto; + text-align:center; +} + +#datatablecontainer{ +} + +#buttoncontainer { + +} + + +input, select, textarea { + font-family: 'Verdana', 'Arial', 'Helvetica', sans-serif; + font-size: small; +} + +.forms { + border: 1px solid #999999; + font-size: small; + font-style: normal; + width: 100%; +} + +.formlabel { + font-size: small; + font-style: normal; + text-align: right; + width: 20%; +} + +.formcontrol { + font-size: small; + font-style: normal; + text-align: left; +} + +a.button{ + float:right; + font-size: 12px; + color: #000000; + text-decoration:none; + text-align: center; + background-color:#B4C8FE; + margin: 2px 5px 2px 5px; + padding:3px; + width: 80px; + + + + border-top-width: 1px; + border-right-width: 1px; + border-bottom-width: 1px; + border-left-width: 1px; + border-top-style: solid; + border-right-style: solid; + border-bottom-style: solid; + border-left-style: solid; + border-top-color: #FFFFFF; + border-right-color: #0D3F59; + border-bottom-color: #0D3F59; + border-left-color: #FFFFFF; + + +} + +a.button:link{ + color: #000000; + text-decoration:none; + background-color:#B4C8FE; +} + +a.button:visited{ + color: #000000; + text-decoration:none; + background-color:#B4C8FE; +} + + + +a.button:hover{ + text-decoration:none; + background-color:#FFFFFF; +} + +a.button:active{ + text-decoration:none; + background-color:#CCCCCC; + border-top-width: 1px; + border-right-width: 1px; + border-bottom-width: 1px; + border-left-width: 1px; + border-top-style: solid; + border-right-style: solid; + border-bottom-style: solid; + border-left-style: solid; + border-bottom-color: #FFFFFF; + border-left-color: #0D3F59; + border-top-color: #0D3F59; + border-right-color: #FFFFFF; +} + + Index: lams_tool_sbmt/web/includes/css/base.css =================================================================== diff -u --- lams_tool_sbmt/web/includes/css/base.css (revision 0) +++ lams_tool_sbmt/web/includes/css/base.css (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -0,0 +1,3 @@ +/* +This is the Base CSS, it will define the location of images etc and other core, non user configurable items. (Admin configurable) +*/ \ No newline at end of file Index: lams_tool_sbmt/web/includes/css/default.css =================================================================== diff -u --- lams_tool_sbmt/web/includes/css/default.css (revision 0) +++ lams_tool_sbmt/web/includes/css/default.css (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -0,0 +1,140 @@ +/* +This is a theme CSS file. Which one will be loaded into the JSP depends on a variable passed in from FLASH. +*/ + +body { + font-family: Verdana, Arial, Helvetica, sans-serif; + background-color: #A2BCF9; + font-size: small; +} +h1 { + font-size: large; + background-color: #B4C8FE; + border-top-width: 1px; + border-top-style: solid; + border-top-color: #999999; + border-left-width: 1px; + border-left-style: solid; + border-left-color: #999999; +} +h2 { + font-size: small; + border-bottom-style: solid; + border-bottom-width: 1px; + border-bottom-color: #666666; + margin-bottom: 1px; + + +} + +th { + font-size: small; + color: #FFFFFF; + background-color: #075A8B; + text-align: left; +} + +#formtablecontainer{ + width: auto; + text-align:center; +} + +#datatablecontainer{ +} + +#buttoncontainer { + +} + + +input, select, textarea { + font-family: 'Verdana', 'Arial', 'Helvetica', sans-serif; + font-size: small; +} + +.forms { + border: 1px solid #999999; + font-size: small; + font-style: normal; + width: 100%; +} + +.formlabel { + font-size: small; + font-style: normal; + text-align: right; + width: 20%; +} + +.formcontrol { + font-size: small; + font-style: normal; + text-align: left; +} + +a.button{ + float:right; + font-size: 12px; + color: #000000; + text-decoration:none; + text-align: center; + background-color:#B4C8FE; + margin: 2px 5px 2px 5px; + padding:3px; + width: 80px; + + + + border-top-width: 1px; + border-right-width: 1px; + border-bottom-width: 1px; + border-left-width: 1px; + border-top-style: solid; + border-right-style: solid; + border-bottom-style: solid; + border-left-style: solid; + border-top-color: #FFFFFF; + border-right-color: #0D3F59; + border-bottom-color: #0D3F59; + border-left-color: #FFFFFF; + + +} + +a.button:link{ + color: #000000; + text-decoration:none; + background-color:#B4C8FE; +} + +a.button:visited{ + color: #000000; + text-decoration:none; + background-color:#B4C8FE; +} + + + +a.button:hover{ + text-decoration:none; + background-color:#FFFFFF; +} + +a.button:active{ + text-decoration:none; + background-color:#CCCCCC; + border-top-width: 1px; + border-right-width: 1px; + border-bottom-width: 1px; + border-left-width: 1px; + border-top-style: solid; + border-right-style: solid; + border-bottom-style: solid; + border-left-style: solid; + border-bottom-color: #FFFFFF; + border-left-color: #0D3F59; + border-top-color: #0D3F59; + border-right-color: #FFFFFF; +} + + Index: lams_tool_sbmt/web/includes/css/xp.css =================================================================== diff -u --- lams_tool_sbmt/web/includes/css/xp.css (revision 0) +++ lams_tool_sbmt/web/includes/css/xp.css (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -0,0 +1,3 @@ +/* +Another theme CSS, would have diufferent colours and layout techniques +*/ \ No newline at end of file Index: lams_tool_sbmt/web/includes/javascript/common.js =================================================================== diff -u --- lams_tool_sbmt/web/includes/javascript/common.js (revision 0) +++ lams_tool_sbmt/web/includes/javascript/common.js (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -0,0 +1,18 @@ + + + var instructionsWindow = null; + /** + * Launches the popup window for the instruction files + */ + function launchInstructionsPopup(url, formName, fieldName, type) { +// add the mac test back in when we have the platform detection working. +// if(mac){ +// window.open(url,'instructions','resizable,width=796,height=570,scrollbars'); +// }else{ + if(instructionsWindow && instructionsWindow.open && !instructionsWindow.closed){ + instructionsWindow.close(); + } + instructionsWindow = window.open(url,'instructions','resizable,width=796,height=570,scrollbars'); + instructionsWindow.window.focus(); +// } + } \ No newline at end of file Fisheye: Tag d7aed7203c6ebc9f86f1577f3f037c8a0899d409 refers to a dead (removed) revision in file `lams_tool_sbmt/web/sbmtAuthoring.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_sbmt/web/sbmtLearner.jsp =================================================================== diff -u -rb9ef7102d5de177b2caeaa920e9cfce8996267ed -rd7aed7203c6ebc9f86f1577f3f037c8a0899d409 --- lams_tool_sbmt/web/sbmtLearner.jsp (.../sbmtLearner.jsp) (revision b9ef7102d5de177b2caeaa920e9cfce8996267ed) +++ lams_tool_sbmt/web/sbmtLearner.jsp (.../sbmtLearner.jsp) (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -13,7 +13,7 @@ <c:out value="${content.title}"/> - + Index: lams_tool_sbmt/web/updateMarks.jsp =================================================================== diff -u -r279fcb721d30c71b3d61cb67351348a41a9709de -rd7aed7203c6ebc9f86f1577f3f037c8a0899d409 --- lams_tool_sbmt/web/updateMarks.jsp (.../updateMarks.jsp) (revision 279fcb721d30c71b3d61cb67351348a41a9709de) +++ lams_tool_sbmt/web/updateMarks.jsp (.../updateMarks.jsp) (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -13,7 +13,7 @@ Files Submitted - + Index: lams_tool_sbmt/web/userReport.jsp =================================================================== diff -u -r75de919817a4bfa05924724631118b092da74cf7 -rd7aed7203c6ebc9f86f1577f3f037c8a0899d409 --- lams_tool_sbmt/web/userReport.jsp (.../userReport.jsp) (revision 75de919817a4bfa05924724631118b092da74cf7) +++ lams_tool_sbmt/web/userReport.jsp (.../userReport.jsp) (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -12,7 +12,7 @@ Files Submitted - + Index: lams_tool_sbmt/web/userlist.jsp =================================================================== diff -u -r75de919817a4bfa05924724631118b092da74cf7 -rd7aed7203c6ebc9f86f1577f3f037c8a0899d409 --- lams_tool_sbmt/web/userlist.jsp (.../userlist.jsp) (revision 75de919817a4bfa05924724631118b092da74cf7) +++ lams_tool_sbmt/web/userlist.jsp (.../userlist.jsp) (revision d7aed7203c6ebc9f86f1577f3f037c8a0899d409) @@ -13,7 +13,7 @@ <bean:message key="page.title.mark1.userlist"/> - +