Index: lams_tool_vote/db/model/lams_tool_vote.clay =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/db/model/lams_tool_vote.clay,v diff -u -r1.10 -r1.11 --- lams_tool_vote/db/model/lams_tool_vote.clay 18 May 2006 17:52:11 -0000 1.10 +++ lams_tool_vote/db/model/lams_tool_vote.clay 14 Aug 2006 18:48:36 -0000 1.11 @@ -177,8 +177,8 @@ - + @@ -455,13 +455,13 @@ - + - + Index: lams_tool_vote/db/sql/create_lams_tool_vote.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/db/sql/create_lams_tool_vote.sql,v diff -u -r1.13 -r1.14 --- lams_tool_vote/db/sql/create_lams_tool_vote.sql 25 Jun 2006 15:50:06 -0000 1.13 +++ lams_tool_vote/db/sql/create_lams_tool_vote.sql 14 Aug 2006 18:48:35 -0000 1.14 @@ -1,8 +1,8 @@ CREATE TABLE tl_lavote11_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT , content_id BIGINT(20) NOT NULL - , title TEXT NOT NULL - , instructions TEXT NOT NULL + , title TEXT + , instructions TEXT , creation_date DATETIME , update_date DATETIME , maxNominationCount VARCHAR(20) NOT NULL DEFAULT '1' Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/Attic/VoteUtils.java,v diff -u -r1.15 -r1.16 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java 14 Aug 2006 00:07:20 -0000 1.15 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java 14 Aug 2006 18:48:36 -0000 1.16 @@ -190,8 +190,10 @@ //voteAuthoringForm.setTitle(defaultVoteContent.getTitle()); //voteAuthoringForm.setInstructions(defaultVoteContent.getInstructions()); + + voteGeneralAuthoringDTO.setActivityTitle(defaultVoteContent.getTitle()); + voteGeneralAuthoringDTO.setActivityInstructions(defaultVoteContent.getInstructions()); - voteAuthoringForm.setAllowText(defaultVoteContent.isAllowText()?ON:OFF); voteAuthoringForm.setAllowTextEntry(defaultVoteContent.isAllowText()?ON:OFF); voteAuthoringForm.setVoteChangable(defaultVoteContent.isVoteChangable()?ON:OFF); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java,v diff -u -r1.28 -r1.29 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java 14 Aug 2006 00:07:20 -0000 1.28 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java 14 Aug 2006 18:48:35 -0000 1.29 @@ -23,6 +23,7 @@ package org.lamsfoundation.lams.tool.vote.web; import java.io.IOException; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.TreeMap; @@ -48,6 +49,7 @@ import org.lamsfoundation.lams.tool.vote.VoteGeneralAuthoringDTO; import org.lamsfoundation.lams.tool.vote.VoteUtils; import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; +import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent; import org.lamsfoundation.lams.tool.vote.service.IVoteService; import org.lamsfoundation.lams.tool.vote.service.VoteServiceProxy; import org.lamsfoundation.lams.web.action.LamsDispatchAction; @@ -158,8 +160,8 @@ { VoteUtils.cleanUpUserExceptions(request); VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form; - repopulateRequestParameters(request, voteAuthoringForm); VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); + repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); VoteUtils.saveRichText(request, voteGeneralAuthoringDTO); voteAuthoringForm.resetUserAction(); return null; @@ -179,7 +181,7 @@ VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); - repopulateRequestParameters(request, voteAuthoringForm); + repopulateRequestParameters(request, voteAuthoringForm,voteGeneralAuthoringDTO); String httpSessionID=voteAuthoringForm.getHttpSessionID(); logger.debug("httpSessionID: " + httpSessionID); @@ -292,7 +294,7 @@ VoteGeneralAuthoringDTO voteGeneralAuthoringDTO= new VoteGeneralAuthoringDTO(); - repopulateRequestParameters(request, voteAuthoringForm); + repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); String httpSessionID=voteAuthoringForm.getHttpSessionID(); logger.debug("httpSessionID: " + httpSessionID); @@ -402,7 +404,7 @@ VoteGeneralAuthoringDTO voteGeneralAuthoringDTO= new VoteGeneralAuthoringDTO(); - repopulateRequestParameters(request, voteAuthoringForm); + repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); String httpSessionID=voteAuthoringForm.getHttpSessionID(); logger.debug("httpSessionID: " + httpSessionID); @@ -442,8 +444,8 @@ VoteUtils.saveRichText(request, voteGeneralAuthoringDTO); ActionMessages errors= new ActionMessages(); - errors=validateSubmit(request, errors, voteAuthoringForm); - + //errors=validateSubmit(request, errors, voteAuthoringForm); + /* if (errors.size() > 0) { logger.debug("returning back to from to fix errors:"); @@ -452,6 +454,7 @@ voteGeneralAuthoringDTO.setValidationError(new Boolean(true).toString()); return false; } + */ List attachmentList=(List)sessionMap.get(ATTACHMENT_LIST_KEY); logger.debug("attachmentList :" +attachmentList); @@ -574,6 +577,9 @@ logger.debug("listOfflineFilesMetaData:" + listOfflineFilesMetaData); voteGeneralAuthoringDTO.setListOfflineFilesMetadata(listOfflineFilesMetaData); + voteAuthoringForm.setDefineLaterInEditMode(new Boolean(false).toString()); + voteGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(false).toString()); + logger.debug("voteGeneralAuthoringDTO: " + voteGeneralAuthoringDTO); request.setAttribute(VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO); @@ -594,7 +600,8 @@ VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form; logger.debug("voteAuthoringForm :" +voteAuthoringForm); - repopulateRequestParameters(request, voteAuthoringForm); + VoteGeneralAuthoringDTO voteGeneralAuthoringDTO=new VoteGeneralAuthoringDTO(); + repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); /* determine whether the request is from Monitoring url Edit Activity*/ String sourceVoteStarter = (String) request.getAttribute(SOURCE_VOTE_STARTER); @@ -635,7 +642,7 @@ logger.debug("voteAuthoringForm :" +voteAuthoringForm); VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); - repopulateRequestParameters(request, voteAuthoringForm); + repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); String httpSessionID=voteAuthoringForm.getHttpSessionID(); logger.debug("httpSessionID: " + httpSessionID); @@ -784,7 +791,7 @@ logger.debug("voteAuthoringForm :" +voteAuthoringForm); VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); - repopulateRequestParameters(request, voteAuthoringForm); + repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); String httpSessionID=voteAuthoringForm.getHttpSessionID(); logger.debug("httpSessionID: " + httpSessionID); @@ -975,7 +982,7 @@ logger.debug("voteAuthoringForm :" +voteAuthoringForm); VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); - repopulateRequestParameters(request, voteAuthoringForm); + repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); String httpSessionID=voteAuthoringForm.getHttpSessionID(); logger.debug("httpSessionID: " + httpSessionID); @@ -1087,7 +1094,7 @@ logger.debug("voteAuthoringForm :" +voteAuthoringForm); VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); - repopulateRequestParameters(request, voteAuthoringForm); + repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); String httpSessionID=voteAuthoringForm.getHttpSessionID(); logger.debug("httpSessionID: " + httpSessionID); @@ -1199,7 +1206,7 @@ logger.debug("voteAuthoringForm :" +voteAuthoringForm); VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); - repopulateRequestParameters(request, voteAuthoringForm); + repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); String httpSessionID=voteAuthoringForm.getHttpSessionID(); logger.debug("httpSessionID: " + httpSessionID); @@ -1288,7 +1295,7 @@ logger.debug("voteAuthoringForm :" +voteAuthoringForm); VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); - repopulateRequestParameters(request, voteAuthoringForm); + repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); String httpSessionID=voteAuthoringForm.getHttpSessionID(); logger.debug("httpSessionID: " + httpSessionID); @@ -1377,27 +1384,8 @@ logger.debug("voteAuthoringForm :" +voteAuthoringForm); VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); - repopulateRequestParameters(request, voteAuthoringForm); - - String httpSessionID=voteAuthoringForm.getHttpSessionID(); - logger.debug("httpSessionID: " + httpSessionID); - - SessionMap sessionMap=(SessionMap)request.getSession().getAttribute(httpSessionID); - logger.debug("sessionMap: " + sessionMap); - - Map mapOptionsContent=(Map)sessionMap.get(MAP_OPTIONS_CONTENT_KEY); - logger.debug("mapOptionsContent: " + mapOptionsContent); - voteGeneralAuthoringDTO.setMapOptionsContent(mapOptionsContent); - - int maxIndex=mapOptionsContent.size(); - logger.debug("maxIndex: " + maxIndex); - voteGeneralAuthoringDTO.setMaxOptionIndex(maxIndex); - - String firstEntry=(String)mapOptionsContent.get("1"); - logger.debug("firstEntry: " + firstEntry); - voteGeneralAuthoringDTO.setDefaultOptionContent(firstEntry); + repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); - voteAuthoringForm.setSubmissionAttempt(new Boolean(false).toString()); voteGeneralAuthoringDTO.setSubmissionAttempt(new Boolean(false).toString()); @@ -1408,14 +1396,52 @@ String destination=VoteUtils.getDestination(sourceVoteStarter); logger.debug("destination: " + destination); + voteAuthoringForm.setDefineLaterInEditMode(new Boolean(true).toString()); voteGeneralAuthoringDTO.setDefineLaterInEditMode(new Boolean(true).toString()); String toolContentID=voteAuthoringForm.getToolContentID(); logger.debug("toolContentID: " + toolContentID); VoteContent voteContent=voteService.retrieveVote(new Long(toolContentID)); logger.debug("existing voteContent:" + voteContent); - + + VoteUtils.readContentValues(request, voteContent, voteAuthoringForm, voteGeneralAuthoringDTO); + logger.debug("form title is: : " + voteAuthoringForm.getTitle()); + + /* + * get the nominations + */ + Map mapOptionsContent= new TreeMap(new VoteComparator()); + logger.debug("setting existing content data from the db"); + Iterator queIterator=voteContent.getVoteQueContents().iterator(); + Long mapIndex=new Long(1); + logger.debug("mapOptionsContent: " + mapOptionsContent); + while (queIterator.hasNext()) + { + VoteQueContent voteQueContent=(VoteQueContent) queIterator.next(); + logger.debug("voteQueContent : " + voteQueContent); + if (voteQueContent != null) + { + logger.debug("question: " + voteQueContent.getQuestion()); + mapOptionsContent.put(mapIndex.toString(),voteQueContent.getQuestion()); + /** + * make the first entry the default(first) one for jsp + */ + if (mapIndex.longValue() == 1) + { + voteGeneralAuthoringDTO.setDefaultOptionContent(voteQueContent.getQuestion()); + } + + mapIndex=new Long(mapIndex.longValue()+1); + } + } + logger.debug("Map initialized with existing contentid to: " + mapOptionsContent); + voteGeneralAuthoringDTO.setMapOptionsContent(mapOptionsContent); + + int maxIndex=mapOptionsContent.size(); + logger.debug("maxIndex: " + maxIndex); + voteGeneralAuthoringDTO.setMaxOptionIndex(maxIndex); + boolean isContentInUse=VoteUtils.isContentInUse(voteContent); logger.debug("isContentInUse:" + isContentInUse); @@ -1438,46 +1464,56 @@ return mapping.findForward(destination); } - - protected void repopulateRequestParameters(HttpServletRequest request, VoteAuthoringForm voteAuthoringForm) + + protected void repopulateRequestParameters(HttpServletRequest request, VoteAuthoringForm voteAuthoringForm, + VoteGeneralAuthoringDTO voteGeneralAuthoringDTO) { logger.debug("starting repopulateRequestParameters"); String toolContentID=request.getParameter(TOOL_CONTENT_ID); logger.debug("toolContentID: " + toolContentID); voteAuthoringForm.setToolContentID(toolContentID); + voteGeneralAuthoringDTO.setToolContentID(toolContentID); String activeModule=request.getParameter(ACTIVE_MODULE); logger.debug("activeModule: " + activeModule); voteAuthoringForm.setActiveModule(activeModule); + voteGeneralAuthoringDTO.setActiveModule(activeModule); String httpSessionID=request.getParameter(HTTP_SESSION_ID); logger.debug("httpSessionID: " + httpSessionID); voteAuthoringForm.setHttpSessionID(httpSessionID); + voteGeneralAuthoringDTO.setHttpSessionID(httpSessionID); String defaultContentIdStr=request.getParameter(DEFAULT_CONTENT_ID_STR); logger.debug("defaultContentIdStr: " + defaultContentIdStr); voteAuthoringForm.setDefaultContentIdStr(defaultContentIdStr); + voteGeneralAuthoringDTO.setDefaultContentIdStr(defaultContentIdStr); String defineLaterInEditMode=request.getParameter(DEFINE_LATER_IN_EDIT_MODE); logger.debug("defineLaterInEditMode: " + defineLaterInEditMode); voteAuthoringForm.setDefineLaterInEditMode(defineLaterInEditMode); + voteGeneralAuthoringDTO.setDefineLaterInEditMode(defineLaterInEditMode); String voteChangable=request.getParameter(VOTE_CHANGABLE); logger.debug("voteChangable: " + voteChangable); voteAuthoringForm.setVoteChangable(voteChangable); + voteGeneralAuthoringDTO.setVoteChangable(voteChangable); String lockOnFinish=request.getParameter(LOCK_ON_FINISH); logger.debug("lockOnFinish: " + lockOnFinish); voteAuthoringForm.setLockOnFinish(lockOnFinish); + voteGeneralAuthoringDTO.setLockOnFinish(lockOnFinish); String allowText=request.getParameter(ALLOW_TEXT); logger.debug("allowText: " + allowText); voteAuthoringForm.setAllowText(allowText); + voteGeneralAuthoringDTO.setAllowText(allowText); String maxNominationCount=request.getParameter(MAX_NOMINATION_COUNT); logger.debug("maxNominationCount: " + maxNominationCount); voteAuthoringForm.setMaxNominationCount(maxNominationCount); + voteGeneralAuthoringDTO.setMaxNominationCount(maxNominationCount); } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/Attic/VoteAuthoringForm.java,v diff -u -r1.12 -r1.13 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java 14 Aug 2006 00:07:20 -0000 1.12 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAuthoringForm.java 14 Aug 2006 18:48:35 -0000 1.13 @@ -25,6 +25,7 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.tool.vote.VoteAppConstants; +import org.lamsfoundation.lams.tool.vote.service.IVoteService; /** *

ActionForm for the Authoring environment

@@ -110,6 +111,7 @@ protected String submissionAttempt; protected String defaultOptionContent; protected String httpSessionID; + protected IVoteService voteService; public void resetUserAction() { @@ -845,6 +847,19 @@ } /** + * @return Returns the voteService. + */ + public IVoteService getVoteService() { + return voteService; + } + /** + * @param voteService The voteService to set. + */ + public void setVoteService(IVoteService voteService) { + this.voteService = voteService; + } + + /** * @return Returns the httpSessionID. */ public String getHttpSessionID() { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteDLStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/Attic/VoteDLStarterAction.java,v diff -u -r1.4 -r1.5 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteDLStarterAction.java 23 May 2006 12:48:52 -0000 1.4 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteDLStarterAction.java 14 Aug 2006 18:48:35 -0000 1.5 @@ -56,10 +56,14 @@ VoteUtils.cleanUpSessionAbsolute(request); logger.debug("init defineLater mode. removed attributes..."); + VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form; + IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext()); - request.getSession().setAttribute(TOOL_SERVICE, voteService); + logger.debug("voteService: " + voteService); + //request.getSession().setAttribute(TOOL_SERVICE, voteService); + voteAuthoringForm.setVoteService(voteService); - VoteStarterAction voteStarterAction= new VoteStarterAction(); - return voteStarterAction.executeDefineLater(mapping, form, request, response, voteService); + VoteStarterAction voteStarterAction= new VoteStarterAction(); + return voteStarterAction.executeDefineLater(mapping, voteAuthoringForm, request, response); } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java,v diff -u -r1.23 -r1.24 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java 14 Aug 2006 00:07:20 -0000 1.23 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteStarterAction.java 14 Aug 2006 18:48:35 -0000 1.24 @@ -172,9 +172,15 @@ VoteAuthoringForm voteAuthoringForm = (VoteAuthoringForm) form; VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); - IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext()); - logger.debug("voteService: " + voteService); + logger.debug("getting voteService now: servlet is: " + getServlet()); + IVoteService voteService=null; + if (getServlet() != null) + voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext()); + else + voteService=voteAuthoringForm.getVoteService(); + logger.debug("final voteService: " + voteService); + voteAuthoringForm.setSubmissionAttempt(new Boolean(false).toString()); voteAuthoringForm.setSbmtSuccess(new Boolean(false).toString()); @@ -487,15 +493,22 @@ if (voteContent.getTitle() == null) { voteGeneralAuthoringDTO.setActivityTitle("Voting Title"); - voteGeneralAuthoringDTO.setActivityInstructions("Voting Instructions"); } else { voteGeneralAuthoringDTO.setActivityTitle(voteContent.getTitle()); - voteGeneralAuthoringDTO.setActivityInstructions(voteContent.getInstructions()); } + if (voteContent.getInstructions() == null) + { + voteGeneralAuthoringDTO.setActivityInstructions("Voting Instructions"); + } + else + { + voteGeneralAuthoringDTO.setActivityInstructions(voteContent.getInstructions()); + } + /* * get the nominations */ @@ -585,12 +598,11 @@ voteAuthoringForm.resetUserAction(); } - public ActionForward executeDefineLater(ActionMapping mapping, ActionForm form, - HttpServletRequest request, HttpServletResponse response, IVoteService voteService) + public ActionForward executeDefineLater(ActionMapping mapping, VoteAuthoringForm voteAuthoringForm, + HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException, VoteApplicationException { - logger.debug("passed voteService: " + voteService); - logger.debug("calling execute..."); - return execute(mapping, form, request, response); + logger.debug("calling execute..." + voteAuthoringForm); + return execute(mapping, voteAuthoringForm, request, response); } Index: lams_tool_vote/web/authoring/AdvancedContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/AdvancedContent.jsp,v diff -u -r1.8 -r1.9 --- lams_tool_vote/web/authoring/AdvancedContent.jsp 2 Jul 2006 13:40:21 -0000 1.8 +++ lams_tool_vote/web/authoring/AdvancedContent.jsp 14 Aug 2006 18:48:35 -0000 1.9 @@ -32,7 +32,7 @@ - +
: Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/AuthoringMaincontent.jsp,v diff -u -r1.20 -r1.21 --- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp 14 Aug 2006 00:07:20 -0000 1.20 +++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp 14 Aug 2006 18:48:35 -0000 1.21 @@ -168,18 +168,11 @@ - - - - - - - Index: lams_tool_vote/web/authoring/BasicContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/BasicContent.jsp,v diff -u -r1.25 -r1.26 --- lams_tool_vote/web/authoring/BasicContent.jsp 14 Aug 2006 00:07:20 -0000 1.25 +++ lams_tool_vote/web/authoring/BasicContent.jsp 14 Aug 2006 18:48:35 -0000 1.26 @@ -34,7 +34,7 @@

