Index: lams_tool_nb/build.xml =================================================================== diff -u -r1c31dbd6b844bffd77d86babab9592e8267cc462 -r992d0d544a920da849e7d1a6b3f2006f816f7d86 --- lams_tool_nb/build.xml (.../build.xml) (revision 1c31dbd6b844bffd77d86babab9592e8267cc462) +++ lams_tool_nb/build.xml (.../build.xml) (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -207,6 +207,7 @@ + @@ -216,7 +217,8 @@ - + + Index: lams_tool_nb/conf/language/ApplicationResources.properties =================================================================== diff -u -r1c31dbd6b844bffd77d86babab9592e8267cc462 -r992d0d544a920da849e7d1a6b3f2006f816f7d86 --- lams_tool_nb/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 1c31dbd6b844bffd77d86babab9592e8267cc462) +++ lams_tool_nb/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -9,11 +9,13 @@ tool.display.name=Noticeboard Tool tool.description=Tool that displays a noticeboard -# ========== Authoring Page =========== - -button.basic=Basic -button.advanced=Advanced -button.instructions=Instructions +# Tab name for basic screen (authoring) +label.authoring.heading.basic=Basic +# Tab name for advanced screen (authoring) +label.authoring.heading.advance=Advanced +# Tab name for instructions screen (authoring) +label.authoring.heading.instructions=Instructions +# Button for uploading a file on the authoring instructions page button.upload=Upload # Basic Page @@ -35,8 +37,6 @@ link.download=Download link.delete=Delete -message.noAdvancedSection=Advanced features are not available in this tool - # ========== 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 @@ -46,9 +46,7 @@ message.author.defineLaterSet2=The teacher will set the content of this noticeboard once the lesson is in progress. Please click on the "NEXT" button below to continue # ========== Monitoring Page ========== -button.summary=Summary button.editActivity=Edit Activity -button.statistics=Statistics button.edit=Edit titleHeading.summary=Summary Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java =================================================================== diff -u -r1294bda1a325e4833cde96165167670e6e5024fb -r992d0d544a920da849e7d1a6b3f2006f816f7d86 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java (.../NoticeboardConstants.java) (revision 1294bda1a325e4833cde96165167670e6e5024fb) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java (.../NoticeboardConstants.java) (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -107,16 +107,9 @@ // labels used in ApplicationResources.properties // --------------------------------------------------------------------------- - public static final String BUTTON_BASIC = "button.basic"; - public static final String BUTTON_ADVANCED = "button.advanced"; - public static final String BUTTON_INSTRUCTIONS = "button.instructions"; public static final String BUTTON_SAVE = "button.save"; public static final String BUTTON_DONE = "button.done"; public static final String BUTTON_FINISH = "button.finish"; - // public static final String BUTTON_CANCEL = "button.cancel"; - public static final String BUTTON_EDIT_ACTIVITY = "button.editActivity"; - public static final String BUTTON_SUMMARY = "button.summary"; - public static final String BUTTON_STATISTICS = "button.statistics"; public static final String BUTTON_EDIT = "button.edit"; public static final String BUTTON_UPLOAD = "button.upload"; public static final String LINK_DELETE="link.delete"; Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java =================================================================== diff -u -r381be89a6f9f4d6461c504160317f9d910667a96 -r992d0d544a920da849e7d1a6b3f2006f816f7d86 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java (.../NbAuthoringAction.java) (revision 381be89a6f9f4d6461c504160317f9d910667a96) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java (.../NbAuthoringAction.java) (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -90,7 +90,7 @@ * path=".error" * handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler" * - * @struts:action-forward name="authoringContent" path="/author_page.jsp" + * @struts:action-forward name="authoringContent" path="/authoring/authoring.jsp" * @struts:action-forward name="displayMessage" path=".message" * * ----------------XDoclet Tags-------------------- Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java =================================================================== diff -u -rd789031b1ec349fa6315006cff40f1abc607b932 -r992d0d544a920da849e7d1a6b3f2006f816f7d86 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java (.../NbAuthoringForm.java) (revision d789031b1ec349fa6315006cff40f1abc607b932) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringForm.java (.../NbAuthoringForm.java) (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -86,6 +86,7 @@ private FormFile onlineFile; private FormFile offlineFile; + private String currentTab; /** * @return Returns the offlineFile. */ @@ -274,6 +275,12 @@ return errors; } + public String getCurrentTab() { + return currentTab; + } + public void setCurrentTab(String currentTab) { + this.currentTab = currentTab; + } } Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java =================================================================== diff -u -r138d81c3ff17536909542e5ba06638e14d0e3427 -r992d0d544a920da849e7d1a6b3f2006f816f7d86 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java (.../NbMonitoringAction.java) (revision 138d81c3ff17536909542e5ba06638e14d0e3427) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringAction.java (.../NbMonitoringAction.java) (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -43,7 +43,7 @@ import org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService; import org.lamsfoundation.lams.tool.noticeboard.service.NoticeboardServiceProxy; import org.lamsfoundation.lams.tool.noticeboard.util.NbWebUtil; -import org.lamsfoundation.lams.web.action.LamsLookupDispatchAction; +import org.lamsfoundation.lams.web.action.LamsDispatchAction; /** * @author mtruong @@ -69,40 +69,32 @@ * type="java.lang.NullPointerException" * path=".error" * handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler" - * @struts:action-forward name="monitorPage" path=".monitoringContent" + * @struts:action-forward name="monitorPage" path="/monitoring/monitoring.jsp" * ----------------XDoclet Tags-------------------- */ -public class NbMonitoringAction extends LamsLookupDispatchAction { +public class NbMonitoringAction extends LamsDispatchAction { static Logger logger = Logger.getLogger(NbMonitoringAction.class.getName()); public final static String FORM="NbMonitoringForm"; + + public static final String SUMMARY_TABID = "1"; + public static final String INSTRUCTIONS_TABID = "2"; + public static final String EDITACTIVITY_TABID = "3"; + public static final String STATISTICS_TABID = "4"; - protected Map getKeyMethodMap() - { - Map map = new HashMap(); - map.put(NoticeboardConstants.BUTTON_EDIT_ACTIVITY, "editActivity"); - map.put(NoticeboardConstants.BUTTON_INSTRUCTIONS, "instructions"); - map.put(NoticeboardConstants.BUTTON_STATISTICS, "statistics"); - map.put(NoticeboardConstants.BUTTON_SUMMARY, "summary"); - return map; - } - /** * If no method parameter, or an unknown key, it will * Setup the monitoring environment, and places values in the - * formbean in session scope. + * formbean in session scope and then go to the summary tab. */ public ActionForward unspecified( ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws NbApplicationException { - //return summary(mapping, form, request, response); NbMonitoringForm monitorForm = new NbMonitoringForm(); - - INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext()); NbWebUtil.cleanMonitoringSession(request); Long toolContentId = NbWebUtil.convertToLong(request.getParameter(NoticeboardConstants.TOOL_CONTENT_ID)); @@ -113,21 +105,9 @@ throw new NbApplicationException(error); } monitorForm.setToolContentID(toolContentId.toString()); - - // request.getSession().setAttribute(NoticeboardConstants.TOOL_CONTENT_ID_INMONITORMODE, toolContentId); - - NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId); - if (content == null) - { - String error = "Unable to continue. Data is missing from the database. Tool content id " + toolContentId + " does not exist"; - logger.error(error); - throw new NbApplicationException(error); - } - NbWebUtil.copyValuesIntoSession(request, content); - request.getSession().setAttribute(FORM, monitorForm); - - return mapping.findForward(NoticeboardConstants.MONITOR_PAGE); + return summary(mapping, form, request, response); + } /** @@ -158,7 +138,7 @@ request.setAttribute(NoticeboardConstants.PAGE_EDITABLE, "true"); //set up the request parameters to append to the URL - Map map = new HashMap(); + Map map = new HashMap(); map.put(NoticeboardConstants.TOOL_CONTENT_ID, monitorForm.getToolContentID()); map.put(NoticeboardConstants.DEFINE_LATER, "true"); @@ -171,6 +151,8 @@ request.setAttribute(NoticeboardConstants.PAGE_EDITABLE, "false"); } + // send it to the third tab. + monitorForm.setCurrentTab(EDITACTIVITY_TABID); return mapping.findForward(NoticeboardConstants.MONITOR_PAGE); } @@ -204,7 +186,9 @@ List attachmentList = NbWebUtil.setupAttachmentList(nbService, content); NbWebUtil.addUploadsToSession(request, attachmentList, null); - return mapping.findForward(NoticeboardConstants.MONITOR_PAGE); + // send it to the second tab. + monitorForm.setCurrentTab(INSTRUCTIONS_TABID); + return mapping.findForward(NoticeboardConstants.MONITOR_PAGE); } /** @@ -219,14 +203,15 @@ * @return */ public ActionForward summary(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { - // Long toolContentId = (Long)request.getSession().getAttribute(NoticeboardConstants.TOOL_CONTENT_ID_INMONITORMODE); - // Long toolContentId = getToolContentId(request); - INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext()); + + INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext()); NbMonitoringForm monitorForm = (NbMonitoringForm)form; Long toolContentId = NbWebUtil.convertToLong(monitorForm.getToolContentID()); NoticeboardContent content = nbService.retrieveNoticeboard(toolContentId); NbWebUtil.copyValuesIntoSession(request, content); - + + // send it to the first tab. + monitorForm.setCurrentTab(SUMMARY_TABID); return mapping.findForward(NoticeboardConstants.MONITOR_PAGE); } @@ -269,6 +254,8 @@ } request.setAttribute(NoticeboardConstants.GROUP_STATS_MAP, map); + // send it to the fourth tab. + monitorForm.setCurrentTab(STATISTICS_TABID); return mapping.findForward(NoticeboardConstants.MONITOR_PAGE); } Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java =================================================================== diff -u -rd789031b1ec349fa6315006cff40f1abc607b932 -r992d0d544a920da849e7d1a6b3f2006f816f7d86 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java (.../NbMonitoringForm.java) (revision d789031b1ec349fa6315006cff40f1abc607b932) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbMonitoringForm.java (.../NbMonitoringForm.java) (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -64,7 +64,9 @@ private Map parametersToAppend; - /** + private String currentTab; + + /** * @return Returns the parametersToAppend. */ public Map getParametersToAppend() { @@ -107,5 +109,11 @@ this.parametersToAppend = null; } + public String getCurrentTab() { + return currentTab; + } + public void setCurrentTab(String currentTab) { + this.currentTab = currentTab; + } } Index: lams_tool_nb/web/WEB-INF/lams.tld =================================================================== diff -u -r749b386f349f92cfb0e18cae1da953cc82fb8db0 -r992d0d544a920da849e7d1a6b3f2006f816f7d86 --- lams_tool_nb/web/WEB-INF/lams.tld (.../lams.tld) (revision 749b386f349f92cfb0e18cae1da953cc82fb8db0) +++ lams_tool_nb/web/WEB-INF/lams.tld (.../lams.tld) (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -1,53 +1,278 @@ - - + - 1.0 - 1.1 - lams + 1.0 + lams - + LAMSTags + + Output the Server URL as defined in the lams.xml configuration file. + LAMS URL + + LAMSURL - org.lamsfoundation.lams.web.tag.LAMSURLTag - + org.lamsfoundation.lams.web.tag.LAMSURLTag + empty + Output details from the shared session UserDTO object + user details + + user - org.lamsfoundation.lams.web.tag.UserTag - + org.lamsfoundation.lams.web.tag.UserTag + empty + Output details from the shared session UserDTO object property true - true + true + - css - org.lamsfoundation.lams.web.tag.CssTag - - - - localLink - false - + Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/ + Base URL for the current web app + + + WebAppURL + org.lamsfoundation.lams.web.tag.WebAppURLTag + empty - WebAppURL - org.lamsfoundation.lams.web.tag.WebAppURLTag - + Output stylesheet based on the user preferences. + User's chosen stylesheet + + + css + org.lamsfoundation.lams.web.tag.CssTag + empty + + Output stylesheet based on the user preferences. + localLink + false + + true + + + + + STRUTS-textarea + org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag + empty + + accesskey + false + true + + + alt + false + true + + + altKey + false + true + + + bundle + false + true + + + cols + false + true + + + disabled + false + true + + + errorKey + false + true + + + errorStyle + false + true + + + errorStyleClass + false + true + + + errorStyleId + false + true + + + indexed + false + true + + + name + false + true + + + onblur + false + true + + + onchange + false + true + + + onclick + false + true + + + ondblclick + false + true + + + onfocus + false + true + + + onkeydown + false + true + + + onkeypress + false + true + + + onkeyup + false + true + + + onmousedown + false + true + + + onmousemove + false + true + + + onmouseout + false + true + + + onmouseover + false + true + + + onmouseup + false + true + + + property + true + true + + + readonly + false + true + + + rows + false + true + + + style + false + true + + + styleClass + false + true + + + styleId + false + true + + + tabindex + false + true + + + title + false + true + + + titleKey + false + true + + + value + false + true + + + + Tab + /WEB-INF/tags/Tab.tag + + + Tabs + /WEB-INF/tags/Tabs.tag + + + TabBody + /WEB-INF/tags/TabBody.tag + + + HTMLEditor + /WEB-INF/tags/HTMLEditor.tag + + + SetEditor + /WEB-INF/tags/SetEditor.tag + + Index: lams_tool_nb/web/WEB-INF/struts-config.xml =================================================================== diff -u -r1c31dbd6b844bffd77d86babab9592e8267cc462 -r992d0d544a920da849e7d1a6b3f2006f816f7d86 --- lams_tool_nb/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 1c31dbd6b844bffd77d86babab9592e8267cc462) +++ lams_tool_nb/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -103,7 +103,7 @@ /> Index: lams_tool_nb/web/WEB-INF/tags/HTMLEditor.tag =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/tags/HTMLEditor.tag (revision 0) +++ lams_tool_nb/web/WEB-INF/tags/HTMLEditor.tag (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -0,0 +1,58 @@ +<% +/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * HTMLEditor.tag + * Author: Mitchell Seaton + * Description: Creates a single instance of FCK Editor used over multiple fields. + * Wiki: + */ + + %> +<%@ tag body-content="empty" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-bean" prefix="bean" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + Index: lams_tool_nb/web/WEB-INF/tags/SetEditor.tag =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/tags/SetEditor.tag (revision 0) +++ lams_tool_nb/web/WEB-INF/tags/SetEditor.tag (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -0,0 +1,64 @@ +<% +/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * SetEditor.tag + * Author: Mitchell Seaton + * Description: Creates a dynamic textarea field using a HTML Editor. + * Wiki: + */ + + %> +<%@ tag body-content="empty" %> +<%@ attribute name="id" required="true" rtexprvalue="true" %> +<%@ attribute name="text" required="true" rtexprvalue="true" %> +<%@ attribute name="small" required="false" rtexprvalue="true" %> +<%@ taglib uri="tags-function" prefix="fn" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: lams_tool_nb/web/WEB-INF/tags/Tab.tag =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/tags/Tab.tag (revision 0) +++ lams_tool_nb/web/WEB-INF/tags/Tab.tag (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -0,0 +1,79 @@ +<% +/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * Tab.tag + * Author: Mitchell Seaton + * Description: Creates a tab element. + * Wiki: + */ + + %> +<%@ tag body-content="empty" %> +<%@ attribute name="id" required="true" rtexprvalue="true" %> +<%@ attribute name="value" required="false" rtexprvalue="true" %> +<%@ attribute name="key" required="false" rtexprvalue="true" %> +<%@ attribute name="inactive" required="false" rtexprvalue="true" %> +<%@ attribute name="methodCall" required="false" rtexprvalue="true" %> + +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-bean" prefix="bean" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + + + +<% // Usually methodCall is selectTab, but the calling code can override methodCall if desired. + // this is handy if the page needs different logic on initialisation and user switching tabs %> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${tabTitle}
+ \ No newline at end of file Index: lams_tool_nb/web/WEB-INF/tags/TabBody.tag =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/tags/TabBody.tag (revision 0) +++ lams_tool_nb/web/WEB-INF/tags/TabBody.tag (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -0,0 +1,62 @@ +<% +/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * TabBody.tag + * Author: Mitchell Seaton + * Description: Creates the body container for a tab element + * Wiki: + */ + + %> +<%@ tag body-content="scriptless" %> +<%@ attribute name="id" required="true" rtexprvalue="true" %> +<%@ attribute name="tabTitle" required="false" rtexprvalue="true" %> +<%@ attribute name="titleKey" required="false" rtexprvalue="true" %> +<%@ attribute name="page" required="false" rtexprvalue="true" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-bean" prefix="bean" %> + + +
+ +

+
+ +

+
+ +
+ + + + + + + + +
+ +
+ \ No newline at end of file Index: lams_tool_nb/web/WEB-INF/tags/Tabs.tag =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/tags/Tabs.tag (revision 0) +++ lams_tool_nb/web/WEB-INF/tags/Tabs.tag (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -0,0 +1,72 @@ +<% +/**************************************************************** + * 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 + * **************************************************************** + */ + + /** + * Tabs.tag + * Author: Mitchell Seaton + * Description: Create a tab list from a input collection or nested Tab tags. + * Wiki: + */ + + %> +<%@ tag body-content="scriptless" %> +<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true" %> +<%@ attribute name="control" required="false" rtexprvalue="true" %> +<%@ attribute name="useKey" required="false" rtexprvalue="true" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file Index: lams_tool_nb/web/WEB-INF/tiles/tiles-defs.xml =================================================================== diff -u -rf99a77da03ace5681ac080f10bc8c4e1ccbc8516 -r992d0d544a920da849e7d1a6b3f2006f816f7d86 --- lams_tool_nb/web/WEB-INF/tiles/tiles-defs.xml (.../tiles-defs.xml) (revision f99a77da03ace5681ac080f10bc8c4e1ccbc8516) +++ lams_tool_nb/web/WEB-INF/tiles/tiles-defs.xml (.../tiles-defs.xml) (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -31,15 +31,6 @@ - - - - - - - - - Fisheye: Tag 992d0d544a920da849e7d1a6b3f2006f816f7d86 refers to a dead (removed) revision in file `lams_tool_nb/web/author_page.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/authoring/authoring.jsp =================================================================== diff -u --- lams_tool_nb/web/authoring/authoring.jsp (revision 0) +++ lams_tool_nb/web/authoring/authoring.jsp (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -0,0 +1,111 @@ +<%@ taglib uri="tags-html" prefix="html" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-bean" prefix="bean" %> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ page import="java.util.HashSet" %> +<%@ page import="java.util.Set" %> + + + + + + + + + <fmt:message key="tool.display.name" /> + + + + + + + + + + + + + + + + + + +

+ +<%@ include file="../errorbox.jsp" %> + +<% // in define later mode we only show the basic content, so no point showing the tabs. %> + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + +
+

+ + +

+
+ +
+ +
Index: lams_tool_nb/web/authoring/basic.jsp =================================================================== diff -u --- lams_tool_nb/web/authoring/basic.jsp (revision 0) +++ lams_tool_nb/web/authoring/basic.jsp (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -0,0 +1,34 @@ +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-fck-editor" prefix="FCK" %> + + + + + + +
+ + + + + + + + + +
+ + + + +
+ + + +
+
Index: lams_tool_nb/web/authoring/instructions.jsp =================================================================== diff -u --- lams_tool_nb/web/authoring/instructions.jsp (revision 0) +++ lams_tool_nb/web/authoring/instructions.jsp (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -0,0 +1,124 @@ +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-html" prefix="html" %> +<%@ taglib uri="tags-bean" prefix="bean" %> +<%@ taglib uri="tags-logic" prefix="logic" %> + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + + +
+ + + +
+ + + +
+
+ + + + + +

+
+ + + + +
+ + + + + + + + /download/?uuid=&preferDownload=false + /download/?uuid=&preferDownload=true + + + + + + + + + +
 
+ + + + + + + + + + + + + + + +
+ '/>")' class="button"> + + + + + + + + + + +
+
+
+
+ +
+
+ Fisheye: Tag 992d0d544a920da849e7d1a6b3f2006f816f7d86 refers to a dead (removed) revision in file `lams_tool_nb/web/m_EditActivity.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 992d0d544a920da849e7d1a6b3f2006f816f7d86 refers to a dead (removed) revision in file `lams_tool_nb/web/m_Instructions.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 992d0d544a920da849e7d1a6b3f2006f816f7d86 refers to a dead (removed) revision in file `lams_tool_nb/web/m_Statistics.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 992d0d544a920da849e7d1a6b3f2006f816f7d86 refers to a dead (removed) revision in file `lams_tool_nb/web/m_Summary.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 992d0d544a920da849e7d1a6b3f2006f816f7d86 refers to a dead (removed) revision in file `lams_tool_nb/web/monitor_page.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/monitoring/m_EditActivity.jsp =================================================================== diff -u --- lams_tool_nb/web/monitoring/m_EditActivity.jsp (revision 0) +++ lams_tool_nb/web/monitoring/m_EditActivity.jsp (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -0,0 +1,53 @@ +<%@ taglib uri="tags-html" prefix="html" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-core" prefix="c" %> + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ +
  
+ +
+
+ +
+ + + + + + +
+ + + + +
+
+ Index: lams_tool_nb/web/monitoring/m_Instructions.jsp =================================================================== diff -u --- lams_tool_nb/web/monitoring/m_Instructions.jsp (revision 0) +++ lams_tool_nb/web/monitoring/m_Instructions.jsp (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -0,0 +1,86 @@ +<%@ taglib uri="tags-html" prefix="html" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-bean" prefix="bean" %> +<%@ taglib uri="tags-logic" prefix="logic" %> + +
+ + + + + + + + + + + + + + +
  
+
+ + + + +
+
+ + + + + + + +
+ + + + + + + + /download/?uuid=&preferDownload=false + /download/?uuid=&preferDownload=true + + + + + + + + + +
 
+ + + + + + + + + + + + + + + +
+ '/>")' class="button"> + + + + + + +
+
+
+
+ +
+
Index: lams_tool_nb/web/monitoring/m_Statistics.jsp =================================================================== diff -u --- lams_tool_nb/web/monitoring/m_Statistics.jsp (revision 0) +++ lams_tool_nb/web/monitoring/m_Statistics.jsp (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -0,0 +1,29 @@ +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-core" prefix="c" %> + + + + + + + + + + + + + + + + +
+ + + +    + + + +
 
+    +
Index: lams_tool_nb/web/monitoring/m_Summary.jsp =================================================================== diff -u --- lams_tool_nb/web/monitoring/m_Summary.jsp (revision 0) +++ lams_tool_nb/web/monitoring/m_Summary.jsp (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -0,0 +1,21 @@ +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-core" prefix="c" %> + + + + + + + + + + + + + + +
+ +
  
+ +
Index: lams_tool_nb/web/monitoring/monitoring.jsp =================================================================== diff -u --- lams_tool_nb/web/monitoring/monitoring.jsp (revision 0) +++ lams_tool_nb/web/monitoring/monitoring.jsp (revision 992d0d544a920da849e7d1a6b3f2006f816f7d86) @@ -0,0 +1,132 @@ +<%@ taglib uri="tags-html" prefix="html" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ page import="java.util.HashMap" %> +<%@ page import="org.lamsfoundation.lams.tool.noticeboard.web.NbMonitoringAction" %> + + + + + + + + +<fmt:message key="tool.display.name"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+

+ + + +

+
+ +
+ + + + +
+ Fisheye: Tag 992d0d544a920da849e7d1a6b3f2006f816f7d86 refers to a dead (removed) revision in file `lams_tool_nb/web/monitoringContent.jsp'. Fisheye: No comparison available. Pass `N' to diff?