June 2007 - richfaces-svn-commits

JBoss Rich Faces SVN: r1208 - trunk/sandbox/panelmenu/src/main/resources/org/richfaces/renderkit/html/css.

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

Author: sergeyhalipov Date: 2007-06-18 08:45:26 -0400 (Mon, 18 Jun 2007) New Revision: 1208 Modified: trunk/sandbox/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss Log: Fix some colors in panel-menu css. Modified: trunk/sandbox/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss =================================================================== --- trunk/sandbox/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss 2007-06-18 11:35:38 UTC (rev 1207) +++ trunk/sandbox/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss 2007-06-18 12:45:26 UTC (rev 1208) @@ -21,9 +21,6 @@ } .dr-pmenu-item { - height: 20px; - background-repeat: repeat-x; - background-position: left top; border-top: 1px solid; cursor: pointer; padding: 2px 1px 1px; @@ -45,7 +42,7 @@ <u:selector name=".dr-pmenu-top-group"> <u:style name="font-weight" skin="headerWeightFont"/> - <u:style name="font-family" skin="headerFamilyFont"/> + <u:style name="font-family" skin="generalFamilyFont"/> <u:style name="font-size" skin="headerSizeFont"/> <u:style name="color" skin="headerTextColor"/> <u:style name="background-color" skin="headerBackgroundColor"/> @@ -67,19 +64,19 @@ <u:style name="font-weight" skin="generalWeightFont"/> <u:style name="font-size" skin="generalSizeFont"/> <u:style name="color" skin="generalTextColor"/> - <u:style name="border-top-color" skin="tableBorderColor"/> + <u:style name="border-top-color" skin="panelBorderColor"/> </u:selector> <u:selector name=".dr-pmenu-group-div" > - <u:style name="border-color" skin="tableBorderColor"/> + <u:style name="border-color" skin="panelBorderColor"/> </u:selector> <u:selector name=".dr-pmenu-disabled-element" > - <u:style name="color" skin="tabDisabledTextColor"/> + <u:style name="color" skin="panelBorderColor"/> </u:selector> <u:selector name=".dr-pmenu-hovered-element" > - <u:style name="background-color" skin="tabDisabledTextColor"/> + <u:style name="background-color" skin="additionalBackgroundColor"/> </u:selector> <f:verbatim>

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1207 - trunk/docs/userguide/en/src/main/docbook/modules.

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

Author: vkorluzhenko Date: 2007-06-18 07:35:38 -0400 (Mon, 18 Jun 2007) New Revision: 1207 Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml Log: fixed spelling errors Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2007-06-18 11:09:45 UTC (rev 1206) +++ trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2007-06-18 11:35:38 UTC (rev 1207) @@ -22,7 +22,7 @@ <para>RichFaces is based on the Ajax4jsf framework, so <property>AJAX</property> request support is performed with this - framework. This support is explained in the Overview section of the Ajax4jsf Developers Guide found under the + framework. This support is explained in the Architecture Overview section of the Ajax4jsf Developers Guide found under the <property><ulink url="http://labs.jboss.com/portal/jbossajax4jsf">Ajax4jsf</ulink></property> project. In this section, we will focus on skinnability.</para>

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1206 - trunk/docs/userguide/en/src/main/docbook/modules.

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

Author: vkorluzhenko Date: 2007-06-18 07:09:45 -0400 (Mon, 18 Jun 2007) New Revision: 1206 Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml Log: fixed spelling errors Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2007-06-18 09:08:35 UTC (rev 1205) +++ trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2007-06-18 11:09:45 UTC (rev 1206) @@ -22,8 +22,7 @@ <para>RichFaces is based on the Ajax4jsf framework, so <property>AJAX</property> request support is performed with this - framework. This support is explained in the Architecture - Overview section of the Ajax4jsf Developers Guide found under the + framework. This support is explained in the Overview section of the Ajax4jsf Developers Guide found under the <property><ulink url="http://labs.jboss.com/portal/jbossajax4jsf">Ajax4jsf</ulink></property> project. In this section, we will focus on skinnability.</para>

17 years, 6 months

1
0
0 / 0

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

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

Author: vkorluzhenko Date: 2007-06-18 05:08:35 -0400 (Mon, 18 Jun 2007) New Revision: 1205 Modified: trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml trunk/docs/userguide/en/src/main/docbook/included/dragIndicator.xml trunk/docs/userguide/en/src/main/docbook/included/dragSupport.xml trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml trunk/docs/userguide/en/src/main/docbook/included/gmap.xml trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml trunk/docs/userguide/en/src/main/docbook/included/paint2D.xml trunk/docs/userguide/en/src/main/docbook/included/panel.xml trunk/docs/userguide/en/src/main/docbook/included/panelBar.xml trunk/docs/userguide/en/src/main/docbook/included/separator.xml trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml trunk/docs/userguide/en/src/main/docbook/included/spacer.xml trunk/docs/userguide/en/src/main/docbook/included/suggestionBox.xml trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml trunk/docs/userguide/en/src/main/docbook/included/tree.xml Log: changed style Modified: trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -104,7 +104,7 @@ (<emphasis role="italic"><property>"onChange"</property></emphasis> is its alias). When the attribute definition = true, submission on this event is defined.</para> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataFilterSlider.jsf?...">Here</ulink> you can see the example of <rich:dataFilterSlider> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataFilterSlider.jsf?...">Here</ulink> you can see the example of <emphasis role="bold"><rich:dataFilterSlider></emphasis> usage and sources for the given example. </para> </section> </section> \ No newline at end of file Modified: trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -88,7 +88,7 @@ contains only required strings and they are updated in the tree, even when update is specified for the whole table.</para> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataTable.jsf?c=dataT...">Here</ulink> you can see the example of <rich:dataTable> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataTable.jsf?c=dataT...">Here</ulink> you can see the example of <emphasis role="bold"><rich:dataTable></emphasis> usage and sources for the given example. </para> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -107,7 +107,7 @@ <para>For the <property>"fastforward"</property>/<property>"rewind"</property> controls customization the additional <emphasis role="italic"><property>"fastStep"</property></emphasis> attribute is used. The attribute indicates pages quantity to switch onto when fast scrolling is used. </para> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataTableScroller.jsf...">Here</ulink> you can see the example of <rich:dataScroller> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataTableScroller.jsf...">Here</ulink> you can see the example of <emphasis role="bold"><rich:dataScroller></emphasis> usage and sources for the given example. </para> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/dragIndicator.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dragIndicator.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/dragIndicator.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -134,7 +134,7 @@ <emphasis role="italic"><property>"typeMapping"</property></emphasis> attribute defined with the <emphasis role="bold"><property><rich:dndParam></property></emphasis>component.</para> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dragSupport.jsf?c=dra...">Here</ulink> you can see the example of <rich:dragIndicator> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dragSupport.jsf?c=dra...">Here</ulink> you can see the example of <emphasis role="bold"><rich:dragIndicator></emphasis> usage and sources for the given example. </para> </section> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/dragSupport.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dragSupport.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/dragSupport.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -181,7 +181,7 @@ <para>Developers can use their own custom JavaScript functions to handle these events.</para> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dragSupport.jsf?c=dra...">Here</ulink> you can see the example of <rich:dragSupport> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dragSupport.jsf?c=dra...">Here</ulink> you can see the example of <emphasis role="bold"><rich:dragSupport></emphasis> usage and sources for the given example. </para> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -239,7 +239,7 @@ </mediaobject> </figure> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf?c=dr...">Here</ulink> you can see the example of <rich:dropDownMenu> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf?c=dr...">Here</ulink> you can see the example of <emphasis role="bold"><rich:dropDownMenu></emphasis> usage and sources for the given example. </para> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/dropSupport.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -219,7 +219,7 @@ <para>Developers can use their own custom JavaScript functions to handle these events.</para> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dragSupport.jsf?c=dro...">Here</ulink> you can see the example of <rich:dropSupport> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dragSupport.jsf?c=dro...">Here</ulink> you can see the example of <emphasis role="bold"><rich:dropSupport></emphasis> usage and sources for the given example. </para> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/gmap.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/gmap.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/gmap.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -144,7 +144,7 @@ </listitem> </itemizedlist> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/gmap.jsf?c=gmap">Here</ulink> you can see the example of <rich:gmap> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/gmap.jsf?c=gmap">Here</ulink> you can see the example of <emphasis role="bold"><rich:gmap></emphasis> usage and sources for the given example. </para> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/inputNumberSlider.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -126,7 +126,7 @@ </listitem> </itemizedlist> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/inputNumberSlider.jsf...">Here</ulink> you can see the example of <rich:inputNumberSlider> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/inputNumberSlider.jsf...">Here</ulink> you can see the example of <emphasis role="bold"><rich:inputNumberSlider></emphasis> usage and sources for the given example. </para> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/inputNumberSpinner.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -117,7 +117,7 @@ </listitem> </itemizedlist> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/inputNumberSpinner.js...">Here</ulink> you can see the example of <rich:inputNumberSpinner> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/inputNumberSpinner.js...">Here</ulink> you can see the example of <emphasis role="bold"><rich:inputNumberSpinner></emphasis> usage and sources for the given example. </para> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -218,7 +218,7 @@ <programlisting role="JAVA">onshow="alert(event.parameters.param1)"</programlisting> <para> Here, during modalPanel opening the value of a passing parameter is output. </para> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/modalPanel.jsf?c=moda...">Here</ulink> you can see the example of <rich:modalPanel> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/modalPanel.jsf?c=moda...">Here</ulink> you can see the example of <emphasis role="bold"><rich:modalPanel></emphasis> usage and sources for the given example. </para> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/paint2D.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/paint2D.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/paint2D.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -122,7 +122,7 @@ ... ]]></programlisting> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/paint2D.jsf?c=paint2d">Here</ulink> you can see the example of <rich:paint2D> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/paint2D.jsf?c=paint2d">Here</ulink> you can see the example of <emphasis role="bold"><rich:paint2D></emphasis> usage and sources for the given example. </para> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/panel.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/panel.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/panel.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -141,7 +141,7 @@ </listitem> </itemizedlist> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/panel.jsf?c=panel">Here</ulink> you can see the example of <rich:panel> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/panel.jsf?c=panel">Here</ulink> you can see the example of <emphasis role="bold"><rich:panel></emphasis> usage and sources for the given example. </para> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/panelBar.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/panelBar.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/panelBar.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -78,7 +78,7 @@ <para>Style attributes are described further.</para> <para><property>panelBar</property> could contain any number of child <property>panelBarItem</property> components inside, which content is uploaded onto the client and headers are controls to open the corresponding child element.</para> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/panelBar.jsf?c=panelBar">Here</ulink> you can see the example of <rich:panelBar> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/panelBar.jsf?c=panelBar">Here</ulink> you can see the example of <emphasis role="bold"><rich:panelBar></emphasis> usage and sources for the given example. </para> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/separator.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/separator.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/separator.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -96,7 +96,7 @@ </listitem> </itemizedlist> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/separator.jsf?c=separ...">Here</ulink> you can see the example of <rich:separator> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/separator.jsf?c=separ...">Here</ulink> you can see the example of <emphasis role="bold"><rich:separator></emphasis> usage and sources for the given example. </para> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -111,7 +111,7 @@ </mediaobject> </figure> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/simpleTogglePanel.jsf...">Here</ulink> you can see the example of <rich:simpleTogglePanel> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/simpleTogglePanel.jsf...">Here</ulink> you can see the example of <emphasis role="bold"><rich:simpleTogglePanel></emphasis> usage and sources for the given example. </para> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/spacer.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/spacer.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/spacer.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -80,7 +80,7 @@ </listitem> </itemizedlist> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/spacer.jsf?c=spacer">Here</ulink> you can see the example of <rich:spacer> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/spacer.jsf?c=spacer">Here</ulink> you can see the example of <emphasis role="bold"><rich:spacer></emphasis> usage and sources for the given example. </para> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/suggestionBox.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/suggestionBox.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/suggestionBox.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -154,7 +154,7 @@ quantity and frequency, <property>suggestionBox</property> has one more its own attribute limiting requests (the <emphasis role="italic"><property>"minChars"</property></emphasis> attribute). The attribute defines characters quantity inputted into a field after which AJAX requests are called to perform suggestion.</para> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/suggestionBox.jsf?c=s...">Here</ulink> you can see the example of <rich:suggestionBox> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/suggestionBox.jsf?c=s...">Here</ulink> you can see the example of <emphasis role="bold"><rich:suggestionBox></emphasis> usage and sources for the given example. </para> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -138,7 +138,7 @@ </listitem> </itemizedlist> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/tabPanel.jsf?c=tabPanel">Here</ulink> you can see the example of <rich:tabPanel> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/tabPanel.jsf?c=tabPanel">Here</ulink> you can see the example of <emphasis role="bold"><rich:tabPanel></emphasis> usage and sources for the given example. </para> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -122,7 +122,7 @@ ]]></programlisting> <para>The example shows a <property>togglePanel</property> initial state when the second facet (panelB) is rendered and successive switching from the first to the second happens.</para> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/togglePanel.jsf?c=tog...">Here</ulink> you can see the example of <rich:togglePanel> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/togglePanel.jsf?c=tog...">Here</ulink> you can see the example of <emphasis role="bold"><rich:togglePanel></emphasis> usage and sources for the given example. </para> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -99,7 +99,7 @@ <emphasis role="italic"><property>"width"</property></emphasis> and <emphasis role="italic"><property>"height"</property></emphasis> attributes are placed above all.</para> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/toolBar.jsf?c=toolBar">Here</ulink> you can see the example of <rich:toolBar> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/toolBar.jsf?c=toolBar">Here</ulink> you can see the example of <emphasis role="bold"><rich:toolBar></emphasis> usage and sources for the given example. </para> </section> <section> Modified: trunk/docs/userguide/en/src/main/docbook/included/tree.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/tree.xml 2007-06-15 23:25:05 UTC (rev 1204) +++ trunk/docs/userguide/en/src/main/docbook/included/tree.xml 2007-06-18 09:08:35 UTC (rev 1205) @@ -134,7 +134,7 @@ ... ]]></programlisting></para> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/tree.jsf?c=tree">Here</ulink> you can see the example of <rich:tree> usage and sources for the given example. + <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/tree.jsf?c=tree">Here</ulink> you can see the example of <emphasis role="bold"><rich:tree></emphasis> usage and sources for the given example. </para> </section> <section>

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1204 - in trunk/docs/userguide/en/src/main/docbook: modules and 1 other directory.

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

