svn commit: r1643547 - in /ofbiz/branches/boostrap_theme/themes/bootstrap/includes: appbar.ftl footer.ftl templates/htmlFormMacroLibrary.ftl

[adrianc]

Author: adrianc
Date: Sat Dec  6 16:18:55 2014
New Revision: 1643547

URL: http://svn.apache.org/r1643547
Log:
Bootstrap theme - applied latest patches from Jira issue.

https://issues.apache.org/jira/browse/OFBIZ-5840

Modified:
    ofbiz/branches/boostrap_theme/themes/bootstrap/includes/appbar.ftl
    ofbiz/branches/boostrap_theme/themes/bootstrap/includes/footer.ftl
    ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlFormMacroLibrary.ftl

Modified: ofbiz/branches/boostrap_theme/themes/bootstrap/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/boostrap_theme/themes/bootstrap/includes/appbar.ftl?rev=1643547&r1=1643546&r2=1643547&view=diff
==============================================================================
--- ofbiz/branches/boostrap_theme/themes/bootstrap/includes/appbar.ftl (original)
+++ ofbiz/branches/boostrap_theme/themes/bootstrap/includes/appbar.ftl Sat Dec  6 16:18:55 2014
@@ -18,24 +18,35 @@ under the License.
 -->
 <#assign appModelMenu = Static["org.ofbiz.widget.menu.MenuFactory"].getMenuFromLocation(applicationMenuLocation,applicationMenuName)>
 <#assign modelMenus = Static["org.ofbiz.widget.menu.MenuFactory"].getMenusFromLocation(applicationMenuLocation)>
-<#--  
 
-<div>${appModelMenu?if_exists}</div>
-<div>${applicationMenuLocation}</div>
-<div>${applicationMenuName}</div>
--->
 <#assign menus = modelMenus.keySet()>
 <#assign menuItemList = appModelMenu.menuItemList>
 <#if menuItemList?has_content>
  <nav class="navbar navbar-default" role="navigation" id="app-navigation">
  <ul class="nav navbar-nav">
- <li class="menuTitle">
- <a href="#"><span class="glyphicon glyphicon-cog"></span>&nbsp;${applicationTitle}<#--${context}${parameters.componentName?capitalize}--></a>
- </li>
  <#list menuItemList as item>
  <#assign name = item.name>
  <#assign title = item.getTitle(context)>
- <#assign target = item.getLink().getTarget(context)>
+ <#if (item.getLink().getTarget(context))?has_content>
+ <#assign target = item.getLink().getTarget(context)>
+ <#else>
+ <#if item.getParentPortalPageId(context)?has_content>
+ <#assign parentPortalPageId = item.getParentPortalPageId(context)>
+ <#assign portalPages = Static["org.ofbiz.widget.PortalPageWorker"].getPortalPages(parentPortalPageId, context)>
+ <#list portalPages as portalPage>
+ <#assign name = portalPage.portalPageName>
+ <#assign link = "showPortalPage?portalPageId=${portalPage.portalPageId}">
+ <#if portalPage.parentPortalPageId?has_content>
+ <#assign target = link+"&amp;parentPortalPageId=${portalPage.parentPortalPageId?if_exists}">
+ <#else>
+ <#assign target = link>
+ </#if>
+ <li>
+ <a href="<@ofbizUrl>${target?if_exists}</@ofbizUrl>">${portalPage.get("portalPageName",locale)}</a>
+ </li>
+ </#list>
+ </#if>
+ </#if>
  <#-- Get TabBar submenu based on menu name -->
  <#assign subMenuName = "${name}TabBar">
  <#if menus?seq_contains("${subMenuName}")>
@@ -80,9 +91,15 @@ under the License.
  </#if>
  </#if>
  <#else>
