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 2014/02/18 15:01:20 UTC
svn commit: r1569330 - in /myfaces/tobago/branches/tobago-3.0.x: ./
tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/
tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/
Author: lofwyr
Date: Tue Feb 18 14:01:19 2014
New Revision: 1569330
URL: http://svn.apache.org/r1569330
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-3.0.txt
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component2.0.stg
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/tag1.2.stg
Added: 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=1569330&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-3.0.txt (added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-3.0.txt Tue Feb 18 14:01:19 2014
@@ -0,0 +1,12 @@
+Planned features and changes for Tobago 3.0
+
+- Bootstrap
+- Simplify layout through using CSS3:
+ - Use box-sizing: border-box (requires IE 8) (required for Bootstrap)
+ - Use min/max-width/height (requires IE 9 (IE 8 have bugs (see caniuse.com)))
+ - Use n-th child (requires IE 9 and FF 3.5)
+ - Maybe: Using 75%,25% in HTML where columns="3*;*" in layout? What is with constant values?
+ - Better: Using Flexible Box Layout Module (requires IE 10, might be emulated with JavaScript)
+ - It seems to be required: Remove absolute Positioning (required for Bootstrap)
+
+ - Renderervererbung: addClass() von Parent oder so? z.B. muss man be Bootstrap einem input wohl eine Klasse form-control hinzufügen
\ No newline at end of file
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java?rev=1569330&r1=1569329&r2=1569330&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java Tue Feb 18 14:01:19 2014
@@ -244,6 +244,9 @@ public class ClassesGenerator extends Ab
if ("markup".equals(info.getName())) {
componentInfo.addInterface("org.apache.myfaces.tobago.component.SupportsMarkup");
}
+ if ("css".equals(info.getName())) {
+ componentInfo.addInterface("org.apache.myfaces.tobago.component.SupportsCss");
+ }
if ("requiredMessage".equals(info.getName())) {
componentInfo.setMessages(true);
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component2.0.stg
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component2.0.stg?rev=1569330&r1=1569329&r2=1569330&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component2.0.stg (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component2.0.stg Tue Feb 18 14:01:19 2014
@@ -333,6 +333,10 @@ CharacterProperty(property) ::= <<
<NormalProperty(property)>
>>
+BootstrapPartitionProperty(property) ::= <<
+<NormalProperty(property)>
+>>
+
MethodExpressionProperty(property) ::= <<
/**
@@ -467,6 +471,34 @@ public void set<property.upperCamelCaseN
}
>>
+CssProperty(property) ::= <<
+
+<checkDeprecated(property)>
+public <property.type> get<property.upperCamelCaseName>() {
+ <if(property.transient)>
+ if (<property.propertyName> != null) {
+ return <property.propertyName>;
+ }
+ <else>
+ Object object = getStateHelper().eval(PropertyKeys.<property.propertyName>);
+ if (object != null) {
+ return Css.valueOf(object);
+ }
+ <endif>
+ return null;
+}
+
+<checkDeprecated(property)>
+public void set<property.upperCamelCaseName>(<property.type> <property.propertyName>) {
+ <logDeprecated(property)>
+ <if(property.transient)>
+ this.<property.propertyName> = <property.propertyName>;
+ <else>
+ getStateHelper().put(PropertyKeys.<property.propertyName>, <property.propertyName>);
+ <endif>
+}
+>>
+
enumName() ::= <<
<it.propertyName>,
>>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/tag1.2.stg
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/tag1.2.stg?rev=1569330&r1=1569329&r2=1569330&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/tag1.2.stg (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/tag1.2.stg Tue Feb 18 14:01:19 2014
@@ -273,6 +273,26 @@ if (<it.propertyName> != null) {
}
>>
+BootstrapPartition() ::= <<
+if (<it.propertyName> != null) {
+ if (!<it.propertyName>.isLiteralText()) {
+ <createValueBinding(it)>
+ } else {
+ component.set<it.upperCamelCaseName>(org.apache.myfaces.tobago.layout.BootstrapPartition.valueOf(<it.propertyName>.getExpressionString()));
+ }
+}
+>>
+
+Css() ::= <<
+if (<it.propertyName> != null) {
+ if (!<it.propertyName>.isLiteralText()) {
+ <createValueBinding(it)>
+ } else {
+ component.set<it.upperCamelCaseName>(org.apache.myfaces.tobago.renderkit.css.Css.valueOf(<it.propertyName>.getExpressionString()));
+ }
+}
+>>
+
OrderBy() ::= <<
if (<it.propertyName> != null) {
if (!<it.propertyName>.isLiteralText()) {