[OFBiz] SVN: r5623 - in trunk: applications/content/webapp/content/includes applications/marketing/webapp/marketing/includes applications/workeffort/webapp/workeffort/includes framework/common/webcommon/includes

[jonesde at svn.ofbiz.org]

Author: jonesde
Date: 2005-09-01 15:29:02 -0500 (Thu, 01 Sep 2005)
New Revision: 5623

Modified:
   trunk/applications/content/webapp/content/includes/appbar.ftl
   trunk/applications/marketing/webapp/marketing/includes/appbar.ftl
   trunk/applications/workeffort/webapp/workeffort/includes/appbar.ftl
   trunk/framework/common/webcommon/includes/appbar.ftl
Log:
Changed appbar.ftl files so that if _serverId attribute is not present it will fall back to default-server which comes from SVN by default in the ofbiz-component.xml files; with this it will still work in external instead of embedded app servers

Modified: trunk/applications/content/webapp/content/includes/appbar.ftl
===================================================================
--- trunk/applications/content/webapp/content/includes/appbar.ftl	2005-09-01 20:25:24 UTC (rev 5622)
+++ trunk/applications/content/webapp/content/includes/appbar.ftl	2005-09-01 20:29:02 UTC (rev 5623)
@@ -26,7 +26,7 @@
 
 <#assign security = requestAttributes.security>
 <#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>
-<#assign ofbizServerName = application.getAttribute("_serverId")?if_exists>
+<#assign ofbizServerName = application.getAttribute("_serverId")?default("default-server")>
 <#assign contextPath = request.getContextPath()>
 <#assign displayApps = Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName)>
 

Modified: trunk/applications/marketing/webapp/marketing/includes/appbar.ftl
===================================================================
--- trunk/applications/marketing/webapp/marketing/includes/appbar.ftl	2005-09-01 20:25:24 UTC (rev 5622)
+++ trunk/applications/marketing/webapp/marketing/includes/appbar.ftl	2005-09-01 20:29:02 UTC (rev 5623)
@@ -26,7 +26,7 @@
 
 <#assign security = requestAttributes.security>
 <#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>
-<#assign ofbizServerName = application.getAttribute("_serverId")?if_exists>
+<#assign ofbizServerName = application.getAttribute("_serverId")?default("default-server")>
 <#assign contextPath = request.getContextPath()>
 <#assign displayApps = Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName)>
 

Modified: trunk/applications/workeffort/webapp/workeffort/includes/appbar.ftl
===================================================================
--- trunk/applications/workeffort/webapp/workeffort/includes/appbar.ftl	2005-09-01 20:25:24 UTC (rev 5622)
+++ trunk/applications/workeffort/webapp/workeffort/includes/appbar.ftl	2005-09-01 20:29:02 UTC (rev 5623)
@@ -26,7 +26,7 @@
 
 <#assign security = requestAttributes.security>
 <#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists>
-<#assign ofbizServerName = application.getAttribute("_serverId")?if_exists>
+<#assign ofbizServerName = application.getAttribute("_serverId")?default("default-server")>
 <#assign contextPath = request.getContextPath()>
 <#assign displayApps = Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName)>
 

Modified: trunk/framework/common/webcommon/includes/appbar.ftl
===================================================================
--- trunk/framework/common/webcommon/includes/appbar.ftl	2005-09-01 20:25:24 UTC (rev 5622)
+++ trunk/framework/common/webcommon/includes/appbar.ftl	2005-09-01 20:29:02 UTC (rev 5623)
@@ -1,5 +1,5 @@
 <#--
- *  Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ *  Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a
  *  copy of this software and associated documentation files (the "Software"),
@@ -27,7 +27,7 @@
 <#if (requestAttributes.security)?exists><#assign security = requestAttributes.security></#if>
 <#if (requestAttributes.externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if>
 <#if (externalLoginKey)?exists><#assign externalKeyParam = "?externalLoginKey=" + requestAttributes.externalLoginKey?if_exists></#if>
-<#assign ofbizServerName = application.getAttribute("_serverId")?if_exists>
+<#assign ofbizServerName = application.getAttribute("_serverId")?default("default-server")>
 <#assign contextPath = request.getContextPath()>
 <#assign displayApps = Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName)>
 <#if requestAttributes.uiLabelMap?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
@@ -42,7 +42,7 @@
   <tr bgcolor="#FFFFFF">
     <td><div class="appbarleft"></div></td>
     <td height="15" width="100%">
-	  <table width="100%" border="0" cellspacing="0" cellpadding="0">
+      <table width="100%" border="0" cellspacing="0" cellpadding="0">
         <tr>
           <#list displayApps as display>
             <#assign thisApp = display.getContextRoot()>
@@ -74,7 +74,7 @@
               </td>
             </#if>
           </#list>
-		  <td><div class="appbarright"></div></td>
+          <td><div class="appbarright"></div></td>
           <td width="100%" class="appbarresize">
             <table width="100%" border="0" cellspacing="0" cellpadding="0">
               <tr>
@@ -88,4 +88,3 @@
   </tr>
 </table>
 </#if>
-