myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r548392 - in /myfaces/tobago/trunk/example/demo/src/main: java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java webapp/WEB-INF/tags/layout/overview.tag webapp/overview/sheet.jsp webapp/reference/input.jsp
Date Mon, 18 Jun 2007 16:22:44 GMT
Author: lofwyr
Date: Mon Jun 18 09:22:42 2007
New Revision: 548392

URL: http://svn.apache.org/viewvc?view=rev&rev=548392
Log:
Make demo nicer:
+ using tc:separator
+ reference input samples
+ enlarge general layout

Modified:
    myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java
    myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag
    myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.jsp
    myfaces/tobago/trunk/example/demo/src/main/webapp/reference/input.jsp

Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java?view=diff&rev=548392&r1=548391&r2=548392
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java
(original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/SheetConfig.java
Mon Jun 18 09:22:42 2007
@@ -56,7 +56,7 @@
 
   public SheetConfig() {
     sheetFirst = 0;
-    sheetRows = 7;
+    sheetRows = 10;
     sheetDirectLinkCount = 5;
     sheetDirectLinkCountItems = createSheetItems(new Integer[]{1, 2, 3, 4, 5, 6, 7, 8, 9,
10, 11, 12, 13, 14, 15});
     sheetShowHeader = true;

Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag?view=diff&rev=548392&r1=548391&r2=548392
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/tags/layout/overview.tag Mon
Jun 18 09:22:42 2007
@@ -19,7 +19,7 @@
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
 <f:view locale="#{clientConfigController.locale}">
   <tc:loadBundle basename="overview" var="overviewBundle"/>
-  <tc:page applicationIcon="icon/favicon.ico" label="#{overviewBundle.pageTitle}" id="page"
width="800px" height="600px">
+  <tc:page applicationIcon="icon/favicon.ico" label="#{overviewBundle.pageTitle}" id="page"
width="1000px" height="700px">
 
     <jsp:include page="/menu.jsp" />
     <%--f:facet name="backButtonDetector">

Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.jsp?view=diff&rev=548392&r1=548391&r2=548392
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/sheet.jsp Mon Jun 18 09:22:42
2007
@@ -21,137 +21,131 @@
 <%@ page pageEncoding="UTF-8" %>
 <layout:overview>
   <jsp:body>
-    <tc:panel>
+    <tc:box label="#{overviewBundle.sheet_sampleTitle}" id="sheetBox">
       <f:facet name="layout">
         <tc:gridLayout rows="2*;3*"/>
       </f:facet>
+      <f:facet name="toolBar">
+        <tc:toolBar>
+          <tc:toolBarCommand label="#" tip="#{overviewBundle.sheet_configTip}">
+            <tc:attribute name="renderedPartially" value="sheetConfigPopup"/>
+            <f:facet name="popup">
+              <tc:popup width="300" height="270" id="sheetConfigPopup">
+                <tc:box label="#{overviewBundle.sheet_configTitle}">
+                  <f:facet name="layout">
+                    <tc:gridLayout rows="fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;1*;fixed"/>
+                  </f:facet>
+                  <tx:selectOneChoice label="showHeader"
+                                      value="#{overviewController.sheetConfig.sheetShowHeader}"
+                                      tip="TODO: show Header Text">
+                    <f:selectItem itemValue="#{true}" itemLabel="True"/>
+                    <f:selectItem itemValue="#{false}" itemLabel="False"/>
+                  </tx:selectOneChoice>
+                       <tx:in label="first"
+                         value="#{overviewController.sheetConfig.sheetFirst}"
+                         tip="TODO: paging Start Text">
+                    <f:validateLongRange minimum="0"/>
+                  </tx:in>
+                  <tx:in label="rows"
+                         value="#{overviewController.sheetConfig.sheetRows}"
+                         tip="TODO: paging Lenght Text">
+                    <f:validateLongRange minimum="1"/>
+                  </tx:in>
+
+                  <tx:selectOneChoice label="showRowRange"
+                                      value="#{overviewController.sheetConfig.sheetRowPagingPosition}"
+                                      tip="TODO: paging DirectLinkCount Text">
+                    <f:selectItems value="#{overviewController.sheetConfig.sheetPagingPositionItems}"/>
+                  </tx:selectOneChoice>
+
+                  <tx:selectOneChoice label="showPageRange"
+                                      value="#{overviewController.sheetConfig.sheetPagePagingPosition}"
+                                      tip="TODO: paging DirectLinkCount Text">
+                    <f:selectItems value="#{overviewController.sheetConfig.sheetPagingPositionItems}"/>
+                  </tx:selectOneChoice>
+
+                  <tx:selectOneChoice label="showDirectLinks"
+                                      value="#{overviewController.sheetConfig.sheetDirectPagingPosition}"
+                                      tip="TODO: paging DirectLinkCount Text">
+                    <f:selectItems value="#{overviewController.sheetConfig.sheetPagingPositionItems}"/>
+                  </tx:selectOneChoice>
+
+                  <tx:selectOneChoice label="directLinkCount"
+                                      value="#{overviewController.sheetConfig.sheetDirectLinkCount}"
+                                      tip="TODO: paging DirectLinkCount Text">
+                    <f:selectItems value="#{overviewController.sheetConfig.sheetDirectLinkCountItems}"/>
+                  </tx:selectOneChoice>
+
+                  <tx:selectOneChoice label="selectable"
+                                      value="#{overviewController.sheetConfig.selectable}"
+                                      tip="TODO: selectable Text">
+                    <f:selectItems value="#{overviewController.sheetConfig.sheetSelectableItems}"/>
+                  </tx:selectOneChoice>
 
-      <tc:out escape="false" value="#{overviewBundle.sheet_text}"/>
+                  <tc:cell/>
 
-      <tc:box label="#{overviewBundle.sheet_sampleTitle}" id="sheetBox">
-        <f:facet name="layout">
-          <tc:gridLayout/>
-        </f:facet>
-        <f:facet name="toolBar">
-          <tc:toolBar>
-            <tc:toolBarCommand label="#" tip="#{overviewBundle.sheet_configTip}">
-              <tc:attribute name="renderedPartially" value="sheetConfigPopup"/>
-              <f:facet name="popup">
-                <tc:popup width="300" height="270" id="sheetConfigPopup">
-                  <tc:box label="#{overviewBundle.sheet_configTitle}">
+                  <tc:cell>
                     <f:facet name="layout">
-                      <tc:gridLayout rows="fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;1*;fixed"/>
+                      <tc:gridLayout columns="100px;1*;100px"
+                                     marginLeft="10px" marginRight="10px"/>
                     </f:facet>
-                    <tx:selectOneChoice label="showHeader"
-                                        value="#{overviewController.sheetConfig.sheetShowHeader}"
-                                        tip="TODO: show Header Text">
-                      <f:selectItem itemValue="#{true}" itemLabel="True"/>
-                      <f:selectItem itemValue="#{false}" itemLabel="False"/>
-                    </tx:selectOneChoice>
-                         <tx:in label="first"
-                           value="#{overviewController.sheetConfig.sheetFirst}"
-                           tip="TODO: paging Start Text">
-                      <f:validateLongRange minimum="0"/>
-                    </tx:in>
-                    <tx:in label="rows"
-                           value="#{overviewController.sheetConfig.sheetRows}"
-                           tip="TODO: paging Lenght Text">
-                      <f:validateLongRange minimum="1"/>
-                    </tx:in>
-
-                    <tx:selectOneChoice label="showRowRange"
-                                        value="#{overviewController.sheetConfig.sheetRowPagingPosition}"
-                                        tip="TODO: paging DirectLinkCount Text">
-                      <f:selectItems value="#{overviewController.sheetConfig.sheetPagingPositionItems}"/>
-                    </tx:selectOneChoice>
-
-                    <tx:selectOneChoice label="showPageRange"
-                                        value="#{overviewController.sheetConfig.sheetPagePagingPosition}"
-                                        tip="TODO: paging DirectLinkCount Text">
-                      <f:selectItems value="#{overviewController.sheetConfig.sheetPagingPositionItems}"/>
-                    </tx:selectOneChoice>
-
-                    <tx:selectOneChoice label="showDirectLinks"
-                                        value="#{overviewController.sheetConfig.sheetDirectPagingPosition}"
-                                        tip="TODO: paging DirectLinkCount Text">
-                      <f:selectItems value="#{overviewController.sheetConfig.sheetPagingPositionItems}"/>
-                    </tx:selectOneChoice>
-
-                    <tx:selectOneChoice label="directLinkCount"
-                                        value="#{overviewController.sheetConfig.sheetDirectLinkCount}"
-                                        tip="TODO: paging DirectLinkCount Text">
-                      <f:selectItems value="#{overviewController.sheetConfig.sheetDirectLinkCountItems}"/>
-                    </tx:selectOneChoice>
-
-                    <tx:selectOneChoice label="selectable"
-                                        value="#{overviewController.sheetConfig.selectable}"
-                                        tip="TODO: selectable Text">
-                      <f:selectItems value="#{overviewController.sheetConfig.sheetSelectableItems}"/>
-                    </tx:selectOneChoice>
-
+                    <tc:button label="Cancel">
+                      <tc:attribute name="popupClose" value="immediate"/>
+                    </tc:button>
                     <tc:cell/>
+                    <tc:button label="Ok">
+                      <tc:attribute name="popupClose" value="afterSubmit"/>
+                      <tc:attribute name="renderedPartially" value=":page:sheetBox"/>
+                    </tc:button>
+                  </tc:cell>
+
+                </tc:box>
+              </tc:popup>
+            </f:facet>
+          </tc:toolBarCommand>
+        </tc:toolBar>
+      </f:facet>
 
-                    <tc:cell>
-                      <f:facet name="layout">
-                        <tc:gridLayout columns="100px;1*;100px"
-                                       marginLeft="10px" marginRight="10px"/>
-                      </f:facet>
-                      <tc:button label="Cancel">
-                        <tc:attribute name="popupClose" value="immediate"/>
-                      </tc:button>
-                      <tc:cell/>
-                      <tc:button label="Ok">
-                        <tc:attribute name="popupClose" value="afterSubmit"/>
-                        <tc:attribute name="renderedPartially" value=":page:sheetBox"/>
-                      </tc:button>
-                    </tc:cell>
-
-                  </tc:box>
-                </tc:popup>
-              </f:facet>
-            </tc:toolBarCommand>
-          </tc:toolBar>
-        </f:facet>
+      <tc:out escape="false" value="#{overviewBundle.sheet_text}"/>
 
-        <tc:sheet value="#{demo.solarList}" id="sheet"
-                  columns="3*;1*;3*;3*;3*;3*" var="luminary"
-                  state="#{demo.sheetState}"
-                  showHeader="#{overviewController.sheetConfig.sheetShowHeader}"
-                  showRowRange="#{overviewController.sheetConfig.sheetRowPagingPosition}"
-                  showPageRange="#{overviewController.sheetConfig.sheetPagePagingPosition}"
-                  showDirectLinks="#{overviewController.sheetConfig.sheetDirectPagingPosition}"
-                  first="#{overviewController.sheetConfig.sheetFirst}"
-                  rows="#{overviewController.sheetConfig.sheetRows}"
-                  directLinkCount="#{overviewController.sheetConfig.sheetDirectLinkCount}"
-                  stateChangeListener="#{demo.stateChangeListener}"
-                  sortActionListener="#{overviewController.sheetSorter}"
-                  selectable="#{overviewController.sheetConfig.selectable}">
+      <tc:sheet value="#{demo.solarList}" id="sheet"
+                columns="3*;1*;3*;3*;3*;3*" var="luminary"
+                state="#{demo.sheetState}"
+                showHeader="#{overviewController.sheetConfig.sheetShowHeader}"
+                showRowRange="#{overviewController.sheetConfig.sheetRowPagingPosition}"
+                showPageRange="#{overviewController.sheetConfig.sheetPagePagingPosition}"
+                showDirectLinks="#{overviewController.sheetConfig.sheetDirectPagingPosition}"
+                first="#{overviewController.sheetConfig.sheetFirst}"
+                rows="#{overviewController.sheetConfig.sheetRows}"
+                directLinkCount="#{overviewController.sheetConfig.sheetDirectLinkCount}"
+                stateChangeListener="#{demo.stateChangeListener}"
+                sortActionListener="#{overviewController.sheetSorter}"
+                selectable="#{overviewController.sheetConfig.selectable}">
 <%--
-          <f:facet name="reload">
-            <tc:reload frequency="5000"/>
-          </f:facet>
+        <f:facet name="reload">
+          <tc:reload frequency="5000"/>
+        </f:facet>
 --%>
-          <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
-            <tc:out value="#{luminary.name}" id="t_name"/>
-          </tc:column>
-          <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false"
-                     tip="#{overviewBundle.solarArrayNumberTip}" align="center">
-            <tc:out value="#{luminary.number}" id="t_number"/>
-          </tc:column>
-          <tc:column label="#{overviewBundle.solarArrayOrbit}" sortable="true" id="orbit">
-            <tc:out value="#{luminary.orbit}" id="t_orbit"/>
-          </tc:column>
-          <tc:column label="#{overviewBundle.solarArrayPopulation}" sortable="true" id="population">
-            <tc:in value="#{luminary.population}" id="t_population"/>
-          </tc:column>
-          <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right"
id="distance">
-            <tc:out value="#{luminary.distance}" id="t_distance"/>
-          </tc:column>
-          <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right"
id="period">
-            <tc:out value="#{luminary.period}" id="t_period"/>
-          </tc:column>
-        </tc:sheet>
-      </tc:box>
-    </tc:panel>
+        <tc:column label="#{overviewBundle.solarArrayName}" id="name" sortable="true">
+          <tc:out value="#{luminary.name}" id="t_name"/>
+        </tc:column>
+        <tc:column label="#{overviewBundle.solarArrayNumber}" id="number" sortable="false"
+                   tip="#{overviewBundle.solarArrayNumberTip}" align="center">
+          <tc:out value="#{luminary.number}" id="t_number"/>
+        </tc:column>
+        <tc:column label="#{overviewBundle.solarArrayOrbit}" sortable="true" id="orbit">
+          <tc:out value="#{luminary.orbit}" id="t_orbit"/>
+        </tc:column>
+        <tc:column label="#{overviewBundle.solarArrayPopulation}" sortable="true" id="population">
+          <tc:in value="#{luminary.population}" id="t_population"/>
+        </tc:column>
+        <tc:column label="#{overviewBundle.solarArrayDistance}" sortable="true" align="right"
id="distance">
+          <tc:out value="#{luminary.distance}" id="t_distance"/>
+        </tc:column>
+        <tc:column label="#{overviewBundle.solarArrayPeriod}" sortable="true" align="right"
id="period">
+          <tc:out value="#{luminary.period}" id="t_period"/>
+        </tc:column>
+      </tc:sheet>
+    </tc:box>
   </jsp:body>
 </layout:overview>

Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/input.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/reference/input.jsp?view=diff&rev=548392&r1=548391&r2=548392
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/reference/input.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/reference/input.jsp Mon Jun 18 09:22:42
2007
@@ -23,19 +23,18 @@
   <jsp:body>
     <tc:box label="Input">
       <f:facet name="layout">
-        <tc:gridLayout columns="300px;1*"
-                       rows="fixed;fixed;fixed;fixed;fixed;150px;100px;*"/>
+        <tc:gridLayout rows="fixed;fixed;fixed;fixed;fixed;fixed;fixed;2*;3*;2*;2*;2*;2*;2*"/>
       </f:facet>
+
+      <tc:in value="Some Text without Label"/>
+
       <%-- code-sniplet-start id="in" --%>
       <tx:in label="Input" value="Some Text"/>
       <%-- code-sniplet-end id="in" --%>
-      <tc:cell/>
 
       <tx:in label="Read Only" readonly="true" value="Some Text"/>
-      <tc:cell/>
 
       <tx:in label="Disabled" disabled="true" value="Some Text"/>
-      <tc:cell/>
 
       <tc:panel>
         <f:facet name="layout">
@@ -44,22 +43,35 @@
         <tc:label value="Short Label"/>
         <tc:in value="Some Text"/>
       </tc:panel>
-      <tc:cell/>
 
       <tx:in label="Input (focus)" focus="true" value="Some Text"/>
-      <tc:cell/>
+
+      <tx:in label="Password" password="true" value="Asterics"/>
+
+      <tc:textarea value="Some text without label, some text without label, some text
without label, some text without label, some text without label, some text without label,
some text without label, some text without label, some text without label, some text without
label, ..."/>
 
       <%-- code-sniplet-start id="textarea" --%>
-      <tx:textarea label="Enter your Text:"
-                   value="My new text goes here..."/>
+      <tx:textarea label="Text Area"
+                   value="Some text, some text, some text, some text, some text, some text,
some text, some text, some text, some text, ..."/>
       <%-- code-sniplet-end id="textarea" --%>
-      <tc:cell/>
+
+      <tx:textarea label="Read Only"
+                   readonly="true"
+                   value="Some text, some text, some text, some text, some text, some text,
some text, some text, some text, some text, ..."/>
+
+      <tx:textarea label="Disabled"
+                   disabled="true"
+                   value="Some text, some text, some text, some text, some text, some text,
some text, some text, some text, some text, ..."/>
 
       <tx:textarea label="Area (focus)" focus="true"
                    value="Some Text"/>
-      <tc:cell/>
 
-      <tc:cell spanX="2"/>
+      <tc:panel>
+        <tc:out value="An input field is "/>
+        <tc:in value="here" inline="true"/>
+        <tc:out value=" inside of a floating text."/>
+      </tc:panel>
+
     </tc:box>
   </jsp:body>
 </layout:overview>



Mime
View raw message