- <li>
- <a href="<@ofbizUrl>${target?if_exists}</@ofbizUrl>">${title?if_exists}</a>
- </li>
+ <#if name == "main">
+ <li class="menuTitle">
+ <a href="<@ofbizUrl>${target?if_exists}</@ofbizUrl>">${applicationTitle}&nbsp;&nbsp;<span class="glyphicon glyphicon-home"></span>&nbsp;</a>
+ </li>
+ <#else>
+ <li>
+ <a href="<@ofbizUrl>${target?if_exists}</@ofbizUrl>">${title?if_exists}</a>
+ </li>
+ </#if>
  </#if>
  </#list>
  </ul>

Modified: ofbiz/branches/boostrap_theme/themes/bootstrap/includes/footer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/boostrap_theme/themes/bootstrap/includes/footer.ftl?rev=1643547&r1=1643546&r2=1643547&view=diff
==============================================================================
--- ofbiz/branches/boostrap_theme/themes/bootstrap/includes/footer.ftl (original)
+++ ofbiz/branches/boostrap_theme/themes/bootstrap/includes/footer.ftl Sat Dec  6 16:18:55 2014
@@ -18,13 +18,22 @@ under the License.
 -->
 <div id="footer" class="panel panel-default">
  <div class="panel-body">
-    <ul class="pull-right">
-        <li class="first">${nowTimestamp?datetime?string.short} - <a href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a></li>
-        <li><a href="<@ofbizUrl>ListLocales</@ofbizUrl>">${locale.getDisplayName(locale)}</a></li>
-    </ul>
- <p class="pull-left">
-   ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} <a href="http://www.apache.org" target="_blank">The Apache Software Foundation</a>. ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz.</a> <#include "ofbizhome://runtime/svninfo.ftl" />
-   </p>
+ <div class="col-sm-4">
+ <p class="pull-left">
+   ${uiLabelMap.CommonCopyright} (c) 2001-${nowTimestamp?string("yyyy")} <a href="http://www.apache.org" target="_blank">The Apache Software Foundation</a>.
+   </p>
+ </div>
+ <div class="col-sm-4">
+ <p style="text-align:center;">
+ ${uiLabelMap.CommonPoweredBy} <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz.</a> <#include "ofbizhome://runtime/svninfo.ftl" />
+ </p>
+ </div>
+ <div class="col-sm-4">
+ <ul class="pull-right">
+        <li style="display:inline;">${nowTimestamp?datetime?string.short} - <a href="<@ofbizUrl>ListTimezones</@ofbizUrl>">${timeZone.getDisplayName(timeZone.useDaylightTime(), Static["java.util.TimeZone"].LONG, locale)}</a></li>
+        <li style="display:inline;">${uiLabelMap.CommonLanguageTitle} - <a href="<@ofbizUrl>ListLocales</@ofbizUrl>">${locale.getDisplayName(locale)}</a></li>
+    </ul>
+ </div>
  </div>  
 </div>
 </div>

Modified: ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlFormMacroLibrary.ftl?rev=1643547&r1=1643546&r2=1643547&view=diff
==============================================================================
--- ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlFormMacroLibrary.ftl Sat Dec  6 16:18:55 2014
@@ -751,19 +751,22 @@ Parameter: lastViewName, String, optiona
 
 <#macro renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl paginateFirstLabel paginatePreviousStyle ajaxPreviousUrl previousUrl paginatePreviousLabel pageLabel ajaxSelectUrl selectUrl ajaxSelectSizeUrl selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl paginateNextLabel paginateLastStyle ajaxLastUrl lastUrl paginateLastLabel paginateViewSizeLabel>
   <#if listSize gt viewSize>