Author: ccowens Date: 2007-06-15 19:25:05 -0400 (Fri, 15 Jun 2007) New Revision: 1204 Modified: trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml trunk/docs/userguide/en/src/main/docbook/included/panel.xml trunk/docs/userguide/en/src/main/docbook/included/suggestionBox.xml trunk/docs/userguide/en/src/main/docbook/modules/AUGWADParams.xml trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml Log: (1) Fixed broken image and outdated links in XML already fixed in generated HTML, and (2) fixed misspellings found except NOT YET in component catalog chapter Modified: trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2007-06-15 18:04:49 UTC (rev 1203) +++ trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2007-06-15 23:25:05 UTC (rev 1204) @@ -241,7 +241,7 @@ <title>Datascroller style classes</title> <mediaobject> <imageobject> - <imagedata fileref="img/datascroller3.gif"/> + <imagedata fileref="images/datascroller3.gif"/> </imageobject> </mediaobject> </figure> Modified: trunk/docs/userguide/en/src/main/docbook/included/panel.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/panel.xml 2007-06-15 18:04:49 UTC (rev 1203) +++ trunk/docs/userguide/en/src/main/docbook/included/panel.xml 2007-06-15 23:25:05 UTC (rev 1204) @@ -84,7 +84,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/panel.GIF"/> + <imagedata fileref="images/panel.gif"/> </imageobject> </mediaobject> </figure> @@ -108,7 +108,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/panel2.GIF"/> + <imagedata fileref="images/panel2.gif"/> </imageobject> </mediaobject> </figure> @@ -250,7 +250,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/panel3.GIF"/> + <imagedata fileref="images/panel3.gif"/> </imageobject> </mediaobject> </figure> @@ -302,7 +302,7 @@ <mediaobject> <imageobject> - <imagedata fileref="images/panel4.GIF"/> + <imagedata fileref="images/panel4.gif"/> </imageobject> </mediaobject> </figure> Modified: trunk/docs/userguide/en/src/main/docbook/included/suggestionBox.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/suggestionBox.xml 2007-06-15 18:04:49 UTC (rev 1203) +++ trunk/docs/userguide/en/src/main/docbook/included/suggestionBox.xml 2007-06-15 23:25:05 UTC (rev 1204) @@ -149,7 +149,7 @@ role="italic"><property>"layout"</property></emphasis> and <emphasis role="italic"><property>"style"</property></emphasis> attributes corresponding to dataTable ones for a table appearing in popup (for additional information, read JSF Reference) and custom - attribute managing AJAX requests sending (for additional information, see <ulink url="https://ajax4jsf.dev.java.net">ajax4jsf.dev.java.net</ulink>).</para> + attribute managing AJAX requests sending (for additional information, see <ulink url="http://www.jboss.org/projects/jbossajax4jsf">Ajax4JSF Project</ulink>).</para> <para>In addition to these attributes common for AJAX action components and limiting requests quantity and frequency, <property>suggestionBox</property> has one more its own attribute limiting requests (the <emphasis role="italic"><property>"minChars"</property></emphasis> attribute). The attribute defines characters quantity inputted into a field after which AJAX requests are called to perform suggestion.</para> Modified: trunk/docs/userguide/en/src/main/docbook/modules/AUGWADParams.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/modules/AUGWADParams.xml 2007-06-15 18:04:49 UTC (rev 1203) +++ trunk/docs/userguide/en/src/main/docbook/modules/AUGWADParams.xml 2007-06-15 23:25:05 UTC (rev 1204) @@ -110,7 +110,7 @@ </table></para> <para><table> - <title>org.ajax4jsf.Filter Initialization Parametres</title> + <title>org.ajax4jsf.Filter Initialization Parameters</title> <tgroup cols="3"> <thead> Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2007-06-15 18:04:49 UTC (rev 1203) +++ trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2007-06-15 23:25:05 UTC (rev 1204) @@ -22,11 +22,11 @@ <para>RichFaces is based on the Ajax4jsf framework, so <property>AJAX</property> request support is performed with this - framework. This support is explained in the Architecure + framework. This support is explained in the Architecture Overview section of the Ajax4jsf Developers Guide found under the <property><ulink url="http://labs.jboss.com/portal/jbossajax4jsf">Ajax4jsf</ulink></property> - project. In this section, we will focus on the skinnability.</para> + project. In this section, we will focus on skinnability.</para> </section> <section id="Skinnability">

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1203 - in trunk/sandbox-samples/scrollable-grid-demo/src/main: webapp/WEB-INF and 1 other directory.

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

