svn commit: r1682590 - in /ofbiz/branches/boostrap_theme/themes/bootstrap: includes/templates/htmlFormMacroLibrary.ftl webapp/bootstrap/css/skins/tomahawk.css

[jn...@apache.org]

Author: jnicolas
Date: Sat May 30 09:01:59 2015
New Revision: 1682590

URL: http://svn.apache.org/r1682590
Log:
fix paginate issue JIRA-OFBIZ-6326

Modified:
    ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlFormMacroLibrary.ftl
    ofbiz/branches/boostrap_theme/themes/bootstrap/webapp/bootstrap/css/skins/tomahawk.css

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=1682590&r1=1682589&r2=1682590&view=diff
==============================================================================
--- ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/boostrap_theme/themes/bootstrap/includes/templates/htmlFormMacroLibrary.ftl Sat May 30 09:01:59 2015
@@ -752,14 +752,14 @@ 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; -->
-      <nav>
+      <nav class="paginate-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">
+        <li class="${paginateFirstStyle}<#if viewIndex gt 0>"><a href="javascript:void(0)" onclick="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxFirstUrl}')<#else>submitPagination(this, '${firstUrl}')</#if>" title="${paginateFirstLabel}"><span class="glyphicon glyphicon-step-backward"></span></a><#else> disabled"><a><span class="glyphicon glyphicon-step-backward"></span></a></#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}"><span class="glyphicon glyphicon-step-backward"></span></a><#else> disabled"><a><span class="glyphicon glyphicon-backward"></span></a></#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"><a><span class="glyphicon glyphicon-forward"></span></a></#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"><a><span class="glyphicon glyphicon-step-forward"></span></a></#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>

Modified: ofbiz/branches/boostrap_theme/themes/bootstrap/webapp/bootstrap/css/skins/tomahawk.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/boostrap_theme/themes/bootstrap/webapp/bootstrap/css/skins/tomahawk.css?rev=1682590&r1=1682589&r2=1682590&view=diff
==============================================================================
--- ofbiz/branches/boostrap_theme/themes/bootstrap/webapp/bootstrap/css/skins/tomahawk.css (original)
+++ ofbiz/branches/boostrap_theme/themes/bootstrap/webapp/bootstrap/css/skins/tomahawk.css Sat May 30 09:01:59 2015
@@ -31,7 +31,9 @@ nav#app-navigation.navbar.navbar-default
 	background-image: linear-gradient(to bottom, #fff 0px, #e0e0e0 100%);
     box-shadow: 0 1px 0 rgba(255, 255, 255, 0.15) inset, 0 1px 5px rgba(0, 0, 0, 0.075);
 }
-
+nav.paginate-nav {
+    padding-bottom: 15px;
+}
 .navbar-nav li.menuTitle {
 	background-image: linear-gradient(to bottom, #E5B642 0px, #F0D532 100%);
     background-repeat: repeat-x;