OFBiz › OFBiz - Commits

svn commit: r737309 - in /ofbiz/trunk: framework/common/webcommon/includes/footer.ftl framework/common/webcommon/includes/header.ftl themes/bluelight/includes/footer.ftl

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r737309 - in /ofbiz/trunk: framework/common/webcommon/includes/footer.ftl framework/common/webcommon/includes/header.ftl themes/bluelight/includes/footer.ftl

Author: jleroux
Date: Sat Jan 24 06:56:32 2009
New Revision: 737309

URL: http://svn.apache.org/viewvc?rev=737309&view=rev
Log:
A patch from Bruno Busco "Drop-down Applications Bar" '(https://issues.apache.org/jira/browse/OFBIZ-2118) - OFBIZ-2118

Modified:
ofbiz/trunk/framework/common/webcommon/includes/footer.ftl
ofbiz/trunk/framework/common/webcommon/includes/header.ftl
ofbiz/trunk/themes/bluelight/includes/footer.ftl

Modified: ofbiz/trunk/framework/common/webcommon/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/footer.ftl?rev=737309&r1=737308&r2=737309&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/footer.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/footer.ftl Sat Jan 24 06:56:32 2009
@@ -65,5 +65,7 @@
<script type="text/javascript" src="<@ofbizContentUrl>${javaScript}</@ofbizContentUrl>" type="text/javascript"></script>
</#list>
</#if>
+
+</div>
</body>
</html>

Modified: ofbiz/trunk/framework/common/webcommon/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/header.ftl?rev=737309&r1=737308&r2=737309&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/includes/header.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/includes/header.ftl Sat Jan 24 06:56:32 2009
@@ -89,6 +89,7 @@
<#assign logoLinkURL = "${layoutSettings.commonHeaderImageLinkUrl}">
</#if>
<body>
+ <div class="page-container">
<div class="hidden">
<a href="#column-container" title="${uiLabelMap.CommonSkipNavigation}" accesskey="2">
${uiLabelMap.CommonSkipNavigation}

Modified: ofbiz/trunk/themes/bluelight/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/footer.ftl?rev=737309&r1=737308&r2=737309&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/footer.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/footer.ftl Sat Jan 24 06:56:32 2009
@@ -24,55 +24,4 @@
</div>
</div>

-<#assign nowTimestamp = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp()>
-
-<#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, "secondary")>
-
-<#if userLogin?has_content>
-<center>
- <div id="secondary-navigation">
- <#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)>
- <#-- 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>
- <a<#if selected> class="selected"</#if> href="${response.encodeURL(thisURL + externalKeyParam)}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}"> ${display.title}</#if></a>
- </#if>
- </#list>
- </div>
-</center>
-</#if>
-
-<div id="footer">
- <p><a href="http://jigsaw.w3.org/css-validator/"><img src="<@ofbizContentUrl>/images/vcss.gif</@ofbizContentUrl>" alt="Valid CSS!"/></a>
- <a href="http://validator.w3.org/check?uri=referer"><img src="<@ofbizContentUrl>/images/valid-xhtml10.png</@ofbizContentUrl>" alt="Valid XHTML 1.0!"/></a></p>
- <p>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" target="_blank">www.apache.org</a><br />
- Powered by <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a></p>
-</div>
-<#if layoutSettings.VT_FTR_JAVASCRIPT?has_content>
- <#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript>
- <script type="text/javascript" src="<@ofbizContentUrl>${javaScript}</@ofbizContentUrl>" type="text/javascript"></script>
- </#list>
-</#if>
-
-</div>
-</body>
-</html>
+<#include "component://common/webcommon/includes/footer.ftl" />