Index: lams_tool_vote/conf/language/ApplicationResources.properties =================================================================== diff -u -rf8bbf66132df46ca9c64bab695ee457fd4d331d3 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision f8bbf66132df46ca9c64bab695ee457fd4d331d3) +++ lams_tool_vote/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -137,6 +137,9 @@ authoring.msg.cancel.save =Do you want to close this window without saving? button.try.again =Try again label.group =Group +label.tip.displayPieChart = Displays pie chart of votes +label.tip.displayBarChart = Displays bar chart of votes +label.refresh = Refresh #======= End labels: Exported 131 labels for en AU ===== Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java =================================================================== diff -u -r369b6c2ca857c6b74ee143e081534f50b0b94106 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision 369b6c2ca857c6b74ee143e081534f50b0b94106) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java (.../VoteLearningAction.java) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -369,7 +369,7 @@ return (mapping.findForward(VIEW_ANSWERS)); } - + public ActionForward redoQuestionsOk(ActionMapping mapping, ActionForm form, HttpServletRequest request, Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java =================================================================== diff -u -r176368e713ee9dee5b8c206e3f979dfc839f95cd -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java (.../VoteLearningForm.java) (revision 176368e713ee9dee5b8c206e3f979dfc839f95cd) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java (.../VoteLearningForm.java) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -81,6 +81,7 @@ protected String getNextQuestion; protected String getPreviousQuestion; protected String endLearning; + protected String refreshVotes; protected String nominationsSubmited; protected String revisitingUser; @@ -223,6 +224,7 @@ this.setLearnerFinished(null); this.setDonePreview(null); this.setDoneLearnerProgress(null); + this.setRefreshVotes(null); } public void resetParameters() @@ -271,7 +273,19 @@ public void setOptionCheckBoxSelected(String optionCheckBoxSelected) { this.optionCheckBoxSelected = optionCheckBoxSelected; } - /** + /** + * @return Returns the refreshVotes. + */ + public String getRefreshVotes() { + return refreshVotes; + } + /** + * @param refreshVotes The refreshVotes to set. + */ + public void setRefreshVotes(String refreshVotes) { + this.refreshVotes = refreshVotes; + } +/** * @return Returns the optionIndex. */ public String getOptionIndex() { Index: lams_tool_vote/web/403.jsp =================================================================== diff -u -r0409f98dc17dfd380badf33ae103a47d0fffc4e5 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/403.jsp (.../403.jsp) (revision 0409f98dc17dfd380badf33ae103a47d0fffc4e5) +++ lams_tool_vote/web/403.jsp (.../403.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -1,6 +1,6 @@ <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-core" prefix="c" %> - + \ No newline at end of file Index: lams_tool_vote/web/404.jsp =================================================================== diff -u -r0409f98dc17dfd380badf33ae103a47d0fffc4e5 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/404.jsp (.../404.jsp) (revision 0409f98dc17dfd380badf33ae103a47d0fffc4e5) +++ lams_tool_vote/web/404.jsp (.../404.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -1,7 +1,7 @@ <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-core" prefix="c" %> - + Index: lams_tool_vote/web/authoring/AdvancedContent.jsp =================================================================== diff -u -r1447dc2ae2077d18831a17b7c2f309390adb0687 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision 1447dc2ae2077d18831a17b7c2f309390adb0687) +++ lams_tool_vote/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -28,8 +28,8 @@ <%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> - - + + Index: lams_tool_vote/web/authoring/Basic.jsp =================================================================== diff -u -r6cfdabe63a1d792f3135529031f9a969768a6b10 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/authoring/Basic.jsp (.../Basic.jsp) (revision 6cfdabe63a1d792f3135529031f9a969768a6b10) +++ lams_tool_vote/web/authoring/Basic.jsp (.../Basic.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -29,8 +29,8 @@ <%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> - - + + Index: lams_tool_vote/web/authoring/BasicContent.jsp =================================================================== diff -u -r369b6c2ca857c6b74ee143e081534f50b0b94106 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision 369b6c2ca857c6b74ee143e081534f50b0b94106) +++ lams_tool_vote/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -29,8 +29,8 @@ <%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> - - + +
Index: lams_tool_vote/web/authoring/InstructionsContent.jsp =================================================================== diff -u -r5c9c47d5e75fb6d0229862af0f08c84229b6056c -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/authoring/InstructionsContent.jsp (.../InstructionsContent.jsp) (revision 5c9c47d5e75fb6d0229862af0f08c84229b6056c) +++ lams_tool_vote/web/authoring/InstructionsContent.jsp (.../InstructionsContent.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -29,8 +29,8 @@ <%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> - - + +
@@ -49,15 +49,15 @@
- + - + @@ -103,15 +103,15 @@ - + - + Index: lams_tool_vote/web/export/ExportContent.jsp =================================================================== diff -u -r5c9c47d5e75fb6d0229862af0f08c84229b6056c -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/export/ExportContent.jsp (.../ExportContent.jsp) (revision 5c9c47d5e75fb6d0229862af0f08c84229b6056c) +++ lams_tool_vote/web/export/ExportContent.jsp (.../ExportContent.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -28,8 +28,8 @@ <%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> - - + + Index: lams_tool_vote/web/images/Thumbs.db =================================================================== diff -u -rb9472d342c6b0edd1c3e0df5ff2b7179051bb389 -ra8e5c42d584e4b8b9b67224179acbc53850d279f Binary files differ Index: lams_tool_vote/web/images/columnchart.gif =================================================================== diff -u Binary files differ Index: lams_tool_vote/web/images/piechart.gif =================================================================== diff -u Binary files differ Index: lams_tool_vote/web/learning/AllNominations.jsp =================================================================== diff -u -r1447dc2ae2077d18831a17b7c2f309390adb0687 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/learning/AllNominations.jsp (.../AllNominations.jsp) (revision 1447dc2ae2077d18831a17b7c2f309390adb0687) +++ lams_tool_vote/web/learning/AllNominations.jsp (.../AllNominations.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -24,10 +24,10 @@ <%@ include file="/common/taglibs.jsp"%> - + - + @@ -56,7 +56,8 @@
- + + @@ -69,114 +70,100 @@ +
+ + + + -
+ +
- - - - - - - - - - - - - - - - - - - - - - - - + + + - -
- -
- images/success.gif" align="left" width=20 height=20> - -
- - - - - - - -
- - - - - - -
- - - - - - - - - - + - - - + - + - - - - - - - - - - - - - - - - - - - - -  ( ) - - - - - - -
- - + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + - - - - - - - - - + + + monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value} + + + + + + + + + + + + + + + + + + + + + + + + +  ( ) + + +
+
+ + + + + images/piechart.gif" width=30 height=30 border="0"> + +   + + + - - - monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value} - + + images/columnchart.gif" width=30 height=30 border="0"> + +
-
  @@ -197,27 +184,33 @@
- -
+ +
- - - - - - - + + + + + +    + + + + + + + - + +
+ + + @@ -237,3 +234,9 @@ + + + + + + Index: lams_tool_vote/web/learning/AnswersContent.jsp =================================================================== diff -u -r1584ef78e1cf4a5bbdc726bda5345d69be190801 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision 1584ef78e1cf4a5bbdc726bda5345d69be190801) +++ lams_tool_vote/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -24,10 +24,10 @@ <%@ include file="/common/taglibs.jsp"%> - + - + @@ -117,7 +117,8 @@ - + +
Index: lams_tool_vote/web/learning/ExitLearning.jsp =================================================================== diff -u -r1447dc2ae2077d18831a17b7c2f309390adb0687 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/learning/ExitLearning.jsp (.../ExitLearning.jsp) (revision 1447dc2ae2077d18831a17b7c2f309390adb0687) +++ lams_tool_vote/web/learning/ExitLearning.jsp (.../ExitLearning.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -24,10 +24,10 @@ <%@ include file="/common/taglibs.jsp"%> - + - + @@ -69,7 +69,7 @@ - +
- +
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp =================================================================== diff -u -r1584ef78e1cf4a5bbdc726bda5345d69be190801 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision 1584ef78e1cf4a5bbdc726bda5345d69be190801) +++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -24,10 +24,10 @@ <%@ include file="/common/taglibs.jsp"%> - + - + @@ -115,7 +115,7 @@
Index: lams_tool_vote/web/learning/LearnerRep.jsp =================================================================== diff -u -r793f2f3e75e63dda9c5b717317c8ad9553546e93 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision 793f2f3e75e63dda9c5b717317c8ad9553546e93) +++ lams_tool_vote/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -24,10 +24,10 @@ <%@ include file="/common/taglibs.jsp"%> - + - + @@ -72,7 +72,7 @@
- + Index: lams_tool_vote/web/learning/defineLater.jsp =================================================================== diff -u -r9393c098e5dfd603e2d37347cd1e531a25aa424a -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/learning/defineLater.jsp (.../defineLater.jsp) (revision 9393c098e5dfd603e2d37347cd1e531a25aa424a) +++ lams_tool_vote/web/learning/defineLater.jsp (.../defineLater.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -24,10 +24,10 @@ <%@ include file="/common/taglibs.jsp"%> - + - + Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp =================================================================== diff -u -r369b6c2ca857c6b74ee143e081534f50b0b94106 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision 369b6c2ca857c6b74ee143e081534f50b0b94106) +++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -28,8 +28,8 @@ <%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> - - + + @@ -171,7 +171,7 @@
- + @@ -182,7 +182,7 @@
- + @@ -222,7 +222,7 @@ - + monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value} Index: lams_tool_vote/web/monitoring/Edit.jsp =================================================================== diff -u -r369b6c2ca857c6b74ee143e081534f50b0b94106 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/monitoring/Edit.jsp (.../Edit.jsp) (revision 369b6c2ca857c6b74ee143e081534f50b0b94106) +++ lams_tool_vote/web/monitoring/Edit.jsp (.../Edit.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -28,8 +28,8 @@ <%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> - - + + Index: lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp =================================================================== diff -u -r5c9c47d5e75fb6d0229862af0f08c84229b6056c -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision 5c9c47d5e75fb6d0229862af0f08c84229b6056c) +++ lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -28,8 +28,8 @@ <%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> - - + + @@ -164,7 +164,7 @@
- + @@ -175,7 +175,7 @@
- + @@ -215,7 +215,7 @@ - + monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value} Index: lams_tool_vote/web/monitoring/Instructions.jsp =================================================================== diff -u -r5c9c47d5e75fb6d0229862af0f08c84229b6056c -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/monitoring/Instructions.jsp (.../Instructions.jsp) (revision 5c9c47d5e75fb6d0229862af0f08c84229b6056c) +++ lams_tool_vote/web/monitoring/Instructions.jsp (.../Instructions.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -28,8 +28,8 @@ <%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> - - + + @@ -56,7 +56,7 @@
- + @@ -65,7 +65,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -110,7 +110,7 @@ - + Index: lams_tool_vote/web/monitoring/LearnerRep.jsp =================================================================== diff -u -r369b6c2ca857c6b74ee143e081534f50b0b94106 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/monitoring/LearnerRep.jsp (.../LearnerRep.jsp) (revision 369b6c2ca857c6b74ee143e081534f50b0b94106) +++ lams_tool_vote/web/monitoring/LearnerRep.jsp (.../LearnerRep.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -58,7 +58,7 @@
- + Index: lams_tool_vote/web/monitoring/Stats.jsp =================================================================== diff -u -r369b6c2ca857c6b74ee143e081534f50b0b94106 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/monitoring/Stats.jsp (.../Stats.jsp) (revision 369b6c2ca857c6b74ee143e081534f50b0b94106) +++ lams_tool_vote/web/monitoring/Stats.jsp (.../Stats.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -27,8 +27,8 @@ <%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> - - + + Index: lams_tool_vote/web/monitoring/SummaryContent.jsp =================================================================== diff -u -r369b6c2ca857c6b74ee143e081534f50b0b94106 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 369b6c2ca857c6b74ee143e081534f50b0b94106) +++ lams_tool_vote/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -28,8 +28,8 @@ <%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> - - + + Index: lams_tool_vote/web/monitoring/UserResponses.jsp =================================================================== diff -u -r418f65577010d4ad648867396f4e14cd36d2c723 -ra8e5c42d584e4b8b9b67224179acbc53850d279f --- lams_tool_vote/web/monitoring/UserResponses.jsp (.../UserResponses.jsp) (revision 418f65577010d4ad648867396f4e14cd36d2c723) +++ lams_tool_vote/web/monitoring/UserResponses.jsp (.../UserResponses.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) @@ -28,8 +28,8 @@ <%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-lams" prefix="lams" %> - - + +