Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rc2e6bcaa070543efd25d43beb7bc85dc8a41db35 -r76f439627870a81d38a70c4b88d790b6ee07f26a
--- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision c2e6bcaa070543efd25d43beb7bc85dc8a41db35)
+++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 76f439627870a81d38a70c4b88d790b6ee07f26a)
@@ -356,6 +356,7 @@
label.next =Next
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.custom.tab.link=Custom Tab URL
+config.custom.tab.title=Custom Tab Title
-
#======= End labels: Exported 349 labels for en AU =====
Index: lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -rc2e6bcaa070543efd25d43beb7bc85dc8a41db35 -r76f439627870a81d38a70c4b88d790b6ee07f26a
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision c2e6bcaa070543efd25d43beb7bc85dc8a41db35)
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 76f439627870a81d38a70c4b88d790b6ee07f26a)
@@ -356,6 +356,7 @@
label.next =Next
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.custom.tab.link=Custom Tab URL
+config.custom.tab.title=Custom Tab Title
-
#======= End labels: Exported 349 labels for en AU =====
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
diff -u -re76fd654d97033acef2c7bbe4c0def48e37f79f3 -r76f439627870a81d38a70c4b88d790b6ee07f26a
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (.../IndexAction.java) (revision e76fd654d97033acef2c7bbe4c0def48e37f79f3)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (.../IndexAction.java) (revision 76f439627870a81d38a70c4b88d790b6ee07f26a)
@@ -137,6 +137,11 @@
request.isUserInRole(Role.AUTHOR) || request.isUserInRole(Role.AUTHOR_ADMIN) || request.isUserInRole(Role.MONITOR))
headerLinks.add(new IndexLinkBean("index.community", "index.do?tab=community"));
+ String customTabText = Configuration.get(ConfigurationKeys.CUSTOM_TAB_TITLE);
+ String customTabLink = Configuration.get(ConfigurationKeys.CUSTOM_TAB_LINK);
+ if ( customTabLink != null && customTabLink.trim().length() > 0 )
+ headerLinks.add(new IndexLinkBean(customTabText,"javascript:openCustom(\""+customTabLink+"\")"));
+
log.debug("set headerLinks in request");
request.setAttribute("headerLinks", headerLinks);
}
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
diff -u -r4f330473ca3470b13f16da845ad8910e7154bd8f -r76f439627870a81d38a70c4b88d790b6ee07f26a
--- lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 4f330473ca3470b13f16da845ad8910e7154bd8f)
+++ lams_central/web/includes/javascript/openUrls.js (.../openUrls.js) (revision 76f439627870a81d38a70c4b88d790b6ee07f26a)
@@ -16,6 +16,7 @@
var omWin = null;
var pWin = null;
var copyrightWin = null;
+ var customWin = null;
function closeAllChildren(){
if (authorWin && !authorWin.closed) authorWin.closeWindow();
@@ -274,5 +275,20 @@
}
}
+ function openCustom(url) {
+ var left = 0;
+ var top = 0;
+ if(isMac){
+ customWin = window.open(url,'custom','resizable,left='+left+',top='+top+',scrollbars');
+ }else{
+ if(customWin && !customWin.closed ){
+ customWin.focus();
+ }else{
+ customWin = window.open(url,'custom','resizable,left='+left+',top='+top+',scrollbars');
+ customWin.focus();
+ }
+ }
+ }
+
//-->
Index: lams_central/web/main.jsp
===================================================================
diff -u -rcb35388a85a6db9e9212e754e042fa3e77ebb96a -r76f439627870a81d38a70c4b88d790b6ee07f26a
--- lams_central/web/main.jsp (.../main.jsp) (revision cb35388a85a6db9e9212e754e042fa3e77ebb96a)
+++ lams_central/web/main.jsp (.../main.jsp) (revision 76f439627870a81d38a70c4b88d790b6ee07f26a)
@@ -6,6 +6,7 @@
<%@ taglib uri="tags-lams" prefix="lams"%>
<%@ taglib uri="tags-fmt" prefix="fmt"%>
<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn"%>
<%@ taglib uri="tags-tiles" prefix="tiles" %>
<%JspRedirectStrategy.welcomePageStatusUpdate(request, response);%>
@@ -109,7 +110,14 @@
-
+
+
+
+
+
+
+
+
Index: lams_common/db/sql/insert_lams_unix_config_data.sql
===================================================================
diff -u -rfec11f14003474ec669806d7162c1bb8572d5113 -r76f439627870a81d38a70c4b88d790b6ee07f26a
--- lams_common/db/sql/insert_lams_unix_config_data.sql (.../insert_lams_unix_config_data.sql) (revision fec11f14003474ec669806d7162c1bb8572d5113)
+++ lams_common/db/sql/insert_lams_unix_config_data.sql (.../insert_lams_unix_config_data.sql) (revision 76f439627870a81d38a70c4b88d790b6ee07f26a)
@@ -213,3 +213,9 @@
insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
values ('LearnerProgressBatchSize', '10', 'config.learner.progress.batch.size', 'config.header.look.feel', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+values ('CustomTabLink','', 'config.custom.tab.link', 'config.header.look.feel', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+values ('CustomTabTitle','', 'config.custom.tab.title', 'config.header.look.feel', 'STRING', 0);
\ No newline at end of file
Index: lams_common/db/sql/insert_lams_windows_config_data.sql
===================================================================
diff -u -rfec11f14003474ec669806d7162c1bb8572d5113 -r76f439627870a81d38a70c4b88d790b6ee07f26a
--- lams_common/db/sql/insert_lams_windows_config_data.sql (.../insert_lams_windows_config_data.sql) (revision fec11f14003474ec669806d7162c1bb8572d5113)
+++ lams_common/db/sql/insert_lams_windows_config_data.sql (.../insert_lams_windows_config_data.sql) (revision 76f439627870a81d38a70c4b88d790b6ee07f26a)
@@ -213,3 +213,9 @@
insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
values ('LearnerProgressBatchSize', '10', 'config.learner.progress.batch.size', 'config.header.look.feel', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+values ('CustomTabLink','', 'config.custom.tab.link', 'config.header.look.feel', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+values ('CustomTabTitle','', 'config.custom.tab.title', 'config.header.look.feel', 'STRING', 0);
Index: lams_common/db/sql/insert_rams_unix_config_data.sql
===================================================================
diff -u -r1bf50bf03951b953a70c583d748a044afc6c729f -r76f439627870a81d38a70c4b88d790b6ee07f26a
--- lams_common/db/sql/insert_rams_unix_config_data.sql (.../insert_rams_unix_config_data.sql) (revision 1bf50bf03951b953a70c583d748a044afc6c729f)
+++ lams_common/db/sql/insert_rams_unix_config_data.sql (.../insert_rams_unix_config_data.sql) (revision 76f439627870a81d38a70c4b88d790b6ee07f26a)
@@ -212,4 +212,10 @@
values ('LDAPSearchResultsPageSize', '100', 'config.ldap.search.results.page.size', 'config.header.ldap', 'LONG', 0);
insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
-values ('LearnerProgressBatchSize', '10', 'config.learner.progress.batch.size', 'config.header.look.feel', 'LONG', 1);
\ No newline at end of file
+values ('LearnerProgressBatchSize', '10', 'config.learner.progress.batch.size', 'config.header.look.feel', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+values ('CustomTabLink','', 'config.custom.tab.link', 'config.header.look.feel', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+values ('CustomTabTitle','', 'config.custom.tab.title', 'config.header.look.feel', 'STRING', 0);
\ No newline at end of file
Index: lams_common/db/sql/insert_rams_windows_config_data.sql
===================================================================
diff -u -r1bf50bf03951b953a70c583d748a044afc6c729f -r76f439627870a81d38a70c4b88d790b6ee07f26a
--- lams_common/db/sql/insert_rams_windows_config_data.sql (.../insert_rams_windows_config_data.sql) (revision 1bf50bf03951b953a70c583d748a044afc6c729f)
+++ lams_common/db/sql/insert_rams_windows_config_data.sql (.../insert_rams_windows_config_data.sql) (revision 76f439627870a81d38a70c4b88d790b6ee07f26a)
@@ -212,4 +212,10 @@
values ('LDAPSearchResultsPageSize', '100', 'config.ldap.search.results.page.size', 'config.header.ldap', 'LONG', 0);
insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
-values ('LearnerProgressBatchSize', '10', 'config.learner.progress.batch.size', 'config.header.look.feel', 'LONG', 1);
\ No newline at end of file
+values ('LearnerProgressBatchSize', '10', 'config.learner.progress.batch.size', 'config.header.look.feel', 'LONG', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+values ('CustomTabLink','', 'config.custom.tab.link', 'config.header.look.feel', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+values ('CustomTabTitle','', 'config.custom.tab.title', 'config.header.look.feel', 'STRING', 0);
\ No newline at end of file
Index: lams_common/db/sql/updatescripts/alter_21_branching.sql
===================================================================
diff -u -r871606a998d7eb07d714ac9592c178f9df6173af -r76f439627870a81d38a70c4b88d790b6ee07f26a
--- lams_common/db/sql/updatescripts/alter_21_branching.sql (.../alter_21_branching.sql) (revision 871606a998d7eb07d714ac9592c178f9df6173af)
+++ lams_common/db/sql/updatescripts/alter_21_branching.sql (.../alter_21_branching.sql) (revision 76f439627870a81d38a70c4b88d790b6ee07f26a)
@@ -284,4 +284,11 @@
alter table lams_ext_server_org_map modify column orgid bigint(20);
-- LDEV-1473 learner progress url for branching and sequence system tools
-update lams_system_tool set learner_progress_url='monitoring/complexProgress.do' where system_tool_id > 5;
\ No newline at end of file
+update lams_system_tool set learner_progress_url='monitoring/complexProgress.do' where system_tool_id > 5;
+
+-- LDEV-1563 custom tab
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+values ('CustomTabLink','', 'config.custom.tab.link', 'config.header.look.feel', 'STRING', 0);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)
+values ('CustomTabTitle','', 'config.custom.tab.title', 'config.header.look.feel', 'STRING', 0);
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
diff -u -rc5afbded875388afbb25dcdc972af56bf021658a -r76f439627870a81d38a70c4b88d790b6ee07f26a
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision c5afbded875388afbb25dcdc972af56bf021658a)
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision 76f439627870a81d38a70c4b88d790b6ee07f26a)
@@ -211,4 +211,8 @@
/** 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";
+ public static String CUSTOM_TAB_TITLE = "CustomTabTitle";
}
\ No newline at end of file