[MMBASE SCM] r41281 - in CMSContainer: branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit

[nico]

Author: nico
Date: 2010-03-05 15:39:47 +0100 (Fri, 05 Mar 2010)
New Revision: 41281

Modified:
   
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/pages.tag
   
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/pages.tag
Log:
Jetty requires some whitespave in the EL

Modified: 
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/pages.tag
===================================================================
--- 
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/pages.tag
     2010-03-05 14:26:36 UTC (rev 41280)
+++ 
CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/pages.tag
     2010-03-05 14:39:47 UTC (rev 41281)
@@ -13,8 +13,8 @@
 <c:if test="${empty elementsPerPage}">
    <c:set 
var="elementsPerPage"><%=com.finalist.cmsc.mmbase.PropertiesUtil.getProperty("repository.search.results.per.page")%></c:set>
 </c:if>
-<c:set var="showPages" value="${empty showPages ? 5 :showPages }"/>
-<c:set var="pagesIndex" value="${empty pagesIndex ? 'center' :pagesIndex }"/>
+<c:set var="showPages" value="${empty showPages ? 5 : showPages }"/>
+<c:set var="pagesIndex" value="${empty pagesIndex ? 'center' : pagesIndex }"/>
 <c:set var="offset" value="${empty offset ? 0 : offset }"/>
 <c:set var="search" value="${empty search ? true : search }"/>
 <c:set var="pagesSize" value="${ cmsc:ceil(totalElements/elementsPerPage)}"/>
@@ -25,7 +25,7 @@
 <fmt:message key="pages.go" var="go"/>
 <fmt:message key="searchpages.showresults" var="searchresult">
    <fmt:param>${(totalElements>0)?(offset * elementsPerPage+1):0 }</fmt:param>
-   
<fmt:param>${(totalElements>((offset+1)*elementsPerPage))?((offset+1)*elementsPerPage):totalElements
 }</fmt:param>
+   <fmt:param>${(totalElements>((offset+1)*elementsPerPage)) ? 
((offset+1)*elementsPerPage) : totalElements }</fmt:param>
    <fmt:param>${totalElements}</fmt:param>
 </fmt:message>
 
@@ -67,7 +67,7 @@
       <c:if test="${pagesSize>1}">
          <td style="text-align:right;width:70%;">
             <fmt:message key="searchpages.page"/>:
-                <pg:pager id="${empty pageId?'pager':pageId}" 
items="${totalElements}" maxPageItems="${elementsPerPage}" 
maxIndexPages="${showPages}" 
+                <pg:pager id="${empty pageId ? 'pager' : pageId}" 
items="${totalElements}" maxPageItems="${elementsPerPage}" 
maxIndexPages="${showPages}" 
                  index="${pagesIndex}" isOffset="true" 
export="currentPage=pageNumber">
              
                <c:if test="${not search}">

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/pages.tag
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/pages.tag
     2010-03-05 14:26:36 UTC (rev 41280)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/WEB-INF/tags/edit/pages.tag
     2010-03-05 14:39:47 UTC (rev 41281)
@@ -13,8 +13,8 @@
 <c:if test="${empty elementsPerPage}">
    <c:set 
var="elementsPerPage"><%=com.finalist.cmsc.mmbase.PropertiesUtil.getProperty("repository.search.results.per.page")%></c:set>
 </c:if>
-<c:set var="showPages" value="${empty showPages ? 5 :showPages }"/>
-<c:set var="pagesIndex" value="${empty pagesIndex ? 'center' :pagesIndex }"/>
+<c:set var="showPages" value="${empty showPages ? 5 : showPages }"/>
+<c:set var="pagesIndex" value="${empty pagesIndex ? 'center' : pagesIndex }"/>
 <c:set var="offset" value="${empty offset ? 0 : offset }"/>
 <c:set var="search" value="${empty search ? true : search }"/>
 <c:set var="pagesSize" value="${ cmsc:ceil(totalElements/elementsPerPage)}"/>
@@ -25,7 +25,7 @@
 <fmt:message key="pages.go" var="go"/>
 <fmt:message key="searchpages.showresults" var="searchresult">
    <fmt:param>${(totalElements>0)?(offset * elementsPerPage+1):0 }</fmt:param>
-   
<fmt:param>${(totalElements>((offset+1)*elementsPerPage))?((offset+1)*elementsPerPage):totalElements
 }</fmt:param>
+   <fmt:param>${(totalElements>((offset+1)*elementsPerPage)) ? 
((offset+1)*elementsPerPage) : totalElements }</fmt:param>
    <fmt:param>${totalElements}</fmt:param>
 </fmt:message>
 
@@ -67,7 +67,7 @@
       <c:if test="${pagesSize>1}">
          <td style="text-align:right;width:70%;">
             <fmt:message key="searchpages.page"/>:
-                <pg:pager id="${empty pageId?'pager':pageId}" 
items="${totalElements}" maxPageItems="${elementsPerPage}" 
maxIndexPages="${showPages}" 
+                <pg:pager id="${empty pageId ? 'pager' : pageId}" 
items="${totalElements}" maxPageItems="${elementsPerPage}" 
maxIndexPages="${showPages}" 
                  index="${pagesIndex}" isOffset="true" 
export="currentPage=pageNumber">
              
                <c:if test="${not search}">

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs