Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.32 -r1.33
--- lams_admin/conf/language/lams/ApplicationResources.properties	8 Feb 2008 03:51:16 -0000	1.32
+++ lams_admin/conf/language/lams/ApplicationResources.properties	3 Mar 2008 23:40:29 -0000	1.33
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.31 -r1.32
--- lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	8 Feb 2008 03:51:16 -0000	1.31
+++ lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	3 Mar 2008 23:40:29 -0000	1.32
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java,v
diff -u -r1.42 -r1.43
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	8 Jan 2008 07:02:32 -0000	1.42
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	3 Mar 2008 23:40:03 -0000	1.43
@@ -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/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v
diff -u -r1.31 -r1.32
--- lams_central/web/main.jsp	7 Dec 2007 00:19:17 -0000	1.31
+++ lams_central/web/main.jsp	3 Mar 2008 23:41:57 -0000	1.32
@@ -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 @@
 	
 				<div class="${tabLeft}"></div>
 				<div class="${tabMiddle}">
-						<lams:TabName url="${headerlink.url}" highlight="${highlight}"><fmt:message key="${headerlink.name}" /></lams:TabName>
+						<c:choose>
+						<c:when test="${fn:startsWith(headerlink.name,'index')}">
+							<lams:TabName url="${headerlink.url}" highlight="${highlight}"><fmt:message key="${headerlink.name}" /></lams:TabName>
+						</c:when>
+						<c:otherwise>
+							<lams:TabName url="${headerlink.url}" highlight="${highlight}"><c:out value="${headerlink.name}" /></lams:TabName>						
+						</c:otherwise>
+						</c:choose>
 				</div>
 				<div class="${tabRight}"></div>
 			</div>
Index: lams_central/web/includes/javascript/openUrls.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/openUrls.js,v
diff -u -r1.24 -r1.25
--- lams_central/web/includes/javascript/openUrls.js	29 Oct 2007 06:21:48 -0000	1.24
+++ lams_central/web/includes/javascript/openUrls.js	3 Mar 2008 23:41:57 -0000	1.25
@@ -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_common/db/sql/insert_lams_unix_config_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_unix_config_data.sql,v
diff -u -r1.19 -r1.20
--- lams_common/db/sql/insert_lams_unix_config_data.sql	18 Dec 2007 05:40:44 -0000	1.19
+++ lams_common/db/sql/insert_lams_unix_config_data.sql	3 Mar 2008 23:39:43 -0000	1.20
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/insert_lams_windows_config_data.sql,v
diff -u -r1.15 -r1.16
--- lams_common/db/sql/insert_lams_windows_config_data.sql	18 Dec 2007 05:40:44 -0000	1.15
+++ lams_common/db/sql/insert_lams_windows_config_data.sql	3 Mar 2008 23:38:08 -0000	1.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_rams_unix_config_data.sql,v
diff -u -r1.11 -r1.12
--- lams_common/db/sql/insert_rams_unix_config_data.sql	9 Dec 2007 23:24:29 -0000	1.11
+++ lams_common/db/sql/insert_rams_unix_config_data.sql	3 Mar 2008 23:38:08 -0000	1.12
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_rams_windows_config_data.sql,v
diff -u -r1.8 -r1.9
--- lams_common/db/sql/insert_rams_windows_config_data.sql	9 Dec 2007 23:24:29 -0000	1.8
+++ lams_common/db/sql/insert_rams_windows_config_data.sql	3 Mar 2008 23:38:08 -0000	1.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/updatescripts/Attic/alter_21_branching.sql,v
diff -u -r1.27 -r1.28
--- lams_common/db/sql/updatescripts/alter_21_branching.sql	14 Jan 2008 23:34:56 -0000	1.27
+++ lams_common/db/sql/updatescripts/alter_21_branching.sql	3 Mar 2008 23:38:21 -0000	1.28
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java,v
diff -u -r1.31 -r1.32
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	9 Nov 2007 08:17:29 -0000	1.31
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	3 Mar 2008 23:39:57 -0000	1.32
@@ -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