Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r81b94051fc1ee2baec5f70b3c5fd2605efa4fb55 -r79a6575d49778884cc7d23d028fe14e70ad04a4b --- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 81b94051fc1ee2baec5f70b3c5fd2605efa4fb55) +++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 79a6575d49778884cc7d23d028fe14e70ad04a4b) @@ -359,6 +359,11 @@ config.forgot.password.allow.email =Allow forgot password email link in front page? config.forgot.password.email =Email address from which the forgotten password emails will be sent config.flash.enable =Enable Flash for Learners +config.authoring.screen.size =Authoring Screen Size +config.monitor.screen.size =Monitor Screen Size +config.learner.screen.size =Learner Screen Size +config.admin.screen.size =System Admin Screen Size + #======= End labels: Exported 352 labels for en AU ===== Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r81b94051fc1ee2baec5f70b3c5fd2605efa4fb55 -r79a6575d49778884cc7d23d028fe14e70ad04a4b --- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 81b94051fc1ee2baec5f70b3c5fd2605efa4fb55) +++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 79a6575d49778884cc7d23d028fe14e70ad04a4b) @@ -359,6 +359,10 @@ config.forgot.password.allow.email =Allow forgot password email link in front page? config.forgot.password.email =Email address from which the forgotten password emails will be sent config.flash.enable =Enable Flash for Learners +config.authoring.screen.size =Authoring Screen Size +config.monitor.screen.size =Monitor Screen Size +config.learner.screen.size =Learner Screen Size +config.admin.screen.size =System Admin Screen Size #======= End labels: Exported 352 labels for en AU ===== Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/ConfigurationTag.java =================================================================== diff -u -r472bcb813040efc160e074021be5c71c15455f00 -r79a6575d49778884cc7d23d028fe14e70ad04a4b --- lams_central/src/java/org/lamsfoundation/lams/web/tag/ConfigurationTag.java (.../ConfigurationTag.java) (revision 472bcb813040efc160e074021be5c71c15455f00) +++ lams_central/src/java/org/lamsfoundation/lams/web/tag/ConfigurationTag.java (.../ConfigurationTag.java) (revision 79a6575d49778884cc7d23d028fe14e70ad04a4b) @@ -61,7 +61,7 @@ public int doStartTag() throws JspException { JspWriter writer = pageContext.getOut(); try { - writer.println(Configuration.get(getKey())); + writer.print(Configuration.get(getKey())); } catch (IOException e) { log.error("Error in configuration tag",e); throw new JspException(e); Index: lams_central/web/includes/javascript/openUrls.js =================================================================== diff -u -r76f439627870a81d38a70c4b88d790b6ee07f26a -r79a6575d49778884cc7d23d028fe14e70ad04a4b --- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 76f439627870a81d38a70c4b88d790b6ee07f26a) +++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 79a6575d49778884cc7d23d028fe14e70ad04a4b) @@ -21,7 +21,6 @@ function closeAllChildren(){ if (authorWin && !authorWin.closed) authorWin.closeWindow(); if (learnWin && !learnWin.closed) learnWin.close(); - //if (monitorLessonWin && !monitorLessonWin.closed) monitorLessonWin.close(); if (monitorLessonWin && !monitorLessonWin.closed) monitorLessonWin.closeWindow(); if (addLessonWin && !addLessonWin.closed) addLessonWin.close(); if (epWin && !epWin.closed) epWin.close(); @@ -54,9 +53,10 @@ function openAuthor() { + if(isMac) { - authorWin = window.open('home.do?method=author','aWindow','width=796,height=570,resizable'); + authorWin = window.open('home.do?method=author','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable'); } else { @@ -67,7 +67,7 @@ } else { - authorWin = window.open('home.do?method=author','aWindow','width=796,height=570,resizable'); + authorWin = window.open('home.do?method=author','aWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable'); authorWin.focus(); } } @@ -77,7 +77,7 @@ { if(isMac) { - monitorLessonWin = window.open('../home.do?method=author&layout=editonfly&learningDesignID='+learningDesignID,'mWindow','width=796,height=570,resizable'); + monitorLessonWin = window.open('../home.do?method=author&layout=editonfly&learningDesignID='+learningDesignID,'mWindow','width=' + authoring_width + ',height=' + authoring_height + ',resizable'); } else { @@ -87,7 +87,7 @@ } else { - monitorLessonWin = window.open('../home.do?method=author&layout=editonfly&learningDesignID='+learningDesignID,'mWindow','width=796,height=570,resizable'); + monitorLessonWin = window.open('../home.do?method=author&layout=editonfly&learningDesignID='+learningDesignID,'mWindow', 'width=' + authoring_width + ',height=' + authoring_height + ',resizable'); monitorLessonWin.focus(); } } @@ -109,11 +109,11 @@ { if(belowMinRes) { - monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+lessonID,'mWindow','width=796,height=575,resizable,scrollbars'); + monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+lessonID,'mWindow','width=' + monitor_width + ',height=' + monitor_height + ',resizable,scrollbars'); } else { - monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+lessonID,'mWindow','width=779,height=575,resizable,scrollbars'); + monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+lessonID,'mWindow','width=' + monitor_width + ',height=' + monitor_height + ',resizable,scrollbars'); } } else @@ -123,7 +123,7 @@ monitorLessonWin.location = 'home.do?method=monitorLesson&lessonID='+lessonID; monitorLessonWin.focus(); }else{ - monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+lessonID,'mWindow','width=779,height=575,resizable,resizable,scrollbars'); + monitorLessonWin = window.open('home.do?method=monitorLesson&lessonID='+lessonID,'mWindow','width=' + monitor_width + ',height=' + monitor_height + ',resizable,resizable,scrollbars'); } } } @@ -159,7 +159,7 @@ { if(isMac) { - learnWin = window.open('home.do?method=learner&lessonID='+lessonId,'lWindow','width=796,height=570,resizable,status=yes'); + learnWin = window.open('home.do?method=learner&lessonID='+lessonId,'lWindow','width=' + learner_width + ',height=' + learner_height + ',resizable,status=yes'); } else { @@ -170,7 +170,7 @@ } else { - learnWin = window.open('home.do?method=learner&lessonID='+lessonId,'lWindow','width=796,height=570,resizable,status=yes'); + learnWin = window.open('home.do?method=learner&lessonID='+lessonId,'lWindow','width=' + learner_width + ',height=' + learner_height + ',resizable,status=yes'); } } } @@ -198,14 +198,16 @@ function openSysadmin() { - var height = 650; - var width = 850; + var height = sys_admin_height; + var width = sys_admin_width; var left = 0; var top = 0; + if(self.screen){ top = self.screen.height/2-height/2; left = self.screen.width/2-width/2; } + if(isMac) { sysadminWin = window.open('admin/sysadminstart.do','saWindow','left='+left+',top='+top+',width='+width+',height='+height+',resizable,location,menubar,scrollbars,dependent,status,toolbar'); Index: lams_central/web/loadVars.jsp =================================================================== diff -u --- lams_central/web/loadVars.jsp (revision 0) +++ lams_central/web/loadVars.jsp (revision 79a6575d49778884cc7d23d028fe14e70ad04a4b) @@ -0,0 +1,40 @@ +<%@ page language="java" contentType="text/javascript; charset=utf-8"%> +<%@ taglib uri="tags-lams" prefix="lams"%> + \ No newline at end of file Index: lams_central/web/main.jsp =================================================================== diff -u -r76f439627870a81d38a70c4b88d790b6ee07f26a -r79a6575d49778884cc7d23d028fe14e70ad04a4b --- lams_central/web/main.jsp (.../main.jsp) (revision 76f439627870a81d38a70c4b88d790b6ee07f26a) +++ lams_central/web/main.jsp (.../main.jsp) (revision 79a6575d49778884cc7d23d028fe14e70ad04a4b) @@ -11,7 +11,6 @@ <%JspRedirectStrategy.welcomePageStatusUpdate(request, response);%> <%HttpSessionManager.getInstance().updateHttpSessionByLogin(request.getSession(),request.getRemoteUser());%> - @@ -28,6 +27,7 @@ + Index: lams_common/db/sql/insert_lams_unix_config_data.sql =================================================================== diff -u -r38bf4b9a1cb9d0d1717641908f2e8096ce6e0d61 -r79a6575d49778884cc7d23d028fe14e70ad04a4b --- lams_common/db/sql/insert_lams_unix_config_data.sql (.../insert_lams_unix_config_data.sql) (revision 38bf4b9a1cb9d0d1717641908f2e8096ce6e0d61) +++ lams_common/db/sql/insert_lams_unix_config_data.sql (.../insert_lams_unix_config_data.sql) (revision 79a6575d49778884cc7d23d028fe14e70ad04a4b) @@ -222,3 +222,15 @@ insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('EnableFlash','true', 'config.flash.enable', 'config.header.features', 'BOOLEAN', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('AuthoringScreenSize','800x600', 'config.authoring.screen.size', 'config.header.look.feel', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('MonitorScreenSize','800x600', 'config.monitor.screen.size', 'config.header.look.feel', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('LearnerScreenSize','800x600', 'config.learner.screen.size', 'config.header.look.feel', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1); \ No newline at end of file Index: lams_common/db/sql/insert_lams_windows_config_data.sql =================================================================== diff -u -r38bf4b9a1cb9d0d1717641908f2e8096ce6e0d61 -r79a6575d49778884cc7d23d028fe14e70ad04a4b --- lams_common/db/sql/insert_lams_windows_config_data.sql (.../insert_lams_windows_config_data.sql) (revision 38bf4b9a1cb9d0d1717641908f2e8096ce6e0d61) +++ lams_common/db/sql/insert_lams_windows_config_data.sql (.../insert_lams_windows_config_data.sql) (revision 79a6575d49778884cc7d23d028fe14e70ad04a4b) @@ -221,4 +221,16 @@ values ('CustomTabTitle','', 'config.custom.tab.title', 'config.header.look.feel', 'STRING', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('EnableFlash','true', 'config.flash.enable', 'config.header.features', 'BOOLEAN', 1); \ No newline at end of file +values ('EnableFlash','true', 'config.flash.enable', 'config.header.features', 'BOOLEAN', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('AuthoringScreenSize','800x600', 'config.authoring.screen.size', 'config.header.look.feel', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('MonitorScreenSize','800x600', 'config.monitor.screen.size', 'config.header.look.feel', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('LearnerScreenSize','800x600', 'config.learner.screen.size', 'config.header.look.feel', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1); \ No newline at end of file Index: lams_common/db/sql/insert_rams_unix_config_data.sql =================================================================== diff -u -r472bcb813040efc160e074021be5c71c15455f00 -r79a6575d49778884cc7d23d028fe14e70ad04a4b --- lams_common/db/sql/insert_rams_unix_config_data.sql (.../insert_rams_unix_config_data.sql) (revision 472bcb813040efc160e074021be5c71c15455f00) +++ lams_common/db/sql/insert_rams_unix_config_data.sql (.../insert_rams_unix_config_data.sql) (revision 79a6575d49778884cc7d23d028fe14e70ad04a4b) @@ -221,4 +221,16 @@ values ('CustomTabTitle','', 'config.custom.tab.title', 'config.header.look.feel', 'STRING', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('EnableFlash','true', 'config.flash.enable', 'config.header.features', 'BOOLEAN', 1); \ No newline at end of file +values ('EnableFlash','true', 'config.flash.enable', 'config.header.features', 'BOOLEAN', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('AuthoringScreenSize','800x600', 'config.authoring.screen.size', 'config.header.look.feel', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('MonitorScreenSize','800x600', 'config.monitor.screen.size', 'config.header.look.feel', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('LearnerScreenSize','800x600', 'config.learner.screen.size', 'config.header.look.feel', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1); \ No newline at end of file Index: lams_common/db/sql/insert_rams_windows_config_data.sql =================================================================== diff -u -r472bcb813040efc160e074021be5c71c15455f00 -r79a6575d49778884cc7d23d028fe14e70ad04a4b --- lams_common/db/sql/insert_rams_windows_config_data.sql (.../insert_rams_windows_config_data.sql) (revision 472bcb813040efc160e074021be5c71c15455f00) +++ lams_common/db/sql/insert_rams_windows_config_data.sql (.../insert_rams_windows_config_data.sql) (revision 79a6575d49778884cc7d23d028fe14e70ad04a4b) @@ -221,4 +221,16 @@ values ('CustomTabTitle','', 'config.custom.tab.title', 'config.header.look.feel', 'STRING', 0); insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) -values ('EnableFlash','true', 'config.flash.enable', 'config.header.features', 'BOOLEAN', 1); \ No newline at end of file +values ('EnableFlash','true', 'config.flash.enable', 'config.header.features', 'BOOLEAN', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('AuthoringScreenSize','800x600', 'config.authoring.screen.size', 'config.header.look.feel', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('MonitorScreenSize','800x600', 'config.monitor.screen.size', 'config.header.look.feel', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('LearnerScreenSize','800x600', 'config.learner.screen.size', 'config.header.look.feel', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1); \ No newline at end of file Index: lams_common/db/sql/updatescripts/alter_21_branching.sql =================================================================== diff -u -r41f0e0cbcbab757986ccf2dde1123b9b8dc777c8 -r79a6575d49778884cc7d23d028fe14e70ad04a4b --- lams_common/db/sql/updatescripts/alter_21_branching.sql (.../alter_21_branching.sql) (revision 41f0e0cbcbab757986ccf2dde1123b9b8dc777c8) +++ lams_common/db/sql/updatescripts/alter_21_branching.sql (.../alter_21_branching.sql) (revision 79a6575d49778884cc7d23d028fe14e70ad04a4b) @@ -301,3 +301,15 @@ -- LDEV-1579 alter table lams_tool add column supports_outputs TINYINT(1) DEFAULT 0; +-- LDEV-1598 +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('AuthoringScreenSize','800x600', 'config.authoring.screen.size', 'config.header.look.feel', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('MonitorScreenSize','800x600', 'config.monitor.screen.size', 'config.header.look.feel', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('LearnerScreenSize','800x600', 'config.learner.screen.size', 'config.header.look.feel', 'STRING', 1); + +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1); Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== diff -u -r472bcb813040efc160e074021be5c71c15455f00 -r79a6575d49778884cc7d23d028fe14e70ad04a4b --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision 472bcb813040efc160e074021be5c71c15455f00) +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision 79a6575d49778884cc7d23d028fe14e70ad04a4b) @@ -219,4 +219,10 @@ /** Disable Flash altogether for the learner interface (LDEV-1005) */ public static String FLASH_ENABLE = "EnableFlash"; + /** Configurable screen sizes for authoring, monitor, learner and admin (LDEV-1598) */ + public static String AUTHORING_SCREEN_SIZE = "AuthoringScreenSize"; + public static String MONITOR_SCREEN_SIZE = "MonitorScreenSize"; + public static String LEARNER_SCREEN_SIZE = "LearnerScreenSize"; + public static String ADMIN_SCREEN_SIZE = "AdminScreenSize"; + } \ No newline at end of file