myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r1569335 - in /myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test: ./ src/main/java/org/apache/myfaces/tobago/example/test/ src/main/webapp/WEB-INF/ src/main/webapp/test/bootstrapLayout/
Date Tue, 18 Feb 2014 14:15:20 GMT
Author: lofwyr
Date: Tue Feb 18 14:15:19 2014
New Revision: 1569335

URL: http://svn.apache.org/r1569335
Log:
TOBAGO-1368: Create a new theme which uses Bootstrap
TOBAGO-1358: Using CSS box-sizing: border-box instead of content-box 
TOBAGO-1361: New Layout Manager: Flex Box 
TOBAGO-1360: Clean up attic browser support
- first working draft

Added:
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Bootstrap.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/bootstrapLayout/
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/bootstrapLayout/simple-1.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/bootstrapLayout/simple-2.xhtml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/bootstrapLayout/simple-3.xhtml
Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml?rev=1569335&r1=1569334&r2=1569335&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml Tue Feb
18 14:15:19 2014
@@ -117,6 +117,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
+      <artifactId>tobago-theme-bootstrap</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.myfaces.tobago</groupId>
       <artifactId>tobago-theme-scarborough</artifactId>
       <version>${project.version}</version>
     </dependency>

Added: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Bootstrap.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Bootstrap.java?rev=1569335&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Bootstrap.java
(added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Bootstrap.java
Tue Feb 18 14:15:19 2014
@@ -0,0 +1,32 @@
+package org.apache.myfaces.tobago.example.test;
+
+public class Bootstrap {
+
+  private String value;
+
+  public Bootstrap() {
+    reset();
+  }
+
+  public String save() {
+    return "test/html/bootstrap.xhtml";
+  }
+
+  public String delete() {
+    value = null;
+    return "test/html/bootstrap.xhtml";
+  }
+
+  public String reset() {
+    value = "initial value";
+    return "test/html/bootstrap.xhtml";
+  }
+
+  public String getValue() {
+    return value;
+  }
+
+  public void setValue(final String value) {
+    this.value = value;
+  }
+}

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml?rev=1569335&r1=1569334&r2=1569335&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/faces-config.xml
Tue Feb 18 14:15:19 2014
@@ -233,6 +233,12 @@
     <managed-bean-scope>session</managed-bean-scope>
   </managed-bean>
 
+  <managed-bean>
+    <managed-bean-name>bootstrap</managed-bean-name>
+    <managed-bean-class>org.apache.myfaces.tobago.example.test.Bootstrap</managed-bean-class>
+    <managed-bean-scope>session</managed-bean-scope>
+  </managed-bean>
+
   <navigation-rule>
     <navigation-case>
       <from-outcome>navigation</from-outcome>

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml?rev=1569335&r1=1569334&r2=1569335&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml
(original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml
Tue Feb 18 14:15:19 2014
@@ -26,6 +26,7 @@
     <supported-theme>scarborough</supported-theme>
     <supported-theme>richmond</supported-theme>
     <supported-theme>charlotteville</supported-theme>
+    <supported-theme>bootstrap</supported-theme>
   </theme-config>
   <resource-dir>tobago-resource</resource-dir>
 

Added: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/bootstrapLayout/simple-1.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/bootstrapLayout/simple-1.xhtml?rev=1569335&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/bootstrapLayout/simple-1.xhtml
(added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/bootstrapLayout/simple-1.xhtml
Tue Feb 18 14:15:19 2014
@@ -0,0 +1,35 @@
+<?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.
+-->
+
+<f:view
+    xmlns:tc="http://myfaces.apache.org/tobago/component"
+    xmlns:tx="http://myfaces.apache.org/tobago/extension"
+    xmlns:f="http://java.sun.com/jsf/core">
+
+  <tc:page id="page">
+    <f:facet name="layout">
+      <tc:bootstrapLayout medium="2;4;2;4" small="6;6"/>
+    </f:facet>
+
+    <tx:in label="1st label" value="a aa aaa aaaa aaaaa"/>
+    <tx:in label="2nd label" value="b bb bbb bbbb bbbbb b bb bbb bbbb bbbbb b bb bbb bbbb
bbb bbbb bbbbb "/>
+    <tx:textarea label="3rd label" value="c cc ccc cccc ccccc"/>
+    <tx:textarea label="4th label" value="d dd ddd dddd ddddd"/>
+
+  </tc:page>
+</f:view>

Added: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/bootstrapLayout/simple-2.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/bootstrapLayout/simple-2.xhtml?rev=1569335&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/bootstrapLayout/simple-2.xhtml
(added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/bootstrapLayout/simple-2.xhtml
Tue Feb 18 14:15:19 2014
@@ -0,0 +1,46 @@
+<?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.
+-->
+
+<f:view
+    xmlns:tc="http://myfaces.apache.org/tobago/component"
+    xmlns:tx="http://myfaces.apache.org/tobago/extension"
+    xmlns:f="http://java.sun.com/jsf/core">
+
+  <!--
+  same as simple-1.xhtml, but here are two panels, which contains the controls.
+  -->
+
+  <tc:page id="page">
+    <tc:panel>
+      <f:facet name="layout">
+        <tc:bootstrapLayout medium="2;4;2;4" small="6;6"/>
+      </f:facet>
+
+      <tx:in label="1st label" value="a aa aaa aaaa aaaaa"/>
+      <tx:in label="2nd label" value="b bb bbb bbbb bbbbb b bb bbb bbbb bbbbb b bb bbb
bbbb bbb bbbb bbbbb "/>
+    </tc:panel>
+    <tc:panel>
+      <f:facet name="layout">
+        <tc:bootstrapLayout medium="2;4;2;4" small="6;6"/>
+      </f:facet>
+
+      <tx:textarea label="3rd label" value="c cc ccc cccc ccccc"/>
+      <tx:textarea label="4th label" value="d dd ddd dddd ddddd"/>
+    </tc:panel>
+  </tc:page>
+</f:view>

Added: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/bootstrapLayout/simple-3.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/bootstrapLayout/simple-3.xhtml?rev=1569335&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/bootstrapLayout/simple-3.xhtml
(added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/src/main/webapp/test/bootstrapLayout/simple-3.xhtml
Tue Feb 18 14:15:19 2014
@@ -0,0 +1,53 @@
+<?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.
+-->
+
+<f:view
+    xmlns:tc="http://myfaces.apache.org/tobago/component"
+    xmlns:tx="http://myfaces.apache.org/tobago/extension"
+    xmlns:f="http://java.sun.com/jsf/core">
+
+  <tc:page id="page">
+    <tc:panel>
+      <f:facet name="layout">
+        <tc:bootstrapLayout medium="2;4;2;4" small="6;6"/>
+      </f:facet>
+
+      <tx:in label="1st label" value="#{bootstrap.value}"/>
+      <tx:in label="2nd label" value="b bb bbb bbbb bbbbb b bb bbb bbbb bbbbb b bb bbb
bbbb bbb bbbb bbbbb "/>
+    </tc:panel>
+    <tc:panel>
+      <f:facet name="layout">
+        <tc:bootstrapLayout medium="2;4;2;4" small="6;6"/>
+      </f:facet>
+
+      <tx:textarea label="3rd label" value="c cc ccc cccc ccccc"/>
+      <tx:textarea label="4th label" value="d dd ddd dddd ddddd"/>
+
+    </tc:panel>
+    <tc:panel>
+      <f:facet name="layout">
+        <tc:bootstrapLayout medium="1;1;1" extraSmall="4;4;4"/>
+      </f:facet>
+
+      <tc:button id="cancel" label="Cancel" action="#{bootstrap.reset}"/>
+      <tc:button id="save" label="Save" action="#{bootstrap.save}"/>
+      <tc:button id="delete" label="Delete" action="#{bootstrap.delete}"/>
+    </tc:panel>
+
+  </tc:page>
+</f:view>



Mime
View raw message