svn commit: r833378 - in /ofbiz/trunk: framework/widget/templates/htmlFormMacroLibrary.ftl themes/bluelight/webapp/bluelight/style.css

[jl...@apache.org]

Author: jleroux
Date: Fri Nov  6 12:43:22 2009
New Revision: 833378

URL: http://svn.apache.org/viewvc?rev=833378&view=rev
Log:
A patch from Bruno Busco "Adding pagination icons to Bluelight theme" (https://issues.apache.org/jira/browse/OFBIZ-3168) - OFBIZ-3168
A change that allows a theme to replace the "Prev" "Next" labels with icons. Now only on Blue Light theme/

Modified:
    ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
    ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css

Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=833378&r1=833377&r2=833378&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Fri Nov  6 12:43:22 2009
@@ -428,8 +428,8 @@
 <#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 20>
 <div class="${paginateStyle}">&nbsp; <ul>
-<li class="${paginateFirstStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxFirstUrl}')<#else>${firstUrl}</#if>">${paginateFirstLabel}</a><#else>-disabled">${paginateFirstLabel}</#if></li>
-<li class="${paginatePreviousStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxPreviousUrl}')<#else>${previousUrl}</#if>">${paginatePreviousLabel}</a><#else>-disabled">${paginatePreviousLabel}</#if></li>
+<li class="${paginateFirstStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxFirstUrl}')<#else>${firstUrl}</#if>">${paginateFirstLabel}</a><#else>-disabled"><span>${paginateFirstLabel}</span></#if></li>
+<li class="${paginatePreviousStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxPreviousUrl}')<#else>${previousUrl}</#if>">${paginatePreviousLabel}</a><#else>-disabled"><span>${paginatePreviousLabel}</span></#if></li>
 <#if listSize gt 0 && javaScriptEnabled><li>${pageLabel}<select name="page" size="1" onchange="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxSelectUrl}')<#else>location.href='${selectUrl}'+this.value;</#if>"><#rt/>
 <#assign x=listSize/viewSize?floor>
 <#if listSize gt (viewIndex*viewSize)><#assign x=x+1></#if>
@@ -437,15 +437,15 @@
 <#if i == (viewIndex+1)><option selected="selected" value="<#else><option value="</#if>${i-1}">${i}</option>
 </#list>
 </select></li></#if>
-<li>${commonDisplaying}</li>
-<li class="${paginateNextStyle}<#if highIndex lt listSize>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxNextUrl}')<#else>${nextUrl}</#if>">${paginateNextLabel}</a><#else>-disabled">${paginateNextLabel}</#if></li>
-<li class="${paginateLastStyle}<#if highIndex lt listSize>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxLastUrl}')<#else>${lastUrl}</#if>">${paginateLastLabel}</a><#else>-disabled">${paginateLastLabel}</#if></li>
+<li class="${paginateNextStyle}<#if highIndex lt listSize>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxNextUrl}')<#else>${nextUrl}</#if>">${paginateNextLabel}</a><#else>-disabled"><span>${paginateNextLabel}</span></#if></li>
+<li class="${paginateLastStyle}<#if highIndex lt listSize>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxLastUrl}')<#else>${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>javascript:ajaxUpdateAreas('${ajaxSelectSizeUrl}')<#else>location.href='${selectSizeUrl}';</#if>"><#rt/>
 <#assign availPageSizes = [20, 30, 50, 100, 200]>
 <#list availPageSizes as ps>
   <option <#if viewSize == ps>selected="selected" </#if> value="${ps}">${ps}</option>
 </#list>
 </select> ${paginateViewSizeLabel}</li></#if>
+<li>${commonDisplaying}</li>
 </ul></div><br/>
 </#if>
 </#macro>

Modified: ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css?rev=833378&r1=833377&r2=833378&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css Fri Nov  6 12:43:22 2009
@@ -1802,24 +1802,47 @@
 }
 
 .nav-pager ul li a {
-    display: block;
+display: block;
+height: 16px;
+width: 16px;
+text-indent:-3000px;
 }
 
-.nav-pager ul .nav-first,.nav-pager ul .nav-previous,.nav-pager ul .nav-next,.nav-pager ul .nav-last
-    {
-    border: #999999 solid 0.1em;
-    padding: 0 1em 0 1em;
+.nav-pager ul li span {
+display:none;
+visibility:hidden;
+display: block;
+height: 16px;
+width: 16px;
 }
 
-.nav-pager ul .nav-first-disabled,.nav-pager ul .nav-previous-disabled,.nav-pager ul .nav-next-disabled,.nav-pager ul .nav-last-disabled
-    {
-    border: #999999 solid 0.1em;
-    color: #333333;
-    padding: 0 0.5em 0 0.5em;
-}
 
-.nav-pager select {
-    margin: 0;
+.nav-pager ul .nav-first a {
+background: url(/bluelight/images/resultset_first.png) no-repeat;
+}
+.nav-pager ul .nav-previous a {
+background: url(/bluelight/images/resultset_previous.png) no-repeat;
+}
+.nav-pager ul .nav-next a {
+background: url(/bluelight/images/resultset_next.png) no-repeat;
+}
+.nav-pager ul .nav-last a {
+background: url(/bluelight/images/resultset_last.png) no-repeat;
+}
+.nav-pager ul .nav-first-disabled {
+background: url(/bluelight/images/resultset_first_disabled.png) no-repeat;
+}
+.nav-pager ul .nav-previous-disabled {
+background: url(/bluelight/images/resultset_previous_disabled.png) no-repeat;
+}
+.nav-pager ul .nav-next-disabled {
+background: url(/bluelight/images/resultset_next_disabled.png) no-repeat;
+}
+.nav-pager ul .nav-last-disabled {
+background: url(/bluelight/images/resultset_last_disabled.png) no-repeat;
+}
+.nav-pager ul .nav-pagesize {
+padding: 0 30px 0 30px;
 }
 
 /* ================================= */