richfaces-svn-commits
April 2009
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 645 discussions
JBoss Rich Faces SVN: r13486 - trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-04-10 06:58:54 -0400 (Fri, 10 Apr 2009)
New Revision: 13486
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java
Log:
fix image load
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java 2009-04-10 10:44:03 UTC (rev 13485)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java 2009-04-10 10:58:54 UTC (rev 13486)
@@ -47,7 +47,7 @@
if (null == data) {
return;
}
- File imageResource = fileManager.getFileByAbsolutePath(data.toString());
+ File imageResource = fileManager.getFileByPath(data.toString());
paintImageToBrowser(out, imageResource);
}
@@ -55,7 +55,7 @@
if (null == data) {
return;
}
- File imageResource = fileManager.getFileByPath(data.toString());
+ File imageResource = fileManager.getFileByAbsolutePath(data.toString());
paintImageToBrowser(out, imageResource);
}
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13485 - trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-04-10 06:44:03 -0400 (Fri, 10 Apr 2009)
New Revision: 13485
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/faces-config.xml
Log:
remove RealworldCommandButtonRenderer
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/faces-config.xml 2009-04-10 10:02:52 UTC (rev 13484)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/faces-config.xml 2009-04-10 10:44:03 UTC (rev 13485)
@@ -12,14 +12,5 @@
</locale-config>
<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
</application>
-
-
- <render-kit>
- <render-kit-id>HTML_BASIC</render-kit-id>
- <renderer>
- <component-family>javax.faces.Command</component-family>
- <renderer-type>org.ajax4jsf.components.RealworldAjaxCommandButtonRenderer</renderer-type>
- <renderer-class>org.richfaces.realworld.tags.RealworldCommandButtonRenderer</renderer-class>
- </renderer>
- </render-kit>
+
</faces-config>
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13484 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-04-10 06:02:52 -0400 (Fri, 10 Apr 2009)
New Revision: 13484
Modified:
trunk/docs/userguide/en/src/main/docbook/included/rich_page.desc.xml
trunk/docs/userguide/en/src/main/docbook/included/rich_page.xml
Log:
https://jira.jboss.org/jira/browse/RF-6593
Added descriptions of layout components
Modified: trunk/docs/userguide/en/src/main/docbook/included/rich_page.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/rich_page.desc.xml 2009-04-10 10:02:31 UTC (rev 13483)
+++ trunk/docs/userguide/en/src/main/docbook/included/rich_page.desc.xml 2009-04-10 10:02:52 UTC (rev 13484)
@@ -1,17 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
-<section role="updated">
+<section>
<sectioninfo>
- <keywordset>
- <keyword>layouPanel</keyword>
- <keyword>rich:layouPanel</keyword>
+ <keywordset>
+ <keyword>rich:page</keyword>
</keywordset>
- </sectioninfo>
-
- <title>Description</title>
- <para>The <emphasis role="bold">
- <property><rich:page></property>
- </emphasis>
- </para>
+ </sectioninfo>
+ <section>
+ <title>Description</title>
+ <para>The <emphasis role="bold">
+ <property><rich:page></property>
+ </emphasis> component is used to create structured layouts containing header, bottom, center and left or right layout areas as well as to define the content of the <head/> element, declare DOCTYPE etc.</para>
+
-
- </section>
+ </section>
+ <section>
+ <title>Key Features</title>
+ <itemizedlist>
+
+
+ <listitem><para>Option to change the renderer of the component</para></listitem>
+ <listitem><para>Possibility to define parameters of an HTML page</para></listitem>
+
+
+ </itemizedlist>
+ </section>
+</section>
\ No newline at end of file
Modified: trunk/docs/userguide/en/src/main/docbook/included/rich_page.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/rich_page.xml 2009-04-10 10:02:31 UTC (rev 13483)
+++ trunk/docs/userguide/en/src/main/docbook/included/rich_page.xml 2009-04-10 10:02:52 UTC (rev 13484)
@@ -1,5 +1,71 @@
-
+<?xml version="1.0" encoding="UTF-8"?>
+<section>
+ <sectioninfo>
+ <keywordset>
+ <keyword>rich:page</keyword>
+ <keyword>page</keyword>
+ </keywordset>
+ </sectioninfo>
+ <table>
+ <title>Component identification parameters</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Name</entry>
+ <entry>Value</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>component-type</entry>
+ <entry>org.richfaces.component.html.HtmlPage</entry>
+ </row>
+ <row>
+ <entry>component-class</entry>
+ <entry>org.richfaces.component.html.HtmlPage</entry>
+ </row>
+ <row>
+ <entry>component-family</entry>
+ <entry>org.richfaces.Page</entry>
+ </row>
+ <row>
+ <entry>renderer-type</entry>
+ <entry>org.richfaces.PageRenderer</entry>
+ </row>
+ <row>
+ <entry>tag-class</entry>
+ <entry>org.richfaces.taglib.PageTag</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
<section>
+ <title>Creating the Component with a Page Tag</title>
+ <para>To create the simplest variant on a page use the following syntax:</para>
+
+ <para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
+ <programlisting role="XML"><![CDATA[...
+<rich:layout>
+ <rich:layoutPanel position="center">
+ <!--center-->
+</rich:layoutPanel>
+</rich:layout>
+...]]></programlisting>
+ </section>
+ <section>
+ <title>Creating the Component Dynamically Using Java</title>
+
+ <para>
+ <emphasis role="bold">Example:</emphasis>
+ </para>
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmllayoutPanel;
+...
+HtmllayoutPanel mylayoutPanel = new HtmllayoutPanel();
+...]]></programlisting>
+ </section>
+ <section>
<title>Details of Usage</title>
<para>The <emphasis role="bold"><property><rich:page></property></emphasis>
@@ -9,13 +75,26 @@
<para>
- In the first place, to declare the document type of the page you should use the <emphasis><property>"markupType"</property></emphasis> attribute which has the following values: "html", "xhtml", "html-transitional", "html-3.2".
+ In the first place, to declare the document type of the page you should use the <emphasis><property>"markupType"</property></emphasis> attribute which has the following values:
+ </para>
+
+ <itemizedlist>
+ <listitem><para>"html"</para></listitem>
+ <listitem><para>"html-transitional"</para></listitem>
+ <listitem><para>"xhtml"</para></listitem>
+ <listitem><para>"xhtml-transitional"</para></listitem>
+ <listitem><para>"html-frameset"</para></listitem>
+ <listitem><para>"html-3.2"</para></listitem>
+
+ </itemizedlist>
+
+ <para>
The <emphasis><property>"contentType"</property></emphasis> allows to specify the type of the content and encoding for the page.
</para>
<para>
The title of the page can be set with the <emphasis><property>"pageTile"</property></emphasis> attribute.
- To place some other page parameters (like meta information, links to CSS style sheets etc.) in the <head> part of an HTML page use "pageHeader" facet.
+ To place some other page parameters (like meta information, links to CSS style sheets etc.) in the <head> element of an HTML page use "pageHeader" facet.
</para>
<para>
@@ -34,7 +113,7 @@
</rich:page>
...]]></programlisting>
- <para>The implementation of the <emphasis role="bold"><property><rich:></property></emphasis> component provides three facets that you can use to arrange the layout of the page: "header", "sidebar" and "footer" .</para>
+ <para>The implementation of the <emphasis role="bold"><property><rich:page></property></emphasis> component provides three facets that you can use to arrange the layout of the page: "header", "subheader", "sidebar" and "footer". Their behavior is quite self-explanatory. </para>
<para>The position of the panel rendered by a "sidebar" facet can be set with the <emphasis><property>"sidebarPosition"</property></emphasis> attribute that can take either "right" or "left" values, you can also specify width for this facet with the "sidebarWidth" attribute. </para>
<para>
<emphasis role="bold">Example:</emphasis>
@@ -63,6 +142,101 @@
<para>Several templates are available for the <emphasis role="bold"><property><rich:page></property></emphasis> component. A template can be activated with the <emphasis><property>"theme"</property></emphasis> attribute.</para>
- <para></para>
+ <para>The template defines the way the <emphasis role="bold"><property><rich:page></property></emphasis> is rendered. Standard renderer(default) of the <emphasis role="bold"><property><rich:page></property></emphasis> </para>
</section>
+
+ <section>
+ <title>Facets</title>
+ <table>
+ <title>Facets</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Facet Name</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>pageHeader</entry>
+ <entry>Creates the <head/> part of the HTML page</entry>
+ </row>
+ <row>
+ <entry>header</entry>
+ <entry>Creates a header</entry>
+ </row>
+
+ <row>
+ <entry>subheader</entry>
+ <entry>Creates a horizontal panel under the header</entry>
+ </row>
+ <row>
+ <entry>footer</entry>
+ <entry>Creates a footer</entry>
+ </row>
+
+ <row>
+ <entry>sidebar</entry>
+ <entry>Creates a left/right panel</entry>
+ </row>
+
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+
+
+ <section>
+ <title>Component CSS Selectors</title>
+
+ <table id="comboBoxC">
+ <title>CSS Selectors that define the representation of the component's blocks</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>CSS Selector</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+
+
+ <row>
+ <entry>.rich-page</entry>
+ <entry>Defines styles for the whole page</entry>
+ </row>
+
+
+ <row>
+ <entry>.rich-page-header</entry>
+ <entry>Defines styles for the header</entry>
+ </row>
+
+ <row>
+ <entry>.rich-page-subheader</entry>
+ <entry>Defines styles for the block under the header</entry>
+ </row>
+
+ <row>
+ <entry>.rich-page-sidebar</entry>
+ <entry>Defines styles for the sidebar</entry>
+ </row>
+
+ <row>
+ <entry>.rich-page-body</entry>
+ <entry>Defines styles for the body part of the page</entry>
+ </row>
+
+ <row>
+ <entry>.rich-page-footer</entry>
+ <entry>Defines styles for the footer</entry>
+ </row>
+
+
+ </tbody>
+ </tgroup>
+ </table>
+
+ </section>
+</section>
\ No newline at end of file
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13483 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-04-10 06:02:31 -0400 (Fri, 10 Apr 2009)
New Revision: 13483
Modified:
trunk/docs/userguide/en/src/main/docbook/included/layout.desc.xml
trunk/docs/userguide/en/src/main/docbook/included/layout.xml
trunk/docs/userguide/en/src/main/docbook/included/layoutPanel.desc.xml
trunk/docs/userguide/en/src/main/docbook/included/layoutPanel.xml
Log:
https://jira.jboss.org/jira/browse/RF-6593
Added descriptions of layout components
Modified: trunk/docs/userguide/en/src/main/docbook/included/layout.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/layout.desc.xml 2009-04-10 00:14:07 UTC (rev 13482)
+++ trunk/docs/userguide/en/src/main/docbook/included/layout.desc.xml 2009-04-10 10:02:31 UTC (rev 13483)
@@ -10,13 +10,14 @@
<title>Description</title>
<para>The <emphasis role="bold">
<property><rich:layout></property>
- </emphasis> component is used to build the web page layout.
+ </emphasis> component is designed to build layouts.
</para>
</section>
<section>
<title>Key Features</title>
<itemizedlist>
- <listitem><para>bla bla bla</para></listitem>
+ <listitem><para>Cross-borwser comparability</para></listitem>
+ <listitem><para>Easy markup creation</para></listitem>
</itemizedlist>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/layout.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/layout.xml 2009-04-10 00:14:07 UTC (rev 13482)
+++ trunk/docs/userguide/en/src/main/docbook/included/layout.xml 2009-04-10 10:02:31 UTC (rev 13483)
@@ -4,7 +4,7 @@
<keywordset>
<keyword>rich:layout</keyword>
<keyword>rich:layout</keyword>
- <keyword>breakBefore</keyword>
+
</keywordset>
</sectioninfo>
<table>
@@ -23,15 +23,15 @@
</row>
<row>
<entry>component-class</entry>
- <entry>org.richfaces.component.html.Htmllayout</entry>
+ <entry>org.richfaces.component.html.HtmlLayout</entry>
</row>
<row>
<entry>component-family</entry>
- <entry>org.richfaces.layout</entry>
+ <entry>org.richfaces.Layout</entry>
</row>
<row>
<entry>renderer-type</entry>
- <entry>org.richfaces.layoutRenderer</entry>
+ <entry>org.richfaces.LayoutRenderer</entry>
</row>
<row>
<entry>tag-class</entry>
@@ -43,14 +43,16 @@
<section>
<title>Creating the Component with a Page Tag</title>
- <para>To create the simplest variant of <property>layout</property> on a page,
+ <para>To create the simplest layout with the <emphasis role="bold"><property><rich:layout></property></emphasis> on a page,
use the following syntax:</para>
<para>
<emphasis role="bold">Example:</emphasis>
</para>
<programlisting role="XML"><![CDATA[...
-
+<rich:layout>
+ ...
+</rich:layout>
...
]]></programlisting>
</section>
@@ -60,9 +62,9 @@
<para>
<emphasis role="bold">Example:</emphasis>
</para>
- <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.Htmllayout;
+ <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlLayout;
...
-Htmllayout mylayout = new Htmllayout();
+Htmllayout mylayout = new HtmlLayout();
...
]]></programlisting>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/layoutPanel.desc.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/layoutPanel.desc.xml 2009-04-10 00:14:07 UTC (rev 13482)
+++ trunk/docs/userguide/en/src/main/docbook/included/layoutPanel.desc.xml 2009-04-10 10:02:31 UTC (rev 13483)
@@ -1,20 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
-<section role="new">
+<section>
<sectioninfo>
- <keywordset>
- <keyword>layouPanel</keyword>
- <keyword>rich:layouPanel</keyword>
+ <keywordset>
+ <keyword>rich:page</keyword>
</keywordset>
- </sectioninfo>
+ </sectioninfo>
<section>
- <title>Description</title>
- <para>The <emphasis role="bold">
- <property><rich:layouPanel></property>
- </emphasis> is an auxiliary component used to create layout areas within the <emphasis role="bold"><property><rich:layout></property></emphasis> container.
- </para>
-
-
- </section>
-
-</section>
-
\ No newline at end of file
+ <title>Description</title>
+ <para>The <emphasis role="bold">
+ <property><rich:layouPanel></property>
+ </emphasis> is an auxiliary component used to create layout areas within the
+ <emphasis role="bold"><property><rich:layout></property></emphasis> container.
+ </para>
+
+ </section>
+ <section>
+ <title>Key Features</title>
+ <itemizedlist>
+
+ <listitem><para>Option to change the renderer of the component</para></listitem>
+
+ </itemizedlist>
+ </section>
+</section>
\ No newline at end of file
Modified: trunk/docs/userguide/en/src/main/docbook/included/layoutPanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/layoutPanel.xml 2009-04-10 00:14:07 UTC (rev 13482)
+++ trunk/docs/userguide/en/src/main/docbook/included/layoutPanel.xml 2009-04-10 10:02:31 UTC (rev 13483)
@@ -2,8 +2,8 @@
<section>
<sectioninfo>
<keywordset>
+ <keyword>rich:layoutPanel</keyword>
<keyword>layoutPanel</keyword>
- <keyword>layoutPanel</keyword>
</keywordset>
</sectioninfo>
<table>
@@ -18,23 +18,23 @@
<tbody>
<row>
<entry>component-type</entry>
- <entry>org.richfaces.component.layoutPanel</entry>
+ <entry>org.richfaces.LayoutPanel</entry>
</row>
<row>
<entry>component-class</entry>
- <entry>org.richfaces.component.html.HtmllayoutPanel</entry>
+ <entry>org.richfaces.component.html.HtmlLayoutPanel</entry>
</row>
<row>
<entry>component-family</entry>
- <entry>org.richfaces.component.layoutPanel</entry>
+ <entry>org.richfaces.LayoutPanel</entry>
</row>
<row>
<entry>renderer-type</entry>
- <entry>org.richfaces.renderkit.html.layoutPanelRenderer</entry>
+ <entry>org.richfaces.LayoutPanelRenderer</entry>
</row>
<row>
<entry>tag-class</entry>
- <entry>org.richfaces.taglib.layoutPanelTag</entry>
+ <entry>org.richfaces.taglib.LayoutPanelTag</entry>
</row>
</tbody>
</tgroup>
@@ -73,825 +73,10 @@
</para>
<para>The <emphasis><property>"position"</property></emphasis> attribute defines the position of the <emphasis role="bold"><property><rich:layoutPanel></property></emphasis> in the area created with <emphasis role="bold"><property><rich:layout></property></emphasis> .</para>
- <para>In more detail the component is covered in the <link linkend="DofURichLayout"><emphasis role="bold"><property><rich:layout></property></emphasis></link></para>
+ <para>In more detail the component is covered in the <link linkend="DofURichLayout"><emphasis role="bold"><property><rich:layout></property></emphasis></link>.</para>
</section>
- <!-- JavaScript API-->
<section>
- <title>JavaScript API</title>
- <table>
- <title>JavaScript API</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Function</entry>
- <entry>Description</entry>
- </row>
- </thead>
-
- <tbody>
- <row>
- <entry>beforeSubmit()</entry>
- <entry>Sets up necessary request parameters for file uploading and submits
- form to server by command button. This method should be used together
- with commands. </entry>
- </row>
-
- <row>
- <entry>clear()</entry>
- <entry>Removes all files from the list. The function can also get the <code>$('id').component.entries[i]</code> as a parameter to remove a particular file.</entry>
- </row>
-
- <row>
- <entry>disable()</entry>
- <entry>Disables the component</entry>
- </row>
-
- <row>
- <entry>enable()</entry>
- <entry>Enables the component</entry>
- </row>
-
- <row>
- <entry>remove()</entry>
- <entry>Cancels the request for uploading a file by removing this file from
- upload list and upload queue. Gets <code>$('id').component.entries[i]</code> as a parameter.</entry>
- </row>
-
- <row>
- <entry>stop()</entry>
- <entry>Stops the uploading process</entry>
- </row>
-
- <row>
- <entry>submitForm()</entry>
- <entry>Submits form to server. All added files will be put to model and
- event.</entry>
- </row>
-
- </tbody>
- </tgroup>
- </table>
-
-
-
- <table id="objectProperties">
- <title>Client side object properties</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Property</entry>
- <entry>Description</entry>
- </row>
- </thead>
- <tbody>
-
- <row>
- <entry>entries</entry>
- <entry>Returns a array of all files in the list </entry>
- </row>
-
-
-
- <row>
- <entry>entries.length</entry>
- <entry>Returns the number of files in the list </entry>
- </row>
-
-
- <row>
- <entry>entries[i].fileName</entry>
- <entry>Returns the file name, that is retrieved by the array index </entry>
- </row>
-
-
-
- <row>
- <entry>entries[i].state </entry>
- <entry>Returns the file state. Possible states are <itemizedlist>
-
- <listitem>
- <para>"initialized" - the file is added,
- corresponds to layoutPanelEntry.INITIALIZED constant </para>
- </listitem>
- <listitem>
- <para>"progress" - the file is being uploaded,
- corresponds to layoutPanelEntry.UPLOAD_IN_PROGRESS
- constant</para>
- </listitem>
- <listitem>
- <para>"ready" - uploading is in process,
- corresponds to layoutPanelEntry.READY constant The file will
- be uploaded on queue order.</para>
- </listitem>
- <listitem>
- <para>"canceled" - uploading of the file is
- canceled, corresponds to layoutPanelEntry.UPLOAD_CANCELED
- constant </para>
- </listitem>
- <listitem>
- <para>"done" - the file is uploaded
- successfully, corresponds to layoutPanelEntry.UPLOAD_SUCCESS
- constant</para>
- </listitem>
- <listitem>
- <para>"transfer_error" - a file transfer error
- occurred, corresponds to
- layoutPanelEntry.UPLOAD_TRANSFER_ERROR constant </para>
- </listitem>
- <listitem>
- <para>"size_error" - the file exceeded maximum
- size, corresponds to layoutPanelEntry.UPLOAD_SIZE_ERROR
- constant</para>
- </listitem>
-
-
- </itemizedlist>
- </entry>
- </row>
-
-
-
- <row>
- <entry>entries[i].size</entry>
- <entry> Returns the size of the file. Available in flash enabled version
- only</entry>
- </row>
- <row>
- <entry>entries[i].Type</entry>
- <entry>Returns the mime type of the file. Available in flash enabled version
- only</entry>
- </row>
- <row>
- <entry>entries[i].creator </entry>
- <entry>Returns the name of the author of the file. Available in flash
- enabled version only</entry>
- </row>
- <row>
- <entry>entries[i].creationDate</entry>
- <entry>Returns the date when the file was created. Available in flash
- enabled version only</entry>
- </row>
- <row>
- <entry>entries[i].modificationDate</entry>
- <entry>Returns the date of the last file modification. Available in flash
- enabled version only</entry>
- </row>
-
-
-
-
- </tbody>
- </tgroup>
- </table>
-
-
-
-
- <table id="objectPropertiesWithAttributes">
- <title>Client side object properties available with specific <link
- linkend="layoutPanelEventAttributes"> event attributes</link></title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Property</entry>
- <entry>Description</entry>
- </row>
- </thead>
- <tbody>
-
-
-
-
- <row>
- <entry>entry.state </entry>
- <entry>Returns the file state. Possible states are <itemizedlist>
-
- <listitem>
- <para>"initialized" - the file is added,
- corresponds to layoutPanelEntry.INITIALIZED constant </para>
- </listitem>
- <listitem>
- <para>"progress" - the file is being uploaded,
- corresponds to layoutPanelEntry.UPLOAD_IN_PROGRESS
- constant</para>
- </listitem>
- <listitem>
- <para>"ready" - uploading is in process,
- corresponds to layoutPanelEntry.READY constant The file will
- be uploaded on queue order.</para>
- </listitem>
- <listitem>
- <para>"canceled" - uploading of the file is
- canceled, corresponds to layoutPanelEntry.UPLOAD_CANCELED
- constant </para>
- </listitem>
- <listitem>
- <para>"done" - the file is uploaded
- successfully, corresponds to layoutPanelEntry.UPLOAD_SUCCESS
- constant</para>
- </listitem>
- <listitem>
- <para>"transfer_error" - a file transfer error
- occurred, corresponds to
- layoutPanelEntry.UPLOAD_TRANSFER_ERROR constant </para>
- </listitem>
- <listitem>
- <para>"size_error" - the file exceeded maximum
- size, corresponds to layoutPanelEntry.UPLOAD_SIZE_ERROR
- constant</para>
- </listitem>
-
-
- </itemizedlist>
- </entry>
- </row>
-
- <row>
- <entry>entry.fileName </entry>
- <entry>Returns the file's name. This property works with all event
- handlers except for "onadd". </entry>
- </row>
-
-
-
- <row>
- <entry>entry.size</entry>
- <entry> Returns the size of the file. Available in flash enabled version
- only</entry>
- </row>
- <row>
- <entry>entry.Type</entry>
- <entry>Returns the mime type of the file. Available in flash enabled version
- only</entry>
- </row>
- <row>
- <entry>entry.creator </entry>
- <entry>Returns the name of the author of the file. Available in flash
- enabled version only</entry>
- </row>
- <row>
- <entry>entry.creationDate</entry>
- <entry>Returns the date when the file was created. Available in flash
- enabled version only</entry>
- </row>
- <row>
- <entry>entry.modificationDate</entry>
- <entry>Returns the date of the last file modification. Available in flash
- enabled version only</entry>
- </row>
-
-
-
-
- </tbody>
- </tgroup>
- </table>
-
-
-
- </section>
- <!-- End of JavaScript API-->
-
- <section>
- <title>Facets</title>
- <table>
- <title>Facets</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Facet name</entry>
- <entry>Description</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>label</entry>
- <entry>Defines the information regarding the ongoing process</entry>
- </row>
- <row>
- <entry>progress</entry>
- <entry>Defines the information regarding the uploading process</entry>
- </row>
-
- </tbody>
- </tgroup>
- </table>
- </section>
-
- <section>
- <title>Look-and-Feel Customization</title>
- <para>For skinnability implementation, the components use a <emphasis>
- <property>style class redefinition method.</property>
- </emphasis> Default style classes are mapped on <emphasis>
- <property>skin parameters.</property>
- </emphasis></para>
- <para>There are two ways to redefine the appearance of all <emphasis role="bold">
- <property><layoutPanel></property>
- </emphasis> components at once: <itemizedlist>
- <listitem>
- <para>Redefine the corresponding skin parameters</para>
- </listitem>
- <listitem>
- <para> Add to your style sheets style classes used by a <emphasis role="bold">
- <property><layoutPanel></property>
- </emphasis> component</para>
- </listitem>
- </itemizedlist>
- </para>
- </section>
-
- <section>
- <title>Skin Parameters Redefinition</title>
-
- <table>
- <title>Skin parameters redefinition for a component</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
- <entry>CSS properties</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>tableBackgroundColor</entry>
- <entry>background-color</entry>
- </row>
- <row>
- <entry>tableBorderColor</entry>
- <entry>border-color</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <table>
- <title>Skin parameters redefinition for a font</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
- <entry>CSS properties</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>generalFamilyFont</entry>
- <entry>font-family</entry>
- </row>
- <row>
- <entry>generalSizeFont</entry>
- <entry>font-size</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <table>
- <title>Skin parameters redefinition for a toolbar</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
- <entry>CSS properties</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>additionalBackgroundColor</entry>
- <entry>background-color</entry>
- </row>
- <row>
- <entry>tableBorderColor</entry>
- <entry>border-bottom-color</entry>
- </row>
- <row>
- <entry>tableBackgroundColor</entry>
- <entry>border-top-color</entry>
- </row>
- <row>
- <entry>tableBackgroundColor</entry>
- <entry>border-left-color</entry>
- </row>
-
- </tbody>
- </tgroup>
- </table>
-
- <table>
- <title>Skin parameters redefinition for items in the list</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
- <entry>CSS properties</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>tableBorderColor</entry>
- <entry>border-bottom-color</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <table>
- <title>Skin parameters redefinition for a "Cancel",
- "Clear" links</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
- <entry>CSS properties</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>generalLinkColor</entry>
- <entry>color</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <table>
- <title>Skin parameters redefinition for a button</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
- <entry>CSS properties</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>trimColor</entry>
- <entry>background-color</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <table>
- <title>Skin parameters redefinition for a button border</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
- <entry>CSS properties</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>tableBorderColor</entry>
- <entry>border-color</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <table>
- <title>Skin parameters redefinition for a highlighted button</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
- <entry>CSS properties</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>trimColor</entry>
- <entry>background-color</entry>
- </row>
- <row>
- <entry>selectControlColor</entry>
- <entry>border-color</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <table>
- <title>Skin parameters redefinition for a pressed button</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
- <entry>CSS properties</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>selectControlColor</entry>
- <entry>border-color</entry>
- </row>
- <row>
- <entry>additionalBackgroundColor</entry>
- <entry>background-color</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <table>
- <title>Skin parameters redefinition for "Upload",
- "Clean" buttons</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
- <entry>CSS properties</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>generalTextColor</entry>
- <entry>color</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <table>
- <title>Skin parameters redefinition for a disabled "Start" button
- icon</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
- <entry>CSS properties</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>tableBorderColor</entry>
- <entry>color</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <table>
- <title>Skin parameters redefinition for a disabled "Clear" button
- icon</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Skin parameters</entry>
- <entry>CSS properties</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>tableBorderColor</entry>
- <entry>color</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </section>
-
- <section>
- <title>Definition of Custom Style Classes</title>
-
- <para>The following picture illustrates how CSS classes define styles for component
- elements.</para>
- <figure>
- <title>Classes names</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/layoutPanel_cn.png"/>
- </imageobject>
- </mediaobject>
- </figure>
- <figure>
- <title>Classes names</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/layoutPanel_cn2.png"/>
- </imageobject>
- </mediaobject>
- </figure>
-
- <table id="layoutPanelCN">
- <title>Classes names that define a component representation</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Class name</entry>
- <entry>Description</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>rich-layoutPanel-list-decor</entry>
- <entry>Defines styles for a wrapper <div> element of a
- layoutPanel</entry>
- </row>
- <row>
- <entry>rich-layoutPanel-font</entry>
- <entry>Defines styles for a font of buttons and items</entry>
- </row>
- <row>
- <entry>rich-layoutPanel-toolbar-decor</entry>
- <entry>Defines styles for a toolbar</entry>
- </row>
- <row>
- <entry> rich-layoutPanel-list-overflow</entry>
- <entry>Defines styles for a list of files</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
-
- <table>
- <title>Classes names that define buttons representation</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Class name</entry>
- <entry>Description</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>rich-layoutPanel-button</entry>
- <entry>Defines styles for a buttons</entry>
- </row>
- <row>
- <entry>rich-layoutPanel-button-border</entry>
- <entry>Defines styles for a border of buttons</entry>
- </row>
- <row>
- <entry>rich-layoutPanel-button-light</entry>
- <entry>Defines styles for a highlight of button</entry>
- </row>
- <row>
- <entry>rich-layoutPanel-button-press</entry>
- <entry>Defines styles for a pressed button</entry>
- </row>
- <row>
- <entry>rich-layoutPanel-button-dis</entry>
- <entry>Defines styles for a disabled button</entry>
- </row>
- <row>
- <entry>rich-layoutPanel-button-selection</entry>
- <entry>Defines styles for "Upload",
- "Clean" buttons</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <table>
- <title>Classes names that define the representation of the buttons' icons</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Class name</entry>
- <entry>Description</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>rich-layoutPanel-ico</entry>
- <entry>Defines styles for an icon</entry>
- </row>
- <row>
- <entry>rich-layoutPanel-ico-add</entry>
- <entry>Defines styles for a "Add" button icon</entry>
- </row>
- <row>
- <entry>rich-layoutPanel-ico-start</entry>
- <entry>Defines styles for a "Upload" button icon</entry>
- </row>
- <row>
- <entry>rich-layoutPanel-ico-stop</entry>
- <entry>Defines styles for a "Stop" button icon</entry>
- </row>
- <row>
- <entry>rich-layoutPanel-ico-clear</entry>
- <entry>Defines styles for a "Clear" button icon</entry>
- </row>
- <row>
- <entry>rich-layoutPanel-ico-add-dis</entry>
- <entry>Defines styles for a disabled "Add" button
- icon</entry>
- </row>
- <row>
- <entry>rich-layoutPanel-ico-start-dis</entry>
- <entry>Defines styles for a disabled "Upload" button
- icon</entry>
- </row>
- <row>
- <entry>rich-layoutPanel-ico-clear-dis</entry>
- <entry>Defines styles for a disabled "Clear" button
- icon</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
- <table>
- <title>Classes names that define list items representation</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Class name</entry>
- <entry>Description</entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>rich-layoutPanel-table-td</entry>
- <entry>Defines styles for a wrapper <td> element of a list
- items</entry>
- </row>
- <row>
- <entry>rich-layoutPanel-anc</entry>
- <entry>Defines styles for "Cancel",
- "Stop", "Clear" links</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
-
-
- <para>In order to redefine styles for all <emphasis role="bold">
- <property><layoutPanel></property>
- </emphasis> components on a page using CSS, it's enough to create classes with
- the same names (possible classes could be found in the tables <link
- linkend="layoutPanelCN"> above</link>) and define necessary properties in them. </para>
- <para>
- <emphasis role="bold">Example:</emphasis>
- </para>
- <programlisting role="CSS"><![CDATA[...
-.rich-layoutPanel-anc{
- font-weight:bold;
- text-decoration:none;
-}
-...]]></programlisting>
-
- <para>This is the result:</para>
-
- <figure>
- <title>Redefinition styles with predefined classes</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/layoutPanel_pc.png"/>
- </imageobject>
- </mediaobject>
- </figure>
-
- <para>In the example above the font weight and text decoration for
- "Cancel" and "Clear" links are changed.</para>
-
- <para> Also it's possible to change styles of particular <emphasis role="bold">
- <property><layoutPanel></property>
- </emphasis> component. In this case you should create own style classes and use them in
- the corresponding <emphasis role="bold">
- <property><layoutPanel></property>
- </emphasis>
- <emphasis>
- <property>styleClass</property>
- </emphasis> attributes. An example is placed below: </para>
- <para>
- <emphasis role="bold">Example:</emphasis>
- </para>
- <programlisting role="CSS"><![CDATA[...
-.myClass{
- font-weight:bold;
-}
-...]]></programlisting>
- <para> The <emphasis>
- <property>"addButtonClass"</property>
- </emphasis> attribute for <emphasis role="bold">
- <property><layoutPanel></property>
- </emphasis> is defined as it's shown in the example below: </para>
- <para>
- <emphasis role="bold">Example:</emphasis>
- </para>
- <programlisting role="XML"><![CDATA[<layoutPanel ... addButtonClass="myClass"/>
-]]></programlisting>
-
- <para>This is the result:</para>
- <figure>
- <title>Redefinition styles with own classes and <emphasis>
- <property>styleClass</property>
- </emphasis> attributes</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/layoutPanel_oc.png"/>
- </imageobject>
- </mediaobject>
- </figure>
-
- <para>As it could be seen on the picture above, the font style for "Add"
- button is changed.</para>
-
- </section>
-
- <section>
<title>Relevant Resources Links</title>
<para><ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/layoutPanel.jsf?c=lay..."
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13482 - in trunk: samples/themes/src/main/java/org/richfaces/theme and 6 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-04-09 20:14:07 -0400 (Thu, 09 Apr 2009)
New Revision: 13482
Added:
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseSkinImage.java
trunk/samples/themes/src/main/java/org/richfaces/theme/AbstractThemeRenderer.java
trunk/samples/themes/src/main/java/org/richfaces/theme/images/
trunk/samples/themes/src/main/java/org/richfaces/theme/images/FooterBackground.java
trunk/samples/themes/src/main/java/org/richfaces/theme/images/HeaderBackground.java
trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageFooterGradient.java
trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageHeaderGradient.java
trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/layout.css
Removed:
trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageBackgroundGradient.java
Modified:
trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/theme2.xcss
trunk/samples/themes/src/main/templates/org/richfaces/theme2.jspx
trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss
trunk/ui/layout/src/main/templates/org/richfaces/htmlLayout.jspx
Log:
theme 2 got working
Added: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseSkinImage.java
===================================================================
--- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseSkinImage.java (rev 0)
+++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseSkinImage.java 2009-04-10 00:14:07 UTC (rev 13482)
@@ -0,0 +1,184 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.renderkit.html;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.GradientPaint;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+import java.util.Date;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+
+import org.ajax4jsf.resource.InternetResourceBuilder;
+import org.ajax4jsf.resource.Java2Dresource;
+import org.ajax4jsf.resource.PngRenderer;
+import org.ajax4jsf.resource.ResourceContext;
+import org.ajax4jsf.util.HtmlColor;
+import org.ajax4jsf.util.HtmlDimensions;
+import org.ajax4jsf.util.Zipper2;
+import org.richfaces.renderkit.html.images.GradientAlignment;
+import org.richfaces.renderkit.html.images.GradientType;
+import org.richfaces.renderkit.html.images.GradientType.BiColor;
+import org.richfaces.skin.Skin;
+import org.richfaces.skin.SkinFactory;
+
+/**
+ * @author asmirnov
+ *
+ */
+public abstract class BaseSkinImage extends Java2Dresource {
+
+
+ public BaseSkinImage() {
+ super();
+ setRenderer(new PngRenderer());
+ }
+
+ public Dimension getDimensions(FacesContext facesContext, Object data) {
+ return getDimension();
+ }
+
+ /**
+ * Hook method to define constant dimension.
+ *
+ * @return
+ */
+ protected abstract Dimension getDimension();
+
+ protected Dimension getDimensions(ResourceContext resourceContext) {
+ return getDimension();
+ }
+
+ protected void drawRectangle(Graphics2D g2d, Rectangle2D rect,
+ BiColor biColor, boolean useTop) {
+ if (biColor != null) {
+ Color color = useTop ? biColor.getTopColor() : biColor
+ .getBottomColor();
+ g2d.setColor(color);
+ g2d.fill(rect);
+ }
+ }
+
+ protected void drawGradient(Graphics2D g2d, Rectangle2D rectangle,
+ BiColor colors, int height) {
+ if (colors != null) {
+ GradientPaint gragient = new GradientPaint(0, 0, colors
+ .getTopColor(), 0, height, colors.getBottomColor());
+ g2d.setPaint(gragient);
+ g2d.fill(rectangle);
+ }
+ }
+
+ protected void paint(ResourceContext resourceContext, Graphics2D g2d) {
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+ RenderingHints.VALUE_ANTIALIAS_ON);
+ g2d.setRenderingHint(RenderingHints.KEY_DITHERING,
+ RenderingHints.VALUE_DITHER_ENABLE);
+
+ g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION,
+ RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
+ g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING,
+ RenderingHints.VALUE_COLOR_RENDER_QUALITY);
+ g2d.setRenderingHint(RenderingHints.KEY_RENDERING,
+ RenderingHints.VALUE_RENDER_QUALITY);
+ paintImage(resourceContext,g2d);
+ }
+
+ /**
+ * @param resourceContext
+ * @param g2d
+ */
+ protected abstract void paintImage(ResourceContext resourceContext, Graphics2D g2d);
+
+ private Integer decodeColor(String value) {
+ if (value != null && value.length() != 0) {
+ return Integer.valueOf(HtmlColor.decode(value).getRGB());
+ } else {
+ return null;
+ }
+ }
+
+ private Integer decodeHeight(String value) {
+ if (value != null && value.length() != 0) {
+ return HtmlDimensions.decode(value).intValue();
+ } else {
+ return null;
+ }
+ }
+
+ protected static String safeTrim(String s) {
+ return s != null ? s.trim() : null;
+ }
+
+ protected Object getDataToStore(FacesContext context, Object parameterData) {
+ SkinFactory skinFactory = SkinFactory.getInstance();
+
+ Skin skin = skinFactory.getSkin(context);
+
+ int hashCode = skin.hashCode(context);
+ byte[] data = new byte[4];
+ ByteBuffer.wrap(data).asIntBuffer().put(hashCode);
+ return data;
+ }
+
+ public boolean isCacheable() {
+ return true;
+ }
+
+ @Override
+ public boolean requireFacesContext() {
+ return true;
+ }
+
+ protected Integer getSkinColor(String name) {
+ return decodeColor(getSkinParameter(name));
+ }
+
+ protected Integer getSkinSize(String name) {
+ return decodeHeight(getSkinParameter(name));
+ }
+ protected String getSkinParameter(String name) {
+ String value = null;
+ FacesContext context = FacesContext.getCurrentInstance();
+ if (null != context) {
+ SkinFactory skinFactory = SkinFactory.getInstance();
+ Skin skin = skinFactory.getSkin(context);
+ value = (String) skin.getParameter(context, name);
+
+ if (value == null || value.length() == 0) {
+ skin = skinFactory.getDefaultSkin(context);
+ value = (String) skin.getParameter(context, name);
+ }
+
+ }
+ return value;
+ }
+
+}
Property changes on: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseSkinImage.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/themes/src/main/java/org/richfaces/theme/AbstractThemeRenderer.java
===================================================================
--- trunk/samples/themes/src/main/java/org/richfaces/theme/AbstractThemeRenderer.java (rev 0)
+++ trunk/samples/themes/src/main/java/org/richfaces/theme/AbstractThemeRenderer.java 2009-04-10 00:14:07 UTC (rev 13482)
@@ -0,0 +1,14 @@
+/**
+ *
+ */
+package org.richfaces.theme;
+
+import org.richfaces.renderkit.AbstractPageRenderer;
+
+/**
+ * @author asmirnov
+ *
+ */
+public abstract class AbstractThemeRenderer extends AbstractPageRenderer {
+
+}
Property changes on: trunk/samples/themes/src/main/java/org/richfaces/theme/AbstractThemeRenderer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/themes/src/main/java/org/richfaces/theme/images/FooterBackground.java
===================================================================
--- trunk/samples/themes/src/main/java/org/richfaces/theme/images/FooterBackground.java (rev 0)
+++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/FooterBackground.java 2009-04-10 00:14:07 UTC (rev 13482)
@@ -0,0 +1,17 @@
+/**
+ *
+ */
+package org.richfaces.theme.images;
+
+import org.richfaces.renderkit.html.BaseGradient;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class FooterBackground extends BaseGradient {
+
+ public FooterBackground() {
+ super(1, 95, 47,"panelBorderColor","generalBackgroundColor", false);
+ }
+}
Property changes on: trunk/samples/themes/src/main/java/org/richfaces/theme/images/FooterBackground.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/samples/themes/src/main/java/org/richfaces/theme/images/HeaderBackground.java
===================================================================
--- trunk/samples/themes/src/main/java/org/richfaces/theme/images/HeaderBackground.java (rev 0)
+++ trunk/samples/themes/src/main/java/org/richfaces/theme/images/HeaderBackground.java 2009-04-10 00:14:07 UTC (rev 13482)
@@ -0,0 +1,17 @@
+/**
+ *
+ */
+package org.richfaces.theme.images;
+
+import org.richfaces.renderkit.html.BaseGradient;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class HeaderBackground extends BaseGradient {
+
+ public HeaderBackground() {
+ super(1, 95, 47,"headerBackgroundColor","headerGradientColor", false);
+ }
+}
Property changes on: trunk/samples/themes/src/main/java/org/richfaces/theme/images/HeaderBackground.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/theme2.xcss
===================================================================
--- trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/theme2.xcss 2009-04-10 00:02:23 UTC (rev 13481)
+++ trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/theme2.xcss 2009-04-10 00:14:07 UTC (rev 13482)
@@ -11,7 +11,7 @@
<u:selector name=".header_bg">
<u:style name="background-image">
<!-- images/bg_header.png -->
- <f:resource f:key="org.richfaces.renderkit.html.images.PageContentGradient"/>
+ <f:resource f:key="org.richfaces.theme.images.HeaderBackground"/>
</u:style>
<u:style name="border-bottom" value="1px solid" />
<u:style name="border-bottom-color" skin="generalBackgroundColor" />
@@ -23,7 +23,7 @@
<u:selector name=".footer_bg">
<u:style name="background-image">
<!-- images/bg_footer.png -->
- <f:resource f:key="org.richfaces.renderkit.html.images.PageContentGradient"/>
+ <f:resource f:key="org.richfaces.theme.images.FooterBackground"/>
</u:style>
<u:style name="border-top" value="1px solid" />
<u:style name="border-top-color" skin="generalBackgroundColor" />
Modified: trunk/samples/themes/src/main/templates/org/richfaces/theme2.jspx
===================================================================
--- trunk/samples/themes/src/main/templates/org/richfaces/theme2.jspx 2009-04-10 00:02:23 UTC (rev 13481)
+++ trunk/samples/themes/src/main/templates/org/richfaces/theme2.jspx 2009-04-10 00:14:07 UTC (rev 13482)
@@ -8,7 +8,7 @@
xmlns:h="http://jsf.exadel.com/header"
xmlns:vcp="http://ajax4jsf.org/cdk/vcp"
class="org.richfaces.renderkit.html.Theme2Renderer"
- baseclass="org.richfaces.renderkit.AbstractPageRenderer"
+ baseclass="org.richfaces.theme.AbstractThemeRenderer"
component="org.richfaces.component.UIPage"
>
<c:set var="namespace" value="#{this:prolog(context,component)}"/>
Deleted: trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageBackgroundGradient.java
===================================================================
--- trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageBackgroundGradient.java 2009-04-10 00:02:23 UTC (rev 13481)
+++ trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageBackgroundGradient.java 2009-04-10 00:14:07 UTC (rev 13482)
@@ -1,17 +0,0 @@
-/**
- *
- */
-package org.richfaces.renderkit.html.images;
-
-import org.richfaces.renderkit.html.BaseGradient;
-
-/**
- * @author asmirnov
- *
- */
-public class PageBackgroundGradient extends BaseGradient {
-
- public PageBackgroundGradient() {
- super(1, 350, 300,"shadowBackgroundColor","additionalBackgroundColor", false);
- }
-}
Added: trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageFooterGradient.java
===================================================================
--- trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageFooterGradient.java (rev 0)
+++ trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageFooterGradient.java 2009-04-10 00:14:07 UTC (rev 13482)
@@ -0,0 +1,17 @@
+/**
+ *
+ */
+package org.richfaces.renderkit.html.images;
+
+import org.richfaces.renderkit.html.BaseGradient;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class PageFooterGradient extends BaseGradient {
+
+ public PageFooterGradient() {
+ super(1, 95, 47,"panelBorderColor","generalBackgroundColor", false);
+ }
+}
Property changes on: trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageFooterGradient.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageHeaderGradient.java (from rev 13477, trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageBackgroundGradient.java)
===================================================================
--- trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageHeaderGradient.java (rev 0)
+++ trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageHeaderGradient.java 2009-04-10 00:14:07 UTC (rev 13482)
@@ -0,0 +1,17 @@
+/**
+ *
+ */
+package org.richfaces.renderkit.html.images;
+
+import org.richfaces.renderkit.html.BaseGradient;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class PageHeaderGradient extends BaseGradient {
+
+ public PageHeaderGradient() {
+ super(1, 95, 47,"headerBackgroundColor","headerGradientColor", false);
+ }
+}
Property changes on: trunk/ui/layout/src/main/java/org/richfaces/renderkit/html/images/PageHeaderGradient.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/layout.css
===================================================================
--- trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/layout.css (rev 0)
+++ trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/layout.css 2009-04-10 00:14:07 UTC (rev 13482)
@@ -0,0 +1,285 @@
+/*
+Copyright (c) 2008, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 3.0.0pr2
+*/
+/*
+*
+* The YUI CSS Foundation uses the *property and _property CSS filter
+* techniques to shield a value from A-grade browsers [1] other than
+* IE6 & IE7 (*property) and IE6 (_property)
+*
+
+/*
+Section: Grids and Nesting Grids
+*/
+
+/*
+Subsection: Children generally take half the available space
+*/
+
+.yui-gb .yui-u,
+.yui-g .yui-gb .yui-u,
+.yui-gb .yui-g,
+.yui-gb .yui-gb,
+.yui-gb .yui-gc,
+.yui-gb .yui-gd,
+.yui-gb .yui-ge,
+.yui-gb .yui-gf,
+.yui-gc .yui-u,
+.yui-gc .yui-g,
+.yui-gd .yui-u {
+ float: left;
+}
+
+/*Float units (and sub grids) to the right */
+.yui-g .yui-u,
+.yui-g .yui-g,
+.yui-g .yui-gb,
+.yui-g .yui-gc,
+.yui-g .yui-gd,
+.yui-g .yui-ge,
+.yui-g .yui-gf,
+.yui-gc .yui-u,
+.yui-gd .yui-g,
+.yui-g .yui-gc .yui-u,
+.yui-ge .yui-u,
+.yui-ge .yui-g,
+.yui-gf .yui-g,
+.yui-gf .yui-u {
+ float: right;
+}
+
+/*Float units (and sub grids) to the left */
+.yui-g div.first,
+.yui-gb div.first,
+.yui-gc div.first,
+.yui-gd div.first,
+.yui-ge div.first,
+.yui-gf div.first,
+.yui-g .yui-gc div.first,
+.yui-g .yui-ge div.first,
+.yui-gc div.first div.first {
+ float: left;
+}
+
+.yui-g .yui-u,
+.yui-g .yui-g,
+.yui-g .yui-gb,
+.yui-g .yui-gc,
+.yui-g .yui-gd,
+.yui-g .yui-ge,
+.yui-g .yui-gf {
+ width: 49.1%;
+}
+
+.yui-gb .yui-u,
+.yui-g .yui-gb .yui-u,
+.yui-gb .yui-g,
+.yui-gb .yui-gb,
+.yui-gb .yui-gc,
+.yui-gb .yui-gd,
+.yui-gb .yui-ge,
+.yui-gb .yui-gf,
+.yui-gc .yui-u,
+.yui-gc .yui-g,
+.yui-gd .yui-u {
+ width: 32%;
+ margin-left: 2.0%;
+}
+
+/* Give IE some extra breathing room for 1/3-based rounding issues */
+.yui-gb .yui-u {
+ *width: 31.8%;
+ *margin-left: 1.9%;
+}
+
+.yui-gc div.first,
+.yui-gd .yui-u {
+ width: 66%;
+ _width: 65.7%;
+}
+.yui-gd div.first {
+ width: 32%;
+ _width: 31.5%;
+}
+
+.yui-ge div.first,
+.yui-gf .yui-u {
+ width: 74.2%;
+ _width: 74%;
+}
+
+.yui-ge .yui-u,
+.yui-gf div.first {
+ width: 24%;
+ _width: 23.8%;
+}
+
+.yui-g .yui-gb div.first,
+.yui-gb div.first,
+.yui-gc div.first,
+.yui-gd div.first {
+ margin-left: 0;
+}
+
+/*
+Section: Deep Nesting
+*/
+.yui-g .yui-g .yui-u,
+.yui-gb .yui-g .yui-u,
+.yui-gc .yui-g .yui-u,
+.yui-gd .yui-g .yui-u,
+.yui-ge .yui-g .yui-u,
+.yui-gf .yui-g .yui-u {
+ width: 49%;
+ *width: 48.1%;
+ *margin-left: 0;
+}
+
+.yui-g .yui-gb div.first,
+.yui-gb .yui-gb div.first {
+ *margin-right: 0;
+ *width: 32%;
+ _width: 31.7%;
+}
+
+.yui-g .yui-gc div.first,
+.yui-gd .yui-g {
+ width: 66%;
+}
+
+.yui-gb .yui-g div.first {
+ *margin-right: 4%;
+ _margin-right: 1.3%;
+}
+
+.yui-gb .yui-gc div.first,
+.yui-gb .yui-gd div.first {
+ *margin-right: 0;
+}
+
+.yui-gb .yui-gb .yui-u,
+.yui-gb .yui-gc .yui-u {
+ *margin-left: 1.8%;
+ _margin-left: 4%;
+}
+
+.yui-g .yui-gb .yui-u {
+ _margin-left: 1.0%;
+}
+
+.yui-gb .yui-gd .yui-u {
+ *width: 66%;
+ _width: 61.2%;
+}
+.yui-gb .yui-gd div.first {
+ *width: 31%;
+ _width: 29.5%;
+}
+
+.yui-g .yui-gc .yui-u,
+.yui-gb .yui-gc .yui-u {
+ width: 32%;
+ _float: right;
+ margin-right: 0;
+ _margin-left: 0;
+}
+.yui-gb .yui-gc div.first {
+ width: 66%;
+ *float: left;
+ *margin-left: 0;
+}
+
+.yui-gb .yui-ge .yui-u,
+.yui-gb .yui-gf .yui-u {
+ margin: 0;
+}
+
+.yui-gb .yui-gb .yui-u {
+ _margin-left: .7%;
+}
+
+.yui-gb .yui-g div.first,
+.yui-gb .yui-gb div.first {
+ *margin-left:0;
+}
+
+.yui-gc .yui-g .yui-u,
+.yui-gd .yui-g .yui-u {
+ *width: 48.1%;
+ *margin-left: 0;
+}
+
+.yui-gb .yui-gd div.first {
+ width: 32%;
+}
+.yui-g .yui-gd div.first {
+ _width: 29.9%;
+}
+
+.yui-ge .yui-g {
+ width: 24%;
+}
+.yui-gf .yui-g {
+ width: 74.2%;
+}
+
+.yui-gb .yui-ge div.yui-u,
+.yui-gb .yui-gf div.yui-u {
+ float: right;
+}
+.yui-gb .yui-ge div.first,
+.yui-gb .yui-gf div.first {
+ float: left;
+}
+
+/* Width Accommodation for Nested Contexts */
+.yui-gb .yui-ge .yui-u,
+.yui-gb .yui-gf div.first {
+ *width: 24%;
+ _width: 20%;
+}
+
+/* Width Accommodation for Nested Contexts */
+.yui-gb .yui-ge div.first,
+.yui-gb .yui-gf .yui-u {
+ *width: 73.5%;
+ _width: 65.5%;
+}
+
+/* Patch for GD within GE */
+.yui-ge div.first .yui-gd .yui-u {
+ width: 65%;
+}
+.yui-ge div.first .yui-gd div.first {
+ width: 32%;
+}
+
+/*
+Section: Clearing. zoom for IE, :after for others
+*/
+
+#bd:after,
+.yui-g:after,
+.yui-gb:after,
+.yui-gc:after,
+.yui-gd:after,
+.yui-ge:after,
+.yui-gf:after {
+ content: ".";
+ display: block;
+ height: 0;
+ clear: both;
+ visibility: hidden;
+}
+#bd,
+.yui-g,
+.yui-gb,
+.yui-gc,
+.yui-gd,
+.yui-ge,
+.yui-gf {
+ zoom: 1;
+}
\ No newline at end of file
Property changes on: trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/layout.css
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss
===================================================================
--- trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss 2009-04-10 00:02:23 UTC (rev 13481)
+++ trunk/ui/layout/src/main/resources/org/richfaces/renderkit/html/css/simple.xcss 2009-04-10 00:14:07 UTC (rev 13482)
@@ -22,7 +22,14 @@
</f:verbatim>
<u:selector name=".rich-page-header">
- <u:style name="background-color" skin="generalLinkColor" />
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.PageHeaderGradient"/>
+ </u:style>
+ <u:style name="background-repeat" value="repeat-x"/>
+ <u:style name="background-position" value="top left"/>
+ <u:style name="border-bottom" value="1px solid" />
+ <u:style name="border-bottom-color" skin="generalBackgroundColor" />
+ <u:style name="background-color" skin="headerBackgroundColor"/>
<u:style name="min-height" value="40px" />
<u:style name="padding" value="0 20px" />
<u:style name="color" skin="trimColor" />
@@ -35,27 +42,56 @@
<u:style name="min-height" value="200px" />
<u:style name="background-color" skin="generalBackgroundColor"/>
<u:style name="background-repeat" value="repeat-x"/>
+ <u:style name="background-position" value="top left"/>
</u:selector>
<u:selector name=".rich-page-main">
</u:selector>
- <!--u:selector name=".rich-page-body">
- <u:style name="padding" value="0 30px 0 30px" />
- </u:selector-->
+ <u:selector name=".rich-page-body">
+ <u:style name="vertical-align" value="top"/>
+ <u:style name="width" value="100%"/>
+ <u:style name="border-top" value="2px solid" />
+ <u:style name="border-top-color" skin="panelBorderColor" />
+ <u:style name="border-bottom" value="2px solid" />
+ <u:style name="border-bottom-color" skin="panelBorderColor" />
+ </u:selector>
<u:selector name=".rich-page-footer">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.images.PageFooterGradient"/>
+ </u:style>
+ <u:style name="border-top" value="1px solid" />
+ <u:style name="border-top-color" skin="generalBackgroundColor" />
+ <u:style name="background-color" skin="panelBorderColor"/>
+ <u:style name="background-repeat" value="repeat-x"/>
+ <u:style name="background-position" value="top left"/>
<u:style name="text-align" value="center" />
<u:style name="padding" value="20px 0" />
- <u:style name="background-color" value="#333"/>
- <u:style name="color" skin="trimColor" />
- <u:style name="font-size" skin="headerSizeFont" />
</u:selector>
<u:selector name=".rich-page-sidebar">
<!--u:style name="padding" value="0 20px 0 20px" /-->
+ <u:style name="vertical-align" value="top"/>
+ <u:style name="border-top" value="2px solid" />
+ <u:style name="border-top-color" skin="panelBorderColor" />
+ <u:style name="border-right" value="2px solid" />
+ <u:style name="border-right-color" skin="panelBorderColor" />
+ <u:style name="border-bottom" value="2px solid" />
+ <u:style name="border-bottom-color" skin="panelBorderColor" />
</u:selector>
+ <u:selector name="*.rich-page-sidebar, *.rich-page-body, *.rich-page-footer">
+ <u:style name="font-family" skin="generalFamilyFont" />
+ <u:style name="color" skin="generalTextColor" />
+ <u:style name="font-size" skin="generalSizeFont" />
+ </u:selector>
+ <u:selector name="*.rich-page-header-content">
+ <u:style name="font-family" skin="headerFamilyFont" />
+ <u:style name="color" skin="headerTextColor" />
+ <u:style name="font-size" skin="headerSizeFont" />
+ </u:selector>
+
<u:selector name="h1,h2,h3">
<u:style name="font-family" skin="headerFamilyFont" />
<u:style name="margin" value="0" />
Modified: trunk/ui/layout/src/main/templates/org/richfaces/htmlLayout.jspx
===================================================================
--- trunk/ui/layout/src/main/templates/org/richfaces/htmlLayout.jspx 2009-04-10 00:02:23 UTC (rev 13481)
+++ trunk/ui/layout/src/main/templates/org/richfaces/htmlLayout.jspx 2009-04-10 00:14:07 UTC (rev 13482)
@@ -11,7 +11,7 @@
baseclass="org.richfaces.renderkit.AbstractLayoutRenderer"
component="org.richfaces.component.UILayout"
>
- <h:styles>css/grids.css</h:styles>
+ <h:styles>css/layout.css</h:styles>
<f:clientid var="clientId"/>
<div id="#{clientId}"
x:passThruWithExclusions="value,name,type,id"
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13481 - trunk/ui/colorPicker/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2009-04-09 20:02:23 -0400 (Thu, 09 Apr 2009)
New Revision: 13481
Modified:
trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx
Log:
colorPicker: browser detection was fixed
Modified: trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx
===================================================================
--- trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2009-04-09 22:47:13 UTC (rev 13480)
+++ trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2009-04-10 00:02:23 UTC (rev 13481)
@@ -101,13 +101,8 @@
</div>
<div style="display: none;" id="#{clientId}-colorPicker-script">
<script type="text/javascript">
-
-
- if(navigator.appName == "Microsoft Internet Explorer" && parseInt(navigator.appVersion) == 4 && navigator.appVersion.indexOf("MSIE 6.0") != -1){
- jQuery('div.rich-colorPicker-color').pngFix();
- }
-
- <jsp:scriptlet><![CDATA[
+ jQuery('div.rich-colorPicker-color').pngFix();
+ <jsp:scriptlet><![CDATA[
Boolean flat = (Boolean) component.getAttributes().get("flat");
colorMode = (String) component.getAttributes().get("colorMode");
showEvent = (String) component.getAttributes().get("showEvent");
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13480 - trunk/ui/colorPicker/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2009-04-09 18:47:13 -0400 (Thu, 09 Apr 2009)
New Revision: 13480
Modified:
trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx
Log:
colorPicker: browser detection was fixed
Modified: trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx
===================================================================
--- trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2009-04-09 22:01:37 UTC (rev 13479)
+++ trunk/ui/colorPicker/src/main/templates/org/richfaces/htmlColorPicker.jspx 2009-04-09 22:47:13 UTC (rev 13480)
@@ -103,7 +103,7 @@
<script type="text/javascript">
- if(navigator.appName == "Microsoft Internet Explorer" && parseInt(navigator.appVersion) == 4 && navigator.appVersion.indexOf("MSIE 7.0") == -1){
+ if(navigator.appName == "Microsoft Internet Explorer" && parseInt(navigator.appVersion) == 4 && navigator.appVersion.indexOf("MSIE 6.0") != -1){
jQuery('div.rich-colorPicker-color').pngFix();
}
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13479 - trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-09 18:01:37 -0400 (Thu, 09 Apr 2009)
New Revision: 13479
Modified:
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils/Utils.js
Log:
https://jira.jboss.org/jira/browse/RF-5512
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils/Utils.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils/Utils.js 2009-04-09 21:34:17 UTC (rev 13478)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils/Utils.js 2009-04-09 22:01:37 UTC (rev 13479)
@@ -316,10 +316,12 @@
Utils.getRule = function (className) {
var rule = null;
var sheets = document.styleSheets;
+ var lcClassName = className.toLowerCase();
+
for (var j = 0; !rule && j < sheets.length; j++) {
var rules = sheets[j].cssRules ? sheets[j].cssRules: sheets[j].rules;
for (var i = 0; !rule && i < rules.length; i++) {
- if (rules[i].selectorText.toLowerCase() == (className.toLowerCase())) {
+ if (rules[i].selectorText && rules[i].selectorText.toLowerCase() == lcClassName) {
rule = rules[i];
}
}
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13478 - in trunk: samples/pickList-sample/src/main/webapp/pages and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-09 17:34:17 -0400 (Thu, 09 Apr 2009)
New Revision: 13478
Modified:
trunk/samples/pickList-sample/src/main/java/org/richfaces/Bean.java
trunk/samples/pickList-sample/src/main/webapp/pages/index.jsp
trunk/ui/pickList/src/main/config/component/picklist.xml
trunk/ui/pickList/src/main/java/org/richfaces/component/UIPickList.java
trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListControlsHelper.java
Log:
https://jira.jboss.org/jira/browse/RF-6622
https://jira.jboss.org/jira/browse/RF-6729
Modified: trunk/samples/pickList-sample/src/main/java/org/richfaces/Bean.java
===================================================================
--- trunk/samples/pickList-sample/src/main/java/org/richfaces/Bean.java 2009-04-09 15:58:30 UTC (rev 13477)
+++ trunk/samples/pickList-sample/src/main/java/org/richfaces/Bean.java 2009-04-09 21:34:17 UTC (rev 13478)
@@ -24,6 +24,10 @@
private boolean disabled;
private boolean moveControlsVisible = true;
private boolean fastMoveControlsVisible = true;
+ private boolean copyAllVisible = true;
+ private boolean copyVisible = true;
+ private boolean removeVisible = true;
+ private boolean removeAllVisible = true;
private List <Animal> listValues = new ArrayList<Animal>();
@@ -222,8 +226,41 @@
public void setFastMoveControlsVisible(boolean fastMoveControlsVisible) {
this.fastMoveControlsVisible = fastMoveControlsVisible;
}
+
+ public boolean isCopyAllVisible() {
+ return copyAllVisible;
+ }
+
+ public void setCopyAllVisible(boolean copyAllVisible) {
+ this.copyAllVisible = copyAllVisible;
+ }
+
+ public boolean isCopyVisible() {
+ return copyVisible;
+ }
+
+ public void setCopyVisible(boolean copyVisible) {
+ this.copyVisible = copyVisible;
+ }
+
+ public boolean isRemoveVisible() {
+ return removeVisible;
+ }
+
+ public void setRemoveVisible(boolean removeVisible) {
+ this.removeVisible = removeVisible;
+ }
+
+ public boolean isRemoveAllVisible() {
+ return removeAllVisible;
+ }
+
+ public void setRemoveAllVisible(boolean removeAllVisible) {
+ this.removeAllVisible = removeAllVisible;
+ }
+
// public List<String> getListValues() {
// return listValues;
Modified: trunk/samples/pickList-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/pickList-sample/src/main/webapp/pages/index.jsp 2009-04-09 15:58:30 UTC (rev 13477)
+++ trunk/samples/pickList-sample/src/main/webapp/pages/index.jsp 2009-04-09 21:34:17 UTC (rev 13478)
@@ -15,7 +15,7 @@
<h:form>
- <h:panelGrid columns="6">
+ <h:panelGrid columns="8">
<h:outputText value="set target list width: "></h:outputText>
<h:inputText value="#{pickBean.targetListWidth}"></h:inputText>
@@ -23,6 +23,9 @@
<h:outputText value="set 'CopyAll' control label: "></h:outputText>
<h:inputText value="#{pickBean.copyAllLabel}"></h:inputText>
+ <h:outputText value="copyAll control visible"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickBean.copyAllVisible}"></h:selectBooleanCheckbox>
+
<h:outputText value="set move controls visible"></h:outputText>
<h:selectBooleanCheckbox value="#{pickBean.moveControlsVisible}"></h:selectBooleanCheckbox>
@@ -32,6 +35,9 @@
<h:outputText value="set 'Copy' control label: "></h:outputText>
<h:inputText value="#{pickBean.copyLabel}"></h:inputText>
+ <h:outputText value="copy control visible"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickBean.copyVisible}"></h:selectBooleanCheckbox>
+
<h:outputText value="set fast move controls visible"></h:outputText>
<h:selectBooleanCheckbox value="#{pickBean.fastMoveControlsVisible}"></h:selectBooleanCheckbox>
@@ -41,6 +47,9 @@
<h:outputText value="set 'Remove' control label: "></h:outputText>
<h:inputText value="#{pickBean.removeLabel}"></h:inputText>
+ <h:outputText value="remove control visible"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickBean.removeVisible}"></h:selectBooleanCheckbox>
+
<h:outputText value=""></h:outputText>
<h:outputText value=""></h:outputText>
@@ -50,10 +59,12 @@
<h:outputText value="set 'RemoveAll' control label: "></h:outputText>
<h:inputText value="#{pickBean.removeAllLabel}"></h:inputText>
+ <h:outputText value="removeAll control visible"></h:outputText>
+ <h:selectBooleanCheckbox value="#{pickBean.removeAllVisible}"></h:selectBooleanCheckbox>
+
<h:outputText value=""></h:outputText>
<h:outputText value=""></h:outputText>
-
</h:panelGrid>
<br/>
@@ -77,7 +88,11 @@
showButtonsLabel="true"
moveControlsVisible="#{pickBean.moveControlsVisible}"
fastMoveControlsVisible="#{pickBean.fastMoveControlsVisible}"
- disabled="#{pickBean.disabled}"
+ copyAllVisible="#{pickBean.copyAllVisible}"
+ copyVisible="#{pickBean.copyVisible}"
+ removeVisible="#{pickBean.removeVisible}"
+ removeAllVisible="#{pickBean.removeAllVisible}"
+ disabled="#{pickBean.disabled}"
>
<f:selectItems value="#{pickBean.testList}"/>
Modified: trunk/ui/pickList/src/main/config/component/picklist.xml
===================================================================
--- trunk/ui/pickList/src/main/config/component/picklist.xml 2009-04-09 15:58:30 UTC (rev 13477)
+++ trunk/ui/pickList/src/main/config/component/picklist.xml 2009-04-09 21:34:17 UTC (rev 13478)
@@ -74,9 +74,9 @@
<property>
<name>showButtonsLabel</name>
<classname>boolean</classname>
+ <description>Shows a label for a button. Default value is "true"</description>
<defaultvalue>true</defaultvalue>
- <description>Shows a label for a button. Default value is "true"</description>
- </property>
+ </property>
<property>
<name>copyAllControlLabel</name>
@@ -166,10 +166,42 @@
<defaultvalue>"140px"</defaultvalue>
</property>
<property>
+ <name>copyAllVisible</name>
+ <classname>boolean</classname>
+ <description>
+ If "false", the 'Copy All' control will not be displayed. Even if this value is "true", the 'Copy All' control will not be displayed if the "fastMoveControlsVisible" attribute is "false". Default value is "true".
+ </description>
+ <defaultvalue>true</defaultvalue>
+ </property>
+ <property>
+ <name>copyVisible</name>
+ <classname>boolean</classname>
+ <description>
+ If "false", the 'Copy' control will not be displayed. Even if this value is "true", the 'Copy' control will not be displayed if the "moveControlsVisible" attribute is "false". Default value is "true".
+ </description>
+ <defaultvalue>true</defaultvalue>
+ </property>
+ <property>
+ <name>removeVisible</name>
+ <classname>boolean</classname>
+ <description>
+ If "false", the 'Remove' control will not be displayed. Even if this value is "true", the 'Remove' control will not be displayed if the "moveControlsVisible" attribute is "false". Default value is "true".
+ </description>
+ <defaultvalue>true</defaultvalue>
+ </property>
+ <property>
+ <name>removeAllVisible</name>
+ <classname>boolean</classname>
+ <description>
+ If "false", the 'Remove All' control will not be displayed. Even if this value is "true", the 'Remove All' control will not be displayed if the "fastMoveControlsVisible" attribute is "false". Default value is "true".
+ </description>
+ <defaultvalue>true</defaultvalue>
+ </property>
+ <property>
<name>moveControlsVisible</name>
<classname>boolean</classname>
<description>
- If "false", 'Copy' and 'Remove' controls aren't displayed. Default value is "true".
+ If "false", 'Copy' and 'Remove' controls aren't displayed. Even if this value is "true", the 'Copy' and 'Remove' controls will not be displayed if the "copyVisible" and "removeVisible" attribute values are "false". Default value is "true".
</description>
<defaultvalue>true</defaultvalue>
</property>
@@ -177,7 +209,7 @@
<name>fastMoveControlsVisible</name>
<classname>boolean</classname>
<description>
- If "false", 'Copy All' and 'Remove All' controls aren't displayed. Default value is "true".
+ If "false", 'Copy All' and 'Remove All' controls aren't displayed. Even if this value is "true", the 'Copy All' and 'Remove All' controls will not be displayed if the "copyAllVisible" and "removeAllVisible" attribute values are "false". Default value is "true".
</description>
<defaultvalue>true</defaultvalue>
</property>
Modified: trunk/ui/pickList/src/main/java/org/richfaces/component/UIPickList.java
===================================================================
--- trunk/ui/pickList/src/main/java/org/richfaces/component/UIPickList.java 2009-04-09 15:58:30 UTC (rev 13477)
+++ trunk/ui/pickList/src/main/java/org/richfaces/component/UIPickList.java 2009-04-09 21:34:17 UTC (rev 13478)
@@ -138,5 +138,17 @@
public abstract boolean isFastMoveControlsVisible();
public abstract void setFastMoveControlsVisible(boolean visible);
-
+
+ public abstract boolean isCopyAllVisible();
+ public abstract void setCopyAllVisible(boolean visible);
+
+ public abstract boolean isCopyVisible();
+ public abstract void setCopyVisible(boolean visible);
+
+ public abstract boolean isRemoveVisible();
+ public abstract void setRemoveVisible(boolean visible);
+
+ public abstract boolean isRemoveAllVisible();
+ public abstract void setRemoveAllVisible(boolean visible);
+
}
Modified: trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListControlsHelper.java
===================================================================
--- trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListControlsHelper.java 2009-04-09 15:58:30 UTC (rev 13477)
+++ trunk/ui/pickList/src/main/java/org/richfaces/renderkit/PickListControlsHelper.java 2009-04-09 21:34:17 UTC (rev 13478)
@@ -127,7 +127,8 @@
"copyAll".concat(OrderingComponentControlsHelper.CONTROL_LABEL_ATTRIBUTE_SUFFIX), COPY_ALL_TITLE) {
public boolean isRendered(FacesContext context, UIComponent listComponent) {
- return ((UIPickList) listComponent).isFastMoveControlsVisible() && !((UIPickList) listComponent).isDisabled();
+ return ((UIPickList) listComponent).isFastMoveControlsVisible() && ((UIPickList) listComponent).isCopyAllVisible()
+ && !((UIPickList) listComponent).isDisabled();
}
},
@@ -137,7 +138,7 @@
.concat(OrderingComponentControlsHelper.CONTROL_LABEL_ATTRIBUTE_SUFFIX), COPY_ALL_TITLE) {
public boolean isRendered(FacesContext context, UIComponent listComponent) {
- return ((UIPickList) listComponent).isFastMoveControlsVisible();
+ return ((UIPickList) listComponent).isFastMoveControlsVisible() && ((UIPickList) listComponent).isCopyAllVisible();
}
},
@@ -146,7 +147,8 @@
.concat(OrderingComponentControlsHelper.CONTROL_LABEL_ATTRIBUTE_SUFFIX), COPY_TITLE) {
public boolean isRendered(FacesContext context, UIComponent listComponent) {
- return ((UIPickList) listComponent).isMoveControlsVisible() && !((UIPickList) listComponent).isDisabled();
+ return ((UIPickList) listComponent).isMoveControlsVisible() && ((UIPickList) listComponent).isCopyVisible()
+ && !((UIPickList) listComponent).isDisabled();
}
},
@@ -155,7 +157,7 @@
false, "copy".concat(OrderingComponentControlsHelper.CONTROL_LABEL_ATTRIBUTE_SUFFIX), COPY_TITLE) {
public boolean isRendered(FacesContext context, UIComponent listComponent) {
- return ((UIPickList) listComponent).isMoveControlsVisible();
+ return ((UIPickList) listComponent).isMoveControlsVisible() && ((UIPickList) listComponent).isCopyVisible();
}
},
@@ -164,7 +166,8 @@
.concat(OrderingComponentControlsHelper.CONTROL_LABEL_ATTRIBUTE_SUFFIX), REMOVE_TITLE) {
public boolean isRendered(FacesContext context, UIComponent listComponent) {
- return ((UIPickList) listComponent).isMoveControlsVisible() && !((UIPickList) listComponent).isDisabled();
+ return ((UIPickList) listComponent).isMoveControlsVisible() && ((UIPickList) listComponent).isRemoveVisible()
+ && !((UIPickList) listComponent).isDisabled();
}
},
@@ -173,7 +176,7 @@
.concat(CONTROL_ID_REMOVE), null, false, "remove".concat(OrderingComponentControlsHelper.CONTROL_LABEL_ATTRIBUTE_SUFFIX), REMOVE_TITLE) {
public boolean isRendered(FacesContext context, UIComponent listComponent) {
- return ((UIPickList) listComponent).isMoveControlsVisible();
+ return ((UIPickList) listComponent).isMoveControlsVisible() && ((UIPickList) listComponent).isRemoveVisible();
}
},
@@ -182,7 +185,8 @@
true, "removeAll".concat(OrderingComponentControlsHelper.CONTROL_LABEL_ATTRIBUTE_SUFFIX), REMOVE_ALL_TITLE) {
public boolean isRendered(FacesContext context, UIComponent listComponent) {
- return ((UIPickList) listComponent).isFastMoveControlsVisible() && !((UIPickList) listComponent).isDisabled();
+ return ((UIPickList) listComponent).isFastMoveControlsVisible() && ((UIPickList) listComponent).isRemoveAllVisible()
+ && !((UIPickList) listComponent).isDisabled();
}
},
@@ -192,7 +196,7 @@
.concat(OrderingComponentControlsHelper.CONTROL_LABEL_ATTRIBUTE_SUFFIX), REMOVE_ALL_TITLE) {
public boolean isRendered(FacesContext context, UIComponent listComponent) {
- return ((UIPickList) listComponent).isFastMoveControlsVisible();
+ return ((UIPickList) listComponent).isFastMoveControlsVisible() && ((UIPickList) listComponent).isRemoveAllVisible();
}
} };
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r13477 - in trunk/test-applications/realworld2/web/src/main: java/org/richfaces/realworld/ui and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-04-09 11:58:30 -0400 (Thu, 09 Apr 2009)
New Revision: 13477
Removed:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tags/RealworldCommandButtonRenderer.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/RealworldException.java
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/DirectLinkHelper.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ActionMapperTagHandler.java
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/avatar.xhtml
Log:
Refactoring
Deleted: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tags/RealworldCommandButtonRenderer.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tags/RealworldCommandButtonRenderer.java 2009-04-09 15:58:20 UTC (rev 13476)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/tags/RealworldCommandButtonRenderer.java 2009-04-09 15:58:30 UTC (rev 13477)
@@ -1,65 +0,0 @@
-/**
- *
- */
-package org.richfaces.realworld.tags;
-
-import java.io.IOException;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-
-import org.ajax4jsf.renderkit.AjaxCommandRendererBase;
-import org.ajax4jsf.renderkit.RendererUtils.HTML;
-
-
-/**
- * @author Andrey Markavtsov
- *
- */
-//TODO nick - remove this
-public class RealworldCommandButtonRenderer extends AjaxCommandRendererBase {
-
- @Override
- public void encodeBegin(FacesContext context, UIComponent component)
- throws IOException {
- Object id = component.getClientId(context);
- Object style = component.getAttributes().get("style");
- Object value = component.getAttributes().get("value");
-
- ResponseWriter writer = context.getResponseWriter();
- writer.startElement(HTML.DIV_ELEM, component);
- writer.writeAttribute(HTML.id_ATTRIBUTE, id, null);
- writer.writeAttribute(HTML.class_ATTRIBUTE, "realworldButton", null);
- writer.writeAttribute(HTML.style_ATTRIBUTE, style, null);
- writer.writeAttribute(HTML.onclick_ATTRIBUTE, getOnClick(context, component), null);
-
- writer.startElement(HTML.IMG_ELEMENT, component);
- writer.writeAttribute(HTML.src_ATTRIBUTE, "img/shell/button.png", null);
- writer.writeAttribute(HTML.width_ATTRIBUTE, "103", null);
- writer.writeAttribute(HTML.height_ATTRIBUTE, "28", null);
- writer.writeAttribute(HTML.alt_ATTRIBUTE, "", null);
- writer.writeAttribute(HTML.border_ATTRIBUTE, "0", null);
- writer.endElement(HTML.IMG_ELEMENT);
-
- writer.startElement(HTML.DIV_ELEM, component);
- writer.writeText(value, null);
- writer.endElement(HTML.DIV_ELEM);
-
- writer.startElement(HTML.IMG_ELEMENT, component);
- writer.writeAttribute(HTML.src_ATTRIBUTE, "img/shell/spacer.gif", null);
- writer.writeAttribute(HTML.width_ATTRIBUTE, "103", null);
- writer.writeAttribute(HTML.height_ATTRIBUTE, "28", null);
- writer.writeAttribute(HTML.alt_ATTRIBUTE, "", null);
- writer.writeAttribute(HTML.border_ATTRIBUTE, "0", null);
- writer.endElement(HTML.IMG_ELEMENT);
-
- writer.endElement(HTML.DIV_ELEM);
- }
-
- @Override
- protected Class<? extends UIComponent> getComponentClass() {
- return org.ajax4jsf.component.UIAjaxCommandButton.class;
- }
-
-}
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/DirectLinkHelper.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/DirectLinkHelper.java 2009-04-09 15:58:20 UTC (rev 13476)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/DirectLinkHelper.java 2009-04-09 15:58:30 UTC (rev 13477)
@@ -14,7 +14,6 @@
import org.jboss.seam.security.Identity;
import org.richfaces.realworld.domain.Image;
import org.richfaces.realworld.service.Constants;
-import org.richfaces.realworld.util.RealworldException;
@Name("directLink")
@Scope(ScopeType.EVENT)
@@ -30,17 +29,25 @@
@In Credentials credentials;
public void paintImage(OutputStream out, Object data)
- throws IOException, RealworldException {
+ throws IOException {
Long id = Long.valueOf(data.toString());
Image im = em.find(Image.class, id);
- if(im == null || im.getAlbum() == null || im.getAlbum().getShelf() == null){
+ if(isImageRecentlyRemoved(im)){
imageLoader.paintImage(out, Constants.DEFAULT_PICTURE);
return;
}
- if(im.getAlbum().getShelf().isShared() || (identity.hasRole(Constants.ADMIN_ROLE) && im.getAlbum().getOwner().getLogin().equals(credentials.getUsername()))){
+ if(isImageSharedOrBelongsToUser(im)){
imageLoader.paintImage(out, im.getFullPath());
}else{
return;
}
}
+
+ private boolean isImageSharedOrBelongsToUser(Image im) {
+ return im.getAlbum().getShelf().isShared() || (identity.hasRole(Constants.ADMIN_ROLE) && im.getAlbum().getOwner().getLogin().equals(credentials.getUsername()));
+ }
+
+ private boolean isImageRecentlyRemoved(Image im) {
+ return im == null || im.getAlbum() == null || im.getAlbum().getShelf() == null;
+ }
}
\ No newline at end of file
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java 2009-04-09 15:58:20 UTC (rev 13476)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java 2009-04-09 15:58:30 UTC (rev 13477)
@@ -44,18 +44,22 @@
@In FileManager fileManager;
public void paintImage(OutputStream out, Object data) throws IOException {
-
if (null == data) {
return;
- }
-
- File imageResource = null;
-
- if(data.toString().endsWith(Constants.UPLOAD)){
- imageResource = fileManager.getFileByAbsolutePath(data.toString());
- }else{
- imageResource = fileManager.getFileByPath(data.toString());
}
+ File imageResource = fileManager.getFileByAbsolutePath(data.toString());
+ paintImageToBrowser(out, imageResource);
+ }
+
+ public void paintAvatarImage(OutputStream out, Object data) throws IOException {
+ if (null == data) {
+ return;
+ }
+ File imageResource = fileManager.getFileByPath(data.toString());
+ paintImageToBrowser(out, imageResource);
+ }
+
+ public void paintImageToBrowser(OutputStream out, File imageResource) throws IOException {
if (imageResource != null && imageResource.exists()) {
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ActionMapperTagHandler.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ActionMapperTagHandler.java 2009-04-09 15:58:20 UTC (rev 13476)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ActionMapperTagHandler.java 2009-04-09 15:58:30 UTC (rev 13477)
@@ -197,5 +197,4 @@
nextHandler.apply(ctx, parent);
}
}
-
-}
+}
\ No newline at end of file
Deleted: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/RealworldException.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/RealworldException.java 2009-04-09 15:58:20 UTC (rev 13476)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/RealworldException.java 2009-04-09 15:58:30 UTC (rev 13477)
@@ -1,11 +0,0 @@
-package org.richfaces.realworld.util;
-
-public class RealworldException extends Exception {
-
- /** The serialVersionUID */
- private static final long serialVersionUID = -5437284703541833879L;
-
- public RealworldException(String message) {
- super(message);
- }
-}
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml 2009-04-09 15:58:20 UTC (rev 13476)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml 2009-04-09 15:58:30 UTC (rev 13477)
@@ -1,5 +1,3 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
xmlns:s="http://jboss.com/products/seam/taglib"
xmlns:c="http://java.sun.com/jstl/core"
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-04-09 15:58:20 UTC (rev 13476)
+++ trunk/test-applications/realworld2/web/src/main/webapp/includes/search/result/userResult.xhtml 2009-04-09 15:58:30 UTC (rev 13477)
@@ -10,7 +10,7 @@
<h:panelGrid cellpadding="0">
<h:panelGroup>
<a4j:commandLink reRender="mainArea" actionListener="#{controller.showUser(searchedUser)}">
- <a4j:mediaOutput rendered="#{searchedUser.hasAvatar}" element="img" createContent="#{imageLoader.paintImage}"
+ <a4j:mediaOutput rendered="#{searchedUser.hasAvatar}" element="img" createContent="#{imageLoader.paintAvatarImage}"
styleClass="avatar"
value="/#{searchedUser.login}/avatar.jpg" />
<h:graphicImage rendered="#{!searchedUser.hasAvatar and searchedUser.sex.key =='1' }" value="/img/shell/avatar_default.png" width="80" height="80" alt="" style="border:none"/>
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userPrefs/avatar.xhtml
===================================================================
(Binary files differ)
15 years, 2 months
- 1
- 0