Index: lams_tool_vote/conf/language/ApplicationResources.properties
===================================================================
diff -u -r9b9f1e1d350d003ecddde5760c957849259c8cef -r2a908e1de2e7fea80b982480879f7a3ec972386a
--- lams_tool_vote/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 9b9f1e1d350d003ecddde5760c957849259c8cef)
+++ lams_tool_vote/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 2a908e1de2e7fea80b982480879f7a3ec972386a)
@@ -55,7 +55,6 @@
button.submit =Submit
sbmt.successful =The content has been created successfully.
label.nomination1 =Nomination 1
-radiobox.defineLater =Define Later
label.offlineInstructions =Offline Instructions
label.offlineInstructions.col =Offline Instructions:
label.onlineInstructions =Online Instructions
@@ -70,9 +69,7 @@
label.cancel =Cancel
label.title.export =Learner Submission Details
error.maxNominationCount.invalid =Please correct this: The "Max Nominations" field in Advanced section is invalid.
-error.fields.mandatory =Please correct this: The fields "Title", "Instructions" and the "Nomination 1" are mandatory.
error.fileName.empty =Please correct this: Under "Instructions", the file(name) to upload can not be empty.
-error.content.doesNotExist =Tool Activity Error! Can't continue. Tool content is not ready in the tool's database yet.
error.content.inUse =The modification of the content is not allowed since it is being used.
error.noLearnerActivity =The report is not available since no users attempted the activity yet.
label.learning.forceFinishMessage =Voting is no more allowed. Please finish.
@@ -86,18 +83,11 @@
button.endLearning =Finish
label.user =User
label.attemptTime =Voting Time
-label.timezone =Time-Zone
sbmt.learner.nominations.successful =Your votes have been submitted.
label.finished =Finished
label.learner.nominations =Your nominations are:
label.learning.forceOfflineMessage =This is an offline activity. Please see your instructor for details.
-label.learning.runOffline =This activity is not being done on the computer. Please see your instructor for details.
error.defineLater =Please wait for the teacher to complete the contents of this activity.
-error.toolSessionId.required =Tool Activity Error! Can't continue
URL is not complete. The Tool Activity requires a toolSession id.
-error.contentId.required =Tool Activity Error! Can't continue
URL is not complete. The Tool Activity requires a content id.
-error.defaultContent.notSetup =Tool Activity Error! Can't continue. The default content for the tool has not been setup properly.
-error.numberFormatException =Tool Activity Error! Can't continue. The content id and tool session id(s) passed to the Tool Activity must be numerical.
-error.sessionId.numberFormatException =Tool Activity Error! Can't continue. The toolSession id passed to the Tool Activity must be numerical.
label.edit =Edit
label.selectGroup =Select Group:
label.learner.progress =Learner Progress Report
@@ -116,7 +106,6 @@
label.show =Show
label.hide =Hide
label.hidden =hidden
-label.hiddenLearner =(hidden)
label.view.piechart =View Pie Chart
label.view.barchart =View Bar Chart
label.visible =Visible
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java
===================================================================
diff -u -r2da37d46f5f9f140f21e1c7d93924f7a4ed6188a -r2a908e1de2e7fea80b982480879f7a3ec972386a
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java (.../VoteLearningStarterAction.java) (revision 2da37d46f5f9f140f21e1c7d93924f7a4ed6188a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java (.../VoteLearningStarterAction.java) (revision 2a908e1de2e7fea80b982480879f7a3ec972386a)
@@ -638,7 +638,7 @@
catch(NumberFormatException e)
{
VoteUtils.cleanUpSessionAbsolute(request);
- persistInRequestError(request, "error.sessionId.numberFormatException");
+ //persistInRequestError(request, "error.sessionId.numberFormatException");
logger.debug("add error.sessionId.numberFormatException to ActionMessages.");
return (mapping.findForward(ERROR_LIST));
}
Index: lams_tool_vote/web/VoteErrorBox.jsp
===================================================================
diff -u -r8f75e968f958c917d9fa8bcd868d458aba18544d -r2a908e1de2e7fea80b982480879f7a3ec972386a
--- lams_tool_vote/web/VoteErrorBox.jsp (.../VoteErrorBox.jsp) (revision 8f75e968f958c917d9fa8bcd868d458aba18544d)
+++ lams_tool_vote/web/VoteErrorBox.jsp (.../VoteErrorBox.jsp) (revision 2a908e1de2e7fea80b982480879f7a3ec972386a)
@@ -86,19 +86,6 @@
-
-
-
-
- |
-
-
-
-
-
- |
-
-
@@ -124,12 +111,6 @@
|
-
-
-
- |
-
-
|