Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r5b60c76a61d420733e2c4c96513249cb9a65a484 -r6455f6e20efee02e4c447821693548724bb9cf8c Binary files differ Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r957baf121a8a77b545ce2fbb752b8f9150dfa1af -r6455f6e20efee02e4c447821693548724bb9cf8c --- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 957baf121a8a77b545ce2fbb752b8f9150dfa1af) +++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 6455f6e20efee02e4c447821693548724bb9cf8c) @@ -2,7 +2,7 @@ #language code: en #locale code: AU - # Exported from the LAMS Community by Ernie Ghiglione on Sun Jul 23 22:50:25 CST 2017 + # Exported from the LAMS Community by Ernie Ghiglione on Wed Oct 11 21:29:50 CST 2017 #=================== labels for LAMS Central =================# @@ -154,7 +154,7 @@ title.portrait.change.screen =Portrait title.change.portrait.window =LAMS :: Change portrait error.portrait.not.image =The file is not an image (PNG, GIF, JPG, WBMP and BMP formats allowed). -msg.portrait.resized =Note: image will be resized to fit inside 120x120 pixels. The image formats allowed are: PNG, GIF, JPG, WBMP and BMP. +msg.portrait.resized =The image formats allowed are: PNG, GIF, JPG, WBMP and BMP. label.workspace.root_folder =My Workspace msg.design.not.saved =Your design is not saved, any changes you have made since you last saved will be lost. error.firstname.required =First name is required. @@ -729,6 +729,14 @@ label.course.groups.name.not.unique =Course grouping with such name already exists. Please enter another one. label.save.as.course.grouping.hint =You can save the groups as "Course groupings" so it can be used in other lessons as well. If the groups are just specifically for this lesson, you might not want to do this. Otherwise, click the button to give them a name and reuse them later. label.advanced.settings =Advanced settings -audit.delete.portrait=Portrait for user {0} {1}({2}) deleted. Portrait Id was {3}. +audit.delete.portrait =Portrait for user {0} {1}({2}) deleted. Portrait Id was {3}. +authoring.fla.weights.menu =Weights +authoring.fla.weights.title =Weights on activity outputs +authoring.fla.weights.activity =Activity +authoring.fla.weights.output =Output +authoring.fla.weights.weight =Weight +authoring.fla.weights.sum =Sum +authoring.fla.weights.sum.error =Output weights do not sum up to 100%. Adjust them in Weights dialog. -#======= End labels: Exported 718 labels for en AU ===== + +#======= End labels: Exported 726 labels for en AU ===== Index: lams_central/conf/scss/_bootstrap-variables.scss =================================================================== diff -u -r3cccb9ba98efd5722b7365ffec582e2889143166 -r6455f6e20efee02e4c447821693548724bb9cf8c --- lams_central/conf/scss/_bootstrap-variables.scss (.../_bootstrap-variables.scss) (revision 3cccb9ba98efd5722b7365ffec582e2889143166) +++ lams_central/conf/scss/_bootstrap-variables.scss (.../_bootstrap-variables.scss) (revision 6455f6e20efee02e4c447821693548724bb9cf8c) @@ -104,9 +104,9 @@ // $line-height-large: 1.3333333 // extra decimals for Win 8.1 Chrome // $line-height-small: 1.5 -// $border-radius-base: 4px -// $border-radius-large: 6px -// $border-radius-small: 3px +$border-radius-base: 4px; +$border-radius-large: 6px; +$border-radius-small: 3px; //** Global color for active items (e.g., navs or dropdowns). // $component-active-color: #fff Index: lams_central/web/includes/javascript/main.js =================================================================== diff -u -rd370d27131a5cc99c714158be574703a26cd0416 -r6455f6e20efee02e4c447821693548724bb9cf8c --- lams_central/web/includes/javascript/main.js (.../main.js) (revision d370d27131a5cc99c714158be574703a26cd0416) +++ lams_central/web/includes/javascript/main.js (.../main.js) (revision 6455f6e20efee02e4c447821693548724bb9cf8c) @@ -470,9 +470,10 @@ showDialog(id, { 'orgID' : orgID, 'height': Math.max(380, Math.min(900, $(window).height() - 30)), - 'width' : Math.max(380, Math.min(1024, $(window).width() - 60)), + 'width' : Math.max(380, Math.min(955, $(window).width() - 60)), 'title' : LABELS.GRADEBOOK_COURSE_TITLE, 'open' : function() { + console.log("width "+$(window).width()+":"+Math.max(380, Math.min(955, $(window).width() - 60))); // load contents after opening the dialog $('iframe', this).attr('src', LAMS_URL + 'gradebook/gradebookMonitoring.do?dispatch=courseMonitor&organisationID=' + orgID); Index: lams_learning/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -ra5a1078bc390357a119161f65fac513b5244298e -r6455f6e20efee02e4c447821693548724bb9cf8c --- lams_learning/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision a5a1078bc390357a119161f65fac513b5244298e) +++ lams_learning/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 6455f6e20efee02e4c447821693548724bb9cf8c) @@ -2,15 +2,15 @@ #language code: en #locale code: AU - # Exported from the LAMS Community by Ernie Ghiglione on Mon Jul 10 21:19:58 CST 2017 + # Exported from the LAMS Community by Ernie Ghiglione on Tue Oct 10 22:25:45 CST 2017 #=================== labels for Learner (Java) =================# learner.title =LAMS Learner error.title =Error occured message.activity.loading =The next task is loading. Please wait.... message.lesson.finished =Congratulations, {0}, you have finished. -message.lesson.finishedCont =You have now completed the {0} lesson. You can return at anytime to this lesson and revisit and review activities by double clicking on the blue icons in the left hand progress bar. You can now close this window. +message.lesson.finishedCont =You have now completed the {0} lesson. You can return at anytime to this lesson and revisit and review activities by double clicking on the round icons in progress bar. You can now close this window. label.next.button =Next label.finish.button =Next Activity message.activity.parallel.partialComplete =You have to complete the other task before progressing to the next activity....