You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2010/12/13 20:24:16 UTC
svn commit: r1045325 - in /ofbiz/trunk/themes/bluelight:
includes/appbarOpen.ftl webapp/bluelight/style.css
Author: erwan
Date: Mon Dec 13 19:24:15 2010
New Revision: 1045325
URL: http://svn.apache.org/viewvc?rev=1045325&view=rev
Log:
Bluelight theme wasn't displaying secondary apps. Using same display as droppingcrumbs
Modified:
ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl
ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
Modified: ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl?rev=1045325&r1=1045324&r2=1045325&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl Mon Dec 13 19:24:15 2010
@@ -21,17 +21,24 @@ under the License.
<#assign ofbizServerName = application.getAttribute("_serverId")?default("default-server")>
<#assign contextPath = request.getContextPath()>
<#assign displayApps = Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName, "main")>
+<#assign displaySecondaryApps = Static["org.ofbiz.base.component.ComponentConfig"].getAppBarWebInfos(ofbizServerName, "secondary")>
-<#assign showBreadcrumbs = true>
+<#assign appModelMenu = Static["org.ofbiz.widget.menu.MenuFactory"].getMenuFromLocation(applicationMenuLocation,applicationMenuName,delegator,dispatcher)>
+<#if appModelMenu.getModelMenuItemByName(headerItem)?exists>
+ <#if headerItem!="main">
+ <#assign show_last_menu = true>
+ </#if>
+</#if>
<div class="tabbar">
- <div class="breadcrumbs">
+ <div class="breadcrumbs<#if show_last_menu?exists> menu_selected</#if>">
<div class="breadcrumbs-start">
<div id="main-navigation">
<h2>${uiLabelMap.CommonApplications}</h2>
<ul>
<li>
- <ul>
+ <ul><li><ul class="primary">
+ <#-- Primary Applications -->
<#list displayApps as display>
<#assign thisApp = display.getContextRoot()>
<#assign permission = true>
@@ -54,15 +61,42 @@ under the License.
<#if layoutSettings.suppressTab?exists && display.name == layoutSettings.suppressTab>
<!-- do not display this component-->
<#else>
- <#if !selected>
- <li><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
- <#else>
- <li><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
- </#if>
+ <li <#if selected>class="selected"</#if>><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
+ </#if>
+ </#if>
+ </#list>
+ </ul></li>
+ <li><ul class="secondary">
+ <#-- Secondary Applications -->
+ <#list displaySecondaryApps 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) && !authz.hasPermission(session, perm, requestParameters))>
+ <#-- User must have ALL permissions in the base-permission list -->
+ <#assign permission = false>
+ </#if>
+ </#list>
+ <#if permission == true>
+ <#if thisApp == contextPath || contextPath + "/" == thisApp>
+ <#assign selected = true>
+ </#if>
+ <#assign thisURL = thisApp>
+ <#if thisApp != "/">
+ <#assign thisURL = thisURL + "/control/main">
+ </#if>
+ <#if layoutSettings.suppressTab?exists && display.name == layoutSettings.suppressTab>
+ <!-- do not display this component-->
+ <#else>
+ <li <#if selected>class="selected"</#if>><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
</#if>
</#if>
</#list>
</ul>
</li>
</ul>
+ </li>
+ </ul>
</div>
Modified: ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css?rev=1045325&r1=1045324&r2=1045325&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css Mon Dec 13 19:24:15 2010
@@ -1174,6 +1174,9 @@ text-decoration:none;
color:#999999;
} /*Color subcells disabled mode*/
+#main-navigation ul li ul li ul.secondary{
+left:204px;
+}
/* ================================================= */
/* ===== Screenlet Title Bar/Navigation Styles ===== */