Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbToolContentHandler.java
===================================================================
diff -u
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbToolContentHandler.java (revision 0)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbToolContentHandler.java (revision b13258b9e91d575819ca519cad88e35af9b266a7)
@@ -0,0 +1,63 @@
+/*
+Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+USA
+
+http://www.gnu.org/licenses/gpl.txt
+*/
+package org.lamsfoundation.lams.tool.noticeboard.util;
+
+import org.lamsfoundation.lams.contentrepository.client.ToolContentHandler;
+
+/**
+ * Simple client for accessing the content repository.
+ *
+ */
+public class NbToolContentHandler extends ToolContentHandler {
+
+ private static String repositoryWorkspaceName = "nbworkspace";
+ private static String repositoryUser = "noticeboard";
+ private static char[] repositoryId = {'l','a','m','s','-','n','b'};
+
+ /**
+ *
+ */
+ public NbToolContentHandler() {
+ super();
+ }
+
+ /* (non-Javadoc)
+ * @see org.lamsfoundation.lams.contentrepository.client.ToolContentHandler#getRepositoryWorkspaceName()
+ */
+ public String getRepositoryWorkspaceName() {
+ return repositoryWorkspaceName;
+ }
+
+ /* (non-Javadoc)
+ * @see org.lamsfoundation.lams.contentrepository.client.ToolContentHandler#getRepositoryUser()
+ */
+ public String getRepositoryUser() {
+ return repositoryUser;
+ }
+
+ /* (non-Javadoc)
+ * @see org.lamsfoundation.lams.contentrepository.client.ToolContentHandler#getRepositoryId()
+ */
+ public char[] getRepositoryId() {
+ return repositoryId;
+ }
+
+}
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbWebUtil.java
===================================================================
diff -u -r925813a67f292060b83079d68f5b294fc6d8ffc5 -rb13258b9e91d575819ca519cad88e35af9b266a7
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbWebUtil.java (.../NbWebUtil.java) (revision 925813a67f292060b83079d68f5b294fc6d8ffc5)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/util/NbWebUtil.java (.../NbWebUtil.java) (revision b13258b9e91d575819ca519cad88e35af9b266a7)
@@ -28,7 +28,10 @@
*/
package org.lamsfoundation.lams.tool.noticeboard.util;
-
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import org.lamsfoundation.lams.tool.noticeboard.NbApplicationException;
@@ -66,6 +69,7 @@
public static void cleanAuthoringSession(HttpServletRequest request)
{
request.getSession().removeAttribute(NoticeboardConstants.TOOL_CONTENT_ID);
+ request.getSession().removeAttribute(NoticeboardConstants.ATTACHMENT_LIST);
}
public static void cleanLearnerSession(HttpServletRequest request)
@@ -119,4 +123,11 @@
request.getSession().setAttribute(NoticeboardConstants.ONLINE_INSTRUCTIONS, content.getOnlineInstructions());
request.getSession().setAttribute(NoticeboardConstants.OFFLINE_INSTRUCTIONS, content.getOfflineInstructions());
}
+
+ public static void addUploadsToSession(HttpServletRequest request, Map map)
+ {
+ Collection entries = map.values();
+ List attachmentList = new ArrayList(entries);
+ request.getSession().setAttribute(NoticeboardConstants.ATTACHMENT_LIST, attachmentList);
+ }
}
Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/ApplicationResources.properties
===================================================================
diff -u -r394bb9b7900a26cf4d38d4a8e52ab85791177c5a -rb13258b9e91d575819ca519cad88e35af9b266a7
--- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/ApplicationResources.properties (.../ApplicationResources.properties) (revision 394bb9b7900a26cf4d38d4a8e52ab85791177c5a)
+++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/ApplicationResources.properties (.../ApplicationResources.properties) (revision b13258b9e91d575819ca519cad88e35af9b266a7)
@@ -6,6 +6,7 @@
button.basic=Basic
button.advanced=Advanced
button.instructions=Instructions
+button.upload=Upload
# Basic Page
basic.title=Title:
@@ -14,9 +15,18 @@
#Instructions Page
instructions.onlineInstructions=Online Instructions:
instructions.offlineInstructions=Offline Instructions:
-instructions.uploadOnlineInstr=Upload Online Instructions:
-instructions.uploadOfflineInstr=Upload Offline Instructions:
+instructions.uploadOnlineInstr=Online Instructions File:
+instructions.uploadOfflineInstr=Offline Instructions File:
+instructions.type.online=Online
+instructions.type.offline=Offline
+label.filename=Filename
+label.type=Type
+label.view=View
+label.download=Download
+label.delete=Delete
+label.attachments=Attachments
+
# ========== Learner Page ==========
message.defineLaterSet=Please wait for the teacher to complete the contents of this activity
message.runOfflineSet=This activity is not being done on the computer. Please see your instructor for details
@@ -57,6 +67,6 @@
# --- AUTHORING --- #
-
+error.mandatoryField={0} field is mandatory.
error.missingParam=Unable to continue. {0} is missing.
error.exception.NbApplication=An internal error has occured with the Noticeboard Tool. If reporting this error, please report:
{0}
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r394bb9b7900a26cf4d38d4a8e52ab85791177c5a -rb13258b9e91d575819ca519cad88e35af9b266a7
--- lams_tool_nb/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 394bb9b7900a26cf4d38d4a8e52ab85791177c5a)
+++ lams_tool_nb/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision b13258b9e91d575819ca519cad88e35af9b266a7)
@@ -55,7 +55,6 @@
type="org.lamsfoundation.lams.tool.noticeboard.web.NbLearnerStarterAction"
name="NbLearnerForm"
scope="session"
- input=".learnerStarter"
parameter="mode"
unknown="false"
validate="false"
@@ -216,7 +215,6 @@
type="org.lamsfoundation.lams.tool.noticeboard.web.NbMonitoringStarterAction"
name="NbMonitoringForm"
scope="session"
- input=".monitoringStarter"
unknown="false"
validate="false"
>