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 2011/10/18 22:33:33 UTC
svn commit: r1185843 - in /myfaces/tobago/trunk: src/docbook/
tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/
tobago-example/tobago-example-test/src/main/webapp/WEB-INF/
tobago-example/tobago-theme-example/src/main/resources/META-INF/ tobag...
Author: lofwyr
Date: Tue Oct 18 20:33:33 2011
New Revision: 1185843
URL: http://svn.apache.org/viewvc?rev=1185843&view=rev
Log:
TOBAGO-979: The supported markups should be inherited from the parent theme.
Modified:
myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml
myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-theme.xml
myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/org/apache/myfaces/tobago/renderkit/html/example/standard/style/style.css
Modified: myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml?rev=1185843&r1=1185842&r2=1185843&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml (original)
+++ myfaces/tobago/trunk/src/docbook/tobago-tutorial.xml Tue Oct 18 20:33:33 2011
@@ -904,11 +904,11 @@ tobago-resource/html/standard/standard/i
results from the following naming rule "tobago-" +
<literal>rendererName.toLower()</literal> + "-markup-" + <literal>markupName</literal>:</para>
- <programlisting>.tobago-column-markup-new {
+ <programlisting>.tobago-sheet-cell-markup-new {
background-color: yellow;
}</programlisting>
- <para>For the Example theme it was decided to render a new column with a
+ <para>For the Example theme it was decided to render a new column (sheet-cell) with a
yellow background.</para>
<para>The address book example uses a different way to add markup. In
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml?rev=1185843&r1=1185842&r2=1185843&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml Tue Oct 18 20:33:33 2011
@@ -52,34 +52,6 @@
<markup>sun</markup>
<markup>planet</markup>
<markup>moon</markup>
- <!--
- XXX this is here, because in the moment, the list will be replaced and not be added.
- XXX this may change in the future. -->
- <!-- internal: for the paging buttons -->
- <markup>disabled</markup>
- <!-- internal: for the header -->
- <markup>resizable</markup>
- <!-- for the rows -->
- <markup>odd</markup>
- <markup>even</markup>
- <!-- for the cells -->
- <markup>clickable</markup>
- <markup>first</markup>
- <!-- internal: for the paging fields -->
- <markup>left</markup>
- <markup>center</markup>
- <markup>right</markup>
- </supported-markup>
- </renderer>
-
- <renderer>
- <name>SelectOneChoice</name>
- <supported-markup>
- <markup>disabled</markup>
- <markup>selected</markup>
- <markup>ok</markup>
- <markup>warn</markup>
- <markup>error</markup>
</supported-markup>
</renderer>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml?rev=1185843&r1=1185842&r2=1185843&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/WEB-INF/tobago-config.xml Tue Oct 18 20:33:33 2011
@@ -33,7 +33,6 @@
<renderer>
<name>TreeCommand</name>
<supported-markup>
- <markup>disabled</markup>
<markup>todo</markup>
</supported-markup>
</renderer>
Modified: myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-theme.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-theme.xml?rev=1185843&r1=1185842&r2=1185843&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-theme.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/META-INF/tobago-theme.xml Tue Oct 18 20:33:33 2011
@@ -25,23 +25,14 @@
<fallback>speyside</fallback>
<renderers>
<renderer>
- <name>Out</name>
- <supported-markup>
- <markup>strong</markup>
- <markup>deleted</markup>
- <markup>number</markup>
- </supported-markup>
- </renderer>
- <renderer>
<name>In</name>
<supported-markup>
- <markup>number</markup>
<markup>changeaware</markup>
<markup>blink</markup>
</supported-markup>
</renderer>
<renderer>
- <name>Column</name>
+ <name>Sheet</name>
<supported-markup>
<markup>new</markup>
<markup>none</markup>
Modified: myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/org/apache/myfaces/tobago/renderkit/html/example/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/org/apache/myfaces/tobago/renderkit/html/example/standard/style/style.css?rev=1185843&r1=1185842&r2=1185843&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/org/apache/myfaces/tobago/renderkit/html/example/standard/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/resources/org/apache/myfaces/tobago/renderkit/html/example/standard/style/style.css Tue Oct 18 20:33:33 2011
@@ -15,10 +15,6 @@
* limitations under the License.
*/
-.tobago-column-markup-new {
- background-color: yellow;
-}
-
.tobago-in-markup-changeaware {
border: 1px solid red;
}
@@ -31,6 +27,10 @@
background-color: yellow;
}
+.tobago-sheet-cell-markup-new {
+ background-color: yellow;
+}
+
.tobago-sheet-row-markup-odd {
background: #ffffff;
}