Author: nico
Date: 2010-04-03 17:21:56 +0200 (Sat, 03 Apr 2010)
New Revision: 41762

Modified:
   
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-guestbook/src/webapp/WEB-INF/templates/view/guestbook/basic.jsp
   
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-guestbook/src/webapp/editors/config/guestbook/edit_guestbook.xml
   
CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/config/builders/guestbook/guestbook.xml
   
CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/src/webapp/WEB-INF/templates/view/guestbook/basic.jsp
   
CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/src/webapp/editors/config/guestbook/edit_guestbook.xml
Log:
Small pagesize improvements
Show sinlge edit line
Detect empty value in view template

Modified: 
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-guestbook/src/webapp/WEB-INF/templates/view/guestbook/basic.jsp
===================================================================
--- 
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-guestbook/src/webapp/WEB-INF/templates/view/guestbook/basic.jsp
   2010-04-03 15:19:45 UTC (rev 41761)
+++ 
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-guestbook/src/webapp/WEB-INF/templates/view/guestbook/basic.jsp
   2010-04-03 15:21:56 UTC (rev 41762)
@@ -63,7 +63,7 @@
                <c:set var="elementsPerPage" >
                        <mm:field name="pagesize"><mm:isnotempty><mm:write 
/></mm:isnotempty></mm:field>
                </c:set>
-               <c:if test="${elementsPerPage == -1}">
+               <c:if test="${empty elementsPerPage or elementsPerPage lt 1}">
                        <c:set var="elementsPerPage" value="50"/>
                </c:if>
                <mm:relatednodescontainer type="guestmessage" role="posrel">

Modified: 
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-guestbook/src/webapp/editors/config/guestbook/edit_guestbook.xml
===================================================================
--- 
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-guestbook/src/webapp/editors/config/guestbook/edit_guestbook.xml
  2010-04-03 15:19:45 UTC (rev 41761)
+++ 
CMSContainer/branches/b1_7/CMSContainer_Portlets/portlets-guestbook/src/webapp/editors/config/guestbook/edit_guestbook.xml
  2010-04-03 15:21:56 UTC (rev 41762)
@@ -15,7 +15,7 @@
       <prompt xml:lang="nl">Tekst</prompt>
       <prompt xml:lang="zh">主体</prompt>
    </field>
-   <field name="pagesize">
+   <field name="pagesize" dtrequired="true" dtmin="1" >
       <prompt xml:lang="en">Number of message per page</prompt>
       <prompt xml:lang="nl">Aantal berichten per pagina</prompt>
       <prompt xml:lang="zh">每页信息数</prompt>

Modified: 
CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/config/builders/guestbook/guestbook.xml
===================================================================
--- 
CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/config/builders/guestbook/guestbook.xml
 2010-04-03 15:19:45 UTC (rev 41761)
+++ 
CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/config/builders/guestbook/guestbook.xml
 2010-04-03 15:21:56 UTC (rev 41762)
@@ -37,7 +37,9 @@
                     <input>6</input>
                 </positions>
             </editor>
-            <datatype base="field" 
xmlns="http://www.mmbase.org/xmlns/datatypes"/>
+            <datatype base="line" 
xmlns="http://www.mmbase.org/xmlns/datatypes";>
+               <default value="50"/>
+            </datatype>
         </field>
     </fieldlist>
 </builder>

Modified: 
CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/src/webapp/WEB-INF/templates/view/guestbook/basic.jsp
===================================================================
--- 
CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/src/webapp/WEB-INF/templates/view/guestbook/basic.jsp
   2010-04-03 15:19:45 UTC (rev 41761)
+++ 
CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/src/webapp/WEB-INF/templates/view/guestbook/basic.jsp
   2010-04-03 15:21:56 UTC (rev 41762)
@@ -63,7 +63,7 @@
                <c:set var="elementsPerPage" >
                        <mm:field name="pagesize"><mm:isnotempty><mm:write 
/></mm:isnotempty></mm:field>
                </c:set>
-               <c:if test="${elementsPerPage == -1}">
+               <c:if test="${empty elementsPerPage or elementsPerPage lt 1}">
                        <c:set var="elementsPerPage" value="50"/>
                </c:if>
                <mm:relatednodescontainer type="guestmessage" role="posrel">

Modified: 
CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/src/webapp/editors/config/guestbook/edit_guestbook.xml
===================================================================
--- 
CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/src/webapp/editors/config/guestbook/edit_guestbook.xml
  2010-04-03 15:19:45 UTC (rev 41761)
+++ 
CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/src/webapp/editors/config/guestbook/edit_guestbook.xml
  2010-04-03 15:21:56 UTC (rev 41762)
@@ -15,7 +15,7 @@
       <prompt xml:lang="nl">Tekst</prompt>
       <prompt xml:lang="zh">主体</prompt>
    </field>
-   <field name="pagesize">
+   <field name="pagesize" dtrequired="true" dtmin="1" >
       <prompt xml:lang="en">Number of message per page</prompt>
       <prompt xml:lang="nl">Aantal berichten per pagina</prompt>
       <prompt xml:lang="zh">每页信息数</prompt>

_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to