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.24 -r1.25 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java 25 May 2006 00:40:34 -0000 1.24 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java 1 Jun 2006 09:17:58 -0000 1.25 @@ -204,7 +204,10 @@ logger.debug("sourceVoteStarter: " + sourceVoteStarter); String destination=VoteUtils.getDestination(sourceVoteStarter); logger.debug("destination: " + destination); - + + Map mapOptionsContent=(Map)request.getSession().getAttribute(MAP_OPTIONS_CONTENT); + logger.debug("final mapOptionsContent: " + mapOptionsContent); + return (mapping.findForward(destination)); } @@ -276,6 +279,9 @@ String destination=VoteUtils.getDestination(sourceVoteStarter); logger.debug("destination: " + destination); + Map mapOptionsContent=(Map)request.getSession().getAttribute(MAP_OPTIONS_CONTENT); + logger.debug("final mapOptionsContent: " + mapOptionsContent); + return (mapping.findForward(destination)); } @@ -470,6 +476,10 @@ logger.debug("final duplicate status :" +request.getAttribute(USER_EXCEPTION_OPTIONS_DUPLICATE)); logger.debug("fwding to destination :" +destination); + Map mapOptionsContent=(Map)request.getSession().getAttribute(MAP_OPTIONS_CONTENT); + logger.debug("final mapOptionsContent: " + mapOptionsContent); + + request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG,Boolean.TRUE); return (mapping.findForward(destination)); } @@ -571,6 +581,9 @@ boolean isMoveNominationDown=isMoveNominationDown(mapping, form, request, response); logger.debug("isMoveNominationDown:" + isMoveNominationDown); + + Map mapOptionsContent=(Map)request.getSession().getAttribute(MAP_OPTIONS_CONTENT); + logger.debug("final mapOptionsContent: " + mapOptionsContent); return (mapping.findForward(destination)); } @@ -678,6 +691,9 @@ boolean isMoveNominationUp=isMoveNominationUp(mapping, form, request, response); logger.debug("isMoveNominationUp:" + isMoveNominationUp); + + Map mapOptionsContent=(Map)request.getSession().getAttribute(MAP_OPTIONS_CONTENT); + logger.debug("final mapOptionsContent: " + mapOptionsContent); return (mapping.findForward(destination)); } @@ -1015,7 +1031,10 @@ } VoteUtils.setDefineLater(request, true); - + + Map mapOptionsContent=(Map)request.getSession().getAttribute(MAP_OPTIONS_CONTENT); + logger.debug("final mapOptionsContent: " + mapOptionsContent); + logger.debug("forwarding to : " + destination); return mapping.findForward(destination); } Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/AuthoringMaincontent.jsp,v diff -u -r1.14 -r1.15 --- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp 23 May 2006 12:48:52 -0000 1.14 +++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp 1 Jun 2006 09:17:58 -0000 1.15 @@ -48,47 +48,27 @@ + <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> + - + <bean:message key="activity.title"/> - - + + - - + + - - - - @@ -198,8 +197,7 @@ - - + Index: lams_tool_vote/web/css/fckeditor_style.css =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/css/Attic/fckeditor_style.css,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_vote/web/css/fckeditor_style.css 1 Jun 2006 09:17:58 -0000 1.1 @@ -0,0 +1,55 @@ +.previewPanel{ + width: 700px; + height: 220px; + border-style: none; + border-width: 1px; + padding: 5px; + + overflow: auto; +} + +.textareaPanel{ + width: 700px; + height: 220px; +} + + +.smallPreviewPanel{ + width: 700px; + height: 120px; + border-style: none; + border-width: 1px; + padding: 5px; +} + +.smallTextareaPanel{ + width: 700px; + height: 120px; +} + +#wyswygEditor{ + /*position the wyswygEditor in the centre*/ + position: absolute; + /*top: 15%; + left: 50%; + margin-left: -400px; + margin-top: -260px;*/ + + width: 100%; + height: 100%; + + + /*border-style: solid; + border-width: 3px;*/ +} + +#wyswygEditorScreen{ + position: absolute; + + width: 700px; + height: 220px; + + padding: 0px; + margin: 0px; +} + Index: lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp 23 May 2006 12:48:53 -0000 1.6 +++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp 1 Jun 2006 09:17:58 -0000 1.7 @@ -43,22 +43,64 @@ - + + <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> + - + <bean:message key="label.monitoring"/> - - + + - - + + - - - - - @@ -185,7 +183,8 @@ - + +