-    <div class="${paginateStyle}">&nbsp;
-      <ul>
-        <li class="${paginateFirstStyle}<#if viewIndex gt 0>"><a href="javascript:void(0)" onclick="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxFirstUrl}')<#else>submitPagination(this, '${firstUrl}')</#if>">${paginateFirstLabel}</a><#else>-disabled"><span>${paginateFirstLabel}</span></#if></li>
-        <li class="${paginatePreviousStyle}<#if viewIndex gt 0>"><a href="javascript:void(0)" onclick="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxPreviousUrl}')<#else>submitPagination(this, '${previousUrl}')</#if>">${paginatePreviousLabel}</a><#else>-disabled"><span>${paginatePreviousLabel}</span></#if></li>
-        <#if listSize gt 0 && javaScriptEnabled><li class="nav-page-select">${pageLabel} <select name="page" size="1" onchange="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxSelectUrl}')<#else>submitPagination(this, '${selectUrl}'+this.value)</#if>"><#rt/>
+    <#-- <div class="${paginateStyle}">&nbsp; -->
+      <nav>
+      <ul class="pagination pull-left">
+        <li class="${paginateFirstStyle}<#if viewIndex gt 0>"><a href="javascript:void(0)" onclick="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxFirstUrl}')<#else>submitPagination(this, '${firstUrl}')</#if>" title="${paginateFirstLabel}">${paginateFirstLabel}</a><#else>-disabled"><span class="glyphicon glyphicon-step-backward"></span></#if></li>
+        <li class="${paginatePreviousStyle}<#if viewIndex gt 0>"><a href="javascript:void(0)" onclick="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxPreviousUrl}')<#else>submitPagination(this, '${previousUrl}')</#if>" title="${paginatePreviousLabel}">${paginatePreviousLabel}</a><#else>-disabled"><span class="glyphicon glyphicon-backward"></span></#if></li>
+        <li class="${paginateNextStyle}<#if highIndex lt listSize>"><a href="javascript:void(0)" onclick="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxNextUrl}')<#else>submitPagination(this, '${nextUrl}')</#if>" title="${paginateNextLabel}"><span class="glyphicon glyphicon-forward"></a><#else>-disabled"><span class="glyphicon glyphicon-forward"></span></#if></li>
+        <li class="${paginateLastStyle}<#if highIndex lt listSize>"><a href="javascript:void(0)" onclick="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxLastUrl}')<#else>submitPagination(this, '${lastUrl}')</#if>" title="${paginateLastLabel}"><span class="glyphicon glyphicon-step-forward"></span></a><#else>-disabled"><span class="glyphicon glyphicon-step-forward"></span></#if></li>
+ </ul>
+ <ul class="pagination pull-right">
+        <#if listSize gt 0 && javaScriptEnabled><li class="nav-page-select">${pageLabel} <select style="margin:0px;font-size:100%;" name="page" size="1" onchange="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxSelectUrl}')<#else>submitPagination(this, '${selectUrl}'+this.value)</#if>"><#rt/>
           <#assign x=(listSize/viewSize)?ceiling>
             <#list 1..x as i>
               <#if i == (viewIndex+1)><option selected="selected" value="<#else><option value="</#if>${i-1}">${i}</option>
             </#list>
           </select></li>
         </#if>
-        <li class="${paginateNextStyle}<#if highIndex lt listSize>"><a href="javascript:void(0)" onclick="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxNextUrl}')<#else>submitPagination(this, '${nextUrl}')</#if>">${paginateNextLabel}</a><#else>-disabled"><span>${paginateNextLabel}</span></#if></li>
-        <li class="${paginateLastStyle}<#if highIndex lt listSize>"><a href="javascript:void(0)" onclick="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxLastUrl}')<#else>submitPagination(this, '${lastUrl}')</#if>">${paginateLastLabel}</a><#else>-disabled"><span>${paginateLastLabel}</span></#if></li>
         <#if javaScriptEnabled><li class="nav-pagesize"><select name="pageSize" size="1" onchange="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxSelectSizeUrl}')<#else>submitPagination(this, '${selectSizeUrl}')</#if>"><#rt/>
             <#assign availPageSizes = [20, 30, 50, 100, 200]>
           <#list availPageSizes as ps>
@@ -773,7 +776,8 @@ Parameter: lastViewName, String, optiona
         </#if>
         <li class="nav-displaying">${commonDisplaying}</li>
       </ul>
-    </div>
+      </nav>
+    <#-- </div> -->
   </#if>
 </#macro>