Author: maksimkaszynski Date: 2007-06-15 14:04:49 -0400 (Fri, 15 Jun 2007) New Revision: 1203 Added: trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/benchmark/CoreRequestBenchmarkFilter.java Modified: trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/benchmark/PhaseDemarcationNotifier.java trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/benchmark/RequestBenchMarkFilter.java trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/faces-config.xml trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/web.xml Log: added more benchmarked Added: trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/benchmark/CoreRequestBenchmarkFilter.java =================================================================== --- trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/benchmark/CoreRequestBenchmarkFilter.java (rev 0) +++ trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/benchmark/CoreRequestBenchmarkFilter.java 2007-06-15 18:04:49 UTC (rev 1203) @@ -0,0 +1,17 @@ +/** + * + */ +package org.richfaces.demo.benchmark; + +/** + * @author Maksim Kaszynski + * + */ +public class CoreRequestBenchmarkFilter extends RequestBenchMarkFilter { + + @Override + protected String requestType() { + // TODO Auto-generated method stub + return "Core request "; + } +} Modified: trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/benchmark/PhaseDemarcationNotifier.java =================================================================== --- trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/benchmark/PhaseDemarcationNotifier.java 2007-06-15 15:14:32 UTC (rev 1202) +++ trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/benchmark/PhaseDemarcationNotifier.java 2007-06-15 18:04:49 UTC (rev 1203) @@ -3,6 +3,8 @@ */ package org.richfaces.demo.benchmark; +import java.util.Map; + import javax.faces.event.PhaseEvent; import javax.faces.event.PhaseId; import javax.faces.event.PhaseListener; @@ -26,9 +28,15 @@ * @see javax.faces.event.PhaseListener#afterPhase(javax.faces.event.PhaseEvent) */ public void afterPhase(PhaseEvent event) { + + long l = (Long) getRequestMap(event).get(event.getPhaseId().toString()); if (log.isTraceEnabled()) { log.trace("Phase end " + event.getPhaseId()); } + + if (log.isInfoEnabled()) { + log.info(event.getPhaseId() + " took " + (System.currentTimeMillis() - l) + "ms"); + } } /* (non-Javadoc) @@ -38,6 +46,8 @@ if (log.isTraceEnabled()) { log.trace("Phase start " + event.getPhaseId()); } + getRequestMap(event).put(event.getPhaseId().toString(), System.currentTimeMillis()); + } /* (non-Javadoc) @@ -46,5 +56,9 @@ public PhaseId getPhaseId() { return PhaseId.ANY_PHASE; } + + private Map<String, Object> getRequestMap(PhaseEvent event) { + return event.getFacesContext().getExternalContext().getRequestMap(); + } } Modified: trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/benchmark/RequestBenchMarkFilter.java =================================================================== --- trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/benchmark/RequestBenchMarkFilter.java 2007-06-15 15:14:32 UTC (rev 1202) +++ trunk/sandbox-samples/scrollable-grid-demo/src/main/java/org/richfaces/demo/benchmark/RequestBenchMarkFilter.java 2007-06-15 18:04:49 UTC (rev 1203) @@ -22,7 +22,7 @@ */ public class RequestBenchMarkFilter implements Filter { - private Log log = LogFactory.getLog(RequestBenchMarkFilter.class); + private Log log = LogFactory.getLog(this.getClass()); /* (non-Javadoc) * @see javax.servlet.Filter#destroy() @@ -40,14 +40,17 @@ long startTime = System.currentTimeMillis(); + log.debug("Request started " + ((HttpServletRequest) request).getRequestURL()); + chain.doFilter(request, response); long endTime = System.currentTimeMillis(); + log.debug("Request ended " + ((HttpServletRequest) request).getRequestURL()); - log.debug("Request " + + log.debug(requestType() + ((HttpServletRequest) request).getRequestURL() + - "took " + + " took " + (endTime - startTime) + "ms"); @@ -60,5 +63,9 @@ // TODO Auto-generated method stub } + + protected String requestType() { + return "Request with filters "; + } } Modified: trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/faces-config.xml 2007-06-15 15:14:32 UTC (rev 1202) +++ trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/faces-config.xml 2007-06-15 18:04:49 UTC (rev 1203) @@ -204,16 +204,6 @@ </managed-bean> <managed-bean> - <managed-bean-name>dataModel</managed-bean-name> - <managed-bean-class>org.richfaces.demo.datagrid.bean.ChannelDataModel</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>channel</property-name> - <value>#{jiraService.channel}</value> - </managed-property> - </managed-bean> - - <managed-bean> <managed-bean-name>dataModel2</managed-bean-name> <managed-bean-class>org.richfaces.demo.datagrid.bean.ChannelDataModel2</managed-bean-class> <managed-bean-scope>request</managed-bean-scope> @@ -223,21 +213,6 @@ </managed-property> </managed-bean> - <managed-bean> - <managed-bean-name>selectionBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.datagrid.bean.SelectionBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>dataModel</property-name> - <property-class>org.richfaces.model.ScrollableGridDataModel</property-class> - <value>#{dataModel}</value> - </managed-property> - <managed-property> - <property-name>channel</property-name> - <value>#{jiraService.channel}</value> - </managed-property> - </managed-bean> - <managed-bean> <managed-bean-name>jiraUserConverter</managed-bean-name> <managed-bean-class>org.richfaces.demo.converters.JiraUserConverter</managed-bean-class> Modified: trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/web.xml 2007-06-15 15:14:32 UTC (rev 1202) +++ trunk/sandbox-samples/scrollable-grid-demo/src/main/webapp/WEB-INF/web.xml 2007-06-15 18:04:49 UTC (rev 1203) @@ -30,6 +30,11 @@ <filter-name>ajax4jsf</filter-name> <filter-class>org.ajax4jsf.Filter</filter-class> </filter> + <filter> + <display-name>Request Metrics</display-name> + <filter-name>core-metrics</filter-name> + <filter-class>org.richfaces.demo.benchmark.CoreRequestBenchmarkFilter</filter-class> + </filter> <filter-mapping> <filter-name>metrics</filter-name> <servlet-name>Faces Servlet</servlet-name> @@ -44,6 +49,13 @@ <dispatcher>FORWARD</dispatcher> <dispatcher>INCLUDE</dispatcher> </filter-mapping> + <filter-mapping> + <filter-name>core-metrics</filter-name> + <servlet-name>Faces Servlet</servlet-name> + <dispatcher>REQUEST</dispatcher> + <dispatcher>FORWARD</dispatcher> + <dispatcher>INCLUDE</dispatcher> + </filter-mapping> <servlet> <servlet-name>Faces Servlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>

17 years, 6 months

1
0
0 / 0

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

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

Author: a.izobov Date: 2007-06-15 11:14:32 -0400 (Fri, 15 Jun 2007) New Revision: 1202 Modified: trunk/richfaces/panelbar/src/main/config/component/panelbar.xml trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBarItem.java trunk/richfaces/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java Log: http://jira.jboss.com/jira/browse/RF-20 fixed Modified: trunk/richfaces/panelbar/src/main/config/component/panelbar.xml =================================================================== --- trunk/richfaces/panelbar/src/main/config/component/panelbar.xml 2007-06-15 13:27:33 UTC (rev 1201) +++ trunk/richfaces/panelbar/src/main/config/component/panelbar.xml 2007-06-15 15:14:32 UTC (rev 1202) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" > - <components> @@ -33,23 +33,23 @@ <name>converterMessage</name> <classname>java.lang.String</classname> <description> - A ValueExpression enabled attribute that, if present, will be used as the text of the converter message, replacing any message that comes from the converter + A ValueExpression enabled attribute that, if present, will be used as the text of the converter message, replacing any message that comes from the converter. </description> </property> <property> <name>requiredMessage</name> <classname>java.lang.String</classname> <description> - A ValueExpression enabled attribute that, if present, will be used as the text of the validation message for the "required" facility, if the "required" facility is used + A ValueExpression enabled attribute that, if present, will be used as the text of the validation message for the "required" facility, if the "required" facility is used. </description> </property> <property> <name>validatorMessage</name> <classname>java.lang.String</classname> <description> - A ValueExpression enabled attribute that, if present, will be used as the text of the validator message, replacing any message that comes from the validator + A ValueExpression enabled attribute that, if present, will be used as the text of the validator message, replacing any message that comes from the validator. </description> - </property> + </property> <property> <name>width</name> <classname>java.lang.String</classname> @@ -74,7 +74,7 @@ <property> <name>styleClass</name> <classname>java.lang.String</classname> - <description>Corresponds to the HTML class attribute</description> + <description>Corresponds to the HTML class attribute.</description> </property> <property> <name>headerStyleActive</name> @@ -96,9 +96,9 @@ <name>converter</name> <classname>javax.faces.convert.Converter</classname> <description> - Id of Converter to be used or reference to a Converter + Id of Converter to be used or reference to a Converter. </description> - </property> + </property> <property hidden="true"> <name>localValueSet</name> <classname>boolean</classname> @@ -112,7 +112,12 @@ <classname>java.lang.String</classname> <description>JavaScript code for call before header onclick</description> </property> - + <property> + <name>selectedPanel</name> + <classname>java.lang.Object</classname> + <description>Attribure defines name of selected item</description> + </property> + &ui_component_attributes; &header_component_attributes; &content_component_attributes; @@ -144,7 +149,7 @@ <superclass>org.ajax4jsf.framework.taglib.HtmlComponentTagBase</superclass> <description>A child component of a slide panel component</description> </tag> - + <property> <name>label</name> <classname>java.lang.String</classname> @@ -162,8 +167,14 @@ <classname>java.lang.String</classname> <description>The component header style class active</description> </property> - - &ui_component_attributes; + <property> + <name>name</name> + <classname>java.lang.Object</classname> + <description>Attribute defines item name</description> + <defaultvalue>getId()</defaultvalue> + </property> + + &ui_component_attributes; &header_component_attributes; &content_component_attributes; <property hidden="true"> Modified: trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java =================================================================== --- trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java 2007-06-15 13:27:33 UTC (rev 1201) +++ trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java 2007-06-15 15:14:32 UTC (rev 1202) @@ -21,8 +21,18 @@ package org.richfaces.component; +import java.util.Iterator; +import java.util.List; + +import javax.faces.component.UIComponent; import javax.faces.component.UIComponentBase; +import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; +import javax.faces.event.AbortProcessingException; +import javax.faces.event.FacesEvent; +import org.richfaces.event.SwitchablePanelSwitchEvent; + /** * JSF component class * @@ -41,6 +51,10 @@ public abstract String getWidth(); public abstract void setWidth(String width); + + public abstract Object getSelectedPanel(); + + public abstract void setSelectedPanel(Object item); public boolean getRendersChildren() { return true; @@ -49,5 +63,46 @@ return CLIENT_METHOD; } + public void broadcast(FacesEvent facesEvent) throws AbortProcessingException { + if (facesEvent instanceof SwitchablePanelSwitchEvent) { + if (isRendered()) { + FacesContext facesContext = FacesContext.getCurrentInstance(); + + Object oldValue = getValue(); + super.broadcast(facesEvent); + SwitchablePanelSwitchEvent switchEvent = (SwitchablePanelSwitchEvent) facesEvent; + Object newValue = convertSwitchValue(switchEvent.getEventSource(), + switchEvent.getValue()); + if (oldValue == null && newValue != null || + oldValue != null && !oldValue.equals(newValue)) { + Object newName = null; + List items = getChildren(); + for(Iterator it = items.iterator();it.hasNext();) { + UIComponent comp = (UIComponent)it.next(); + if (comp instanceof UIPanelBarItem) { + UIPanelBarItem item = (UIPanelBarItem) comp; + if (item.getClientId(facesContext).equals(newValue)) { + newName = item.getName(); + break; + } + } + } + + if (newName != null) { + ValueBinding valueBinding = getValueBinding("selectedPanel"); + if (valueBinding != null) { + valueBinding.setValue(facesContext, newName); + setSelectedPanel(null); + } else { + setSelectedPanel(newName); + } + } + } + } + } else { + super.broadcast(facesEvent); + } + } + } Modified: trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBarItem.java =================================================================== --- trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBarItem.java 2007-06-15 13:27:33 UTC (rev 1201) +++ trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBarItem.java 2007-06-15 15:14:32 UTC (rev 1202) @@ -32,7 +32,11 @@ public abstract void setLabel(String label); - public UIPanelBar getPanel(){ + public abstract Object getName(); + + public abstract void setName(Object name); + + public UIPanelBar getPanel(){ //XXX by nick - andrew - panelBarItem is an immediate panelBar child, no need to traverse up a lot return (UIPanelBar) getParent(); } Modified: trunk/richfaces/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java =================================================================== --- trunk/richfaces/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java 2007-06-15 13:27:33 UTC (rev 1201) +++ trunk/richfaces/panelbar/src/main/java/org/richfaces/renderkit/html/PanelBarRendererBase.java 2007-06-15 15:14:32 UTC (rev 1202) @@ -28,6 +28,7 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; import org.ajax4jsf.framework.ajax.AjaxScript; import org.ajax4jsf.framework.ajax.ImageCacheScript; @@ -37,8 +38,11 @@ import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.framework.resource.PrototypeScript; import org.richfaces.component.UIPanelBar; +import org.richfaces.component.UIPanelBarItem; import org.richfaces.event.SwitchablePanelSwitchEvent; +import com.sun.org.apache.bcel.internal.generic.INSTANCEOF; + public abstract class PanelBarRendererBase extends HeaderResourcesRendererBase { public static final String PANEL_BAR_RESOURCES = "PANEL_BAR_RESOURCES"; @@ -61,20 +65,29 @@ public String expanded(FacesContext context, UIComponent component) throws IOException { UIPanelBar panelbar = (UIPanelBar) component; String value = (String)panelbar.getValue(); - if (value != null) { + ValueBinding valueBinding = panelbar.getValueBinding("selectedPanel"); + if (value != null && valueBinding == null) { UIComponent item = component.findComponent(value); if (item != null) { panelbar.setValue(item.getClientId(context)); return item.getClientId(context); } - } + } else { + Object selected = panelbar.getSelectedPanel(); + if (selected != null) { + List items = panelbar.getChildren(); + for(Iterator it = items.iterator();it.hasNext();) { + UIComponent comp = (UIComponent)it.next(); + if (comp instanceof UIPanelBarItem) { + UIPanelBarItem item = (UIPanelBarItem) comp; + if (item.getName().equals(selected)) { + return item.getClientId(context); + } + } + } + } + } return ""; -/* Object expanded=component.getAttributes().get(EXPANDED_ATTR); - String exp=component.getChildCount()==0?"-1":"0"; - if (expanded!=null) { - exp=expanded.toString(); - } - return exp; */ } public String width(FacesContext context, UIComponent component) throws IOException {

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1201 - in trunk/sandbox/scrollable-grid/src/main/javascript: ClientUI/common/box and 1 other directories.

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

Author: dmorozov Date: 2007-06-15 09:27:33 -0400 (Fri, 15 Jun 2007) New Revision: 1201 Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/ScrollableBox.js trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/FakeArrayDataModel.js trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Grid.js trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js trunk/sandbox/scrollable-grid/src/main/javascript/ClientUILib.js Log: Remove unneceserry logs. Add logs needed to check data loading from server performance by scroll event Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/ScrollableBox.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/ScrollableBox.js 2007-06-15 12:35:29 UTC (rev 1200) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/box/ScrollableBox.js 2007-06-15 13:27:33 UTC (rev 1201) @@ -64,7 +64,6 @@ updateLayout: function() { // NOTE: not implemented in this class ClientUI.common.box.ScrollableBox.parentClass.method("updateLayout").call(this); - ClientUILib.log(ClientUILogger.INFO, "ScrollableBox::updateLayout"); }, getViewportScrollX: function() { var scrollX = 0; Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/FakeArrayDataModel.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/FakeArrayDataModel.js 2007-06-15 12:35:29 UTC (rev 1200) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/FakeArrayDataModel.js 2007-06-15 13:27:33 UTC (rev 1201) @@ -46,7 +46,7 @@ }, loadRows: function(options) { - + window.loadingStartTime = (new Date()).getTime(); var state_options = options; var state_input = $(this.gridId + "_state_input"); var submit_input = $(this.gridId + "_submit_input"); Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Grid.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Grid.js 2007-06-15 12:35:29 UTC (rev 1200) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Grid.js 2007-06-15 13:27:33 UTC (rev 1201) @@ -63,9 +63,6 @@ }, createControl: function() { - //TODO: delete - document.gridStartTime = (new Date()).getTime(); - var grid = this; var layout = new ClientUI.layouts.GridLayoutManager(null, this.getElement()); this.layout = layout; @@ -73,53 +70,26 @@ this.templates.each(function(item) { switch(item.pane) { case GridLayout_Enum.HEADER: { - //TODO: delete - document.headerStartTime = (new Date()).getTime(); - var header = new ClientUI.controls.grid.GridHeader($(item.ref), grid); layout.addPane(GridLayout_Enum.HEADER, header); - - //TODO: delete - document.headerStopTime = (new Date()).getTime(); - break; } case GridLayout_Enum.BODY: { - //TODO: delete - document.bodyStartTime = (new Date()).getTime(); - var body = new ClientUI.controls.grid.GridBody($(item.ref), grid); layout.addPane(GridLayout_Enum.BODY, body); - - //TODO: delete - document.bodyStopTime = (new Date()).getTime(); - break; } case GridLayout_Enum.FOOTER: { - //TODO: delete - document.footerStartTime = (new Date()).getTime(); - var footer = new ClientUI.controls.grid.GridFooter($(item.ref), grid); layout.addPane(GridLayout_Enum.FOOTER, footer); - - //TODO: delete - document.footerStopTime = (new Date()).getTime(); - break; } } }); - //TODO: delete - document.gridParseTime = (new Date()).getTime(); - this.currentScrollPos = 0; this.controlCreated = true; this.updateLayout(); - - //TODO: delete - document.gridEndTime = (new Date()).getTime(); }, updateLayout: function() { if(!this.controlCreated || this.getHeight()==0) { Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-06-15 12:35:29 UTC (rev 1200) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-06-15 13:27:33 UTC (rev 1201) @@ -71,18 +71,11 @@ }, _onDataReady: function(options) { // load rows data - var currTime = (new Date()).getTime(); + window.loadingUpdateTime = (new Date()).getTime(); this.invalidate(options); - var loadTime = (new Date()).getTime(); - - ClientUILib.log(ClientUILogger.ERROR, "Total time of data loading of "+options.count+" rows is: " + (loadTime - this.taskDefineTime) + " miliseconds."); - ClientUILib.log(ClientUILogger.WARNING, "start index: " + options.index + ", and startRow: " + options.startRow); - ClientUILib.log(ClientUILogger.WARNING, "data prepare time: " + (this.taskStartLoadingTime - this.taskStartTime)); - - ClientUILib.log(ClientUILogger.WARNING, "data load time: " + (currTime - document.cntStart)); - ClientUILib.log(ClientUILogger.WARNING, "invalidation time: " + (loadTime - currTime)); + window.loadingInvalidateTime = (new Date()).getTime(); }, _onContentVScroll: function(ypos) { this.helpObject1.moveToY(this.sizeBox.getHeight()+ this.defaultRowHeight + 5); @@ -366,8 +359,6 @@ } this.updateStarted = true; - this.taskStartTime = (new Date()).getTime(); - var task = this._getPendingTask(); var range = $R(task.from, task.to); var switchType = 5; @@ -421,8 +412,6 @@ } } - this.taskStartLoadingTime = (new Date()).getTime(); - var process = true; if(startIndex > (task.first + this.dataVisible) || (startIndex + countToLoad) < task.first) { @@ -430,13 +419,10 @@ } if(countToLoad > 0 && process) { this.updateStarted = true; - ClientUILib.log(ClientUILogger.WARNING, "Start loading..."); - ClientUILib.log(ClientUILogger.WARNING, "start index: " + startIndex + ", and startRow: " + startRowIndx + ", and count: " + countToLoad); + ClientUILib.log(ClientUILogger.WARNING, "Start loading: index: " + startIndex + ", and startRow: " + startRowIndx + ", and count: " + countToLoad); this.currRange = range; this.currentPos = task.pos; - this.taskDefineTime = (new Date()).getTime(); - this.showSplash(); this.container.hide(); @@ -617,8 +603,6 @@ * @param {Object} options */ invalidate: function(options) { - - ClientUILib.log(ClientUILogger.WARNING, "Stop loading."); screen.updateInterval = this.updateInterval; setTimeout(function () { Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js 2007-06-15 12:35:29 UTC (rev 1200) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/ScrollableGrid.js 2007-06-15 13:27:33 UTC (rev 1201) @@ -36,7 +36,8 @@ init: function(){ // mark that grid control initialized - this.initialized = true; + if(!this.isInitialized) { + this.isInitialized = true; ClientUI.controls.grid.ScrollableGrid.parentClass.constructor().call(this, this.client_id, this.dataModel, this.templates); var progress = new ClientUI.common.box.SplashBox(this.splash_id, null, 300, true); @@ -48,6 +49,7 @@ if (this.startUpTime) { ClientUILib.log(ClientUILogger.ERROR, "Load Time'" + (new Date().getTime() - this.startUpTime) + "' ms"); } + } }, onSortComplete : function(request, event, data){ @@ -60,10 +62,19 @@ onScrollComplete : function(request, event, data){ var options = this.dataModel.getCurrentOptions(); + window.loadingServerTime = (new Date()).getTime(); Utils.AJAX.updateRows(options,request,this,this.client_id, [this.updateSelectionCallBack]); if (this.selectionManager) { this.selectionManager.restoreState(); } + window.loadingEndTime = (new Date()).getTime(); + + // TODO: remove this time statistic logging + ClientUILib.log(ClientUILogger.ERROR, "Total time of data loading of "+options.count+" rows is: " + (window.loadingEndTime - window.loadingStartTime) + " miliseconds."); + ClientUILib.log(ClientUILogger.WARNING, "...Server load time: " + (window.loadingServerTime - window.loadingStartTime)); + ClientUILib.log(ClientUILogger.WARNING, "...DOM updated time: " + (window.loadingUpdateTime - window.loadingServerTime)); + ClientUILib.log(ClientUILogger.WARNING, "...Grid invalidation time: " + (window.loadingInvalidateTime - window.loadingUpdateTime)); + ClientUILib.log(ClientUILogger.WARNING, "...Selection mng time: " + (window.loadingEndTime - window.loadingInvalidateTime)); }, onSorted: function(sortEvent) { Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUILib.js =================================================================== --- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUILib.js 2007-06-15 12:35:29 UTC (rev 1200) +++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUILib.js 2007-06-15 13:27:33 UTC (rev 1201) @@ -81,7 +81,6 @@ } }); this.packages[libName] = true; - ClientUILib.log(ClientUILogger.INFO, "ClientUILib::declarePackage '" + libName + "'"); }, log: function(level, infoText) { if(ClientUILogger.isCreated) @@ -124,7 +123,7 @@ // flag logger is initialized isCreated: false, width: 460, - height: 150, + height: 90, create: function() { this.logElement = $(document.createElement("div")); this.logElement.setStyle({position: 'absolute'}); @@ -149,8 +148,11 @@ this.logElement.setStyle({width: this.width + 'px'}); this.logElement.setStyle({height: this.height + 'px'}); //this.logElement.setStyle({top: (this.getWindowHeight() - this.height - 10) + 'px'}); - this.logElement.setStyle({top: 10 + 'px'}); - this.logElement.setStyle({left: (this.getWindowWidth() - this.width - 10) + 'px'}); + //this.logElement.setStyle({top: 10 + 'px'}); + //this.logElement.setStyle({left: (this.getWindowWidth() - this.width - 10) + 'px'}); + this.logElement.setStyle({top: '0px'}); + this.logElement.setStyle({left: '250px'}); + this.logElement.setStyle({zIndex: '1000'}); } }, log: function(level, infoText) {

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1200 - in trunk/sandbox/panelmenu/src: main/java/org/richfaces/renderkit/html and 5 other directories.

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

Author: sergeyhalipov Date: 2007-06-15 08:35:29 -0400 (Fri, 15 Jun 2007) New Revision: 1200 Modified: trunk/sandbox/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java trunk/sandbox/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java trunk/sandbox/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java trunk/sandbox/panelmenu/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconBasic.java trunk/sandbox/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss trunk/sandbox/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js trunk/sandbox/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx trunk/sandbox/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx trunk/sandbox/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx trunk/sandbox/panelmenu/src/test/java/org/richfaces/component/PanelMenuComponentTest.java Log: Change panel-menu L&F to be compatible with design prototype. Modified: trunk/sandbox/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java =================================================================== --- trunk/sandbox/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2007-06-15 11:59:47 UTC (rev 1199) +++ trunk/sandbox/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2007-06-15 12:35:29 UTC (rev 1200) @@ -55,7 +55,7 @@ public final static String PANEL_MENU_SPACER_ICON_NAME = "spacer"; - public void insertTDs(FacesContext context , UIComponent component) throws IOException { + public void insertSpacerImages(FacesContext context , UIComponent component) throws IOException { ResponseWriter writer = context.getResponseWriter(); int level = calculateLevel(component); //StringBuffer buffer = new StringBuffer(); @@ -63,7 +63,6 @@ int w = 16; //width(context); for (int i=0;i<level;i++){ - writer.startElement(HTML.td_ELEM, component); writer.startElement("img", component); writer.writeAttribute("src", src, null); writer.writeAttribute("alt", "", null); @@ -71,9 +70,7 @@ writer.writeAttribute("vspace", "0", null); writer.writeAttribute("height", String.valueOf(w), null); writer.writeAttribute("width", String.valueOf(w), null); - writer.writeAttribute("style", "display:block; ", null); writer.endElement("img"); - writer.endElement(HTML.td_ELEM); } } @@ -112,7 +109,7 @@ color = (String) skin.getParameter(context,"panelmenu.itemBulletColor"); } if(iconType != null && !iconType.equals("none")){ - if (iconType.equals("custom")){ + if (iconType.equals("custom") || "".equals(iconType)){ source = getResource(PanelMenuIconSpacer.class.getName()).getUri(context, color); } else if (iconType.equals("spacer")){ source = getResource(PanelMenuIconSpacer.class.getName()).getUri(context, color); @@ -275,7 +272,7 @@ * @param component * @throws IOException */ - public void drawIcon(ResponseWriter writer, String iconType, String imageSrc, UIComponent component) throws IOException{ + public void drawIcon(ResponseWriter writer, String iconType, String imageSrc, UIComponent component, String id) throws IOException{ if (iconType != null && !iconType.equals("") && !iconType.equals("none")){ int h = 16; //width(context); writer.startElement("img", component); @@ -283,9 +280,9 @@ writer.writeAttribute("alt", "", null); writer.writeAttribute("vspace", "0", null); writer.writeAttribute("hspace", "0", null); - writer.writeAttribute("style", "display:block; ", null); writer.writeAttribute("width", String.valueOf(h), null); writer.writeAttribute("height", String.valueOf(h), null); + writer.writeAttribute("id", id, null); writer.endElement("img"); } Modified: trunk/sandbox/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java =================================================================== --- trunk/sandbox/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2007-06-15 11:59:47 UTC (rev 1199) +++ trunk/sandbox/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2007-06-15 12:35:29 UTC (rev 1200) @@ -78,15 +78,15 @@ } if (align.equalsIgnoreCase(from)){ - image(context,component); + image(context,component, from + "Icon" + component.getClientId(context)); } else { String iconType = PANEL_MENU_SPACER_ICON_NAME; String imageSrc = getIconByType(iconType, isTopLevel, context, component); - drawIcon(context.getResponseWriter(), iconType, imageSrc, component); + drawIcon(context.getResponseWriter(), iconType, imageSrc, component, from + "Icon" + component.getClientId(context)); } } - private void image(FacesContext context, UIComponent component )throws IOException { + private void image(FacesContext context, UIComponent component, String id )throws IOException { ResponseWriter writer = context.getResponseWriter(); UIPanelMenu panelMenu = findMenu(component); @@ -160,8 +160,11 @@ icon = defaultIconNodeClosed; } } + + if ("".equals(icon)) + icon = "custom"; String source = getIconByType(icon, isTopLevel, context, component); - drawIcon(writer, icon, source, component); + drawIcon(writer, icon, source, component, id); } public String getFullStyleClass(FacesContext context, UIComponent component) { @@ -259,5 +262,19 @@ return ""; } + public String getDivClass(FacesContext context, UIComponent component) { + String result = ""; + if (isTopLevel(component)) + result = "dr-pmenu-group-div"; + return result; + } + public String getTableClass(FacesContext context, UIComponent component) { + String result; + if (isTopLevel(component)) + result = "dr-pmenu-top-group"; + else + result = "dr-pmenu-group"; + return result; + } } Modified: trunk/sandbox/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java =================================================================== --- trunk/sandbox/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2007-06-15 11:59:47 UTC (rev 1199) +++ trunk/sandbox/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuItemRenderer.java 2007-06-15 12:35:29 UTC (rev 1200) @@ -78,15 +78,15 @@ } if (align.equalsIgnoreCase(from)){ - image(context,component); + image(context,component, from); } else { String iconType = PANEL_MENU_SPACER_ICON_NAME; String imageSrc = getIconByType(iconType, isTopLevel, context, component); - drawIcon(context.getResponseWriter(), iconType, imageSrc, component); + drawIcon(context.getResponseWriter(), iconType, imageSrc, component, from + "Icon" + component.getClientId(context)); } } - private void image(FacesContext context, UIComponent component) + private void image(FacesContext context, UIComponent component, String from) throws IOException{ UIPanelMenu panelMenu = findMenu(component); @@ -130,7 +130,7 @@ } else iconType = customItemIcon; source = getIconByType(iconType, isTopLevel, context, component); - drawIcon(writer, iconType, source, component); + drawIcon(writer, iconType, source, component, from + "Icon" + component.getClientId(context)); } Modified: trunk/sandbox/panelmenu/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconBasic.java =================================================================== --- trunk/sandbox/panelmenu/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconBasic.java 2007-06-15 11:59:47 UTC (rev 1199) +++ trunk/sandbox/panelmenu/src/main/java/org/richfaces/renderkit/html/iconimages/PanelMenuIconBasic.java 2007-06-15 12:35:29 UTC (rev 1200) @@ -74,6 +74,7 @@ protected Object getDataToStore(FacesContext context, Object data) { Object[] stored = new Object[5]; Skin skin = SkinFactory.getInstance().getSkin(context); + Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context); stored[0] = new Integer(HtmlDimensions.decode("16px").intValue()); @@ -82,7 +83,11 @@ if (data!=null){ col = HtmlColor.decode(data.toString()); } else { - col = HtmlColor.decode(skin.getParameter(context, "headerTextColor").toString()); + String skinParameter = "headerTextColor"; + String headerTextColor = (String) skin.getParameter(context, skinParameter); + if (null == headerTextColor || "".equals(headerTextColor)) + headerTextColor = (String) defaultSkin.getParameter(context, skinParameter); + col = HtmlColor.decode(headerTextColor); } stored[1]= col; return stored; Modified: trunk/sandbox/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss =================================================================== --- trunk/sandbox/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss 2007-06-15 11:59:47 UTC (rev 1199) +++ trunk/sandbox/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss 2007-06-15 12:35:29 UTC (rev 1200) @@ -5,78 +5,88 @@ xmlns="http://www.w3.org/1999/xhtml"> <f:verbatim> - .dr-pmenu-group { + .dr-pmenu-top-group { height: 20px; background-repeat: repeat-x; background-position: left top; + padding: 2px 1px 2px 2px; + cursor: pointer; } + .dr-pmenu-group { + padding: 2px 1px 1px; + margin-top:1px; + cursor:pointer; + border-top: 1px solid; + } + .dr-pmenu-item { height: 20px; background-repeat: repeat-x; background-position: left top; + border-top: 1px solid; + cursor: pointer; + padding: 2px 1px 1px; + margin-top: 1px; } + .dr-pmenu-group-div { + border: 1px solid; + margin-bottom: 3px; + padding: 1px; + } + + .dr-pmenu-group-self-label { + padding-left: 5px; + width: 100%; + } + </f:verbatim> - <u:selector name=".dr-pmenu-group"> - <u:style name="width" value="100%"/> - <u:style name="padding" value="0px"/> - <u:style name="vertical-align" value="middle"/> - <u:style name="cursor" value="pointer"/> - <u:style name="text-align" value="left"/> + <u:selector name=".dr-pmenu-top-group"> <u:style name="font-weight" skin="headerWeightFont"/> <u:style name="font-family" skin="headerFamilyFont"/> <u:style name="font-size" skin="headerSizeFont"/> <u:style name="color" skin="headerTextColor"/> - <u:style name="border-style" value="none"/> - <u:style name="border-color" skin="panelBorderColor"/> <u:style name="background-color" skin="headerBackgroundColor"/> <u:style name="background-image" > <f:resource f:key="org.richfaces.renderkit.html.gradientimages.PanelMenuGroupGradient" /> </u:style> </u:selector> + <u:selector name=".dr-pmenu-group"> + <u:style name="font-weight" skin="headerWeightFont"/> + <u:style name="font-family" skin="headerFamilyFont"/> + <u:style name="font-size" skin="headerSizeFont"/> + <u:style name="color" skin="generalTextColor"/> + <u:style name="border-top-color" skin="tableBorderColor"/> + </u:selector> + <u:selector name=".dr-pmenu-item"> - <u:style name="width" value="100%"/> - <u:style name="padding" value="0px"/> - <u:style name="vertical-align" value="middle"/> - <u:style name="cursor" value="pointer"/> - <u:style name="text-align" value="left"/> <u:style name="font-family" skin="generalFamilyFont"/> <u:style name="font-weight" skin="generalWeightFont"/> <u:style name="font-size" skin="generalSizeFont"/> <u:style name="color" skin="generalTextColor"/> - <u:style name="border-style" value="none"/> - <u:style name="border-top-style" value="solid"/> - <u:style name="border-color" skin="subBorderColor"/> - <u:style name="background-image" > - <f:resource f:key="org.richfaces.renderkit.html.gradientimages.PanelMenuItemGradient" /> - </u:style> + <u:style name="border-top-color" skin="tableBorderColor"/> </u:selector> - <u:selector name=".dr-pmenu-group-tr"> - <u:style name="background-image" > - <f:resource f:key="org.richfaces.renderkit.html.gradientimages.PanelMenuGroupGradient" /> - </u:style> + <u:selector name=".dr-pmenu-group-div" > + <u:style name="border-color" skin="tableBorderColor"/> </u:selector> - <u:selector name=".dr-pmenu-item-tr"> - <u:style name="background-image" > - <f:resource f:key="org.richfaces.renderkit.html.gradientimages.PanelMenuItemGradient" /> - </u:style> + <u:selector name=".dr-pmenu-disabled-element" > + <u:style name="color" skin="tabDisabledTextColor"/> </u:selector> + <u:selector name=".dr-pmenu-hovered-element" > + <u:style name="background-color" skin="tabDisabledTextColor"/> + </u:selector> + <f:verbatim> .dr-pmenu-disabled-element { cursor: default; - color: #c0c0c0; } - .dr-pmenu-hovered-element { - background-color : #c0c0c0; - } - </f:verbatim> </f:template> \ No newline at end of file Modified: trunk/sandbox/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js =================================================================== --- trunk/sandbox/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-06-15 11:59:47 UTC (rev 1199) +++ trunk/sandbox/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-06-15 12:35:29 UTC (rev 1200) @@ -58,11 +58,11 @@ } parent = parent.parentObj; } - this.obj = $(ids.myId); + this.obj = $("tdhide" + ids.myId); this.leftIcon = $('leftIcon' + ids.myId); this.rightIcon = $('rightIcon' + ids.myId); this.labelArea = $('icon' + ids.myId); - this.content = this._getDirectChildrenByTag(this.obj,"TD")[level+1]; + this.content = document.getElementsByClassName("dr-pmenu-group-self-label", this.obj)[0]; this.iconAlign = iconAlign; /* if (level == 0){ @@ -114,11 +114,11 @@ if (this.childObj[i]._getDirectChildrenByTag(this.childObj[i].content,"INPUT")[0]!=null){ this.childObj[i]._getDirectChildrenByTag(this.childObj[i].content,"INPUT")[0].value="";} if (this.haveDynamicIcon){ - var img = null + var img = null; if (this.iconAlign=="right"){ - img = this._getDirectChildrenByTag(this.iconswitcher.nextSibling,"IMG")[0]; + img = this.rightIcon; } else { - img = this._getDirectChildrenByTag(this.iconswitcher.previousSibling,"IMG")[0]; + img = this.leftIcon; } if (img!=null){ if (this.iconCollapsed!="none"){ @@ -132,8 +132,8 @@ } this.childObj[i].collapse(); this.childObj[i].hide(); - this.childObj[i].tdhider.style.display="none"; - this.childObj[i].tablehider.style.display="none"; + //this.childObj[i].tdhider.style.display="none"; + //this.childObj[i].tablehider.style.display="none"; } } this.expanded = false; @@ -156,9 +156,9 @@ if (this.haveDynamicIcon){ var img = null if (this.iconAlign=="right"){ - img = this._getDirectChildrenByTag(this.iconswitcher.nextSibling,"IMG")[0]; + img = this.rightIcon; } else { - img = this._getDirectChildrenByTag(this.iconswitcher.previousSibling,"IMG")[0]; + img = this.leftIcon; } if (img!=null){ if (this.iconExpanded!="none"){ @@ -285,33 +285,27 @@ addHoverStyles: function(e) { if(!this.hasInitialSylesChecked){ - this.initialStyles = this.obj.style.cssText; + this.initialStyles = this.tablehider.style.cssText; this.hasInitialSylesChecked = true; } if (this.hoveredStyles) { - Element.setStyle(this.obj, this.hoveredStyles); + Element.setStyle(this.tablehider, this.hoveredStyles); } if (this.hoveredClasses) for (i = 0; i < this.hoveredClasses.length; i++) { - this.obj.addClassName(this.hoveredClasses[i]); - this.leftIcon.addClassName(this.hoveredClasses[i]); - this.rightIcon.addClassName(this.hoveredClasses[i]); - this.labelArea.addClassName(this.hoveredClasses[i]); + this.tablehider.addClassName(this.hoveredClasses[i]); } }, removeHoverStyles: function(e) { if (this.hoveredStyles && this.hasInitialSylesChecked) { - this.obj.style.cssText = this.initialStyles; + this.tablehider.style.cssText = this.initialStyles; } if (this.hoveredClasses) for (var i = 0; i < this.hoveredClasses.length; i++){ - this.obj.removeClassName(this.hoveredClasses[i]); - this.leftIcon.removeClassName(this.hoveredClasses[i]); - this.rightIcon.removeClassName(this.hoveredClasses[i]); - this.labelArea.removeClassName(this.hoveredClasses[i]); + this.tablehider.removeClassName(this.hoveredClasses[i]); } }, @@ -346,21 +340,15 @@ _attachBehaviors: function() { if (!this.disabled) { if (this.event) - Event.observe(this.obj, this.event, this.itemClicked.bindAsEventListener(this), false); + Event.observe(this.tablehider, this.event, this.itemClicked.bindAsEventListener(this), false); else - Event.observe(this.obj, "click", this.itemClicked.bindAsEventListener(this), false); + Event.observe(this.tablehider, "click", this.itemClicked.bindAsEventListener(this), false); Event.observe(this.obj, "mouseover", this.hoverItem.bindAsEventListener(this), false); - Event.observe(this.obj, "mouseover", this.addHoverStyles.bindAsEventListener(this), false); - Event.observe(this.obj, "mouseout", this.removeHoverStyles.bindAsEventListener(this), false); + Event.observe(this.tablehider, "mouseover", this.addHoverStyles.bindAsEventListener(this), false); + Event.observe(this.tablehider, "mouseout", this.removeHoverStyles.bindAsEventListener(this), false); - Event.observe(this.leftIcon, "mouseover", this.addHoverStyles.bindAsEventListener(this), false); - Event.observe(this.rightIcon, "mouseover", this.addHoverStyles.bindAsEventListener(this), false); - Event.observe(this.labelArea, "mouseover", this.addHoverStyles.bindAsEventListener(this), false); - Event.observe(this.leftIcon, "mouseout", this.removeHoverStyles.bindAsEventListener(this), false); - Event.observe(this.rightIcon, "mouseout", this.removeHoverStyles.bindAsEventListener(this), false); - Event.observe(this.labelArea, "mouseout", this.removeHoverStyles.bindAsEventListener(this), false); } } }; Modified: trunk/sandbox/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx =================================================================== --- trunk/sandbox/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx 2007-06-15 11:59:47 UTC (rev 1199) +++ trunk/sandbox/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx 2007-06-15 12:35:29 UTC (rev 1200) @@ -24,25 +24,20 @@ <f:clientid var="clientId"/> <f:call name="utils.encodeBeginFormIfNessesary"/> - <table cellpadding="0" cellspacing="0" - style="#{component.style};" class="#{component.styleClass}" - id="#{clientId}" width="#{component.width}" - onclick="#{component.onclick}" - ondblclick="#{component.ondblclick}" - onmousemove="#{component.onmousemove}" - onmouseout="#{component.onmouseout}" - onmouseover="#{component.onmouseover}"> + <div style="#{component.style};" class="#{component.styleClass}" + id="#{clientId}" width="#{component.width}" + onclick="#{component.onclick}" + ondblclick="#{component.ondblclick}" + onmousemove="#{component.onmousemove}" + onmouseout="#{component.onmouseout}" + onmouseover="#{component.onmouseover}" > - <tbody> - <vcp:body> - <f:call name="renderChildren"/> - </vcp:body> - <tr style="display:none"> - <td> - <f:call name="insertScript"/> - </td> - </tr> - </tbody> - </table> + <vcp:body> + <f:call name="renderChildren" /> + </vcp:body> + <div style="display:none"> + <f:call name="insertScript"/> + </div> + </div> <f:call name="utils.encodeEndFormIfNessesary"/> </f:root> Modified: trunk/sandbox/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx =================================================================== --- trunk/sandbox/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2007-06-15 11:59:47 UTC (rev 1199) +++ trunk/sandbox/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2007-06-15 12:35:29 UTC (rev 1200) @@ -12,47 +12,45 @@ > <f:clientid var="clientId"/> - <tr id="tdhide#{clientId}" style="#{this:getHideStyle(context, component)}" > - <td> - <jsp:scriptlet> - <![CDATA[ - String isNodeOpened = isOpened(context, component) ? "opened" : "closed"; - ]]> - </jsp:scriptlet> - <table cellpadding="0" cellspacing="0" border="0" width="100%" - id="tablehide#{clientId}" - class="dr-pmenu-group rich-pmenu-group #{this:getFullStyleClass( context, component )} " - style="#{this:getFullStyle( context, component )}" > - - <f:call name="utils.encodePassThru" /> - <tr id="#{clientId}"> - <f:call name="insertTDs" /> - <td id="leftIcon#{clientId}" class="#{this:getIconClass( context, component )}"> - <f:call name="insertImage"> - <f:parameter value="left" /> - </f:call> - </td> - <td style="width:100%" id="icon#{clientId}" class="#{this:getLabelClass( context, component )}"> - <input type="hidden" name="panelMenuState#{clientId}" - value="#{isNodeOpened}" > - </input> + + <div id="tdhide#{clientId}" style="#{this:getHideStyle(context, component)}" + class="#{this:getDivClass(context, component)}" > + <jsp:scriptlet> + <![CDATA[ + String isNodeOpened = isOpened(context, component) ? "opened" : "closed"; + ]]> + </jsp:scriptlet> + <table cellspacing="0" cellpadding="0" border="0" + id="tablehide#{clientId}" + class="#{this:getTableClass(context, component)} rich-pmenu-group #{this:getFullStyleClass( context, component )} " + style="#{this:getFullStyle( context, component )}" > + + <f:call name="utils.encodePassThru" /> + + <tr> + <td> + <f:call name="insertSpacerImages" /> + <f:call name="insertImage"> + <f:parameter value="left" /> + </f:call> + </td> + <td style="width:100%" id="icon#{clientId}" class="dr-pmenu-group-self-label #{this:getLabelClass( context, component )}" > + <input type="hidden" name="panelMenuState#{clientId}" + value="#{isNodeOpened}" /> - <input type="hidden" name="panelMenuAction#{clientId}" - value="" > - </input> - <f:call name="insertLabel"/> - - </td> - <td id="rightIcon#{clientId}" class="#{this:getIconClass( context, component )}"> - <f:call name="insertImage"> - <f:parameter value="right" /> - </f:call> - </td> - </tr> - </table> - </td> - </tr> - <vcp:body> - <f:call name="renderChildren" /> - </vcp:body> + <input type="hidden" name="panelMenuAction#{clientId}" + value="" /> + <f:call name="insertLabel"/> + </td> + <td> + <f:call name="insertImage"> + <f:parameter value="right" /> + </f:call> + </td> + </tr> + </table> + <vcp:body> + <f:call name="renderChildren" /> + </vcp:body> + </div> </f:root> \ No newline at end of file Modified: trunk/sandbox/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx =================================================================== --- trunk/sandbox/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2007-06-15 11:59:47 UTC (rev 1199) +++ trunk/sandbox/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2007-06-15 12:35:29 UTC (rev 1200) @@ -12,38 +12,38 @@ > <f:clientid var="clientId"/> - <tr id="tdhide#{clientId}" style="#{this:getHideStyle(context, component)}" > - <td> - <table cellpadding="0" cellspacing="0" border="0" width="100%" - class="rich-pmenu-item dr-pmenu-item #{this:getFullStyleClass( context, component )} " - style="#{this:getFullStyle( context, component )}" - id="tablehide#{clientId}" > + + <div id="tdhide#{clientId}" style="#{this:getHideStyle(context, component)}" > + <table cellspacing="0" cellpadding="0" border="0" + id="tablehide#{clientId}" + class="dr-pmenu-item rich-pmenu-item #{this:getFullStyleClass( context, component )} " + style="#{this:getFullStyle( context, component )}" > + <f:call name="utils.encodeAttributes"> <f:parameter value="onclick,onmousedown,onmouseup,onmousemove" /> </f:call> - <tr> - <f:call name="utils.encodeId"/> - <f:call name="insertTDs"/> - <td id="leftIcon#{clientId}" class="#{this:getIconClass( context, component )}"> - <f:call name="insertImage"> - <f:parameter value="left"/> - </f:call> - </td> - <td id="icon#{clientId}" class="#{this:getLabelClass( context, component )}" style="width:100%"> + + <tr> + <f:call name="utils.encodeId"/> + <td> + <f:call name="insertSpacerImages" /> + <f:call name="insertImage"> + <f:parameter value="left" /> + </f:call> + </td> + <td style="width:100%" id="icon#{clientId}" class="dr-pmenu-group-self-label #{this:getLabelClass( context, component )}" > <input type="hidden" name="panelMenuAction#{clientId}" value=""/> <f:call name="insertValue"/> <vcp:body> <f:call name="renderChildren" /> - </vcp:body> - <f:clientid var="clientId"/> - </td> - <td id="rightIcon#{clientId}" class="#{this:getIconClass( context, component )}"> - <f:call name="insertImage"> - <f:parameter value="right"/> - </f:call> - </td> - </tr> - </table> - </td> - </tr> + </vcp:body> + </td> + <td> + <f:call name="insertImage"> + <f:parameter value="right" /> + </f:call> + </td> + </tr> + </table> + </div> </f:root> \ No newline at end of file Modified: trunk/sandbox/panelmenu/src/test/java/org/richfaces/component/PanelMenuComponentTest.java =================================================================== --- trunk/sandbox/panelmenu/src/test/java/org/richfaces/component/PanelMenuComponentTest.java 2007-06-15 11:59:47 UTC (rev 1199) +++ trunk/sandbox/panelmenu/src/test/java/org/richfaces/component/PanelMenuComponentTest.java 2007-06-15 12:35:29 UTC (rev 1200) @@ -84,6 +84,7 @@ private UIPanelMenu panelMenu; private UIPanelMenuGroup group1; private UIPanelMenuGroup group2; + private UIPanelMenuGroup group3; private UIPanelMenuItem item1; private UIPanelMenuItem item2; @@ -115,6 +116,10 @@ item1.setId("item1"); group1.getChildren().add(item1); + group3 = (UIPanelMenuGroup)application.createComponent("org.richfaces.panelMenuGroup"); + group3.setId("subgroup"); + group2.getChildren().add(group3); + item2 = (UIPanelMenuItem)application.createComponent("org.richfaces.panelMenuItem"); item2.setId("item2"); item2.setDisabled(true); @@ -179,26 +184,46 @@ assertNotNull(page); System.out.println(page.asXml()); - HtmlElement table = page.getHtmlElementById(panelMenu.getClientId(facesContext)); - assertNotNull(table); - assertEquals("table", table.getNodeName()); + HtmlElement div = page.getHtmlElementById(panelMenu.getClientId(facesContext)); + assertNotNull(div); + assertEquals("div", div.getNodeName()); + HtmlElement firstGroupDiv = page.getHtmlElementById("tdhide" + group1.getClientId(facesContext)); + assertNotNull(firstGroupDiv); + assertEquals("div", firstGroupDiv.getNodeName()); + + String styleClass = firstGroupDiv.getAttributeValue("class"); + assertTrue(styleClass.contains("dr-pmenu-group-div")); + HtmlElement firstGroupHide = page.getHtmlElementById("tablehide" + group1.getClientId(facesContext)); assertNotNull(firstGroupHide); assertEquals("table", firstGroupHide.getNodeName()); - String styleClass = firstGroupHide.getAttributeValue("class"); - assertTrue(styleClass.contains("dr-pmenu-group")); + styleClass = firstGroupHide.getAttributeValue("class"); + assertTrue(styleClass.contains("dr-pmenu-top-group")); assertTrue(styleClass.contains("rich-pmenu-group")); assertTrue(styleClass.contains("rich-pmenu-disabled-element")); + assertTrue(styleClass.contains("dr-pmenu-disabled-element")); + HtmlElement subGroupDiv = page.getHtmlElementById("tdhide" + group3.getClientId(facesContext)); + assertNotNull(subGroupDiv); + assertEquals("div", subGroupDiv.getNodeName()); + + HtmlElement subGroupHide = page.getHtmlElementById("tablehide" + group3.getClientId(facesContext)); + assertNotNull(subGroupHide); + assertEquals("table", subGroupHide.getNodeName()); + + styleClass = subGroupHide.getAttributeValue("class"); + assertTrue(styleClass.contains("dr-pmenu-group")); + assertTrue(styleClass.contains("rich-pmenu-group")); + HtmlElement leftIcon = page.getHtmlElementById("leftIcon" + group1.getClientId(facesContext)); assertNotNull(leftIcon); - assertEquals("td", leftIcon.getNodeName()); + assertEquals("img", leftIcon.getNodeName()); HtmlElement rightIcon = page.getHtmlElementById("rightIcon" + group1.getClientId(facesContext)); assertNotNull(rightIcon); - assertEquals("td", rightIcon.getNodeName()); + assertEquals("img", rightIcon.getNodeName()); HtmlElement firstItemHide = page.getHtmlElementById("tablehide" + item1.getClientId(facesContext)); assertNotNull(firstItemHide); @@ -210,11 +235,11 @@ leftIcon = page.getHtmlElementById("leftIcon" + item1.getClientId(facesContext)); assertNotNull(leftIcon); - assertEquals("td", leftIcon.getNodeName()); + assertEquals("img", leftIcon.getNodeName()); rightIcon = page.getHtmlElementById("rightIcon" + item1.getClientId(facesContext)); assertNotNull(rightIcon); - assertEquals("td", rightIcon.getNodeName()); + assertEquals("img", rightIcon.getNodeName()); HtmlElement secondItemHide = page.getHtmlElementById("tablehide" + item2.getClientId(facesContext)); assertNotNull(secondItemHide);

17 years, 6 months

1
0
0 / 0

JBoss Rich Faces SVN: r1199 - trunk/richfaces/menu-components/src/test/java/org/richfaces/renderkit/html.

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

Author: a.izobov Date: 2007-06-15 07:59:47 -0400 (Fri, 15 Jun 2007) New Revision: 1199 Modified: trunk/richfaces/menu-components/src/test/java/org/richfaces/renderkit/html/MenuItemRendererBaseTest.java Log: test fixed Modified: trunk/richfaces/menu-components/src/test/java/org/richfaces/renderkit/html/MenuItemRendererBaseTest.java =================================================================== --- trunk/richfaces/menu-components/src/test/java/org/richfaces/renderkit/html/MenuItemRendererBaseTest.java 2007-06-15 11:57:55 UTC (rev 1198) +++ trunk/richfaces/menu-components/src/test/java/org/richfaces/renderkit/html/MenuItemRendererBaseTest.java 2007-06-15 11:59:47 UTC (rev 1199) @@ -53,7 +53,7 @@ } public String getSubmitMode() { - return MenuComponent.MODE_AJAX; + return MenuComponent.MODE_SERVER; } public void setSubmitMode(String submitMode) {

17 years, 6 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits June 2007