JBoss Rich Faces SVN: r3597 - branches/3.1.x/test-applications/facelets/src/main/webapp/RichPanels/Panel.
by richfaces-svn-commits＠lists.jboss.org
Author: viktor_volkov
Date: 2007-10-29 10:14:33 -0400 (Mon, 29 Oct 2007)
New Revision: 3597
Modified:
branches/3.1.x/test-applications/facelets/src/main/webapp/RichPanels/Panel/Panel.xhtml
Log:
Adding components to Panel in Richpanels application
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/RichPanels/Panel/Panel.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/RichPanels/Panel/Panel.xhtml 2007-10-29 13:57:36 UTC (rev 3596)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/RichPanels/Panel/Panel.xhtml 2007-10-29 14:14:33 UTC (rev 3597)
@@ -5,16 +5,6 @@
xmlns:c="http://java.sun.com/jstl/core"
xmlns:ui="http://java.sun.com/jsf/facelets">
- <rich:spacer width="10" height="50"></rich:spacer>
-
- <rich:panel rendered="true" id="any"
- style="width:#{panel.width};height:#{panel.height};overflow:auto;">
- <f:facet name="header">
- <h:outputText value="rich:any"></h:outputText>
- </f:facet>
-
- </rich:panel>
-
<rich:panel rendered="true" id="Panel"
style="width:500px;height:700px;overflow:auto;">
<f:facet name="header">
@@ -106,7 +96,7 @@
<rich:spacer width="10" height="50"></rich:spacer>
<rich:panel rendered="true" id="InputNumberSlider"
- style="width:400px;height:1000px;overflow:auto;">
+ style="width:400px;height:900px;overflow:auto;">
<f:facet name="header">
<h:outputText value="rich:inputNumberSlider"></h:outputText>
</f:facet>
@@ -116,7 +106,7 @@
<rich:spacer width="10" height="50"></rich:spacer>
<rich:panel rendered="true" id="InputNumberSpinner"
- style="width:400px;height:800px;overflow:auto;">
+ style="width:400px;height:700px;overflow:auto;">
<f:facet name="header">
<h:outputText value="rich:inputNumberSpinner"></h:outputText>
</f:facet>
@@ -133,8 +123,176 @@
<ui:include src="/Insert/Insert.xhtml" />
</rich:panel>
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="jQuery"
+ style="width:400px;height:600px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:jQuery"></h:outputText>
+ </f:facet>
+ <ui:include src="/jQuery/jQuery.xhtml" />
+ </rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="message"
+ style="width:400px;height:600px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:message, rich:messages"></h:outputText>
+ </f:facet>
+ <ui:include src="/Message/Message.xhtml" />
+ </rich:panel>
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="ModalPanel"
+ style="width:400px;height:400px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:modalpanel"></h:outputText>
+ </f:facet>
+ <ui:include src="/ModalPanel/ModalPanel.xhtml" />
+ </rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="Paint2D"
+ style="width:1000px;height:600px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:paint2D"></h:outputText>
+ </f:facet>
+ <ui:include src="/Paint2D/Paint2D.xhtml" />
+ </rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="PanelBar"
+ style="width:600px;height:600px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:panelBar"></h:outputText>
+ </f:facet>
+ <ui:include src="/PanelBar/PanelBar.xhtml" />
+ </rich:panel>
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="PanelMenu"
+ style="width:800px;height:900px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:panelmenu"></h:outputText>
+ </f:facet>
+ <ui:include src="/PanelMenu/PanelMenu.xhtml" />
+ </rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="ScrollableDataTable"
+ style="width:500px;height:700px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:scrollableDataTable"></h:outputText>
+ </f:facet>
+ <ui:include src="/ScrollableDataTable/ScrollableDataTable.xhtml" />
+ </rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="Separator"
+ style="width:600px;height:500px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:separator"></h:outputText>
+ </f:facet>
+ <ui:include src="/Separator/Separator.xhtml" />
+ </rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="SimpleTogglePanel"
+ style="width:600px;height:800px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:simpleTogglePanel"></h:outputText>
+ </f:facet>
+ <ui:include src="/SimpleTogglePanel/SimpleTogglePanel.xhtml" />
+ </rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="Spacer"
+ style="width:700px;height:400px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:spacer"></h:outputText>
+ </f:facet>
+ <ui:include src="/Spacer/Spacer.xhtml" />
+ </rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="SuggestionBox"
+ style="width:500px;height:700px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:suggestionbox"></h:outputText>
+ </f:facet>
+ <ui:include src="/SuggestionBox/SuggestionBox.xhtml" />
+ </rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="TabPanel"
+ style="width:700px;height:700px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:tabPanel"></h:outputText>
+ </f:facet>
+ <ui:include src="/TabPanel/TabPanel.xhtml" />
+ </rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="TogglePanel"
+ style="width:700px;height:1000px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:togglePanel"></h:outputText>
+ </f:facet>
+ <ui:include src="/TogglePanel/TogglePanel.xhtml" />
+ </rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="ToolBar"
+ style="width:1000px;height:300px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:toolBar"></h:outputText>
+ </f:facet>
+ <ui:include src="/ToolBar/ToolBar.xhtml" />
+ </rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="ToolTip"
+ style="width:500px;height:600px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:toolTip"></h:outputText>
+ </f:facet>
+ <ui:include src="/Tooltip/Tooltip.xhtml" />
+ </rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="Tree"
+ style="width:600px;height:1200px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:tree, rich:treeNode"></h:outputText>
+ </f:facet>
+ <ui:include src="/Tree/Tree.xhtml" />
+ </rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="VirtualEarth"
+ style="width:1000px;height:600px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:virtualEarth"></h:outputText>
+ </f:facet>
+ <ui:include src="/VirtualEarth/VirtualEarth.xhtml" />
+ </rich:panel>
+
</h:form>
16 years, 6 months
JBoss Rich Faces SVN: r3596 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2007-10-29 09:57:36 -0400 (Mon, 29 Oct 2007)
New Revision: 3596
Modified:
trunk/docs/userguide/en/src/main/docbook/included/subTable.xml
Log:
http://jira.jboss.com/jira/browse/RF-920 - adding Skin Parameters Redefinition section
Modified: trunk/docs/userguide/en/src/main/docbook/included/subTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/subTable.xml 2007-10-29 13:56:42 UTC (rev 3595)
+++ trunk/docs/userguide/en/src/main/docbook/included/subTable.xml 2007-10-29 13:57:36 UTC (rev 3596)
@@ -115,11 +115,22 @@
</itemizedlist>
<para>To redefine a style of a particular page, use component class attributes which list is the same as the <property>subTable</property> one and is known to you.</para>
</section>
+
<section>
+ <title>Skin Parameters Redefinition</title>
+
+ <para>Skin parameters redefinition for <emphasis role="bold">
+ <property><rich:subTable></property>
+ </emphasis> are the same as for the <link linkend="SPR"><emphasis role="bold">
+ <property><rich:dataTable></property>
+ </emphasis></link> component.</para>
+ </section>
+
+ <section>
<title>Definition of Custom Style Classes</title>
<table>
- <title>Classes names that define a subtable appearance</title>
+ <title>Classes names that define a whole component appearance</title>
<tgroup cols="2">
<thead>
<row>
@@ -136,15 +147,28 @@
<entry>rich-subtable-caption</entry>
<entry>Defines styles for a "caption" facet element</entry>
</row>
+
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Classes names that define header and footer elements</title>
+ <tgroup cols="2">
+ <thead>
<row>
+ <entry>Class name</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+
+ <row>
<entry>rich-subtable-header</entry>
<entry>Defines styles for a subtable header row</entry>
</row>
+
<row>
- <entry>rich-subtable-headercell</entry>
- <entry>Defines styles for a subtable header cell</entry>
- </row>
- <row>
<entry>rich-subtable-header-continue</entry>
<entry>Defines styles for all subtable header lines after the first</entry>
</row>
@@ -152,7 +176,41 @@
<entry>rich-subtable-subheader</entry>
<entry>Defines styles for a column header of subtable</entry>
</row>
+
<row>
+ <entry>rich-subtable-subfooter</entry>
+ <entry>Defines styles for a column footer of subtable</entry>
+ </row>
+
+ <row>
+ <entry>rich-subtable-footer</entry>
+ <entry>Defines styles for a subtable footer row</entry>
+ </row>
+
+ <row>
+ <entry>rich-subtable-footer-continue</entry>
+ <entry>Defines styles for all subtable footer lines after the first</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Classes names that define rows and cells</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Class name</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>rich-subtable-headercell</entry>
+ <entry>Defines styles for a subtable header cell</entry>
+ </row>
+
+ <row>
<entry>rich-subtable-subheadercell</entry>
<entry>Defines styles for a column header cell of subtable</entry>
</row>
@@ -168,26 +226,17 @@
<entry>rich-subtable-firstrow</entry>
<entry>Defines styles for a subtable start row</entry>
</row>
+
<row>
- <entry>rich-subtable-subfooter</entry>
- <entry>Defines styles for a column footer of subtable</entry>
- </row>
- <row>
<entry>rich-subtable-subfootercell</entry>
<entry>Defines styles for a column footer cell of subtable</entry>
</row>
+
<row>
- <entry>rich-subtable-footer</entry>
- <entry>Defines styles for a subtable footer row</entry>
- </row>
- <row>
<entry>rich-subtable-footercell</entry>
<entry>Defines styles for a subtable footer cell</entry>
</row>
- <row>
- <entry>rich-subtable-footer-continue</entry>
- <entry>Defines styles for all subtable footer lines after the first</entry>
- </row>
+
</tbody>
</tgroup>
</table>
16 years, 6 months
JBoss Rich Faces SVN: r3595 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2007-10-29 09:56:42 -0400 (Mon, 29 Oct 2007)
New Revision: 3595
Modified:
trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml
Log:
http://jira.jboss.com/jira/browse/RF-920 - adding rich-classes
Modified: trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml 2007-10-29 13:56:02 UTC (rev 3594)
+++ trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml 2007-10-29 13:56:42 UTC (rev 3595)
@@ -145,6 +145,33 @@
</section>
<section>
+ <title>Definition of Custom Style Classes</title>
+ <table>
+ <title>Classes names that define a component appearance</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Class name</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>rich-toggle-panel</entry>
+ <entry>Defines styles for all component</entry>
+ </row>
+
+ <row>
+ <entry>rich-tglctrl</entry>
+ <entry>Defines styles for a toggle control</entry>
+ </row>
+
+ </tbody>
+ </tgroup>
+ </table>
+ </section>
+
+ <section>
<title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/togglePanel.jsf?c=tog..."
16 years, 6 months
JBoss Rich Faces SVN: r3594 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2007-10-29 09:56:02 -0400 (Mon, 29 Oct 2007)
New Revision: 3594
Modified:
trunk/docs/userguide/en/src/main/docbook/included/column.xml
trunk/docs/userguide/en/src/main/docbook/included/columnGroup.xml
trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml
trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
Log:
http://jira.jboss.com/jira/browse/RF-920 - adding Skin Parameters Redefinition section
Modified: trunk/docs/userguide/en/src/main/docbook/included/column.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/column.xml 2007-10-29 11:29:06 UTC (rev 3593)
+++ trunk/docs/userguide/en/src/main/docbook/included/column.xml 2007-10-29 13:56:02 UTC (rev 3594)
@@ -194,9 +194,27 @@
<listitem>to add <emphasis
><property>style classes</property></emphasis> used by the column to your page style sheets</listitem>
</itemizedlist>
- </section>
+ </section>
+
+ <section>
+ <title>Skin Parameters Redefinition</title>
+
+ <para>Skin parameters redefinition for <emphasis role="bold">
+ <property><rich:column></property>
+ </emphasis> are the same as for the <link linkend="SPR"><emphasis role="bold">
+ <property><rich:dataTable></property>
+ </emphasis></link> component.</para>
+ </section>
+
<section>
<title>Definition of Custom Style Classes</title>
+
+ <para>Custom style classes for <emphasis role="bold">
+ <property><rich:column></property>
+ </emphasis> are the same as for the <link linkend="DofCCS"><emphasis role="bold">
+ <property><rich:dataTable></property>
+ </emphasis></link> component.
+ </para>
<para>In order to redefine styles for all <emphasis role="bold">
<property><rich:column></property>
Modified: trunk/docs/userguide/en/src/main/docbook/included/columnGroup.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/columnGroup.xml 2007-10-29 11:29:06 UTC (rev 3593)
+++ trunk/docs/userguide/en/src/main/docbook/included/columnGroup.xml 2007-10-29 13:56:02 UTC (rev 3594)
@@ -179,9 +179,26 @@
<listitem>to add <emphasis
><property>style classes</property></emphasis> used by the columnGroup to your page style sheets</listitem>
</itemizedlist>
- </section>
+ </section>
+
<section>
+ <title>Skin Parameters Redefinition</title>
+
+ <para>Skin parameters redefinition for <emphasis role="bold"><property><rich:columnGroup></property>
+ </emphasis> are the same as for the <link linkend="SPR"><emphasis role="bold">
+ <property><rich:dataTable></property>
+ </emphasis></link> component.</para>
+ </section>
+
+ <section>
<title>Definition of Custom Style Classes</title>
+
+ <para>Custom style classes for <emphasis role="bold">
+ <property><rich:columnGroup></property>
+ </emphasis> are the same as for the <link linkend="DofCCS"><emphasis role="bold">
+ <property><rich:dataTable></property>
+ </emphasis></link> component.
+ </para>
<para>In order to redefine styles for all <emphasis role="bold">
<property><rich:columnGroup></property>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml 2007-10-29 11:29:06 UTC (rev 3593)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml 2007-10-29 13:56:02 UTC (rev 3594)
@@ -115,11 +115,26 @@
><property>style classes</property></emphasis> used by the dataGrid to your page style sheets</listitem>
</itemizedlist>
- </section>
+ </section>
+ <section>
+ <title>Skin Parameters Redefinition</title>
+
+ <para>Skin parameters redefinition for <emphasis role="bold">
+ <property><rich:dataGrid></property>
+ </emphasis> are the same as for the <link linkend="SPR"><emphasis role="bold">
+ <property><rich:dataTable></property>
+ </emphasis></link> component.</para>
+ </section>
+
<section>
<title>Definition of Custom Style Classes</title>
-
+ <para>Custom style classes for <emphasis role="bold">
+ <property><rich:dataGrid></property>
+ </emphasis> are the same as for the <link linkend="DofCCS"><emphasis role="bold">
+ <property><rich:dataTable></property>
+ </emphasis></link> component.
+ </para>
<para>In order to redefine styles for all <emphasis role="bold">
<property><rich:dataGrid></property>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2007-10-29 11:29:06 UTC (rev 3593)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2007-10-29 13:56:02 UTC (rev 3594)
@@ -125,7 +125,7 @@
</itemizedlist>
</section>
- <section>
+ <section id="SPR">
<title>Skin Parameters Redefinition</title>
<table>
@@ -246,7 +246,7 @@
</section>
- <section>
+ <section id="DofCCS">
<title>Definition of Custom Style Classes</title>
<para>On the screenshot there are classes names that define styles for component elements.</para>
@@ -261,7 +261,7 @@
</figure>
<table>
- <title>Classes names that define a table appearance</title>
+ <title>Classes names that define a whole component appearance</title>
<tgroup cols="2">
<thead>
<row>
@@ -278,23 +278,68 @@
<entry>rich-table-caption</entry>
<entry>Defines styles for a "caption" facet element</entry>
</row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Classes names that define header and footer elements</title>
+ <tgroup cols="2">
+ <thead>
<row>
+ <entry>Class name</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+
+ <row>
<entry>rich-table-header</entry>
<entry>Defines styles for a table header row</entry>
</row>
+
<row>
- <entry>rich-table-headercell</entry>
- <entry>Defines styles for a header cell</entry>
- </row>
- <row>
<entry>rich-table-header-continue</entry>
<entry>Defines styles for all header lines after the first</entry>
</row>
<row>
<entry>rich-table-subheader</entry>
<entry>Defines styles for a column header</entry>
+ </row>
+
+ <row>
+ <entry>rich-table-footer</entry>
+ <entry>Defines styles for a footer row</entry>
</row>
+
<row>
+ <entry>rich-table-footer-continue</entry>
+ <entry>Defines styles for all footer lines after the first</entry>
+ </row>
+ <row>
+ <entry>rich-table-subfooter</entry>
+ <entry>Defines styles for a column footer</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Classes names that define rows and cells of a table</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Class name</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>rich-table-headercell</entry>
+ <entry>Defines styles for a header cell</entry>
+ </row>
+
+ <row>
<entry>rich-table-subheadercell</entry>
<entry>Defines styles for a column header cell</entry>
</row>
@@ -310,29 +355,20 @@
<entry>rich-table-firstrow</entry>
<entry>Defines styles for a table start row</entry>
</row>
+
<row>
- <entry>rich-table-footer</entry>
- <entry>Defines styles for a footer row</entry>
- </row>
- <row>
<entry>rich-table-footercell</entry>
<entry>Defines styles for a footer cell</entry>
</row>
+
<row>
- <entry>rich-table-footer-continue</entry>
- <entry>Defines styles for all footer lines after the first</entry>
- </row>
- <row>
- <entry>rich-table-subfooter</entry>
- <entry>Defines styles for a column footer</entry>
- </row>
- <row>
<entry>rich-table-subfootercell</entry>
<entry>Defines styles for a column footer cell</entry>
</row>
</tbody>
</tgroup>
</table>
+
<para>In order to redefine styles for all <emphasis role="bold">
<property><rich:dataTable></property>
</emphasis> components on a page using CSS, it's enough to create classes with the
16 years, 6 months
JBoss Rich Faces SVN: r3593 - in branches/3.1.x/ui/simpleTogglePanel/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-10-29 07:29:06 -0400 (Mon, 29 Oct 2007)
New Revision: 3593
Modified:
branches/3.1.x/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss
branches/3.1.x/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx
Log:
RF-962
Modified: branches/3.1.x/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss
===================================================================
--- branches/3.1.x/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss 2007-10-29 11:20:00 UTC (rev 3592)
+++ branches/3.1.x/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss 2007-10-29 11:29:06 UTC (rev 3593)
@@ -31,6 +31,9 @@
text-align : left;
vertical-align : top;
}
+.dr-stglpanel-marker{
+ float: left;
+}
]]>
</f:verbatim>
Modified: branches/3.1.x/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx
===================================================================
--- branches/3.1.x/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-10-29 11:20:00 UTC (rev 3592)
+++ branches/3.1.x/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-10-29 11:29:06 UTC (rev 3593)
@@ -33,7 +33,7 @@
class="dr-stglpnl-h rich-stglpanel-header #{component.attributes['headerClass']}"
onclick="#{this:getOnClick(context,component)}">
- <div style="float: right">
+ <div class="dr-stglpanel-marker rich-stglpanel-marker">
<div id="#{clientId}_switch_on" style="display: #{this:getSwitchOnStatus(context, component)};" class="dr-stglpnl-m rich-stglpnl-marker">
<jsp:scriptlet><![CDATA[
if(component.getFacet("closeMarker")!=null && component.getFacet("closeMarker").isRendered()) {
16 years, 6 months
JBoss Rich Faces SVN: r3592 - in trunk/ui/simpleTogglePanel/src/main: templates and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2007-10-29 07:20:00 -0400 (Mon, 29 Oct 2007)
New Revision: 3592
Modified:
trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss
trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx
Log:
RF-962
Modified: trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss
===================================================================
--- trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss 2007-10-29 09:45:27 UTC (rev 3591)
+++ trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss 2007-10-29 11:20:00 UTC (rev 3592)
@@ -31,6 +31,9 @@
text-align : left;
vertical-align : top;
}
+.dr-stglpanel-marker{
+ float: left;
+}
]]>
</f:verbatim>
Modified: trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx
===================================================================
--- trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-10-29 09:45:27 UTC (rev 3591)
+++ trunk/ui/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-10-29 11:20:00 UTC (rev 3592)
@@ -33,7 +33,7 @@
class="dr-stglpnl-h rich-stglpanel-header #{component.attributes['headerClass']}"
onclick="#{this:getOnClick(context,component)}">
- <div style="float: right">
+ <div class="dr-stglpanel-marker rich-stglpanel-marker">
<div id="#{clientId}_switch_on" style="display: #{this:getSwitchOnStatus(context, component)};" class="dr-stglpnl-m rich-stglpnl-marker">
<jsp:scriptlet><![CDATA[
if(component.getFacet("closeMarker")!=null && component.getFacet("closeMarker").isRendered()) {
16 years, 6 months
JBoss Rich Faces SVN: r3591 - branches/3.1.x/test-applications/facelets/src/main/webapp/RichPanels/Panel.
by richfaces-svn-commits＠lists.jboss.org
Author: viktor_volkov
Date: 2007-10-29 05:45:27 -0400 (Mon, 29 Oct 2007)
New Revision: 3591
Modified:
branches/3.1.x/test-applications/facelets/src/main/webapp/RichPanels/Panel/Panel.xhtml
Log:
Adding components to Panel in Richpanels application
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/RichPanels/Panel/Panel.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/RichPanels/Panel/Panel.xhtml 2007-10-29 09:43:51 UTC (rev 3590)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/RichPanels/Panel/Panel.xhtml 2007-10-29 09:45:27 UTC (rev 3591)
@@ -86,12 +86,53 @@
<rich:spacer width="10" height="50"></rich:spacer>
<rich:panel rendered="true" id="Effect"
- style="width:500px;height:500px;overflow:auto;">
+ style="width:700px;height:500px;overflow:auto;">
<f:facet name="header">
<h:outputText value="rich:effect"></h:outputText>
</f:facet>
<ui:include src="/Effect/Effect.xhtml" />
</rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="GMap"
+ style="width:600px;height:800px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:gmap"></h:outputText>
+ </f:facet>
+ <ui:include src="/Gmap/Gmap.xhtml" />
+ </rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="InputNumberSlider"
+ style="width:400px;height:1000px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:inputNumberSlider"></h:outputText>
+ </f:facet>
+ <ui:include src="/inputNumberSlider/inputNumberSlider.xhtml" />
+ </rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="InputNumberSpinner"
+ style="width:400px;height:800px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:inputNumberSpinner"></h:outputText>
+ </f:facet>
+ <ui:include src="/inputNumberSpinner/inputNumberSpinner.xhtml" />
+ </rich:panel>
+
+ <rich:spacer width="10" height="50"></rich:spacer>
+
+ <rich:panel rendered="true" id="Insert"
+ style="width:600px;height:1000px;overflow:auto;">
+ <f:facet name="header">
+ <h:outputText value="rich:insert"></h:outputText>
+ </f:facet>
+ <ui:include src="/Insert/Insert.xhtml" />
+ </rich:panel>
+
</h:form>
16 years, 6 months
JBoss Rich Faces SVN: r3590 - branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: viktor_volkov
Date: 2007-10-29 05:43:51 -0400 (Mon, 29 Oct 2007)
New Revision: 3590
Added:
branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DragAndDrop.xml
Modified:
branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml
branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
Log:
syntax error fix
Copied: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DragAndDrop.xml (from rev 3539, branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DradAbdDrop.xml)
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DragAndDrop.xml (rev 0)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-DragAndDrop.xml 2007-10-29 09:43:51 UTC (rev 3590)
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
+ "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
+<faces-config>
+ <managed-bean>
+ <managed-bean-name>dndBean</managed-bean-name>
+ <managed-bean-class>dnd.DndBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+</faces-config>
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-10-29 09:39:14 UTC (rev 3589)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/faces-config.xml 2007-10-29 09:43:51 UTC (rev 3590)
@@ -66,7 +66,7 @@
</navigation-case>
<navigation-case>
<from-outcome>dnd</from-outcome>
- <to-view-id>/DradAndDrop/DragAndDrop.xhtml</to-view-id>
+ <to-view-id>/DragAndDrop/DragAndDrop.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>DS</from-outcome>
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-10-29 09:39:14 UTC (rev 3589)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2007-10-29 09:43:51 UTC (rev 3590)
@@ -33,7 +33,7 @@
</context-param>
<context-param>
<param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>/WEB-INF/faces-config-RichPanelsBean.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DradAbdDrop.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Messa!
ge.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-SelectOneMenuPage.xml,/WEB-INF/faces-config-RichTest.xml</param-value>
+ <param-value>/WEB-INF/faces-config-RichPanelsBean.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Messa!
ge.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-SelectOneMenuPage.xml,/WEB-INF/faces-config-RichTest.xml</param-value>
</context-param>
<context-param>
<param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
16 years, 6 months
JBoss Rich Faces SVN: r3589 - branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSlider.
by richfaces-svn-commits＠lists.jboss.org
Author: viktor_volkov
Date: 2007-10-29 05:39:14 -0400 (Mon, 29 Oct 2007)
New Revision: 3589
Modified:
branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSlider/inputNumberSlider.xhtml
Log:
comment <a4j:log>
Modified: branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSlider/inputNumberSlider.xhtml
===================================================================
--- branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSlider/inputNumberSlider.xhtml 2007-10-29 09:34:07 UTC (rev 3588)
+++ branches/3.1.x/test-applications/facelets/src/main/webapp/inputNumberSlider/inputNumberSlider.xhtml 2007-10-29 09:39:14 UTC (rev 3589)
@@ -5,7 +5,7 @@
xmlns:rich="http://richfaces.org/rich">
<h:form>
<h:panelGrid columns="1">
- <a4j:log level="ALL" popup="false" width="400" height="200"/>
+ <!--a4j:log level="ALL" popup="false" width="400" height="200"/-->
<h:outputText value="Event:"></h:outputText>
<rich:inputNumberSlider minValue="0" maxValue="100" width="300px"
onmousedown="alert('OnMouseDown');" onblur="" onchange="" onclick="" ondblclick="" onerror="" onfocus="" onselect="" onkeydown=""
16 years, 6 months
JBoss Rich Faces SVN: r3588 - in branches/3.1.x/ui/message/src/main: java/org/richfaces/component and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2007-10-29 05:34:07 -0400 (Mon, 29 Oct 2007)
New Revision: 3588
Modified:
branches/3.1.x/ui/message/src/main/config/component/message.xml
branches/3.1.x/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java
branches/3.1.x/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java
branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java
branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java
branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
Log:
add level attribute to show only certain category of messages RF-1059
Modified: branches/3.1.x/ui/message/src/main/config/component/message.xml
===================================================================
--- branches/3.1.x/ui/message/src/main/config/component/message.xml 2007-10-29 09:18:31 UTC (rev 3587)
+++ branches/3.1.x/ui/message/src/main/config/component/message.xml 2007-10-29 09:34:07 UTC (rev 3588)
@@ -36,6 +36,14 @@
</test>
</tag>
+ <property>
+ <name>level</name>
+ <classname>java.lang.String</classname>
+ <defaultvalue>"ALL"</defaultvalue>
+ <description>
+ comma-separated list of messages categoris which should be displayed
+ </description>
+ </property>
<property attachedstate="true">
<name>passedLabel</name>
@@ -292,7 +300,16 @@
Attribute should define the label to be displayed when no message appears
</description>
</property>
+ <property>
+ <name>level</name>
+ <classname>java.lang.String</classname>
+ <description>
+ comma-separated list of messages categoris which should be displayed
+ </description>
+ <defaultvalue>"ALL"</defaultvalue>
+ </property>
+
<property>
<name>var</name>
<classname>java.lang.String</classname>
Modified: branches/3.1.x/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java
===================================================================
--- branches/3.1.x/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java 2007-10-29 09:18:31 UTC (rev 3587)
+++ branches/3.1.x/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java 2007-10-29 09:34:07 UTC (rev 3588)
@@ -44,4 +44,9 @@
isPassed = false;
}
+ public abstract String getLevel();
+
+ public abstract void setLevel(String level);
+
+
}
\ No newline at end of file
Modified: branches/3.1.x/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java
===================================================================
--- branches/3.1.x/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java 2007-10-29 09:18:31 UTC (rev 3587)
+++ branches/3.1.x/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java 2007-10-29 09:34:07 UTC (rev 3588)
@@ -16,8 +16,7 @@
private boolean isPassed = false;
-
-
+
public boolean isPassed(){
return isPassed;
}
@@ -36,5 +35,9 @@
isPassed = true;
super.decode(context);
}
-
+
+ public abstract String getLevel();
+
+ public abstract void setLevel(String level);
+
}
Modified: branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java
===================================================================
--- branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java 2007-10-29 09:18:31 UTC (rev 3587)
+++ branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java 2007-10-29 09:34:07 UTC (rev 3588)
@@ -1,17 +1,22 @@
package org.richfaces.renderkit;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import javax.faces.application.FacesMessage;
import javax.faces.application.FacesMessage.Severity;
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
+import javax.faces.component.UIMessage;
+import javax.faces.component.UIMessages;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
+import org.ajax4jsf.resource.InternetResource;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -30,7 +35,62 @@
public static final String COMPONENT_NOT_FOUND_IN_VIEW_WARN_MESSAGE = "component not found in the view WARNING";
+ private static final String ERROR_NAME = "ERROR";
+ private static final String WARN_NAME = "WARN";
+
+ private static final String FATAL_NAME = "FATAL";
+
+ private static final String INFO_NAME = "INFO";
+
+ private static final String ALL_NAME = "ALL";
+
+ protected List acceptLevels = new ArrayList();
+
+
+ private final InternetResource[] styles = {getResource("/org/richfaces/renderkit/html/css/msg.css"),getResource("/org/richfaces/renderkit/html/css/msgs.css")};
+
+ private InternetResource[] stylesAll = null;
+
+
+ protected InternetResource[] getStyles(){
+ synchronized (this){
+ if(stylesAll == null){
+
+ InternetResource[] rsrcs = super.getStyles();
+ boolean ignoreSuper = rsrcs == null || rsrcs.length == 0;
+ boolean ignoreThis = styles == null || styles.length == 0;
+
+ if(ignoreSuper){
+
+ if (ignoreThis) {
+ stylesAll = new InternetResource[0];
+ } else {
+ stylesAll = styles;
+ }
+
+ }else{
+
+ if(ignoreThis){
+ stylesAll = rsrcs;
+ }else{
+ Set rsrcsSet = new java.util.LinkedHashSet();
+ for(int i = 0; i < rsrcs.length; i++ ){
+ rsrcsSet.add(rsrcs[i]);
+ }
+
+ for(int i = 0; i < styles.length; i++ ){
+ rsrcsSet.add(styles[i]);
+ }
+ stylesAll = (InternetResource[]) rsrcsSet.toArray(new InternetResource[rsrcsSet.size()]);
+ }
+ }
+ }
+ }
+
+ return stylesAll;
+ }
+
protected Iterator getMessageIterator(FacesContext context, String forClientId, UIComponent component) throws IOException{
Iterator msgIter = null;
@@ -264,6 +324,49 @@
return retComp;
};
+ protected boolean isAcceptableMessage(FacesMessage message){
+
+ boolean accept = false;
+
+ if(acceptLevels.contains(ALL_NAME)){
+ return true;
+ }
+
+ Severity severity = message.getSeverity();
+
+ if(severity == FacesMessage.SEVERITY_ERROR
+ && acceptLevels.contains(ERROR_NAME)){
+ accept = true;
+
+ }else if(severity == FacesMessage.SEVERITY_FATAL
+ && acceptLevels.contains(FATAL_NAME)){
+ accept = true;
+
+ }else if(severity == FacesMessage.SEVERITY_INFO
+ && acceptLevels.contains(INFO_NAME)){
+ accept = true;
+
+ }else if(severity == FacesMessage.SEVERITY_WARN
+ && acceptLevels.contains(WARN_NAME)){
+ accept = true;
+ }
+
+ return accept;
+ }
+
+ protected List creatAcceptLevels(String [] levels){
+
+ List acceptLevels = new ArrayList();
+
+ for (int i = 0; i < levels.length; i++) {
+ acceptLevels.add(levels[i].toUpperCase());
+ }
+
+ return acceptLevels;
+ }
+
+
+
public abstract void renderMarkerHtml(UIComponent component, UIComponent markerFacet, FacesContext context, ResponseWriter writer,
String markerClass, String markerStyle) throws IOException;
Modified: branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java
===================================================================
--- branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java 2007-10-29 09:18:31 UTC (rev 3587)
+++ branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java 2007-10-29 09:34:07 UTC (rev 3588)
@@ -2,7 +2,6 @@
import java.io.IOException;
import java.util.Iterator;
-import java.util.Set;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
@@ -11,7 +10,6 @@
import javax.faces.context.ResponseWriter;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
-import org.ajax4jsf.resource.InternetResource;
import org.richfaces.component.UIRichMessage;
import org.richfaces.renderkit.RichMessageBaseRenderer;
@@ -22,51 +20,7 @@
*/
public class HtmlRichMessageRenderer extends RichMessageBaseRenderer{
- private final InternetResource[] styles = {getResource("/org/richfaces/renderkit/html/css/msg.css")};
- private InternetResource[] stylesAll = null;
-
-
- protected InternetResource[] getStyles(){
- synchronized (this){
- if(stylesAll == null){
-
- InternetResource[] rsrcs = super.getStyles();
- boolean ignoreSuper = rsrcs == null || rsrcs.length == 0;
- boolean ignoreThis = styles == null || styles.length == 0;
-
- if(ignoreSuper){
-
- if (ignoreThis) {
- stylesAll = new InternetResource[0];
- } else {
- stylesAll = styles;
- }
-
- }else{
- if(ignoreThis){
- stylesAll = rsrcs;
- }else{
- Set rsrcsSet = new java.util.LinkedHashSet();
-
- for(int i = 0; i < rsrcs.length; i++ ){
- rsrcsSet.add(rsrcs[i]);
- }
-
- for(int i = 0; i < styles.length; i++ ){
- rsrcsSet.add(styles[i]);
- }
-
- stylesAll = (InternetResource[]) rsrcsSet.toArray(new InternetResource[rsrcsSet.size()]);
- }
- }
- }
- }
-
- return stylesAll;
- }
-
-
protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
Iterator msgIter = null;
@@ -105,11 +59,12 @@
ResponseWriter writer = context.getResponseWriter();
- outerStyles(uiMsg, context, writer, facesMsg);
- renderMarkerFacet(uiMsg,context, writer,facesMsg);
- renderLabel(uiMsg, context, writer, facesMsg);
-
-
+ acceptLevels = creatAcceptLevels(uiMsg.getLevel().split(","));
+ if(isAcceptableMessage(facesMsg)){
+ outerStyles(uiMsg, context, writer, facesMsg);
+ renderMarkerFacet(uiMsg,context, writer,facesMsg);
+ renderLabel(uiMsg, context, writer, facesMsg);
+ }
}
public void renderOuterStyles(UIComponent component, FacesContext context, ResponseWriter writer,String outerStyle, String outerClass) throws IOException{
Modified: branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
===================================================================
--- branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-10-29 09:18:31 UTC (rev 3587)
+++ branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-10-29 09:34:07 UTC (rev 3588)
@@ -4,17 +4,18 @@
package org.richfaces.renderkit.html;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.Iterator;
-import java.util.Set;
+import java.util.List;
import javax.faces.application.FacesMessage;
+import javax.faces.application.FacesMessage.Severity;
import javax.faces.component.UIComponent;
import javax.faces.component.UIMessages;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
-import org.ajax4jsf.resource.InternetResource;
import org.richfaces.component.UIRichMessages;
import org.richfaces.renderkit.RichMessageBaseRenderer;
@@ -26,55 +27,6 @@
private boolean isWroteTable = false;
- private final InternetResource[] styles = {getResource("/org/richfaces/renderkit/html/css/msgs.css")};
-
- private InternetResource[] stylesAll = null;
-
-
- protected InternetResource[] getStyles(){
-
- synchronized (this){
-
- if(stylesAll == null){
-
- InternetResource[] rsrcs = super.getStyles();
- boolean ignoreSuper = rsrcs == null || rsrcs.length == 0;
- boolean ignoreThis = styles == null || styles.length == 0;
-
- if(ignoreSuper){
-
- if (ignoreThis) {
- stylesAll = new InternetResource[0];
- } else {
- stylesAll = styles;
- }
-
- }else{
-
- if(ignoreThis){
- stylesAll = rsrcs;
- }else{
-
- Set rsrcsSet = new java.util.LinkedHashSet();
- for(int i = 0; i < rsrcs.length; i++ ){
- rsrcsSet.add(rsrcs[i]);
- }
-
- for(int i = 0; i < styles.length; i++ ){
- rsrcsSet.add(styles[i]);
- }
-
- stylesAll = (InternetResource[]) rsrcsSet.toArray(new InternetResource[rsrcsSet.size()]);
- }
-
- }
-
- }
- }
-
- return stylesAll;
- }
-
protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
String forIds = null;
@@ -101,6 +53,11 @@
boolean isDisplayNone = (!messagesIter.hasNext() && !uiMessages.isPassed()) ? true : false;
+ if(!isDisplayNone){
+ String [] levels = uiMessages.getLevel().split(",");
+ acceptLevels = creatAcceptLevels(levels);
+ }
+
layout = (String)uiMessages.getAttributes().get("layout");
if((layout != null) && (layout.equals("table"))){
@@ -127,6 +84,7 @@
while(messagesIter.hasNext()){
FacesMessage facesMsg = (FacesMessage)(messagesIter.next());
+
renderBody(uiMessages, context, writer, facesMsg);
}
@@ -141,6 +99,8 @@
}
+
+
public void renderLabelHtml(UIComponent component, FacesContext context, ResponseWriter writer,
FacesMessage facesMsg, String labelClass, String labelStyle, String passLabel) throws IOException {
@@ -274,24 +234,26 @@
if(uiMessages.isPassed() || facesMsg != null ){
- if(isWroteTable){
- writer.startElement(HTML.TR_ELEMENT, uiMessages);
- writer.startElement(HTML.td_ELEM, uiMessages);
- }else{
- writer.startElement("dt", uiMessages);
- }
-
- outerStyles(uiMessages, context, writer, facesMsg);
- renderMarkerFacet(uiMessages, context, writer, facesMsg);
- renderLabel(uiMessages, context, writer, facesMsg);
-
- if(isWroteTable){
- writer.endElement(HTML.td_ELEM);
- writer.endElement(HTML.TR_ELEMENT);
- }else{
- writer.endElement("dt");
- }
+ if(isAcceptableMessage(facesMsg)){
+ if(isWroteTable){
+ writer.startElement(HTML.TR_ELEMENT, uiMessages);
+ writer.startElement(HTML.td_ELEM, uiMessages);
+ }else{
+ writer.startElement("dt", uiMessages);
+ }
+
+ outerStyles(uiMessages, context, writer, facesMsg);
+ renderMarkerFacet(uiMessages, context, writer, facesMsg);
+ renderLabel(uiMessages, context, writer, facesMsg);
+
+ if(isWroteTable){
+ writer.endElement(HTML.td_ELEM);
+ writer.endElement(HTML.TR_ELEMENT);
+ }else{
+ writer.endElement("dt");
+ }
+ }
}
}
16 years, 6 months