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/06/25 11:59:28 UTC
svn commit: r1687463 - in /myfaces/tobago/branches/tobago-3.0.x: ./
tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/
tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/
tobago-example/tobago-example-addre...
Author: lofwyr
Date: Thu Jun 25 09:59:27 2015
New Revision: 1687463
URL: http://svn.apache.org/r1687463
Log:
flowLayout and flexLayout can be written without a <f:facet name="layout"> tag
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-3.0.txt
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/editor.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/list.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/personal.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/00/flow-layout.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/12-best-practice/00/error.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/51-for-each/for-each.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/65-accessKey/accessKey.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/overview.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flexLayout/flexLayout-horizontal.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flexLayout/flexLayout-simple.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flexLayout/flexLayout-vertical.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flowLayout/flowLayout-textAlign.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/section/section.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-selector.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlowLayoutRenderer.java
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-3.0.txt
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-3.0.txt?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-3.0.txt (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-3.0.txt Thu Jun 25 09:59:27 2015
@@ -17,7 +17,13 @@ Todo:
- consolidate LinkRenderer, ButtonRenderer with CommandRenderer
- - check it its a good idea to use layouts with less typing:
+ - simplify: layout without facet and container (columnLayout, ...):
+
+Done:
+
+ - Removing tc:cell tag, please use tc:panel instead.
+
+ - simplify (flowLayout, flexLayout):
<tc:flowLayout>
... content ...
@@ -31,9 +37,3 @@ Todo:
</f:facet>
... content ...
</tc:panel>
-
-
-
-Done:
-
- - Removing tc:cell tag, please use tc:panel instead.
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/editor.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/editor.xhtml?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/editor.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/editor.xhtml Thu Jun 25 09:59:27 2015
@@ -24,65 +24,55 @@
xmlns:ui="http://java.sun.com/jsf/facelets">
<ui:param name="title" value="#{bundle.editorTitle}"/>
- <tc:panel>
- <f:facet name="layout">
- <tc:flowLayout/>
- </f:facet>
+ <tc:flowLayout>
<tc:script file="bootstrap-datepicker.js"/>
<tc:style file="datepicker.css"/>
- <tc:toolBar iconSize="big"> <!-- XXX merge with the other toolbar on list.xhtml !!! -->
- <tc:button tip="Logout" action="#{controller.logout}" immediate="true" css="btn-danger"
- image="image/org/tango-project/tango-icon-theme/16x16/actions/system-log-out.png"/>
- </tc:toolBar>
-
- <tc:box label="#{bundle.editorBoxTitle}">
- <f:facet name="layout">
- <tc:flexLayout rows="auto;*;auto"/>
- </f:facet>
-
- <tc:messages/>
-
-<!--
- <tc:tabGroup switchType="reloadTab" immediate="true">
- <tc:tab label="#{bundle.editorTabPersonal}">
--->
- <ui:include src="tab/personal.xhtml"/>
-<!--
- </tc:tab>
-
- <tc:tab label="#{bundle.editorTabBusiness}" rendered="#{!controller.simple}">
- <ui:include src="tab/business.xhtml"/>
- </tc:tab>
-
- <tc:tab label="#{bundle.editorTabMisc}" rendered="#{!controller.simple}">
- <ui:include src="tab/misc.xhtml"/>
- </tc:tab>
- </tc:tabGroup>
--->
-
- <tc:panel>
- <f:facet name="layout">
- <tc:columnLayout medium="2;10"/>
- </f:facet>
-
- <tc:out/>
+ <tc:toolBar iconSize="big"> <!-- XXX merge with the other toolbar on list.xhtml !!! -->
+ <tc:button tip="Logout" action="#{controller.logout}" immediate="true" css="btn-danger"
+ image="image/org/tango-project/tango-icon-theme/16x16/actions/system-log-out.png"/>
+ </tc:toolBar>
+
+ <tc:box label="#{bundle.editorBoxTitle}">
+ <tc:flexLayout rows="auto;*;auto">
+
+ <tc:messages/>
+
+ <!--
+ <tc:tabGroup switchType="reloadTab" immediate="true">
+ <tc:tab label="#{bundle.editorTabPersonal}">
+ -->
+ <ui:include src="tab/personal.xhtml"/>
+ <!--
+ </tc:tab>
+
+ <tc:tab label="#{bundle.editorTabBusiness}" rendered="#{!controller.simple}">
+ <ui:include src="tab/business.xhtml"/>
+ </tc:tab>
+
+ <tc:tab label="#{bundle.editorTabMisc}" rendered="#{!controller.simple}">
+ <ui:include src="tab/misc.xhtml"/>
+ </tc:tab>
+ </tc:tabGroup>
+ -->
<tc:panel>
<f:facet name="layout">
- <tc:flowLayout/>
+ <tc:columnLayout medium="2;10"/>
</f:facet>
- <tc:button action="#{controller.store}"
- label="#{bundle.editorStore}" defaultCommand="true"/>
- <tc:button action="#{controller.cancel}" immediate="true"
- label="#{bundle.editorCancel}"/>
+ <tc:out/>
+
+ <tc:flowLayout>
+ <tc:button action="#{controller.store}" label="#{bundle.editorStore}" defaultCommand="true"/>
+ <tc:button action="#{controller.cancel}" immediate="true" label="#{bundle.editorCancel}"/>
+ </tc:flowLayout>
</tc:panel>
- </tc:panel>
+ </tc:flexLayout>
</tc:box>
-</tc:panel>
+ </tc:flowLayout>
</ui:composition>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/layout/basic.xhtml Thu Jun 25 09:59:27 2015
@@ -26,141 +26,136 @@
<tc:page applicationIcon="icon/favicon.ico" label="${title}" id="page">
- <f:facet name="layout">
- <tc:flowLayout/>
- </f:facet>
-
- <tc:script file="auth/logout.js"/>
-
-<!--
- <f:facet name="menuBar">
- <tc:menuBar>
- <tc:form>
- <tc:menu label="#{bundle.menuFile}">
- <tc:menuCommand label="#{bundle.menuFileNew}" action="#{controller.createAddress}" immediate="true"
- image="image/org/tango-project/tango-icon-theme/16x16/actions/contact-new.png"/>
- <tc:menuCommand label="Add Dummy Addresses" action="#{controller.addDummyAddresses}" immediate="true"/>
- <tc:menuSeparator/>
- <tc:menuCommand label="#{bundle.admin}" action="#{admin.admin}"
- image="image/org/tango-project/tango-icon-theme/16x16/categories/preferences-system.png"/>
- <tc:menuSeparator/>
- <tc:menuCommand label="Logout" action="#{controller.logout}"
- image="image/org/tango-project/tango-icon-theme/16x16/actions/system-log-out.png"/>
- </tc:menu>
-
- <tc:menu label="#{bundle.menuSettings}">
- <tc:menu label="#{bundle.menuSettingsLanguage}">
- <tx:menuRadio action="#{controller.languageChanged}"
- value="#{controller.language}">
- <f:selectItems value="#{controller.languages}"/>
- </tx:menuRadio>
- </tc:menu>
- <tc:menu label="#{bundle.menuSettingsTheme}">
- <tx:menuRadio action="#{controller.themeChanged}"
- value="#{controller.theme}">
- <f:selectItems value="#{controller.themeItems}"/>
- </tx:menuRadio>
- </tc:menu>
- <tx:menuCheckbox label="#{bundle.menuSettingsMode}" value="#{controller.simple}"/>
- </tc:menu>
-
- <tc:menu label="#{bundle.menuHelp}">
- <tc:menuCommand label="#{bundle.menuHelpAbout}"
- image="image/org/tango-project/tango-icon-theme/16x16/apps/help-browser.png">
- <tc:popupReference for=":page:about"/>
- </tc:menuCommand>
- </tc:menu>
- </tc:form>
- </tc:menuBar>
- </f:facet>
--->
-
- <tc:panel>
- <f:facet name="layout">
- <tc:flowLayout/>
- </f:facet>
+ <tc:flowLayout>
- <ui:insert/>
- </tc:panel>
+ <tc:script file="auth/logout.js"/>
- <tc:separator/>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:columnLayout medium="2;3;1;2;3;1"/>
- </f:facet>
- <!--
- <tc:form>
- -->
- <tx:selectOneChoice label="#{bundle.footerLanguage}"
- value="#{controller.language}">
- <f:selectItems value="#{controller.languages}"/>
- <f:facet name="change">
- <tc:command action="#{controller.languageChangedList}"/>
- </f:facet>
- </tx:selectOneChoice>
<!--
- </tc:form>
- -->
- <tc:image alt="#{bundle.footerFlag}" width="16" height="11"
- value="#{bundle.footerFlagIcon}"/>
- <!--
- <tc:form>
- -->
- <tx:selectOneChoice label="#{bundle.footerTheme}" value="#{controller.theme}">
- <f:selectItems value="#{controller.themeItems}"/>
- <f:facet name="change">
- <tc:command action="#{controller.themeChanged}"/>
- </f:facet>
- </tx:selectOneChoice>
- <!--
- </tc:form>
+ <f:facet name="menuBar">
+ <tc:menuBar>
+ <tc:form>
+ <tc:menu label="#{bundle.menuFile}">
+ <tc:menuCommand label="#{bundle.menuFileNew}" action="#{controller.createAddress}" immediate="true"
+ image="image/org/tango-project/tango-icon-theme/16x16/actions/contact-new.png"/>
+ <tc:menuCommand label="Add Dummy Addresses" action="#{controller.addDummyAddresses}" immediate="true"/>
+ <tc:menuSeparator/>
+ <tc:menuCommand label="#{bundle.admin}" action="#{admin.admin}"
+ image="image/org/tango-project/tango-icon-theme/16x16/categories/preferences-system.png"/>
+ <tc:menuSeparator/>
+ <tc:menuCommand label="Logout" action="#{controller.logout}"
+ image="image/org/tango-project/tango-icon-theme/16x16/actions/system-log-out.png"/>
+ </tc:menu>
+
+ <tc:menu label="#{bundle.menuSettings}">
+ <tc:menu label="#{bundle.menuSettingsLanguage}">
+ <tx:menuRadio action="#{controller.languageChanged}"
+ value="#{controller.language}">
+ <f:selectItems value="#{controller.languages}"/>
+ </tx:menuRadio>
+ </tc:menu>
+ <tc:menu label="#{bundle.menuSettingsTheme}">
+ <tx:menuRadio action="#{controller.themeChanged}"
+ value="#{controller.theme}">
+ <f:selectItems value="#{controller.themeItems}"/>
+ </tx:menuRadio>
+ </tc:menu>
+ <tx:menuCheckbox label="#{bundle.menuSettingsMode}" value="#{controller.simple}"/>
+ </tc:menu>
+
+ <tc:menu label="#{bundle.menuHelp}">
+ <tc:menuCommand label="#{bundle.menuHelpAbout}"
+ image="image/org/tango-project/tango-icon-theme/16x16/apps/help-browser.png">
+ <tc:popupReference for=":page:about"/>
+ </tc:menuCommand>
+ </tc:menu>
+ </tc:form>
+ </tc:menuBar>
+ </f:facet>
-->
- <tc:button label="Dummy" action="#{controller.addDummyAddresses}" immediate="true"
- image="image/org/tango-project/tango-icon-theme/16x16/actions/contact-new.png"/>
-
- </tc:panel>
- <f:facet name="popup">
- <tc:popup id="about" width="400" height="220" left="200" top="200">
- <tc:box label="About">
- <f:facet name="layout">
- <tc:gridLayout rows="150px;*;auto" columns="150px;*"/>
+ <tc:flowLayout>
+ <ui:insert/>
+ </tc:flowLayout>
+
+ <tc:separator/>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:columnLayout medium="2;3;1;2;3;1"/>
+ </f:facet>
+ <!--
+ <tc:form>
+ -->
+ <tx:selectOneChoice label="#{bundle.footerLanguage}"
+ value="#{controller.language}">
+ <f:selectItems value="#{controller.languages}"/>
+ <f:facet name="change">
+ <tc:command action="#{controller.languageChangedList}"/>
</f:facet>
-
- <tc:image value="image/org/tango-project/tango-icon-theme/address-book-splash-screen.png" width="150"
- height="150"/>
- <tc:panel>
+ </tx:selectOneChoice>
+ <!--
+ </tc:form>
+ -->
+ <tc:image alt="#{bundle.footerFlag}" width="16" height="11"
+ value="#{bundle.footerFlagIcon}"/>
+ <!--
+ <tc:form>
+ -->
+ <tx:selectOneChoice label="#{bundle.footerTheme}" value="#{controller.theme}">
+ <f:selectItems value="#{controller.themeItems}"/>
+ <f:facet name="change">
+ <tc:command action="#{controller.themeChanged}"/>
+ </f:facet>
+ </tx:selectOneChoice>
+ <!--
+ </tc:form>
+ -->
+ <tc:button label="Dummy" action="#{controller.addDummyAddresses}" immediate="true"
+ image="image/org/tango-project/tango-icon-theme/16x16/actions/contact-new.png"/>
+
+ </tc:panel>
+
+ <f:facet name="popup">
+ <tc:popup id="about" width="400" height="220" left="200" top="200">
+ <tc:box label="About">
<f:facet name="layout">
- <tc:gridLayout rows="auto;auto;auto;*"/>
+ <tc:gridLayout rows="150px;*;auto" columns="150px;*"/>
</f:facet>
- <tc:out markup="strong" value="Addressbook Demo"/>
- <tc:panel/>
- <tc:out value="Version #{controller.version}"/>
- <tc:panel/>
- </tc:panel>
-
- <tc:panel>
- <tc:gridLayoutConstraint columnSpan="2"/>
- </tc:panel>
-
- <tc:panel>
- <tc:gridLayoutConstraint columnSpan="2"/>
+ <tc:image value="image/org/tango-project/tango-icon-theme/address-book-splash-screen.png" width="150"
+ height="150"/>
<tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="*;auto"/>
+ <tc:gridLayout rows="auto;auto;auto;*"/>
</f:facet>
+
+ <tc:out markup="strong" value="Addressbook Demo"/>
+ <tc:panel/>
+ <tc:out value="Version #{controller.version}"/>
<tc:panel/>
- <tc:button label="OK">
- <tc:attribute name="popupClose" value="immediate"/>
- </tc:button>
</tc:panel>
- </tc:panel>
- </tc:box>
- </tc:popup>
- </f:facet>
+ <tc:panel>
+ <tc:gridLayoutConstraint columnSpan="2"/>
+ </tc:panel>
+
+ <tc:panel>
+ <tc:gridLayoutConstraint columnSpan="2"/>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;auto"/>
+ </f:facet>
+ <tc:panel/>
+ <tc:button label="OK">
+ <tc:attribute name="popupClose" value="immediate"/>
+ </tc:button>
+ </tc:panel>
+ </tc:panel>
+ </tc:box>
+ </tc:popup>
+ </f:facet>
+
+ </tc:flowLayout>
</tc:page>
</f:view>
</ui:composition>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/list.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/list.xhtml?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/list.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/list.xhtml Thu Jun 25 09:59:27 2015
@@ -24,10 +24,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets">
<ui:param name="title" value="#{bundle.listPageTitle}"/>
- <tc:panel>
- <f:facet name="layout">
- <tc:flowLayout/>
- </f:facet>
+ <tc:flowLayout>
<tc:toolBar iconSize="big">
<!--
<tc:button label="#{bundle.toolbarAddressList}" action="#{controller.search}" immediate="true"
@@ -131,5 +128,5 @@
</tc:sheet>
</tc:box>
- </tc:panel>
+ </tc:flowLayout>
</ui:composition>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/personal.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/personal.xhtml?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/personal.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/tab/personal.xhtml Thu Jun 25 09:59:27 2015
@@ -23,10 +23,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets">
<tc:loadBundle basename="resource" var="bundle"/>
- <tc:panel>
- <f:facet name="layout">
- <tc:flowLayout />
- </f:facet>
+ <tc:flowLayout>
<tc:panel>
<f:facet name="layout">
<tc:columnLayout medium="2;10"/>
@@ -70,10 +67,7 @@
<f:selectItems value="#{countries}"/>
</tx:selectOneChoice>
<!--
- <tc:panel rendered="#{!controller.simple}">
- <f:facet name="layout">
- <tc:flexLayout rows="160px" columns="120px"/>
- </f:facet>
+ <tc:flexLayout rows="160px" columns="120px" rendered="#{!controller.simple}">
<tc:form>
<tc:button
image="#{controller.currentAddressPictureUrl}"
@@ -83,27 +77,23 @@
top="200" rendered="#{controller.renderFileUploadPopup}"
id="popup-fileUpload">
<tc:box label="FileUpload">
- <f:facet name="layout">
- <tc:flexLayout rows="auto;1*;auto" margin="10"/>
- </f:facet>
- <tc:file value="#{controller.uploadedFile}" required="true">
- <tc:validateFileItem contentType="image/*"/>
- </tc:file>
- <tc:messages/>
- <tc:panel>
- <f:facet name="layout">
- <tc:flexLayout columns="1*;100px;100px"/>
- </f:facet>
- <tc:panel/>
- <tc:button action="#{controller.okFileUpload}" label="OK"/>
- <tc:button action="#{controller.cancelFileUpload}" label="Cancel" immediate="true"/>
- </tc:panel>
+ <tc:flexLayout rows="auto;1*;auto" margin="10"/>
+ <tc:file value="#{controller.uploadedFile}" required="true">
+ <tc:validateFileItem contentType="image/*"/>
+ </tc:file>
+ <tc:messages/>
+ <tc:flexLayout columns="1*;100px;100px"/>
+ <tc:panel/>
+ <tc:button action="#{controller.okFileUpload}" label="OK"/>
+ <tc:button action="#{controller.cancelFileUpload}" label="Cancel" immediate="true"/>
+ </tc:flexLayout>
+ </tc:flexLayout>
</tc:box>
</tc:popup>
</f:facet>
</tc:button>
</tc:form>
- </tc:panel>
+ </tc:flexLayout>
-->
<tx:in value="#{controller.currentAddress.phone}"
@@ -135,6 +125,6 @@
<f:convertDateTime pattern="#{bundle.editorDatePattern}"/>
</tx:date>
</tc:panel>
- </tc:panel>
+ </tc:flowLayout>
</ui:composition>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-addressbook/src/main/webapp/auth/login.xhtml Thu Jun 25 09:59:27 2015
@@ -25,60 +25,56 @@
<tc:loadBundle basename="resource" var="bundle"/>
<tc:page id="page" label="Login">
- <f:facet name="layout">
- <tc:flexLayout rows="*;auto;*"/>
- </f:facet>
-
- <tc:out/>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:flexLayout columns="*;auto;*"/>
- </f:facet>
+ <tc:flexLayout rows="*;auto;*">
<tc:out/>
- <tc:box label="Login">
- <f:facet name="layout">
- <tc:gridLayout rows="auto;auto;auto;auto"/>
- </f:facet>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:flowLayout/>
- </f:facet>
- <tc:out value="#{bundle.loginIntro}"/>
- (
- <tc:link label="guest/guest" image="image/org/tango-project/tango-icon-theme/16x16/apps/system-users.png"
- omit="true">
- <tc:dataAttribute name="login" value='{"username": "guest", "password": "guest"}'/>
- </tc:link>
- or
- <tc:link label="admin/admin" image="image/org/tango-project/tango-icon-theme/16x16/apps/system-users.png"
- omit="true">
- <tc:dataAttribute name="login" value='{"username": "admin", "password": "admin"}'/>
- </tc:link>
- )
- </tc:panel>
-
- <tx:in fieldId="j_username" label="#{bundle.loginUser}"/>
- <tx:in fieldId="j_password" password="true" label="#{bundle.loginPassword}"/>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="*;auto"/>
- </f:facet>
-
- <tc:panel/>
- <tc:button label="#{bundle.loginLogin}" defaultCommand="true"/>
- </tc:panel>
- </tc:box>
+ <tc:panel>
+ <tc:flexLayout columns="*;auto;*">
- <tc:out/>
+ <tc:out/>
+
+ <tc:box label="Login">
+ <f:facet name="layout">
+ <tc:gridLayout rows="auto;auto;auto;auto"/>
+ </f:facet>
+
+ <tc:flowLayout>
+ <tc:out value="#{bundle.loginIntro}"/>
+ (
+ <tc:link label="guest/guest" image="image/org/tango-project/tango-icon-theme/16x16/apps/system-users.png"
+ omit="true">
+ <tc:dataAttribute name="login" value='{"username": "guest", "password": "guest"}'/>
+ </tc:link>
+ or
+ <tc:link label="admin/admin" image="image/org/tango-project/tango-icon-theme/16x16/apps/system-users.png"
+ omit="true">
+ <tc:dataAttribute name="login" value='{"username": "admin", "password": "admin"}'/>
+ </tc:link>
+ )
+ </tc:flowLayout>
+
+ <tx:in fieldId="j_username" label="#{bundle.loginUser}"/>
+ <tx:in fieldId="j_password" password="true" label="#{bundle.loginPassword}"/>
+
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout columns="*;auto"/>
+ </f:facet>
+
+ <tc:panel/>
+ <tc:button label="#{bundle.loginLogin}" defaultCommand="true"/>
+ </tc:panel>
+ </tc:box>
+
+ <tc:out/>
- </tc:panel>
+ </tc:flexLayout>
+ </tc:panel>
+
+ <tc:out/>
- <tc:out/>
+ </tc:flexLayout>
<tc:script file="auth/login.js"/>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/00/flow-layout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/00/flow-layout.xhtml?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/00/flow-layout.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/00/flow-layout.xhtml Thu Jun 25 09:59:27 2015
@@ -19,13 +19,9 @@
<ui:composition template="/layout/overview.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:f="http://java.sun.com/jsf/core">
+ xmlns:ui="http://java.sun.com/jsf/facelets">
<ui:param name="title" value="#{overviewBundle.layout}"/>
- <tc:panel>
- <f:facet name="layout">
- <tc:flowLayout margin="#{20}"/>
- </f:facet>
+ <tc:flowLayout margin="20px">
<tc:out value="Flow layout: Work in progress!"/>
@@ -130,5 +126,5 @@
<tc:out
value="Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque consequat, libero eget porta mattis, risus velit congue magna, at posuere sem orci vitae turpis. Integer pulvinar. Cras libero. Proin vestibulum tempor urna. Nulla odio nisl, auctor vitae, faucibus pharetra, feugiat eget, justo. Suspendisse at tellus non justo dictum tincidunt. Aenean placerat nunc id tortor. Donec mollis ornare pede. Vestibulum ut arcu et dolor auctor varius. Praesent tincidunt, eros quis vulputate facilisis, orci turpis sollicitudin justo, id faucibus nunc orci sed purus. Proin ligula erat, sollicitudin id, rhoncus eget, nonummy sit amet, risus. Aenean arcu lorem, facilisis et, posuere sed, ultrices tincidunt, nunc. Sed ac massa. Quisque lacinia. Donec quis nibh."/>
- </tc:panel>
+ </tc:flowLayout>
</ui:composition>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/12-best-practice/00/error.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/12-best-practice/00/error.xhtml?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/12-best-practice/00/error.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/12-best-practice/00/error.xhtml Thu Jun 25 09:59:27 2015
@@ -29,16 +29,11 @@
<tc:gridLayout rows="35px;35px;35px;35px" columns="100px;*"/>
</f:facet>
- <tc:panel>
+ <tc:flowLayout>
<tc:gridLayoutConstraint columnSpan="2"/>
- <f:facet name="layout">
- <tc:flowLayout />
- </f:facet>
-
<tc:out value="When using MyFaces or Facelets you have to turn off the exception mechanism of them to use this demo. See in the MyFaces Wiki: "/>
<tc:link link="http://wiki.apache.org/myfaces/Handling_Server_Errors" label="Handling Server Errors"/>
-
- </tc:panel>
+ </tc:flowLayout>
<tc:button action="#{bestPracticeController.throwException}" label="Application"/>
<tc:out
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/51-for-each/for-each.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/51-for-each/for-each.xhtml?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/51-for-each/for-each.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/51-for-each/for-each.xhtml Thu Jun 25 09:59:27 2015
@@ -27,12 +27,9 @@
<tc:gridLayout rows="100px;auto;auto;auto;*"/>
</f:facet>
- <tc:panel>
- <f:facet name="layout">
- <tc:flowLayout />
- </f:facet>
+ <tc:flowLayout>
<tc:out escape="false" value="#{overviewBundle.foreach_text}"/>
- </tc:panel>
+ </tc:flowLayout>
<tc:form>
<tc:panel>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/65-accessKey/accessKey.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/65-accessKey/accessKey.xhtml?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/65-accessKey/accessKey.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/65-accessKey/accessKey.xhtml Thu Jun 25 09:59:27 2015
@@ -21,11 +21,7 @@
xmlns:f="http://java.sun.com/jsf/core">
<ui:param name="title" value="Access Keys"/>
- <tc:panel>
- <f:facet name="layout">
- <tc:flowLayout />
- </f:facet>
-
+ <tc:flowLayout>
<p>
Todo: describe the usage:
<ul>
@@ -40,6 +36,5 @@
To log the use of the accessKey attribute please configure
the category <code>org.apache.myfaces.tobago.internal.util.AccessKeyLogger</code> to log level "debug".
</p>
-
- </tc:panel>
+ </tc:flowLayout>
</ui:composition>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/overview.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/overview.xhtml?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/overview.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/overview.xhtml Thu Jun 25 09:59:27 2015
@@ -38,19 +38,13 @@
<ui:include src="/menu.xhtml"/>
- <tc:panel>
- <f:facet name="layout">
- <tc:flexLayout columns="*;4*"/>
- </f:facet>
+ <tc:flexLayout columns="*;4*">
<tc:panel>
<ui:include src="/navigation.xhtml"/>
</tc:panel>
- <tc:panel>
- <f:facet name="layout">
- <tc:flexLayout rows="auto;*;auto"/>
- </f:facet>
+ <tc:flexLayout rows="auto;*;auto">
<tc:messages orderBy="SEVERITY"/>
@@ -60,12 +54,13 @@
<ui:include src="/footer.xhtml"/>
- </tc:panel>
+ </tc:flexLayout>
- </tc:panel>
+ </tc:flexLayout>
<tc:footer fixed="true">
- © 2015 Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
+ © 2015 Apache Software Foundation, Licensed under the <a
+ href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
</tc:footer>
</tc:page>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml Thu Jun 25 09:59:27 2015
@@ -81,17 +81,14 @@
</tc:form>
<tc:form>
- <tc:panel>
- <f:facet name="layout">
- <tc:flowLayout textAlign="right"/>
- </f:facet>
+ <tc:flowLayout textAlign="right">
<tc:in placeholder="Search"/>
<tc:button defaultCommand="true" omit="true" label="go">
<tc:dataAttribute name="alert-text"
value="Sorry: Search not implemented"/>
</tc:button>
- </tc:panel>
+ </tc:flowLayout>
</tc:form>
</tc:nav>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flexLayout/flexLayout-horizontal.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flexLayout/flexLayout-horizontal.xhtml?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flexLayout/flexLayout-horizontal.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flexLayout/flexLayout-horizontal.xhtml Thu Jun 25 09:59:27 2015
@@ -18,19 +18,16 @@
<f:view
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:tx="http://myfaces.apache.org/tobago/extension"
- xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core">
<tc:page id="page">
- <f:facet name="layout">
- <tc:flexLayout columns="*;auto;100px;2*"/>
- </f:facet>
+ <tc:flexLayout columns="*;auto;100px;2*">
- <tc:textarea value="Left 1*"/>
- <tc:image value="pidgeon-point.jpg"/>
- <tc:textarea value="100px"/>
- <tc:textarea value="Right 2*"/>
+ <tc:textarea value="Left 1*"/>
+ <tc:image value="pidgeon-point.jpg"/>
+ <tc:textarea value="100px"/>
+ <tc:textarea value="Right 2*"/>
+ </tc:flexLayout>
</tc:page>
</f:view>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flexLayout/flexLayout-simple.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flexLayout/flexLayout-simple.xhtml?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flexLayout/flexLayout-simple.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flexLayout/flexLayout-simple.xhtml Thu Jun 25 09:59:27 2015
@@ -18,17 +18,12 @@
<f:view
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:tx="http://myfaces.apache.org/tobago/extension"
- xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core">
<tc:page id="page">
- <f:facet name="layout">
- <tc:flexLayout columns="*;2*"/>
- </f:facet>
-
- <tc:textarea value="Left"/>
- <tc:textarea value="Right"/>
-
+ <tc:flexLayout columns="*;2*">
+ <tc:textarea value="Left"/>
+ <tc:textarea value="Right"/>
+ </tc:flexLayout>
</tc:page>
</f:view>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flexLayout/flexLayout-vertical.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flexLayout/flexLayout-vertical.xhtml?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flexLayout/flexLayout-vertical.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flexLayout/flexLayout-vertical.xhtml Thu Jun 25 09:59:27 2015
@@ -18,20 +18,19 @@
<f:view
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:tx="http://myfaces.apache.org/tobago/extension"
- xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core">
- <tc:page id="page" >
+ <tc:page id="page">
<tc:gridLayoutConstraint height="500px"/>
- <f:facet name="layout">
- <tc:flexLayout rows="*;auto;100px;2*"/>
- </f:facet>
-
- <tc:textarea value="Top 1*"/>
- <tc:image value="pidgeon-point.jpg"/>
- <tc:textarea value="100px"/>
- <tc:textarea value="Bottom 2*"/>
+
+ <tc:flexLayout rows="*;auto;100px;2*">
+
+ <tc:textarea value="Top 1*"/>
+ <tc:image value="pidgeon-point.jpg"/>
+ <tc:textarea value="100px"/>
+ <tc:textarea value="Bottom 2*"/>
+
+ </tc:flexLayout>
</tc:page>
</f:view>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flowLayout/flowLayout-textAlign.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flowLayout/flowLayout-textAlign.xhtml?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flowLayout/flowLayout-textAlign.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/flowLayout/flowLayout-textAlign.xhtml Thu Jun 25 09:59:27 2015
@@ -28,11 +28,7 @@
<tc:gridLayout rows="20px;auto;20px;auto;20px;auto;60px;"/>
</f:facet>
- <tc:panel>
- <f:facet name="layout">
- <tc:flowLayout textAlign="left"/>
- </f:facet>
-
+ <tc:flowLayout textAlign="left">
<tc:out id="left" value="left">
<tc:dataAttribute name="assert-left" value="0"/>
<tc:dataAttribute name="assert-top" value="0"/>
@@ -40,15 +36,11 @@
<tc:dataAttribute name="assert-height" value="14"/>
<tc:dataAttribute name="assert-epsilon" value="1"/>
</tc:out>
- </tc:panel>
+ </tc:flowLayout>
<tc:separator/>
- <tc:panel>
- <f:facet name="layout">
- <tc:flowLayout textAlign="right"/>
- </f:facet>
-
+ <tc:flowLayout textAlign="right">
<tc:out id="right" value="right">
<tc:dataAttribute name="assert-left" value="577"/>
<tc:dataAttribute name="assert-top" value="31"/>
@@ -56,15 +48,11 @@
<tc:dataAttribute name="assert-height" value="14"/>
<tc:dataAttribute name="assert-epsilon" value="1"/>
</tc:out>
- </tc:panel>
+ </tc:flowLayout>
<tc:separator/>
- <tc:panel>
- <f:facet name="layout">
- <tc:flowLayout textAlign="center"/>
- </f:facet>
-
+ <tc:flowLayout textAlign="center">
<tc:out id="center" value="center">
<tc:dataAttribute name="assert-left" value="283"/>
<tc:dataAttribute name="assert-top" value="62"/>
@@ -72,15 +60,11 @@
<tc:dataAttribute name="assert-height" value="14"/>
<tc:dataAttribute name="assert-epsilon" value="1"/>
</tc:out>
- </tc:panel>
+ </tc:flowLayout>
<tc:separator/>
- <tc:panel>
- <f:facet name="layout">
- <tc:flowLayout textAlign="justify"/>
- </f:facet>
-
+ <tc:flowLayout textAlign="justify">
1_XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX
2_XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX
3_XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX XXXXXXXX
@@ -92,7 +76,7 @@
<tc:dataAttribute name="assert-epsilon" value="1"/>
</tc:out>
4_XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
- </tc:panel>
+ </tc:flowLayout>
<tc:script file="script/tobago-assert.js"/>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/section/section.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/section/section.xhtml?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/section/section.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/section/section.xhtml Thu Jun 25 09:59:27 2015
@@ -21,33 +21,32 @@
xmlns:f="http://java.sun.com/jsf/core">
<tc:page id="page">
- <f:facet name="layout">
- <tc:flowLayout />
- </f:facet>
+ <tc:flowLayout>
- <tc:section label="Main Section" image="glyphicon-heart">
- <tc:section label="1st Sub-Section">
- 1st content
- </tc:section>
- <tc:section>
- 2nd content (title has no label nor image)
- </tc:section>
- <tc:section label="3rd Sub-Section with image" image="glyphicon-star">
- 3rd content
- </tc:section>
- <tc:section image="glyphicon-star-empty">
- 4th content (title has only an image)
- <tc:section label="Sub-Sub-Section" image="glyphicon-star-empty">
- <tc:section label="Sub-Sub-Sub-Section" image="glyphicon-star-empty">
- <tc:section label="Sub-Sub-Sub-Sub-Section" image="glyphicon-star-empty">
- <tc:section label="Sub-Sub-Sub-Sub-Sub-Section" image="glyphicon-star-empty">
- Level 6
+ <tc:section label="Main Section" image="glyphicon-heart">
+ <tc:section label="1st Sub-Section">
+ 1st content
+ </tc:section>
+ <tc:section>
+ 2nd content (title has no label nor image)
+ </tc:section>
+ <tc:section label="3rd Sub-Section with image" image="glyphicon-star">
+ 3rd content
+ </tc:section>
+ <tc:section image="glyphicon-star-empty">
+ 4th content (title has only an image)
+ <tc:section label="Sub-Sub-Section" image="glyphicon-star-empty">
+ <tc:section label="Sub-Sub-Sub-Section" image="glyphicon-star-empty">
+ <tc:section label="Sub-Sub-Sub-Sub-Section" image="glyphicon-star-empty">
+ <tc:section label="Sub-Sub-Sub-Sub-Sub-Section" image="glyphicon-star-empty">
+ Level 6
+ </tc:section>
</tc:section>
</tc:section>
</tc:section>
</tc:section>
- </tc:section>
- </tc:section>
+ </tc:section>
+ </tc:flowLayout>
</tc:page>
</f:view>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-selector.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-selector.xhtml?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-selector.xhtml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/sheet/sheet-selector.xhtml Thu Jun 25 09:59:27 2015
@@ -27,10 +27,7 @@
<tc:gridLayout rows="160px;auto" columns="600px"/>
</f:facet>
- <tc:panel>
- <f:facet name="layout">
- <tc:flowLayout />
- </f:facet>
+ <tc:flowLayout>
<ul>
<li>
@@ -62,7 +59,7 @@
</li>
</ol>
- </tc:panel>
+ </tc:flowLayout>
<tc:sheet value="#{sheet.solarArray}" id="sheet" columns="auto;*;*" var="luminary" rows="20">
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlowLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlowLayoutRenderer.java?rev=1687463&r1=1687462&r2=1687463&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlowLayoutRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlowLayoutRenderer.java Thu Jun 25 09:59:27 2015
@@ -24,7 +24,6 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.config.Configurable;
import org.apache.myfaces.tobago.layout.LayoutContainer;
import org.apache.myfaces.tobago.layout.Measure;
-import org.apache.myfaces.tobago.renderkit.MarginValues;
import org.apache.myfaces.tobago.renderkit.RendererBase;
import org.apache.myfaces.tobago.renderkit.SpacingValues;
import org.apache.myfaces.tobago.renderkit.css.Classes;
@@ -39,7 +38,7 @@ import javax.faces.component.UIComponent
import javax.faces.context.FacesContext;
import java.io.IOException;
-public class FlowLayoutRenderer extends RendererBase implements SpacingValues, MarginValues {
+public class FlowLayoutRenderer extends RendererBase implements SpacingValues {
@Override
public void encodeBegin(final FacesContext facesContext, final UIComponent component) throws IOException {
@@ -48,10 +47,10 @@ public class FlowLayoutRenderer extends
writer.startElement(HtmlElements.DIV, layout);
writer.writeClassAttribute(Classes.create(layout), BootstrapClass.textAlign(layout.getTextAlign()));
final Style style = new Style();
- style.setMarginLeft(getMarginLeft(facesContext, layout));
- style.setMarginRight(getMarginRight(facesContext, layout));
- style.setMarginTop(getMarginTop(facesContext, layout));
- style.setMarginBottom(getMarginBottom(facesContext, layout));
+ style.setMarginLeft(layout.getMarginLeft());
+ style.setMarginRight(layout.getMarginRight());
+ style.setMarginTop(layout.getMarginTop());
+ style.setMarginBottom(layout.getMarginBottom());
writer.writeStyleAttribute(style);
}
@@ -77,25 +76,4 @@ public class FlowLayoutRenderer extends
public Measure getRowSpacing(final FacesContext facesContext, final Configurable component) {
return getResourceManager().getThemeMeasure(facesContext, component, Attributes.ROW_SPACING);
}
-
- public Measure getMarginLeft(final FacesContext facesContext, final Configurable component) {
- final Configurable parent = (Configurable) ((UIComponent) component).getParent();
- return getResourceManager().getThemeMeasure(facesContext, parent, Attributes.MARGIN_LEFT);
- }
-
- public Measure getMarginRight(final FacesContext facesContext, final Configurable component) {
- final Configurable parent = (Configurable) ((UIComponent) component).getParent();
- return getResourceManager().getThemeMeasure(facesContext, parent, Attributes.MARGIN_RIGHT);
- }
-
- public Measure getMarginTop(final FacesContext facesContext, final Configurable component) {
- final Configurable parent = (Configurable) ((UIComponent) component).getParent();
- return getResourceManager().getThemeMeasure(facesContext, parent, Attributes.MARGIN_TOP);
- }
-
- public Measure getMarginBottom(final FacesContext facesContext, final Configurable component) {
- final Configurable parent = (Configurable) ((UIComponent) component).getParent();
- return getResourceManager().getThemeMeasure(facesContext, parent, Attributes.MARGIN_BOTTOM);
- }
-
}