Index: lams_tool_vote/conf/language/ApplicationResources.properties
===================================================================
diff -u -rb523c049772bec9396882cecd81fdb23a91b5c19 -r0ab582175b03ab93a172f7ee84c105a3b8d267b7
--- lams_tool_vote/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision b523c049772bec9396882cecd81fdb23a91b5c19)
+++ lams_tool_vote/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 0ab582175b03ab93a172f7ee84c105a3b8d267b7)
@@ -2,11 +2,11 @@
# ========== Values for tool and library activity. Sent to Flash as part of the learning design toolkit. ======
activity.title=Voting
-activity.description=Voting description
+activity.description=Allows voting format
activity.helptext=Voting help text
tool.display.name=Voting
-tool.description=Voting description
+tool.description=Allows voting format
#Authoring mode resources
label.tool.shortname =Voting
@@ -24,89 +24,45 @@
label.exportPortfolio.simple =Export Portfolio
label.authoring.vote.basic =Please define the nominations.
label.monitoring =Voting Monitoring
-label.vote.questions =Voting Questions
label.allowText =Allow Text Entry
label.maxNomCount =Max Votes
label.vote.nominations =Nominations
label.nomination =Nomination
-label.advanced.definitions =Advanced Definitions
label.vote.changable =Allow learner to change vote
label.vote.lockedOnFinish =Locked on finish
label.authoring.title =Title
label.authoring.instructions =Instructions
-label.Questions =Questions
label.moveDown =Down
-label.add.question =Add New
-label.add.option =Add New
-button.removeQuestion =Delete
label.other =Other
label.view.chart =View Chart (All Votes)
-label.view.pieChart =View Pie-Chart
-label.view.barChart =View Bar-Chart
button.delete =Delete
label.fileContent =File Content
-label.withRetries =Voting with Retries
-label.withoutRetries =Voting without Retries
-label.individual.results.withRetries =Results for Voting with Retries
-label.individual.results.withoutRetries =Results for Voting without Retries
-label.viewAnswers =Previous Answers
-label.viewNominations =Previous Nominations
-label.learner.viewAnswers =Learner's Answers
-label.withRetries.results.summary =Voting with Retries Summary
-label.withoutRetries.results.summary =Voting without Retries Summary
label.learning.reportMessage =The following are your votes.
-label.learning.reportMessage.past =The following were your votes.
error.maxNominationCount.reached =You have selected too many nominations. You can only select
label.nominations =nominations.
label.learning.forceFinishMessage =Voting is no more allowed. Please finish.
count.total.user =Total Users Count:
count.finished.user =Finished User Count:
-count.max.attempt =Maximum Attempt Count:
-label.attempts =Attempts
-label.you.answered =You answered:
-label.learner.answered =Learner answered:
label.learning.report =Learning Report
label.retake =Redo Vote
-label.view.summary =View Summary
-label.view.answers =View Answers
-label.view.answers =View Nominations
-label.nominated =Nominated
label.submit.vote =Submit Vote
label.view =View
label.download =Download
label.delete =Delete
label.finished =Finished
label.overAllResults =Overall Results
-label.attempt =Attempt
button.cancel =Cancel
button.upload =Upload
button.preview =Preview
button.advanced =Advanced
button.instructions =Instructions
button.add =Add
-button.addNewQuestion =Add
button.remove =Delete
button.submit =Submit
-button.done =Done
-button.getNextQuestion =Next
-button.next =Next
-button.nextQuestion =Next Question
-button.continue =Continue
-button.getPreviousQuestion =Previous
-label.percent =%
sbmt.successful =The content has been created successfully.
-label.monitoringReport.title =Monitoring Report Title
label.nomination1 =Nomination 1
radiobox.defineLater =Define Later
-radiobox.synchInMonitor =Sync in Monitor
-radiobox.forceOffline =Force Offline
-radiobox.questionsSequenced =Questions Sequenced
-radiobox.showFeedback =Show Feedback
-radiobox.sln =Show Learner's Report
-radiobox.onepq =1 page per question
-radiobox.retries =Allow Retries
-label.report.title =Report Title
label.offlineInstructions =Offline Instructions
label.offlineInstructions.col =Offline Instructions:
label.onlineInstructions =Online Instructions
@@ -119,18 +75,13 @@
option.off =OFF
label.save =Save
label.cancel =Cancel
-label.choose.nominations =Please choose your nominations.
label.title.export =Learner Submission Details
-feedback =Please address the following issues before submit.
error.maxNominationCount.invalid =Please correct this: The "Max Nominations" field in Advanced section is invalid.
error.default.content.notSetup =The tool initialization error: The tool default content has not been set up properly.
error.question.empty =Please correct this: The question text can not be empty.
-error.emptyQuestion =Please enter the question text. The chosen question can not be empty.
error.title =Please correct this: The field "Title" is mandatory.
error.instructions =Please correct this: The field "Instructions" is mandatory.
-error.reportTitle =Please correct this: The field "Report Title (Advanced)" is mandatory.
-error.defaultoption.empty =Please correct this: The first nomination can not be empty.
error.learner.userId.required =Tool Activity Error! Can't continue. Tool Activity expects learner's user id.
error.learner.user.doesNoExist =Tool Activity Error! Learner is not ready in the tool's database yet.
error.file.notPersisted =An error occurred: The file is not viewable yet. Please save all the content first and check back.
@@ -140,7 +91,6 @@
error.toolContent.notAvailable =Tool Activity Error! Can't continue. Tool content is not ready in the tool's database yet.
Please verify the API method: public void createToolSession(Long toolSessionId, Long toolContentId) has run properly.
error.learner.required =Tool Activity Error! Can't continue. The Learner records are not ready in the tool's database yet.
error.fileName.empty =Please correct this: Under "Instructions", the file(name) to upload can not be empty.
-error.passMark.greater100 =Please correct this: The passmark can not be greater than 100%
error.content.locked =The content has been locked since it is being used by one mor more learners.
The modification of the content is not allowed.
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.
@@ -153,18 +103,12 @@
#Learning mode resources
label.progressiveResults =Progressive Voting Results
-label.question =Question
-label.answers =Answers:
button.endLearning =Finish
-label.learning.user =User
-label.learning.attemptTime =Attempt Date/Time
-label.learning.timezone =Time-Zone
-label.learning.response =Response
label.user =User
label.attemptTime =Attempt Date/Time
label.timezone =Time-Zone
label.response =Response
-sbmt.learner.nominations.successful =Your nominations have been submitted.
+sbmt.learner.nominations.successful =Your votes have been submitted.
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.
@@ -184,11 +128,9 @@
#Monitoring mode resources
button.startLesson =Start Lesson
button.deleteLesson =Delete Lesson
-button.contributeLesson =Contribute -> Report
button.forceComplete =Force Complete
-error.synchInMonitor =The report is available only after all the students finish their activities.
- Some of the students has not completed the activity yet. However, those students may be forced to complete.
-error.monitorReportTitle =The field "Monitor Report Title (Advanced)" is mandatory.
+
+
error.noStudentActivity =Sorry, the report can not be generated.
No student has attempted the activity yet.
error.contentAndToolSession.notCompatible =Tool Activity Error! Can't continue. The content id and tool session(s) passed to the tool activity are not compatible with each other.
The Tool Activity expects that each of the passed tool sessions refer to the same passed content id.
error.toolSessions.wrongFormat =Tool Activity Error! Can't continue. No valid tool sessions has been passed to the Tool Activity.
The expected format is: TOOLURL?toolContentId=A&toolSessionId1=B&toolSessionId2=C&toolSessionId3=D&...
@@ -202,19 +144,11 @@
error.content.noToolSessions =A report can not be generated since there has not been any student activity on this content.
error.user.doesNotExist =Tool Activity Error! Can't continue. The user id passed to the Tool Activity does not refer to an existing user.
error.tab.contentId.required =Sorry, the screen is not available. The Tool Activity requires a content id.
-monitoring.feedback.instructionUpdate =The content has been updated successfully.
-group.label =Group
-button.summary =Summary
-button.editActivity =Edit Activity
-button.stats =Stats
+
label.edit =Edit
-label.update =Update
label.selectGroup =Select Group:
label.learner.progress =Learner Progress Report
-label.stats.totalLearners =Total count of learners:
-label.stats.allGroups =All Groups:
-label.stats.totalAllGroups =Total count of all learners:
#=========================Error Messages===========================#
error.system.vote=A system exception has occured. Please contact Lams International technical support at 95806666. The error to report is\:
{0}
Index: lams_tool_vote/web/authoring/BasicContent.jsp
===================================================================
diff -u -rb981d563ace42f1c943a2e847aa2f725249b82a8 -r0ab582175b03ab93a172f7ee84c105a3b8d267b7
--- lams_tool_vote/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision b981d563ace42f1c943a2e847aa2f725249b82a8)
+++ lams_tool_vote/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision 0ab582175b03ab93a172f7ee84c105a3b8d267b7)
@@ -134,7 +134,7 @@
-
+
Index: lams_tool_vote/web/export/exportportfolio.jsp
===================================================================
diff -u -rb523c049772bec9396882cecd81fdb23a91b5c19 -r0ab582175b03ab93a172f7ee84c105a3b8d267b7
--- lams_tool_vote/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision b523c049772bec9396882cecd81fdb23a91b5c19)
+++ lams_tool_vote/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 0ab582175b03ab93a172f7ee84c105a3b8d267b7)
@@ -36,7 +36,7 @@
- ozgur's export portf
+ portfolio data, to be defined
\ No newline at end of file