svn commit: r528927 - /ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl

[jacopoc]

Author: jacopoc
Date: Sat Apr 14 21:43:49 2007
New Revision: 528927

URL: http://svn.apache.org/viewvc?view=rev&rev=528927
Log:
Applied patch from Adian Crum (OFBIZ-892) to refactor the layout of the main application bar: it now uses the same style of the other menu bars and so it is simpler and less graphically rich.
This is a Commit-Then-Review approach: if you don't like it I'll revert this change.

Modified:
    ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl

Modified: ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl?view=diff&rev=528927&r1=528926&r2=528927
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/appbar.ftl Sat Apr 14 21:43:49 2007
@@ -17,67 +17,33 @@
 under the License.
 -->
 
-<#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")?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>
-
-<#if requestAttributes.userLogin?has_content><#assign userLogin = requestAttributes.userLogin></#if>
 
 <#if userLogin?has_content>
-<#assign unselectedClass = {"col" : "tabdownblock", "left" : "tabdownleft", "center" : "tabdowncenter", "right" : "tabdownright", "link" : "tablink"}>
-<#assign selectedClass = {"col" : "mainblock", "left" : "tabupleft", "center" : "tabupcenter", "right" : "tabupright", "link" : "tablinkselected"}>
-
-<table align="center" width="100%" border="0" cellspacing="0" cellpadding="0">
-  <tr class="appbar">
-    <td><div class="appbarleft"></div></td>
-    <td height="15" width="100%">
-      <table width="100%" border="0" cellspacing="0" cellpadding="0">
-          <tr>
-          <#list displayApps as display>
-            <#assign thisApp = display.getContextRoot()>
-            <#assign permission = true>
-            <#assign permissions = display.getBasePermission()>
-            <#list permissions as perm>
-                <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session))>
-                    <#assign permission = false>
-                </#if>
-            </#list>
-            <#if permission == true>
-              <#if thisApp == contextPath>
-                <#assign class = selectedClass>
-              <#else>
-                <#assign class = unselectedClass>
-              </#if>
-              <td height="15" class="${class.col}">
-                <table width="100%" border="0" cellspacing="0" cellpadding="0">
-                  <tr>
-                    <td class="${class.left}"><a href="${response.encodeURL(thisApp + "/control/main" + externalKeyParam)}" title="" class="${class.link}"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" width="10" height="15" border="0"/></a></td>
-                    <td nowrap="nowrap" class="${class.center}"><a href="${response.encodeURL(thisApp + "/control/main" + externalKeyParam)}" title="" class="${class.link}"><#if uiLabelMap?exists>${uiLabelMap[display.title]}<#else>${display.title}</#if></a></td>
-                    <td class="${class.right}"><a href="${response.encodeURL(thisApp + "/control/main" + externalKeyParam)}" title="" class="${class.link}"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" width="10" height="15" border="0"/></a></td>
-                  </tr>
-                  <#if thisApp != contextPath>
-                    <tr><td colspan="3" class="blackarea"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" height="1"/></td></tr>
-                    <tr><td colspan="3" class="whitearea"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" height="1"/></td></tr>
-                  </#if>
-                </table>
-              </td>
-            </#if>
-          </#list>
-          <td><div class="appbarright"></div></td>
-          <td width="100%" class="appbarresize">
-            <table width="100%" border="0" cellspacing="0" cellpadding="0">
-              <tr>
-                <td class="whitearea"><img src="<@ofbizContentUrl>/images/spacer.gif</@ofbizContentUrl>" alt="" height="1"/></td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
+  <div id="main-navigation">
+    <ul>
+      <#list displayApps as display>
+        <#assign thisApp = display.getContextRoot()>
+        <#assign permission = true>
+        <#assign selected = false>
+        <#assign permissions = display.getBasePermission()>
+        <#list permissions as perm>
+          <#if (perm != "NONE" && !security.hasEntityPermission(perm, "_VIEW", session))>
+            <#assign permission = false>
+          </#if>
+        </#list>
+        <#if permission == true>
+          <#if thisApp == contextPath>
+            <#assign selected = true>
+          </#if>
+          <li<#if selected> class="selected"</#if>><a href="${response.encodeURL(thisApp + "/control/main" + externalKeyParam)}" title=""><#if uiLabelMap?exists>${uiLabelMap[display.title]}<#else>${display.title}</#if></a></li>
+        </#if>
+      </#list>
+    </ul>
+    <br class="clear"/>
+  </div>
 </#if>