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 2015/12/17 11:06:16 UTC

svn commit: r1720503 - /myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/navigation.xhtml

Author: lofwyr
Date: Thu Dec 17 10:06:16 2015
New Revision: 1720503

URL: http://svn.apache.org/viewvc?rev=1720503&view=rev
Log:
content was no longer cropped

Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/navigation.xhtml

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/navigation.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/navigation.xhtml?rev=1720503&r1=1720502&r2=1720503&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/navigation.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/navigation.xhtml Thu Dec 17 10:06:16 2015
@@ -23,48 +23,44 @@
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:f="http://java.sun.com/jsf/core">
   <tc:page id="page" label="Tobago Example Test">
-    <f:facet name="layout">
-      <tc:gridLayout columns="300px;*"/>
-    </f:facet>
-    <tc:gridLayoutConstraint width="1300px" height="1000px"/>
-
-    <tc:panel>
-      <f:facet name="layout">
-        <!--todo replace 20px with "auto" -->
-        <tc:gridLayout rows="auto;*"/>
-      </f:facet>
-
+    <tc:flexLayout columns="300px;*">
       <tc:panel>
         <f:facet name="layout">
-          <tc:gridLayout columns="*;30px" rows="auto;auto"/>
+          <!--todo replace 20px with "auto" -->
+          <tc:gridLayout rows="auto;*"/>
         </f:facet>
 
-        <tx:selectOneChoice value="#{clientConfig.theme}" label="Theme">
-          <f:selectItems value="#{clientConfig.themeItems}"/>
-        </tx:selectOneChoice>
-        <tc:button action="#{clientConfig.submit}" label="OK">
-          <tc:gridLayoutConstraint rowSpan="2"/>
-        </tc:button>
-        <tx:selectOneChoice value="#{clientConfig.locale}" label="Locale">
-          <f:selectItems value="#{clientConfig.localeItems}"/>
-        </tx:selectOneChoice>
+        <tc:panel>
+          <f:facet name="layout">
+            <tc:gridLayout columns="*;30px" rows="auto;auto"/>
+          </f:facet>
+
+          <tx:selectOneChoice value="#{clientConfig.theme}" label="Theme">
+            <f:selectItems value="#{clientConfig.themeItems}"/>
+          </tx:selectOneChoice>
+          <tc:button action="#{clientConfig.submit}" label="OK">
+            <tc:gridLayoutConstraint rowSpan="2"/>
+          </tc:button>
+          <tx:selectOneChoice value="#{clientConfig.locale}" label="Locale">
+            <f:selectItems value="#{clientConfig.localeItems}"/>
+          </tx:selectOneChoice>
+        </tc:panel>
+
+        <tc:tree value="#{browser.tree}" var="node">
+          <tc:treeNode disabled="#{node.disabled}">
+            <tc:treeIndent/>
+            <tc:treeIcon/>
+            <tc:treeCommand link="#{node.resource}" label="#{node.label}" target="content"
+                            rendered="#{node.childCount == 0}" markup="#{node.markup}"/>
+            <tc:treeLabel value="#{node.label}" rendered="#{node.childCount > 0}"/>
+          </tc:treeNode>
+        </tc:tree>
       </tc:panel>
 
-      <tc:tree value="#{browser.tree}" var="node">
-        <tc:treeNode disabled="#{node.disabled}">
-          <tc:treeIndent/>
-          <tc:treeIcon/>
-          <tc:treeCommand link="#{node.resource}" label="#{node.label}" target="content"
-                          rendered="#{node.childCount == 0}" markup="#{node.markup}"/>
-          <tc:treeLabel value="#{node.label}" rendered="#{node.childCount > 0}"/>
-        </tc:treeNode>
-      </tc:tree>
-    </tc:panel>
-
-    <!-- src will be set via <tc:treeNode target="page:content"> -->
-    <tc:object name="content"/>
-
-    <!--<tc:script file="http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js"/>-->
+      <!-- src will be set via <tc:treeNode target="page:content"> -->
+      <tc:object name="content"/>
 
+      <!--<tc:script file="http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js"/>-->
+    </tc:flexLayout>
   </tc:page>
 </f:view>