myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r548309 - in /myfaces/tobago/trunk/example/demo/src/main/webapp: footer.jsp overview/basic.jsp reference/separator.jsp
Date Mon, 18 Jun 2007 11:00:55 GMT
Author: lofwyr
Date: Mon Jun 18 04:00:42 2007
New Revision: 548309

URL: http://svn.apache.org/viewvc?view=rev&rev=548309
Log:
Using separator tag in demo

Added:
    myfaces/tobago/trunk/example/demo/src/main/webapp/reference/separator.jsp
      - copied, changed from r542456, myfaces/tobago/trunk/example/sandbox/src/main/webapp/separator.jsp
Modified:
    myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp
    myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.jsp

Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp?view=diff&rev=548309&r1=548308&r2=548309
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/footer.jsp Mon Jun 18 04:00:42 2007
@@ -1,3 +1,11 @@
+<%@ page import="org.apache.myfaces.tobago.example.reference.SimpleBean" %>
+<%@ page import="org.apache.myfaces.tobago.model.TreeState" %>
+<%@ page import="javax.faces.application.FacesMessage" %>
+<%@ page import="javax.faces.context.FacesContext" %>
+<%@ page import="javax.swing.tree.DefaultMutableTreeNode" %>
+<%@ page import="java.io.PrintWriter" %>
+<%@ page import="java.io.StringWriter" %>
+<%@ page import="java.util.Date" %>
 <%--
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,12 +28,11 @@
 
   <tc:panel>
     <f:facet name="layout">
-      <tc:gridLayout columns="70px;70px;130px;1*"
-          rows="15px;fixed"/>
+      <tc:gridLayout columns="70px;70px;130px;1*" rows="15px;fixed"/>
     </f:facet>
 
     <tc:cell spanX="4">
-     <f:verbatim><hr /></f:verbatim>
+      <tc:separator/>
     </tc:cell>
 
     <tc:button immediate="true"

Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.jsp?view=diff&rev=548309&r1=548308&r2=548309
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basic.jsp Mon Jun 18 04:00:42
2007
@@ -21,21 +21,31 @@
 
 <layout:overview>
   <jsp:body>
-    <tc:panel>
+    <tc:box label="#{overviewBundle.basic}">
       <%--
       <f:facet name="reload">
         <tc:reload frequency="5000" />
       </f:facet>
       --%>
       <f:facet name="layout">
-        <tc:gridLayout border="0" rows="20px;fixed;1*;20px;fixed;1*;20px;fixed" />
+        <tc:gridLayout border="0" rows="fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed;fixed"
/>
       </f:facet>
 
-  <%-- row --%>
+      <%-- row --%>
+      <tc:separator>
+        <f:facet name="label">
+          <tc:label value="#{overviewBundle.basic_sampleInputTitle}"/>
+        </f:facet>
+      </tc:separator>
+
+      <%-- row --%>
+      <tc:messages />
+
+      <%-- row --%>
       <tc:out escape="false" value="#{overviewBundle.basic_text_input}" />
 
-  <%-- row --%>
-      <tc:box label="#{overviewBundle.basic_sampleInputTitle}">
+      <%-- row --%>
+      <tc:panel>
         <f:facet name="layout">
           <tc:gridLayout columns="1*;1*" border="0" />
         </f:facet>
@@ -58,16 +68,20 @@
 
         <tx:textarea value="#{overviewController.basicArea}"
           label="#{overviewBundle.basic_textareaLabel}" />
-      </tc:box>
+      </tc:panel>
 
-  <%-- row --%>
-      <tc:cell />
+      <%-- row --%>
+      <tc:separator>
+        <f:facet name="label">
+          <tc:label value="#{overviewBundle.basic_sampleSelectTitle}"/>
+        </f:facet>
+      </tc:separator>
 
-  <%-- row --%>
+      <%-- row --%>
       <tc:out escape="false" value="#{overviewBundle.basic_text_select}" />
 
-  <%-- row --%>
-      <tc:box label="#{overviewBundle.basic_sampleSelectTitle}">
+      <%-- row --%>
+      <tc:panel>
         <f:facet name="layout">
           <tc:gridLayout columns="1*;1*"  border="0"/>
         </f:facet>
@@ -92,15 +106,20 @@
             <f:selectItems value="#{overviewController.items}" />
           </tc:selectOneChoice>
         </tc:panel>
-      </tc:box>
-  <%-- row --%>
-      <tc:cell />
+      </tc:panel>
 
-  <%-- row --%>
+      <%-- row --%>
+      <tc:separator>
+        <f:facet name="label">
+          <tc:label value="#{overviewBundle.basic_sampleLinkTitle}"/>
+        </f:facet>
+      </tc:separator>
+
+      <%-- row --%>
       <tc:out escape="false" value="#{overviewBundle.basic_text_action}" />
 
-  <%-- row --%>
-      <tc:box label="#{overviewBundle.basic_sampleLinkTitle}">
+      <%-- row --%>
+      <tc:panel>
         <f:facet name="layout">
           <tc:gridLayout columns="120px;*;120px;*;120px" border="0"/>
         </f:facet>
@@ -119,7 +138,8 @@
           <tx:in value="#{overviewController.lastAction}" readonly="true"
             label="#{overviewBundle.basic_lastActionLabel}" />
         </tc:cell>
-      </tc:box>
-    </tc:panel>
+      </tc:panel>
+
+    </tc:box>
   </jsp:body>
 </layout:overview>

Copied: myfaces/tobago/trunk/example/demo/src/main/webapp/reference/separator.jsp (from r542456,
myfaces/tobago/trunk/example/sandbox/src/main/webapp/separator.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/reference/separator.jsp?view=diff&rev=548309&p1=myfaces/tobago/trunk/example/sandbox/src/main/webapp/separator.jsp&r1=542456&p2=myfaces/tobago/trunk/example/demo/src/main/webapp/reference/separator.jsp&r2=548309
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/separator.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/reference/separator.jsp Mon Jun 18 04:00:42
2007
@@ -15,12 +15,6 @@
  * limitations under the License.
 --%>
 
-<%--
-  User: bommel
-  Date: Nov 20, 2006
-  Time: 9:29:45 AM
---%>
-<%@ taglib uri="http://myfaces.apache.org/tobago/sandbox" prefix="tcs" %>
 <%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
 
@@ -38,11 +32,11 @@
       </f:facet>
 
       <tc:cell spanX="2">
-        <tcs:separator>
+        <tc:separator>
           <f:facet name="label">
             <tc:label value="Separator with Label"/>
           </f:facet>
-        </tcs:separator>
+        </tc:separator>
       </tc:cell>
 
       <tc:panel>
@@ -50,7 +44,7 @@
           <tc:gridLayout rows="*;fixed;2*"/>
         </f:facet>
         <tc:textarea/>
-        <tcs:separator/>
+        <tc:separator/>
         <tc:textarea/>
       </tc:panel>
 
@@ -59,11 +53,11 @@
           <tc:gridLayout rows="2*;fixed;*"/>
         </f:facet>
         <tc:textarea/>
-        <tcs:separator>
+        <tc:separator>
           <f:facet name="label">
             <tc:label value="Separator with Label"/>
           </f:facet>
-        </tcs:separator>
+        </tc:separator>
         <tc:textarea/>
       </tc:panel>
 



Mime
View raw message