Index: lams_monitoring/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -ra9c9257fe4de2c325006255af0e79af54aef3bc0 -r8dc1d75924ecfcc0742ba8f8fff00b22f656a284 --- lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision a9c9257fe4de2c325006255af0e79af54aef3bc0) +++ lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 8dc1d75924ecfcc0742ba8f8fff00b22f656a284) @@ -305,6 +305,40 @@ force.complete.learner.command.message =The instructor has moved you to another activity. index.emailnotifications =Notifications label.email =Email +label.tour =Tour +tour.intro.title =Monitor Tour +tour.intro.content =This short tour will show you the features of the LAMS Monitoring screen. You can stop the tour at any time by clicking End Tour, and restart it again by clicking on the Tour button. +tour.end.title =End Of Tour +tour.end.content =Thank you for taking the tour. To restart the tour, click the Tour button again. Remember you can get more help on Monitoring by clicking the Help button on each tab. +tour.tab.selection.title=Tab Selection +tour.tab.selection.content=

Monitoring is broken into three areas, accessed by these titles at the top of the page.

Lesson gives the overall lesson details.

Sequence gives an overview of the lesson sequence and is used to access the activities within the lesson.

Learners shows the details about each learner.

+tour.tab.refresh.content=Updates the screen. +tour.help.content=Additional help may be accessed using the Help button. +tour.lesson.state.content=

Click on the current status to change the status. The lesson can be Started, Suspended, Archived or Removed.

Started or Activated lessons are available for learners to participate in.

Suspended or Disabled lessons are lessons that have been disabled by a monitor. Learners cannot see but not access disabled lessons. Learners currently in the lesson (with a learner window open) can progress through the lesson.

Archived lessons do not appear on learner's main screen, but are available for Monitors to view.

Removed lessons are removed altogether and cannot be retrieved.

+tour.lesson.count.learners.content=

This area shows the number of learners who have started the sequence so far, and the total number of learners who are able to access the sequence.

Note that this does NOT indicate the number of learners online at this moment, but rather how many learners have joined the sequence since it was started.

+tour.learner.in.class.content=

Display the learners in the class. From the resulting learner list you can email a particular learner.

+tour.edit.class.content=

Add or Remove learners from the lesson.

+tour.email.notifications.content=

Send an email notification to one or more learners. Notifications can be scheduled for later sending.

+tour.lesson.im.content=

Click on Presence to allow learners to see who is currently online.

Once Presence is on, the number of learners online is shown on the Presence button. Click Instant Messaging to allow learners to message each other.

Click on Presence and Instant Messaging again to disable.

View the learners' messages using Open IM.

+tour.completion.chart.content=

Graph showing the proportion of learners who have not started the lesson, are in progress or have completed the lesson. Hover over the graph sections to see the percentages.

+tour.tab.sequence.content=The sequence tab allows you to manage where learners are in the sequence or make changes to the lesson sequence. +tour.activity.content=

Double click on any activity to see the details for that activity

+tour.move.learners.title=View and Move Learners +tour.move.learners.small.content=

If you have a small number of learners in an activity, hover over each person icon in an activity to find the right learner, then click on the learner to open a view of their current activity or click and drag the icon to move them to another activity

+tour.move.learners.affect.content=

Moving a learner forward to a new activity marks them as completed in the earlier activity or activities, without the learner completing the activity themselves.

+tour.move.learners.large.content=

If you have a large number of learners in an activity, click on the group/people icon on the top right of the activity. This will bring up a box allowing you to select one or more learners to move, or to see the current activity view for a particular learner.

+tour.completed.learners.title=Completed Learners +tour.completed.learners.content=

The completed learners appear at the bottom of the screen. To make a learner complete the lesson, click and drag the learner's icon from their current activity to this area at the bottom of the screen.

+tour.learner.search.title=Learner Search +tour.learner.search.content=

Enter a first name, last name or login to search for a learner.

+tour.live.edit.title=Live Edit +tour.live.edit.content=

Change the lesson sequence. You can only change the parts not yet accessed by learners, such as adding new activities later in the sequence.

+tour.tab.learners.content=

Learners gives a learner by learner view of lesson progression. More learners are available via paging.

