Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java,v
diff -u -r1.19 -r1.20
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java 19 Sep 2006 06:37:23 -0000 1.19
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java 19 Sep 2006 08:33:07 -0000 1.20
@@ -280,42 +280,6 @@
nbContent.setDateUpdated(new Date(System.currentTimeMillis()));
}
- public ActionErrors validate(ActionMapping mapping, HttpServletRequest request)
- {
- ActionErrors errors = new ActionErrors();
- //check the tool content id
- //check the title and instructions
-
- float maxFileSize = UploadFileUtil.getMaxFileSize();
-
- if (this.offlineFile != null && offlineFile.getFileSize()!= 0)
- {
- float sizeOfOfflineUpload = offlineFile.getFileSize() / 1024 / 1024;
- //check the file size
- if (sizeOfOfflineUpload > maxFileSize)
- {
- logger.error("file size " + sizeOfOfflineUpload + " Max File Size allowed: " + maxFileSize);
- errors.add("filesize", new ActionMessage("error.exceedMaxFileSize"));
- this.setMethod("Instructions");
- }
-
- }
- else if ( this.onlineFile != null && onlineFile.getFileSize() != 0)
- {
- float sizeOfOnlineUpload = onlineFile.getFileSize() / 1024 / 1024; //getFileSize() returns the file size in bytes, but we are comparing the filesize using units MBs
-
- if (sizeOfOnlineUpload > maxFileSize)
- {
-
- logger.error("file size " + sizeOfOnlineUpload + " Max File Size allowed: " + maxFileSize);
- errors.add("filesize", new ActionMessage("error.exceedMaxFileSize"));
- this.setMethod("Instructions");
- }
- }
-
- return errors;
-
- }
public String getCurrentTab() {
return currentTab;
}
Index: lams_tool_nb/web/META-INF/MANIFEST.MF
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/META-INF/Attic/MANIFEST.MF,v
diff -u -r1.1 -r1.2
--- lams_tool_nb/web/META-INF/MANIFEST.MF 7 Jun 2005 05:52:18 -0000 1.1
+++ lams_tool_nb/web/META-INF/MANIFEST.MF 19 Sep 2006 08:33:07 -0000 1.2
@@ -1,3 +1,5 @@
-Manifest-Version: 1.0
+Implementation-Title: LAMS - Noticeboard Tool
+Implementation-Version: 2.0 RC1
+Implementation-Vendor: LAMS Foundation (http://lamsfoundation.org)
Class-Path:
Index: lams_tool_nb/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/authoring/authoring.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_nb/web/authoring/authoring.jsp 6 Sep 2006 01:40:15 -0000 1.12
+++ lams_tool_nb/web/authoring/authoring.jsp 19 Sep 2006 08:33:07 -0000 1.13
@@ -37,13 +37,17 @@
return true;
}
- function deleteAttachment(dispatch, uuid) {
- document.authoringForm.dispatch.value = dispatch;
- document.authoringForm.deleteFileUuid.value = uuid;
- document.authoringForm.submit();
+ function deleteAttachment(uuid) {
+ document.NbAuthoringForm.method.value = '';
+ document.NbAuthoringForm.deleteFileUuid.value = uuid;
+ document.NbAuthoringForm.submit();
}
-
+ function doUpload() {
+ document.NbAuthoringForm.method.value = '';
+ document.NbAuthoringForm.submit();
+ }
+
@@ -57,8 +61,7 @@
+ value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
Index: lams_tool_nb/web/authoring/instructions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/authoring/Attic/instructions.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_nb/web/authoring/instructions.jsp 6 Sep 2006 01:40:15 -0000 1.7
+++ lams_tool_nb/web/authoring/instructions.jsp 19 Sep 2006 08:33:07 -0000 1.8
@@ -10,6 +10,7 @@
+
@@ -47,7 +48,7 @@
+ href="javascript:deleteAttachment('${attachment.uuid}')">
@@ -69,9 +70,10 @@
|
-
+
-
+
|
@@ -113,7 +115,7 @@
+ href="javascript:deleteAttachment('${attachment.uuid}')">
@@ -135,9 +137,10 @@
|
-
+
-
+
|