February 2008 - richfaces-svn-commits

JBoss Rich Faces SVN: r6127 - trunk/sandbox/samples/fileUploadDemo.

by richfaces-svn-commits＠lists.jboss.org

Author: andrei_exadel Date: 2008-02-18 04:38:41 -0500 (Mon, 18 Feb 2008) New Revision: 6127 Modified: trunk/sandbox/samples/fileUploadDemo/pom.xml Log: Modified: trunk/sandbox/samples/fileUploadDemo/pom.xml =================================================================== --- trunk/sandbox/samples/fileUploadDemo/pom.xml 2008-02-16 16:03:58 UTC (rev 6126) +++ trunk/sandbox/samples/fileUploadDemo/pom.xml 2008-02-18 09:38:41 UTC (rev 6127) @@ -22,7 +22,7 @@ <version>3.2.0-SNAPSHOT</version> </dependency> <dependency> - <groupId>org.richfaces.sandbox.ui</groupId> + <groupId>org.richfaces.ui</groupId> <artifactId>progressBar</artifactId> <version>3.2.0-SNAPSHOT</version> </dependency>

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6126 - in trunk/docs/userguide: en/src/main/docbook and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: vsukhov Date: 2008-02-16 11:03:58 -0500 (Sat, 16 Feb 2008) New Revision: 6126 Added: trunk/docs/userguide/en/src/main/docbook/included/pickList.desc.xml trunk/docs/userguide/en/src/main/docbook/included/pickList.xml trunk/docs/userguide/en/src/main/resources/images/pickList1.png Modified: trunk/docs/userguide/en/src/main/docbook/included/panel.xml trunk/docs/userguide/en/src/main/docbook/master.xml trunk/docs/userguide/pom.xml Log: http://jira.jboss.com/jira/browse/RF-2174 pickList component added to guide. Description done. Done Key Features, Creating the Component Dynamically Using Java, Details of Usage, JavaScript API sections. Modified: trunk/docs/userguide/en/src/main/docbook/included/panel.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/panel.xml 2008-02-16 15:38:36 UTC (rev 6125) +++ trunk/docs/userguide/en/src/main/docbook/included/panel.xml 2008-02-16 16:03:58 UTC (rev 6126) @@ -339,7 +339,7 @@ header redefined color and a text style in body is got.</para> <figure> <title><emphasis role="bold"> - <property><rich:panel></property> with redefined header and body text style</title> + <property><rich:panel></property></emphasis> with redefined header and body text style</title> <mediaobject> <imageobject> Added: trunk/docs/userguide/en/src/main/docbook/included/pickList.desc.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/pickList.desc.xml (rev 0) +++ trunk/docs/userguide/en/src/main/docbook/included/pickList.desc.xml 2008-02-16 16:03:58 UTC (rev 6126) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<section> + <sectioninfo> + <keywordset> + <keyword>pickList</keyword> + </keywordset> + </sectioninfo> + <section> + <title>Description</title> + <para>The <emphasis role="bold"> + <property><rich:pickList></property> + </emphasis> is a component for ordering items in a list. This component provides possibilities similar to <emphasis role="bold"><property><rich:orderingList></property></emphasis>, except sorting items on the client side. + <emphasis role="bold"> + <property><rich:pickList></property></emphasis> doesn't have this possibility. + </para> + <figure> + <title><emphasis role="bold"> + <property><rich:pickList></property> + </emphasis> component</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/pickList1.png"/> + </imageobject> + </mediaobject> + </figure> + + </section> +<section> + <title>Key Features</title> + <itemizedlist> + <listitem>Highly customizable look and feel</listitem> +  +  + <listitem>Multiple selection of list items</listitem> + <listitem>Keyboard support</listitem> +  + </itemizedlist> +</section> +</section> + \ No newline at end of file Added: trunk/docs/userguide/en/src/main/docbook/included/pickList.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/pickList.xml (rev 0) +++ trunk/docs/userguide/en/src/main/docbook/included/pickList.xml 2008-02-16 16:03:58 UTC (rev 6126) @@ -0,0 +1,438 @@ +<?xml version="1.0" encoding="UTF-8"?> +<section> + <sectioninfo> + <keywordset> + <keyword>rich:pickList</keyword> + <keyword>pickList</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.PickList</entry> + </row> + <row> + <entry>component-class</entry> + + <entry>org.richfaces.component.html.HtmlPickList</entry> + </row> + <row> + <entry>component-family</entry> + + <entry>org.richfaces.PickList</entry> + </row> + <row> + <entry>renderer-type</entry> + + <entry>org.richfaces.PickListRenderer</entry> + </row> + <row> + <entry>tag-class</entry> + + <entry>org.richfaces.taglib.PickListTagHandler</entry> + </row> + </tbody> + </tgroup> + </table> + <section> + <title>Creating the Component with a Page Tag</title> + <para>Here is a simple example as it could be used on a page: </para> + + <para> + <emphasis role="bold">Example:</emphasis> + </para> + <programlisting role="XML"><![CDATA[...<pickList:pickList + copyControlLabel = "#{pickBean.copyLabel}" + value="#{pickBean.listValues}"> + <f:selectItems value="#{pickBean.testList}"/> +</pickList:pickList> +...]]></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.HtmlPickList; +... +HtmlPickList myPickList = new HtmlPickList(); +...]]></programlisting> + </section> + <section> + <title>Details of Usage</title> + +  + + <para>The <emphasis role="bold"> + <property><rich:pickList></property> + </emphasis> component consists of <itemizedlist> + <listitem><property>Item list</property> element that displays a list of items. It + has three different representations for a single element: common, selected, + active. Combination of these states is possible.</listitem> + <listitem> + <property>Ordering controls set</property> + </listitem> + </itemizedlist> + </para> + +  + + <para>The <emphasis> + <property> "value"</property> + </emphasis> + attribute is used to access the values of a list. </para> + + <para> In the example + below after submitting the form you can see the <emphasis role="bold"> + <property><rich:pickList></property></emphasis> component with the main attributes + and the <emphasis role="bold"> + <property><h:panelGrid></property></emphasis> where you can set the values.</para> + <para> + <emphasis role="bold">Example:</emphasis> + </para> + <programlisting role="XML"><![CDATA[... +<h:form> + <h:panelGrid columns="2"> + <h:outputText value="set target list width: "></h:outputText> + <h:inputText value="#{pickBean.targetListWidth}"></h:inputText> + <h:outputText value="set source list width: "></h:outputText> + <h:inputText value="#{pickBean.sourceListWidth}"></h:inputText> + <h:outputText value="set list heights: "></h:outputText> + <h:inputText value="#{pickBean.listsHeight}"></h:inputText> + <h:outputText value="set 'CopyAll' control label: "></h:outputText> + <h:inputText value="#{pickBean.copyAllLabel}"></h:inputText> + <h:outputText value="set 'Copy' control label: "></h:outputText> + <h:inputText value="#{pickBean.copyLabel}"></h:inputText> + <h:outputText value="set 'Remove' control label: "></h:outputText> + <h:inputText value="#{pickBean.removeLabel}"></h:inputText> + <h:outputText value="set 'RemoveAll' control label: "></h:outputText> + <h:inputText value="#{pickBean.removeAllLabel}"></h:inputText> + </h:panelGrid> + <pickList:pickList valueChangeListener="#{pickBean.selectionChanged}" listsHeight="#{pickBean.listsHeight}" +sourceListWidth="#{pickBean.sourceListWidth}" targetListWidth="#{pickBean.targetListWidth}" copyAllControlLabel = "#{pickBean.copyAllLabel}" +copyControlLabel = "#{pickBean.copyLabel}" removeControlLabel = "#{pickBean.removeLabel}" +removeAllControlLabel ="#{pickBean.removeAllLabel}" value="#{pickBean.listValues}"> + <f:selectItem itemValue="cat" itemLabel="cat"/> + <f:selectItem itemValue="dog" itemLabel="dog"/> + <f:selectItems value="#{pickBean.testList}"/> + </pickList:pickList> + <h:commandButton value="Submit" action="none"/> +</h:form> +...]]></programlisting> + +  + <para> + The <emphasis role="bold"> + <property><rich:pickList></property></emphasis> + component provides changing "height" and "width" parameters of lists by using such attributes as: + <itemizedlist> + <listitem> + <emphasis> + <property> "listsHeight"</property></emphasis> that defines height of the list in "px". + + </listitem> + <listitem> + <emphasis> + <property> "targetListWidth"</property></emphasis> that defines width of a target list in "px". + + </listitem> + <listitem> + <emphasis> + <property> "sourceListWidth"</property></emphasis> that defines width of a source list in "px". + + </listitem> + </itemizedlist> + </para> +<para> + The <emphasis role="bold"> + <property><rich:pickList></property></emphasis> component has performance to change the "Button labels" with the help of such attributes as: + <itemizedlist> + <listitem> + <emphasis> + <property> "copyAllControlLabel"</property></emphasis> defines label for "Copy all" button. + + </listitem> + <listitem> + <emphasis> + <property> "copyControlLabel"</property></emphasis> defines label for "Copy" button. + + </listitem> + <listitem> + <emphasis> + <property> "removeControlLabel"</property></emphasis> defines label for "Remove" button. + + </listitem> + <listitem> + <emphasis> + <property> "removeAllControlLabel"</property></emphasis> defines label for "Remove all" button. + + </listitem> + </itemizedlist> +</para> + <para> + The + <emphasis> + <property> "value"</property></emphasis> attribute defines array of items to be shown in a list. + With the help of this attribute you can input the list of items. + </para> + + <table> + <title>Keyboard usage for elements selection</title> + <tgroup cols="2"> + <thead> + <row> + <entry>Keys and combinations </entry> + <entry>Description</entry> + </row> + </thead> + <tbody> +  + <row> + <entry>CTRL+click</entry> + <entry>Inverts selection for an item</entry> + </row> + <row> + <entry>SHIFT+click</entry> + <entry>Selects all rows from active one to a clicked row if they differ, + else select the active row. All other selections are cleared</entry> + </row> + <row> + <entry>D</entry> + <entry>Selects all elements inside the list if some active element is + already present in a list</entry> + </row> + <row> + <entry>Up, Down arrows</entry> + <entry>Changes the active and selected elements to the next or previous in a list</entry> + </row> + </tbody> + </tgroup> + </table> + </section> + + <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>Hide()</entry> + <entry>Hides ordering control</entry> + </row> + <row> + <entry>Show()</entry> + <entry>Shows ordering control</entry> + </row> + <row> + <entry>isShown()</entry> + <entry>Checks if current control is shown</entry> + </row> + <row> + <entry>Enable()</entry> + <entry>Enables ordering control</entry> + </row> + <row> + <entry>Disable()</entry> + <entry>Disables ordering control</entry> + </row> + <row> + <entry>isEnabled()</entry> + <entry>Checksif current control is enabled</entry> + </row> +  + <row> + <entry>getSelection()</entry> + <entry>Returns currently selected item</entry> + </row> + <row> + <entry>getItems()</entry> + <entry>Returns the collection of all items</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><rich:pickList></property> + </emphasis> components at once: <itemizedlist> + <listitem>Redefine the corresponding skin parameters</listitem> + <listitem> Add to your style sheets style classes used by a <emphasis role="bold"> + <property><rich:pickList></property> + </emphasis> component</listitem> + </itemizedlist> + </para> + </section> + + <section> + <title>Skin Parameters Redefinition</title> + + <table> + <title>Skin parameters redefinition for a wrapper <div> element of a list</title> + <tgroup cols="2"> + <thead> + <row> + <entry>Skin parameters</entry> + <entry>CSS properties</entry> + </row> + </thead> + <tbody> + + </tbody> + </tgroup> + </table> + + + + </section> + + <section> + <title>Definition of Custom Style Classes</title> + + <para>On the screenshot there are classes names that define styles for component elements.</para> + + + <figure> + <title>Classes names</title> + +  + + </figure> + +  + + </section> + + <section> + <title>Relevant Resources Links</title> + <para><ulink + url="http://livedemo.exadel.com/richfaces-demo/richfaces/pickList.jsf?c=pickList" + >Here</ulink> you can see an example of <emphasis role="bold"> + <property><rich:pickList></property> + </emphasis> usage and sources for the given example. </para> + </section> + +</section> Modified: trunk/docs/userguide/en/src/main/docbook/master.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/master.xml 2008-02-16 15:38:36 UTC (rev 6125) +++ trunk/docs/userguide/en/src/main/docbook/master.xml 2008-02-16 16:03:58 UTC (rev 6126) @@ -53,6 +53,7 @@ <!ENTITY componentControl_table SYSTEM "../../../target/generated/componentControl.xml"> <!ENTITY columns_table SYSTEM "../../../target/generated/columns.xml"> <!ENTITY comboBox_table SYSTEM "../../../target/generated/comboBox.xml"> +<!ENTITY pickList_table SYSTEM "../../../target/generated/pickList.xml"> <!ENTITY coreComponents_table SYSTEM "../../../target/generated/a4j.xml"> @@ -111,6 +112,7 @@ &panel_table; &panelBar_table; &panelMenu_table; +&pickList_table; &scrollableDataTable_table; &separator_table; &simpleTogglePanel_table; Added: trunk/docs/userguide/en/src/main/resources/images/pickList1.png =================================================================== (Binary files differ) Property changes on: trunk/docs/userguide/en/src/main/resources/images/pickList1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/docs/userguide/pom.xml =================================================================== --- trunk/docs/userguide/pom.xml 2008-02-16 15:38:36 UTC (rev 6125) +++ trunk/docs/userguide/pom.xml 2008-02-16 16:03:58 UTC (rev 6126) @@ -86,12 +86,24 @@ ${project.version} </version> </artifactItem> - + <artifactItem> <groupId> org.richfaces.ui </groupId> <artifactId> + pickList + </artifactId> + <version> + ${project.version} + </version> + </artifactItem> + + <artifactItem> + <groupId> + org.richfaces.ui + </groupId> + <artifactId> componentControl </artifactId> <version> @@ -674,7 +686,7 @@ <imagePathSettingRequired> true </imagePathSettingRequired> - </format> + </format > <format> <formatName>html</formatName> <stylesheetResource>

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6125 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2008-02-16 10:38:36 -0500 (Sat, 16 Feb 2008) New Revision: 6125 Modified: trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml trunk/docs/userguide/en/src/main/docbook/included/orderingList.xml Log: http://jira.jboss.com/jira/browse/RF-2261- guide updated according to dev issue Modified: trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2008-02-16 15:36:37 UTC (rev 6124) +++ trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2008-02-16 15:38:36 UTC (rev 6125) @@ -215,6 +215,19 @@ Currently the button controls type is based on <div> element. </para> </note> + <para> + The <emphasis role="bold"><property><rich:listShuttle></property></emphasis> component allows to use internationalization method + to redefine and localize the labels. You could use application resource bundle and define + <property>RICH_SHUTTLES_TOP_LABEL </property>, + <property>RICH_SHUTTLES_BOTTOM_LABEL</property>, + <property>RICH_SHUTTLES_UP_LABEL </property>, + <property>RICH_SHUTTLES_DOWN_LABEL </property> + + <property>RICH_LIST_SHUTTLE_COPY_ALL_LABEL</property>, + <property>RICH_LIST_SHUTTLE_COPY_LABEL</property>, + <property>RICH_LIST_SHUTTLE_REMOVE_ALL_LABEL</property>, + <property>RICH_LIST_SHUTTLE_REMOVE_LABEL </property> there. + </para>   <!--para>The component provides possibility to be customized using templating. The customization could be performed by a layout definition nested into the component. 5

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6124 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2008-02-16 10:36:37 -0500 (Sat, 16 Feb 2008) New Revision: 6124 Modified: trunk/docs/userguide/en/src/main/docbook/included/calendar.xml Log: http://jira.jboss.com/jira/browse/RF-2057 -resource bundle url edited Modified: trunk/docs/userguide/en/src/main/docbook/included/calendar.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/calendar.xml 2008-02-16 00:13:50 UTC (rev 6123) +++ trunk/docs/userguide/en/src/main/docbook/included/calendar.xml 2008-02-16 15:36:37 UTC (rev 6124) @@ -408,8 +408,9 @@ <property>RICH_CALENDAR_CLEAN_LABEL</property>, <property>RICH_CALENDAR_CANCEL_LABEL </property> there. </para> - <para>You could also pack <property>org.richfaces.renderkit.calendar</property> <ulink url="http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..." - >resource</ulink> bundle with your JARs defining the same properties.</para> + <para>You could also pack <property>org.richfaces.renderkit.calendar</property> <ulink url="http://labs.jboss.com/file-access/default/members/jbossrichfaces/freezone..." + >resource</ulink> bundle with your JARs defining the same properties. + </para> </section> <section>

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6123 - in trunk/sandbox/ui/fileUpload/src/main: templates/org/richfaces and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-02-15 19:13:50 -0500 (Fri, 15 Feb 2008) New Revision: 6123 Modified: trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx Log: Latest changes for file upload Modified: trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-15 21:14:09 UTC (rev 6122) +++ trunk/sandbox/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-02-16 00:13:50 UTC (rev 6123) @@ -25,6 +25,18 @@ new T('Stop') ]); +FileUploadEntry.cancelControlTemplate = + new E('a', + { + 'style':'text-decoration: none; color:black', + 'onclick': function (context) { return 'var entry = FileUploadEntry.getComponent(this); entry.uploadObject.clear(entry); return false;';}, + 'className':'upload_anc', + 'href':'#' + }, + [ + new T('Cancel') + ]); + FileUploadEntry.template = [ new E('table', @@ -50,7 +62,7 @@ [ new E('div',{'className':'upload_font upload_del'}, [ - FileUploadEntry.clearControlTemplate + //FileUploadEntry.clearControlTemplate ]) ]), new E('td',{'className':'upload_table_td'}, @@ -64,7 +76,7 @@ FileUploadEntry.INITIALIZED = "initialized"; - +FileUploadEntry.READY = "ready"; FileUploadEntry.UPLOAD_IN_PROGRESS = "progress"; FileUploadEntry.UPLOAD_CANCELED = "canceled"; @@ -74,6 +86,7 @@ FileUploadEntry.LABELS = {}; FileUploadEntry.LABELS[FileUploadEntry.INITIALIZED] = ''; +FileUploadEntry.LABELS[FileUploadEntry.READY] = ''; FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_IN_PROGRESS] = 'uploading'; FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_CANCELED] = 'canceled'; FileUploadEntry.LABELS[FileUploadEntry.UPLOAD_SUCCESS] = 'done'; @@ -93,17 +106,17 @@ Object.extend(FileUploadEntry.prototype, { - element: null, + fileInput: null, uploadObject: null, state: FileUploadEntry.INITIALIZED, - initialize: function(element, uploadObject) { - this.element = element; + initialize: function(fileInput, uploadObject) { + this.fileInput = fileInput; this.uploadObject = uploadObject; - var content = FileUploadEntry.template.invoke('getContent', {fileName: $F(this.element)}).join(''); + var content = FileUploadEntry.template.invoke('getContent', {fileName: $F(this.fileInput)}).join(''); Element.insert(this.uploadObject.items, content); @@ -122,9 +135,20 @@ this.uploadObject.stopScript(this.uid); }, + _clearInput: function() { + //remove input type="file" element + Richfaces.removeNode(this.fileInput); + this.fileInput = null; + }, + + _clearEntry: function() { + Richfaces.removeNode(this.entryElement); + this.entryElement = null; + }, + clear: function() { - this.element.parentNode.removeChild(this.element); - this.entryElement.parentNode.removeChild(this.entryElement); + this._clearInput(); + this._clearEntry(); }, setState: function(newState) { @@ -138,10 +162,16 @@ if (newState == FileUploadEntry.UPLOAD_IN_PROGRESS) { Element.insert(this.controlArea, FileUploadEntry.stopControlTemplate.getContent()); + } else if (newState == FileUploadEntry.READY) { + Element.insert(this.controlArea, FileUploadEntry.cancelControlTemplate.getContent()); } else { Element.insert(this.controlArea, FileUploadEntry.clearControlTemplate.getContent()); } + if (newState == FileUploadEntry.UPLOAD_SUCCESS) { + this._clearInput(); + } + this.uploadObject.notifyStateChange(this, oldState); } @@ -259,8 +289,15 @@ }, add: function(elt) { - this.entries.push(new FileUploadEntry(elt, this)); + var newEntry = new FileUploadEntry(elt, this); + this.entries.push(newEntry); + if (this.runUpload) { + newEntry.setState(FileUploadEntry.READY); + } else { + newEntry.setState(FileUploadEntry.INITIALIZED); + } + var newUpload = elt.cloneNode(true); newUpload.id = this.id + ":file" + (this.idCounter++); $(this.id + ":add1").appendChild(newUpload); @@ -271,6 +308,7 @@ }, remove: function(entry) { + entry.clear(); this.entries = this.entries.without(entry); }, @@ -311,15 +349,15 @@ clear: function(entry) { if (entry) { this.remove(entry); - entry.clear(); } else { //this.entries.length should be evaluated every time! - for (var i = 0; i < this.entries.length; i++) { + var i = 0; + while (i < this.entries.length) { var entry = this.entries[i]; if (entry.state != FileUploadEntry.UPLOAD_IN_PROGRESS) { this.remove(entry); - i--; - entry.clear(); + } else { + i++; } } } @@ -335,6 +373,28 @@ this.progressBar.disable(); }, + _updateEntriesState: function() { + var l = this.entries.length; + + var oldState; + var newState; + + if (this.runUpload) { + oldState = FileUploadEntry.INITIALIZED; + newState = FileUploadEntry.READY; + } else { + oldState = FileUploadEntry.READY; + newState = FileUploadEntry.INITIALIZED; + } + + for (var i = 0; i < l; i++) { + var entry = this.entries[i]; + if (entry.state == oldState) { + entry.setState(newState); + } + } + }, + notifyStateChange: function(entry, oldState) { var newState = entry.state; @@ -359,6 +419,8 @@ this.setupAutoUpload(); } + this._updateEntriesState(); + } else if (newState == FileUploadEntry.UPLOAD_CANCELED || newState == FileUploadEntry.UPLOAD_TRANSFER_ERROR || newState == FileUploadEntry.UPLOAD_SERVER_ERROR) { @@ -368,12 +430,15 @@ this.runUpload = false; + this._updateEntriesState(); + } else if (newState == FileUploadEntry.UPLOAD_IN_PROGRESS) { this.activeEntry = entry; this.progressBar.setValue(0); this.progressBar.enable(); - + + this._updateEntriesState(); } }, @@ -401,14 +466,22 @@ try { var inputs = parentForm.elements; - var entryInput = entry.element; + var entryInput = entry.fileInput; var l = inputs.length; for (var i = 0; i < l; i++) { var input = inputs[i]; - if ('hidden' != input.type && input != entryInput) { - input._name = input.name; - input.name = undefined; + if (input != entryInput) { + if ('hidden' != input.type) { + input._name = input.name; + input.name = undefined; + + //TODO for test + if ('file' == input.type) { + input._disabled = input.disabled; + input.disabled = true; + } + } } } @@ -423,10 +496,13 @@ for (var i = 0; i < l; i++) { var input = inputs[i]; - if ('hidden' != input.type && input != entryInput) { - if (input._name) { - input.name = input._name; - input._name = undefined; + if ('hidden' != input.type) { + input.name = input._name; + input._name = undefined; + + if ('file' == input.type) { + input.disabled = input._disabled; + input._disabled = undefined; } } } Modified: trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx =================================================================== --- trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-02-15 21:14:09 UTC (rev 6122) +++ trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2008-02-16 00:13:50 UTC (rev 6123) @@ -76,7 +76,7 @@ id="#{clientId}:upload3" onclick="return $('#{clientId}').component.stop();"> <a href="#" class="upload_button_selection"> - <div class="upload_button_content upload_font upload_ico upload_ico_start" + <div class="upload_button_content upload_font upload_ico upload_ico_stop" id="#{clientId}:upload4"> <b>Stop</b> </div>

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6122 - trunk/framework/impl/src/main/java/org/richfaces/renderkit.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2008-02-15 16:14:09 -0500 (Fri, 15 Feb 2008) New Revision: 6122 Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java Log: main method added to TemplateEncoderRendererBase Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java 2008-02-15 19:19:41 UTC (rev 6121) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/TemplateEncoderRendererBase.java 2008-02-15 21:14:09 UTC (rev 6122) @@ -3,8 +3,11 @@ */ package org.richfaces.renderkit; +import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PrintWriter; import java.io.StringReader; import java.io.StringWriter; import java.io.Writer; @@ -56,7 +59,7 @@ return true; } - private void writeScriptBody(ResponseWriter writer, String string) throws IOException { + void writeScriptBody(Writer writer, String string) throws IOException { Properties tidyProperties = new Properties(); InputStream propertiesStream = null; try { @@ -166,4 +169,21 @@ protected ContentHandler createContentHandler(Writer writer) { return new MacroDefinitionJSContentHandler(writer, "Richfaces.evalMacro(\"", "\", context)"); } + + public static void main(String[] args) throws Exception { + StringBuffer buffer = new StringBuffer(); + BufferedReader reader = new BufferedReader(new InputStreamReader(System.in)); + String s; + while ((s = reader.readLine()) != null) { + buffer.append(s); + } + + new TemplateEncoderRendererBase(){ + + protected Class<? extends UIComponent> getComponentClass() { + return null; + } + + }.writeScriptBody(new PrintWriter(System.out), buffer.toString()); + } }

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6121 - in trunk/ui/dataTable/src/main: java/org/richfaces/component and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2008-02-15 14:19:41 -0500 (Fri, 15 Feb 2008) New Revision: 6121 Modified: trunk/ui/dataTable/src/main/config/component/column.xml trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java Log: RF-1741 Modified: trunk/ui/dataTable/src/main/config/component/column.xml =================================================================== --- trunk/ui/dataTable/src/main/config/component/column.xml 2008-02-15 15:44:45 UTC (rev 6120) +++ trunk/ui/dataTable/src/main/config/component/column.xml 2008-02-15 19:19:41 UTC (rev 6121) @@ -94,6 +94,7 @@ <name>selfSorted</name> <classname>boolean</classname> <description></description> + <defaultvalue>true</defaultvalue> </property> <property elonly="true"> Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java 2008-02-15 15:44:45 UTC (rev 6120) +++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIColumn.java 2008-02-15 19:19:41 UTC (rev 6121) @@ -21,8 +21,16 @@ package org.richfaces.component; +import javax.el.MethodExpression; +import javax.el.ValueExpression; +import org.richfaces.model.ExtendedFilterField; +import org.richfaces.model.FilterField; +import org.richfaces.model.Ordering; +import org.richfaces.model.SortField2; + + /** * JSF component class * @@ -36,4 +44,42 @@ public abstract String getSortMode(); public abstract void setSortMode(String mode); + + public FilterField getFilterField(){ + FilterField filterField = null; + MethodExpression filterMethod = getFilterMethod(); + ValueExpression filterExpression = getValueExpression("filterExpression"); + ValueExpression filterBy = getValueExpression("filterBy"); + String filterValue = getFilterValue(); + if (filterMethod != null) { + filterField = new FilterField(filterMethod); + } else if (filterExpression != null) { + filterField = new FilterField(filterExpression); + } else if (filterBy != null) { + filterField = new ExtendedFilterField(filterBy, filterValue); + } + return filterField; + } + + public SortField2 getSortField(){ + SortField2 sortField2 = null; + if (!Ordering.UNSORTED.equals(getSortOrder())) { + ValueExpression comparator = getValueExpression("comparator"); + ValueExpression sortExpression = getValueExpression("sortExpression"); + if (comparator != null) { + sortField2 = new SortField2(comparator, getSortOrder()); + } else if (sortExpression != null) { + sortField2 = new SortField2(sortExpression, getSortOrder()); + } + } + return sortField2; + } + + public void toggleSortOrder(){ + if(Ordering.ASCENDING.equals(getSortOrder())) { + setSortOrder(Ordering.DESCENDING); + } else { + setSortOrder(Ordering.ASCENDING); + } + } } Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java 2008-02-15 15:44:45 UTC (rev 6120) +++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java 2008-02-15 19:19:41 UTC (rev 6121) @@ -22,8 +22,10 @@ package org.richfaces.component; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; +import java.util.Map; import javax.el.ELContext; import javax.el.ExpressionFactory; @@ -170,38 +172,45 @@ @Override protected ExtendedDataModel createDataModel() { List<FilterField> filterFields = new LinkedList<FilterField>(); - List<SortField2> sortFields = new LinkedList<SortField2>(); + Map<String, SortField2> sortFieldsMap = new LinkedHashMap<String, SortField2>(); List<UIComponent> list = getChildren(); for (Iterator<UIComponent> iterator = list.iterator(); iterator.hasNext();) { UIComponent component = iterator.next(); if (component instanceof org.richfaces.component.UIColumn) { - Column column = (Column) component; - MethodExpression filterMethod = column.getFilterMethod(); - ValueExpression filterExpression = component.getValueExpression("filterExpression"); - ValueExpression filterBy = component.getValueExpression("filterBy"); - String filterValue = column.getFilterValue(); - if (filterMethod != null) { - filterFields.add(new FilterField(filterMethod)); - } else if (filterExpression != null) { - filterFields.add(new FilterField(filterExpression)); - } else if (filterBy != null) { - filterFields.add(new ExtendedFilterField(filterBy, filterValue)); + org.richfaces.component.UIColumn column = (org.richfaces.component.UIColumn) component; + FilterField filterField = column.getFilterField(); + if (filterField != null) { + filterFields.add(filterField); } - if (!Ordering.UNSORTED.equals(column.getSortOrder())) { - ValueExpression comparator = component.getValueExpression("comparator"); - ValueExpression sortExpression = component.getValueExpression("sortExpression"); - if (comparator != null) { - sortFields.add(new SortField2(comparator, column.getSortOrder())); - } else if (sortExpression != null) { - sortFields.add(new SortField2(sortExpression, column.getSortOrder())); - } + SortField2 sortField = column.getSortField(); + if (sortField != null) { + sortFieldsMap.put(component.getId(), sortField); } } } + List<SortField2> sortFields = new LinkedList<SortField2>(); + List sortPriority = getSortPriority(); + if (sortPriority != null) { + for (Object object : sortPriority) { + if (object instanceof String) { + String id = (String) object; + SortField2 sortField = sortFieldsMap.get(id); + if (sortField != null) { + sortFields.add(sortField); + sortFieldsMap.remove(id); + } + } + } + } + sortFields.addAll(sortFieldsMap.values()); setFilterFields(filterFields); setSortFields(sortFields); ExtendedDataModel dataModel = super.createDataModel(); return new ModifiableModel(dataModel, getVar(), getFilterFields(), getSortFields()); } + + public abstract List getSortPriority(); + public abstract void setSortPriority(List sortPriority); + } \ No newline at end of file Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-15 15:44:45 UTC (rev 6120) +++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2008-02-15 19:19:41 UTC (rev 6121) @@ -22,6 +22,7 @@ package org.richfaces.renderkit; import java.io.IOException; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -485,20 +486,26 @@ protected void doDecode(FacesContext context, UIComponent component) { Map<String, String> map = context.getExternalContext().getRequestParameterMap(); if (SORT_FILTER_PARAMETER.equals(map.get(component.getClientId(context)))) { - String id = map.get(SORT_FILTER_PARAMETER); + String clientId = map.get(SORT_FILTER_PARAMETER); List<UIComponent> list = component.getChildren(); for (Iterator<UIComponent> iterator = list.iterator(); iterator .hasNext();) { UIComponent children = iterator.next(); - if (children instanceof Column) { - Column column = (Column) children; + if (children instanceof org.richfaces.component.UIColumn) { + org.richfaces.component.UIColumn column = (org.richfaces.component.UIColumn) children; children.setId(children.getId()); - if(children.getClientId(context).equals(id)) { - if(Ordering.ASCENDING.equals(column.getSortOrder())) { - column.setSortOrder(Ordering.DESCENDING); - } else { - column.setSortOrder(Ordering.ASCENDING); + if(children.getClientId(context).equals(clientId)) { + String id = children.getId(); + UIDataTable table = (UIDataTable)component; + List sortPriority = table.getSortPriority(); + if(sortPriority == null){ + sortPriority = new ArrayList(); + table.setSortPriority(sortPriority); } + if(!sortPriority.contains(id)) { + sortPriority.add(id); + } + column.toggleSortOrder(); } String filterValue = map.get(children.getClientId(context) + SORT_FILTER_PARAMETER); if (filterValue != null) {

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6120 - in management/design: SKINS and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: admitriev Date: 2008-02-15 10:44:45 -0500 (Fri, 15 Feb 2008) New Revision: 6120 Added: management/design/SKINS/ management/design/SKINS/DEFAULT.skin.properties management/design/SKINS/NULL.skin.properties management/design/SKINS/blueSky.skin.properties management/design/SKINS/classic.skin.properties management/design/SKINS/deepMarine.skin.properties management/design/SKINS/emeraldTown.skin.properties management/design/SKINS/japanCherry.skin.properties management/design/SKINS/plain.skin.properties management/design/SKINS/ruby.skin.properties management/design/SKINS/wine.skin.properties Modified: management/design/inplaceInput/design/inplaceInput.html management/design/inplaceSelect/design/inplaceSelect.html Log: Added: management/design/SKINS/DEFAULT.skin.properties =================================================================== --- management/design/SKINS/DEFAULT.skin.properties (rev 0) +++ management/design/SKINS/DEFAULT.skin.properties 2008-02-15 15:44:45 UTC (rev 6120) @@ -0,0 +1,71 @@ +#Colors +headerBackgroundColor=#D4CFC7 +headerGradientColor=#EDEAE6 +headerTextColor=#000000 +headerWeightFont=bold + +generalBackgroundColor=#FFFFFF +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#F1EEE9 + +shadowBackgroundColor=#000000 +shadowOpacity=1 + +panelBorderColor=#C4C0B9 +subBorderColor=#ffffff + +tabBackgroundColor=#E3DED5 +tabDisabledTextColor=#B1ADA7 + +trimColor=#DFDCD5 + +tipBackgroundColor=\#FAE6B0 +tipBorderColor=\#E5973E + +selectControlColor=#E79A00 + + +generalLinkColor=#0078D0 +hoverLinkColor=#0090FF +visitedLinkColor=#0090FF + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + +tableBackgroundColor=#FFFFFF +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#C4C0C9 +tableBorderWidth=1px + + +#Calendar colors +calendarWeekBackgroundColor=#F1EEE9 + +calendarHolidaysBackgroundColor=#FFEBDA +calendarHolidaysTextColor=#FF7800 + +calendarCurrentBackgroundColor=#FF7800 +calendarCurrentTextColor=#FFEBDA + +calendarSpecBackgroundColor=#F1EEE9 +calendarSpecTextColor=#000000 + + +warningColor=#FFE6E6 +warningBackgroundColor=#FF0000 + +editorBackgroundColor=#F1F1F1 +editBackgroundColor=#FBFF8E \ No newline at end of file Added: management/design/SKINS/NULL.skin.properties =================================================================== --- management/design/SKINS/NULL.skin.properties (rev 0) +++ management/design/SKINS/NULL.skin.properties 2008-02-15 15:44:45 UTC (rev 6120) @@ -0,0 +1,72 @@ +loadStyleSheets=false +#Colors +headerBackgroundColor=#D4CFC7 +headerGradientColor=#EDEAE6 +headerTextColor=#000000 +headerWeightFont=bold + +generalBackgroundColor=#FFFFFF +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#F1EEE9 + +shadowBackgroundColor=#000000 +shadowOpacity=1 + +panelBorderColor=#C4C0B9 +subBorderColor=#ffffff + +tabBackgroundColor=#E3DED5 +tabDisabledTextColor=#B1ADA7 + +trimColor=#DFDCD5 + +tipBackgroundColor=\#FAE6B0 +tipBorderColor=\#E5973E + +selectControlColor=#E79A00 + + +generalLinkColor=#0078D0 +hoverLinkColor=#0090FF +visitedLinkColor=#0090FF + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + +tableBackgroundColor=#FFFFFF +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#C4C0C9 +tableBorderWidth=1px + + +#Calendar colors +calendarWeekBackgroundColor=#F1EEE9 + +calendarHolidaysBackgroundColor=#FFEBDA +calendarHolidaysTextColor=#FF7800 + +calendarCurrentBackgroundColor=#FF7800 +calendarCurrentTextColor=#FFEBDA + +calendarSpecBackgroundColor=#F1EEE9 +calendarSpecTextColor=#000000 + + +warningColor=#FFE6E6 +warningBackgroundColor=#FF0000 + +editorBackgroundColor=#F1F1F1 +editBackgroundColor=#FBFF8E \ No newline at end of file Added: management/design/SKINS/blueSky.skin.properties =================================================================== --- management/design/SKINS/blueSky.skin.properties (rev 0) +++ management/design/SKINS/blueSky.skin.properties 2008-02-15 15:44:45 UTC (rev 6120) @@ -0,0 +1,72 @@ +#Colors +headerBackgroundColor=#BED6F8 +headerGradientColor=#F2F7FF +headerTextColor=#000000 +headerWeightFont=bold + +generalBackgroundColor=#FFFFFF +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#ECF4FE + +shadowBackgroundColor=#000000 +shadowOpacity=1 + +panelBorderColor=#BED6F8 +subBorderColor=#ffffff + +tabBackgroundColor=#C6DEFF +tabDisabledTextColor=#8DB7F3 + +trimColor=#D6E6FB + +tipBackgroundColor=#FAE6B0 +tipBorderColor=#E5973E + +selectControlColor=#E79A00 + + +generalLinkColor=#0078D0 +hoverLinkColor=#0090FF +visitedLinkColor=#0090FF + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + + +tableBackgroundColor=#FFFFFF +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#C0C0C0 +tableBorderWidth=1px + + +#Calendar colors +calendarWeekBackgroundColor=#F5F5F5 + +calendarHolidaysBackgroundColor=#FFEBDA +calendarHolidaysTextColor=#FF7800 + +calendarCurrentBackgroundColor=#FF7800 +calendarCurrentTextColor=#FFEBDA + +calendarSpecBackgroundColor=#E4F5E2 +calendarSpecTextColor=#000000 + + +warningColor=#FFE6E6 +warningBackgroundColor=#FF0000 + +editorBackgroundColor=#F1F1F1 +editBackgroundColor=#FBFF8E \ No newline at end of file Added: management/design/SKINS/classic.skin.properties =================================================================== --- management/design/SKINS/classic.skin.properties (rev 0) +++ management/design/SKINS/classic.skin.properties 2008-02-15 15:44:45 UTC (rev 6120) @@ -0,0 +1,71 @@ +#Colors +headerBackgroundColor=#4A75B5 +headerGradientColor=#93C4E5 +headerTextColor=#FFFFFF +headerWeightFont=bold + +generalBackgroundColor=#F3F2F2 +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#EAF0F8 + +shadowBackgroundColor=#000000 +shadowOpacity=1 + +panelBorderColor=#C0C0C0 +subBorderColor=#ffffff + +tabBackgroundColor=#9FBDEB +tabDisabledTextColor=#6A92CF + +trimColor=#C6D6EA + +tipBackgroundColor=#FAE6B0 +tipBorderColor=#E5973E + +selectControlColor=#E79A00 + + +generalLinkColor=#0078D0 +hoverLinkColor=#0090FF +visitedLinkColor=#0090FF + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + +tableBackgroundColor=#FFFFFF +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#C0C0C0 +tableBorderWidth=1px + + +#Calendar colors +calendarWeekBackgroundColor=#F5F5F5 + +calendarHolidaysBackgroundColor=#FFEBDA +calendarHolidaysTextColor=#FF7800 + +calendarCurrentBackgroundColor=#FF7800 +calendarCurrentTextColor=#FFEBDA + +calendarSpecBackgroundColor=#E4F5E2 +calendarSpecTextColor=#000000 + + +warningColor=#FFE6E6 +warningBackgroundColor=#FF0000 + +editorBackgroundColor=#F1F1F1 +editBackgroundColor=#FBFF8E \ No newline at end of file Added: management/design/SKINS/deepMarine.skin.properties =================================================================== --- management/design/SKINS/deepMarine.skin.properties (rev 0) +++ management/design/SKINS/deepMarine.skin.properties 2008-02-15 15:44:45 UTC (rev 6120) @@ -0,0 +1,70 @@ +#Colors +headerBackgroundColor=#008894 +headerGradientColor=#79C9D0 +headerTextColor=#FFFFFF +headerWeightFont=bold + +generalBackgroundColor=#FFFFFF +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#C2EAEE + +shadowBackgroundColor=#000000 +shadowOpacity=1 + +panelBorderColor=#11808A +subBorderColor=#D8E5E6 + +tabBackgroundColor=#529CA3 +tabDisabledTextColor=#11808A + +trimColor=#C9EDF0 + +tipBackgroundColor=#FAE6B0 +tipBorderColor=#E5973E + +selectControlColor=#E79A00 + + +generalLinkColor=#228C96 +hoverLinkColor=#00717C +visitedLinkColor=#228C96 + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + +tableBackgroundColor=#FFFFFF +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#C0C0C0 +tableBorderWidth=1px + +#Calendar colors +calendarWeekBackgroundColor=#F5F5F5 + +calendarHolidaysBackgroundColor=#FFEBDA +calendarHolidaysTextColor=#FF7800 + +calendarCurrentBackgroundColor=#FF7800 +calendarCurrentTextColor=#FFEBDA + +calendarSpecBackgroundColor=#DFF8F8 +calendarSpecTextColor=#000000 + + +warningColor=#FFE6E6 +warningBackgroundColor=#FF0000 + +editorBackgroundColor=#F1F1F1 +editBackgroundColor=#FBFF8E Added: management/design/SKINS/emeraldTown.skin.properties =================================================================== --- management/design/SKINS/emeraldTown.skin.properties (rev 0) +++ management/design/SKINS/emeraldTown.skin.properties 2008-02-15 15:44:45 UTC (rev 6120) @@ -0,0 +1,70 @@ +#Colors +headerBackgroundColor=#005000 +headerGradientColor=#70BA70 +headerTextColor=#FFFFFF +headerWeightFont=bold + +generalBackgroundColor=#f1f1f1 +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#E2F6E2 + +shadowBackgroundColor=#000000 +shadowOpacity=1 + +panelBorderColor=#C0C0C0 +subBorderColor=#ffffff + +tabBackgroundColor=#ADCDAD +tabDisabledTextColor=#67AA67 + +trimColor=#BBECBB + +tipBackgroundColor=#FAE6B0 +tipBorderColor=#E5973E + +selectControlColor=#FF9409 + + +generalLinkColor=#43BD43 +hoverLinkColor=#FF9409 +visitedLinkColor=#43BD43 + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + +tableBackgroundColor=#FFFFFF +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#C0C0C0 +tableBorderWidth=1px + +#Calendar colors +calendarWeekBackgroundColor=#f5f5f5 + +calendarHolidaysBackgroundColor=#FFEBDA +calendarHolidaysTextColor=#FF7800 + +calendarCurrentBackgroundColor=#FF7800 +calendarCurrentTextColor=#FFEBDA + +calendarSpecBackgroundColor=#E2F6E2 +calendarSpecTextColor=#000000 + + +warningColor=#FFE6E6 +warningBackgroundColor=#FF0000 + +editorBackgroundColor=#F1F1F1 +editBackgroundColor=#FBFF8E Added: management/design/SKINS/japanCherry.skin.properties =================================================================== --- management/design/SKINS/japanCherry.skin.properties (rev 0) +++ management/design/SKINS/japanCherry.skin.properties 2008-02-15 15:44:45 UTC (rev 6120) @@ -0,0 +1,71 @@ +#Colors +headerBackgroundColor=#E8BDBD +headerGradientColor=#FBD9D9 +headerTextColor=#980808 +headerWeightFont=bold + +generalBackgroundColor=#F8ECEC +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#E9F0F0 + +shadowBackgroundColor=#980808 +shadowOpacity=1 + +panelBorderColor=#DFA5A5 +subBorderColor=#FFF3F3 + +tabBackgroundColor=#F3C1C1 +tabDisabledTextColor=#DF8989 + +trimColor=#F7D5D5 + +tipBackgroundColor=#FAE6B0 +tipBorderColor=#E5973E + +selectControlColor=#E79A00 + + +generalLinkColor=#CF0000 +hoverLinkColor=#FF0000 +visitedLinkColor=#CF0000 + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + +tableBackgroundColor=#FFFFFF +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#DFA5A5 +tableBorderWidth=1px + + +#Calendar colors +calendarWeekBackgroundColor=#f5f5f5 + +calendarHolidaysBackgroundColor=#FFEBEB +calendarHolidaysTextColor=#980808 + +calendarCurrentBackgroundColor=#980808 +calendarCurrentTextColor=#ffffff + +calendarSpecBackgroundColor=#f1f1f1 +calendarSpecTextColor=#000000 + + +warningColor=#FFE6E6 +warningBackgroundColor=#FF0000 + +editorBackgroundColor=#F1F1F1 +editBackgroundColor=#FBFF8E Added: management/design/SKINS/plain.skin.properties =================================================================== --- management/design/SKINS/plain.skin.properties (rev 0) +++ management/design/SKINS/plain.skin.properties 2008-02-15 15:44:45 UTC (rev 6120) @@ -0,0 +1,70 @@ +#Colors +headerBackgroundColor=#{null} +headerGradientColor=#{null} +headerTextColor=#{null} +headerWeightFont=#{null} + +generalBackgroundColor=#{null} +generalTextColor=#{null} +generalSizeFont=#{null} +generalFamilyFont=#{null} + +controlTextColor=#{null} +controlBackgroundColor=#{null} +additionalBackgroundColor=#{null} + +shadowBackgroundColor=#{null} +shadowOpacity=#{null} + +panelBorderColor=#{null} +subBorderColor=#{null} + +tabBackgroundColor=#{null} +tabDisabledTextColor=#{null} + +trimColor=#{null} + +tipBackgroundColor=#{null} +tipBorderColor=#{null} + +selectControlColor=#{null} + + +generalLinkColor=#{null} +hoverLinkColor=#{null} +visitedLinkColor=#{null} + +# Fonts +headerSizeFont=#{null} +headerFamilyFont=#{null} + +tabSizeFont=#{null} +tabFamilyFont=#{null} + +buttonSizeFont=#{null} +buttonFamilyFont=#{null} + +tableBackgroundColor=#{null} +tableFooterBackgroundColor=#{null} +tableSubfooterBackgroundColor=#{null} +tableBorderColor=#{null} +tableBorderWidth=0px + +#Calendar colors +calendarWeekBackgroundColor=#{null} + +calendarHolidaysBackgroundColor=#{null} +calendarHolidaysTextColor=#{null} + +calendarCurrentBackgroundColor=#{null} +calendarCurrentTextColor=#{null} + +calendarSpecBackgroundColor=#{null} +calendarSpecTextColor=#{null} + + +warningColor=#FFE6E6 +warningBackgroundColor=#FF0000 + +editorBackgroundColor=#F1F1F1 +editBackgroundColor=#FBFF8E \ No newline at end of file Added: management/design/SKINS/ruby.skin.properties =================================================================== --- management/design/SKINS/ruby.skin.properties (rev 0) +++ management/design/SKINS/ruby.skin.properties 2008-02-15 15:44:45 UTC (rev 6120) @@ -0,0 +1,71 @@ +#Colors +headerBackgroundColor=#900000 +headerGradientColor=#DF5858 +headerTextColor=#FFFFFF +headerWeightFont=bold + +generalBackgroundColor=#f1f1f1 +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#F9E4E4 + +shadowBackgroundColor=#000000 +shadowOpacity=1 + +panelBorderColor=#C0C0C0 +subBorderColor=#ffffff + +tabBackgroundColor=#EDAEAE +tabDisabledTextColor=#C47979 + +trimColor=#F7C4C4 + +tipBackgroundColor=#FAE6B0 +tipBorderColor=#E5973E + +selectControlColor=#FF9409 + + +generalLinkColor=#CF0000 +hoverLinkColor=#FF0000 +visitedLinkColor=#CF0000 + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + +tableBackgroundColor=#FFFFFF +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#C0C0C0 +tableBorderWidth=1px + + +#Calendar colors +calendarWeekBackgroundColor=#f5f5f5 + +calendarHolidaysBackgroundColor=#FFF1F1 +calendarHolidaysTextColor=#980808 + +calendarCurrentBackgroundColor=#808080 +calendarCurrentTextColor=#ffffff + +calendarSpecBackgroundColor=#f1f1f1 +calendarSpecTextColor=#000000 + + +warningColor=#FFE6E6 +warningBackgroundColor=#FF0000 + +editorBackgroundColor=#F1F1F1 +editBackgroundColor=#FBFF8E Added: management/design/SKINS/wine.skin.properties =================================================================== --- management/design/SKINS/wine.skin.properties (rev 0) +++ management/design/SKINS/wine.skin.properties 2008-02-15 15:44:45 UTC (rev 6120) @@ -0,0 +1,72 @@ +#Colors +headerBackgroundColor=#5D7343 +headerGradientColor=#9AB37D +headerTextColor=#FFFFFF +headerWeightFont=bold + +generalBackgroundColor=#EDEADD +generalTextColor=#000000 +generalSizeFont=11px +generalFamilyFont=Arial, Verdana, sans-serif + +controlTextColor=#000000 +controlBackgroundColor=#ffffff +additionalBackgroundColor=#EEE9D1 + +shadowBackgroundColor=#000000 +shadowOpacity=1 + +panelBorderColor=#B6AD84 +subBorderColor=#EDEADD + +tabBackgroundColor=#9AB37D +tabDisabledTextColor=#A49449 + +trimColor=#E1D2AF + +tipBackgroundColor=#FAE6B0 +tipBorderColor=#E5973E + +selectControlColor=#E79A00 + + +generalLinkColor=#C29632 +hoverLinkColor=#F0A700 +visitedLinkColor=#C29632 + +# Fonts +headerSizeFont=11px +headerFamilyFont=Arial, Verdana, sans-serif + +tabSizeFont=11 +tabFamilyFont=Arial, Verdana, sans-serif + +buttonSizeFont=11 +buttonFamilyFont=Arial, Verdana, sans-serif + + +tableBackgroundColor=#FFFFFF +tableFooterBackgroundColor=#cccccc +tableSubfooterBackgroundColor=#f1f1f1 +tableBorderColor=#B6AD84 +tableBorderWidth=1px + +#Calendar colors +calendarWeekBackgroundColor=#f5f5f5 + +calendarHolidaysBackgroundColor=#FFF4D8 +calendarHolidaysTextColor=#B38919 + +calendarCurrentBackgroundColor=#B38919 +calendarCurrentTextColor=#ffffff + +calendarSpecBackgroundColor=#F0FCE2 +calendarSpecTextColor=#000000 + + +warningColor=#FFE6E6 +warningBackgroundColor=#FF0000 + +editorBackgroundColor=#F1F1F1 +editBackgroundColor=#FBFF8E + Modified: management/design/inplaceInput/design/inplaceInput.html =================================================================== --- management/design/inplaceInput/design/inplaceInput.html 2008-02-15 15:36:12 UTC (rev 6119) +++ management/design/inplaceInput/design/inplaceInput.html 2008-02-15 15:44:45 UTC (rev 6120) @@ -11,20 +11,20 @@ -.is_default_state{white-space : nowrap; background-color : #f1f1f1; border-bottom : 1px dashed #000000; padding-left : 3px; padding-right : 3px;} +.is_default_state{white-space : nowrap; background-color : #f1f1f1/*editorBackgroundColor*/; border-bottom : 1px dashed #000000/*generalTextColor*/; padding-left : 3px; padding-right : 3px;} .is_changed_state{background-image:url(images/mark_changed.gif); background-position : top left; background-repeat : no-repeat;} .is_edit_state{position : relative; width : 100px;} -.is_field{background : #FFF281; padding : 0px 0px 0px 0px; border : 0px; margin : 0px; width : 100px; position : absolute; top:0px; left : 0px;} +.is_field{background : #FBFF8E/*editBackgroundColor*/; padding : 0px 0px 0px 0px; border : 0px; margin : 0px; width : 100px; position : absolute; top:0px; left : 0px;} .is_strut{width : 100px; height : 1px} .is_btn{ - background : url(images/bg_btn.png) #FFFFFF; - border : 1px outset #BED6F8; + background : url(images/bg_btn.png) top repeat-x #C7D7EC; /*gradient - from generalBackgroundColor to tabBackgroundColor, background-color - tabBackgroundColor*/ + border : 1px outset #BED6F8; /*panelBorderColor*/ padding : 0px; margin : 0px;} .is_btn_press{ - background : url(images/bg_press.png) #FFFFFF; - border : 1px inset #BED6F8; + background : url(images/bg_press.png) top repeat-x #C7D7EC; /*gradient - from tabBackgroundColor to generalBackgroundColor, background-color - tabBackgroundColor*/ + border : 1px inset #BED6F8; /*panelBorderColor*/ padding : 0px; margin : 0px;} .is_btn_set{ position : absolute; top:0px; left : 100px; white-space : nowrap} @@ -63,9 +63,7 @@ <div style="width : 300px;"> Fresh off his victory in the Florida primary, Sen. John McCain is poised to take another big prize. Former <span class="is_edit_state"> - <img src="images/spacer.gif" class="is_strut"> - <input type="Text" value="New York" class="is_field"> - <div class="is_btn_set_br_in"> + <img src="images/spacer.gif" class="is_strut"><input type="Text" value="New York" class="is_field"><div class="is_btn_set_br_in"> <div class="is_shadow"> <table cellpadding="0" cellspacing="0" border="0" class="is_shadow_size"> <tr> Modified: management/design/inplaceSelect/design/inplaceSelect.html =================================================================== --- management/design/inplaceSelect/design/inplaceSelect.html 2008-02-15 15:36:12 UTC (rev 6119) +++ management/design/inplaceSelect/design/inplaceSelect.html 2008-02-15 15:44:45 UTC (rev 6120) @@ -10,20 +10,20 @@ legend{font-weight : bold} -.insel_default_state{white-space : nowrap; background-color : #f1f1f1; border-bottom : 1px dashed #000000; padding-left : 3px; padding-right : 3px;} +.insel_default_state{white-space : nowrap; background-color : #f1f1f1/*editorBackgroundColor*/; border-bottom : 1px dashed #000000/*generalTextColor*/; padding-left : 3px; padding-right : 3px;} .insel_changed_state{background-image:url(images/mark_changed.gif); background-position : top left; background-repeat : no-repeat;} .insel_edit_state{position : relative; width : 100px;} -.insel_field{background : #FFF281; padding : 0px 0px 0px 0px; border : 0px; margin : 0px; width : 112px; position : absolute; top:0px; left : 0px;background-image:url(images/mark_list.gif); background-position : center right; background-repeat : no-repeat;} +.insel_field{background : #FBFF8E/*editBackgroundColor*/; padding : 0px 0px 0px 0px; border : 0px; margin : 0px; width : 112px; position : absolute; top:0px; left : 0px;background-image:url(images/mark_list.gif); background-position : center right; background-repeat : no-repeat;} .insel_strut{width : 100px; height : 1px} .insel_btn{ - background : url(images/bg_btn.png) #FFFFFF; - border : 1px outset #BED6F8; + background : url(images/bg_btn.png) top repeat-x #C7D7EC; /*gradient - from generalBackgroundColor to tabBackgroundColor, background-color - tabBackgroundColor*/ + border : 1px outset #BED6F8; /*panelBorderColor*/ padding : 0px; margin : 0px;} .insel_btn_press{ - background : url(images/bg_press.png) #FFFFFF; - border : 1px inset #BED6F8; + background : url(images/bg_press.png) top repeat-x #C7D7EC; /*gradient - from tabBackgroundColor to generalBackgroundColor, background-color - tabBackgroundColor*/ + border : 1px inset #BED6F8; /*panelBorderColor*/ padding : 0px; margin : 0px;} .insel_btn_set{ position : absolute; top:0px; left : 112px; white-space : nowrap}

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6119 - trunk/docs/userguide/en/src/main/docbook/included.

by richfaces-svn-commits＠lists.jboss.org

Author: msorokin Date: 2008-02-15 10:36:12 -0500 (Fri, 15 Feb 2008) New Revision: 6119 Added: trunk/docs/userguide/en/src/main/docbook/included/progressBar.desc.xml Log: Description for the progressBar component added. http://jira.jboss.com/jira/browse/RF-1690 Added: trunk/docs/userguide/en/src/main/docbook/included/progressBar.desc.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/progressBar.desc.xml (rev 0) +++ trunk/docs/userguide/en/src/main/docbook/included/progressBar.desc.xml 2008-02-15 15:36:12 UTC (rev 6119) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<section> + <sectioninfo> + <keywordset> + <keyword></keyword> + </keywordset> + </sectioninfo> + <section> + <title>Description</title> + <para>The <emphasis role="bold"> + <property><rich:progressBar></property> + </emphasis> component is designed for displaying a progress bar which shows the current status of the process. The component has an option to display some numeric data, like percentage (above, in or below the progress bar) along side with graphical presentation. </para> + +  + </section> + <section> + <title>Key Features</title> + <itemizedlist> + <listitem>Customization of informational part of the component</listitem> + <listitem>Status polling frequency adjustment</listitem> + <listitem>Ajax or Client modes</listitem> + </itemizedlist> + </section> +</section> \ No newline at end of file

18 years, 2 months

1
0
0 / 0

JBoss Rich Faces SVN: r6118 - in trunk/ui/message/src/main/java/org/richfaces/renderkit: html and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2008-02-15 10:34:56 -0500 (Fri, 15 Feb 2008) New Revision: 6118 Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java Log: RF-2265, fix summary detail tooltip behavior according to the standart message behavior Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java =================================================================== --- trunk/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java 2008-02-15 14:46:20 UTC (rev 6117) +++ trunk/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java 2008-02-15 15:34:56 UTC (rev 6118) @@ -18,6 +18,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.richfaces.component.UIRichMessages; import org.richfaces.renderkit.html.HtmlRichMessageRenderer; /** @@ -260,6 +261,17 @@ } + protected boolean isAcceptableMessagesPresent(Iterator messagesIter) { + while(messagesIter.hasNext()){ + FacesMessage message = (FacesMessage)(messagesIter.next()); + boolean exist = isAcceptableMessage(message); + if (exist) { + return true; + } + } + return false; + } + protected boolean isAcceptableMessage(FacesMessage message){ boolean accept = false; Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java =================================================================== --- trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java 2008-02-15 14:46:20 UTC (rev 6117) +++ trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java 2008-02-15 15:34:56 UTC (rev 6118) @@ -150,34 +150,30 @@ getUtils().writeAttribute(writer, HTML.class_ATTRIBUTE,classes); getUtils().writeAttribute(writer, HTML.style_ATTRIBUTE, labelStyle); + title = (String) component.getAttributes().get("title"); + if(title != null) { + writer.writeAttribute("title", title, "title"); + } + if(facesMsg != null){ - if(isTooltip){ - title = (String) uiMsg.getAttributes().get("title"); - if(title != null){ - getUtils().writeAttribute(writer, HTML.title_ATTRIBUTE, title); - }else{ - getUtils().writeAttribute(writer, HTML.title_ATTRIBUTE, summary); + boolean wroteTooltip = false; + if (showSummary && showDetail && isTooltip) { + if (title == null || title.length() == 0) { + writer.writeAttribute("title", summary, "title"); } + wroteTooltip = true; + } + + if (!wroteTooltip && showSummary) { + writer.writeText(summary, component, null); } - - if(showSummary && !isTooltip){ - writer.writeText(summary, null); - writer.writeText("\t", null); - } - if(showDetail){ - writer.writeText(detail, null); - writer.writeText("\t", null); - } - - - }else { - - if(passLabel != null){ + if (showDetail) { + writer.writeText(detail, component, null); + } + } else if(passLabel != null){ writer.writeText(passLabel, null); writer.writeText("\t", null); - } - } writer.endElement(HTML.SPAN_ELEM); Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java =================================================================== --- trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2008-02-15 14:46:20 UTC (rev 6117) +++ trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2008-02-15 15:34:56 UTC (rev 6118) @@ -25,36 +25,27 @@ private boolean isWroteTable = false; protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { + UIRichMessages uiMessages = (UIRichMessages)component; + String layout = null; String forIds = null; - Iterator messagesIter = null; - - UIRichMessages uiMessages = (UIRichMessages)component; - if(uiMessages.isGlobalOnly()){ forIds = ""; } - - messagesIter = getMessageIterator(context, forIds, component); - - renderComponentUI(writer, context, component, messagesIter); - } - - public void renderComponentUI(ResponseWriter writer, FacesContext context, UIComponent component, Iterator messagesIter) throws IOException{ - - String layout = null; - - UIRichMessages uiMessages = (UIRichMessages)component; - - boolean isDisplayNone = !messagesIter.hasNext(); - + Iterator messagesIter = getMessageIterator(context, forIds, component); + boolean isDisplayNone = !messagesIter.hasNext(); + if(!isDisplayNone){ String [] levels = uiMessages.getLevel().split(","); acceptLevels = creatAcceptLevels(levels); - } - + + if (!isAcceptableMessagesPresent(messagesIter)) { + isDisplayNone = true; + } + } + layout = (String)uiMessages.getAttributes().get("layout"); if((layout != null) && (layout.equals("table"))){ @@ -74,7 +65,9 @@ renderComponentOuterStyles(uiMessages, context, writer, isDisplayNone); } - + + messagesIter = getMessageIterator(context, forIds, component); + if(!messagesIter.hasNext()){ renderBody(uiMessages, context, writer, null); }else{ @@ -93,11 +86,8 @@ }else{ writer.endElement("dl"); } - } - - public void renderLabelHtml(UIComponent component, FacesContext context, ResponseWriter writer, FacesMessage facesMsg, String labelClass, String labelStyle, String passLabel) throws IOException { @@ -129,37 +119,31 @@ writer.startElement(HTML.SPAN_ELEM, uiMessages); getUtils().writeAttribute(writer, HTML.class_ATTRIBUTE,labelClass); getUtils().writeAttribute(writer, HTML.style_ATTRIBUTE, labelStyle); - + + title = (String) component.getAttributes().get("title"); + if(title != null) { + writer.writeAttribute("title", title, "title"); + } + if(facesMsg != null){ - - if(isTooltip){ - - title = (String) uiMessages.getAttributes().get("title"); - if(title != null){ - getUtils().writeAttribute(writer, HTML.title_ATTRIBUTE, title); - }else{ - getUtils().writeAttribute(writer, HTML.title_ATTRIBUTE, summary); + boolean wroteTooltip = false; + if (showSummary && showDetail && isTooltip) { + if (title == null || title.length() == 0) { + writer.writeAttribute("title", summary, "title"); } - + wroteTooltip = true; + } + + if (!wroteTooltip && showSummary) { + writer.writeText(summary, component, null); } - - if(showDetail){ - writer.writeText(detail, null); - writer.writeText("\t", null); - } - - if(showSummary){ - writer.writeText(summary, null); - writer.writeText("\t", null); - } - }else { - - if(passLabel != null){ + if (showDetail) { + writer.writeText(detail, component, null); + } + } else if(passLabel != null){ writer.writeText(passLabel, null); writer.writeText("\t", null); - } - } writer.endElement(HTML.SPAN_ELEM);

18 years, 2 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits February 2008