+tour.learners.progress.content=

Blue circles indicate activities which have been completed by the learner.

Red squares indicate the current position of the learner in the sequence

Green triangles represent activities not yet reached.

+tour.completion.sorting.title=Sorting +tour.completion.sorting.content=

Turn on to sort the completed learners first or turn off to sort alphabetically.

+tour.journal.entries.content=

View the entries in the learner's journal. These are entries are made in Learner, using the Save to Journal option in the Notebook.

+tour.email.content=

Send an email to a particular learner.

+tour.this.is.disabled=This function is disabled while the tour is running. - #======= End labels: Exported 299 labels for en AU ===== Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -r78d36040b1f0d2787187f414544fb3c52f791cb0 -r8dc1d75924ecfcc0742ba8f8fff00b22f656a284 --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 78d36040b1f0d2787187f414544fb3c52f791cb0) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 8dc1d75924ecfcc0742ba8f8fff00b22f656a284) @@ -1,4 +1,4 @@ -// ********** GLOBAL VARIABLES ********** +// ********** GLOBAL VARIABLES ********** // copy of lesson SVG so it does no need to be fetched every time var originalSequenceCanvas = null, // DIV container for lesson SVG @@ -42,7 +42,7 @@ * Sets up lesson tab. */ function initLessonTab(){ - // sets presence availability + // sets presence availability. buttons may be temporarily disable by the tour. $('#presenceButton').click(function(){ var checked = $(this).toggleClass('btn-success').hasClass('btn-success'); $.ajax({ @@ -56,9 +56,9 @@ }, success : function() { updatePresenceAvailableCount(); - if (checked) { $('#imButton').show(); + $('#imButton').prop('disabled', false); alert(LABELS.LESSON_PRESENCE_ENABLE_ALERT); } else { $('#imButton').removeClass('btn-success').hide(); @@ -83,6 +83,7 @@ success : function() { if (checked) { $('#openImButton').show(); + $('#openImButton').prop('disabled', false); alert(LABELS.LESSON_IM_ENABLE_ALERT); } else { $('#openImButton').hide(); @@ -811,7 +812,7 @@ } var learnerTotalCount = learnerCount + response.completedLearnerCount; - $('#learnersStartedPossibleCell').text(learnerTotalCount + ' / ' + response.numberPossibleLearners); + $('#learnersStartedPossibleCell').html(''+learnerTotalCount + ' / ' + response.numberPossibleLearners+''); addCompletedLearnerIcons(response.completedLearners, response.completedLearnerCount, learnerTotalCount); $.each(response.activities, function(activityIndex, activity){ @@ -1676,7 +1677,7 @@ ';11;'; learnerProgressCellsTemplate += - ' ' + ' ' + LABELS.EMAIL_BUTTON + ''; } Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -r75765d2caf035efe57e40cad41337756253d488f -r8dc1d75924ecfcc0742ba8f8fff00b22f656a284 --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 75765d2caf035efe57e40cad41337756253d488f) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 8dc1d75924ecfcc0742ba8f8fff00b22f656a284) @@ -12,6 +12,7 @@ + @@ -35,6 +36,7 @@ + @@ -50,6 +52,7 @@ presenceEnabled = false, hasDialog = false, sequenceTabShowInfo = ${sequenceTabShowInfo eq true}, + tourInProgress = false; LAMS_URL = '', @@ -168,7 +171,9 @@ LESSON_INTRODUCTION : '', - EMAIL_TITLE : '' + EMAIL_TITLE : '', + + TOUR_DISABLED_ELEMENT : '' } $(document).ready(function(){ @@ -188,6 +193,14 @@ }); function doSelectTab(tabId) { + if ( tourInProgress ) { + alert(LABELS.TOUR_DISABLED_ELEMENT); + return; + } + actualDoSelectTab(tabId); + } + + function actualDoSelectTab(tabId) { selectTab(tabId); var sequenceInfoDialog = $('#sequenceInfoDialog'); if ( tabId == '2' ) { @@ -201,6 +214,8 @@ } + <%@ include file="monitorTour.jsp" %> + @@ -225,10 +240,14 @@
- - + + +

@@ -332,7 +351,7 @@

:
-
+