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 2018/05/18 08:42:42 UTC
[myfaces-tobago] branch master updated: demo: clean up
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new 507c5a1 demo: clean up
507c5a1 is described below
commit 507c5a154aa6b0dbd6aff65d6f2b0e918f9be6f9
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Fri May 18 10:27:35 2018 +0200
demo: clean up
---
.../content/40-test/9000-attribute/attribute.xhtml | 10 +++---
.../90000-attic/error/display-exception.xhtml | 40 ----------------------
.../90000-attic/error/throw-exception.xhtml | 16 ++-------
.../90000-attic/forEach/dynamic-include.xhtml | 12 ++-----
4 files changed, 10 insertions(+), 68 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9000-attribute/attribute.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9000-attribute/attribute.xhtml
index 26878b0..f4ff11c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9000-attribute/attribute.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/9000-attribute/attribute.xhtml
@@ -26,13 +26,10 @@
<tc:gridLayout columns="250px 1fr">
<tc:label value="condition"/>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="1fr 1fr"/>
- </f:facet>
+ <tc:gridLayout columns="1fr 1fr">
<tc:selectBooleanCheckbox value="#{attributeController.condition}"/>
<tc:button label="update" action="#{attributeController.update}"/>
- </tc:panel>
+ </tc:gridLayout>
<tc:label value="simple output"/>
<tc:in readonly="true">
@@ -63,7 +60,8 @@
</c:if>
</tc:button>
- <tc:label value="conditional action (#{attributeController.condition}) and outcome not (#{not attributeController.condition})"/>
+ <tc:label
+ value="conditional action (#{attributeController.condition}) and outcome not (#{not attributeController.condition})"/>
<tc:button label="Click">
<c:if test="${attributeController.condition}">
<tc:attribute name="action" value="#{attributeController.reload}"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/error/display-exception.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/error/display-exception.xhtml
deleted file mode 100644
index cc113f5..0000000
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/error/display-exception.xhtml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
--->
-
-<!-- XXX This is an old page. Content might not be up to date. Needs to be refactored, or just deleted. -->
-<f:view
- xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:f="http://java.sun.com/jsf/core">
-
- <tc:page>
- <!-- <tc:gridLayoutConstraint width="600px" height="300px"/> -->
-
- <tc:box label="An Exception has occured">
- <f:facet name="layout">
- <tc:gridLayout rows="auto 1fr"/>
- </f:facet>
-
- <tc:messages/>
- <tc:out
- value="This page will be shown, when an org.apache.myfaces.tobago.example.demo.DemoException occures!"/>
-
- </tc:box>
-
- </tc:page>
-</f:view>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/error/throw-exception.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/error/throw-exception.xhtml
index 9a6d054..975f43b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/error/throw-exception.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/error/throw-exception.xhtml
@@ -23,25 +23,15 @@
xmlns:f="http://java.sun.com/jsf/core">
<tc:page>
- <!-- <tc:gridLayoutConstraint width="600px" height="300px"/> -->
-
<tc:box label="Error Test">
- <f:facet name="layout">
- <tc:gridLayout rows="100px auto"/>
- </f:facet>
<tc:panel>
Please click the button, that will throw an exception!
</tc:panel>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="1fr auto"/>
- </f:facet>
-
- <tc:panel/>
- <tc:button label="Error" action="#{errorController.error}"/>
- </tc:panel>
+ <tc:flowLayout textAlign="right">
+ <tc:button label="Throw an error" action="#{errorController.error}"/>
+ </tc:flowLayout>
</tc:box>
</tc:page>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/dynamic-include.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/dynamic-include.xhtml
index 47a7da8..df1b157 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/dynamic-include.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/90000-attic/forEach/dynamic-include.xhtml
@@ -23,13 +23,10 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:c="http://java.sun.com/jsp/jstl/core">
+ xmlns:c="http://java.sun.com/jsp/jstl/core">
<tc:page width="800px" height="800px" label="Dynamic Include">
<tc:box label="Dynamic Included Panels">
- <f:facet name="layout">
- <tc:gridLayout margin="10px" columns="500px" rows="100px auto auto auto auto auto"/>
- </f:facet>
<tc:panel>
<p>
This example demonstrates dynamic includes with Facelets.
@@ -49,13 +46,10 @@
<c:forEach var="panel" items="#{dynamicController.panels}">
<ui:include src="#{panel.name}"/>
</c:forEach>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout columns="100px 100px 1fr" rows="auto"/>
- </f:facet>
+ <tc:flowLayout textAlign="right">
<tc:button label="Next" action="#{dynamicController.addPanel}"/>
<tc:button label="Reset" immediate="true" action="#{dynamicController.reset}"/>
- </tc:panel>
+ </tc:flowLayout>
</tc:box>
</tc:page>
</f:view>
--
To stop receiving notification emails like this one, please contact
lofwyr@apache.org.