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" %>
-
-
+
+