- +
@@ -62,31 +62,32 @@
- - - - - - - - +
- -
- -
- -
+
+ + + + + + + + + - - @@ -99,7 +100,7 @@ - -
+ +
+ +
+ + images/down.gif" align=left onclick="javascript:submitModifyNomination('1','moveNominationDown');">
+ + images/up.gif" align=left onclick="javascript:submitModifyNomination('','moveNominationUp');"> Index: lams_tool_vote/web/authoring/BasicContentViewOnly.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/Attic/BasicContentViewOnly.jsp,v diff -u -r1.7 -r1.8 --- lams_tool_vote/web/authoring/BasicContentViewOnly.jsp 3 Jul 2006 01:38:09 -0000 1.7 +++ lams_tool_vote/web/authoring/BasicContentViewOnly.jsp 14 Aug 2006 18:48:35 -0000 1.8 @@ -29,34 +29,33 @@ <%@ taglib uri="tags-lams" prefix="lams" %>
- +
- - + - - + - + - - + + - + @@ -66,7 +65,6 @@ - Index: lams_tool_vote/web/authoring/InstructionsContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/Attic/InstructionsContent.jsp,v diff -u -r1.8 -r1.9 --- lams_tool_vote/web/authoring/InstructionsContent.jsp 14 Aug 2006 00:07:20 -0000 1.8 +++ lams_tool_vote/web/authoring/InstructionsContent.jsp 14 Aug 2006 18:48:35 -0000 1.9 @@ -32,7 +32,7 @@ -
: - + +
: - - + +
: - +
:
+
Index: lams_tool_vote/web/learning/ExitLearning.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/ExitLearning.jsp,v diff -u -r1.9 -r1.10 --- lams_tool_vote/web/learning/ExitLearning.jsp 12 Aug 2006 17:50:34 -0000 1.9 +++ lams_tool_vote/web/learning/ExitLearning.jsp 14 Aug 2006 18:48:35 -0000 1.10 @@ -98,14 +98,12 @@ -
Index: lams_tool_vote/web/learning/AllNominations.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v diff -u -r1.20 -r1.21 --- lams_tool_vote/web/learning/AllNominations.jsp 12 Aug 2006 21:40:48 -0000 1.20 +++ lams_tool_vote/web/learning/AllNominations.jsp 14 Aug 2006 18:48:35 -0000 1.21 @@ -218,14 +218,12 @@ - -
+
-
-
+
-