Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java =================================================================== diff -u -r0f6c8333c4187ad33fafc3fc874525e091be8d21 -raf90794d49a9d2472e1028caeda057963a382c60 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java (.../VoteAction.java) (revision 0f6c8333c4187ad33fafc3fc874525e091be8d21) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java (.../VoteAction.java) (revision af90794d49a9d2472e1028caeda057963a382c60) @@ -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 =================================================================== diff -u -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 -raf90794d49a9d2472e1028caeda057963a382c60 --- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) +++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision af90794d49a9d2472e1028caeda057963a382c60) @@ -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 =================================================================== diff -u --- lams_tool_vote/web/css/fckeditor_style.css (revision 0) +++ lams_tool_vote/web/css/fckeditor_style.css (revision af90794d49a9d2472e1028caeda057963a382c60) @@ -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 =================================================================== diff -u -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 -raf90794d49a9d2472e1028caeda057963a382c60 --- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) +++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision af90794d49a9d2472e1028caeda057963a382c60) @@ -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 @@ - + +