Index: lams_central/web/css/_learner_base.scss =================================================================== diff -u -rf7f38c0fd8e86323bca2df607731f1ec913e8869 -r964c0c4acd889de82f339a982844d32edd6fd784 --- lams_central/web/css/_learner_base.scss (.../_learner_base.scss) (revision f7f38c0fd8e86323bca2df607731f1ec913e8869) +++ lams_central/web/css/_learner_base.scss (.../_learner_base.scss) (revision 964c0c4acd889de82f339a982844d32edd6fd784) @@ -1117,3 +1117,8 @@ min-height: $portrait-size-image-lg + 20; min-width: $portrait-size-image-lg + 20; } + +// Use the same offset as the radio buttons in Bootstrap so that ticks line up with radio buttons on pages like Optional Activities +.radio-button-offset { + margin-left: -20px; +} \ No newline at end of file Index: lams_learning/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r045ebfd1d11d9ed0a1f81a00abb1a2ea373e8d93 -r964c0c4acd889de82f339a982844d32edd6fd784 --- lams_learning/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 045ebfd1d11d9ed0a1f81a00abb1a2ea373e8d93) +++ lams_learning/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 964c0c4acd889de82f339a982844d32edd6fd784) @@ -17,7 +17,7 @@ message.activity.parallel.noFrames =Your browser does not handle frames! message.activity.options.noActivitySelected =Please select an activity from the list message.activity.options.activityCount =You must complete at least {0} out of {1} activities to finish. -message.activity.options.note =Note: Once you finish any of the above activities you can revisit them by using the progress bar. +message.activity.options.note =Note: Once you finish any of the above activities you can revisit them by using the progress bar or by clicking or by clicking on the activity name shown above. label.activity.options.choose =Choose label.synch.gate.title =Synch gate label.synch.gate.message =You have stopped at a gate. You cannot continue until all of your group/class reach this point. @@ -60,7 +60,7 @@ label.sequence.empty.message =There are no activities to complete in this part of the lesson. Click Next to continue. label.my.progress =My Progress label.resume =Resume -message.activity.options.note.maximum =Note: The maximum number of activities you may attempt is {0}. You can revisit started or finished activities by using the progress bar. +message.activity.options.note.maximum =Note: The maximum number of activities you may attempt is {0}. You can revisit started or finished activities by using the progress bar or by clicking on the activity name shown above. message.activity.set.options.activityCount =You must complete at least {0} out of {1} sequences to finish. message.activity.set.options.note =Note: Once you finish any of the above sequences you can revisit them by using the progress bar. message.activity.set.options.note.maximum =Note: The maximum number of sequences you may attempt is {0}. You can revisit started or finished sequences by using the progress bar. Index: lams_learning/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rd9bd1a0e26977326e557246c8440c8d13d2debc9 -r964c0c4acd889de82f339a982844d32edd6fd784 --- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision d9bd1a0e26977326e557246c8440c8d13d2debc9) +++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 964c0c4acd889de82f339a982844d32edd6fd784) @@ -17,7 +17,7 @@ message.activity.parallel.noFrames =Your browser does not handle frames! message.activity.options.noActivitySelected =Please select an activity from the list message.activity.options.activityCount =You must complete at least {0} out of {1} activities to finish. -message.activity.options.note =Note: Once you finish any of the above activities you can revisit them by using the progress bar. +message.activity.options.note =Note: Once you finish any of the above activities you can revisit them by using the progress bar or by clicking or by clicking on the activity name shown above. label.activity.options.choose =Choose label.synch.gate.title =Synch gate label.synch.gate.message =You have stopped at a gate. You cannot continue until all of your group/class reach this point. @@ -60,7 +60,7 @@ label.sequence.empty.message =There are no activities to complete in this part of the lesson. Click Next to continue. label.my.progress =My Progress label.resume =Resume -message.activity.options.note.maximum =Note: The maximum number of activities you may attempt is {0}. You can revisit started or finished activities by using the progress bar. +message.activity.options.note.maximum =Note: The maximum number of activities you may attempt is {0}. You can revisit started or finished activities by using the progress bar or by clicking on the activity name shown above. message.activity.set.options.activityCount =You must complete at least {0} out of {1} sequences to finish. message.activity.set.options.note =Note: Once you finish any of the above sequences you can revisit them by using the progress bar. message.activity.set.options.note.maximum =Note: The maximum number of sequences you may attempt is {0}. You can revisit started or finished sequences by using the progress bar. Index: lams_learning/web/optionsActivity.jsp =================================================================== diff -u -r02e61ba9a9752984ac1296ac635e4d61c7ce5d2c -r964c0c4acd889de82f339a982844d32edd6fd784 --- lams_learning/web/optionsActivity.jsp (.../optionsActivity.jsp) (revision 02e61ba9a9752984ac1296ac635e4d61c7ce5d2c) +++ lams_learning/web/optionsActivity.jsp (.../optionsActivity.jsp) (revision 964c0c4acd889de82f339a982844d32edd6fd784) @@ -79,12 +79,11 @@ value="${activityURL.activityId}"> - + - - - + + @@ -142,7 +141,6 @@ -