You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mk...@apache.org on 2006/05/17 19:04:40 UTC

svn commit: r407321 - in /myfaces/tomahawk/trunk/examples/simple/src/main/webapp: home.jsp newspaperTable.jsp

Author: mkienenb
Date: Wed May 17 10:04:39 2006
New Revision: 407321

URL: http://svn.apache.org/viewvc?rev=407321&view=rev
Log:
Fix for TOMAHAWK-5 -- Marking newspaperTable as deprecated.  Updating examples.

Modified:
    myfaces/tomahawk/trunk/examples/simple/src/main/webapp/home.jsp
    myfaces/tomahawk/trunk/examples/simple/src/main/webapp/newspaperTable.jsp

Modified: myfaces/tomahawk/trunk/examples/simple/src/main/webapp/home.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/webapp/home.jsp?rev=407321&r1=407320&r2=407321&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/webapp/home.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/webapp/home.jsp Wed May 17 10:04:39 2006
@@ -41,6 +41,7 @@
                     <h:outputLink value="crossDataTable.jsf" ><f:verbatim>Dynamic number of columns, add a column</f:verbatim></h:outputLink>
                     <h:outputLink value="optDataTable.jsf" ><f:verbatim>Optional Header/Footer</f:verbatim></h:outputLink>
                     <h:outputLink value="simpleGroupBy.jsf" ><f:verbatim>Group by columns</f:verbatim></h:outputLink>
+                	<h:outputLink value="newspaperTable.jsf" ><f:verbatim>Newspaper Table</f:verbatim></h:outputLink>
                 </h:panelGrid>
                 <h:outputLink value="selectbox.jsf" ><f:verbatim>Select boxes</f:verbatim></h:outputLink>
                 <h:outputLink value="fileupload.jsf" ><f:verbatim>File upload</f:verbatim></h:outputLink>
@@ -75,7 +76,6 @@
                 </h:panelGrid>
                 <h:outputLink value="panelstack.jsf" ><f:verbatim>Panel Stack</f:verbatim></h:outputLink>
                 <h:outputLink value="css.jsf" ><f:verbatim>Style Sheet</f:verbatim></h:outputLink>
-                <h:outputLink value="newspaperTable.jsf" ><f:verbatim>Newspaper Table</f:verbatim></h:outputLink>
                 <h:outputLink value="swapimage.jsf" ><f:verbatim>Swap Image</f:verbatim></h:outputLink>
                 <h:outputLink value="collapsiblePanel.jsf" ><f:verbatim>Collapsible Panel</f:verbatim></h:outputLink>
                 <h:outputLink value="testExceptions.jsf" ><f:verbatim>Test the custom error page - not really jsf stuff, but a demonstration how to print the real exception</f:verbatim></h:outputLink>

Modified: myfaces/tomahawk/trunk/examples/simple/src/main/webapp/newspaperTable.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/webapp/newspaperTable.jsp?rev=407321&r1=407320&r2=407321&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/webapp/newspaperTable.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/webapp/newspaperTable.jsp Wed May 17 10:04:39 2006
@@ -35,34 +35,70 @@
 
     <f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
 
-    <t:newspaperTable id="data"
-            newspaperColumns="2"
-            styleClass="standardTable"
-            headerClass="standardTable_Header"
-            footerClass="standardTable_Header"
-            rowClasses="standardTable_Row1,standardTable_Row2"
-            columnClasses="standardTable_Column,standardTable_ColumnCentered,standardTable_Column"
-            var="country"
-            value="#{countryList.countries}">
-           <f:facet name="spacer">
-             <f:verbatim> &nbsp; </f:verbatim>
-           </f:facet>
-       <h:column>
-           <f:facet name="header">
-              <h:outputText value="#{example_messages['label_country_name']}" />
-           </f:facet>
-            <h:outputText value="#{country.name}" />
-       </h:column>
-
-       <h:column>
-           <f:facet name="header">
-              <h:outputText value="#{example_messages['label_country_iso']}" />
-           </f:facet>
-           <h:outputText value="#{country.isoCode}" />
-       </h:column>
-
-    </t:newspaperTable>
+    <h:panelGrid columns="1">
+    
+		<h:outputText value="Implementation using obsolete t:newspaperTable" />
+	
+	    <t:newspaperTable id="dataOld"
+	            newspaperColumns="2"
+	            styleClass="standardTable"
+	            headerClass="standardTable_Header"
+	            footerClass="standardTable_Header"
+	            rowClasses="standardTable_Row1,standardTable_Row2"
+	            columnClasses="standardTable_Column,standardTable_ColumnCentered,standardTable_Column"
+	            var="country"
+	            value="#{countryList.countries}">
+	           <f:facet name="spacer">
+	             <f:verbatim> &nbsp; </f:verbatim>
+	           </f:facet>
+	       <h:column>
+	           <f:facet name="header">
+	              <h:outputText value="#{example_messages['label_country_name']}" />
+	           </f:facet>
+	            <h:outputText value="#{country.name}" />
+	       </h:column>
+	
+	       <h:column>
+	           <f:facet name="header">
+	              <h:outputText value="#{example_messages['label_country_iso']}" />
+	           </f:facet>
+	           <h:outputText value="#{country.isoCode}" />
+	       </h:column>
+	
+	    </t:newspaperTable>
+	
+		<h:outputText value="Implementation using t:dataTable" />
+	
+	    <t:dataTable id="dataNew"
+	            newspaperColumns="2"
+	            styleClass="standardTable"
+	            headerClass="standardTable_Header"
+	            footerClass="standardTable_Header"
+	            rowClasses="standardTable_Row1,standardTable_Row2"
+	            columnClasses="standardTable_Column,standardTable_ColumnCentered,standardTable_Column"
+	            var="country"
+	            value="#{countryList.countries}">
+	           <f:facet name="spacer">
+	             <f:verbatim> &nbsp; </f:verbatim>
+	           </f:facet>
+	       <h:column>
+	           <f:facet name="header">
+	              <h:outputText value="#{example_messages['label_country_name']}" />
+	           </f:facet>
+	            <h:outputText value="#{country.name}" />
+	       </h:column>
+	
+	       <h:column>
+	           <f:facet name="header">
+	              <h:outputText value="#{example_messages['label_country_iso']}" />
+	           </f:facet>
+	           <h:outputText value="#{country.isoCode}" />
+	       </h:column>
+	
+	    </t:dataTable>
 
+	</h:panelGrid>
+	
 </f:view>
 
 <%@include file="inc/page_footer.jsp" %>