You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2014/07/18 11:36:36 UTC

svn commit: r1611575 - in /myfaces/tobago/branches/tobago-3.0.x: ./ tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/03/sheet-filter.xhtml

Author: lofwyr
Date: Fri Jul 18 09:36:36 2014
New Revision: 1611575

URL: http://svn.apache.org/r1611575
Log:
Merged from trunk
TOBAGO-1203: Sheet-Header: Support for input components in header-cells [from revision 1610948]

Modified:
    myfaces/tobago/branches/tobago-3.0.x/   (props changed)
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/03/sheet-filter.xhtml

Propchange: myfaces/tobago/branches/tobago-3.0.x/
------------------------------------------------------------------------------
  Merged /myfaces/tobago/trunk:r1610948

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/03/sheet-filter.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/03/sheet-filter.xhtml?rev=1611575&r1=1611574&r2=1611575&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/03/sheet-filter.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/03/sheet-filter.xhtml Fri Jul 18 09:36:36 2014
@@ -28,14 +28,19 @@
       <tc:gridLayout rows="1*;5*"/>
     </f:facet>
 
-    <tc:out value="Filter demo"/>
+    <tc:panel>
+      Filter demo.
+      <br/>
+      <b>Warning:</b> paging currently doesn't work with filters
+    </tc:panel>
 
     <tc:sheet value="#{sheetFilter.filtered}" id="sheet" rows="20"
               columns="3*;2*;2*;2*" var="luminary"
               state="#{sheetFilter.state}"
-              showRowRange="left"
-              showPageRange="right"
-              showDirectLinks="center">
+              showRowRange="none"
+              showPageRange="none"
+              showDirectLinks="none">
+<!-- XXX paging currently doesn't work with filters -->
 
       <f:facet name="header">
         <tc:form>