Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r0484f09a01d9b6b6d0c8ef375206c651c6694dc1 -r5d62f3e3ddf8ecead3be4c6bcabfa9a6d1596f20 --- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 0484f09a01d9b6b6d0c8ef375206c651c6694dc1) +++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 5d62f3e3ddf8ecead3be4c6bcabfa9a6d1596f20) @@ -263,7 +263,6 @@ config.user.inactive.timeout =Inactive user timeout config.use.cache.debug.listener =Cache debug listener config.cleanup.preview.older.than.days =Number of days to keep preview -config.authoring.activities.colour =Authoring Activities colour config.authoring.client.version =Authoring client version config.monitor.client.version =Monitoring client version config.learner.client.version =Learner client version @@ -298,7 +297,6 @@ config.ldap.encrypt.password.from.browser =Encrypt password in browser config.ldap.search.results.page.size =Search results page size error.numeric ={0} only accepts numeric characters -config.learner.progress.batch.size =Batch size for monitoring's learner progress screen. label.users.in.system ={0} users in system. label.users.in.group ={0} users in course. label.show =Show @@ -459,7 +457,6 @@ admin.list.signup.pages =List of signup pages error.course.keys.unequal =Course keys did not match error.context.exists =This URL context is taken -config.learner.collapsible.progress.panel =Set collapsible panel for progress bar in Learner config.authoring.suffix =Add unique suffix when importing Learning Designs config.authoring.single.activity =Enable single activity lessons error.name.invalid.characters =Name cannot contain any of these characters < > ^ * @ % $ Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r0484f09a01d9b6b6d0c8ef375206c651c6694dc1 -r5d62f3e3ddf8ecead3be4c6bcabfa9a6d1596f20 --- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 0484f09a01d9b6b6d0c8ef375206c651c6694dc1) +++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 5d62f3e3ddf8ecead3be4c6bcabfa9a6d1596f20) @@ -247,7 +247,6 @@ config.user.inactive.timeout =Inactive user timeout config.use.cache.debug.listener =Cache debug listener config.cleanup.preview.older.than.days =Number of days to keep preview -config.authoring.activities.colour =Authoring Activities colour config.authoring.client.version =Authoring client version config.monitor.client.version =Monitoring client version config.learner.client.version =Learner client version @@ -281,7 +280,6 @@ config.ldap.encrypt.password.from.browser =Encrypt password in browser config.ldap.search.results.page.size =Search results page size error.numeric ={0} only accepts numeric characters -config.learner.progress.batch.size =Batch size for monitoring's learner progress screen. label.users.in.system ={0} users in system. label.users.in.group ={0} users in course. label.show =Show @@ -436,7 +434,6 @@ admin.list.signup.pages =List of signup pages error.course.keys.unequal =Course keys did not match error.context.exists =This URL context is taken -config.learner.collapsible.progress.panel =Set collapsible panel for progress bar in Learner config.authoring.suffix =Add unique suffix when importing Learning Designs config.authoring.single.activity =Enable single activity lessons error.name.invalid.characters =Name cannot contain any of these characters < > ^ * @ % $ Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -rcac4b20509606b942a7cd762ebadd2674c3983ab -r5d62f3e3ddf8ecead3be4c6bcabfa9a6d1596f20 Binary files differ Index: lams_central/web/includes/javascript/openUrls.js =================================================================== diff -u -rccfaf7a9ef3cf04f1647bcb16ff673ca8cfc5952 -r5d62f3e3ddf8ecead3be4c6bcabfa9a6d1596f20 --- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision ccfaf7a9ef3cf04f1647bcb16ff673ca8cfc5952) +++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 5d62f3e3ddf8ecead3be4c6bcabfa9a6d1596f20) @@ -67,6 +67,7 @@ } function openMonitorLesson( lessonID ) { + debugger; if (isMac) { if(belowMinRes) { monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+lessonID,'mWindow','width=' + monitor_width + ',height=' + monitor_height + ',resizable,scrollbars'); @@ -101,6 +102,7 @@ } function openLearner( lessonId ) { + debugger; var learnerUrl = 'home.do?method=learner&lessonID=' + lessonId; if (isMac) { @@ -134,6 +136,7 @@ } function openSysadmin() { + debugger; var height = sys_admin_height; var width = sys_admin_width; var left = 0; Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170309.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170309.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170309.sql (revision 5d62f3e3ddf8ecead3be4c6bcabfa9a6d1596f20) @@ -0,0 +1,16 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4255, LDEV-4256 Removing UI options no longer used +DELETE FROM `lams_configuration` WHERE `config_key`='LearnerCollapsProgressPanel'; +DELETE FROM `lams_configuration` WHERE `config_key`='AuthoringActivitiesColour'; +DELETE FROM `lams_configuration` WHERE `config_key`='LearnerProgressBatchSize'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== diff -u -rf43980a0cb717534ae8440457d8fa4f4bac24d34 -r5d62f3e3ddf8ecead3be4c6bcabfa9a6d1596f20 --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision f43980a0cb717534ae8440457d8fa4f4bac24d34) +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision 5d62f3e3ddf8ecead3be4c6bcabfa9a6d1596f20) @@ -79,9 +79,6 @@ */ public static String ALLOW_MULTIPLE_LOGIN = "AllowMultipleLogin"; - /** Value for controlling style colour on Canvas Activities */ - public static String AUTHORING_ACTS_COLOUR = "AuthoringActivitiesColour"; - /** Values for client updates */ public static String AUTHORING_CLIENT_VERSION = "AuthoringClientVersion"; @@ -192,11 +189,6 @@ public static String LDAP_SEARCH_RESULTS_PAGE_SIZE = "LDAPSearchResultsPageSize"; - /** - * Number of learners to be displayed on the learner progress screen in monitoring. - */ - public static String LEARNER_PROGRESS_BATCH_SIZE = "LearnerProgressBatchSize"; - /** Custom tab for the main page */ public static String CUSTOM_TAB_LINK = "CustomTabLink"; @@ -248,9 +240,6 @@ // LDEV-2747 public static String ENABLE_SERVER_REGISTRATION = "EnableServerRegistration"; - // LDEV-2889 - public static String LEARNER_COLLAPSIBLE_PROGRESS_PANEL = "LearnerCollapsProgressPanel"; - // CNG-26 Add to lams_configuration and set to false // if you don't want imported LD to have __ appended public static String SUFFIX_IMPORTED_LD = "SuffixImportedLD";