November 2007 - richfaces-svn-commits

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

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

Author: artdaw Date: 2007-11-14 09:47:10 -0500 (Wed, 14 Nov 2007) New Revision: 3986 Modified: trunk/docs/userguide/en/src/main/docbook/included/orderingList.xml Log: RF - 1184 - edit JavaScript API section Modified: trunk/docs/userguide/en/src/main/docbook/included/orderingList.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/orderingList.xml 2007-11-14 14:46:45 UTC (rev 3985) +++ trunk/docs/userguide/en/src/main/docbook/included/orderingList.xml 2007-11-14 14:47:10 UTC (rev 3986) @@ -55,12 +55,12 @@ </para> <programlisting role="XML"><![CDATA[... <rich:orderingList value="#{bean.list}" var="list"> - <rich:column> - <f:facet name="header"> - <h:outputText value="Name" /> - </f:facet> - <h:inputText value="#{item.name}" /> - </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Name" /> + </f:facet> + <h:inputText value="#{item.name}" /> + </rich:column> <rich:orderingList> ... ]]></programlisting> @@ -114,12 +114,12 @@ </para> <programlisting role="XML"><![CDATA[... <rich:orderingList value="#{bean.simpleItems}" var="item" selection="#{bean.selection}" controlsType="link"> - <rich:column> - <f:facet name="header"> - <h:outputText value="Name" /> - </f:facet> - <h:outputText value="#{item}" /> - </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Name" /> + </f:facet> + <h:outputText value="#{item}" /> + </rich:column> </rich:orderingList> ...]]></programlisting> @@ -143,16 +143,16 @@ </para> <programlisting role="XML"><![CDATA[... <rich:orderingList value="#{bean.simpleItems}" var="item" controlsType="link"> - <f:facet name="caption"> - <h:outputText value="Caption" /> - </f:facet> - <h:outputText value="#{item}" /> - <rich:column> - <f:facet name="header"> - <h:outputText value="Name" /> + <f:facet name="caption"> + <h:outputText value="Caption" /> </f:facet> <h:outputText value="#{item}" /> - </rich:column> + <rich:column> + <f:facet name="header"> + <h:outputText value="Name" /> + </f:facet> + <h:outputText value="#{item}" /> + </rich:column> </rich:orderingList> ...]]></programlisting> @@ -186,18 +186,18 @@ <para> <programlisting role="XML"><![CDATA[... <rich:orderingList value="#{demoBean.items}" var="item" selection="#{bean.selection}" controlType="button"> - <f:facet name="topControl"> - <h:outputText value="Move to top"> - </f:facet> - <f:facet name="upControl"> - <h:outputText value="Move up"> - </f:facet> - <f:facet name="downControl"> - <h:outputText value="Move down"> - </f:facet> - <f:facet name="bottomControl"> - <h:outputText value="Move to bottom"> - </f:facet> + <f:facet name="topControl"> + <h:outputText value="Move to top"> + </f:facet> + <f:facet name="upControl"> + <h:outputText value="Move up"> + </f:facet> + <f:facet name="downControl"> + <h:outputText value="Move down"> + </f:facet> + <f:facet name="bottomControl"> + <h:outputText value="Move to bottom"> + </f:facet> <rich:orderingList> ... ]]></programlisting> @@ -284,15 +284,15 @@ <programlisting role="XML"><![CDATA[... <rich:orderingList> - <h:panelGrid columns="2" columnClasses="class1 class2"> - <h:outputText value="{list}"/> - <h:panelGroup> - <h:outputText value="{topControl}"/> - <h:outputText value="{upControl}"/> - <h:outputText value="{downControl}"/> - <h:outputText value="{bottomControl}"/> - </h:panelGroup> - </h:panelGrid> + <h:panelGrid columns="2" columnClasses="class1 class2"> + <h:outputText value="{list}"/> + <h:panelGroup> + <h:outputText value="{topControl}"/> + <h:outputText value="{upControl}"/> + <h:outputText value="{downControl}"/> + <h:outputText value="{bottomControl}"/> + </h:panelGroup> + </h:panelGrid> </rich:orderingList> ...]]> @@ -358,7 +358,7 @@ </row> <row> <entry>CTRL+Up arrow</entry> - <entry>Moves selected item to one position uppert</entry> + <entry>Moves selected item to one position upper</entry> </row> <row> <entry>CTRL+Down arrow</entry> @@ -391,79 +391,79 @@  <row> <entry>doSortAscending()</entry> - <entry>Invert current sorting</entry> + <entry>Sort items in the list ascending</entry> <entry>Component</entry> </row> <row> <entry>doSortDescending()</entry> - <entry/> + <entry>Sort items in the list descending</entry> <entry>Component</entry> </row> <row> <entry>doSort()</entry> - <entry/> + <entry>Invert current sorting</entry> <entry>Component</entry> </row>  <row> <entry>doHide()</entry> - <entry/> + <entry>Hide ordering control</entry> <entry>Any Ordering control</entry> </row> <row> <entry>doShow()</entry> - <entry/> + <entry>Show ordering control</entry> <entry>Any Ordering control</entry> </row> <row> <entry>isShown()</entry> - <entry/> + <entry>Check if current control is shown</entry> <entry>Any Ordering control</entry> </row> <row> <entry>doEnable()</entry> - <entry/> + <entry>Enable ordering control</entry> <entry>Any Ordering control</entry> </row> <row> <entry>doDisable()</entry> - <entry/> + <entry>Disable ordering control</entry> <entry>Any Ordering control</entry> </row> <row> <entry>isEnabled()</entry> - <entry/> + <entry>Check if current control is enabled</entry> <entry>Any Ordering control</entry> </row>  <row> <entry>moveUp()</entry> - <entry/> + <entry>Move up selected item in the list</entry> <entry>Any Item</entry> </row> <row> <entry>moveDown()</entry> - <entry/> + <entry>Move down selected item in the list</entry> <entry>Any Item</entry> </row> <row> <entry>moveTop()</entry> - <entry/> + <entry>Move top selected item in the list</entry> <entry>Any Item</entry> </row> <row> <entry>moveBottom()</entry> - <entry/> + <entry>Move bottom selected item in the list</entry> <entry>Any Item</entry> </row> <row> <entry>getSelection()</entry> - <entry/> + <entry>Return currently selected item</entry> <entry>Any Item</entry> </row> <row> <entry>getItems()</entry> - <entry/> + <entry>Return the collection of all items</entry> <entry>Any Item</entry> </row> </tbody>

18 years, 5 months

1
0
0 / 0

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

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

Author: artdaw Date: 2007-11-14 09:46:45 -0500 (Wed, 14 Nov 2007) New Revision: 3985 Modified: trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml Log: RF - 1174 - edit JavaScript API section, Deatails of Usage, add examples Modified: trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2007-11-14 14:22:36 UTC (rev 3984) +++ trunk/docs/userguide/en/src/main/docbook/included/listShuttle.xml 2007-11-14 14:46:45 UTC (rev 3985) @@ -15,12 +15,12 @@ </para> <programlisting role="XML"><![CDATA[... <rich:listShuttle value="#{bean.list}" var="list" selection="#{value.resultList}"> - <f:facet name=header> - <h:outputText value="Header1"/> - </f:facet> - <rich:column> - <h:outputText value="#{list.text}"> - </rich:column> + <f:facet name=header> + <h:outputText value="Header1"/> + </f:facet> + <rich:column> + <h:outputText value="#{list.text}"> + </rich:column> <rich:listShuttle> ...]]></programlisting> </section> @@ -37,28 +37,253 @@ </section> <section> <title>Details of Usage</title> - <para>The <emphasis role="bold"> <property><rich:listShuttle></property> - </emphasis> component is represented with the next tags: <itemizedlist> - <listitem><emphasis role="bold"> - <property><rich:listShuttle></property> - </emphasis> - the tag defines all the component properties like list binding, - sorting possibility, ordering controls set, move/copy controls set, behavioral - and look and feel properties</listitem> - <listitem>facets with <emphasis> - <property>"source"</property> - </emphasis> and <emphasis> - <property>"target"</property> - </emphasis> names to build lists with different columns sets.</listitem> - <listitem><emphasis role="bold"> - <property><rich:column></property> - </emphasis>, <emphasis role="bold"> - <property><h:column></property> - </emphasis> is used to define columns for every row.</listitem> + </emphasis> component consists of the following parts: <itemizedlist> + <listitem>two item lists (source and target). List consists of items; each item has + three different representations: common, selected, active</listitem> + <listitem>optional caption, header (sorted and non-sorted), footer elements</listitem> + <listitem>copy/moving controls set, a set of controls, which performs moving/copying + items between lists</listitem> + <listitem>optional ordering controls set, a set of controls that performs + reordering</listitem> </itemizedlist> </para> - + <para>The <emphasis role="bold"> + <property><rich:listShuttle></property> + </emphasis> component provides to use <emphasis> + <property>"source"</property> + </emphasis> and <emphasis> + <property>"target"</property> + </emphasis> facets. It is possible to use the facets only together defined. In case the + facets definition skipped – both lists contain the columns defined nested to listShuttle + component.</para> + <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[... +<rich:listShuttle sourceValue="#{bean.list}" var="list" value="#{value.resultList}"> + <f:facet name="source"> + <rich:column> + <h:outputText value="#{list.text}"/> + </rich:column> + </f:facet> + <f:facet name="target"> + <rich:column> + <h:outputText value="#{list.text}"/> + </rich:column> + <rich:column> + <h:outputText value="#{list.description}"/> + </rich:column> + </f:facet> +<rich:listShuttle> + +...]]></programlisting> +  + <para>Captions could be added to a list only after it was defined as a <emphasis> + <property>sourceCaption</property> + </emphasis> and <emphasis> + <property>targetCaption</property> + </emphasis> named facets inside the component or defined with the <emphasis> + <property>sourceCaptionLabel</property> + </emphasis> and <emphasis> + <property>targetCaptionLabel</property> + </emphasis> attribute.</para> +  + <para>The <emphasis role="bold"> + <property><rich:listShuttle></property> + </emphasis> component provides the possibility to use <property> "ordering + controls set" </property>, which performs reordering in the target item + list. Every control has possibility to be disabled. </para> + <para> + <property> + <emphasis>"topControl"</emphasis> + </property>, <property> + <emphasis>"topControlDisabled"</emphasis> + </property>, <property> + <emphasis>"bottomControl"</emphasis> + </property>, <property> + <emphasis>"bottomControlDisabled"</emphasis> + </property>, <property> + <emphasis>"upControl"</emphasis> + </property>, <property> + <emphasis>"upControlDisabled"</emphasis> + </property>, <property> + <emphasis>"downControl"</emphasis> + </property>, <property> + <emphasis>"downControlDisabled"</emphasis> + </property> facets are used to replaces the default control with facets content. </para> + <para> + <emphasis role="bold">Example:</emphasis> + </para> + <para> + <programlisting role="XML"><![CDATA[... +<rich:orderingList value="#{demoBean.items}" var="item" controlType="button"> + <f:facet name="topControl"> + <h:outputText value="Move to top"> + </f:facet> + <f:facet name="upControl"> + <h:outputText value="Move up"> + </f:facet> + <f:facet name="downControl"> + <h:outputText value="Move down"> + </f:facet> + <f:facet name="bottomControl"> + <h:outputText value="Move to bottom"> + </f:facet> +<rich:orderingList> +... +]]></programlisting> + </para> +  + <para>The <emphasis role="bold"> + <property><rich:listShuttle></property> + </emphasis>component also provides 4 predefined controls in <property> + "move/copy controls set" </property> for moving or copying items + between source and target lists. Every control has possibility to be disabled. </para> + <para> + <property> + <emphasis>"copyCotrol"</emphasis> + </property>, <property> + <emphasis>"copy_disabled"</emphasis> + </property>, <property> + <emphasis>"removeControl"</emphasis> + </property>, <property> + <emphasis>"remove_disabled"</emphasis> + </property>, <property> + <emphasis>"copyAllControl"</emphasis> + </property>, <property> + <emphasis>"copyAll_disabled"</emphasis> + </property>, <property> + <emphasis>"removeAllControl"</emphasis> + </property>, <property> + <emphasis>"removeAll_disabled"</emphasis> + </property> facets are used to replaces the default control with facets content. </para> +  + <para> The <property> + <emphasis>"sourceValue"</emphasis> + </property> attribute defines the collection to be shown in source list.</para> + <para> The <property> + <emphasis>"value"</emphasis> + </property> attribute defines the collection to store the value from target list.</para> + <para> The <property> + <emphasis>"var"</emphasis> + </property> could be shared between both collections to defined lists on the page.</para> + <para>Controls rendering is based on the<property> + <emphasis>"controlsType"</emphasis> + </property> attribute. Possible types are button, link, none.</para> The position of the + <property>ordering controls set</property> relatively to list should be customized with <property> + <emphasis>"orderControlsVerticalAlign"</emphasis> + </property> attribute. The position of the <property>move/copy controls set</property> + relatively to lists should be customized with <property> + <emphasis>"moveControlsVerticalAlign"</emphasis> + </property> attribute.  + <para>The <emphasis role="bold"> + <property><rich:listShuttle></property> + </emphasis> component provides the possibility to be customized using templating. The + customization could be performed by layout definition nested to component.</para> + <para>10 elements could be provided to be defined inside template (all standard controls + should also possible to use inside): sourceList, targetList, CopyControl, removeCotrol, + copyAllControl, removeAllControl, topcontrol, bottomControl, downCotrol, upControl.</para> + <para>The markup defined in the initial picture could be defined as in the following example.</para> + <para> + <emphasis role="bold">Example:</emphasis> + </para> + <programlisting role="XML"><![CDATA[... +<rich:listShuttle> +  + ... +  + <h:panelGrid columns="4"> + <h:outputText value="{sourceList}"/> + <h:panelGroup> + <h:outputText value="{copyAllControl}"/> + <h:outputText value="{copyControl}"/> + <h:outputText value="{removeControl}"/> + <h:outputText value="{removeAllControl}"/> + </h:panelGroup> + <h:outputText value="targetList"/> + <h:panelGroup> + <h:outputText value="{topControl}"/> + <h:outputText value="{upControl}"/> + <h:outputText value="{downControl}"/> + <h:outputText value="{bottomControl}"/> + </h:panelGroup> + </h:panelGrid> + </rich:listShuttle> + +... +]]></programlisting> + + <para>Keyboard usage</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>Described in selection behaviour requirement</entry> + </row> + <row> + <entry>SHIFT+click</entry> + <entry>Described in selection behaviour requirement</entry> + </row> + <row> + <entry>CTRL+A</entry> + <entry>Selects all elements inside the list if some active element is + already present in a list</entry> + </row> + <row> + <entry>Space</entry> + <entry>Inverts selection on the active element</entry> + </row> + <row> + <entry>Up, Down arrows</entry> + <entry>Change the active element to the next or previous in a list and make + it the only selected. Scroll should follow the selection to keep it + visible</entry> + </row> + </tbody> + </tgroup> + </table> + <table> + <title>Keyboard usage for elements reordering</title> + <tgroup cols="2"> + <thead> + <row> + <entry>Keys and combinations </entry> + <entry>Description</entry> + </row> + </thead> + <tbody> +  + <row> + <entry>Home</entry> + <entry>Moves selected set to the top of a list</entry> + </row> + <row> + <entry>End</entry> + <entry>Moves selected set to the bottomof a list</entry> + </row> + <row> + <entry>CTRL+Up arrow</entry> + <entry>Moves selected item to one position upper</entry> + </row> + <row> + <entry>CTRL+Down arrow</entry> + <entry>Moves selected item to one position lower</entry> + </row> + </tbody> + </tgroup> + </table> </section> <section> <title>JavaScript API</title> @@ -80,100 +305,100 @@  <row> <entry>doSortAscending()</entry> - <entry>Invert current sorting</entry> + <entry>Sort items in the list ascending</entry> <entry>Component</entry> </row> <row> <entry>doSortDescending()</entry> - <entry/> + <entry>Sort items in the list descending</entry> <entry>Component</entry> </row> <row> <entry>doSort()</entry> - <entry/> + <entry>Invert current sorting</entry> <entry>Component</entry> </row>  <row> <entry>doHide()</entry> - <entry/> + <entry>Hide ordering control</entry> <entry>Any Ordering control</entry> </row> <row> <entry>doShow()</entry> - <entry/> + <entry>Show ordering control</entry> <entry>Any Ordering control</entry> </row> <row> <entry>isShown()</entry> - <entry/> + <entry>Check if current control is shown</entry> <entry>Any Ordering control</entry> </row> <row> <entry>doEnable()</entry> - <entry/> + <entry>Enable ordering control</entry> <entry>Any Ordering control</entry> </row> <row> <entry>doDisable()</entry> - <entry/> + <entry>Disable ordering control</entry> <entry>Any Ordering control</entry> </row> <row> <entry>isEnabled()</entry> - <entry/> + <entry>Check if current control is enabled</entry> <entry>Any Ordering control</entry> </row>  <row> <entry>moveUp()</entry> - <entry/> + <entry>Move up selected item in the list</entry> <entry>Any Item</entry> </row> <row> <entry>moveDown()</entry> - <entry/> + <entry>Move down selected item in the list</entry> <entry>Any Item</entry> </row> <row> <entry>moveTop()</entry> - <entry/> + <entry>Move top selected item in the list</entry> <entry>Any Item</entry> </row> <row> <entry>moveBottom()</entry> - <entry/> + <entry>Move bottom selected item in the list</entry> <entry>Any Item</entry> </row> <row> <entry>copy()</entry> - <entry/> + <entry>Copy selected item from the source list to the target list</entry> <entry>Any Item</entry> </row> <row> <entry>remove()</entry> - <entry/> + <entry>Remove selected item from the target list to the source list</entry> <entry>Any Item</entry> </row> <row> <entry>copyAll()</entry> - <entry/> + <entry>Copy all items from the source list to the target list</entry> <entry>Any Item</entry> </row> <row> <entry>removeAll()</entry> - <entry/> + <entry>Remove all items from the target list to the source list</entry> <entry>Any Item</entry> </row> <row> <entry>getSelection()</entry> - <entry/> - <entry/> + <entry>Return currently selected item</entry> + <entry>Any Item</entry> </row> <row> <entry>getItems()</entry> - <entry/> - <entry/> + <entry>Return the collection of all items</entry> + <entry>Any Item</entry> </row> </tbody> </tgroup> @@ -198,11 +423,11 @@ </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>Style classes</title> <mediaobject> @@ -211,9 +436,9 @@ </imageobject> </mediaobject> </figure> - +  - + <table> <title>Classes names that define a caption representations in the source list</title> <tgroup cols="2"> @@ -324,7 +549,7 @@ </tgroup> </table> <table> - <title>Classes names that define a cells representations in the target list</title> + <title>Classes names that define a cells representations in the target list</title> <tgroup cols="2"> <thead> <row> @@ -378,17 +603,17 @@ <entry>rich-shuttle-down</entry> <entry>Defines class for Down control</entry> </row> - + <row> <entry>rich-shuttle-copy</entry> <entry>Defines class for Copy control</entry> </row> - + <row> <entry>rich-shuttle-remove</entry> <entry>Defines class for Remove control</entry> </row> - + <row> <entry>rich-shuttle-copyAll</entry> <entry>Defines class for copyAll control</entry> @@ -405,13 +630,14 @@ </tgroup> </table> <para>In order to redefine styles for all <emphasis role="bold"> - <property><rich:listShuttle></property> - </emphasis> components on a page using CSS, it's enough to create classes with the same names and define necessary properties in them. - </para> + <property><rich:listShuttle></property> + </emphasis> components on a page using CSS, it's enough to create classes with the same + names and define necessary properties in them. </para> <para>To change styles of particular <emphasis role="bold"> - <property><rich:listShuttle></property> - </emphasis> components, define your own style classes in the corresponding <emphasis role="bold"> - <property><rich:listShuttle></property> - </emphasis> component attributes.</para> + <property><rich:listShuttle></property> + </emphasis> components, define your own style classes in the corresponding <emphasis + role="bold"> + <property><rich:listShuttle></property> + </emphasis> component attributes.</para> </section> - </section> +</section>

18 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r3984 - in management/design/orderingList/markup: ol_images and 1 other directory.

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

Author: nbelaevski Date: 2007-11-14 09:22:36 -0500 (Wed, 14 Nov 2007) New Revision: 3984 Added: management/design/orderingList/markup/ol_images/bg_header.png management/design/orderingList/markup/ol_images/bg_press.png management/design/orderingList/markup/ol_images/bg_select.png Modified: management/design/orderingList/markup/ol_images/bottom.gif management/design/orderingList/markup/ol_images/down.gif management/design/orderingList/markup/ol_images/top.gif management/design/orderingList/markup/ol_images/up.gif management/design/orderingList/markup/ordering_list.html Log: Updated markup committed Added: management/design/orderingList/markup/ol_images/bg_header.png =================================================================== (Binary files differ) Property changes on: management/design/orderingList/markup/ol_images/bg_header.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: management/design/orderingList/markup/ol_images/bg_press.png =================================================================== (Binary files differ) Property changes on: management/design/orderingList/markup/ol_images/bg_press.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: management/design/orderingList/markup/ol_images/bg_select.png =================================================================== (Binary files differ) Property changes on: management/design/orderingList/markup/ol_images/bg_select.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: management/design/orderingList/markup/ol_images/bottom.gif =================================================================== (Binary files differ) Modified: management/design/orderingList/markup/ol_images/down.gif =================================================================== (Binary files differ) Modified: management/design/orderingList/markup/ol_images/top.gif =================================================================== (Binary files differ) Modified: management/design/orderingList/markup/ol_images/up.gif =================================================================== (Binary files differ) Modified: management/design/orderingList/markup/ordering_list.html =================================================================== --- management/design/orderingList/markup/ordering_list.html 2007-11-14 14:14:19 UTC (rev 3983) +++ management/design/orderingList/markup/ordering_list.html 2007-11-14 14:22:36 UTC (rev 3984) @@ -4,19 +4,29 @@ <title>Ordering List</title> <style> .ol_header{padding : 1px;} - .ol_headerlabel{font-family : Arial; font-size :11px; font-weight : bold; padding : 3px 3px 3px 8px} - .ol_body{border : 1px solid #bfbfc0; background-color : #e7f2fb;} - .ol_list{overflow : auto; width : 200px; height : 150px; background : #FFFFFF; border : 1px solid #bfbfc0; margin : 0px 8px 8px 8px;} - .ol_button_layout{padding : 15px 8px 15px 0px; vertical-align : top} - .ol_button{background : #4A75B5; border : 1px solid #bfbfc0; margin-bottom : 3px; cursor : pointer; padding : 1px} + + .ol_label{font-family : Arial; font-size :11px; font-weight : bold;} + .ol_out_label{padding : 3px 3px 3px 8px} + .ol_in_label{padding : 3px 3px 3px 0px} + + .ol_body{border : 0px solid #bfbfc0;} + + .ol_list{overflow : auto; width : 200px; height : 150px; background : #FFFFFF; border : 1px solid #bfbfc0;} + .ol_outputlist{ margin : 0px 8px 8px 8px;} + .ol_inputlist{ margin : 0px 8px 8px 0px;} + + .ol_button_layout{padding : 15px 8px 15px 0px;} + .ol_button{background : url(ol_images/bg_header.png) top left #C6D6EA; border : 1px solid #bfbfc0; margin-bottom : 3px; cursor : pointer; padding : 1px} .ol_button_dis{background : #bfbfc0; border : 1px solid #bfbfc0; margin-bottom : 3px; padding : 1px} - .ol_button_press{background : #4A75B5; border : 1px solid #bfbfc0; margin-bottom : 3px; padding : 2px 0px 0px 2px} + .ol_button_press{background : url(ol_images/bg_press.png) top left repeat-x #EAF0F8; border : 1px solid #bfbfc0; margin-bottom : 3px; padding : 2px 0px 0px 2px} + .ol_center_button_col_valign{vertical-align : middle} + .ol_right_button_col_valign{vertical-align : middle} #internal_tab{width : 100%} #internal_tab .ol_endcol{border-right : 0px} - #internal_tab td{color : #000000; font-family : Arial; font-size :11px; border-bottom : 1px solid #bfbfc0;border-right : 1px solid #bfbfc0; padding : 2px} - #internal_tab th{background : #4A75B5; color : #FFFFFF; font-family : Arial; font-size :11px; font-weight : normal; border-bottom : 1px solid #bfbfc0;border-right : 1px solid #bfbfc0; padding : 2px} + #internal_tab td{font-family : Arial; font-size :11px; border-bottom : 1px solid #bfbfc0;border-top : 1px solid #FFFFFF; padding : 2px} + #internal_tab th{background : url(ol_images/bg_header.png) top left repeat-x #C6D6EA; color : #000000; font-family : Arial; font-size :11px; font-weight : normal; border-bottom : 1px solid #bfbfc0;border-right : 1px solid #bfbfc0;border-left : 1px solid #EAF0F8;border-top : 1px solid #FFFFFF; padding : 2px} #internal_tab tr.ol_select{background : #EAF0F8} - #internal_tab tr.ol_currant{background : #C6D6EA} + #internal_tab tr.ol_currant{background : #EAF0F8; color : #4A75B5;} </style> </head> @@ -25,12 +35,12 @@ <table border="0" cellpadding="0" cellspacing="0" class="ol_body"> <tr> <td colspan="2" class="ol_header"> - <div class="ol_headerlabel">Ordering List</div> + <div class="ol_label ol_out_label">Ordering List</div> </td> </tr> <tr> <td> - <div class="ol_list"> + <div class="ol_list ol_outputlist"> <table border="0" cellpadding="0" cellspacing="0" id="internal_tab"> <tr> <th nowrap> @@ -39,12 +49,9 @@ <th nowrap> Header 2 </th> - <th nowrap> + <th nowrap class="ol_endcol"> Header 3 </th> - <th nowrap class="ol_endcol"> - Header 4 - </th> </tr> <tr> <td nowrap> @@ -53,12 +60,9 @@ <td nowrap> Content 2 </td> - <td nowrap> + <td nowrap class="ol_endcol"> Content 3 </td> - <td nowrap class="ol_endcol"> - Content 4 - </td> </tr> <tr> <td nowrap> @@ -67,12 +71,9 @@ <td nowrap> Content 2 </td> - <td nowrap> + <td nowrap class="ol_endcol"> Content 3 </td> - <td nowrap class="ol_endcol"> - Content 4 - </td> </tr> <tr class="ol_select"> <td nowrap> @@ -81,12 +82,9 @@ <td nowrap> Content 2 </td> - <td nowrap> + <td nowrap class="ol_endcol"> Content 3 </td> - <td nowrap class="ol_endcol"> - Content 4 - </td> </tr> <tr> <td nowrap> @@ -95,12 +93,9 @@ <td nowrap> Content 2 </td> - <td nowrap> + <td nowrap class="ol_endcol"> Content 3 </td> - <td nowrap class="ol_endcol"> - Content 4 - </td> </tr> <tr class="ol_currant"> <td nowrap> @@ -109,12 +104,9 @@ <td nowrap> Content 2 </td> - <td nowrap> + <td nowrap class="ol_endcol"> Content 3 </td> - <td nowrap class="ol_endcol"> - Content 4 - </td> </tr> <tr class="ol_select"> <td nowrap> @@ -123,12 +115,9 @@ <td nowrap> Content 2 </td> - <td nowrap> + <td nowrap class="ol_endcol"> Content 3 </td> - <td nowrap class="ol_endcol"> - Content 4 - </td> </tr> <tr> <td nowrap> @@ -137,12 +126,9 @@ <td nowrap> Content 2 </td> - <td nowrap> + <td nowrap class="ol_endcol"> Content 3 </td> - <td nowrap class="ol_endcol"> - Content 4 - </td> </tr> <tr> <td nowrap> @@ -151,12 +137,9 @@ <td nowrap> Content 2 </td> - <td nowrap> + <td nowrap class="ol_endcol"> Content 3 </td> - <td nowrap class="ol_endcol"> - Content 4 - </td> </tr> <tr> <td nowrap> @@ -165,23 +148,21 @@ <td nowrap> Content 2 </td> - <td nowrap> + <td nowrap class="ol_endcol"> Content 3 </td> - <td nowrap class="ol_endcol"> - Content 4 - </td> </tr> </table> </div> </td> - <td class="ol_button_layout"> - <div class="ol_button" onmousedown="this.className='ol_button_press'" onmouseup="this.className='ol_button'" onmouseout="this.className='ol_button'"><img src="ol_images/top.gif" width="15" height="15" alt="" border="0"></div> + <td class="ol_center_button_col_valign"> + <div class="ol_button_layout"> <div class="ol_button" onmousedown="this.className='ol_button_press'" onmouseup="this.className='ol_button'" onmouseout="this.className='ol_button'"><img src="ol_images/up.gif" width="15" height="15" alt="" border="0"></div> <div class="ol_button" onmousedown="this.className='ol_button_press'" onmouseup="this.className='ol_button'" onmouseout="this.className='ol_button'"><img src="ol_images/down.gif" width="15" height="15" alt="" border="0"></div> - <div class="ol_button_dis"><img src="ol_images/bottom.gif" width="15" height="15" alt="" border="0"></div> + <div class="ol_button" onmousedown="this.className='ol_button_press'" onmouseup="this.className='ol_button'" onmouseout="this.className='ol_button'"><img src="ol_images/top.gif" width="15" height="15" alt="" border="0"></div> + <div class="ol_button" onmousedown="this.className='ol_button_press'" onmouseup="this.className='ol_button'" onmouseout="this.className='ol_button'""><img src="ol_images/bottom.gif" width="15" height="15" alt="" border="0"></div> + </div> </td> - </tr> </table> </body>

18 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r3983 - in branches/3.1.x/test-applications/jsp/src/main: java/calendar and 68 other directories.

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

Author: ayanul Date: 2007-11-14 09:14:19 -0500 (Wed, 14 Nov 2007) New Revision: 3983 Added: branches/3.1.x/test-applications/jsp/src/main/java/rich/MapComponent.java branches/3.1.x/test-applications/jsp/src/main/java/richTest/ branches/3.1.x/test-applications/jsp/src/main/java/richTest/RichTest.java branches/3.1.x/test-applications/jsp/src/main/java/scrollableDataTable/ branches/3.1.x/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java branches/3.1.x/test-applications/jsp/src/main/java/util/icon/ branches/3.1.x/test-applications/jsp/src/main/java/util/icon/Icon.java branches/3.1.x/test-applications/jsp/src/main/java/util/resources.properties branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/CalendarStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTableStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Insert/InsertProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Message/MessageProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Message/MessageStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2DStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/PanelProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/PanelStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBarStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/ScrollableDataTable/ branches/3.1.x/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/SeparatorProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/SeparatorStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/SpacerProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/SpacerStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanelProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanelStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/ToolBar/ToolBarProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/TooltipProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/TooltipStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Tree/TreeProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Action/ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Action/EventInfo.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Blank/ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Blank/Blank.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Blank/BlankProperty.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Blank/BlankStraightforward.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/styles/app.css Removed: branches/3.1.x/test-applications/jsp/src/main/java/div/ branches/3.1.x/test-applications/jsp/src/main/java/rich/Rich.java branches/3.1.x/test-applications/jsp/src/main/java/style/ branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DS.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DT.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Div/ branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DDMenu.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/RichTest/ branches/3.1.x/test-applications/jsp/src/main/webapp/Select/ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Div.xml branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Map.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichTest.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/SelectOneMenuPage.jsp Modified: branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarBean.java branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java branches/3.1.x/test-applications/jsp/src/main/java/dataScroller/DataScroller.java branches/3.1.x/test-applications/jsp/src/main/java/dataTable/DataTable.java branches/3.1.x/test-applications/jsp/src/main/java/ddMenu/DDMenu.java branches/3.1.x/test-applications/jsp/src/main/java/dnd/DndBean.java branches/3.1.x/test-applications/jsp/src/main/java/gmap/Gmap.java branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSlider/InputNumberSlider.java branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSpinner/InputNumberSpinner.java branches/3.1.x/test-applications/jsp/src/main/java/message/Message.java branches/3.1.x/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java branches/3.1.x/test-applications/jsp/src/main/java/paint2D/Paint2D.java branches/3.1.x/test-applications/jsp/src/main/java/paint2D/PaintData.java branches/3.1.x/test-applications/jsp/src/main/java/panel/Panel.java branches/3.1.x/test-applications/jsp/src/main/java/panelBar/PanelBar.java branches/3.1.x/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java branches/3.1.x/test-applications/jsp/src/main/java/rich/RichBean.java branches/3.1.x/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java branches/3.1.x/test-applications/jsp/src/main/java/sb/Data.java branches/3.1.x/test-applications/jsp/src/main/java/sb/Sb.java branches/3.1.x/test-applications/jsp/src/main/java/separator/Separator.java branches/3.1.x/test-applications/jsp/src/main/java/spacer/Spacer.java branches/3.1.x/test-applications/jsp/src/main/java/tabPanel/TabPanel.java branches/3.1.x/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java branches/3.1.x/test-applications/jsp/src/main/java/tooltip/Tooltip.java branches/3.1.x/test-applications/jsp/src/main/java/tree/Bean.java branches/3.1.x/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java branches/3.1.x/test-applications/jsp/src/main/java/util/skins/Skins.java branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Effect/Effect.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Insert/Insert.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Message/Message.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/Separator.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/Tree/Tree.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DragAndDrop.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Gmap.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Icon.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-TogglePanel.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-tooltip.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/web.xml branches/3.1.x/test-applications/jsp/src/main/webapp/index.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/jQuery/jQuery.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div/Div.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/Map.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/pages/main.jsp branches/3.1.x/test-applications/jsp/src/main/webapp/styles/styles.css Log: for jsp add straightforward add events test fix Calendar(add mode: ajax, server, location) Modified: branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarBean.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarBean.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -29,10 +29,13 @@ import java.util.StringTokenizer; import java.util.TimeZone; +import javax.el.ValueExpression; import javax.faces.event.ValueChangeEvent; import org.richfaces.event.CurrentDateChangeEvent; +import util.componentInfo.ComponentInfo; + public class CalendarBean { private static final String [] WEEK_DAY_SHORT = new String[] { "|>Sun*<|", @@ -47,6 +50,7 @@ "Sep +", "Oct +", "Nov +", "Dec +" }; private Locale locale; + private TimeZone tZone; private boolean popup; private boolean readonly; private boolean showInput; @@ -58,12 +62,12 @@ private boolean required; private Date currentDate; private Date selectedDate; + private String headerFacet; + private String mode; private String preloadDateRangeBegin; private String preloadDateRangeEnd; private String weekDay; private String month; - private String height; - private String width; private String pattern; private String jointPoint; private String direction; @@ -74,8 +78,44 @@ private String timeZone; private int zindex; private int counter; + private ComponentInfo info; - + public CalendarBean() { + mode = "client"; + label = "Button label"; + locale = new Locale("us","US",""); + popup = true; + pattern = "MMM d, yyyy"; + jointPoint = "bottom-left"; + direction = "bottom-right"; + readonly = true; + enableManualInput = false; + showInput = true; + boundary = "inactive"; + icon = null; + disabled = false; + bypassUpdates = false; + rendered = true; + zindex = 2; + toolTipMode = "none"; + required = false; + weekDay = "long"; + month = "none"; + timeZone = "Eastern European Time"; + preloadDateRangeBegin = "10.08.2007"; //d.m.y + preloadDateRangeEnd = "11.10.2007"; + } + + public boolean getRenderedAjax() { + if(mode.equalsIgnoreCase("ajax") && rendered) return true; + else return false; + } + + public boolean getRenderedClient() { + if(mode.equalsIgnoreCase("client") && rendered) return true; + else return false; + } + public String getTimeZone() { return timeZone; } @@ -118,32 +158,14 @@ this.pattern = pattern; } - - public CalendarBean() { - height = "400px"; - width = "400px"; - label = "Button label"; - locale = Locale.US; - popup = true; - pattern = "MMM d, yyyy"; - jointPoint = "bottom-left"; - direction = "bottom-right"; - readonly = true; - enableManualInput = false; - showInput = true; - boundary = "inactive"; - icon = null; - disabled = false; - bypassUpdates = false; - rendered = true; - zindex = 2; - toolTipMode = "none"; - required = false; - weekDay = "long"; - month = "none"; - timeZone = "Eastern European Time"; - preloadDateRangeBegin = "10.08.2007"; //d.m.y - preloadDateRangeEnd = "11.10.2007"; + + public void selectLocale(ValueChangeEvent event) { + String tLocale = (String) event.getNewValue(); + if (tLocale != null) { + String lang = tLocale.substring(0, 2); + String country = tLocale.substring(3); + locale = new Locale(lang, country, ""); + } } public Date getPrDateRangeBegin() { @@ -154,7 +176,6 @@ date.add(Integer.parseInt(st.nextToken())); } cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0); - System.out.println("prBegin " + cal.getTime()); return cal.getTime(); } @@ -166,7 +187,6 @@ date.add(Integer.parseInt(st.nextToken())); } cal.set(date.get(2), date.get(1) - 1, date.get(0), 12, 0, 0); - System.out.println("prEnd " + cal.getTime()); return cal.getTime(); } @@ -280,7 +300,6 @@ public void dcl(CurrentDateChangeEvent event) { System.out.println(event.getCurrentDateString()); - System.out.println("ajvhckndskncs"); } public void ddd(ValueChangeEvent event) { @@ -325,14 +344,6 @@ this.bypassUpdates = bypassUpdates; } - public String getHeight() { - return height; - } - - public void setHeight(String height) { - this.height = height; - } - public boolean isRendered() { return rendered; } @@ -357,14 +368,6 @@ this.zindex = zindex; } - public String getWidth() { - return width; - } - - public void setWidth(String width) { - this.width = width; - } - public boolean isRequired() { return required; } @@ -383,9 +386,7 @@ public TimeZone getTmZone() { TimeZone tZone = TimeZone.getDefault(); - System.out.println("timeZone" + timeZone + " tZone " + tZone); tZone.setID(timeZone); - System.out.println("timeZone" + timeZone + " tZone " + tZone); return tZone; } @@ -412,4 +413,139 @@ public void setWeekDay(String weekDay) { this.weekDay = weekDay; } + + public void setMode(String mode) { + this.mode = mode; + } + + public String getMode() { + return mode; + } + public void bTest1() { + setCurrentDate(new Date()); +// setTimeZone(); + setSelectedDate(new Date()); + changeIcons(); + setHeaderFacet("Test 1"); + setLocale(new Locale("de","DE","")); + setDirection("bottom-left"); + setEnableManualInput(false); + setDisabled(false); + setJointPoint("top-right"); + setMonth("long"); + setPattern("dd-MM-yyyy"); + setPopup(true); + setPreloadDateRangeBegin("10.09.2007"); + setPreloadDateRangeEnd("11.01.2008"); + setReadonly(true); + setRequired(true); + setShowInput(false); + setToolTipMode("single"); + setWeekDay("long"); + setZindex(3); + } + + public void bTest2() { +// setCurrentDate(new Date()); +// setTimeZone(); +// setSelectedDate(); + changeIcons(); + setHeaderFacet("Test 2"); + setLocale(new Locale("fr","FR","")); + setDirection("top-right"); + setEnableManualInput(true); + setDisabled(false); + setJointPoint("bottom-left"); + setMonth("none"); + setPattern("dd.MM.yyyy"); + setPopup(true); + setPreloadDateRangeBegin("10.09.2007"); + setPreloadDateRangeEnd("12.01.2008"); + setReadonly(true); + setRequired(true); + setShowInput(false); + setToolTipMode("single"); + setWeekDay("none"); + setZindex(3); + } + + public void bTest3() { +// setCurrentDate(new Date()); +// setTimeZone(); +// setSelectedDate(); + changeIcons(); + setHeaderFacet("Test 3"); + setLocale(new Locale("ru","RU","")); + setDirection("bottom-left"); + setEnableManualInput(false); + setDisabled(false); + setJointPoint("top-right"); + setMonth("long"); + setPattern("dd-MM-yyyy"); + setPopup(false); + setPreloadDateRangeBegin("10.09.2007"); + setPreloadDateRangeEnd("11.01.2008"); + setReadonly(false); + setRequired(false); + setShowInput(false); + setToolTipMode("single"); + setWeekDay("long"); + setZindex(3); + } + + public void bTest4() { +// setCurrentDate(new Date()); +// setTimeZone(); +// setSelectedDate(); + changeIcons(); + setHeaderFacet("Test 4"); + setLocale(new Locale("de","DE","")); + setDirection("bottom-left"); + setEnableManualInput(false); + setDisabled(true); + setJointPoint("top-right"); + setMonth("long"); + setPattern("dd-MM-yyyy"); + setPopup(false); + setPreloadDateRangeBegin("10.09.2007"); + setPreloadDateRangeEnd("11.01.2008"); + setReadonly(false); + setRequired(false); + setShowInput(false); + setToolTipMode("single"); + setWeekDay("none"); + setZindex(3); + } + + public void bTest5() { +// setCurrentDate(new Date()); +// setTimeZone(); +// setSelectedDate(); + changeIcons(); + setHeaderFacet("Test 5"); + setLocale(new Locale("de","DE","")); + setDirection("bottom-right"); + setEnableManualInput(false); + setDisabled(false); + setJointPoint("bottom-left"); + setMonth("none"); + setPattern("d/M/yy"); + setPopup(true); + setPreloadDateRangeBegin("09.09.2007"); + setPreloadDateRangeEnd("10.01.2008"); + setReadonly(false); + setRequired(true); + setShowInput(true); + setToolTipMode("none"); + setWeekDay("short"); + setZindex(1); + } + + public String getHeaderFacet() { + return headerFacet; + } + + public void setHeaderFacet(String headerFacet) { + this.headerFacet = headerFacet; + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/calendar/CalendarDataModelItemImpl.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -33,18 +33,9 @@ private Object data; private String styleClass; private Object toolTip; - private int day; private boolean enabled = true; - public int getDay() { - return day; - } - - public void setDay(int day) { - this.day = day; - } - /* (non-Javadoc) * @see org.richfaces.component.CalendarDataModelItem#getData() */ @@ -107,5 +98,8 @@ public void setEnabled(boolean enabled) { this.enabled = enabled; } - + + public int getDay() { + return 0; + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/dataScroller/DataScroller.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/dataScroller/DataScroller.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/dataScroller/DataScroller.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -51,7 +51,7 @@ dataTable = new ArrayList(); - for(int i=0;i<40;i++) + for(int i=0;i<1000;i++) { dataTable.add(new Data("Random",i)); } @@ -129,7 +129,43 @@ this.limitToList = limitToList; } - - + public void bTest1(){ + setAlign("left"); + setFastControls("auto"); + setLimitToList(false); + setMaxPages(20); + setRenderIfSinglePage(true); + } + public void bTest2(){ + setAlign("right"); + setFastControls("show"); + setLimitToList(false); + setMaxPages(30); + setRenderIfSinglePage(false); + } + + public void bTest3(){ + setAlign("center"); + setFastControls("hide"); + setLimitToList(false); + setMaxPages(10); + setRenderIfSinglePage(true); + } + + public void bTest4(){ + setAlign("center"); + setFastControls("auto"); + setLimitToList(true); + setMaxPages(30); + setRenderIfSinglePage(false); + } + + public void bTest5(){ + setAlign("left"); + setFastControls("show"); + setLimitToList(false); + setMaxPages(40); + setRenderIfSinglePage(true); + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/dataTable/DataTable.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/dataTable/DataTable.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/dataTable/DataTable.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -138,4 +138,44 @@ public void setR2rendered(boolean r2rendered) { this.r2rendered = r2rendered; } + + public void bTest1() { + setAlign("center"); + setBorder("4px"); + setC1rendered(false); + setColumnsWidth("300px"); + setWidth("500px"); + } + + public void bTest2() { + setAlign("left"); + setBorder("0px"); + setC1rendered(true); + setColumnsWidth("500px"); + setWidth("300px"); + } + + public void bTest3() { + setAlign("right"); + setBorder("5px"); + setC1rendered(true); + setColumnsWidth("100px"); + setWidth("200px"); + } + + public void bTest4() { + setAlign("center"); + setBorder("4px"); + setC1rendered(false); + setColumnsWidth("500px"); + setWidth("500px"); + } + + public void bTest5() { + setAlign("center"); + setBorder("4px"); + setC1rendered(false); + setColumnsWidth("400px"); + setWidth("800px"); + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/ddMenu/DDMenu.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/ddMenu/DDMenu.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/ddMenu/DDMenu.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -22,6 +22,7 @@ private boolean check; public DDMenu() { + selectMenu = "accord"; hideDelay = 0; showDelay = 0; verticalOffset = 0; @@ -177,4 +178,79 @@ public void setMode(String mode) { this.mode = mode; } + + public void bTest1(){ + setDirection("top-right"); + setEvent("onmouseover"); + setGroupDirection("top-up"); + setHideDelay(5); + setHorizontalOffset(1); + setHorizontalOffset(1); + setVerticalOffset(1); + setJointPoint("1px"); + setMode("none"); + setPopupWidth("300px"); + setShowDelay(1); + setDisabled(false); + } + + public void bTest2(){ + setDirection("bottom-right"); + setEvent("onclick"); + setGroupDirection("bottom-left"); + setHideDelay(5); + setShowDelay(5); + setHorizontalOffset(20); + setHorizontalOffset(20); + setVerticalOffset(20); + setJointPoint("bottom-right"); + setMode("ajax"); + setPopupWidth("200px"); + setDisabled(false); + } + + public void bTest3(){ + setDirection("bottom-left"); + setEvent("onmouseover"); + setGroupDirection("top-up"); + setHideDelay(10); + setShowDelay(10); + setHorizontalOffset(5); + setHorizontalOffset(5); + setVerticalOffset(5); + setJointPoint("top-left"); + setMode("server"); + setPopupWidth("50px"); + setDisabled(false); + } + + public void bTest4(){ + setDirection("top-left"); + setEvent("onmouseover"); + setGroupDirection("auto"); + setHideDelay(0); + setShowDelay(0); + setHorizontalOffset(0); + setHorizontalOffset(0); + setVerticalOffset(0); + setJointPoint("0px"); + setMode("ajax"); + setPopupWidth("auto"); + setDisabled(true); + } + + public void bTest5(){ + setDirection("auto"); + setEvent("onmouseover"); + setGroupDirection("auto"); + setHideDelay(1); + setShowDelay(5); + setHorizontalOffset(2); + setHorizontalOffset(2); + setVerticalOffset(2); + setJointPoint("auto"); + setMode("ajax"); + setPopupWidth("auto"); + setDisabled(true); + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/dnd/DndBean.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/dnd/DndBean.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/dnd/DndBean.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -23,12 +23,12 @@ } public void processDrop(DropEvent event) { - System.out.println("Bean.processDrop()"); + System.out.println("Bean.processDrop()" + event.getDropValue()); this.dragValue = event.getDragValue(); } - public void processDrag(DragEvent dragEvent) { - System.out.println("Bean.processDrag()"); + public void processDrag(DragEvent event) { + System.out.println("Bean.processDrag()"+ event.getDropValue()); } public List getTypes() { Modified: branches/3.1.x/test-applications/jsp/src/main/java/gmap/Gmap.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/gmap/Gmap.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/gmap/Gmap.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -3,14 +3,14 @@ public class Gmap { private String zoom; - private boolean continuousZoom; - private boolean doubleClickZoom; - private boolean dragging; + private String continuousZoom; + private String doubleClickZoom; + private String dragging; public Gmap() { - continuousZoom = false; - doubleClickZoom = false; - dragging = false; + continuousZoom = "false"; + doubleClickZoom = "false"; + dragging = "false"; } public String getZoom() { @@ -27,39 +27,28 @@ return null; } - public boolean isContinuousZoom() { + public String getContinuousZoom() { return continuousZoom; } - public void setContinuousZoom(boolean continuousZoom) { + public void setContinuousZoom(String continuousZoom) { this.continuousZoom = continuousZoom; } - public boolean isDoubleClickZoom() { + public String getDoubleClickZoom() { return doubleClickZoom; } - public void setDoubleClickZoom(boolean doubleClickZoom) { + public void setDoubleClickZoom(String doubleClickZoom) { this.doubleClickZoom = doubleClickZoom; } - public boolean isDragging() { + public String getDragging() { + return dragging; } - public void setDragging(boolean dragging) { - this.dragging = dragging; + public void setDragging(String dragging) { + this.dragging = dragging; } - - public String getContinuousZoomAsString() { - return String.valueOf(continuousZoom); - } - - public String getDoubleClickZoomAsString() { - return String.valueOf(continuousZoom); - } - - public String getDraggingAsString() { - return String.valueOf(continuousZoom); - } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSlider/InputNumberSlider.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSlider/InputNumberSlider.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSlider/InputNumberSlider.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,10 +1,16 @@ package inputNumberSlider; +import javax.faces.event.ValueChangeEvent; +import javax.faces.event.ValueChangeListener; + public class InputNumberSlider { - private int inputSize; private int maxlength; + private String requiredMessage; + private String inputPosition; + private String tabindex; + private String value; private String width; private String minValue; private String maxValue; @@ -14,7 +20,9 @@ private String inputStyle; private String tipStyle; private String handleStyle; - + private boolean immediate; + private boolean required; + private boolean showToolTip; private boolean disabled; private boolean showInput; private boolean rendered; @@ -22,7 +30,13 @@ private boolean showBoundaryValues; public InputNumberSlider() { - + immediate = false; + rendered = false; + showToolTip = false; + requiredMessage = "requiredMessage work!"; + inputPosition = "right"; + tabindex = "2"; + value = "30"; inputSize = 5; maxlength = 3; width = "300px"; @@ -41,6 +55,9 @@ showBoundaryValues=true; } + public void changeListener(ValueChangeEvent event) { + System.out.println("valueChangeListener " + event.toString()); + } public boolean isDisabled() { return disabled; @@ -200,5 +217,127 @@ public void setMaxlength(int maxlength) { this.maxlength = maxlength; } + + public boolean isImmediate() { + return immediate; + } + + public void setImmediate(boolean immediate) { + this.immediate = immediate; + } + + public boolean isRequired() { + return required; + } + + public void setRequired(boolean required) { + this.required = required; + } + + public boolean isShowToolTip() { + return showToolTip; + } + + public void setShowToolTip(boolean showToolTip) { + this.showToolTip = showToolTip; + } + + public String getRequiredMessage() { + return requiredMessage; + } + + public void setRequiredMessage(String requiredMessage) { + this.requiredMessage = requiredMessage; + } + + public String getInputPosition() { + return inputPosition; + } + + public void setInputPosition(String inputPosition) { + this.inputPosition = inputPosition; + } + + public String getTabindex() { + return tabindex; + } + + public void setTabindex(String tabindex) { + this.tabindex = tabindex; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + public void bTest1(){ + setMinValue("0"); + setMaxValue("9"); + setInputSize(1); + setInputPosition("right"); + setEnableManualInput(true); + setValue("3"); + setShowInput(true); + setStep("1"); + setShowToolTip(true); + setShowBoundaryValues(true); + setShowInput(true); + } + + public void bTest2(){ + setMinValue("1000"); + setMaxValue("99999"); + setInputSize(10); + setInputPosition("left"); + setEnableManualInput(false); + setValue("99999"); + setShowInput(true); + setStep("50"); + setShowToolTip(false); + setShowBoundaryValues(true); + setShowInput(true); + } + + public void bTest3(){ + setMinValue("101"); + setMaxValue("203"); + setInputSize(4); + setInputPosition("left"); + setEnableManualInput(false); + setValue("102"); + setShowInput(true); + setStep("2"); + setShowToolTip(false); + setShowBoundaryValues(true); + } + + public void bTest4(){ + setMinValue("10"); + setMaxValue("12"); + setInputSize(2); + setInputPosition("left"); + setEnableManualInput(false); + setValue("102"); + setShowInput(false); + setStep("2"); + setShowToolTip(false); + setShowBoundaryValues(true); + } + + public void bTest5(){ + setMinValue("-99999"); + setMaxValue("99999"); + setInputSize(15); + setInputPosition("right"); + setEnableManualInput(true); + setValue("103"); + setShowInput(true); + setStep("2"); + setShowToolTip(false); + setShowBoundaryValues(false); + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSpinner/InputNumberSpinner.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSpinner/InputNumberSpinner.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/inputNumberSpinner/InputNumberSpinner.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -4,18 +4,19 @@ // private String size; // private String controlPosition; - private int inputSize; - private String max; - private String min; - private String value; - private String step; - private String inputStyle; - private String style; - private String btnLabel = "ON"; - private boolean cycled; - private boolean disabled; - private boolean manualInput; - private boolean rendered; + private int inputSize; + private String tabindex; + private String max; + private String min; + private String value; + private String step; + private String inputStyle; + private String style; + private String btnLabel = "ON"; + private boolean cycled; + private boolean disabled; + private boolean manualInput; + private boolean rendered; public InputNumberSpinner() { // size= "200"; @@ -47,9 +48,10 @@ } } + /* - * public String getControlPosition() { return controlPosition; } public void - * setControlPosition(String controlPosition) { this.controlPosition = + * public String getControlPosition() { return controlPosition; } public + * void setControlPosition(String controlPosition) { this.controlPosition = * controlPosition; } */ @@ -154,4 +156,66 @@ this.inputSize = inputSize; } + public String getTabindex() { + return tabindex; + } + + public void setTabindex(String tabindex) { + this.tabindex = tabindex; + } + + public void bTest1(){ + setCycled(true); + setManualInput(true); + setInputSize(5); + setMin("0"); + setMax("20"); + setStep("1"); + setTabindex("2"); + setValue("1"); + } + + public void bTest2(){ + setCycled(false); + setManualInput(false); + setInputSize(10); + setMin("1000"); + setMax("99999"); + setStep("255"); + setTabindex("5"); + setValue("5555"); + } + + public void bTest3(){ + setCycled(true); + setManualInput(false); + setInputSize(3); + setMin("101"); + setMax("202"); + setStep("2"); + setTabindex("2"); + setValue("102"); + } + + public void bTest4(){ + setCycled(false); + setManualInput(true); + setInputSize(4); + setMin("33"); + setMax("66"); + setStep("11"); + setTabindex("3"); + setValue("55"); + } + + public void bTest5(){ + setCycled(true); + setManualInput(true); + setInputSize(15); + setMin("-99999"); + setMax("99999"); + setStep("33"); + setTabindex("5"); + setValue("101"); + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/message/Message.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/message/Message.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/message/Message.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -7,8 +7,12 @@ private boolean showDetail; private boolean showSummary; private boolean tooltip; + private String select1; + private String select2; + private String select3; + private String select4; + private String select5; - public Message() { msg = "select1"; layout = "table"; @@ -16,6 +20,11 @@ showDetail = true; showSummary = false; tooltip = true; + select1 = "error"; + select2 = "error"; + select3 = "error"; + select4 = "error"; + select5 = "error"; } public String getMsg() { @@ -65,4 +74,114 @@ public void setTitle(String title) { this.title = title; } + + public String getSelect1() { + return select1; + } + + public void setSelect1(String select1) { + this.select1 = select1; + } + + public String getSelect2() { + return select2; + } + + public void setSelect2(String select2) { + this.select2 = select2; + } + + public String getSelect3() { + return select3; + } + + public void setSelect3(String select3) { + this.select3 = select3; + } + + public String getSelect4() { + return select4; + } + + public void setSelect4(String select4) { + this.select4 = select4; + } + + public String getSelect5() { + return select5; + } + + public void setSelect5(String select5) { + this.select5 = select5; + } + + public void bTest1(){ + setLayout("table"); + setMsg("fatal"); + setShowDetail(true); + setShowSummary(true); + setTitle("Test1"); + setTooltip(true); + setSelect1("error"); + setSelect2("fatal"); + setSelect3("warn"); + setSelect4("info"); + setSelect5("passed"); + } + + public void bTest2(){ + setLayout("table"); + setMsg("error"); + setShowDetail(false); + setShowSummary(true); + setTitle("Test2"); + setTooltip(true); + setSelect1("error"); + setSelect2("fatal"); + setSelect3("fatal"); + setSelect4("passed"); + setSelect5("passed"); + } + + public void bTest3(){ + setLayout("table"); + setMsg("passed"); + setShowDetail(true); + setShowSummary(false); + setTitle("Test3"); + setTooltip(true); + setSelect1("error"); + setSelect2("error"); + setSelect3("passed"); + setSelect4("error"); + setSelect5("passed"); + } + + public void bTest4(){ + setLayout("table"); + setMsg("passed"); + setShowDetail(true); + setShowSummary(true); + setTitle("Test4"); + setTooltip(false); + setSelect1("warn"); + setSelect2("warn"); + setSelect3("warn"); + setSelect4("warn"); + setSelect5("warn"); + } + + public void bTest5(){ + setLayout("table"); + setMsg("warn"); + setShowDetail(false); + setShowSummary(false); + setTitle("Test5"); + setTooltip(false); + setSelect1("passed"); + setSelect2("fatal"); + setSelect3("error"); + setSelect4("passed"); + setSelect5("warn"); + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/modalPanel/ModalPanel.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -20,6 +20,8 @@ moveable=true; resizeable=true; + + } public int getHeight() { @@ -69,5 +71,49 @@ public void setWidth(int width) { this.width = width; } + + public void bTest1(){ + setHeight(300); + setWidth(450); + setMinHeight(250); + setMinWidth(400); + setMoveable(false); + setResizeable(false); + } + public void bTest2(){ + setHeight(350); + setWidth(400); + setMinHeight(400); + setMinWidth(450); + setMoveable(true); + setResizeable(false); + } + + public void bTest3(){ + setHeight(400); + setWidth(300); + setMinHeight(400); + setMinWidth(300); + setMoveable(true); + setResizeable(true); + } + + public void bTest4(){ + setHeight(450); + setWidth(450); + setMinHeight(450); + setMinWidth(450); + setMoveable(false); + setResizeable(true); + } + + public void bTest5(){ + setHeight(900); + setWidth(800); + setMinHeight(700); + setMinWidth(600); + setMoveable(true); + setResizeable(true); + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/paint2D/Paint2D.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/paint2D/Paint2D.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/paint2D/Paint2D.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,3 +1,12 @@ +/** @package + + Paint2D.java + + Copyright(c) exadel 2000 + + Author: Alex Yanul + Created: AY 7/30/2007 12:52:38 PM +*/ package paint2D; import java.awt.Color; @@ -3,12 +12,10 @@ import java.awt.Font; import java.awt.Graphics2D; -import java.awt.geom.AffineTransform; -import java.awt.geom.Rectangle2D; public class Paint2D { - private static int size = 100; private static float location = 150; - + + PaintData data = new PaintData(); private int width; private int height; @@ -22,15 +29,7 @@ private String border; private boolean rendered; private boolean style; - - public boolean isStyle() { - return style; - } - - public void setStyle(boolean style) { - this.style = style; - } - + public boolean isRerender() { return rendered; } @@ -48,27 +47,27 @@ } public Paint2D() { - + width = 400; align = "left"; height = 200; title = "Pain2D title"; bgcolor = "white"; rendered = true; - border = "4px"; + border = "2px"; style = false; } - + public String getStyleString() { if(style) return "style"; else return ""; } - + public void paint(Graphics2D g2, Object obj) { - PaintData data = (PaintData) obj; - int testLenght = data.text.length(); + data.setText(((PaintData) obj).getText()); + int testLenght = data.getText().length(); int fontSize = testLenght < 8 ? 40 : 40 - (testLenght - 8); if (fontSize < 12) fontSize = 12; Font font = new Font("Serif", Font.HANGING_BASELINE, fontSize); @@ -79,7 +78,7 @@ g2.translate(x, y); g2.setPaint(Color.BLUE); - g2.drawString(data.text, 0, 0); + g2.drawString(data.getText(), 0, 0); } public int getHeight() { @@ -154,14 +153,6 @@ this.location = location; } - public int getSize() { - return size; - } - - public void setSize(int size) { - this.size = size; - } - public boolean isRendered() { return rendered; } @@ -169,4 +160,77 @@ public void setRendered(boolean rendered) { this.rendered = rendered; } + + public boolean isStyle() { + return style; + } + + public void setStyle(boolean style) { + this.style = style; + } + + public void bTest1(){ + setAlign("top"); + setBgcolor("gray"); + setBorder("3"); + setFormat("gif"); + setHeight(300); + setWidth(300); + setVspace("15"); + setHspace("15"); + setTitle("Test1"); + //data.setText("Test1!"); + } + + public void bTest2(){ + setAlign("middle"); + setBgcolor("yellow"); + setBorder("1"); + setFormat("png"); + setHeight(400); + setWidth(300); + setVspace("0"); + setHspace("15"); + setTitle("Test2"); + //data.setText("Test2!"); + } + + public void bTest3(){ + setAlign("left"); + setBgcolor("lime"); + setBorder("10"); + setFormat("jpeg"); + setHeight(300); + setWidth(400); + setVspace("15"); + setHspace("0"); + setTitle("Test3"); + //data.setText("Test3!"); + } + + public void bTest4(){ + setAlign("right"); + setBgcolor("teal"); + setBorder("3"); + setFormat("gif"); + setHeight(400); + setWidth(600); + setVspace("0"); + setHspace("0"); + setTitle("Test4"); + //data.setText("Test4!"); + } + + public void bTest5(){ + setAlign("botton"); + setBgcolor("fuchsia"); + setBorder("3"); + setFormat("png"); + setHeight(400); + setWidth(450); + setVspace("-5"); + setHspace("-5"); + setTitle("Test5"); + //data.setText("Test5!"); + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/paint2D/PaintData.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/paint2D/PaintData.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/paint2D/PaintData.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -3,7 +3,7 @@ import java.io.Serializable; public class PaintData implements Serializable{ - String text; + private String text; public PaintData() { Modified: branches/3.1.x/test-applications/jsp/src/main/java/panel/Panel.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/panel/Panel.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/panel/Panel.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -57,6 +57,36 @@ else for(int i = 0; i < title.length; i++) title[i] = t + "_" + i; - } + + public void bTest1(){ + setWidth("500px"); + setHeight("300px"); + setTitle(new String [] {"Test1", "Test 1", "Test_1", "Test-1"}); + } + + public void bTest2(){ + setWidth("500px"); + setHeight("600px"); + setTitle(new String [] {"Test2", "Test 2", "Test_2", "Test-2"}); + } + + public void bTest3(){ + setWidth("50%"); + setHeight("300px"); + setTitle(new String [] {"Test3", "Test 3", "Test_3", "Test-3"}); + } + + public void bTest4(){ + setWidth("400px"); + setHeight("10%"); + setTitle(new String [] {"Test4", "Test 4", "Test_4", "Test-4"}); + } + + public void bTest5(){ + setWidth("400px"); + setHeight("400px"); + setTitle(new String [] {"Test5", "Test 5", "Test_5", "Test-5"}); + } + } Modified: branches/3.1.x/test-applications/jsp/src/main/java/panelBar/PanelBar.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/panelBar/PanelBar.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/panelBar/PanelBar.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -121,4 +121,33 @@ this.btnLabel = btnLabel; } + public void bTest1(){ + setWidth("500px"); + setHeight("300px"); + setLabel(new String [] {"Test1", "Test 1", "Test_1", "Test-1"}); + } + + public void bTest2(){ + setWidth("500px"); + setHeight("600px"); + setLabel(new String [] {"Test2", "Test 2", "Test_2", "Test-2"}); + } + + public void bTest3(){ + setWidth("50%"); + setHeight("300px"); + setLabel(new String [] {"Test3", "Test 3", "Test_3", "Test-3"}); + } + + public void bTest4(){ + setWidth("400px"); + setHeight("10%"); + setLabel(new String [] {"Test4", "Test 4", "Test_4", "Test-4"}); + } + + public void bTest5(){ + setWidth("400px"); + setHeight("400px"); + setLabel(new String [] {"Test5", "Test 5", "Test_5", "Test-5"}); + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/panelMenu/PanelMenu.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,6 +1,6 @@ package panelMenu; -import style.icon.Icon; +import util.icon.Icon; public class PanelMenu { @@ -23,16 +23,23 @@ width = "500px"; mode = "none"; expandMode = "none"; - align = ""; + align = "left"; rendered = "true"; disabled = false; tabIndex = "1"; + iconGroupPosition = "left"; + iconGroupTopPosition = "left"; iconItemPosition = "left"; iconItemTopPosition = "left"; - iconGroupPosition = "left"; - iconGroupTopPosition = "left"; + expandSingle = true; icon = new Icon(); - +/* icon.setCollapsed(icon.iconCollapse); + icon.setExpanded(icon.iconExpand); + icon.setItem(icon.iconItem); + icon.setIcon(icon.iconFileManager); + icon.setCollapsedGroup(icon.iconAjaxProcess); + icon.setDisabledGroup(icon.iconAjaxStoped); +*/ } public boolean isDisabled() { @@ -63,7 +70,6 @@ return rendered; } public void setRendered(String rendered) { - System.out.println(rendered); this.rendered = rendered; } public Icon getIcon() { @@ -128,4 +134,112 @@ public void setInputText(String inputText) { this.inputText = inputText; } + + public void bTest1(){ + icon.setCollapsed(icon.iconCollapse); + icon.setExpanded(icon.iconExpand); + icon.setItem(icon.iconItem); + icon.setIcon(icon.iconFileManager); + icon.setCollapsedGroup(icon.iconAjaxProcess); + icon.setDisabledGroup(icon.iconAjaxStoped); + + setWidth("400px"); + setAlign("right"); + setDisabled(false); + setExpandMode("ajax"); + setExpandSingle(false); + setIconGroupPosition("left"); + setIconGroupTopPosition("right"); + setIconItemPosition("left"); + setIconItemTopPosition("right"); + setMode("ajax"); + setTabIndex("3"); + } + + public void bTest2(){ + icon.setCollapsed(icon.iconExpand); + icon.setExpanded(icon.iconCollapse); + icon.setItem(icon.iconHeader); + icon.setIcon(icon.iconFileManagerReject); + icon.setCollapsedGroup(icon.iconAjaxStoped); + icon.setDisabledGroup(icon.iconAjaxProcess); + + setWidth("250px"); + setAlign("bottom"); + setDisabled(false); + setExpandMode("server"); + setExpandSingle(false); + setIconGroupPosition("right"); + setIconGroupTopPosition("left"); + setIconItemPosition("right"); + setIconItemTopPosition("left"); + setMode("server"); + setTabIndex("2"); + } + + public void bTest3(){ + icon.setCollapsed(icon.iconCollapse); + icon.setExpanded(icon.iconExpand); + icon.setItem(icon.iconItem); + icon.setIcon(icon.iconFileManager); + icon.setCollapsedGroup(icon.iconAjaxProcess); + icon.setDisabledGroup(icon.iconAjaxStoped); + + setWidth("400px"); + setAlign("middle"); + setDisabled(false); + setExpandMode("server"); + setExpandSingle(false); + setIconGroupPosition("right"); + setIconGroupTopPosition("right"); + setIconItemPosition("right"); + setIconItemTopPosition("left"); + setMode("none"); + setTabIndex("2"); + + } + + public void bTest4(){ + icon.setCollapsed(icon.iconExpand); + icon.setExpanded(icon.iconCollapse); + icon.setItem(icon.iconHeader); + icon.setIcon(icon.iconFileManagerReject); + icon.setCollapsedGroup(icon.iconAjaxStoped); + icon.setDisabledGroup(icon.iconAjaxProcess); + + setWidth("250px"); + setAlign("top"); + setDisabled(true); + setExpandMode("none"); + setExpandSingle(false); + setIconGroupPosition("left"); + setIconGroupTopPosition("left"); + setIconItemPosition("left"); + setIconItemTopPosition("left"); + setMode("ajax"); + setTabIndex("2"); + + } + + public void bTest5(){ + icon.setCollapsed(icon.iconCollapse); + icon.setExpanded(icon.iconExpand); + icon.setItem(icon.iconItem); + icon.setIcon(icon.iconFileManager); + icon.setCollapsedGroup(icon.iconAjaxProcess); + icon.setDisabledGroup(icon.iconAjaxStoped); + + setWidth("250px"); + setAlign("right"); + setDisabled(false); + setExpandMode("none"); + setExpandSingle(true); + setIconGroupPosition("right"); + setIconGroupTopPosition("right"); + setIconItemPosition("right"); + setIconItemTopPosition("right"); + setMode("none"); + setTabIndex("2"); + + } } Added: branches/3.1.x/test-applications/jsp/src/main/java/rich/MapComponent.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/rich/MapComponent.java (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/java/rich/MapComponent.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,21 @@ +package rich; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +public class MapComponent { + private Map<String, ArrayList<String>> m; + + public MapComponent() { + m = new HashMap<String, ArrayList<String>>(); + } + + public void add(String component, ArrayList<String> path) { + m.put(component, path); + } + + public ArrayList<String> get(String key){ + return m.get(key); + } +} Deleted: branches/3.1.x/test-applications/jsp/src/main/java/rich/Rich.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/rich/Rich.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/rich/Rich.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,7 +0,0 @@ -package rich; - -import java.util.ArrayList; - -public class Rich { - -} Modified: branches/3.1.x/test-applications/jsp/src/main/java/rich/RichBean.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/rich/RichBean.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/rich/RichBean.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -3,18 +3,71 @@ import java.util.ArrayList; public class RichBean { - private String src; - + private MapComponent map; + public RichBean() { - src = ""; + src = "Blank"; + map = new MapComponent(); + // map.add( value, add( pages_path/name_pages, array<boolean>(Property, Straightforward) ); + map.add("Blank", add("/pages/Blank/Blank", new boolean [] {true, true})); + map.add("Calendar", add("/Calendar/Calendar", new boolean [] {true, true})); + map.add("DataFilterSlider", add("/DataFilterSlider/DataFilterSlider", new boolean [] {true, false})); + map.add("DataScroller", add("/DataScroller/DataScroller", new boolean [] {true, true})); + map.add("DataTable", add("/DataTable/DataTable", new boolean [] {true, true})); + map.add("DragAndDrop", add("/DragAndDrop/DragAndDrop", new boolean [] {false, false})); + map.add("DropDownMenu", add("/DropDownMenu/DropDownMenu", new boolean [] {true, true})); + map.add("Effect", add("/Effect/Effect", new boolean [] {false, false})); + map.add("Gmap", add("/Gmap/Gmap", new boolean [] {true, false})); + map.add("InputNumberSlider", add("/InputNumberSlider/InputNumberSlider", new boolean [] {true, true})); + map.add("InputNumberSpinner", add("/InputNumberSpinner/InputNumberSpinner", new boolean [] {true, true})); + map.add("Insert", add("/Insert/Insert", new boolean [] {true, false})); + map.add("Message", add("/Message/Message", new boolean [] {true, true})); + map.add("ModalPanel", add("/ModalPanel/ModalPanel", new boolean [] {true, true})); + map.add("Paint2D", add("/Paint2D/Paint2D", new boolean [] {true, true})); + map.add("Panel", add("/Panel/Panel", new boolean [] {true, true})); + map.add("Panel2", add("/Panel/Panel2", new boolean [] {false, false})); + map.add("PanelBar", add("/PanelBar/PanelBar", new boolean [] {true, true})); + map.add("PanelMenu", add("/PanelMenu/PanelMenu", new boolean [] {true, true})); + map.add("Separator", add("/Separator/Separator", new boolean [] {true, true})); + map.add("SimpleTogglePanel", add("/SimpleTogglePanel/SimpleTogglePanel", new boolean [] {true, true})); + map.add("Spacer", add("/Spacer/Spacer", new boolean [] {true, true})); + map.add("SuggestionBox", add("/SuggestionBox/SuggestionBox", new boolean [] {true, true})); + map.add("TabPanel", add("/TabPanel/TabPanel", new boolean [] {true, true})); + map.add("TogglePanel", add("/TogglePanel/TogglePanel", new boolean [] {true, true})); + map.add("ToolBar", add("/ToolBar/ToolBar", new boolean [] {true, false})); + map.add("Tooltip", add("/Tooltip/Tooltip", new boolean [] {true, true})); + map.add("Tree", add("/Tree/Tree", new boolean [] {true, false})); + map.add("VirtualEarth", add("/VirtualEarth/VirtualEarth", new boolean [] {true, true})); + map.add("ScrollableDataTable", add("/ScrollableDataTable/ScrollableDataTable", new boolean [] {true, false})); + map.add("jQuery", add("/jQuery/jQuery", new boolean [] {false, false})); } public String getSrc() { return src; } + public String getPathComponent() { + return map.get(src).get(0); + } + + public String getPathProperty() { + return map.get(src).get(1); + } + + public String getPathStraightforward() { + return map.get(src).get(2); + } + public void setSrc(String src) { this.src = src; } + + private ArrayList<String> add(String path, boolean [] arr){ + ArrayList<String> list = new ArrayList<String>(); + list.add(path + ".jsp"); + if(arr[0]) list.add(path + "Property.jsp"); else list.add("/pages/Blank/BlankProperty.jsp"); + if(arr[1]) list.add(path + "Straightforward.jsp"); else list.add("/pages/Blank/BlankStraightforward.jsp"); + return list; + } } Added: branches/3.1.x/test-applications/jsp/src/main/java/richTest/RichTest.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/richTest/RichTest.java (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/java/richTest/RichTest.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,23 @@ +package richTest; + +import java.util.ArrayList; + +import org.richfaces.component.Dropzone; +import org.richfaces.event.DropEvent; +import org.richfaces.event.DropListener; + + +public class RichTest { + private String [] items = new String [] {"item 1", "item 2", "item 3", "item 4", "item 5", "item 6", "item 7", "item 8", "item 9", "item 10", "item 11", "item 12", "item 13", "item 14", "item 15"}; + + public RichTest() { + } + + public String[] getItems() { + return items; + } + + public void setItems(String[] items) { + this.items = items; + } +} Modified: branches/3.1.x/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/sTP/SimpleTogglePanel.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -5,7 +5,7 @@ private String switchType; // "client", "server"(default), "ajax" private String width; private String height; - + private String position = "right"; private boolean focus; private boolean rendered; @@ -56,4 +56,42 @@ public void setFocus(boolean focus) { this.focus = focus; } + + public void bTest1(){ + setHeight("80px"); + setWidth("300px"); + setSwitchType("ajax"); + } + + public void bTest2(){ + setHeight("10%"); + setWidth("100%"); + setSwitchType("client"); + } + + public void bTest3(){ + setHeight("80px"); + setWidth("100%"); + setSwitchType("server"); + } + + public void bTest4(){ + setHeight("10%"); + setWidth("200px"); + setSwitchType("client"); + } + + public void bTest5(){ + setHeight("400px"); + setWidth("250px"); + setSwitchType("client"); + } + + public String getPosition() { + return position; + } + + public void setPosition(String position) { + this.position = position; + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/sb/Data.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/sb/Data.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/sb/Data.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -7,10 +7,10 @@ private String flag; - public Data(String text, String label){ + public Data(String text, String alabelbel){ this.text = text; - this.label = label; - this.flag = "/images/flag.png"; + this.label = alabelbel; + this.flag="/pics/header.png"; } public String getLabel() { Modified: branches/3.1.x/test-applications/jsp/src/main/java/sb/Sb.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/sb/Sb.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/sb/Sb.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,261 +1,297 @@ package sb; -import java.util.*; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + import org.richfaces.renderkit.html.SuggestionBoxRenderer; -public class Sb { +public class Sb implements Serializable { - private ArrayList cities; - private ArrayList data; - private ArrayList tokens; - private int first; - private int zindex; - private String property; - private String rows; - private String cellspacing; - private String cellpadding; - private String minchars; - private String frequency; - private String rules; - private String border; - private String width; - private String height; - private String shadowOpacity; - private String bgColor; - private String shadowDepth; - private boolean focus; - private boolean check; - private boolean reRender; + private static final String[] cit = { "Abba", "Abbeville", "Acworth", + "Adairsville", "Adel", "Adrian", "Ailey", "Alamo", "Alapaha", + "Albany", "Allenhurst", "Alma", "Alma", "Alpharetta", "Alston", + "Amboy", "Ambrose", "Americus", "Appling", "Arlington", "Ashburn", + "Athens", "Athens-Clarke County", "Atkinson", "Atlanta", + "Attapulgus", "Auburn", "Augusta", "Augusta-Richmond County", + "Austell", "Avondale Estates", "Axson" }; + private ArrayList cities; + private ArrayList data; + private ArrayList tokens; + private int first; + private int zindex; + private String property; + private String rows; + private String cellspacing; + private String cellpadding; + private String minchars; + private String rules; + private String border; + private String width; + private String height; + private String shadowOpacity; + private String bgColor; + private String shadowDepth; - private static final String[] cit = {"Abba", "Abbeville", "Acworth", "Adairsville", "Adel", - "Adrian", "Ailey", "Alamo", "Alapaha", "Albany", "Allenhurst", "Alma", "Alma", - "Alpharetta", "Alston", "Amboy", "Ambrose", "Americus", "Appling", "Arlington", "Ashburn", - "Athens", "Athens-Clarke County", "Atkinson", "Atlanta", "Attapulgus", "Auburn", - "Augusta", "Augusta-Richmond County", "Austell", "Avondale Estates", "Axson"}; + private boolean focus; - public Sb() { + public Sb() { + focus = false; border = "1"; width = "200"; height = "150"; shadowOpacity = "1"; shadowDepth = Integer.toString(SuggestionBoxRenderer.SHADOW_DEPTH); - reRender = true; zindex = 3; - focus = true; rows = "0"; first = 0; cellspacing = "2"; cellpadding = "2"; minchars = "1"; - frequency = "0"; rules = "none"; setCities(getAllData()); + } - } + public List autocomplete(Object event) { + String pref = event.toString(); + ArrayList result = new ArrayList(); - public List autocomplete(Object event) { - String pref = event.toString(); - ArrayList result = new ArrayList(); - - Iterator iterator = getAllData().iterator(); - while (iterator.hasNext()) { - Data elem = (Data) iterator.next(); - if ((elem != null && elem.getText().toLowerCase().indexOf(pref.toLowerCase()) == 0) - || "".equals(pref)) { - result.add(elem); - } - } - return result; + Iterator iterator = getAllData().iterator(); + while (iterator.hasNext()) { + Data elem = (Data) iterator.next(); + if ((elem != null && elem.getText().toLowerCase().indexOf( + pref.toLowerCase()) == 0) + || "".equals(pref)) { + result.add(elem); + } } + return result; + } - public ArrayList getCities() { - return cities; + public void bTest1(){ + setBorder("2"); + setCellpadding("0"); + setCellspacing("0"); + setHeight("150"); + setWidth("200"); + setMinchars("1"); + setShadowDepth("11"); + setShadowOpacity("3"); + setZindex(3); } - public void setCities(ArrayList cities) { - this.cities = cities; + public void bTest2(){ + setBorder("0"); + setCellpadding("3"); + setCellspacing("3"); + setHeight("200"); + setWidth("200"); + setMinchars("1"); + setShadowDepth("1"); + setShadowOpacity("7"); + setZindex(3); } - public ArrayList getAllData() { - ArrayList result = new ArrayList(); - for (int i = 0; i < cit.length; i++) { - Data data = new Data(cit[i], String.valueOf(i + 1)); - result.add(data); - } - return result; + public void bTest3(){ + setBorder("1"); + setCellpadding("5"); + setCellspacing("0"); + setHeight("150"); + setWidth("200"); + setMinchars("2"); + setShadowDepth("1"); + setShadowOpacity("7"); + setZindex(3); } - public ArrayList getData() { - return data; + public void bTest4(){ + setBorder("1"); + setCellpadding("0"); + setCellspacing("5"); + setHeight("150"); + setWidth("200"); + setMinchars("2"); + setShadowDepth("7"); + setShadowOpacity("1"); + setZindex(3); } - public void setData(ArrayList data) { - this.data = data; + public void bTest5(){ + setBorder("4"); + setCellpadding("1"); + setCellspacing("1"); + setHeight("200"); + setWidth("400"); + setMinchars("2"); + setShadowDepth("5"); + setShadowOpacity("5"); + setZindex(1); } - public String getProperty() { - return property; + public ArrayList getAllData() { + ArrayList result = new ArrayList(); + for (int i = 0; i < cit.length; i++) { + Data data = new Data(cit[i], String.valueOf(i + 1)); + result.add(data); } + return result; + } - public void setProperty(String property) { - this.property = property; - } + public String getBgColor() { + return bgColor; + } - public String getCellpadding() { - return cellpadding; - } + public String getBorder() { + return border; + } - public void setCellpadding(String cellpadding) { - this.cellpadding = cellpadding; - } + public String getCellpadding() { + return cellpadding; + } - public String getCellspacing() { - return cellspacing; - } + public String getCellspacing() { + return cellspacing; + } - public void setCellspacing(String cellspacing) { - this.cellspacing = cellspacing; - } + public ArrayList getCities() { + return cities; + } - public boolean isCheck() { - return check; - } + public ArrayList getData() { + return data; + } - public void setCheck(boolean check) { - this.check = check; - } + public int getFirst() { + return first; + } - public int getFirst() { - return first; - } - public int getIntFirst() { - return first; - } + public String getHeight() { + return height; + } - public void setFirst(int first) { - this.first = first; - } + public int getIntFirst() { + return first; + } - public String getFrequency() { - return frequency; - } - public double getDoubleFrequency() { - return Double.parseDouble(getFrequency()); - } + public int getIntRows() { + return Integer.parseInt(getRows()); + } - public void setFrequency(String frequency) { - this.frequency = frequency; - } + public String getMinchars() { + return minchars; + } - public String getMinchars() { - return minchars; - } + public String getProperty() { + return property; + } - public void setMinchars(String minchars) { - this.minchars = minchars; - } + public String getRows() { + return rows; + } - public String getRows() { - return rows; - } - public int getIntRows() { - return Integer.parseInt(getRows()); - } + public String getRules() { + return rules; + } - public void setRows(String rows) { - this.rows = rows; - } + public String getShadowDepth() { + return shadowDepth; + } - public String getRules() { - return rules; - } + public String getShadowOpacity() { + return shadowOpacity; + } - public void setRules(String rules) { - this.rules = rules; - } + public ArrayList getTokens() { + return tokens; + } - public ArrayList getTokens() { - return tokens; - } + public String getWidth() { + return width; + } - public void setTokens(ArrayList tokens) { - this.tokens = tokens; - } - public void OnSelect() { - System.out.print("Onselect works!!!"); + public int getZindex() { + return zindex; + } - } + public boolean isFocus() { + return focus; + } - public String getBorder() { - return border; - } + public void OnSelect() { + System.out.print("Onselect works!!!"); - public void setBorder(String border) { - this.border = border; - } + } - public String getHeight() { - return height; - } + public void setBgColor(String bgColor) { + this.bgColor = bgColor; + } - public void setHeight(String height) { - this.height = height; - } + public void setBorder(String border) { + this.border = border; + } - public String getShadowOpacity() { - return shadowOpacity; - } + public void setCellpadding(String cellpadding) { + this.cellpadding = cellpadding; + } - public void setShadowOpacity(String shadowOpacity) { - this.shadowOpacity = shadowOpacity; - } + public void setCellspacing(String cellspacing) { + this.cellspacing = cellspacing; + } - public String getWidth() { - return width; - } + public void setCities(ArrayList cities) { + this.cities = cities; + } - public void setWidth(String width) { - this.width = width; - } + public void setData(ArrayList data) { + this.data = data; + } - public String getBgColor() { - return bgColor; - } + public void setFirst(int first) { + this.first = first; + } - public void setBgColor(String bgColor) { - this.bgColor = bgColor; - } + public void setFocus(boolean focus) { + this.focus = focus; + } - public boolean isFocus() { - return focus; - } + public void setHeight(String height) { + this.height = height; + } - public void setFocus(boolean focus) { - this.focus = focus; - } + public void setMinchars(String minchars) { + this.minchars = minchars; + } - public int getZindex() { - return zindex; - } + public void setProperty(String property) { + this.property = property; + } - public void setZindex(int zindex) { - this.zindex = zindex; - } + public void setRows(String rows) { + this.rows = rows; + } - public String getShadowDepth() { - return shadowDepth; - } + public void setRules(String rules) { + this.rules = rules; + } public void setShadowDepth(String shadowDepth) { - this.shadowDepth = shadowDepth; - } + this.shadowDepth = shadowDepth; + } - public boolean isReRender() { - return reRender; - } - - public void setReRender(boolean reRender) { - this.reRender = reRender; - } - + public void setShadowOpacity(String shadowOpacity) { + this.shadowOpacity = shadowOpacity; + } + + public void setTokens(ArrayList tokens) { + this.tokens = tokens; + } + + public void setWidth(String width) { + this.width = width; + } + + public void setZindex(int zindex) { + this.zindex = zindex; + } } Added: branches/3.1.x/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/java/scrollableDataTable/ScrollableDataTable.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,31 @@ +package scrollableDataTable; + +import java.util.ArrayList; +import java.util.Random; + +import dataScroller.Data; + +public class ScrollableDataTable +{ + private ArrayList<Data> data; + private String [] priority = {"blocker", "critical", "major", "minor", "trivial"}; + private String [] priorityIcon = {"/pics/sdt/priority_blocker.gif", "/pics/sdt/priority_critical.gif", "/pics/sdt/priority_major.gif", "/pics/sdt/priority_minor.gif", "/pics/sdt/priority_trivial.gif"}; + + public ScrollableDataTable() { + + data = new ArrayList<Data>(); + int k; + for(int i = 0; i < 10000; i++) { + k = new Random().nextInt(5); + data.add(new Data("Bug " + new Random().nextInt(10 + i), i,priority[k], priorityIcon[k])); + } + } + + public ArrayList<Data> getData() { + return data; + } + + public void setData(ArrayList<Data> data) { + this.data = data; + } +} \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/java/separator/Separator.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/separator/Separator.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/separator/Separator.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -132,4 +132,43 @@ this.width = width; } + public void bTest1(){ + setAlign("left"); + setHeight("300px"); + setWidth("10px"); + setLineType("beveled"); + setTitle("Test1"); + } + + public void bTest2(){ + setAlign("center"); + setHeight("50px"); + setWidth("600px"); + setLineType("dotted"); + setTitle("Test2"); + } + + public void bTest3(){ + setAlign("right"); + setHeight("150px"); + setWidth("200px"); + setLineType("dashed"); + setTitle("Test3"); + } + + public void bTest4(){ + setAlign("left"); + setHeight("20px"); + setWidth("300px"); + setLineType("double"); + setTitle("Test4"); + } + + public void bTest5(){ + setAlign("left"); + setHeight("100px"); + setWidth("100px"); + setLineType("solid"); + setTitle("Test5"); + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/spacer/Spacer.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/spacer/Spacer.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/spacer/Spacer.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -72,5 +72,29 @@ public void setBtn(String btn) { this.btn = btn; } + + public void bTest1(){ + setHeight("100"); + setWidth("10"); + } + public void bTest2(){ + setHeight("10"); + setWidth("100"); + } + + public void bTest3(){ + setHeight("5"); + setWidth("5"); + } + + public void bTest4(){ + setHeight("100"); + setWidth("100"); + } + + public void bTest5(){ + setHeight("400"); + setWidth("200"); + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/tabPanel/TabPanel.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/tabPanel/TabPanel.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/tabPanel/TabPanel.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -17,6 +17,7 @@ private String inactiveTabStyle; private String contentStyle; private String BtnLabel="ON"; + private boolean immediate; private boolean rendered; @@ -37,6 +38,7 @@ inactiveTabStyle=null; contentStyle=null; + immediate = false; rendered=true; disabledTab=false; @@ -51,7 +53,7 @@ setDisabledTabStyle("disabledTabStyle"); setInactiveTabStyle("inactiveTabStyle"); } else { - setBtnLabel("OFF"); + setBtnLabel("ON"); setActiveTabStyle(null); setContentStyle(null); setDisabledTabStyle(null); @@ -185,5 +187,83 @@ public void setBtnLabel(String btnLabel) { BtnLabel = btnLabel; } + + public boolean isImmediate() { + return immediate; + } + + public void setImmediate(boolean immediate) { + this.immediate = immediate; + } + public void bTest1() { + setDisabledTab(false); + setHeaderAlignment("left"); + setHeaderSpacing("10px"); + setHeight("250px"); + setImmediate(false); + setLabel("Test 1"); + setLabelWidth("10px"); + setWidth("300px"); + setSelectedTab("2"); + setSwitchType("server"); + setTitle("Title test 1"); + } + + public void bTest2() { + setDisabledTab(true); + setHeaderAlignment("right"); + setHeaderSpacing("40px"); + setHeight("400px"); + setImmediate(false); + setLabel("Test 2"); + setLabelWidth("40px"); + setWidth("40%"); + setSelectedTab("1"); + setSwitchType("ajax"); + setTitle("Title test2"); + } + + public void bTest3() { + setDisabledTab(false); + setHeaderAlignment("center"); + setHeaderSpacing("20px"); + setHeight("20%"); + setImmediate(false); + setLabel("Test 3"); + setLabelWidth("400px"); + setWidth("600px"); + setSelectedTab("3"); + setSwitchType("client"); + setTitle("Title test 3"); + } + + public void bTest4() { + setDisabledTab(true); + setHeaderAlignment("left"); + setHeaderSpacing("300px"); + setHeight("500px"); + setImmediate(false); + setLabel("Teset 4"); + setLabelWidth("500px"); + setWidth("500px"); + setSelectedTab("2"); + setSwitchType("server"); + setTitle("Title test 4"); + } + + public void bTest5() { + setDisabledTab(false); + setHeaderAlignment("left"); + setHeaderSpacing("20px"); + setHeight("40%"); + setImmediate(false); + setLabel("Test 5"); + setLabelWidth("40px"); + setWidth("10%"); + setSelectedTab("3"); + setSwitchType("client"); + setTitle("Title test 5"); + } + } Modified: branches/3.1.x/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/togglePanel/TogglePanel.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -14,40 +14,57 @@ stateOrder="asus,benq,toshiba"; } - - public String getInitialState() { return initialState; } - - public void setInitialState(String initialState) { this.initialState = initialState; } - - public String getStateOrder() { return stateOrder; } - - public void setStateOrder(String stateOrder) { this.stateOrder = stateOrder; } - - public String getSwitchType() { return switchType; } - - public void setSwitchType(String switchType) { this.switchType = switchType; } + public void bTest1() { + setInitialState("asus"); + setStateOrder("asus,benq,toshiba"); + setSwitchType("client"); + } + + public void bTest2() { + setInitialState("benq"); + setStateOrder("toshiba,asus,benq"); + setSwitchType("client"); + } + + public void bTest3() { + setInitialState("asus"); + setStateOrder("asus,benq,toshiba"); + setSwitchType("server"); + } + + public void bTest4() { + setInitialState("benq"); + setStateOrder("asus,benq,toshiba"); + setSwitchType("ajax"); + } + + public void bTest5() { + setInitialState("toshiba"); + setStateOrder("toshiba,asus,benq"); + setSwitchType("ajax"); + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/tooltip/Tooltip.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/tooltip/Tooltip.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/tooltip/Tooltip.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -7,7 +7,8 @@ private boolean disabled; private int horizontalOffset; private int verticalOffset; - private int delay; + private int showDelay; + private int hideDelay; private String value; private String mode; private String direction; @@ -31,7 +32,8 @@ direction = "top-right"; horizontalOffset = 0; verticalOffset = 0; - delay = 0; + showDelay = 0; + hideDelay = 0; style = "none"; layout = "inline"; } @@ -108,12 +110,89 @@ this.style = style; } - public int getDelay() { - return delay; + public void bTest1(){ + setShowDelay(0); + setHideDelay(3); + setDirection("top-right"); + setDisabled(false); + setFollowMouse(false); + setHorizontalOffset(0); + setVerticalOffset(0); + setLayout("inline"); + setMode("client"); + setValue("Test1"); + setRendered(true); } + + public void bTest2(){ + setShowDelay(3); + setHideDelay(0); + setDirection("top-left"); + setDisabled(false); + setFollowMouse(false); + setHorizontalOffset(5); + setVerticalOffset(5); + setLayout("block"); + setMode("ajax"); + setValue("Test2"); + setRendered(true); + } + + public void bTest3(){ + setShowDelay(3); + setHideDelay(3); + setDirection("bottom-right"); + setDisabled(false); + setFollowMouse(true); + setHorizontalOffset(5); + setVerticalOffset(0); + setLayout("inline"); + setMode("client"); + setValue("Test3"); + setRendered(true); + } + + public void bTest4(){ + setShowDelay(1); + setHideDelay(2); + setDirection("bottom-left"); + setDisabled(false); + setFollowMouse(true); + setHorizontalOffset(0); + setVerticalOffset(5); + setLayout("block"); + setMode("client"); + setValue("Test4"); + setRendered(true); + } - public void setDelay(int delay) { - this.delay = delay; + public void bTest5(){ + setShowDelay(3); + setHideDelay(1); + setDirection("bottom-right"); + setDisabled(false); + setFollowMouse(true); + setHorizontalOffset(-5); + setVerticalOffset(-5); + setLayout("inline"); + setMode("ajax"); + setValue("Test5"); + setRendered(true); } + public int getShowDelay() { + return showDelay; + } + + public void setShowDelay(int showDelay) { + this.showDelay = showDelay; + } + + public int getHideDelay() { + return hideDelay; + } + + public void setHideDelay(int hideDelay) { + this.hideDelay = hideDelay; + } } Modified: branches/3.1.x/test-applications/jsp/src/main/java/tree/Bean.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/tree/Bean.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/tree/Bean.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,24 +1,3 @@ -/** - * License Agreement. - * - * JBoss RichFaces - Ajax4jsf Component Library - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - package tree; import java.io.IOException; @@ -47,9 +26,6 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; -/** - * @author $Autor$ - */ public class Bean { private String switchType = "client"; private TreeNode data; @@ -222,6 +198,7 @@ try { tree.queueNodeExpand(new ListRowKey(expandPath)); } catch (IOException e) { + e.printStackTrace(); } } @@ -254,6 +231,7 @@ try { this.tree.queueExpandAll(); } catch (IOException e) { + e.printStackTrace(); } return null; @@ -355,4 +333,4 @@ public void setRenderFacets(boolean renderFacets) { this.renderFacets = renderFacets; } -} \ No newline at end of file +} Modified: branches/3.1.x/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,32 +1,79 @@ package util.componentInfo; +import java.lang.reflect.AccessibleObject; +import java.lang.reflect.Field; +import java.util.ArrayList; + public class ComponentInfo { + private final String beanName; private String attribute; private String property; + private boolean print; - public ComponentInfo() { - + public ComponentInfo(String beanName) { + this.beanName = beanName; + this.attribute = ""; + this.property = ""; + print = true; } - public ComponentInfo(String attribute, String property) { + public void setComponentInfo(String attribute, String property) { this.attribute = attribute; this.property = property; - System.out.println(); + if(print) printInfo(); } + + public static String toString(Object obj) { + Class cl = obj.getClass(); + String r = cl.getName() + "["; + Class sc = cl.getSuperclass(); + if (!sc.equals(Object.class)) + r += sc + ","; + Field[] fields = cl.getDeclaredFields(); + try { + AccessibleObject.setAccessible(fields, true); + } catch (SecurityException e) { + } + for (int i = 0; i < fields.length; i++) { + Field f = fields[i]; + r += f.getName() + "="; + try { + Object val = f.get(obj); + if(val == null) r += "null"; else + r += val.toString(); + } catch (IllegalAccessException e) { + r += "???"; + } + if (i < fields.length - 1) + r += ","; + else + r += "]"; + } + return r; + } + public boolean isPrint() { + return print; + } + + public void setPrint(boolean print) { + this.print = print; + } + + public String [] getComponentInfo() { + String [] str = {attribute, property}; + return str; + } + public String getAttribute() { return attribute; } - public void setAttribute(String attribute) { - this.attribute = attribute; - } - public String getProperty() { return property; } - - public void setProperty(String property) { - this.property = property; + + private void printInfo() { + System.out.println("beanName: " + beanName + "[attribute:" + attribute + "; property:" + property + "];"); } } Added: branches/3.1.x/test-applications/jsp/src/main/java/util/icon/Icon.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/util/icon/Icon.java (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/java/util/icon/Icon.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,194 @@ +package util.icon; + +public class Icon { + + public final String iconAjaxProcess = "/pics/ajax_process.gif"; + public final String iconAjaxStoped = "/pics/ajax_stoped.gif"; + public final String iconCollapse = "/pics/collapse.gif"; + public final String iconExpand = "/pics/expand.gif"; + public final String iconFileManagerReject = "/pics/file-manager-reject.png"; + public final String iconFileManager = "/pics/file-manager.png"; + public final String iconHeader = "/pics/header.png"; + public final String iconItem = "/pics/item.png"; + public final String none = "none"; + + private String icon; + private String item; + private String disabled; + private String disabledItem; + private String topItem; + private String topDisabledItem; + private String expandedGroup; + private String collapsedGroup; + private String disabledGroup; + private String expandedTopGroup; + private String collapsedTopGroup; + private String topDisableGroup; + private String expanded; + private String collapsed; + + public Icon() { + icon = "none"; + item = "none"; + disabled = "none"; + disabledItem = "none"; + topItem = "none"; + topDisabledItem = "none"; + expandedGroup = "none"; + collapsedGroup = "none"; + disabledGroup = "none"; + expandedTopGroup = "none"; + collapsedTopGroup = "none"; + topDisableGroup = "none"; + expanded = "none"; + collapsed = "none"; + } + + public final String getIconAjaxProcess() { + return iconAjaxProcess; + } + + public final String getIconAjaxStoped() { + return iconAjaxStoped; + } + + public final String getIconCollapse() { + return iconCollapse; + } + + public final String getIconExpand() { + return iconExpand; + } + + public final String getIconFileManager() { + return iconFileManager; + } + + public final String getIconFileManagerReject() { + return iconFileManagerReject; + } + + public final String getIconHeader() { + return iconHeader; + } + + public final String getIconItem() { + return iconItem; + } + + public String getCollapsed() { + return collapsed; + } + + public void setCollapsed(String collapsed) { + this.collapsed = collapsed; + } + + public String getCollapsedGroup() { + return collapsedGroup; + } + + public void setCollapsedGroup(String collapsedGroup) { + this.collapsedGroup = collapsedGroup; + } + + public String getCollapsedTopGroup() { + return collapsedTopGroup; + } + + public void setCollapsedTopGroup(String collapsedTopGroup) { + this.collapsedTopGroup = collapsedTopGroup; + } + + public String getDisabled() { + return disabled; + } + + public void setDisabled(String disabled) { + this.disabled = disabled; + } + + public String getDisabledGroup() { + return disabledGroup; + } + + public void setDisabledGroup(String disabledGroup) { + this.disabledGroup = disabledGroup; + } + + public String getDisabledItem() { + return disabledItem; + } + + public void setDisabledItem(String disabledItem) { + this.disabledItem = disabledItem; + } + + public String getExpanded() { + return expanded; + } + + public void setExpanded(String expanded) { + this.expanded = expanded; + } + + public String getExpandedGroup() { + return expandedGroup; + } + + public void setExpandedGroup(String expandedGroup) { + this.expandedGroup = expandedGroup; + } + + public String getExpandedTopGroup() { + return expandedTopGroup; + } + + public void setExpandedTopGroup(String expandedTopGroup) { + this.expandedTopGroup = expandedTopGroup; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public String getItem() { + return item; + } + + public void setItem(String item) { + this.item = item; + } + + public String getTopDisabledItem() { + return topDisabledItem; + } + + public void setTopDisabledItem(String topDisabledItem) { + this.topDisabledItem = topDisabledItem; + } + + public String getTopDisableGroup() { + return topDisableGroup; + } + + public void setTopDisableGroup(String topDisableGroup) { + this.topDisableGroup = topDisableGroup; + } + + public String getTopItem() { + return topItem; + } + + public void setTopItem(String topItem) { + this.topItem = topItem; + } + + public final String getNone() { + return none; + } +} Added: branches/3.1.x/test-applications/jsp/src/main/java/util/resources.properties =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/util/resources.properties (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/java/util/resources.properties 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,2 @@ +prompt=Your Name\: +greeting=Hello Modified: branches/3.1.x/test-applications/jsp/src/main/java/util/skins/Skins.java =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/java/util/skins/Skins.java 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/java/util/skins/Skins.java 2007-11-14 14:14:19 UTC (rev 3983) @@ -18,7 +18,7 @@ "deepMarine", "DEFAULT", "emeraldTown", "japanCherry", "ruby", "wine", "plain" }; - private String defaultSkin = "blueSky"; + private String defaultSkin = "deepMarine"; private String skin = defaultSkin; Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -3,74 +3,46 @@ <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> <%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> - <f:subview id="calendarID"> - <style type="text/css"> - .smallText { - font-size: xx-small; - } - .largeText { - font-size: xx-large; - } - - .Selecteddayclass { - background-color: #0087FF; - } - </style> -<h:form> - <rich:messages showDetail="true"></rich:messages> - - <h:panelGrid columns="2"> - <h:outputText value="Client mode" /> - <h:outputText value="Ajax mode" /> +<f:subview id="calendarSubviewID"> + + <h:form> + <h:messages /> + <rich:messages showDetail="true"></rich:messages> - <rich:calendar id="calendarClientID" dataModel="#{calendarDataModel}" - locale="#{calendarBean.locale}" popup="#{calendarBean.popup}" - preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" - preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" - datePattern="#{calendarBean.pattern}" - weekDayLabels="#{calendarBean.weekDayLabels}" - weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" - monthLabels="#{calendarBean.monthLabels}" - monthLabelsShort="#{calendarBean.monthLabelsShort}" - value="#{calendarBean.selectedDate}" - currentDate="#{calendarBean.currentDate}" - jointPoint="#{calendarBean.jointPoint}" - direction="#{calendarBean.direction}" - enableManualInput="#{calendarBean.enableManualInput}" - showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" - boundaryDatesMode="#{calendarBean.boundary}" - currentDateChangeListener="#{calendarBean.dcl}" - valueChangeListener="#{calendarBean.ddd}" reRender="counter" - inputClass="ic" buttonClass="bc" - ajaxSingle="#{calendarBean.ajaxSingle}" - buttonIcon="#{calendarBean.icon}" - buttonIconDisabled="#{icon.iconFileManagerReject}" - disabled="#{calendarBean.disabled}" - bypassUpdates="#{calendarBean.bypassUpdates}" - height="#{calendarBean.height}" - width="#{calendarBean.width}" - zindex="#{calendarBean.zindex}" - toolTipMode="#{calendarBean.toolTipMode}" - rendered="#{calendarBean.rendered}" - focus="popupModeID" - mode="client" - required="#{calendarBean.required}" - requiredMessage="Required Message" - > - <f:facet name="weekDay"> - <f:verbatim><span style="padding: 2px; font-size: 4" >{weekDayLabel + weekDayLabelShort}</span></f:verbatim> + <h:panelGrid columns="2"> + <h:outputText value="Client mode" rendered="#{calendarBean.renderedClient}" /> + <h:outputText value="Ajax mode" rendered="#{calendarBean.renderedAjax}"/> + + <rich:calendar id="calendarClientID" dataModel="#{calendarDataModel}" locale="#{calendarBean.locale}" + popup="#{calendarBean.popup}" preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}" + preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}" datePattern="#{calendarBean.pattern}" + weekDayLabels="#{calendarBean.weekDayLabels}" weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" + monthLabels="#{calendarBean.monthLabels}" monthLabelsShort="#{calendarBean.monthLabelsShort}" + value="#{calendarBean.selectedDate}" currentDate="#{calendarBean.currentDate}" jointPoint="#{calendarBean.jointPoint}" + direction="#{calendarBean.direction}" enableManualInput="#{calendarBean.enableManualInput}" + showInput="#{calendarBean.showInput}" buttonLabel="#{calendarBean.label}" boundaryDatesMode="#{calendarBean.boundary}" + currentDateChangeListener="#{calendarBean.dcl}" valueChangeListener="#{calendarBean.ddd}" reRender="calendarPropertyID,counter" inputClass="ic" + buttonClass="bc" ajaxSingle="#{calendarBean.ajaxSingle}" buttonIcon="#{calendarBean.icon}" + buttonIconDisabled="#{icon.iconFileManagerReject}" disabled="#{calendarBean.disabled}" + bypassUpdates="#{calendarBean.bypassUpdates}" zindex="#{calendarBean.zindex}" toolTipMode="#{calendarBean.toolTipMode}" rendered="#{calendarBean.renderedClient}" + focus="popupModeID" mode="client" required="#{calendarBean.required}" requiredMessage="Required Message" + timeZone="#{calendarBean.tmZone}"> + <f:facet name="weekDay"> + <f:verbatim> + <span style="padding: 2px; font-size: 4">{weekDayLabel + weekDayLabelShort}</span> + </f:verbatim> </f:facet> - + <f:facet name="optionalHeader"> - <h:outputText value="optionalHeader Facet" /> + <h:outputText value="optionalHeader Facet #{headerFacet}" /> </f:facet> - + <f:facet name="optionalFooter"> <h:outputText value="optionalFooter Facet" /> </f:facet> - + <f:validator validatorId="org.richfaces.CalendarValidator" /> - + <h:panelGrid columns="2"> <f:verbatim> <span style="padding: 2px;">{day}</span> @@ -82,148 +54,47 @@ </h:panelGrid> </h:panelGrid> </rich:calendar> - - </h:panelGrid> - - - - <h:panelGrid columns="2"> - <h:outputText value="Select Locale:" /> - <h:selectOneRadio onchange="submit()" value="en/US"> - <f:selectItem itemLabel="US" itemValue="en/US" /> - <f:selectItem itemLabel="DE" itemValue="de/DE" /> - <f:selectItem itemLabel="FR" itemValue="fr/FR" /> - <f:selectItem itemLabel="RU" itemValue="ru/RU" /> - </h:selectOneRadio> - - <h:outputText value="Popup Mode:" /> - <h:selectBooleanCheckbox id="popupModeID" value="#{calendarBean.popup}" - onclick="submit()" /> - - <h:outputText value="Custom day labels" /> - <h:selectOneRadio value="#{calendarBean.weekDay}"> - <f:selectItem itemLabel="none" itemValue="none"/> - <f:selectItem itemLabel="day labels" itemValue="long"/> - <f:selectItem itemLabel="day labels short" itemValue="short"/> - <a4j:support event="onclick" reRender="calendarClientID,calendarAjaxID"></a4j:support> - </h:selectOneRadio> - <h:outputText value="Custom month labels" /> - <h:selectOneRadio value="#{calendarBean.month}"> - <f:selectItem itemLabel="none" itemValue="none"/> - <f:selectItem itemLabel="day labels" itemValue="long"/> - <f:selectItem itemLabel="day labels short" itemValue="short"/> - <a4j:support event="onclick" reRender="calendarClientID,calendarAjaxID"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="Select Date Pattern:" /> - <h:selectOneMenu value="MMM d, yyyy" onchange="submit()"> - <f:selectItem itemLabel="d/M/yy" itemValue="d/M/yy" /> - <f:selectItem itemLabel="dd/M/yy" itemValue="dd/M/yy" /> - <f:selectItem itemLabel="d/MMM/y" itemValue="d/MMM/y" /> - <f:selectItem itemLabel="dd.MM.yyyy" itemValue="dd.MM.yyyy" /> - <f:selectItem itemLabel="MMM d, yyyy" itemValue="MMM d, yyyy" /> - </h:selectOneMenu> - - <h:inputText id="selectdate" /> - <h:commandButton type="button" value="Select Date" - onclick="$(this.form.id+':calendarID').component.selectDate(this.form[this.form.id+':selectdate'].value);" /> - - <h:outputText value="Preload date range begin(d.m.y)" /> - <h:inputText value="#{calendarBean.preloadDateRangeBegin}" onchange="submit();"/> - - <h:outputText value="Preload date range end(d.m.y)" /> - <h:inputText value="#{calendarBean.preloadDateRangeEnd}" onchange="submit();"/> - - <h:outputText value="z-index:" /> - <h:inputText value="#{calendarBean.zindex}"> - <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> - </h:inputText> + <rich:calendar id="calendarAjaxID" dataModel="#{calendarDataModel}" locale="#{calendarBean.locale}" + popup="#{calendarBean.popup}" datePattern="#{calendarBean.pattern}" weekDayLabels="#{calendarBean.weekDayLabels}" + weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}" monthLabels="#{calendarBean.monthLabels}" + monthLabelsShort="#{calendarBean.monthLabelsShort}" value="#{calendarBean.selectedDate}" + currentDate="#{calendarBean.currentDate}" jointPoint="#{calendarBean.jointPoint}" direction="#{calendarBean.direction}" + enableManualInput="#{calendarBean.enableManualInput}" showInput="#{calendarBean.showInput}" + buttonLabel="#{calendarBean.label}" boundaryDatesMode="#{calendarBean.boundary}" + currentDateChangeListener="#{calendarBean.dcl}" valueChangeListener="#{calendarBean.ddd}" reRender="calendarPropertyID,counter" inputClass="ic" + buttonClass="bc" ajaxSingle="#{calendarBean.ajaxSingle}" buttonIcon="#{calendarBean.icon}" + buttonIconDisabled="#{icon.iconFileManagerReject}" disabled="#{calendarBean.disabled}" + bypassUpdates="#{calendarBean.bypassUpdates}" zindex="#{calendarBean.zindex}" toolTipMode="#{calendarBean.toolTipMode}" rendered="#{calendarBean.renderedAjax}" + focus="popupModeID" mode="ajax" required="#{calendarBean.required}" requiredMessage="Required Message" + timeZone="#{calendarBean.tmZone}"> + <f:facet name="weekDay"> + <f:verbatim> + <span style="padding: 2px; font-size: 4">{weekDayLabel + weekDayLabelShort}</span> + </f:verbatim> + </f:facet> - <h:outputText value="Height:" /> - <h:inputText value="#{calendarBean.height}"> - <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> - </h:inputText> - - <h:outputText value="Width:" /> - <h:inputText value="#{calendarBean.width}"> - <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> - </h:inputText> - - <h:outputText value="reRender (counter):" /> - <h:outputText id="counter" value="#{calendarBean.counter}" /> - - <h:outputText value="Required" /> - <h:selectBooleanCheckbox value="#{calendarBean.required}" onclick="submit()"/> - - <h:outputText value="Select Popup Joint Point:" /> - <h:selectOneRadio onchange="submit()" - value="#{calendarBean.jointPoint}"> - <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> - <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> - <f:selectItem itemLabel="top-right" itemValue="top-right" /> - <f:selectItem itemLabel="top-left" itemValue="top-left" /> - </h:selectOneRadio> - - <h:outputText value="Select Popup Direction:" /> - <h:selectOneRadio onchange="submit()" - value="#{calendarBean.direction}"> - <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> - <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> - <f:selectItem itemLabel="top-right" itemValue="top-right" /> - <f:selectItem itemLabel="top-left" itemValue="top-left" /> - <f:selectItem itemLabel="auto" itemValue="auto" /> - </h:selectOneRadio> + <f:facet name="optionalHeader"> + <h:outputText value="optionalHeader Facet" /> + </f:facet> - <h:outputText value="Time Zone:" /> - <h:selectOneRadio value="#{calendarBean.timeZone}" onchange="submit();"> - <f:selectItem itemLabel="Eastern European Time" itemValue="Eastern European Time"/> - <f:selectItem itemLabel="Turkmenistan Time" itemValue="Turkmenistan Time"/> - <f:selectItem itemLabel="Korea Standard Time" itemValue="Korea Standard Time"/> - </h:selectOneRadio> + <f:facet name="optionalFooter"> + <h:outputText value="optionalFooter Facet" /> + </f:facet> - - <h:outputText value="ToolTip Mode:" /> - <h:selectOneRadio value="#{calendarBean.toolTipMode}" onchange="submit();"> - <f:selectItem itemLabel="none" itemValue="none"/> - <f:selectItem itemLabel="single" itemValue="single"/> - <f:selectItem itemLabel="batch" itemValue="batch"/> - </h:selectOneRadio> - - <h:outputText value="BoundaryDatesMode:" /> - <h:selectOneRadio onclick="submit()" value="#{calendarBean.boundary}"> - <f:selectItem itemLabel="inactive" itemValue="inactive" /> - <f:selectItem itemLabel="select" itemValue="select" /> - <f:selectItem itemLabel="scroll" itemValue="scroll" /> - </h:selectOneRadio> - - <h:outputText value="EnableManualInput:"></h:outputText> - <h:selectBooleanCheckbox value="#{calendarBean.enableManualInput}" - onclick="submit()"> - </h:selectBooleanCheckbox> - - <h:outputText value="ShowInput:"></h:outputText> - <h:selectBooleanCheckbox value="#{calendarBean.showInput}" - onclick="submit()"> - </h:selectBooleanCheckbox> - - <h:outputText value="Disabled:" /> - <h:selectBooleanCheckbox value="#{calendarBean.disabled}" onclick="submit()"/> - - <h:outputText value="Rendered:" /> - <h:selectBooleanCheckbox value="#{calendarBean.rendered}" onclick="submit()"/> - - <f:verbatim></f:verbatim> - <h:commandButton action="#{calendarBean.changeIcons}" value="ChangeIcons" /> - - <h:outputText value="Current date: " /> - <h:outputText value="#{calendarBean.currentDateAsText}" /> + <f:validator validatorId="org.richfaces.CalendarValidator" /> - <h:outputText value="Selected date: " /> - <h:outputText value="#{calendarBean.selectedDate}" /> - - <f:verbatim></f:verbatim> - <h:commandButton value="Submit" /> - </h:panelGrid> + <h:panelGrid columns="2"> + <f:verbatim> + <span style="padding: 2px;">{day}</span> + </f:verbatim> + <h:panelGrid> + <h:outputText styleClass="smallText" value="{data.enLabel}" /> + <h:outputText styleClass="smallText" value="{data.frLabel}" /> + <h:outputText styleClass="smallText" value="{data.deLabel}" /> + </h:panelGrid> + </h:panelGrid> + </rich:calendar> + </h:panelGrid> </h:form> -</f:subview> +</f:subview> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,139 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="calendarPropertySubviewID"> + <rich:simpleTogglePanel id="calendarPropertyID" switchType="client" opened="true" label="calendar property"> + <h:panelGrid columns="2"> + + <a4j:commandButton action="#{calendarBean.info}" value="fasdf"></a4j:commandButton> + + <h:outputText value="Mode" /> + <h:selectOneRadio value="#{calendarBean.mode}" onchange="submit();"> + <f:selectItem itemLabel="client" itemValue="client"/> + <f:selectItem itemLabel="ajax" itemValue="ajax"/> + </h:selectOneRadio> + + + <h:outputText value="Select Locale:" /> + <h:selectOneRadio onchange="submit()" valueChangeListener="#{calendarBean.selectLocale}"> + <f:selectItem itemLabel="US" itemValue="en/US" /> + <f:selectItem itemLabel="DE" itemValue="de/DE" /> + <f:selectItem itemLabel="FR" itemValue="fr/FR" /> + <f:selectItem itemLabel="RU" itemValue="ru/RU" /> + </h:selectOneRadio> + + <h:outputText value="Popup Mode:" /> + <h:selectBooleanCheckbox id="popupModeID" value="#{calendarBean.popup}" onclick="submit()" /> + + <h:outputText value="Custom day labels" /> + <h:selectOneRadio value="#{calendarBean.weekDay}"> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="day labels" itemValue="long" /> + <f:selectItem itemLabel="day labels short" itemValue="short" /> + <a4j:support event="onclick" reRender="calendarClientID,calendarAjaxID"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Custom month labels" /> + <h:selectOneRadio value="#{calendarBean.month}"> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="day labels" itemValue="long" /> + <f:selectItem itemLabel="day labels short" itemValue="short" /> + <a4j:support event="onclick" reRender="calendarClientID,calendarAjaxID"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Select Date Pattern:" /> + <h:selectOneMenu value="MMM d, yyyy" onchange="submit()"> + <f:selectItem itemLabel="d/M/yy" itemValue="d/M/yy" /> + <f:selectItem itemLabel="dd/M/yy" itemValue="dd/M/yy" /> + <f:selectItem itemLabel="d/MMM/y" itemValue="d/MMM/y" /> + <f:selectItem itemLabel="dd.MM.yyyy" itemValue="dd.MM.yyyy" /> + <f:selectItem itemLabel="MMM d, yyyy" itemValue="MMM d, yyyy" /> + <f:selectItem itemLabel="dd-MM-yyyy" itemValue="dd-MM-yyyy" /> + </h:selectOneMenu> + + <h:outputText value="Preload date range begin(d.m.y)" /> + <h:inputText value="#{calendarBean.preloadDateRangeBegin}" onchange="submit();" /> + + <h:outputText value="Preload date range end(d.m.y)" /> + <h:inputText value="#{calendarBean.preloadDateRangeEnd}" onchange="submit();" /> + + <h:outputText value="z-index:" /> + <h:inputText value="#{calendarBean.zindex}"> + <a4j:support event="onchange" reRender="calendarClientID,calendarAjaxID"></a4j:support> + </h:inputText> + + <h:outputText value="reRender (counter):" /> + <h:outputText id="counter" value="#{calendarBean.counter}" /> + + <h:outputText value="Required" /> + <h:selectBooleanCheckbox value="#{calendarBean.required}" onclick="submit()" /> + + <h:outputText value="Select Popup Joint Point:" /> + <h:selectOneRadio onchange="submit()" value="#{calendarBean.jointPoint}"> + <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> + <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> + <f:selectItem itemLabel="top-right" itemValue="top-right" /> + <f:selectItem itemLabel="top-left" itemValue="top-left" /> + </h:selectOneRadio> + + <h:outputText value="Select Popup Direction:" /> + <h:selectOneRadio onchange="submit()" value="#{calendarBean.direction}"> + <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> + <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> + <f:selectItem itemLabel="top-right" itemValue="top-right" /> + <f:selectItem itemLabel="top-left" itemValue="top-left" /> + <f:selectItem itemLabel="auto" itemValue="auto" /> + </h:selectOneRadio> + + <h:outputText value="Time Zone:" /> + <h:selectOneRadio valueChangeListener="#{calendarBean.timeZone}" onchange="submit();"> + <f:selectItem itemLabel="Eastern European Time" itemValue="Eastern European Time" /> + <f:selectItem itemLabel="Turkmenistan Time" itemValue="Turkmenistan Time" /> + <f:selectItem itemLabel="Korea Standard Time" itemValue="Korea Standard Time" /> + </h:selectOneRadio> + + + <h:outputText value="ToolTip Mode:" /> + <h:selectOneRadio value="#{calendarBean.toolTipMode}" onchange="submit();"> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="single" itemValue="single" /> + <f:selectItem itemLabel="batch" itemValue="batch" /> + </h:selectOneRadio> + + <h:outputText value="BoundaryDatesMode:" /> + <h:selectOneRadio onclick="submit()" value="#{calendarBean.boundary}"> + <f:selectItem itemLabel="inactive" itemValue="inactive" /> + <f:selectItem itemLabel="select" itemValue="select" /> + <f:selectItem itemLabel="scroll" itemValue="scroll" /> + </h:selectOneRadio> + + <h:outputText value="EnableManualInput:"></h:outputText> + <h:selectBooleanCheckbox value="#{calendarBean.enableManualInput}" onclick="submit()"> + </h:selectBooleanCheckbox> + + <h:outputText value="ShowInput:"></h:outputText> + <h:selectBooleanCheckbox value="#{calendarBean.showInput}" onclick="submit()"> + </h:selectBooleanCheckbox> + + <h:outputText value="Disabled:" /> + <h:selectBooleanCheckbox value="#{calendarBean.disabled}" onclick="submit()" /> + + <h:outputText value="Rendered:" /> + <h:selectBooleanCheckbox value="#{calendarBean.rendered}" onclick="submit()" /> + + <f:verbatim></f:verbatim> + <h:commandButton action="#{calendarBean.changeIcons}" value="ChangeIcons" /> + + <h:outputText value="Current date: " /> + <h:outputText value="#{calendarBean.currentDateAsText}" /> + + <h:outputText value="Selected date: " /> + <h:outputText value="#{calendarBean.selectedDate}" /> + + <f:verbatim></f:verbatim> + <h:commandButton value="Submit" /> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/CalendarStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/CalendarStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Calendar/CalendarStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="calendarStraightforwardSubviewID"> + <rich:simpleTogglePanel switchType="client" opened="true" label="calendar straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{calendarBean.bTest1}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{calendarBean.bTest2}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{calendarBean.bTest3}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{calendarBean.bTest4}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{calendarBean.bTest5}" value="run" reRender="calendarClientID,calendarAjaxID,calendarPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/CustomizePage/CustomizePage.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,18 +1,19 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:view> -<html> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j" + xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"> <head> -<title></title> -<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> +<link rel="stylesheet" href="#{facesContext.externalContext.requestContextPath}/styles/styles.css" type="text/css" /> </head> -<body> + + +<f:view> <h:form> - <rich:messages showDetail="true"></rich:messages> - + </h:form> -</body> -</html> -</f:view> \ No newline at end of file +</f:view> +</html> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DFS.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -2,6 +2,7 @@ <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + <style type="text/css"> body{ Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSlider.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,54 +1,13 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<style type="text/css"> -body { - font: normal 11px tahoma, sans-serif; -} +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> -.column { - width: 75px; - font: normal 11px tahoma, sans-serif; - text-align: center; -} - -.column-index { - width: 75px; - font: normal 11px tahoma, sans-serif; - text-align: left; -} - -.list-row3 { - background-color: #ececec; -} - -.list-row1 { - background-color: #f1f6fd; -} - -.list-row2 { - background-color: #fff; -} - -.list-header { - font: bold 11px tahoma, sans-serif; - text-align: center; -} - -.list-table1 { - border: 1px solid #bed6f8; -} - -.list-table2 { - border: 1px solid #bed6f8; -} -</style> - -<f:subview id="dfsID"> - +<f:subview id="DataFilterSliderSubviewID"> + <a4j:form id="form1" reRender="list-body" ajaxSubmit="true" ignoreDupResponses="true" requestDelay="100"> + <a4j:region id="stat1"> <a4j:outputPanel id="p1"> <rich:dataFilterSlider sliderListener="#{dfs.doSlide}" rendered="#{dfs.rendered}" @@ -58,7 +17,7 @@ storeResults="true" trackStyleClass="track" width="400px" styleClass="slider-container" startRange="10000" endRange="60000" increment="10000" rangeStyleClass="range" trailer="true" - trailerStyleClass="trailer" handleStyleClass="handle" + trailerStyleClass="trailer" handleStyleClass="handle" handleValue="10000" id="slider_1"> </rich:dataFilterSlider> </a4j:outputPanel> @@ -119,13 +78,5 @@ </h:dataTable> </a4j:outputPanel> </a4j:region> - <h:panelGrid columns="2"> - <h:outputText value="Rendered:" /> - <h:selectBooleanCheckbox value="#{dfs.rendered}" > - <a4j:support event="onclick" reRender="p1"></a4j:support> - </h:selectBooleanCheckbox> - </h:panelGrid> </a4j:form> - -</f:subview> - +</f:subview> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataFilterSlider/DataFilterSliderProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,13 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="calendarPropertySubviewID"> + <h:panelGrid columns="2"> + <h:outputText value="Rendered:" /> + <h:selectBooleanCheckbox value="#{dfs.rendered}" > + <a4j:support event="onclick" reRender="p1"></a4j:support> + </h:selectBooleanCheckbox> + </h:panelGrid> +</f:subview> \ No newline at end of file Deleted: branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DS.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DS.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DS.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,68 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - <f:subview id="dataScrollerID"> - <h:form dir="DSform"> - - <h:dataTable id="dataTableId" value="#{dataScroller.dataTable}" - var="dT" cellpadding="5px" rows="5" border="1"> - <f:facet name="header"> - <rich:datascroller fastControls="#{dataScroller.fastControls}" - align="#{dataScroller.align}" rendered="#{dataScroller.render}" - limitToList="#{dataScroller.limitToList}" - renderIfSinglePage="#{dataScroller.renderIfSinglePage}" - maxPages="#{dataScroller.maxPages}" - scrollerListener="#{dataScroller.ScrollerListener}" /> - </f:facet> - <h:column> - <h:outputText value="#{dT.data0}" /> - </h:column> - <h:column> - <h:outputText value="#{dT.data1}" /> - </h:column> - - </h:dataTable> - <h:commandButton action="#{dataScroller.CutArray}" value="CutArray" /> - <h:commandButton action="#{dataScroller.RestoreArray}" - value="RestoreArray" /> - - <h:panelGrid columns="2"> - <h:outputText value="maxPages" /> - <h:inputText value="#{dataScroller.maxPages}"> - <a4j:support event="onchange" reRender="dataScrollerID"></a4j:support> - </h:inputText> - - <h:outputText value="Rendered:" /> - <h:selectBooleanCheckbox value="#{dataScroller.render}" - onclick="submit();" /> - - <h:outputText value="renderIfSinglePage:" /> - <h:selectBooleanCheckbox value="#{dataScroller.renderIfSinglePage}" - onclick="submit();" /> - - <h:outputText value="limitToList:" /> - <h:selectBooleanCheckbox value="#{dataScroller.limitToList}" - onclick="submit();" /> - - <h:outputText value="fastControls" /> - <h:selectOneRadio value="#{dataScroller.fastControls}"> - <f:selectItem itemLabel="auto" itemValue="auto" /> - <f:selectItem itemLabel="show" itemValue="show" /> - <f:selectItem itemLabel="hide" itemValue="hide" /> - <a4j:support event="onclick" reRender="dataTableId"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="align" /> - <h:selectOneRadio value="#{dataScroller.align}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <f:selectItem itemLabel="center" itemValue="center" /> - <a4j:support event="onclick" reRender="dataTableId"></a4j:support> - </h:selectOneRadio> - - </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> - </h:form> - </f:subview> - Added: branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScroller.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,33 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="DataScrollerSubviewID"> + <h:form dir="DSform"> + + <h:dataTable id="dataTableId" value="#{dataScroller.dataTable}" + var="dT" cellpadding="5px" rows="5" border="1"> + <f:facet name="header"> + <rich:datascroller fastControls="#{dataScroller.fastControls}" + align="#{dataScroller.align}" rendered="#{dataScroller.render}" + limitToList="#{dataScroller.limitToList}" + renderIfSinglePage="#{dataScroller.renderIfSinglePage}" + maxPages="#{dataScroller.maxPages}" + scrollerListener="#{dataScroller.ScrollerListener}" + onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" + onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"/> + </f:facet> + <h:column> + <h:outputText value="#{dT.data0}" /> + </h:column> + <h:column> + <h:outputText value="#{dT.data1}" /> + </h:column> + </h:dataTable> + </h:form> +</f:subview> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,49 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="datascrollerPropertySubviewID"> + <rich:simpleTogglePanel id="dTablePropertyID" switchType="client" opened="true" + label="datascroller property"> + + <h:commandButton action="#{dataScroller.CutArray}" value="CutArray" /> + <h:commandButton action="#{dataScroller.RestoreArray}" + value="RestoreArray" /> + + <h:panelGrid columns="2"> + <h:outputText value="maxPages" /> + <h:inputText value="#{dataScroller.maxPages}"> + <a4j:support event="onchange" reRender="dataScrollerID"></a4j:support> + </h:inputText> + + <h:outputText value="Rendered:" /> + <h:selectBooleanCheckbox value="#{dataScroller.render}" + onclick="submit();" /> + + <h:outputText value="renderIfSinglePage:" /> + <h:selectBooleanCheckbox value="#{dataScroller.renderIfSinglePage}" + onclick="submit();" /> + + <h:outputText value="limitToList:" /> + <h:selectBooleanCheckbox value="#{dataScroller.limitToList}" + onclick="submit();" /> + + <h:outputText value="fastControls" /> + <h:selectOneRadio value="#{dataScroller.fastControls}"> + <f:selectItem itemLabel="auto" itemValue="auto" /> + <f:selectItem itemLabel="show" itemValue="show" /> + <f:selectItem itemLabel="hide" itemValue="hide" /> + <a4j:support event="onclick" reRender="dataTableId"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="align" /> + <h:selectOneRadio value="#{dataScroller.align}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <f:selectItem itemLabel="center" itemValue="center" /> + <a4j:support event="onclick" reRender="dataTableId"></a4j:support> + </h:selectOneRadio> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataScroller/DataScrollerStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,26 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="datascrollerStraightforwardSubviewID"> + <rich:simpleTogglePanel switchType="client" opened="true" + label="datascroller straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{dataScroller.bTest1}" value="run" reRender="dataTableId,dTablePropertyID"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{dataScroller.bTest2}" value="run" reRender="dataTableId,dTablePropertyID"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{dataScroller.bTest3}" value="run" reRender="dataTableId,dTablePropertyID"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{dataScroller.bTest4}" value="run" reRender="dataTableId,dTablePropertyID"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{dataScroller.bTest5}" value="run" reRender="dataTableId,dTablePropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Deleted: branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DT.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DT.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DT.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,106 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> - <f:subview id="DataTableID"> - <h:form> - <rich:dataTable id="dataTableID" var="dataTableID" - value="#{dataTable.mounths}" rowKeyVar="key" styleClass="table" - captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" - headerClass="header" footerClass="footer" cellpadding="" cellspacing="" - onRowClick="alert('row #{key}')" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red" - border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite"> - <f:facet name="caption"> - <h:outputText value="caption" /> - </f:facet> - <f:facet name="header"> - <rich:columnGroup columnClasses="cola, colb ,rowc rowcc"> - <rich:column rowspan="2" rendered="#{dataTable.r2rendered}"> - <h:outputText value="2-row head" /> - </rich:column> - <h:column rendered="#{dataTable.r2rendered}"> - <h:outputText value="head in UIColumn" /> - </h:column> - <rich:column breakBefore="true"> - <h:outputText value="2-d row head" /> - </rich:column> - </rich:columnGroup> - </f:facet> - <f:facet name="footer"> - <h:outputText value="table foot" /> - </f:facet> - <rich:columnGroup> - <rich:column id="mounth" styleClass="column" rowspan="2" - headerClass="cheader" footerClass="cfooter"> - <f:facet name="header"> - <h:outputText value="mounth" /> - </f:facet> - <f:facet name="footer"> - <h:outputText value="-//-" /> - </f:facet> - <h:outputText value="#{dataTableID.mounth}" /> - </rich:column> - <rich:column styleClass="column" headerClass="cheader" - footerClass="cfooter" rendered="#{dataTable.r2rendered}"> - <f:facet name="header"> - <h:outputText value="mounth" /> - </f:facet> - <f:facet name="footer"> - <h:outputText value="-//-" /> - </f:facet> - <h:outputText value="#{dataTableID.town}" /> - </rich:column> - </rich:columnGroup> - <rich:column styleClass="column" headerClass="cheader" - footerClass="cfooter" rendered="#{dataTable.r2rendered}"> - <h:outputText value="#{dataTableID.day}" /> - </rich:column> - <rich:subTable id="detail" var="detail" value="#{dataTableID.detail}"> - <rich:column id="name"> - <h:outputText value="#{detail.name}" /> - </rich:column> - <rich:column id="qty" rendered="#{dataTable.r2rendered}"> - <h:outputText value="#{detail.qty}" /> - </rich:column> - </rich:subTable> - <rich:column id="total" styleClass="total" colspan="2"> - <h:outputText value="#{dataTableID.total}" /> - </rich:column> - </rich:dataTable> - - <h:panelGrid columns="2"> - <h:outputText value="Align:"></h:outputText> - <h:selectOneMenu value="#{dataTable.align}"> - <f:selectItem itemLabel="center" itemValue="*center" /> - <f:selectItem itemLabel="left" itemValue="*left" /> - <f:selectItem itemLabel="right " itemValue="*right" /> - <a4j:support event="onclick" reRender="dataTableID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="Border: "></h:outputText> - <h:inputText value="#{dataTable.border}"> - <a4j:support event="onchange" reRender="dataTableID"></a4j:support> - </h:inputText> - - <h:outputText value="Columns Width: "></h:outputText> - <h:inputText value="#{dataTable.columnsWidth}"> - <a4j:support event="onchange" reRender="dataTableID"></a4j:support> - </h:inputText> - - <h:outputText value="Width: "></h:outputText> - <h:inputText value="#{dataTable.width}"> - <a4j:support event="onchange" reRender="dataTableID"></a4j:support> - </h:inputText> - - <h:outputText value="rendered:" /> - <h:selectBooleanCheckbox value="#{dataTable.rendered}" - onclick="submit();" /> - - <h:outputText value=" row 2 rendered" /> - <h:selectBooleanCheckbox value="#{dataTable.r2rendered}" - onclick="submit();" /> - </h:panelGrid> - - </h:form> - </f:subview> - Added: branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTable.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,73 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="DataTableSubviewID"> + <h:form dir="DSform"> + <rich:dataTable id="dataTableID" var="dataTableID" value="#{dataTable.mounths}" rowKeyVar="key" styleClass="table" + captionClass="caption" rowClasses="rowa,rowb,rowc rowcc" headerClass="header" footerClass="footer" cellpadding="" + cellspacing="" onRowClick="print('onRowClickInputID', 'onRowClick work!');alert('row #{key}');" rendered="#{dataTable.rendered}" align="#{dataTable.align}" bgcolor="red" + border="#{dataTable.border}" columnsWidth="#{dataTable.columnsWidth}" width="#{dataTable.width}" title="DataTableTite" + onRowDblClick="print('onRowDblClickInputID', 'onRowDblClick work!')" + onRowMouseDown="print('onRowMouseDownInputID', 'onRowMouseDown work!')" + onRowMouseMove="print('onRowMouseMoveInputID', 'onRowMouseMove work!')" + onRowMouseOut="print('onRowMouseOutInputID', 'onRowMouseOut work!')" + onRowMouseOver="print('onRowMouseOverInputID', 'onRowMouseOver work!')" + onRowMouseUp="print('onRowMouseUpInputID', 'onRowMouseUp work!')"> + <f:facet name="caption"> + <h:outputText value="caption" /> + </f:facet> + <f:facet name="header"> + <rich:columnGroup columnClasses="cola, colb ,rowc rowcc"> + <rich:column rowspan="2" rendered="#{dataTable.r2rendered}"> + <h:outputText value="2-row head" /> + </rich:column> + <h:column rendered="#{dataTable.r2rendered}"> + <h:outputText value="head in UIColumn" /> + </h:column> + <rich:column breakBefore="true"> + <h:outputText value="2-d row head" /> + </rich:column> + </rich:columnGroup> + </f:facet> + <f:facet name="footer"> + <h:outputText value="table foot" /> + </f:facet> + <rich:columnGroup> + <rich:column id="mounth" styleClass="column" rowspan="2" headerClass="cheader" footerClass="cfooter"> + <f:facet name="header"> + <h:outputText value="mounth" /> + </f:facet> + <f:facet name="footer"> + <h:outputText value="-//-" /> + </f:facet> + <h:outputText value="#{dataTableID.mounth}" /> + </rich:column> + <rich:column styleClass="column" headerClass="cheader" footerClass="cfooter" rendered="#{dataTable.r2rendered}"> + <f:facet name="header"> + <h:outputText value="mounth" /> + </f:facet> + <f:facet name="footer"> + <h:outputText value="-//-" /> + </f:facet> + <h:outputText value="#{dataTableID.town}" /> + </rich:column> + </rich:columnGroup> + <rich:column styleClass="column" headerClass="cheader" footerClass="cfooter" rendered="#{dataTable.r2rendered}"> + <h:outputText value="#{dataTableID.day}" /> + </rich:column> + <rich:subTable id="detail" var="detail" value="#{dataTableID.detail}"> + <rich:column id="name"> + <h:outputText value="#{detail.name}" /> + </rich:column> + <rich:column id="qty" rendered="#{dataTable.r2rendered}"> + <h:outputText value="#{detail.qty}" /> + </rich:column> + </rich:subTable> + <rich:column id="total" styleClass="total" colspan="2"> + <h:outputText value="#{dataTableID.total}" /> + </rich:column> + </rich:dataTable> + </h:form> +</f:subview> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTableProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,39 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="dataTablePropertySubviewID"> + <rich:simpleTogglePanel id="dtPropertyID" switchType="client" opened="true" label="dataTable property"> + <h:panelGrid columns="2" style="top"> + <h:outputText value="Align:"></h:outputText> + <h:selectOneMenu value="#{dataTable.align}"> + <f:selectItem itemLabel="center" itemValue="center" /> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="right " itemValue="right" /> + <a4j:support event="onclick" reRender="dataTableID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="Border: "></h:outputText> + <h:inputText value="#{dataTable.border}"> + <a4j:support event="onchange" reRender="dataTableID"></a4j:support> + </h:inputText> + + <h:outputText value="Columns Width: "></h:outputText> + <h:inputText value="#{dataTable.columnsWidth}"> + <a4j:support event="onchange" reRender="dataTableID"></a4j:support> + </h:inputText> + + <h:outputText value="Width: "></h:outputText> + <h:inputText value="#{dataTable.width}"> + <a4j:support event="onchange" reRender="dataTableID"></a4j:support> + </h:inputText> + + <h:outputText value="rendered:" /> + <h:selectBooleanCheckbox value="#{dataTable.rendered}" onclick="submit();" /> + + <h:outputText value=" row 2 rendered" /> + <h:selectBooleanCheckbox value="#{dataTable.r2rendered}" onclick="submit();" /> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTableStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTableStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DataTable/DataTableStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="StraightforwardSubviewID"> + <rich:simpleTogglePanel switchType="client" opened="true" label="dataTable straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{dataTable.bTest1}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{dataTable.bTest2}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{dataTable.bTest3}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{dataTable.bTest4}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{dataTable.bTest5}" value="run" reRender="dtPropertyID,dataTableID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DragAndDrop/DragAndDrop.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,25 +1,12 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<style type="text/css"> - .dropzoneDecoration { - width: 70px; height: 70px; border: 2px dotted navy; - } - - .accept { - border: 3px dotted green; - padding: 10px; - } +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> - .reject { - border: 3px dashed red; - padding: 10px; - } - </style> +<f:subview id="DtadAndDropSubviewID"> -<f:subview id="dndID"> <h:form id="form"> + <h:panelGroup id="dragValueText"> <h:outputText value="#{dndBean.dragValue}" /> </h:panelGroup> @@ -29,7 +16,9 @@ <h:column> <h:panelGrid styleClass="dropzoneDecoration" id="drag1"> <h:outputText value="#{type} - drag" /> - <rich:dragSupport dragType="#{type}" dragValue="#{type} - value" action="#{dndBean.dragAction}" dragListener="#{dndBean.processDrag}"> + <rich:dragSupport dragType="#{type}" dragValue="#{type} - value" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondragend="print('ondragendInputID', 'ondragend work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" + onsubmit="print('onsubmitInputID', 'onsubmit work!')" action="#{dndBean.dragAction}" dragListener="#{dndBean.processDrag}"> </rich:dragSupport> </h:panelGrid> </h:column> @@ -39,8 +28,11 @@ <h:column> <h:panelGrid styleClass="dropzoneDecoration" id="drop2"> <h:outputText value="#{type} - drop" /> - <rich:dropSupport reRender="dragValueText" action="#{dndBean.dropAction}" acceptedTypes="#{type}" dropListener="#{dndBean.processDrop}" - dropValue="#{type} - value"> + <rich:dropSupport reRender="dragValueText" ondragenter="print('InputID', ' work!')" ondragexit="print('InputID', ' work!')" + ondrop="print('InputID', ' work!')" ondropend="print('InputID', ' work!')" + oncomplete="print('oncompleteInputID', 'oncomplete work!')" + onsubmit="print('onsubmitInputID', 'onsubmit work!')" + action="#{dndBean.dropAction}" acceptedTypes="#{type}" dropListener="#{dndBean.processDrop}" dropValue="#{type} - value"> </rich:dropSupport> </h:panelGrid> </h:column> @@ -82,10 +74,13 @@ <h:panelGrid styleClass="dropzoneDecoration" id="grid1"> <f:verbatim>Accepts file and folder... Customizes</f:verbatim> <rich:dropSupport id="zone1" - ondrop="var zone = $('form:grid1'); zone.style.borderColor= 'red'; setTimeout( function() { this.style.borderColor= 'navy'; }.bind(zone), 300);" + oncomplete="print('oncompleteInputID', 'oncomplete work!')" + onsubmit="print('onsubmitInputID', 'onsubmit work!')" ondragenter="print('ondragenterInputID', 'ondragenter work!')" + ondragexit="print('ondragexitInputID', 'ondragexit work!')" ondrop="print('ondropInputID', 'ondrop work!');var zone = $('DtadAndDropSubviewID:form:grid1'); zone.style.borderColor= 'red'; setTimeout( function() { this.style.borderColor= 'navy'; }.bind(zone), 300);" acceptedTypes="file, folder" typeMapping="{file: testDrop}"> <rich:dndParam name="testDrop"> - <h:graphicImage height="16" width="16" value="#{icon.iconFileManager}" /> + <h:graphicImage height="16" width="16" + value="#{icon.iconFileManager}" /> </rich:dndParam> </rich:dropSupport> </h:panelGrid> @@ -98,7 +93,11 @@ <h:panelGrid styleClass="dropzoneDecoration" id="grid3"> <f:verbatim>Accepts none... Customizes</f:verbatim> - <rich:dropSupport typeMapping="{file: testDrop}"> + <rich:dropSupport typeMapping="{file: testDrop}" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondragenter="print('ondragenterInputID', 'ondragenter work!')" + ondragexit="print('ondragexitInputID', 'ondragexit work!')" + ondrop="print('ondropInputID', 'ondrop work!')" ondropend="print('ondropendInputID', 'ondropend work!')" + onsubmit="print('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="testDrop"> <h:graphicImage height="16" width="16" value="#{icon.iconFileManagerReject}" /> </rich:dndParam> @@ -107,13 +106,19 @@ <h:panelGrid styleClass="dropzoneDecoration" id="grid4"> <f:verbatim>Accepts file and folder</f:verbatim> - <rich:dropSupport acceptedTypes="file, folder"> + <rich:dropSupport acceptedTypes="file, folder" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondragenter="print('ondragenterInputID', 'ondragenter work!')" + ondragexit="print('ondragexitInputID', 'ondragexit work!')" + ondrop="print('ondropInputID', 'ondrop work!')" ondropend="print('ondropendInputID', 'ondropend work!')" + onsubmit="print('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="testDrop" value="testDropValue" /> </rich:dropSupport> </h:panelGrid> <h:panelGrid id="grid5"> - <rich:dragSupport dragType="file"> + <rich:dragSupport dragType="file" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondragend="print('ondragendInputID', 'ondragend work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" + onsubmit="print('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue" /> </rich:dragSupport> @@ -121,7 +126,9 @@ </h:panelGrid> <h:panelGrid id="grid6"> - <rich:dragSupport dragType="file" dragIndicator="indicator"> + <rich:dragSupport dragType="file" dragIndicator="indicator" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondragend="print('ondragendInputID', 'ondragend work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" + onsubmit="print('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue" /> </rich:dragSupport> @@ -129,7 +136,9 @@ </h:panelGrid> <h:panelGrid id="grid7"> - <rich:dragSupport dragType="folder" dragIndicator="indicator"> + <rich:dragSupport dragType="folder" dragIndicator="indicator" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondragend="print('ondragendInputID', 'ondragend work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" + onsubmit="print('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue for Folder" /> </rich:dragSupport> @@ -139,7 +148,9 @@ <h:outputText /> <h:panelGrid id="grid8"> - <rich:dragSupport dragType="folder"> + <rich:dragSupport dragType="folder" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondragend="print('ondragendInputID', 'ondragend work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" + onsubmit="print('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="label" value="Label" /> <rich:dndParam name="testDrag" value="testDragValue for Folder" /> </rich:dragSupport> @@ -147,7 +158,9 @@ </h:panelGrid> <h:panelGrid id="grid9"> - <rich:dragSupport dragType="file" dragIndicator="defaultIndicator"> + <rich:dragSupport dragType="file" dragIndicator="defaultIndicator" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondragend="print('ondragendInputID', 'ondragend work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" + onsubmit="print('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="testDrag" value="testDragValue" /> <rich:dndParam name="marker" value="testMarkerValue" /> <rich:dndParam name="label" value="testDragValue" /> @@ -156,7 +169,9 @@ </h:panelGrid> <h:panelGrid id="grid10"> - <rich:dragSupport dragType="folder" dragIndicator="defaultIndicator"> + <rich:dragSupport dragType="folder" dragIndicator="defaultIndicator" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondragend="print('ondragendInputID', 'ondragend work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" + onsubmit="print('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="label" value="testDragValue for Folder" /> </rich:dragSupport> <f:verbatim>Folder Draggable with defaultIndicator</f:verbatim> @@ -165,7 +180,9 @@ </h:panelGrid> <h:panelGrid id="renderedId"> - <rich:dragSupport dragType="file" dragIndicator="defaultIndicator"> + <rich:dragSupport dragType="file" dragIndicator="defaultIndicator" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondragend="print('ondragendInputID', 'ondragend work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" + onsubmit="print('onsubmitInputID', 'onsubmit work!')"> <rich:dndParam name="marker" value="testMarkerValue" /> <rich:dndParam name="label" value="testDragValue" /> </rich:dragSupport> @@ -179,7 +196,5 @@ <a4j:outputPanel ajaxRendered="true"> <h:messages /> </a4j:outputPanel> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> - Deleted: branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DDMenu.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DDMenu.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DDMenu.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,146 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:subview id="ddMenuID"> -<h:form> - <h:panelGrid columns="3"> - <h:panelGrid columns="2"> - <h:outputText value="HideDelay (ms):" /> - <h:inputText value="#{dDMenu.hideDelay}"> - <a4j:support event="onchange" reRender="ddmId" /> - </h:inputText> - - <h:outputText value="ShowDelay (ms):" /> - <h:inputText value="#{dDMenu.showDelay}"> - <a4j:support event="onchange" reRender="ddmId" /> - </h:inputText> - - <h:outputText value="PopupWidth (px):" /> - <h:inputText value="#{dDMenu.popupWidth}"> - <a4j:support event="onchange" reRender="ddmId" /> - </h:inputText> - - <h:outputText value="horizontalOffset (px):" /> - <h:inputText value="#{dDMenu.horizontalOffset}"> - <a4j:support event="onchange" reRender="ddmId" /> - </h:inputText> - - <h:outputText value="verticalOffset (px):" /> - <h:inputText value="#{dDMenu.verticalOffset}"> - <a4j:support event="onchange" reRender="ddmId" /> - </h:inputText> - - <h:outputText value="Mode:" /> - <h:selectOneRadio value="#{dDMenu.mode}"> - <f:selectItem itemLabel="none" itemValue="none"/> - <f:selectItem itemLabel="ajax" itemValue="ajax"/> - <f:selectItem itemLabel="server" itemValue="server"/> - <a4j:support event="onclick" reRender="ddmId" /> - </h:selectOneRadio> - - <h:outputText value="Direction:" /> - <h:selectOneRadio value="#{dDMenu.direction}"> - <f:selectItem itemLabel="top-right" itemValue="top-right" /> - <f:selectItem itemLabel="top-left" itemValue="top-left" /> - <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> - <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> - <f:selectItem itemLabel="auto" itemValue="auto" /> - <a4j:support event="onclick" reRender="ddmId" /> - </h:selectOneRadio> - - <h:outputText value="GroupDirection:" /> - <h:selectOneRadio value="#{dDMenu.groupDirection}"> - <f:selectItem itemLabel="top-up" itemValue="top-up" /> - <f:selectItem itemLabel="top-down" itemValue="top-down" /> - <f:selectItem itemLabel="bottom-up" itemValue="bottom-up" /> - <f:selectItem itemLabel="bottom-down" itemValue="bottom-down" /> - <f:selectItem itemLabel="auto" itemValue="auto" /> - <a4j:support event="onclick" reRender="ddmId" /> - </h:selectOneRadio> - - <h:outputText value="JointPoint:" /> - <h:selectOneRadio value="#{dDMenu.jointPoint}"> - <f:selectItem itemLabel="top-right" itemValue="tr" /> - <f:selectItem itemLabel="top-left" itemValue="tl" /> - <f:selectItem itemLabel="bottom-right" itemValue="br" /> - <f:selectItem itemLabel="bottom-left" itemValue="bl" /> - <f:selectItem itemLabel="auto" itemValue="auto" /> - <a4j:support event="onclick" reRender="ddmId" /> - </h:selectOneRadio> - - <h:outputText value="Menu appearance event:" /> - <h:selectOneRadio value="#{dDMenu.event}" onclick="submit()"> - <f:selectItem itemLabel="onclick" itemValue="onclick"/> - <f:selectItem itemLabel="onmouseover" itemValue="onmouseover"/> - <a4j:support event="onclick" reRender="ddmId" /> - </h:selectOneRadio> - - <h:outputText value="Rendered:" /> - <h:selectBooleanCheckbox value="#{dDMenu.rendered}" onclick="submit()"> - - </h:selectBooleanCheckbox> - - <h:outputText value="Disable some items:" /> - <h:selectBooleanCheckbox value="#{dDMenu.disabled}"> - <a4j:support reRender="ddmId" event="onclick" /> - </h:selectBooleanCheckbox> - <h:commandButton action="#{dDMenu.changeIcons}" value="ChangeIcons" /> - </h:panelGrid> - - <rich:spacer width="300px"></rich:spacer> - - <rich:panel style="width:200px; height:50px;" > - <rich:dropDownMenu id="ddmId" value="DropDownMenu" - hideDelay="#{dDMenu.hideDelay}" direction="#{dDMenu.direction}" - horizontalOffset="#{dDMenu.horizontalOffset}" - jointPoint="#{dDMenu.jointPoint}" popupWidth="#{dDMenu.popupWidth}" - showDelay="#{dDMenu.showDelay}" rendered="#{dDMenu.rendered}" event="#{dDMenu.event}" - verticalOffset="#{dDMenu.verticalOffset}" styleClass="panelpos"> - <rich:menuItem icon="#{dDMenu.icon}"> - <h:outputText value="Item1" /> - </rich:menuItem> - <rich:menuSeparator /> - <rich:menuItem icon="#{dDMenu.icon}" onmousedown="alert('OnMouseDown')" selectClass="mousemove"> - <h:outputText value="OnMouseDown" /> - </rich:menuItem> - <rich:menuSeparator /> - <rich:menuItem > - <h:outputText value="Item2" /> - </rich:menuItem> - <rich:menuItem icon="#{dDMenu.icon}"> - <h:outputText value="Item3" /> - </rich:menuItem> - <rich:menuSeparator /> - <rich:menuItem icon="/pics/ajax_process.gif" iconDisabled="/pics/ajax_stoped.gif" disabled="#{dDMenu.disabled}"> - <h:outputText value="Image"></h:outputText> - </rich:menuItem> - <rich:menuItem disabled="#{dDMenu.disabled}" icon="#{dDMenu.icon}" > - <h:outputText value="Image:" /> - <h:graphicImage value="/pics/ajax_process.gif" /> - </rich:menuItem> - <rich:menuSeparator /> - <rich:menuGroup value="Second level" - direction="#{dDMenu.groupDirection}" disabled="#{dDMenu.disabled}" icon="#{dDMenu.icon}" iconFolder="#{dDMenu.iconFolder}"> - <rich:menuItem icon="#{dDMenu.icon}"> - <h:outputText value="Item3" /> - </rich:menuItem> - <rich:menuItem value="Item4"> - <h:selectOneMenu value="#{dDMenu.selectMenu}"> - <f:selectItem itemLabel="Honda Accord" itemValue="accord" /> - <f:selectItem itemLabel="Toyota 4Runner" itemValue="4runner" /> - <f:selectItem itemLabel="Nissan Z350" itemValue="nissan-z" /> - </h:selectOneMenu> - </rich:menuItem> - <rich:menuSeparator /> - <rich:menuItem icon="#{dDMenu.icon}"> - <h:outputText value="Checkbox " /> - <h:selectBooleanCheckbox value="#{dDMenu.check}" onclick="submit()" /> - </rich:menuItem> - </rich:menuGroup> - </rich:dropDownMenu> - </rich:panel> - </h:panelGrid> -</h:form> -</f:subview> - Added: branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenu.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,70 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="DropDownMenuSubviewID"> + <h:form> + <h:panelGrid columns="2"> + <rich:spacer width="400px" height="400px"></rich:spacer> + <rich:panel> + <rich:dropDownMenu id="ddmId" value="DropDownMenu" submitMode="#{dDMenu.mode}" hideDelay="#{dDMenu.hideDelay}" + direction="#{dDMenu.direction}" horizontalOffset="#{dDMenu.horizontalOffset}" jointPoint="#{dDMenu.jointPoint}" + popupWidth="#{dDMenu.popupWidth}" showDelay="#{dDMenu.showDelay}" rendered="#{dDMenu.rendered}" + verticalOffset="#{dDMenu.verticalOffset}" styleClass="panelpos" event="#{dDMenu.event}" + oncollapse="print('oncollapseInputID', 'oncollapse work!')" onexpand="print('onexpandInputID', 'onexpand work!')" + ongroupactivate="print('ongroupactivateInputID', 'ongroupactivate work!')" + onitemselect="print('onitemselectInputID', 'onitemselect work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')"> + <rich:menuItem icon="#{dDMenu.icon}" onclick="print('onclickInputID', 'onclick work (item)!')" + oncomplete="print('oncompleteInputID', 'oncomplete work (item)!')" onmousedown="print('onmousedownInputID', 'onmousedown work (item)!')" + onmousemove="print('onmousemoveInputID', ' work (item)!')" onmouseout="print('onmouseoutInputID', 'onmouseout work (item)!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work (item)!')" onmouseup="print('onmouseupInputID', 'onmouseup work (item)!')" + onselect="print('onselectInputID', 'onselect work (item)!')"> + <h:outputText value="Item1(test events)" /> + </rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem icon="#{dDMenu.icon}" onmousedown="alert('OnMouseDown')" selectClass="mousemove"> + <h:outputText value="OnMouseDown" /> + </rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem> + <h:outputText value="Item2" /> + </rich:menuItem> + <rich:menuItem icon="#{dDMenu.icon}"> + <h:outputText value="Item3" /> + </rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem icon="/pics/ajax_process.gif" iconDisabled="/pics/ajax_stoped.gif" disabled="#{dDMenu.disabled}"> + <h:outputText value="Image"></h:outputText> + </rich:menuItem> + <rich:menuItem disabled="#{dDMenu.disabled}" icon="#{dDMenu.icon}"> + <h:outputText value="Image:" /> + <h:graphicImage value="/pics/ajax_process.gif" /> + </rich:menuItem> + <rich:menuSeparator /> + <rich:menuGroup value="Second level" direction="#{dDMenu.groupDirection}" disabled="#{dDMenu.disabled}" icon="#{dDMenu.icon}" + iconFolder="#{dDMenu.iconFolder}"> + <rich:menuItem icon="#{dDMenu.icon}"> + <h:outputText value="Item3" /> + </rich:menuItem> + <rich:menuItem value="Item4"> + <h:selectOneMenu value="#{dDMenu.selectMenu}"> + <f:selectItem itemLabel="Honda Accord" itemValue="accord" /> + <f:selectItem itemLabel="Toyota 4Runner" itemValue="4runner" /> + <f:selectItem itemLabel="Nissan Z350" itemValue="nissan-z" /> + </h:selectOneMenu> + </rich:menuItem> + <rich:menuSeparator /> + <rich:menuItem icon="#{dDMenu.icon}"> + <h:outputText value="CheckBox " /> + <h:selectBooleanCheckbox value="#{dDMenu.check}" onclick="submit()" /> + </rich:menuItem> + </rich:menuGroup> + </rich:dropDownMenu> + </rich:panel> + </h:panelGrid> + <a4j:log></a4j:log> + </h:form> +</f:subview> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,91 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="dropDownMenuPropertySubviewID"> + <rich:simpleTogglePanel id="ddMenuPropertyID" switchType="client" opened="true" label="dropDownMenu property"> + <h:panelGrid columns="2"> + <h:outputText value="HideDelay (ms):" /> + <h:inputText value="#{dDMenu.hideDelay}"> + <a4j:support event="onchange" reRender="ddmId" /> + </h:inputText> + + <h:outputText value="ShowDelay (ms):" /> + <h:inputText value="#{dDMenu.showDelay}"> + <a4j:support event="onchange" reRender="ddmId" /> + </h:inputText> + + <h:outputText value="PopupWidth (px):" /> + <h:inputText value="#{dDMenu.popupWidth}"> + <a4j:support event="onchange" reRender="ddmId" /> + </h:inputText> + + <h:outputText value="horizontalOffset (px):" /> + <h:inputText value="#{dDMenu.horizontalOffset}"> + <a4j:support event="onchange" reRender="ddmId" /> + </h:inputText> + + <h:outputText value="verticalOffset (px):" /> + <h:inputText value="#{dDMenu.verticalOffset}"> + <a4j:support event="onchange" reRender="ddmId" /> + </h:inputText> + + <h:outputText value="Mode:" /> + <h:selectOneRadio value="#{dDMenu.mode}"> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <f:selectItem itemLabel="server" itemValue="server" /> + <a4j:support event="onclick" reRender="ddmId" /> + </h:selectOneRadio> + + <h:outputText value="Direction:" /> + <h:selectOneRadio value="#{dDMenu.direction}"> + <f:selectItem itemLabel="top-right" itemValue="top-right" /> + <f:selectItem itemLabel="top-left" itemValue="top-left" /> + <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> + <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> + <f:selectItem itemLabel="auto" itemValue="auto" /> + <a4j:support event="onclick" reRender="ddmId" /> + </h:selectOneRadio> + + <h:outputText value="GroupDirection:" /> + <h:selectOneRadio value="#{dDMenu.groupDirection}"> + <f:selectItem itemLabel="top-up" itemValue="top-up" /> + <f:selectItem itemLabel="top-down" itemValue="top-down" /> + <f:selectItem itemLabel="bottom-up" itemValue="bottom-up" /> + <f:selectItem itemLabel="bottom-down" itemValue="bottom-down" /> + <f:selectItem itemLabel="auto" itemValue="auto" /> + <a4j:support event="onclick" reRender="ddmId" /> + </h:selectOneRadio> + + <h:outputText value="JointPoint:" /> + <h:selectOneRadio value="#{dDMenu.jointPoint}"> + <f:selectItem itemLabel="top-right" itemValue="tr" /> + <f:selectItem itemLabel="top-left" itemValue="tl" /> + <f:selectItem itemLabel="bottom-right" itemValue="br" /> + <f:selectItem itemLabel="bottom-left" itemValue="bl" /> + <f:selectItem itemLabel="auto" itemValue="auto" /> + <a4j:support event="onclick" reRender="ddmId" /> + </h:selectOneRadio> + + <h:outputText value="Menu appearance event:" /> + <h:selectOneRadio value="#{dDMenu.event}" onclick="submit()"> + <f:selectItem itemLabel="onclick" itemValue="onclick" /> + <f:selectItem itemLabel="onmouseover" itemValue="onmouseover" /> + <a4j:support event="onclick" reRender="ddmId" /> + </h:selectOneRadio> + + <h:outputText value="Rendered:" /> + <h:selectBooleanCheckbox value="#{dDMenu.rendered}" onclick="submit()"> + + </h:selectBooleanCheckbox> + + <h:outputText value="Disable some items:" /> + <h:selectBooleanCheckbox value="#{dDMenu.disabled}"> + <a4j:support reRender="ddmId" event="onclick" /> + </h:selectBooleanCheckbox> + <h:commandButton action="#{dDMenu.changeIcons}" value="ChangeIcons" /> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/DropDownMenu/DropDownMenuStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="dropDownMenuStraightforwardSubviewID"> + <rich:simpleTogglePanel id="ddMenuStraightforwardID" switchType="client" opened="true" label="dropDownMenu straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{dDMenu.bTest1}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{dDMenu.bTest2}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{dDMenu.bTest3}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{dDMenu.bTest4}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{dDMenu.bTest5}" value="run" reRender="ddmId,ddMenuPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Effect/Effect.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Effect/Effect.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,11 +1,11 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> - <f:subview id="effectID"> - <h:messages /> +<f:subview id="effectSubviewID"> <h:form> + <rich:panel id="indexID"> <a4j:commandLink value="Hide all" onclick="hideFrm1(),hideFrm2(),hideFrm3(),hideFrm4(),hideFrm5()"></a4j:commandLink> @@ -294,7 +294,7 @@ <rich:effect for="frm5" name="hideFrm5" type="Fade" /> <rich:effect for="frm5" name="showFrm5" type="Appear" /> - </h:form> - </f:subview> +</h:form> +</f:subview> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Gmap/Gmap.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,29 +1,32 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - <f:subview id="gmapID"> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="GmapSubviewID"> <h:form> - <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" + <rich:gmap id="gm" lat="37.97" zoom="#{gmap.zoom}" gmapVar="map" onclick="" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" oninit="print('oninitInputID', 'oninit work!')" + onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" + onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')" gmapKey="ABQIAAAAxU6W9QEhFLMNdc3ATIu-VxT2yXp_ZAY8_ufC3CFXhHIE1NvwkxRkrpOGzxH8_ud3inE9pG1845-FCA" style="width:500px;height:400px" - enableContinuousZoom="#{gmap.continuousZoomAsString}" - enableDoubleClickZoom="#{gmap.doubleClickZoomAsString}" - enableDragging="#{gmap.draggingAsString}" - /> + enableContinuousZoom="#{gmap.continuousZoom}" + enableDoubleClickZoom="#{gmap.doubleClickZoom}" + enableDragging="#{gmap.dragging}" /> <h:panelGroup> <f:verbatim> - Controls: - <br /> + Controls:<br /> <a href="javascript:void(0);" onclick="map.hideControls();return false;">Remove</a> <a href="javascript:void(0);" onclick="map.showControls();return false;">Show</a> <br /> <br /> - Type: - <br /> + Type:<br /> <a href="javascript:void(0);" onclick="map.setMapType(G_NORMAL_MAP);return false;">Normal</a> <a href="javascript:void(0);" @@ -32,8 +35,7 @@ onclick="map.setMapType(G_HYBRID_MAP);return false;">Hybrid</a> <br /> <br /> - Zoom: - <br /> + Zoom:<br /> <a href="javascript:void(0);" onclick="map.zoomIn();return false;">In</a> <a href="javascript:void(0);" onclick="map.zoomOut();return false;">Out</a> <br /> @@ -47,57 +49,40 @@ </f:verbatim> </h:panelGroup> - <rich:panel> - <h:panelGrid columns="2"> - <h:outputText value="Dragging:" /> - <h:selectBooleanCheckbox value="#{gmap.dragging}" /> - - <h:outputText value="Continuous Zoom:" /> - <h:selectBooleanCheckbox value="#{gmap.continuousZoom}" /> - - <h:outputText value="Double Click Zoom:" /> - <h:selectBooleanCheckbox value="#{gmap.doubleClickZoom}" /> - - <h:commandLink value="submit" action="submit();"></h:commandLink> - </h:panelGrid> - </rich:panel> - - <a4j:outputPanel> + <a4j:outputPanel> <script> - function createMarker(point,html) { - var marker = new GMarker(point); - GEvent.addListener(marker, "click", function() { - marker.openInfoWindowHtml(html); - }); - return marker; - } - - function showExadelInMinsk() { - var point = new GLatLng(53.92316,27.510737, 53.92316,27.510737); - map.setCenter(point); - var marker = createMarker(point,'Go to the <a target="_blank" href="http://www.exadel.com">Exadle Web Site</a>'); - map.setZoom(16); - map.addOverlay(marker); - } - - function showExadel() { - var point = new GLatLng(37.9721046, -122.0424842834); - map.setCenter(point); - var marker = createMarker(point,'Go to the <a target="_blank" href="http://www.exadel.com">Exadle Web Site</a>'); - map.setZoom(16); - map.addOverlay(marker); - } - - function setCenter(lag, lat, zoom) { - map.setCenter(new GLatLng(lag, lat), zoom); - var ulp = new GPoint(lag,lat); - var ul = G_NORMAL_MAP.getProjection().fromPixelToLatLng(ulp,zoom); - } - </script> + + function createMarker(point,html) { + var marker = new GMarker(point); + GEvent.addListener(marker, "click", function() { + marker.openInfoWindowHtml(html); + }); + return marker; + } + + function showExadelInMinsk() { + var point = new GLatLng(53.92316,27.510737, 53.92316,27.510737); + map.setCenter(point); + var marker = createMarker(point,'Go to the <a target="_blank" href="http://www.exadel.com">Exadle Web Site</a>'); + map.setZoom(16); + map.addOverlay(marker); + } + + function showExadel() { + var point = new GLatLng(37.9721046, -122.0424842834); + map.setCenter(point); + var marker = createMarker(point,'Go to the <a target="_blank" href="http://www.exadel.com">Exadle Web Site</a>'); + map.setZoom(16); + map.addOverlay(marker); + } + + function setCenter(lag, lat, zoom) { + map.setCenter(new GLatLng(lag, lat), zoom); + var ulp = new GPoint(lag,lat); + var ul = G_NORMAL_MAP.getProjection().fromPixelToLatLng(ulp,zoom); + } + </script> </a4j:outputPanel> - </h:form> - <h:form> - <h:commandLink value="Back" action="main"></h:commandLink> - </h:form> - </f:subview> + </h:form> +</f:subview> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Gmap/GmapProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,17 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="GmapPropertySubviewID"> + <h:panelGrid columns="2"> + <h:outputText value="Dragging:" /> + <h:selectBooleanCheckbox value="#{gmap.dragging}" onclick="submit()" /> + + <h:outputText value="Continuous Zoom:" /> + <h:selectBooleanCheckbox value="#{gmap.continuousZoom}" onclick="submit()" /> + + <h:outputText value="Double Click Zoom:" /> + <h:selectBooleanCheckbox value="#{gmap.doubleClickZoom}" onclick="submit()" /> + </h:panelGrid> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSlider.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -2,111 +2,30 @@ <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:subview id="inputNumgerSliderID"> - <h:messages></h:messages> - <h:form> - <h:outputText value="Event:"></h:outputText> - <rich:inputNumberSlider minValue="0" maxValue="100" width="300px" - onmousedown="alert('OnMouseDown');"></rich:inputNumberSlider> - - <rich:spacer height="15px" width="300px"></rich:spacer> - <rich:inputNumberSlider id="SliderId" disabled="#{inputNumberSlider.disabled}" - enableManualInput="#{inputNumberSlider.enableManualInput}" - inputSize="#{inputNumberSlider.inputSize}" - maxValue="#{inputNumberSlider.maxValue}" - minValue="#{inputNumberSlider.minValue}" - rendered="#{inputNumberSlider.rendered}" - showBoundaryValues="#{inputNumberSlider.showBoundaryValues}" - step="#{inputNumberSlider.step}" - showInput="#{inputNumberSlider.showInput}" - width="#{inputNumberSlider.width}" - barClass="#{inputNumberSlider.barStyle}" - tipClass="#{inputNumberSlider.tipStyle}" - inputClass="#{inputNumberSlider.inputStyle}" - handleClass="#{inputNumberSlider.handleStyle}" - styleClass="#{inputNumberSlider.tipStyle}" - maxlength="#{inputNumberSlider.maxlength}"></rich:inputNumberSlider> -<%-- -<style type="text/css"> - .input - { - border:3px; - background-color: maroon; - } - </style> ---%> - - - <rich:spacer height="20px"></rich:spacer> - - <h:panelGrid columns="2" cellspacing="10px" border="1"> - - <h:outputText value="Width:"></h:outputText> - <h:inputText value="#{inputNumberSlider.width}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:inputText> - - <h:outputText value="Max Value:"></h:outputText> - <h:inputText value="#{inputNumberSlider.maxValue}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:inputText> - - <h:outputText value="Min Value:"></h:outputText> - <h:inputText value="#{inputNumberSlider.minValue}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:inputText> - - <h:outputText value="Input Size:"></h:outputText> - <h:inputText value="#{inputNumberSlider.inputSize}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:inputText> - - <h:outputText value="Input MaxLength:"></h:outputText> - <h:inputText value="#{inputNumberSlider.maxlength}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:inputText> - - <h:outputText value="Step:"></h:outputText> - <h:inputText value="#{inputNumberSlider.step}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:inputText> - - <h:outputText value="Disabled:"></h:outputText> - <h:selectBooleanCheckbox value="#{inputNumberSlider.disabled}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:selectBooleanCheckbox> - - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{inputNumberSlider.rendered}" - onclick="submit()"> - </h:selectBooleanCheckbox> - - <h:outputText value="Manual Input:"></h:outputText> - <h:selectBooleanCheckbox - value="#{inputNumberSlider.enableManualInput}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:selectBooleanCheckbox> - - <h:outputText value="Boundary Values:"></h:outputText> - <h:selectBooleanCheckbox - value="#{inputNumberSlider.showBoundaryValues}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:selectBooleanCheckbox> - - <h:outputText value="Show Input:"></h:outputText> - <h:selectBooleanCheckbox value="#{inputNumberSlider.showInput}"> - <a4j:support event="onchange" reRender="SliderId"></a4j:support> - </h:selectBooleanCheckbox> - - <h:outputText value="Switch Styles" /> - <a4j:commandButton id="slBtn" value="#{inputNumberSlider.btnLabel}" - action="#{inputNumberSlider.doStyles}" reRender="SliderId,slBtn"> - </a4j:commandButton> - +<f:subview id="inputNumberSliderSubviewID"> + <h:form> + <h:panelGrid columns="1"> + <rich:inputNumberSlider id="SliderId" immediate="#{inputNumberSlider.immediate}" + inputPosition="#{inputNumberSlider.inputPosition}" showToolTip="#{inputNumberSlider.showToolTip}" + tabindex="#{inputNumberSlider.tabindex}" value="#{inputNumberSlider.value}" valueChangeListener="{key}" + required="#{inputNumberSlider.rendered}" requiredMessage="#{inputNumberSlider.requiredMessage}" + disabled="#{inputNumberSlider.disabled}" enableManualInput="#{inputNumberSlider.enableManualInput}" + inputSize="#{inputNumberSlider.inputSize}" maxValue="#{inputNumberSlider.maxValue}" minValue="#{inputNumberSlider.minValue}" + rendered="#{inputNumberSlider.rendered}" showBoundaryValues="#{inputNumberSlider.showBoundaryValues}" + step="#{inputNumberSlider.step}" showInput="#{inputNumberSlider.showInput}" width="#{inputNumberSlider.width}" + barClass="#{inputNumberSlider.barStyle}" tipClass="#{inputNumberSlider.tipStyle}" inputClass="#{inputNumberSlider.inputStyle}" + handleClass="#{inputNumberSlider.handleStyle}" styleClass="#{inputNumberSlider.tipStyle}" + maxlength="#{inputNumberSlider.maxlength}" onmousedown="print('onmousedownInputID', 'onmousedown work!')" + onblur="print('onblurInputID', 'onblur work!')" onchange="print('onchangeInputID', 'onchange work!')" + onclick="print('onclickInputID', 'onclick work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" + onerror="print('ondblclickInputID', 'ondblclick work!')" onfocus="print('onfocusInputID', 'onfocus work!')" + onselect="print('onselectInputID', 'onselect work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"> + </rich:inputNumberSlider> </h:panelGrid> - - <h:commandLink value="Back" action="main"></h:commandLink> + <rich:spacer height="20px"></rich:spacer> </h:form> -</f:subview> - +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,106 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="inputNumberSliderPropertySubviewID"> + <rich:simpleTogglePanel id="iNSliderPropertyID" switchType="client" opened="true" label="inputNumberSlider property"> + <h:panelGrid columns="2" cellspacing="10px" border="1"> + <h:outputText value="value" /> + <h:inputText value="#{inputNumberSlider.value}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> + + <h:outputText value="inputPosition"></h:outputText> + <h:selectOneRadio value="#{inputNumberSlider.inputPosition}"> + <f:selectItem itemLabel="right" itemValue="right" /> + <f:selectItem itemLabel="left" itemValue="left" /> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Width:"></h:outputText> + <h:inputText value="#{inputNumberSlider.width}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> + + <h:outputText value="Max Value:"></h:outputText> + <h:inputText value="#{inputNumberSlider.maxValue}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> + + <h:outputText value="Min Value:"></h:outputText> + <h:inputText value="#{inputNumberSlider.minValue}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> + + <h:outputText value="Input Size:"></h:outputText> + <h:inputText value="#{inputNumberSlider.inputSize}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> + + <h:outputText value="Input MaxLength:"></h:outputText> + <h:inputText value="#{inputNumberSlider.maxlength}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> + + <h:outputText value="Step:"></h:outputText> + <h:inputText value="#{inputNumberSlider.step}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> + + <h:outputText value="tabindex" /> + <h:inputText value="#{inputNumberSlider.tabindex}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> + + <h:outputText value="Disabled:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSlider.disabled}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSlider.rendered}" onclick="submit()"> + </h:selectBooleanCheckbox> + + <h:outputText value="Manual Input:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSlider.enableManualInput}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Boundary Values:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSlider.showBoundaryValues}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Show Input:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSlider.showInput}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="showToolTip" /> + <h:selectBooleanCheckbox value="#{inputNumberSlider.showToolTip}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="required" /> + <h:selectBooleanCheckbox value="#{inputNumberSlider.required}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="requiredMessage" /> + <h:inputText value="#{inputNumberSlider.requiredMessage}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:inputText> + + <h:outputText value="immediate" /> + <h:selectBooleanCheckbox value="#{inputNumberSlider.immediate}"> + <a4j:support event="onchange" reRender="SliderId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Switch Styles" /> + <a4j:commandButton id="slBtn" value="#{inputNumberSlider.btnLabel}" action="#{inputNumberSlider.doStyles}" + reRender="SliderId,slBtn"> + </a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSlider/InputNumberSliderStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="inputNumberSliderStraightforwardSubviewID"> + <rich:simpleTogglePanel switchType="client" opened="true" label="inputNumberSlider straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{inputNumberSlider.bTest1}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{inputNumberSlider.bTest2}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{inputNumberSlider.bTest3}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{inputNumberSlider.bTest4}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{inputNumberSlider.bTest5}" value="run" reRender="SliderId,iNSliderPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinner.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,77 +1,26 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> <%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> - <f:subview id="inputNumgerSpinnerID"> - <h:form> - <h:messages></h:messages> - <h:outputText value="Event:"></h:outputText> - <rich:inputNumberSpinner minValue="0" maxValue="10" onchange="alert('mouse down');"></rich:inputNumberSpinner> - - <rich:spacer height="15px"></rich:spacer> - <rich:inputNumberSpinner id="SpinnerID" - cycled="#{inputNumberSpinner.cycled}" - disabled="#{inputNumberSpinner.disabled}" - maxValue="#{inputNumberSpinner.max}" - minValue="#{inputNumberSpinner.min}" - step="#{inputNumberSpinner.step}" - rendered="#{inputNumberSpinner.rendered}" - value="#{inputNumberSpinner.value}" - inputClass="#{inputNumberSpinner.inputStyle}" - styleClass="#{inputNumberSpinner.style}" - enableManualInput="#{inputNumberSpinner.manualInput}" - inputSize="#{inputNumberSpinner.inputSize}"></rich:inputNumberSpinner> - <rich:spacer height="20px"></rich:spacer> - - <h:panelGrid columns="2" cellpadding="10px" border="1"> +<f:subview id="inputNumberSpinnerSubviewID"> + <h:form> + <h:messages></h:messages> - <h:outputText value="Max: "></h:outputText> - <h:inputText value="#{inputNumberSpinner.max}"> - <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> - </h:inputText> - - <h:outputText value="Min: "></h:outputText> - <h:inputText value="#{inputNumberSpinner.min}"> - <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> - </h:inputText> - - <h:outputText value="Step: "></h:outputText> - <h:inputText value="#{inputNumberSpinner.step}"> - <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> - </h:inputText> - - <h:outputText value="Size: "></h:outputText> - <h:inputText value="#{inputNumberSpinner.inputSize}"> - <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> - </h:inputText> - - <h:outputText value="Value: "></h:outputText> - <h:inputText value="#{inputNumberSpinner.value}"> - <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> - </h:inputText> - - <h:outputText value="Cycled:"></h:outputText> - <h:selectBooleanCheckbox value="#{inputNumberSpinner.cycled}"> - <a4j:support event="onclick" reRender="SpinnerID"></a4j:support> - </h:selectBooleanCheckbox> - - <h:outputText value="Manual Input:"></h:outputText> - <h:selectBooleanCheckbox value="#{inputNumberSpinner.manualInput}"> - <a4j:support event="onclick" reRender="SpinnerID"></a4j:support> - </h:selectBooleanCheckbox> - - <h:outputText value="Disabled:"></h:outputText> - <h:selectBooleanCheckbox value="#{inputNumberSpinner.disabled}"> - <a4j:support event="onclick" reRender="SpinnerID"></a4j:support> - </h:selectBooleanCheckbox> - - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{inputNumberSpinner.rendered}" onclick="submit()"> - </h:selectBooleanCheckbox> - <h:outputText value="Switch Styles:" /> - <h:commandButton action="#{inputNumberSpinner.doStyles}" value="#{inputNumberSpinner.btnLabel}" /> - </h:panelGrid> <h:commandLink value="Back" action="main"></h:commandLink> -</h:form> - </f:subview> - + <rich:inputNumberSpinner id="SpinnerID" tabindex="#{inputNumberSpinner.tabindex}" cycled="#{inputNumberSpinner.cycled}" + disabled="#{inputNumberSpinner.disabled}" maxValue="#{inputNumberSpinner.max}" minValue="#{inputNumberSpinner.min}" + step="#{inputNumberSpinner.step}" rendered="#{inputNumberSpinner.rendered}" value="#{inputNumberSpinner.value}" + inputClass="#{inputNumberSpinner.inputStyle}" styleClass="#{inputNumberSpinner.style}" + enableManualInput="#{inputNumberSpinner.manualInput}" inputSize="#{inputNumberSpinner.inputSize}" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onblur="print('onblurInputID', 'onblur work!')" + onchange="print('onchangeInputID', 'onchange work!')" onclick="print('onclickInputID', 'onclick work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onerror="print('ondblclickInputID', 'ondblclick work!')" + onfocus="print('onfocusInputID', 'onfocus work!')" onselect="print('onselectInputID', 'onselect work!')" + onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" + onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')" ondownclick="print('ondownclickInputID', 'ondownclick work!')" + onupclick="print('onupclickInputID', 'onupclick work!')"></rich:inputNumberSpinner> + <rich:spacer height="20px"></rich:spacer> + </h:form> +</f:subview> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,56 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="iNSpinnerPropertySubviewID"> + <rich:simpleTogglePanel id="iNSpinnerPropertyID" switchType="client" opened="true" label="inputNumberSpinner property"> + <h:panelGrid columns="2" cellpadding="10px" border="1"> + <h:outputText value="Max: "></h:outputText> + <h:inputText value="#{inputNumberSpinner.max}"> + <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> + </h:inputText> + + <h:outputText value="Min: "></h:outputText> + <h:inputText value="#{inputNumberSpinner.min}"> + <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> + </h:inputText> + + <h:outputText value="Step: "></h:outputText> + <h:inputText value="#{inputNumberSpinner.step}"> + <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> + </h:inputText> + + <h:outputText value="Size: "></h:outputText> + <h:inputText value="#{inputNumberSpinner.inputSize}"> + <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> + </h:inputText> + + <h:outputText value="Value: "></h:outputText> + <h:inputText value="#{inputNumberSpinner.value}"> + <a4j:support reRender="SpinnerID" event="onchange"></a4j:support> + </h:inputText> + + <h:outputText value="Cycled:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSpinner.cycled}"> + <a4j:support event="onclick" reRender="SpinnerID"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Manual Input:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSpinner.manualInput}"> + <a4j:support event="onclick" reRender="SpinnerID"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Disabled:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSpinner.disabled}"> + <a4j:support event="onclick" reRender="SpinnerID"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{inputNumberSpinner.rendered}" onclick="submit()"> + </h:selectBooleanCheckbox> + <h:outputText value="Switch Styles:" /> + <h:commandButton action="#{inputNumberSpinner.doStyles}" value="#{inputNumberSpinner.btnLabel}" /> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/InputNumberSpinner/InputNumberSpinnerStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="iNSpinnerStraightforwardSubviewID"> + <rich:simpleTogglePanel switchType="client" opened="true" label="inputNumberSpinner straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{inputNumberSpinner.bTest1}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{inputNumberSpinner.bTest2}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{inputNumberSpinner.bTest3}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{inputNumberSpinner.bTest4}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{inputNumberSpinner.bTest5}" value="run" reRender="SpinnerID,iNSpinnerPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Insert/Insert.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Insert/Insert.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Insert/Insert.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,8 +1,9 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - <f:subview id="insertID"> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="insertSubviewID"> <h:form> <h:messages /> @@ -10,40 +11,5 @@ <rich:insert id="insertID" highlight="#{insert.highlight}" rendered="#{insert.rendered}" src="#{insert.src}"></rich:insert> </rich:panel> - - <h:panelGrid columns="2"> - <h:outputText value="Highlight:" /> - <h:selectOneMenu value="#{insert.highlight}"> - <f:selectItem itemValue="HTML" itemLabel="HTML" /> - <f:selectItem itemValue="GROOVY" itemLabel="GROOVY" /> - <f:selectItem itemValue="JAVA" itemLabel="JAVA" /> - <f:selectItem itemValue="BEANSHELL" itemLabel="BEANSHELL" /> - <f:selectItem itemValue="BSH" itemLabel="BSH" /> - <f:selectItem itemValue="XML" itemLabel="XML" /> - <f:selectItem itemValue="XHTML" itemLabel="XHTML" /> - <f:selectItem itemValue="LZX" itemLabel="LZX" /> - <f:selectItem itemValue="CPP" itemLabel="CPP" /> - <f:selectItem itemValue="CXX" itemLabel="CXX" /> - <a4j:support event="onclick" reRender="panelID,insertID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="Select file:" /> - <h:selectOneMenu value="#{insert.src}"> - <f:selectItem itemValue="/Insert/src/test.html" itemLabel="HTML" /> - <f:selectItem itemValue="/Insert/src/test.java" itemLabel="JAVA" /> - <f:selectItem itemValue="/Insert/src/test.groovy" itemLabel="GROOVY" /> - <f:selectItem itemValue="/Insert/src/test.bsh" itemLabel="BEANSHELL,BSH" /> - <f:selectItem itemValue="/Insert/src/test.xml" itemLabel="XML" /> - <f:selectItem itemValue="/Insert/Insert.jsp" itemLabel="XHTML" /> - <f:selectItem itemValue="/Insert/src/test.lzx" itemLabel="LZX" /> - <f:selectItem itemValue="/Insert/src/test.cpp" itemLabel="CPP,CXX" /> - <a4j:support event="onclick" action="submit();" reRender="panelID,insertID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="Rendered" /> - <h:selectBooleanCheckbox value="#{insert.rendered}" onchange="submit();"/> - </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> - </f:subview> - +</f:subview> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Insert/InsertProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Insert/InsertProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Insert/InsertProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,39 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="InsertPropertySubviewID"> + <h:panelGrid columns="2"> + <h:outputText value="Highlight:" /> + <h:selectOneMenu value="#{insert.highlight}"> + <f:selectItem itemValue="HTML" itemLabel="HTML" /> + <f:selectItem itemValue="GROOVY" itemLabel="GROOVY" /> + <f:selectItem itemValue="JAVA" itemLabel="JAVA" /> + <f:selectItem itemValue="BEANSHELL" itemLabel="BEANSHELL" /> + <f:selectItem itemValue="BSH" itemLabel="BSH" /> + <f:selectItem itemValue="XML" itemLabel="XML" /> + <f:selectItem itemValue="XHTML" itemLabel="XHTML" /> + <f:selectItem itemValue="LZX" itemLabel="LZX" /> + <f:selectItem itemValue="CPP" itemLabel="CPP" /> + <f:selectItem itemValue="CXX" itemLabel="CXX" /> + <a4j:support event="onclick" reRender="panelID,insertID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="Select file:" /> + <h:selectOneMenu value="#{insert.src}"> + <f:selectItem itemValue="/Insert/src/test.html" itemLabel="HTML" /> + <f:selectItem itemValue="/Insert/src/test.java" itemLabel="JAVA" /> + <f:selectItem itemValue="/Insert/src/test.groovy" itemLabel="GROOVY" /> + <f:selectItem itemValue="/Insert/src/test.bsh" itemLabel="BEANSHELL,BSH" /> + <f:selectItem itemValue="/Insert/src/test.xml" itemLabel="XML" /> + <f:selectItem itemValue="/Insert/Insert.xhtml" itemLabel="XHTML" /> + <f:selectItem itemValue="/Insert/src/test.lzx" itemLabel="LZX" /> + <f:selectItem itemValue="/Insert/src/test.cpp" itemLabel="CPP,CXX" /> + <a4j:support event="onclick" action="submit();" reRender="panelID,insertID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="Rendered" /> + <h:selectBooleanCheckbox value="#{insert.rendered}" onchange="submit();"/> + </h:panelGrid> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Message/Message.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Message/Message.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Message/Message.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,109 +1,20 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - <f:subview id="messageID"> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="messageSubviewID"> <h:form> <rich:panel> - <h:panelGrid columns="2"> - <h:outputText value="1." /> - <h:selectOneMenu id="select1" value=""> - <f:selectItem itemValue="error" itemLabel="error" /> - <f:selectItem itemValue="fatal" itemLabel="fatal" /> - <f:selectItem itemValue="warn" itemLabel="warning" /> - <f:selectItem itemValue="info" itemLabel="info" /> - <f:selectItem itemValue="passed" itemLabel="passed" /> - <f:validator validatorId="MessageValidator" /> - </h:selectOneMenu> - - <h:outputText value="2." /> - <h:selectOneMenu id="select2" value=""> - <f:selectItem itemValue="error" itemLabel="error" /> - <f:selectItem itemValue="fatal" itemLabel="fatal" /> - <f:selectItem itemValue="warn" itemLabel="warning" /> - <f:selectItem itemValue="info" itemLabel="info" /> - <f:selectItem itemValue="passed" itemLabel="passed" /> - <f:validator validatorId="MessageValidator" /> - </h:selectOneMenu> - - <h:outputText value="3." /> - <h:selectOneMenu id="select3" value=""> - <f:selectItem itemValue="error" itemLabel="error" /> - <f:selectItem itemValue="fatal" itemLabel="fatal" /> - <f:selectItem itemValue="warn" itemLabel="warning" /> - <f:selectItem itemValue="info" itemLabel="info" /> - <f:selectItem itemValue="passed" itemLabel="passed" /> - <f:validator validatorId="MessageValidator" /> - </h:selectOneMenu> - - <h:outputText value="4." /> - <h:selectOneMenu id="select4" value=""> - <f:selectItem itemValue="error" itemLabel="error" /> - <f:selectItem itemValue="fatal" itemLabel="fatal" /> - <f:selectItem itemValue="warn" itemLabel="warning" /> - <f:selectItem itemValue="info" itemLabel="info" /> - <f:selectItem itemValue="passed" itemLabel="passed" /> - <f:validator validatorId="MessageValidator" /> - </h:selectOneMenu> - - <h:outputText value="5." /> - <h:selectOneMenu id="select5" value=""> - <f:selectItem itemValue="error" itemLabel="error" /> - <f:selectItem itemValue="fatal" itemLabel="fatal" /> - <f:selectItem itemValue="warn" itemLabel="warning" /> - <f:selectItem itemValue="info" itemLabel="info" /> - <f:selectItem itemValue="passed" itemLabel="passed" /> - <f:validator validatorId="MessageValidator" /> - </h:selectOneMenu> - - <h:outputText value="Rich Message Demo:" /> - <h:selectOneMenu value="#{message.msg}"> - <f:selectItem itemValue="no" itemLabel="no" /> - <f:selectItem itemValue="select1" itemLabel="1" /> - <f:selectItem itemValue="select2" itemLabel="2" /> - <f:selectItem itemValue="select3" itemLabel="3" /> - <f:selectItem itemValue="select4" itemLabel="4" /> - <f:selectItem itemValue="select5" itemLabel="5" /> - </h:selectOneMenu> - - <h:outputText value="Title:" /> - <h:inputText value="#{message.title}" /> - - <h:outputText value="Show Detail:" /> - <h:selectBooleanCheckbox value="#{message.showDetail}" /> - - <h:outputText value="ShowSummary" /> - <h:selectBooleanCheckbox value="#{message.showSummary}" /> - - <h:outputText value="Tooltip" /> - <h:selectBooleanCheckbox value="#{message.tooltip}" /> - - <h:outputText value="Layout:" /> - <h:selectOneMenu value="#{message.layout}"> - <f:selectItem itemValue="table" itemLabel="table"/> - <f:selectItem itemValue="list" itemLabel="list"/> - </h:selectOneMenu> - - <h:commandButton value="submit" /> - <a4j:commandButton value="submit ajax" /> - </h:panelGrid> - </rich:panel> - - <rich:spacer></rich:spacer> - - <rich:panel> <h:outputText value="Rich Message Demo:" /> <f:verbatim> <br /> </f:verbatim> - <rich:message for="#{message.msg}" tooltip="#{message.tooltip}" - showDetail="#{message.showDetail}" - showSummary="#{message.showSummary}" passedLabel="No Error" - errorLabelClass="errorLabel" fatalLabelClass="warnLabel" - infoLabelClass="infoLabel" warnLabelClass="fatalLabel" - title="#{message.title}"> + <rich:message for="#{message.msg}" tooltip="#{message.tooltip}" showDetail="#{message.showDetail}" + showSummary="#{message.showSummary}" passedLabel="No Error" errorLabelClass="errorLabel" fatalLabelClass="warnLabel" + infoLabelClass="infoLabel" warnLabelClass="fatalLabel" title="#{message.title}"> <f:facet name="errorMarker"> @@ -130,16 +41,11 @@ <rich:separator></rich:separator> <h:outputText value="Rich Messages Demo" /> - <rich:messages layout="#{message.layout}" tooltip="#{message.tooltip}" - showDetail="#{message.showDetail}" - showSummary="#{message.showSummary}" passedLabel="No Error" - errorLabelClass="errorLabel" fatalLabelClass="warnLabel" - infoLabelClass="infoLabel" warnLabelClass="fatalLabel" - warnMarkerClass="markerWarn" infoMarkerClass="markerInfo" - errorMarkerClass="markerError" fatalMarkerClass="markerFatal" - errorClass="errorClass" fatalClass="fatalClass" - warnClass="warnClass" infoClass="infoClass" labelClass="labelClass" - var="messages" styleClass="class" title="#{message.title}"> + <rich:messages layout="#{message.layout}" tooltip="#{message.tooltip}" showDetail="#{message.showDetail}" + showSummary="#{message.showSummary}" passedLabel="No Error" errorLabelClass="errorLabel" fatalLabelClass="warnLabel" + infoLabelClass="infoLabel" warnLabelClass="fatalLabel" warnMarkerClass="markerWarn" infoMarkerClass="markerInfo" + errorMarkerClass="markerError" fatalMarkerClass="markerFatal" errorClass="errorClass" fatalClass="fatalClass" + warnClass="warnClass" infoClass="infoClass" labelClass="labelClass" var="messages" styleClass="class" title="#{message.title}"> <f:facet name="errorMarker"> <h:graphicImage url="/pics/error.gif" /> </f:facet> @@ -159,9 +65,10 @@ </h:outputText> </rich:messages> </rich:panel> - </h:form> - <h:form> - <h:commandLink value="Back" action="main"></h:commandLink> - </h:form> - </f:subview> + <f:verbatim> + <br /> + </f:verbatim> + + </h:form> +</f:subview> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Message/MessageProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Message/MessageProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Message/MessageProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,91 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="MessagePropertySubviewID"> + <rich:simpleTogglePanel id="msgPropertyID" switchType="client" opened="true" label="modalPanel property"> + <h:panelGrid columns="2"> + <h:outputText value="1." /> + <h:selectOneMenu id="select1" value="#{message.select1}"> + <f:selectItem itemValue="error" itemLabel="error" /> + <f:selectItem itemValue="fatal" itemLabel="fatal" /> + <f:selectItem itemValue="warn" itemLabel="warning" /> + <f:selectItem itemValue="info" itemLabel="info" /> + <f:selectItem itemValue="passed" itemLabel="passed" /> + <f:validator validatorId="MessageValidator" /> + </h:selectOneMenu> + + <h:outputText value="2." /> + <h:selectOneMenu id="select2" value="#{message.select2}"> + <f:selectItem itemValue="error" itemLabel="error" /> + <f:selectItem itemValue="fatal" itemLabel="fatal" /> + <f:selectItem itemValue="warn" itemLabel="warning" /> + <f:selectItem itemValue="info" itemLabel="info" /> + <f:selectItem itemValue="passed" itemLabel="passed" /> + <f:validator validatorId="MessageValidator" /> + </h:selectOneMenu> + + <h:outputText value="3." /> + <h:selectOneMenu id="select3" value="#{message.select3}"> + <f:selectItem itemValue="error" itemLabel="error" /> + <f:selectItem itemValue="fatal" itemLabel="fatal" /> + <f:selectItem itemValue="warn" itemLabel="warning" /> + <f:selectItem itemValue="info" itemLabel="info" /> + <f:selectItem itemValue="passed" itemLabel="passed" /> + <f:validator validatorId="MessageValidator" /> + </h:selectOneMenu> + + <h:outputText value="4." /> + <h:selectOneMenu id="select4" value="#{message.select4}"> + <f:selectItem itemValue="error" itemLabel="error" /> + <f:selectItem itemValue="fatal" itemLabel="fatal" /> + <f:selectItem itemValue="warn" itemLabel="warning" /> + <f:selectItem itemValue="info" itemLabel="info" /> + <f:selectItem itemValue="passed" itemLabel="passed" /> + <f:validator validatorId="MessageValidator" /> + </h:selectOneMenu> + + <h:outputText value="5." /> + <h:selectOneMenu id="select5" value="#{message.select5}"> + <f:selectItem itemValue="error" itemLabel="error" /> + <f:selectItem itemValue="fatal" itemLabel="fatal" /> + <f:selectItem itemValue="warn" itemLabel="warning" /> + <f:selectItem itemValue="info" itemLabel="info" /> + <f:selectItem itemValue="passed" itemLabel="passed" /> + <f:validator validatorId="MessageValidator" /> + </h:selectOneMenu> + + <h:outputText value="Rich Message Demo:" /> + <h:selectOneMenu value="#{message.msg}"> + <f:selectItem itemValue="no" itemLabel="no" /> + <f:selectItem itemValue="select1" itemLabel="1" /> + <f:selectItem itemValue="select2" itemLabel="2" /> + <f:selectItem itemValue="select3" itemLabel="3" /> + <f:selectItem itemValue="select4" itemLabel="4" /> + <f:selectItem itemValue="select5" itemLabel="5" /> + </h:selectOneMenu> + + <h:outputText value="Title:" /> + <h:inputText value="#{message.title}" /> + + <h:outputText value="Show Detail:" /> + <h:selectBooleanCheckbox value="#{message.showDetail}" /> + + <h:outputText value="ShowSummary" /> + <h:selectBooleanCheckbox value="#{message.showSummary}" /> + + <h:outputText value="Tooltip" /> + <h:selectBooleanCheckbox value="#{message.tooltip}" /> + + <h:outputText value="Layout:" /> + <h:selectOneMenu value="#{message.layout}"> + <f:selectItem itemValue="table" itemLabel="table" /> + <f:selectItem itemValue="list" itemLabel="list" /> + </h:selectOneMenu> + + <h:commandButton value="submit" /> + <a4j:commandButton value="submit ajax" /> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Message/MessageStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Message/MessageStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Message/MessageStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="MessageStraightforwardSubviewID"> + <rich:simpleTogglePanel switchType="client" opened="true" label="modalPanel straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{message.bTest1}" value="run" onclick="submit()"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{message.bTest2}" value="run" onclick="submit()"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{message.bTest3}" value="run" onclick="submit()"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{message.bTest4}" value="run" onclick="submit()"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{message.bTest5}" value="run" onclick="submit()"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,72 +1,31 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<f:subview id="modalPanel"> - <h:form id="MPform"> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> - <rich:modalPanel id="MPid" - minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}" - height="#{modalPanel.height}" width="#{modalPanel.width}" - moveable="#{modalPanel.moveable}" resizeable="#{modalPanel.resizeable}"> +<f:subview id="modalPanelSubviewID"> + <h:form id="MPform"> + <rich:modalPanel id="MPid" minHeight="#{modalPanel.minHeight}" minWidth="#{modalPanel.minWidth}" height="#{modalPanel.height}" + width="#{modalPanel.width}" moveable="#{modalPanel.moveable}" resizeable="#{modalPanel.resizeable}" onhide="print('onhideInputID', 'onhide work!')" + onshow="print('onshowInputID', 'onshow work!')"> <f:facet name="header"> <h:outputText value="Heder goes here..." /> </f:facet> + <h:outputText value="This is Modal Panel example" styleClass="text1" /> - <f:verbatim> - <br/> - <br/> + <br /> + <br /> </f:verbatim> - - <h:outputLink - onclick="Richfaces.hideModalPanel('MPform:MPid');return false;" - value="Close"> + <h:outputLink onclick="Richfaces.hideModalPanel('MPform:MPid');return false;" value="Close"> <f:verbatim>Close</f:verbatim> </h:outputLink> </rich:modalPanel> - <a onclick="Richfaces.showModalPanel('MPform:MPid');" href="#">Show MP</a> - + <a onclick="Richfaces.showModalPanel('MPform:MPid');" href="#">Show MP</a> + <rich:spacer height="20px"></rich:spacer> - - <h:panelGrid columns="2" > - - <h:outputText value="Width:" /> - <h:inputText value="#{modalPanel.width}"> - <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> - </h:inputText> - - <h:outputText value="Height:" /> - <h:inputText value="#{modalPanel.height}"> - <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> - </h:inputText> - - <h:outputText value="minWidth:" /> - <h:inputText value="#{modalPanel.minWidth}"> - <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> - </h:inputText> - - <h:outputText value="minHeight:" /> - <h:inputText value="#{modalPanel.minHeight}"> - <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> - </h:inputText> - - <h:outputText value="Resizeable:" /> - <h:selectBooleanCheckbox value="#{modalPanel.resizeable}" > - <a4j:support event="onclick" reRender="MPform:MPid"></a4j:support> - </h:selectBooleanCheckbox> - - <h:outputText value="Moveable:" /> - <h:selectBooleanCheckbox value="#{modalPanel.moveable}" > - <a4j:support event="onclick" reRender="MPform:MPid"></a4j:support> - </h:selectBooleanCheckbox> - - </h:panelGrid> - - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> - Added: branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,41 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="ModalPanelPropertySubviewID"> + <rich:simpleTogglePanel id="mpPropertyID" switchType="client" opened="true" label="modalPanel property"> + <h:panelGrid columns="2"> + + <h:outputText value="Width:" /> + <h:inputText value="#{modalPanel.width}"> + <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> + </h:inputText> + + <h:outputText value="Height:" /> + <h:inputText value="#{modalPanel.height}"> + <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> + </h:inputText> + + <h:outputText value="minWidth:" /> + <h:inputText value="#{modalPanel.minWidth}"> + <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> + </h:inputText> + + <h:outputText value="minHeight:" /> + <h:inputText value="#{modalPanel.minHeight}"> + <a4j:support event="onchange" reRender="MPform:MPid"></a4j:support> + </h:inputText> + + <h:outputText value="Resizeable:" /> + <h:selectBooleanCheckbox value="#{modalPanel.resizeable}"> + <a4j:support event="onclick" reRender="MPform:MPid"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Moveable:" /> + <h:selectBooleanCheckbox value="#{modalPanel.moveable}"> + <a4j:support event="onclick" reRender="MPform:MPid"></a4j:support> + </h:selectBooleanCheckbox> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanelStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="ModalPanelStraightforwardSubviewID"> + <rich:simpleTogglePanel switchType="client" opened="true" label="modalPanel straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{modalPanel.bTest1}" value="run" reRender="MPform:MPid,mpPropertyID"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{modalPanel.bTest2}" value="run" reRender="MPform:MPid,mpPropertyID"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{modalPanel.bTest3}" value="run" reRender="MPform:MPid,mpPropertyID"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{modalPanel.bTest4}" value="run" reRender="MPform:MPid,mpPropertyID"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{modalPanel.bTest5}" value="run" reRender="MPform:MPid,mpPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2D.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,93 +1,13 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:subview id="paint2D"> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> +<f:subview id="paint2DSubviewID"> <h:form> - <rich:paint2D id="paint2d" paint="#{paint2D.paint}" data="#{paintData}" width="#{paint2D.width}" height="#{paint2D.height}" align="#{paint2D.align}" - hspace="#{paint2D.hspace}" vspace="#{paint2D.vspace}" bgcolor="#{paint2D.bgcolor}" format="#{paint2D.format}" title="#{paint2D.title}" - styleClass="#{paint2D.styleString}" border="#{paint2D.border}" rendered="#{paint2D.rendered}" /> - - <h:panelGrid columns="2" cellpadding="5px" border="2"> - <h:outputText value="Text"></h:outputText> - <h:inputText value="#{paintData.text}"> - <a4j:support event="onkeyup" reRender="paint2d" /> - </h:inputText> - - <h:outputText value="Width: "></h:outputText> - <h:inputText value="#{paint2D.width}"> - <a4j:support event="onchange" reRender="paint2d"></a4j:support> - </h:inputText> - - <h:outputText value="Height: "></h:outputText> - <h:inputText value="#{paint2D.height}"> - <a4j:support event="onchange" reRender="paint2d"></a4j:support> - </h:inputText> - - <h:outputText value="Vertical space: "></h:outputText> - <h:inputText value="#{paint2D.vspace}"> - <a4j:support event="onchange" reRender="paint2d"></a4j:support> - </h:inputText> - - <h:outputText value="Horizontal space: "></h:outputText> - <h:inputText value="#{paint2D.hspace}"> - <a4j:support event="onchange" reRender="paint2d"></a4j:support> - </h:inputText> - - <h:outputText value="Align:"></h:outputText> - <h:selectOneMenu value="#{paint2D.align}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="middle" itemValue="middle" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <f:selectItem itemLabel="bottom" itemValue="bottom" /> - <f:selectItem itemLabel="top" itemValue="top" /> - <a4j:support event="onclick" reRender="paint2d"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="Format:"></h:outputText> - <h:selectOneMenu value="#{paint2D.format}"> - <f:selectItem itemLabel="jpeg" itemValue="jpeg" /> - <f:selectItem itemLabel="gif" itemValue="gif" /> - <f:selectItem itemLabel="png" itemValue="png" /> - <a4j:support event="onclick" reRender="paint2d"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="Background Colour"></h:outputText> - <h:selectOneMenu value="#{paint2D.bgcolor}"> - <f:selectItem itemLabel="aqua" itemValue="aqua" /> - <f:selectItem itemLabel="blue" itemValue="blue" /> - <f:selectItem itemLabel="fuchsia" itemValue="fuchsia" /> - <f:selectItem itemLabel="gray" itemValue="gray" /> - <f:selectItem itemLabel="lime" itemValue="lime" /> - <f:selectItem itemLabel="maroon" itemValue="maroon" /> - <f:selectItem itemLabel="purple" itemValue="purple" /> - <f:selectItem itemLabel="red" itemValue="red" /> - <f:selectItem itemLabel="silver" itemValue="silver" /> - <f:selectItem itemLabel="teal" itemValue="teal" /> - <f:selectItem itemLabel="yellow" itemValue="yellow" /> - <f:selectItem itemLabel="white" itemValue="white" /> - <a4j:support event="onclick" reRender="paint2d"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="Style" /> - <h:selectBooleanCheckbox value="#{paint2D.style}" > - <a4j:support event="onclick" reRender="paint2d,borderID" /> - </h:selectBooleanCheckbox> - - <h:outputText value="Border: "></h:outputText> - <h:inputText id="borderID" disabled="#{paint2D.style}" value="#{paint2D.border}"> - <a4j:support event="onchange" reRender="paint2d"></a4j:support> - </h:inputText> - - <h:outputText value="Rendered"></h:outputText> - <h:selectBooleanCheckbox value="#{paint2D.rendered}"> - <a4j:support event="onclick" reRender="paint2d"></a4j:support> - </h:selectBooleanCheckbox> - </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> - + <rich:paint2D id="paint2dID" paint="#{paint2D.paint}" data="#{paintData}" width="#{paint2D.width}" height="#{paint2D.height}" + align="#{paint2D.align}" hspace="#{paint2D.hspace}" vspace="#{paint2D.vspace}" bgcolor="#{paint2D.bgcolor}" + format="#{paint2D.format}" title="#{paint2D.title}" styleClass="#{paint2D.styleString}" border="#{paint2D.border}" + rendered="#{paint2D.rendered}" /> </h:form> - </f:subview> - Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2DProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,85 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="Paint2DPropertySubviewID"> + <rich:simpleTogglePanel id="paint2DPropertyID" switchType="client" opened="true" label="paint2D property"> + <h:panelGrid columns="2" cellpadding="5px" border="2"> + <h:outputText value="Text"></h:outputText> + <h:inputText value="#{paintData.text}"> + <a4j:support event="onchange" reRender="paint2dID" /> + </h:inputText> + + <h:outputText value="Width: "></h:outputText> + <h:inputText value="#{paint2D.width}"> + <a4j:support event="onchange" reRender="paint2dID"></a4j:support> + </h:inputText> + + <h:outputText value="Height: "></h:outputText> + <h:inputText value="#{paint2D.height}"> + <a4j:support event="onchange" reRender="paint2dID"></a4j:support> + </h:inputText> + + <h:outputText value="Vertical space: "></h:outputText> + <h:inputText value="#{paint2D.vspace}"> + <a4j:support event="onchange" reRender="paint2dID"></a4j:support> + </h:inputText> + + <h:outputText value="Horizontal space: "></h:outputText> + <h:inputText value="#{paint2D.hspace}"> + <a4j:support event="onchange" reRender="paint2dID"></a4j:support> + </h:inputText> + + <h:outputText value="Align:"></h:outputText> + <h:selectOneMenu value="#{paint2D.align}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="middle" itemValue="middle" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <f:selectItem itemLabel="bottom" itemValue="bottom" /> + <f:selectItem itemLabel="top" itemValue="top" /> + <a4j:support event="onclick" reRender="paint2dID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="Format:"></h:outputText> + <h:selectOneMenu value="#{paint2D.format}"> + <f:selectItem itemLabel="jpeg" itemValue="jpeg" /> + <f:selectItem itemLabel="gif" itemValue="gif" /> + <f:selectItem itemLabel="png" itemValue="png" /> + <a4j:support event="onclick" reRender="paint2dID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="Background Colour"></h:outputText> + <h:selectOneMenu value="#{paint2D.bgcolor}"> + <f:selectItem itemLabel="aqua" itemValue="aqua" /> + <f:selectItem itemLabel="blue" itemValue="blue" /> + <f:selectItem itemLabel="fuchsia" itemValue="fuchsia" /> + <f:selectItem itemLabel="gray" itemValue="gray" /> + <f:selectItem itemLabel="lime" itemValue="lime" /> + <f:selectItem itemLabel="maroon" itemValue="maroon" /> + <f:selectItem itemLabel="purple" itemValue="purple" /> + <f:selectItem itemLabel="red" itemValue="red" /> + <f:selectItem itemLabel="silver" itemValue="silver" /> + <f:selectItem itemLabel="teal" itemValue="teal" /> + <f:selectItem itemLabel="yellow" itemValue="yellow" /> + <f:selectItem itemLabel="white" itemValue="white" /> + <a4j:support event="onclick" reRender="paint2dID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="Style" /> + <h:selectBooleanCheckbox value="#{paint2D.style}"> + <a4j:support event="onclick" reRender="paint2dID,borderID" /> + </h:selectBooleanCheckbox> + + <h:outputText value="Border: "></h:outputText> + <h:inputText id="borderID" disabled="#{paint2D.style}" value="#{paint2D.border}"> + <a4j:support event="onchange" reRender="paint2dID"></a4j:support> + </h:inputText> + + <h:outputText value="Rendered"></h:outputText> + <h:selectBooleanCheckbox value="#{paint2D.rendered}"> + <a4j:support event="onclick" reRender="paint2dID"></a4j:support> + </h:selectBooleanCheckbox> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2DStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2DStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Paint2D/Paint2DStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="Paint2DStraightforwardSubviewID"> + <rich:simpleTogglePanel switchType="client" opened="true" label="paint2D straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{paint2D.bTest1}" value="run" reRender="paint2dID,paint2DPropertyID"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{paint2D.bTest2}" value="run" reRender="paint2dID,paint2DPropertyID"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{paint2D.bTest3}" value="run" reRender="paint2dID,paint2DPropertyID"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{paint2D.bTest4}" value="run" reRender="paint2dID,paint2DPropertyID"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{paint2D.bTest5}" value="run" reRender="paint2dID,paint2DPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,62 +1,50 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> <%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> - <f:subview id="panelID"> - <h:form> - <h:messages></h:messages> - <h:outputText value="Panel 1, rendered: #{!panel.rendered}; Panel 2, rendered #{panel.rendered};"></h:outputText> - - <rich:panel rendered="#{!panel.rendered}" id="p1" style="width:#{panel.width};height:#{panel.height};overflow:auto;"> - <f:facet name="header"><h:outputText id="t1" value="#{panel.title[0]}   (Panel 1)" /></f:facet> - - <rich:panel> - <f:facet name="header"><h:outputText id="t2" value="#{panel.title[1]}" /></f:facet> - <h:panelGrid columns="2"> - <h:outputText id="o1" value="width #{panel.title[2]}, eg. 250px"></h:outputText> - <h:inputText value="#{w}"><a4j:support event="onchange" reRender="p3"></a4j:support></h:inputText> - - <h:outputText id="o2" value="height #{panel.title[2]}, eg. 200px"></h:outputText> - <h:inputText value="#{h}"><a4j:support event="onchange" reRender="p3"></a4j:support></h:inputText> - </h:panelGrid> - - <rich:panel id="p3" style="width:#{w};height:#{h};overflow:auto;"> - <f:facet name="header"><h:outputText id="t3" value="#{panel.title[2]}" /></f:facet> - <h:graphicImage value="/pics/asus.jpg" width="150" height="100"></h:graphicImage> - </rich:panel> - </rich:panel> - </rich:panel> - - <rich:panel onmousedown="alert('OnMouseDown');" id="panelId" onclick="submit()" - rendered="#{panel.rendered}" - style="width:#{panel.width};height:#{panel.height}" > - <f:verbatim> - This is panel 2 example... - </f:verbatim> - </rich:panel> - <h:panelGrid columns="2" cellpadding="10px" > - <h:outputText value="Title"></h:outputText> - <h:inputText valueChangeListener="#{panel.makeTitle}"> - <a4j:support event="onchange" reRender="t1,t2,t3,o1,o2"></a4j:support> - </h:inputText> - - <h:outputText value="Width: "></h:outputText> - <h:inputText value="#{panel.width}" > - <a4j:support event="onchange" reRender="panelId,p1"></a4j:support> - </h:inputText> +<f:subview id="panelSubviewID"> + <h:form> - <h:outputText value="Height: "></h:outputText> - <h:inputText value="#{panel.height}" > - <a4j:support event="onchange" reRender="panelId,p1"></a4j:support> - </h:inputText> + <h:outputText value="Panel 1, rendered: #{!panel.rendered}; Panel 2, rendered #{panel.rendered};"></h:outputText> - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{panel.rendered}" onclick="submit()"></h:selectBooleanCheckbox> - </h:panelGrid> - <h:commandLink value="Sample 2" action="Sample2"></h:commandLink> - <br/> - <h:commandLink value="Back" action="main"></h:commandLink> + <rich:panel rendered="#{!panel.rendered}" id="p1" style="width:#{panel.width};height:#{panel.height};overflow:auto;" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" onclick="print('onclickInputID', 'onclick work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"> + <f:facet name="header"> + <h:outputText id="t1" value="#{panel.title[0]} (Panel 1)" /> + </f:facet> + + <rich:panel> + <f:facet name="header"> + <h:outputText id="t2" value="#{panel.title[1]}" /> + </f:facet> + <h:panelGrid columns="2"> + <h:outputText id="o1" value="width #{panel.title[2]}, eg. 250px"></h:outputText> + <h:inputText value="#{w}"> + <a4j:support event="onchange" reRender="p3"></a4j:support> + </h:inputText> + + <h:outputText id="o2" value="height #{panel.title[2]}, eg. 200px"></h:outputText> + <h:inputText value="#{h}"> + <a4j:support event="onchange" reRender="p3"></a4j:support> + </h:inputText> + </h:panelGrid> + + <rich:panel id="p3" style="width:#{w};height:#{h};overflow:auto;"> + <f:facet name="header"> + <h:outputText id="t3" value="#{panel.title[2]}" /> + </f:facet> + <h:graphicImage value="/pics/asus.jpg" width="150" height="100"></h:graphicImage> + </rich:panel> + </rich:panel> + </rich:panel> + + <rich:panel id="panelId" rendered="#{panel.rendered}" + style="width:#{panel.width};height:#{panel.height}" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" onclick="print('onclickInputID', 'onclick work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"> + <f:verbatim>This is panel 2 example...(Test events)</f:verbatim> + + </rich:panel> </h:form> - </f:subview> +</f:subview> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/Panel2.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,148 +1,98 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<style> - .panel { - vertical-align:top; - } - .rich-panel-header { - color:#F00 !important; - - } - .top { - width:200px !important;height:100px !important; - } - .hea { - color:#FCC !important; - } - .bo { - color:#F00 !important; - } - - .top2 { - width:200px !important;height:100px !important; - border:2px solid #4C9600 !important; - background-color:#E4FFC8 !important; - } - - -.hea2 { - background-image : url() !important; - background-color : #4C9600 !important; - height:18px !important; - text-align:center !important; - vertical-align:middle !important; - color:#CFF !important; - padding:4px 0 !important; - } - - .bo2 { - color:#4C9600; - } - .bo3 { - height:100px; - overflow:auto; - } - -</style> -<f:subview id="Panel2ID"> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> - <h:panelGrid columnClasses="panel" border="0" columns="3"> - <rich:panel styleClass="top"> - <f:facet name="header"> - <h:panelGroup> - <h:outputText escape="false" value="dsdsdsdsd <br />sdsd" /> +<f:subview id="panel2SubviewID"> + <h:form> + <h:messages showDetail="true" /> + <h:panelGrid columnClasses="panel" border="0" columns="3"> + <rich:panel styleClass="top"> + <f:facet name="header"> + <h:panelGroup> + <f:verbatim>dsdsdsdsd<br />sdsd </f:verbatim> + </h:panelGroup> - </h:panelGroup> - </f:facet> - <h:outputText escape="false" value="This is <b>default</b> panel. content here" /> + </f:facet> - </rich:panel> + <f:verbatim>This is <b>default</b> panel. content here</f:verbatim> + </rich:panel> + <rich:panel styleClass="top" headerClass="hea" bodyClass="bo"> + <f:facet name="header"> + <h:outputText value="Header of the Panel" /> + </f:facet> + <f:verbatim>This panel contains custom headerClass and bodyClass</f:verbatim> + </rich:panel> + <rich:panel styleClass="top2" headerClass="hea2" bodyClass="bo2"> + <f:facet name="header"> + <h:outputText value="Header of the Panel" /> + </f:facet> + <f:verbatim> This panel also contains custom headerClass and bodyClass. The background is not a 3D anymore.</f:verbatim> + </rich:panel> - <rich:panel styleClass="top" headerClass="hea" bodyClass="bo"> - <f:facet name="header"> - <h:outputText value="Header of the Panel" /> - </f:facet> - <h:outputText value="This panel contains custom headerClass and bodyClass" /> + <h:panelGroup> + <h:form> + <rich:panel + onmouseover="document.getElementById(this.id+'_header').style.background='#60BA01';document.getElementById(this.id+'_body').style.background='#F4FFF8'" + onmouseout="document.getElementById(this.id+'_header').style.background='#4C9600';document.getElementById(this.id+'_body').style.background='#E4FFC8'" + style="width:200px;" headerClass="hea2" bodyClass="bo3"> + <f:facet name="header"> + <h:outputText value="Header of the Panel" /> + </f:facet> + <f:verbatim>Base on the previous layout, but form element and javascript behaviour are added</f:verbatim> + <br /> + <h:inputText /> + </rich:panel> + </h:form> + </h:panelGroup> - </rich:panel> + <rich:panel style="width:200px;" headerClass="hea" bodyClass="bo3"> + <f:facet name="header"> + <h:outputText value="Scrolling Text Panel" /> + </f:facet> + <f:verbatim> + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + Long Text Long Text Long Text + </f:verbatim> + </rich:panel> - <rich:panel styleClass="top2" headerClass="hea2" bodyClass="bo2"> + <rich:panel styleClass="top"> + <f:verbatim>This is a panel without the header</f:verbatim> + + </rich:panel> + </h:panelGrid> + <rich:panel style="position: absolute; top: 116px; right: 100px; " + styleClass="top"> <f:facet name="header"> <h:outputText value="Header of the Panel" /> </f:facet> - <h:outputText value="This panel also contains custom headerClass and bodyClass. The background is not a 3D anymore." /> - + <f:verbatim> + This is a panel with absolute position on the screen.<br /> + Resize the browser's window for fun. + </f:verbatim> </rich:panel> - - <h:panelGroup> - <h:form> - <rich:panel - onmouseover="document.getElementById(this.id+'_header').style.background='#60BA01';document.getElementById(this.id+'_body').style.background='#F4FFF8'" - onmouseout="document.getElementById(this.id+'_header').style.background='#4C9600';document.getElementById(this.id+'_body').style.background='#E4FFC8'" - style="width:200px;" headerClass="hea2" bodyClass="bo3"> - <f:facet name="header"> - <h:outputText value="Header of the Panel" /> - </f:facet> - <h:outputText value="Base on the previous layout, but form element and javascript behaviour are added" /> - <f:verbatim> - <br /> - </f:verbatim> - <h:inputText /> - </rich:panel> - </h:form> - </h:panelGroup> - - <rich:panel style="width:200px;" headerClass="hea" bodyClass="bo3"> + <rich:panel style="width:#{panel.width};height:#{panel.height}"> <f:facet name="header"> - <h:outputText value="Scrolling Text Panel" /> + <f:verbatim> + Test<br /> + Test<br /> + Test<br /> + </f:verbatim> </f:facet> - <f:verbatim> - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - Long Text Long Text Long Text - </f:verbatim> + <h:form> + <h:outputText value="inside the form" /> + </h:form> </rich:panel> - - <rich:panel styleClass="top"> - <h:outputText value="This is a panel without the header" /> - - </rich:panel> - </h:panelGrid> - - <rich:panel style="position: absolute; top: 116px; right: 100px; " styleClass="top"> - <f:facet name="header"> - <h:outputText value="Header of the Panel" /> - </f:facet> - <h:outputText escape="false" value=" This is a panel with absolute position on the screen.<br /> - Resize the browser's window for fun." /> - </rich:panel> - - <rich:panel style="width:#{panel.width};height:#{panel.height}"> - <f:facet name="header"> - <f:verbatim> - Test<br /> - Test<br /> - Test<br /> - </f:verbatim> - </f:facet> - <h:form> - <h:outputText value="inside the form" /> - </h:form> - </rich:panel> - <h:form> - <h:commandLink value="Back to Panel" action="BackP"></h:commandLink> </h:form> </f:subview> - Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/PanelProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/PanelProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/PanelProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,28 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="PanelPropertySubviewID"> + <rich:simpleTogglePanel id="panelPropertyID" switchType="client" opened="true" label="panel property"> + <h:panelGrid columns="2" cellpadding="10px"> + <h:outputText value="Title"></h:outputText> + <h:inputText valueChangeListener="#{panel.makeTitle}"> + <a4j:support event="onchange" reRender="t1,t2,t3,o1,o2"></a4j:support> + </h:inputText> + + <h:outputText value="Width: "></h:outputText> + <h:inputText value="#{panel.width}"> + <a4j:support event="onchange" reRender="panelId,p1"></a4j:support> + </h:inputText> + + <h:outputText value="Height: "></h:outputText> + <h:inputText value="#{panel.height}"> + <a4j:support event="onchange" reRender="panelId,p1"></a4j:support> + </h:inputText> + + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{panel.rendered}" onclick="submit()"></h:selectBooleanCheckbox> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/PanelStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/PanelStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Panel/PanelStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="PanelStraightforwardSubviewID"> + <rich:simpleTogglePanel switchType="client" opened="true" label="panel straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{panel.bTest1}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{panel.bTest2}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{panel.bTest3}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{panel.bTest4}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{panel.bTest5}" value="run" reRender="panelPropertyID,panelId,p1,t1,t2,t3,o1,o2"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBar.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,64 +1,39 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:subview id="panelBarID"> - <h:messages></h:messages> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="panelBarSubviewID"> <h:form> - <rich:panelBar id="pBId" height="#{panelBar.height}" - width="#{panelBar.width}" - contentClass="#{panelBar.contentStyle}" - styleClass="#{panelBar.style}" - selectedPanel="pBiId4"> - <rich:panelBarItem rendered="#{panelBar.rendered}" id="pBiId1" label="#{panelBar.label[0]}" headerClass="#{panelBar.headerStyle}"> + + <h:messages></h:messages> + + <rich:panelBar id="pBId" height="#{panelBar.height}" width="#{panelBar.width}" contentClass="#{panelBar.contentStyle}" + styleClass="#{panelBar.style}" selectedPanel="pBiId4" onclick="print('onclickInputID', 'onclick work!')"> + <rich:panelBarItem rendered="#{panelBar.rendered}" id="pBiId1" label="#{panelBar.label[0]}" + headerClass="#{panelBar.headerStyle}"> <h:outputText value="Some text..."></h:outputText> </rich:panelBarItem> <rich:panelBarItem id="pBiId2" label="#{panelBar.label[1]}" headerClass="#{panelBar.headerStyle}"> - <h:graphicImage value="/pics/masshtaby_01.jpg" width="300" - height="200"></h:graphicImage> + <h:graphicImage value="/pics/masshtaby_01.jpg" width="300" height="200"></h:graphicImage> </rich:panelBarItem> <rich:panelBarItem id="pBiId3" label="#{panelBar.label[2]}" headerClass="#{panelBar.headerStyle}"> - <f:facet name="openMarker"><h:graphicImage value="/pics/ajax_process.gif"></h:graphicImage> </f:facet> - <f:facet name="closeMarker"><h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage> </f:facet> - <h:graphicImage value="/pics/podb109_61.jpg" width="300" - height="200"></h:graphicImage> + <f:facet name="openMarker"> + <h:graphicImage value="/pics/ajax_process.gif"></h:graphicImage> + </f:facet> + <f:facet name="closeMarker"> + <h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage> + </f:facet> + <h:graphicImage value="/pics/podb109_61.jpg" width="300" height="200"></h:graphicImage> </rich:panelBarItem> <rich:panelBarItem id="pBiId4" label="#{panelBar.label[3]}" headerClass="#{panelBar.headerStyle}"> <h:outputText value="Select Panel"></h:outputText> </rich:panelBarItem> - </rich:panelBar> <rich:spacer height="20px"></rich:spacer> - - <h:panelGrid columns="2" cellspacing="10px"> - <h:outputText value="Label: "></h:outputText> - <h:inputText valueChangeListener="#{panelBar.makeLabels}"> - <a4j:support event="onchange" reRender="pBId"></a4j:support> - </h:inputText> - - <h:outputText value="Width: "></h:outputText> - <h:inputText value="#{panelBar.width}"> - <a4j:support event="onchange" reRender="pBId"></a4j:support> - </h:inputText> - - <h:outputText value="Height: "></h:outputText> - <h:inputText value="#{panelBar.height}"> - <a4j:support event="onchange" reRender="pBId"></a4j:support> - </h:inputText> - - <h:outputText value="Rendered"></h:outputText> - <h:selectBooleanCheckbox value="#{panelBar.rendered}"> - <a4j:support event="onchange" reRender="pBId"/> - </h:selectBooleanCheckbox> - - <h:outputText value="Switch Styles:" /> - <h:commandButton action="#{panelBar.doStyles}" value="#{panelBar.btnLabel}" /> - </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> - Added: branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBarProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,33 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="panelBarPropertySubviewID"> + <rich:simpleTogglePanel id="pbPropertyID" switchType="client" opened="true" label="panelBar property"> + <h:panelGrid columns="2" cellspacing="10px"> + <h:outputText value="Label: "></h:outputText> + <h:inputText valueChangeListener="#{panelBar.makeLabels}"> + <a4j:support event="onchange" reRender="pBId"></a4j:support> + </h:inputText> + + <h:outputText value="Width: "></h:outputText> + <h:inputText value="#{panelBar.width}"> + <a4j:support event="onchange" reRender="pBId"></a4j:support> + </h:inputText> + + <h:outputText value="Height: "></h:outputText> + <h:inputText value="#{panelBar.height}"> + <a4j:support event="onchange" reRender="pBId"></a4j:support> + </h:inputText> + + <h:outputText value="Rendered"></h:outputText> + <h:selectBooleanCheckbox value="#{panelBar.rendered}"> + <a4j:support event="onchange" reRender="pBId" /> + </h:selectBooleanCheckbox> + + <h:outputText value="Switch Styles:" /> + <h:commandButton action="#{panelBar.doStyles}" value="#{panelBar.btnLabel}" /> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBarStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBarStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/PanelBar/PanelBarStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="panelBarStraightforwardSubviewID"> + <rich:simpleTogglePanel switchType="client" opened="true" label="panelBar straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{panelBar.bTest1}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{panelBar.bTest2}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{panelBar.bTest3}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{panelBar.bTest4}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{panelBar.bTest5}" value="run" reRender="pbPropertyID,pBId"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenu.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,32 +1,29 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<style> - .sPanel - { - background: gray; - } - .body - { - background-color: pink; - border: green 3px solid; - background: gray; - } - </style> -<f:subview id="panelMenuID"> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> +<f:subview id="panelMenuSubviewID"> <h:form> + <h:messages showDetail="true"/> <rich:panelMenu id="panelMenuID" disabled="#{panelMenu.disabled}" width="#{panelMenu.width}" selectedChild="thisChild" expandSingle="#{panelMenu.expandSingle}" mode="#{panelMenu.mode}" value="PanelMenu" rendered="#{panelMenu.rendered}" iconCollapsedGroup="#{panelMenu.icon.collapsedGroup}" iconCollapsedTopGroup="#{panelMenu.icon.collapsedTopGroup}" iconDisabledGroup="#{panelMenu.icon.disabledGroup}" iconDisabledItem="#{panelMenu.icon.disabledItem}" - iconExpandedGroup="#{panelMenu.icon.expandedGroup}" iconExpandedTopGroup="#{panelMenu.icon.expandedTopGroup}" iconItem="#{panelMenu.icon.item}" - iconTopDisabledItem="#{panelMenu.icon.disabledItem}" iconTopDisableGroup="#{panelMenu.icon.disabledGroup}" iconTopItem="#{panelMenu.icon.topItem}" + iconExpandedGroup="#{panelMenu.icon.expandedGroup}" iconExpandedTopGroup="#{panelMenu.icon.expandedTopGroup}" + iconItem="#{panelMenu.icon.item}" iconTopDisabledItem="#{panelMenu.icon.disabledItem}" + iconTopDisableGroup="#{panelMenu.icon.disabledGroup}" iconTopItem="#{panelMenu.icon.topItem}" iconGroupPosition="#{panelMenu.iconGroupPosition}" iconGroupTopPosition="#{panelMenu.iconGroupTopPosition}" - iconItemPosition="#{panelMenu.iconItemPosition}" iconItemTopPosition="#{panelMenu.iconItemTopPosition}" styleClass="sPanel"> + iconItemPosition="#{panelMenu.iconItemPosition}" iconItemTopPosition="#{panelMenu.iconItemTopPosition}" styleClass="sPanel" + onclick="" ondblclick="" ongroupcollapse="" ongroupexpand="" onitemhover="" onkeydown="" onkeypress="" onkeyup="" + onmousedown="" onmousemove="" onmouseout="" onmouseover="" onmouseup=""> - <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> + <rich:panelMenuItem label="Item 1(Test event)" onclick="print('onclickInputID', 'onclick work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')"></rich:panelMenuItem> <rich:panelMenuItem disabled="true" iconDisabled="/pics/ajax_stoped.gif"> <h:outputText value="Disabled Item" /> </rich:panelMenuItem> @@ -84,7 +81,7 @@ </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 2"> + <rich:panelMenuGroup label="Group 2 "> <rich:panelMenuItem label="Item 2_1"></rich:panelMenuItem> <rich:panelMenuGroup label="Group 2_2"> @@ -100,10 +97,10 @@ <rich:panelMenuItem label="Item 3_1"> <f:verbatim> <br /> - text1 <br /> - text2 <br /> - text3 - </f:verbatim> + text <br /> + text <br /> + text + </f:verbatim> </rich:panelMenuItem> <rich:panelMenuItem label="Item 3_2"> <h:graphicImage value="/pics/benq.jpg" width="150px" height="100px"></h:graphicImage> @@ -119,7 +116,7 @@ <h:outputText id="info" value="Expand Mode: #{panelMenu.mode}, Disabled: #{!panelMenu.disabled}, Align: #{panelMenu.align}, Tab Index: #{panelMenu.tabIndex}"></h:outputText> -  + <f:verbatim> <br /> </f:verbatim> @@ -146,8 +143,8 @@ <rich:panelMenuItem label="Item "></rich:panelMenuItem> </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 1_3" align="#{panelMenu.align}" iconCollapsed="#{icon.iconCollapse}" iconExpanded="#{icon.iconExpand}" - iconDisabled="#{icon.disabled}"> + <rich:panelMenuGroup label="Group 1_3" align="#{panelMenu.align}" iconCollapsed="#{icon.iconCollapse}" + iconExpanded="#{icon.iconExpand}" iconDisabled="#{icon.disabled}"> <rich:panelMenuItem label="Item 1"></rich:panelMenuItem> <rich:panelMenuItem label="Item 2"></rich:panelMenuItem> <rich:panelMenuItem label="Item 3"></rich:panelMenuItem> @@ -175,292 +172,10 @@ </rich:panelMenuGroup> </rich:panelMenuGroup> </rich:panelMenu> + <f:verbatim> <br /> <br /> </f:verbatim> - - <h:panelGrid columns="2"> - - <h:outputText value="Width"></h:outputText> - <h:inputText value="#{panelMenu.width}"> - <a4j:support event="onchange" reRender="panelMenuID,panelMenuID2,info"></a4j:support> - </h:inputText> - - <h:outputText value="Tab Index"></h:outputText> - <h:inputText value="#{panelMenu.tabIndex}"> - <a4j:support event="onchange" reRender="panelMenuID,panelMenuID2,info"></a4j:support> - </h:inputText> - - <h:outputText value="Expand Single"></h:outputText> - <h:selectBooleanCheckbox value="#{panelMenu.expandSingle}"> - <a4j:support event="onchange" reRender="panelMenuID"></a4j:support> - </h:selectBooleanCheckbox> - - <h:outputText value="Mode"></h:outputText> - <h:selectOneRadio value="#{panelMenu.mode}" id="Mode1ID" onchange="submit();"> - <f:selectItem itemLabel="none" itemValue="none" /> - <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <f:selectItem itemLabel="server" itemValue="server" /> - </h:selectOneRadio> - - <h:outputText value="Expand mode"></h:outputText> - <h:selectOneRadio value="#{panelMenu.expandMode}" onchange="submit();"> - <f:selectItem itemLabel="none" itemValue="none" /> - <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <f:selectItem itemLabel="server" itemValue="server" /> - </h:selectOneRadio> - - <h:outputText value="Align:"></h:outputText> - <h:selectOneMenu value="#{panelMenu.align}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="middle" itemValue="middle" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <f:selectItem itemLabel="bottom" itemValue="bottom" /> - <f:selectItem itemLabel="top" itemValue="top" /> - <a4j:support event="onclick" reRender="panelMenuID,panelMenuID2,info"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="Disabled"></h:outputText> - <h:selectBooleanCheckbox value="#{panelMenu.disabled}"> - <a4j:support event="onchange" reRender="panelMenuID,panelMenuID2,info"></a4j:support> - </h:selectBooleanCheckbox> - - <h:outputText value="Rendered"></h:outputText> - <h:selectBooleanCheckbox value="#{panelMenu.rendered}" onchange="submit();"></h:selectBooleanCheckbox> - </h:panelGrid> - - <h:panelGrid columns="4"> - <h:outputText value="Icon"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.icon}" onchange="submit();"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - </h:selectOneMenu> - - <h:outputText value="icon Item"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.item}" onchange="submit();"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item " itemValue="#{icon.iconItem}" /> - </h:selectOneMenu> - - <h:outputText value="icon Disabled"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.disabled}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="icon Disabled Item"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.disabledItem}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="icon Top Item"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.topItem}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="icon Top Disabled Item"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.topDisabledItem}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="icon Expanded Group"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.expandedGroup}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="icon CollapsedGroup"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.collapsedGroup}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="icon Disabled Group"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.disabledGroup}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="icon Expanded Top Group"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.expandedTopGroup}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="icon Collapsed Top Group"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.collapsedTopGroup}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="icon Top Disable Group"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.topDisableGroup}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="icon Expanded"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.expanded}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="icon Collapsed"></h:outputText> - <h:selectOneMenu value="#{panelMenu.icon.collapsed}"> - <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> - <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> - <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> - <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> - <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> - <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> - <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> - <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> - <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - </h:panelGrid> - <br /> - <h:panelGrid columns="4"> - <h:outputText value="icon Group Position"></h:outputText> - <h:selectOneMenu value="#{panelMenu.iconGroupPosition}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="icon Group Top Position"></h:outputText> - <h:selectOneMenu value="#{panelMenu.iconGroupTopPosition}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="icon Item Position"></h:outputText> - <h:selectOneMenu value="#{panelMenu.iconItemPosition}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="icon Item Top Position"></h:outputText> - <h:selectOneMenu value="#{panelMenu.iconItemTopPosition}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> - </h:selectOneMenu> - </h:panelGrid> - - <f:verbatim> - <br /> - </f:verbatim> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> - </f:subview> - Added: branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,283 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="panelMenuPropertySubviewID"> + <rich:simpleTogglePanel id="pmPropertyID" switchType="client" opened="true" label="panelMenu property"> + <h:panelGrid columns="2"> + <h:outputText value="Width"></h:outputText> + <h:inputText value="#{panelMenu.width}"> + <a4j:support event="onchange" reRender="panelMenuID,panelMenuID2,info"></a4j:support> + </h:inputText> + + <h:outputText value="Tab Index"></h:outputText> + <h:inputText value="#{panelMenu.tabIndex}"> + <a4j:support event="onchange" reRender="panelMenuID,panelMenuID2,info"></a4j:support> + </h:inputText> + + <h:outputText value="Expand Single"></h:outputText> + <h:selectBooleanCheckbox value="#{panelMenu.expandSingle}"> + <a4j:support event="onchange" reRender="panelMenuID"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Mode"></h:outputText> + <h:selectOneRadio value="#{panelMenu.mode}" id="Mode1ID" onchange="submit();"> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <f:selectItem itemLabel="server" itemValue="server" /> + </h:selectOneRadio> + + <h:outputText value="Expand mode"></h:outputText> + <h:selectOneRadio value="#{panelMenu.expandMode}" onchange="submit();"> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <f:selectItem itemLabel="server" itemValue="server" /> + </h:selectOneRadio> + + <h:outputText value="Align:"></h:outputText> + <h:selectOneMenu value="#{panelMenu.align}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="middle" itemValue="middle" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <f:selectItem itemLabel="bottom" itemValue="bottom" /> + <f:selectItem itemLabel="top" itemValue="top" /> + <a4j:support event="onclick" reRender="panelMenuID,panelMenuID2,info"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="Disabled"></h:outputText> + <h:selectBooleanCheckbox value="#{panelMenu.disabled}"> + <a4j:support event="onchange" reRender="panelMenuID,panelMenuID2,info"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Rendered"></h:outputText> + <h:selectBooleanCheckbox value="#{panelMenu.rendered}" onchange="submit();"></h:selectBooleanCheckbox> + </h:panelGrid> + + <h:panelGrid columns="4"> + <h:outputText value="Icon"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.icon}" onchange="submit();"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + </h:selectOneMenu> + + <h:outputText value="icon Item"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.item}" onchange="submit();"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item " itemValue="#{icon.iconItem}" /> + </h:selectOneMenu> + + <h:outputText value="icon Disabled"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.disabled}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon Disabled Item"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.disabledItem}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon Top Item"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.topItem}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon Top Disabled Item"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.topDisabledItem}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon Expanded Group"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.expandedGroup}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon CollapsedGroup"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.collapsedGroup}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon Disabled Group"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.disabledGroup}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon Expanded Top Group"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.expandedTopGroup}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon Collapsed Top Group"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.collapsedTopGroup}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon Top Disable Group"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.topDisableGroup}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon Expanded"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.expanded}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon Collapsed"></h:outputText> + <h:selectOneMenu value="#{panelMenu.icon.collapsed}"> + <f:selectItem itemLabel="none" itemValue="#{icon.none}" /> + <f:selectItem itemLabel="Ajax Process" itemValue="#{icon.iconAjaxProcess}" /> + <f:selectItem itemLabel="Ajax Stoped" itemValue="#{icon.iconAjaxStoped}" /> + <f:selectItem itemLabel="Collapse" itemValue="#{icon.iconCollapse}" /> + <f:selectItem itemLabel="Expand" itemValue="#{icon.iconExpand}" /> + <f:selectItem itemLabel="File Manager" itemValue="#{icon.iconFileManager}" /> + <f:selectItem itemLabel="File Manager Reject" itemValue="#{icon.iconFileManagerReject}" /> + <f:selectItem itemLabel="Header" itemValue="#{icon.iconHeader}" /> + <f:selectItem itemLabel="Item" itemValue="#{icon.iconItem}" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + </h:panelGrid> + <br /> + <h:panelGrid columns="4"> + <h:outputText value="icon Group Position"></h:outputText> + <h:selectOneMenu value="#{panelMenu.iconGroupPosition}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon Group Top Position"></h:outputText> + <h:selectOneMenu value="#{panelMenu.iconGroupTopPosition}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon Item Position"></h:outputText> + <h:selectOneMenu value="#{panelMenu.iconItemPosition}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="icon Item Top Position"></h:outputText> + <h:selectOneMenu value="#{panelMenu.iconItemTopPosition}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <a4j:support event="onclick" reRender="panelMenuID"></a4j:support> + </h:selectOneMenu> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/PanelMenu/PanelMenuStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="panelMenuStraightforwardSubviewID"> + <rich:simpleTogglePanel switchType="client" opened="true" label="panelMenu straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{panelMenu.bTest1}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{panelMenu.bTest2}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{panelMenu.bTest3}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{panelMenu.bTest4}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{panelMenu.bTest5}" value="run" reRender="pmPropertyID,panelMenuID,panelMenuID2,info"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,41 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="scrollableDataTableSubviewID"> + <h:form> + <rich:scrollableDataTable id="sdt" var="sdt" value="#{scrollableDT.data}" rows="30" width="400px" + oncomplete="print('oncompleteInputID', 'oncomplete work!')" onselectionchange="print('onselectionchangeInputID', 'onselectionchange work!')"> + <rich:column width="100px" sortable="false"> + <f:facet name="header"> + <h:outputText value="Number" /> + </f:facet> + <h:outputText value="#{sdt.data1}" /> + </rich:column> + + <rich:column width="100px" sortable="false"> + <f:facet name="header"> + <h:outputText value="Name" /> + </f:facet> + <h:outputText value="#{sdt.data0}" /> + </rich:column> + + <rich:column width="100px" sortable="false"> + <f:facet name="header"> + <h:outputText value="Priority" /> + </f:facet> + <h:outputText value="#{sdt.data2}" /> + </rich:column> + + <rich:column width="100px" sortable="false"> + <f:facet name="header"> + <h:outputText value="Name" /> + </f:facet> + <h:outputText value="#{sdt.data3}" /> + </rich:column> + </rich:scrollableDataTable> + + + </h:form> +</f:subview> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,8 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="scrollableDataTablePropertySubviewID"> + <a4j:commandButton value="reRender" reRender="sdt"></a4j:commandButton> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/Separator.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/Separator.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/Separator.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,66 +1,19 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:subview id="separatorID"> - <h:form> - <h:messages></h:messages> - <h:outputText value="Event:"></h:outputText> - <rich:separator height="20px" width="300px" onmousedown="alert('mouse click')"></rich:separator> - - <h:outputText value="Some text one..." styleClass="text"> - </h:outputText> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> - <rich:separator id="separatorId" rendered="#{separator.rendered}" - width="#{separator.width}" height="#{separator.height}" - title="#{separator.title}" lineType="#{separator.lineType}" - align="#{separator.align}" styleClass="#{separator.style}"></rich:separator> +<f:subview id="separatorSubviewID"> + <h:form> + <h:outputText value="Some text one..." styleClass="text"></h:outputText> + <rich:separator id="separatorId" rendered="#{separator.rendered}" width="#{separator.width}" height="#{separator.height}" + title="#{separator.title}" lineType="#{separator.lineType}" align="#{separator.align}" styleClass="#{separator.style}" + onclick="print('onclickInputID', 'onclick work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" + onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" + onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"></rich:separator> <h:outputText value="Some text two..." styleClass="text"></h:outputText> <rich:spacer height="20px"></rich:spacer> - <h:panelGrid columns="2"> - <h:outputText value="Width (px or %): "></h:outputText> - <h:inputText value="#{separator.width}"> - <a4j:support event="onchange" reRender="separatorId"></a4j:support> - </h:inputText> - - <h:outputText value="Height (px or %):"></h:outputText> - <h:inputText value="#{separator.height}"> - <a4j:support event="onchange" reRender="separatorId"></a4j:support> - </h:inputText> - - <h:outputText value="LineType:"></h:outputText> - <h:selectOneRadio value="#{separator.lineType}" - layout="pageDirection"> - <f:selectItem itemLabel="beveled" itemValue="beveled" /> - <f:selectItem itemLabel="dotted" itemValue="dotted" /> - <f:selectItem itemLabel="dashed" itemValue="dashed" /> - <f:selectItem itemLabel="double" itemValue="double" /> - <f:selectItem itemLabel="solid" itemValue="solid" /> - <a4j:support event="onclick" reRender="separatorId"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="Align:"></h:outputText> - <h:selectOneRadio value="#{separator.align}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="center" itemValue="center" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <a4j:support event="onclick" reRender="separatorId"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="Title:"></h:outputText> - <h:inputText value="#{separator.title}"> - <a4j:support event="onchange" reRender="separatorId"></a4j:support> - </h:inputText> - - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{separator.rendered}" - onclick="submit()"></h:selectBooleanCheckbox> - - <h:outputText value="Switch Styles:" /> - <h:commandButton action="#{separator.doStyles}" value="#{separator.btnLabel}" /> - </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> - </h:form> </f:subview> - Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/SeparatorProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/SeparatorProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/SeparatorProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,49 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="SeparatorPropertySubviewID"> + <rich:simpleTogglePanel id="separatorPropertyID" switchType="client" opened="true" label="separator property"> + <h:panelGrid columns="2"> + <h:outputText value="Width (px or %): "></h:outputText> + <h:inputText value="#{separator.width}"> + <a4j:support event="onchange" reRender="separatorId"></a4j:support> + </h:inputText> + + <h:outputText value="Height (px or %):"></h:outputText> + <h:inputText value="#{separator.height}"> + <a4j:support event="onchange" reRender="separatorId"></a4j:support> + </h:inputText> + + <h:outputText value="LineType:"></h:outputText> + <h:selectOneRadio value="#{separator.lineType}" layout="pageDirection"> + <f:selectItem itemLabel="beveled" itemValue="beveled" /> + <f:selectItem itemLabel="dotted" itemValue="dotted" /> + <f:selectItem itemLabel="dashed" itemValue="dashed" /> + <f:selectItem itemLabel="double" itemValue="double" /> + <f:selectItem itemLabel="solid" itemValue="solid" /> + <a4j:support event="onclick" reRender="separatorId"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Align:"></h:outputText> + <h:selectOneRadio value="#{separator.align}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="center" itemValue="center" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <a4j:support event="onclick" reRender="separatorId"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Title:"></h:outputText> + <h:inputText value="#{separator.title}"> + <a4j:support event="onchange" reRender="separatorId"></a4j:support> + </h:inputText> + + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{separator.rendered}" onclick="submit()"></h:selectBooleanCheckbox> + + <h:outputText value="Switch Styles:" /> + <h:commandButton action="#{separator.doStyles}" value="#{separator.btnLabel}" /> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/SeparatorStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/SeparatorStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Separator/SeparatorStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="SeparatorStraightforwardSubviewID"> + <rich:simpleTogglePanel switchType="client" opened="true" label="separator straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{separator.bTest1}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{separator.bTest2}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{separator.bTest3}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{separator.bTest4}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{separator.bTest5}" value="run" reRender="separatorId,separatorPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,27 +1,19 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<style type="text/css"> - .head - { - background-color: aqua; - } - .body - { - background-color: pink; - } - - </style> -<f:subview id="simpleTogglePanelID"> - <h:messages></h:messages> - <h:form> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> - <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" - label="simpleTogglePanel with some text" - width="#{simpleTogglePanel.width}" - height="#{simpleTogglePanel.height}" - switchType="#{simpleTogglePanel.switchType}" opened="false"> +<f:subview id="simpleTogglePanelSubviewID"> + + <h:form> + <rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" + width="#{simpleTogglePanel.width}" height="#{simpleTogglePanel.height}" switchType="#{simpleTogglePanel.switchType}" + opened="false" onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')"> <f:facet name="closeMarker"> <h:outputText value="Close It" /> </f:facet> @@ -38,18 +30,24 @@ </f:verbatim> </rich:simpleTogglePanel> - <rich:simpleTogglePanel id="sTP1" headerClass="head" - label="simpleTogglePanel wiht image" - width="#{simpleTogglePanel.width}" - height="#{simpleTogglePanel.height}" - rendered="#{simpleTogglePanel.rendered}" - switchType="#{simpleTogglePanel.switchType}" opened="false"> + <rich:simpleTogglePanel id="sTP1" headerClass="head" label="simpleTogglePanel wiht image" width="#{simpleTogglePanel.width}" + height="#{simpleTogglePanel.height}" rendered="#{simpleTogglePanel.rendered}" switchType="#{simpleTogglePanel.switchType}" + opened="false" onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')"> <h:graphicImage value="/pics/podb109_61.jpg" width="500" height="300"></h:graphicImage> </rich:simpleTogglePanel> - <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" - width="#{simpleTogglePanel.width}" ignoreDupResponses="true" - focus="#{simpleTogglePanel.focus}"> + <rich:simpleTogglePanel id="sTP2" label="Focus simpleTogglePanle" width="#{simpleTogglePanel.width}" ignoreDupResponses="true" + focus="#{simpleTogglePanel.focus}" onclick="print('onclickInputID', 'onclick work!')" + oncomplete="print('oncompleteInputID', 'oncomplete work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" + onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" + onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"> <f:facet name="closeMarker"> <h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage> </f:facet> @@ -72,34 +70,5 @@ </rich:simpleTogglePanel> <rich:spacer height="20px"></rich:spacer> - - <h:panelGrid columns="2" border="1"> - <h:outputText value="Width:"> - </h:outputText> - <h:inputText value="#{simpleTogglePanel.width}"> - <a4j:support event="onchange" reRender="sTP, sTP1"></a4j:support> - </h:inputText> - - <h:outputText value="Height:"> - </h:outputText> - <h:inputText value="#{simpleTogglePanel.height}"> - <a4j:support event="onchange" reRender="sTP, sTP1"></a4j:support> - </h:inputText> - - <h:outputText value="Switch Type:"></h:outputText> - <h:selectOneRadio value="#{simpleTogglePanel.switchType}"> - <f:selectItem itemLabel="client" itemValue="client" /> - <f:selectItem itemLabel="server" itemValue="server" /> - <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <a4j:support event="onclick" reRender="sTP, sTP1, sTP2"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{simpleTogglePanel.rendered}" - onclick="submit()"> - </h:selectBooleanCheckbox> - - </h:panelGrid> </h:form> </f:subview> - Added: branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,34 @@ + <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="stpPropertySubviewID"> + <rich:simpleTogglePanel id="stpPropertyID" switchType="client" opened="true" label="spacer property"> + <h:panelGrid columns="2" border="1"> + <h:outputText value="Width:"> + </h:outputText> + <h:inputText value="#{simpleTogglePanel.width}"> + <a4j:support event="onchange" reRender="sTP,sTP1"></a4j:support> + </h:inputText> + + <h:outputText value="Height:"> + </h:outputText> + <h:inputText value="#{simpleTogglePanel.height}"> + <a4j:support event="onchange" reRender="sTP,sTP1"></a4j:support> + </h:inputText> + + <h:outputText value="Switch Type:"></h:outputText> + <h:selectOneRadio value="#{simpleTogglePanel.switchType}"> + <f:selectItem itemLabel="client" itemValue="client" /> + <f:selectItem itemLabel="server" itemValue="server" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <a4j:support event="onclick" reRender="sTP,sTP1,sTP2"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{simpleTogglePanel.rendered}" onclick="submit()"> + </h:selectBooleanCheckbox> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="stpStraightforwardSubviewID"> + <rich:simpleTogglePanel switchType="client" opened="true" label="spacer straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{simpleTogglePanel.bTest1}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{simpleTogglePanel.bTest2}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{simpleTogglePanel.bTest3}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{simpleTogglePanel.bTest4}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{simpleTogglePanel.bTest5}" value="run" reRender="sTP,sTP1,sTP2,stpPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/Spacer.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,58 +1,28 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<style type="text/css"> -.text -{ -font-size:20px; -} -.spacer -{ -background-color: aqua; -} -</style> -<f:subview id="spacerID"> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> - <h:messages></h:messages> +<f:subview id="spacerSubviewID"> <h:form> - <h:outputText value="Event:"></h:outputText> - <rich:spacer id="spacerIdEven" rendered="#{spacer.rendered}" style="border: 3px solid red; background: blue;" styleClass="#{spacer.style}" - width="#{spacer.width}" height="#{spacer.height}" onmousedown="alert('onmousedown')" title="title"></rich:spacer> + <style type="text/css"> +.text { + font-size: 20px; +} - <f:verbatim> - <br /> - </f:verbatim> - +.spacer { + background-color: aqua; +} +</style> <h:outputText value="Some text one..." styleClass="text"></h:outputText> - <rich:spacer id="spacerId" width="#{spacer.width}" height="#{spacer.height}" rendered="#{spacer.rendered}" styleClass="#{spacer.style}"> + <rich:spacer id="spacerId" width="#{spacer.width}" height="#{spacer.height}" rendered="#{spacer.rendered}" + styleClass="#{spacer.style}" onclick="print('onclickInputID', 'onclick work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')"> </rich:spacer> <h:outputText value="Some text two..." styleClass="text"></h:outputText> - - <h:panelGrid columns="2"> - <h:outputText value="Width (px or %):"></h:outputText> - <h:inputText value="#{spacer.width}"> - <a4j:support event="onchange" reRender="spacerId"></a4j:support> - </h:inputText> - - <h:outputText value="Height (px or %):"></h:outputText> - <h:inputText value="#{spacer.height}"> - <a4j:support event="onchange" reRender="spacerId"></a4j:support> - </h:inputText> - - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{spacer.rendered}" onclick="submit()"> - </h:selectBooleanCheckbox> - - </h:panelGrid> - <a4j:commandButton id="btn" action="#{spacer.doStyle}" value="#{spacer.btn}" reRender="spacerId, btn"></a4j:commandButton> - - <f:verbatim> - <br /> - </f:verbatim> - - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> - - Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/SpacerProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/SpacerProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/SpacerProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,27 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="spacerPropertySubviewID"> + <rich:simpleTogglePanel id="spacerPropertyID" switchType="client" opened="true" label="spacer property"> + <h:panelGrid columns="2"> + <h:outputText value="Width (px or %):"></h:outputText> + <h:inputText value="#{spacer.width}"> + <a4j:support event="onchange" reRender="spacerId"></a4j:support> + </h:inputText> + + <h:outputText value="Height (px or %):"></h:outputText> + <h:inputText value="#{spacer.height}"> + <a4j:support event="onchange" reRender="spacerId"></a4j:support> + </h:inputText> + + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{spacer.rendered}" onclick="submit()"> + </h:selectBooleanCheckbox> + + <h:outputText value="Style" /> + <a4j:commandButton id="btn" action="#{spacer.doStyle}" value="#{spacer.btn}" reRender="spacerId, btn"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/SpacerStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/SpacerStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Spacer/SpacerStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="spacerStraightforwardSubviewID"> + <rich:simpleTogglePanel switchType="client" opened="true" label="spacer straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{spacer.bTest1}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{spacer.bTest2}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{spacer.bTest3}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{spacer.bTest4}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{spacer.bTest5}" value="run" reRender="spacerPropertyID,spacerId"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,127 +1,37 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<f:subview id="suggestionBoxID"> - <h:form id="suggestionbox_form"> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> - <f:verbatim>Suggestion Box will suggest you Town's names if it's started with the "a" or - "A" letter</f:verbatim> - <f:verbatim> - <br /> +<f:subview id="suggestionBoxSubviewID"> + <h:form id="suggestionbox_form"> + <h:messages showDetail="true"/> + <f:verbatim>Suggestion Box will suggest you Town's names if it's started with the "a" or "A" letter + <br /> </f:verbatim> <h:inputText id="text" /> <rich:suggestionbox id="suggestionBoxId" for="text" - zindex="#{sb.zindex}" rules="#{sb.rules}" + zindex="#{sb.zindex}" rules="#{sb.rules}" styleClass="styleClass" suggestionAction="#{sb.autocomplete}" var="result" width="#{sb.width}" height="#{sb.height}" border="#{sb.border}" cellpadding="#{sb.cellpadding}" cellspacing="#{sb.cellspacing}" first="#{sb.first}" minChars="#{sb.minchars}" tokens=", ]" bgcolor="#{sb.bgColor}" focus="#{sb.forcus}" title="#{result.text}" summary="summary" shadowOpacity="#{sb.shadowOpacity}" - shadowDepth="#{sb.shadowDepth}" selectValueClass="mousemove" rendered="#{sb.reRender}"> + shadowDepth="#{sb.shadowDepth}" selectValueClass="mousemove" + nothingLabel="nothingLabel work! " oncomplete="print('oncompleteInputID', 'oncomplete work!')" + onselect="print('onselectInputID', 'onselect work!')" onsubmit="print('onsubmitInputID', 'onsubmit work!')"> <h:column> <h:outputText value="#{result.text}" /> </h:column> </rich:suggestionbox> + <div + style="position: relative; font-size: 50px; z-index: 2; color: navy">z-index</div> + <f:verbatim> - <div style="position:relative; font-size:50px; z-index:2; color: navy">z-index</div> - </f:verbatim> - - <f:verbatim> <br /> <br /> </f:verbatim> - <h:panelGrid columns="2" cellpadding="5px"> - <h:outputText value="z-index (1 or 3)"></h:outputText> - <h:selectOneRadio value="#{sb.zindex}"> - <f:selectItem itemLabel="1" itemValue="1" /> - <f:selectItem itemLabel="3" itemValue="3" /> - <a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support> - </h:selectOneRadio> - - - <f:verbatim>Border</f:verbatim> - <h:inputText value="#{sb.border}"> - <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> - </h:inputText> - - <f:verbatim>Width</f:verbatim> - <h:inputText value="#{sb.width}"> - <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> - </h:inputText> - - <f:verbatim>Height</f:verbatim> - <h:inputText value="#{sb.height}"> - <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> - </h:inputText> - - <f:verbatim>Cellpadding</f:verbatim> - <h:inputText value="#{sb.cellpadding}"> - <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> - </h:inputText> - - <f:verbatim>Cellspacing</f:verbatim> - <h:inputText value="#{sb.cellspacing}"> - <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> - </h:inputText> - - <f:verbatim>First</f:verbatim> - <h:inputText value="#{sb.first}"> - <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> - </h:inputText> - - <f:verbatim>MinChars</f:verbatim> - <h:inputText value="#{sb.minchars}"> - <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> - </h:inputText> - - <h:outputText value="Background Colour"></h:outputText> - <h:selectOneMenu value="#{sb.bgColor}"> - <f:selectItem itemLabel="none" itemValue="none" /> - <f:selectItem itemLabel="aqua" itemValue="aqua" /> - <f:selectItem itemLabel="blue" itemValue="blue" /> - <f:selectItem itemLabel="fuchsia" itemValue="fuchsia" /> - <f:selectItem itemLabel="gray" itemValue="gray" /> - <f:selectItem itemLabel="lime" itemValue="lime" /> - <f:selectItem itemLabel="maroon" itemValue="maroon" /> - <f:selectItem itemLabel="purple" itemValue="purple" /> - <f:selectItem itemLabel="red" itemValue="red" /> - <f:selectItem itemLabel="silver" itemValue="silver" /> - <f:selectItem itemLabel="teal" itemValue="teal" /> - <f:selectItem itemLabel="yellow" itemValue="yellow" /> - <f:selectItem itemLabel="white" itemValue="white" /> - <a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support> - </h:selectOneMenu> - - <h:outputText value="Shadow Opacity"></h:outputText> - <h:selectOneRadio value="#{sb.shadowOpacity}"> - <f:selectItem itemLabel="1" itemValue="1" /> - <f:selectItem itemLabel="3" itemValue="2" /> - <f:selectItem itemLabel="5" itemValue="3" /> - <f:selectItem itemLabel="7" itemValue="4" /> - <f:selectItem itemLabel="9" itemValue="5" /> - <f:selectItem itemLabel="11" itemValue="6" /> - <f:selectItem itemLabel="13" itemValue="7" /> - <f:selectItem itemLabel="15" itemValue="8" /> - <a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="Shadow Depth"></h:outputText> - <h:selectOneRadio value="#{sb.shadowDepth}"> - <f:selectItem itemLabel="3" itemValue="3" /> - <f:selectItem itemLabel="4" itemValue="4" /> - <f:selectItem itemLabel="5" itemValue="5" /> - <f:selectItem itemLabel="6" itemValue="6" /> - <f:selectItem itemLabel="7" itemValue="6" /> - <a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="Render"></h:outputText> - <h:selectBooleanCheckbox value="#{sb.reRender}" onchange="submit();"></h:selectBooleanCheckbox> - </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> - Added: branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,94 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<f:subview id="suggestionboxPropertySubviewID"> + <rich:simpleTogglePanel id="sbPropertyID" switchType="client" opened="true" label="suggestionBox property"> + <h:panelGrid columns="2" cellpadding="5px"> + + <h:outputText value="z-index"></h:outputText> + <h:selectOneRadio value="#{sb.zindex}"> + <f:selectItem itemLabel="1" itemValue="1" /> + <f:selectItem itemLabel="3" itemValue="3" /> + <a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support> + </h:selectOneRadio> + + <f:verbatim>Border</f:verbatim> + <h:inputText value="#{sb.border}"> + <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> + </h:inputText> + + <f:verbatim>Width</f:verbatim> + <h:inputText value="#{sb.width}"> + <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> + </h:inputText> + + <f:verbatim>Height</f:verbatim> + <h:inputText value="#{sb.height}"> + <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> + </h:inputText> + + <f:verbatim>Cellpadding</f:verbatim> + <h:inputText value="#{sb.cellpadding}"> + <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> + </h:inputText> + + <f:verbatim>Cellspacing</f:verbatim> + <h:inputText value="#{sb.cellspacing}"> + <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> + </h:inputText> + + <f:verbatim>First</f:verbatim> + <h:inputText value="#{sb.first}"> + <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> + </h:inputText> + + <f:verbatim>MinChars</f:verbatim> + <h:inputText value="#{sb.minchars}"> + <a4j:support event="onchange" reRender="suggestionBoxId"></a4j:support> + </h:inputText> + + <h:outputText value="Background Colour"></h:outputText> + <h:selectOneMenu value="#{sb.bgColor}"> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="aqua" itemValue="aqua" /> + <f:selectItem itemLabel="blue" itemValue="blue" /> + <f:selectItem itemLabel="fuchsia" itemValue="fuchsia" /> + <f:selectItem itemLabel="gray" itemValue="gray" /> + <f:selectItem itemLabel="lime" itemValue="lime" /> + <f:selectItem itemLabel="maroon" itemValue="maroon" /> + <f:selectItem itemLabel="purple" itemValue="purple" /> + <f:selectItem itemLabel="red" itemValue="red" /> + <f:selectItem itemLabel="silver" itemValue="silver" /> + <f:selectItem itemLabel="teal" itemValue="teal" /> + <f:selectItem itemLabel="yellow" itemValue="yellow" /> + <f:selectItem itemLabel="white" itemValue="white" /> + <a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support> + </h:selectOneMenu> + + <h:outputText value="Shadow Opacity"></h:outputText> + <h:selectOneRadio value="#{sb.shadowOpacity}"> + <f:selectItem itemLabel="1" itemValue="1" /> + <f:selectItem itemLabel="3" itemValue="2" /> + <f:selectItem itemLabel="5" itemValue="3" /> + <f:selectItem itemLabel="7" itemValue="4" /> + <f:selectItem itemLabel="9" itemValue="5" /> + <f:selectItem itemLabel="11" itemValue="6" /> + <f:selectItem itemLabel="13" itemValue="7" /> + <f:selectItem itemLabel="15" itemValue="8" /> + <a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Shadow Depth"></h:outputText> + <h:selectOneRadio value="#{sb.shadowDepth}"> + <f:selectItem itemLabel="3" itemValue="3" /> + <f:selectItem itemLabel="4" itemValue="4" /> + <f:selectItem itemLabel="5" itemValue="5" /> + <f:selectItem itemLabel="6" itemValue="6" /> + <f:selectItem itemLabel="7" itemValue="6" /> + <a4j:support event="onclick" reRender="suggestionBoxId"></a4j:support> + </h:selectOneRadio> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBoxStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<f:subview id="suggestionboxStraightforwardSubviewID"> + <rich:simpleTogglePanel switchType="client" opened="true" label="suggestionBox straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{sb.bTest1}" value="run" reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{sb.bTest2}" value="run" reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{sb.bTest3}" value="run" reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{sb.bTest4}" value="run" reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{sb.bTest5}" value="run" reRender="sbPropertyID,suggestionBoxId"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanel.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,104 +1,59 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:subview id="tabPanelID"> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="tabPanelSubviewID"> <h:form> - <rich:tabPanel id="tabPanelId" headerAlignment="#{tabPanel.headerAlignment}" width="#{tabPanel.width}" height="#{tabPanel.height}" - rendered="#{tabPanel.rendered}" title="#{tabPanel.title}" switchType="#{tabPanel.switchType}" headerSpacing="#{tabPanel.headerSpacing}" - selectedTab="#{tabPanel.selectedTab}" activeTabClass="#{tabPanel.activeTabStyle}" disabledTabClass="#{tabPanel.disabledTabStyle}" - inactiveTabClass="#{tabPanel.inactiveTabStyle}" contentClass="#{tabPanel.contentStyle}"> - <rich:tab id="tab1" labelWidth="#{tabPanel.labelWidth}" label="#{tabPanel.label}"> + <rich:tabPanel id="tabPanelId" headerAlignment="#{tabPanel.headerAlignment}" width="#{tabPanel.width}" + height="#{tabPanel.height}" rendered="#{tabPanel.rendered}" title="#{tabPanel.title}" switchType="#{tabPanel.switchType}" + headerSpacing="#{tabPanel.headerSpacing}" selectedTab="#{tabPanel.selectedTab}" activeTabClass="#{tabPanel.activeTabStyle}" + disabledTabClass="#{tabPanel.disabledTabStyle}" inactiveTabClass="#{tabPanel.inactiveTabStyle}" + contentClass="#{tabPanel.contentStyle}" onclick="print('onclickInputID', 'onclick work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')"> + + <rich:tab id="tabOne" labelWidth="#{tabPanel.labelWidth}" label="#{tabPanel.label}" + onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')" + ontabenter="print('ontabenterInputID', 'ontabenter work!')" ontableave="print('ontableaveInputID', 'ontableave work!')"> <h:outputText value="This is tab panel test example" styleClass="text1"></h:outputText> </rich:tab> - <rich:tab id="tab2" label="Tab with image" disabled="#{tabPanel.disabledTab}"> + <rich:tab id="tabTwo" label="Tab with image" disabled="#{tabPanel.disabledTab}" + onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')" + ontabenter="print('ontabenterInputID', 'ontabenter work!')" ontableave="print('ontableaveInputID', 'ontableave work!')"> <f:facet name="header"> <h:outputText value="client switchType from facet" /> </f:facet> - <f:facet name="openMarker"> - <h:graphicImage value="/pics/ajax_process.gif"></h:graphicImage> - </f:facet> - <f:facet name="closeMarker"> - <h:graphicImage value="/pics/ajax_stoped.gif"></h:graphicImage> - </f:facet> <h:graphicImage value="/pics/masshtaby_01.jpg" width="560" height="383"></h:graphicImage> </rich:tab> - <rich:tab id="tab3" label="Tab with some text" disabled="#{tabPanel.disabledTab}"> - <f:verbatim> - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... - </f:verbatim> + <rich:tab id="tabThree" label="Tab with some text" disabled="#{tabPanel.disabledTab}" + onclick="print('onclickInputID', 'onclick work!')" oncomplete="print('oncompleteInputID', 'oncomplete work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')" + ontabenter="print('ontabenterInputID', 'ontabenter work!')" ontableave="print('ontableaveInputID', 'ontableave work!')"> + <h:outputText + value=" Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text... + Some text... Some text... Some text... Some text... Some text... Some text... Some text... Some text..." /> </rich:tab> </rich:tabPanel> - <rich:spacer height="20px"></rich:spacer> - <h:panelGrid columns="2" cellspacing="10px"> - <h:outputText value="Width (px or %):"></h:outputText> - <h:inputText value="#{tabPanel.width}"> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:inputText> - - <h:outputText value="Height (px or %):"></h:outputText> - <h:inputText value="#{tabPanel.height}"> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:inputText> - - <h:outputText value="Title:"></h:outputText> - <h:inputText value="#{tabPanel.title}"> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:inputText> - - <h:outputText value="LabelWidth:"></h:outputText> - <h:inputText value="#{tabPanel.labelWidth}"> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:inputText> - - <h:outputText value="SwitchType:"></h:outputText> - <h:selectOneRadio value="#{tabPanel.switchType}"> - <f:selectItem itemLabel="client" itemValue="client" /> - <f:selectItem itemLabel="server" itemValue="server" /> - <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="Header Alignment:"></h:outputText> - <h:selectOneRadio value="#{tabPanel.headerAlignment}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="center" itemValue="center" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="Header Spacing:"></h:outputText> - <h:inputText value="#{tabPanel.headerSpacing}"> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:inputText> - - <h:outputText value="Selected Tab:"></h:outputText> - <h:selectOneRadio value="#{tabPanel.selectedTab}"> - <f:selectItem itemLabel="1" itemValue="tab1" /> - <f:selectItem itemLabel="2" itemValue="tab2" /> - <f:selectItem itemLabel="3" itemValue="tab3" /> - <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="Rendered"></h:outputText> - <h:selectBooleanCheckbox value="#{tabPanel.rendered}" onclick="submit()"> - </h:selectBooleanCheckbox> - - <h:outputText value="Disable Tab"></h:outputText> - <h:selectBooleanCheckbox value="#{tabPanel.disabledTab}" onclick="submit()"> - </h:selectBooleanCheckbox> - <h:outputText value="Switch Styles:" /> - <h:commandButton action="#{tabPanel.doStyles}" value="#{tabPanel.btnLabel}" /> - - - </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> + <rich:spacer height="20px"></rich:spacer> </h:form> </f:subview> - Added: branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanelProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanelProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanelProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="tabPanelPropertySubviewID"> + <rich:simpleTogglePanel switchType="client" opened="true" label="dataTable straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{tabPanel.bTest1}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{tabPanel.bTest2}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{tabPanel.bTest3}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{tabPanel.bTest4}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{tabPanel.bTest5}" value="run" reRender="tpPropertyID,tabPanelId"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanelStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanelStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/TabPanel/TabPanelStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,67 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="tabPanelStraightforwardSubviewID"> + <rich:simpleTogglePanel id="tpPropertyID" switchType="client" opened="true" label="tabPanel property"> + <h:panelGrid columns="2" cellspacing="10px"> + <h:outputText value="Width (px or %):"></h:outputText> + <h:inputText value="#{tabPanel.width}" onchange="submit();" /> + + <h:outputText value="Height (px or %):"></h:outputText> + <h:inputText value="#{tabPanel.height}" onchange="submit();" /> + + <h:outputText value="Title:"></h:outputText> + <h:inputText value="#{tabPanel.title}"> + <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> + </h:inputText> + + <h:outputText value="LabelWidth:"></h:outputText> + <h:inputText value="#{tabPanel.labelWidth}" onchange="submit();" /> + + <h:outputText value="SwitchType:"></h:outputText> + <h:selectOneRadio value="#{tabPanel.switchType}"> + <f:selectItem itemLabel="client" itemValue="client" /> + <f:selectItem itemLabel="server" itemValue="server" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Header Alignment:"></h:outputText> + <h:selectOneRadio value="#{tabPanel.headerAlignment}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="center" itemValue="center" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Header Spacing:"></h:outputText> + <h:inputText value="#{tabPanel.headerSpacing}"> + <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> + </h:inputText> + + <h:outputText value="Selected Tab:"></h:outputText> + <h:selectOneRadio value="#{tabPanel.selectedTab}" onchange="submit();"> + <f:selectItem itemLabel="1" itemValue="tabOne" /> + <f:selectItem itemLabel="2" itemValue="tabTwo" /> + <f:selectItem itemLabel="3" itemValue="tabThr" /> + </h:selectOneRadio> + + <h:outputText value="immediate" /> + <h:selectBooleanCheckbox value="#{tabPanel.immediate}"> + <a4j:support event="onchange" reRender="tabPanelId"></a4j:support> + </h:selectBooleanCheckbox> + + <h:outputText value="Rendered"></h:outputText> + <h:selectBooleanCheckbox value="#{tabPanel.rendered}" onclick="submit()"> + </h:selectBooleanCheckbox> + + <h:outputText value="Disable Tab"></h:outputText> + <h:selectBooleanCheckbox value="#{tabPanel.disabledTab}" onclick="submit()"> + </h:selectBooleanCheckbox> + <h:outputText value="Switch Styles:" /> + <h:commandButton action="#{tabPanel.doStyles}" value="#{tabPanel.btnLabel}" /> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanel.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,23 +1,25 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<f:subview id="togglePanel"> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> - <h:messages></h:messages> -<h:form id="tooggleTest"> - <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" - initialState="asus" stateOrder="asus,blank" - style="width:300px!important"> +<f:subview id="togglePanelSubviewID"> + <h:form id="tooggleTest"> + + <rich:togglePanel id="panel1" switchType="#{togglePanel.switchType}" initialState="asus" stateOrder="asus,blank" + style="width:300px!important; overflow: hidden;" onclick="print('onclickInputID', 'onclick work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')"> <f:facet name="blank"> <rich:panel> <f:facet name="header"> <h:panelGroup> - <rich:toggleControl id="toggleControl_blank" - for="tooggleTest:panel1"> + <rich:toggleControl id="toggleControl_blank" for="tooggleTest:panel1"> <h:outputText value="Expand" style="font-weight: bold;" /> - <h:graphicImage url="/pics/collapse.gif" - style="border-width: 0px;" /> + <h:graphicImage url="/pics/collapse.gif" style="border-width: 0px;" /> </rich:toggleControl> </h:panelGroup> </f:facet> @@ -28,21 +30,16 @@ <rich:panel> <f:facet name="header"> <h:panelGroup> - <rich:toggleControl id="toggleControl_panel1" - for="tooggleTest:panel1"> + <rich:toggleControl id="toggleControl_panel1" for="tooggleTest:panel1"> <h:outputText value="Collapse" style="font-weight: bold;" /> - <h:graphicImage url="/pics/expand.gif" - style="border-width: 0px;" /> + <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> </rich:toggleControl> </h:panelGroup> </f:facet> - <h:panelGrid columns="2" border="0" - style="width: 100%;background-color: white;"> - <h:graphicImage url="/pics/asus.jpg" height="300" width="300" - alt="asus.jpg" /> + <h:panelGrid columns="2" border="0" style="width: 100%;background-color: white;"> + <h:graphicImage url="/pics/asus.jpg" height="300" width="300" alt="asus.jpg" /> <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" - value="Asus F 3 Tc" /> + <h:outputText style="font: 18px;font-weight: bold;" value="Asus F 3 Tc" /> <f:verbatim> Processor: AMD Turion 64 X 2 - 1600 Mhz<br /> RAM: 1024 Mb<br /> @@ -56,33 +53,34 @@ </rich:panel> </f:facet> </rich:togglePanel> - <br /> - <br /> - <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" - initialState="#{togglePanel.initialState}" - stateOrder="#{togglePanel.stateOrder}"> + <f:verbatim> + <br /> + <br /> + </f:verbatim> + + <rich:togglePanel id="panel2" switchType="#{togglePanel.switchType}" initialState="#{togglePanel.initialState}" + stateOrder="#{togglePanel.stateOrder}" onclick="print('onclickInputID', 'onclick work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')"> <f:facet name="asus"> <rich:panel> <f:facet name="header"> <h:panelGroup> - <h:outputText value="Customizable toggle panel" - style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_1" - for="tooggleTest:panel2"> + <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> + <rich:toggleControl id="toggleControl_panel_1" for="tooggleTest:panel2"> <h:outputText value="Next"></h:outputText> - <h:graphicImage url="/pics/expand.gif" - style="border-width: 0px;" /> + <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> </rich:toggleControl> </h:panelGroup> </f:facet> - <h:panelGrid columns="2" border="0" - style="width: 100%;background-color: white;"> - <h:graphicImage url="/pics/asus.jpg" height="300" width="300" - alt="asus.jpg" /> + <h:panelGrid columns="2" border="0" style="width: 100%;background-color: white;"> + <h:graphicImage url="/pics/asus.jpg" height="300" width="300" alt="asus.jpg" /> <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" - value="Asus F 3 Tc" /> + <h:outputText style="font: 18px;font-weight: bold;" value="Asus F 3 Tc" /> <f:verbatim> Processor: AMD Turion 64 X 2 - 1600 Mhz<br /> RAM: 1024 Mb<br /> @@ -100,23 +98,17 @@ <rich:panel> <f:facet name="header"> <h:panelGroup> - <h:outputText value="Customizable toggle panel" - style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_2" - for="tooggleTest:panel2"> + <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> + <rich:toggleControl id="toggleControl_panel_2" for="tooggleTest:panel2"> <h:outputText value="Next"></h:outputText> - <h:graphicImage url="/pics/expand.gif" - style="border-width: 0px;" /> + <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> </rich:toggleControl> </h:panelGroup> </f:facet> - <h:panelGrid columns="2" border="0" - style="width: 100%;background-color: yellow;"> - <h:graphicImage url="/pics/benq.jpg" height="300" width="300" - alt="benq.jpg" /> + <h:panelGrid columns="2" border="0" style="width: 100%;background-color: yellow;"> + <h:graphicImage url="/pics/benq.jpg" height="300" width="300" alt="benq.jpg" /> <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" - value="BenQ A 52" /> + <h:outputText style="font: 18px;font-weight: bold;" value="BenQ A 52" /> <f:verbatim> Processor: Core Duo T2250 (1.73GHz)<br /> RAM: 1024 Mb<br /> @@ -134,23 +126,17 @@ <rich:panel> <f:facet name="header"> <h:panelGroup> - <h:outputText value="Customizable toggle panel" - style="font-weight: bold;" /> - <rich:toggleControl id="toggleControl_panel_3" - for="tooggleTest:panel2"> + <h:outputText value="Customizable toggle panel" style="font-weight: bold;" /> + <rich:toggleControl id="toggleControl_panel_3" for="tooggleTest:panel2"> <h:outputText value="Next"></h:outputText> - <h:graphicImage url="/pics/expand.gif" - style="border-width: 0px;" /> + <h:graphicImage url="/pics/expand.gif" style="border-width: 0px;" /> </rich:toggleControl> </h:panelGroup> </f:facet> - <h:panelGrid columns="2" border="0" - style="width: 100%;background-color: orange;"> - <h:graphicImage url="/pics/toshiba.jpg" height="300" width="300" - alt="toshiba.jpg" /> + <h:panelGrid columns="2" border="0" style="width: 100%;background-color: orange;"> + <h:graphicImage url="/pics/toshiba.jpg" height="300" width="300" alt="toshiba.jpg" /> <h:panelGroup> - <h:outputText style="font: 18px;font-weight: bold;" - value="Toshiba Satellite A 100-784" /> + <h:outputText style="font: 18px;font-weight: bold;" value="Toshiba Satellite A 100-784" /> <f:verbatim> Processor: Intel Core Duo T2250 - 1.73GHz<br /> RAM: 1024 Mb<br /> @@ -164,39 +150,11 @@ </rich:panel> </f:facet> </rich:togglePanel> + <f:verbatim> <br /> <br /> </f:verbatim> - <rich:separator height="5px" width="500px" /> - - <h:panelGrid columns="2" cellpadding="5px" cellspacing="5px"> - <h:outputText value="InitialState:"></h:outputText> - <h:selectOneRadio value="#{togglePanel.initialState}"> - <f:selectItem itemLabel="Asus" itemValue="asus" /> - <f:selectItem itemLabel="Benq" itemValue="benq" /> - <f:selectItem itemLabel="toshiba" itemValue="toshiba" /> - <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="StateOrder:"></h:outputText> - <h:selectOneRadio value="#{togglePanel.stateOrder}"> - <f:selectItem itemLabel="Asus,Benq,Toshiba" - itemValue="asus,benq,toshiba" /> - <f:selectItem itemLabel="Toshiba, Asus, Benq" - itemValue="toshiba,asus,benq" /> - <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="switchType:"></h:outputText> - <h:selectOneRadio value="#{togglePanel.switchType}"> - <f:selectItem itemLabel="client" itemValue="client" /> - <f:selectItem itemLabel="server" itemValue="server" /> - <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <a4j:support event="onclick" reRender="panel1,panel2"></a4j:support> - </h:selectOneRadio> - </h:panelGrid> - -</h:form> + <ui:debug hotkey="L"></ui:debug> + </h:form> </f:subview> - Added: branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,33 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="togglePanelPropertySubviewID"> + <rich:simpleTogglePanel id="tPanelPropertyID" switchType="client" opened="true" label="tooglePanel property"> + <h:panelGrid columns="2" cellpadding="5px" cellspacing="5px"> + <h:outputText value="InitialState:"></h:outputText> + <h:selectOneRadio value="#{togglePanel.initialState}"> + <f:selectItem itemLabel="Asus" itemValue="asus" /> + <f:selectItem itemLabel="Benq" itemValue="benq" /> + <f:selectItem itemLabel="toshiba" itemValue="toshiba" /> + <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="StateOrder:"></h:outputText> + <h:selectOneRadio value="#{togglePanel.stateOrder}"> + <f:selectItem itemLabel="Asus,Benq,Toshiba" itemValue="asus,benq,toshiba" /> + <f:selectItem itemLabel="Toshiba, Asus, Benq" itemValue="toshiba,asus,benq" /> + <a4j:support event="onchange" reRender="tooggleTest:panel2"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="switchType:"></h:outputText> + <h:selectOneRadio value="#{togglePanel.switchType}"> + <f:selectItem itemLabel="client" itemValue="client" /> + <f:selectItem itemLabel="server" itemValue="server" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <a4j:support event="onclick" reRender="panel1,panel2"></a4j:support> + </h:selectOneRadio> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/TogglePanel/TogglePanelStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="togglePanelStraightforwardSubviewID"> + <rich:simpleTogglePanel switchType="client" opened="true" label="tooglePanel straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{togglePanel.bTest1}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{togglePanel.bTest2}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{togglePanel.bTest3}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{togglePanel.bTest4}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{togglePanel.bTest5}" value="run" reRender="panel1,panel2,tPanelPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/ToolBar/ToolBar.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,16 +1,20 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:subview id="toolBarID"> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> +<f:subview id="toolBarSubviewID"> <h:form> - <rich:toolBar id="toolBarId" width="#{toolBar.width}" + <h:messages></h:messages> + + <rich:toolBar id="toolBarId" width="#{toolBar.width}" height="#{toolBar.height}" rendered="#{toolBar.rendered}" - itemSeparator="#{toolBar.itemSeparator}" contentClass="#{toolBar.contentStyle}" separatorClass="#{toolBar.separatorStyle}" > + itemSeparator="#{toolBar.itemSeparator}" + contentClass="#{toolBar.contentStyle}" + separatorClass="#{toolBar.separatorStyle}"> <h:outputText value="ToolBar" style="font-style: italic"></h:outputText> - <rich:toolBarGroup > + <rich:toolBarGroup> <h:outputText value="Width:"></h:outputText> <h:inputText value="#{toolBar.width}"> <a4j:support event="onchange" reRender="toolBarId"></a4j:support> @@ -30,32 +34,5 @@ </rich:toolBar> - <h:panelGrid columns="2"> - <h:outputText value="Image location:"></h:outputText> - <h:selectOneRadio value="#{toolBar.location}"> - <f:selectItem itemLabel="left" itemValue="left" /> - <f:selectItem itemLabel="right" itemValue="right" /> - <a4j:support event="onclick" reRender="toolBarId"></a4j:support> - </h:selectOneRadio> - - - <h:outputText value="itemSeparator:"></h:outputText> - <h:selectOneRadio value="#{toolBar.itemSeparator}"> - <f:selectItem itemLabel="none" itemValue="none" /> - <f:selectItem itemLabel="line" itemValue="line" /> - <f:selectItem itemLabel="square" itemValue="square" /> - <f:selectItem itemLabel="disc" itemValue="disc" /> - <f:selectItem itemLabel="grid" itemValue="grid" /> - <a4j:support event="onclick" reRender="toolBarId"></a4j:support> - </h:selectOneRadio> - - <h:outputText value="Switch Styles" /> - <a4j:commandButton id="slBtn" value="#{toolBar.btnLabel}" - action="#{toolBar.doStyles}" reRender="toolBarId,slBtn"> - </a4j:commandButton> - </h:panelGrid> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> - </f:subview> - Added: branches/3.1.x/test-applications/jsp/src/main/webapp/ToolBar/ToolBarProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/ToolBar/ToolBarProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/ToolBar/ToolBarProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,32 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="toolBarPropertySubviewID"> + <h:panelGrid columns="2"> + <h:outputText value="Image location:"></h:outputText> + <h:selectOneRadio value="#{toolBar.location}"> + <f:selectItem itemLabel="left" itemValue="left" /> + <f:selectItem itemLabel="right" itemValue="right" /> + <a4j:support event="onclick" reRender="toolBarId"></a4j:support> + </h:selectOneRadio> + + + <h:outputText value="itemSeparator:"></h:outputText> + <h:selectOneRadio value="#{toolBar.itemSeparator}"> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="line" itemValue="line" /> + <f:selectItem itemLabel="square" itemValue="square" /> + <f:selectItem itemLabel="disc" itemValue="disc" /> + <f:selectItem itemLabel="grid" itemValue="grid" /> + <a4j:support event="onclick" reRender="toolBarId"></a4j:support> + </h:selectOneRadio> + + <h:outputText value="Switch Styles" /> + <a4j:commandButton id="slBtn" value="#{toolBar.btnLabel}" + action="#{toolBar.doStyles}" reRender="toolBarId,slBtn"> + </a4j:commandButton> + </h:panelGrid> + +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,9 +1,11 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - <f:subview id="tooltipID"> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="tooltipSubviewID"> <h:form> + <h:messages></h:messages> <h:outputText value="DEFAULT VALUE:"></h:outputText> @@ -12,14 +14,14 @@ <br /> </f:verbatim> - <h:graphicImage value="/pics/ajax_process.gif" width="15px" - height="15px"> - <rich:toolTip value="ajax progress"> - </rich:toolTip> - </h:graphicImage> - <h:inputText value="Text" id="inp1" size="50"> - <rich:toolTip value="toolTip for input text"> + <rich:toolTip value="toolTip for input text" onclick="print('onclickInputID', 'onclick work!')" + oncomplete="print('oncompleteInputID', 'oncomplete work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" + onhide="print('onhideInputID', 'onhide work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')" onshow="print('onshowInputID', 'onshow work!')"> <f:facet name="defaultContent"> <f:verbatim>DEFAULT VALUE</f:verbatim> </f:facet> @@ -27,7 +29,13 @@ </h:inputText> <h:selectOneListbox value="1" id="ddl"> - <rich:toolTip value="1231231"> + <rich:toolTip value="1231231" onclick="print('onclickInputID', 'onclick work!')" + oncomplete="print('oncompleteInputID', 'oncomplete work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" + onhide="print('onhideInputID', 'onhide work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')" onshow="print('onshowInputID', 'onshow work!')"> <f:facet name="defaultContent"> <f:verbatim>DEFAULT VALUE DropDown</f:verbatim> </f:facet> @@ -45,13 +53,16 @@ </f:verbatim> <rich:panel style="width:50px; height:50px; background-color: gray"> - <rich:toolTip id="tooltipID" value="#{tooltip.value}" - mode="#{tooltip.mode}" delay="#{tooltip.delay}" layout="#{tooltip.layout}" - horizontalOffset="#{tooltip.horizontalOffset}" - verticalOffset="#{tooltip.verticalOffset}" - followMouse="#{tooltip.followMouse}" - direction="#{tooltip.direction}" style="#{tooltip.style}" - disabled="#{tooltip.disabled}" rendered="#{tooltip.rendered}"> + <rich:toolTip id="tooltipID" value="#{tooltip.value}" mode="#{tooltip.mode}" showDelay="#{tooltip.showDelay}" hideDelay="#{tooltip.hideDelay}" + layout="#{tooltip.layout}" horizontalOffset="#{tooltip.horizontalOffset}" verticalOffset="#{tooltip.verticalOffset}" + followMouse="#{tooltip.followMouse}" direction="#{tooltip.direction}" style="#{tooltip.style}" disabled="#{tooltip.disabled}" + rendered="#{tooltip.rendered}" onclick="print('onclickInputID', 'onclick work!')" + oncomplete="print('oncompleteInputID', 'oncomplete work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" + onhide="print('onhideInputID', 'onhide work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onmousedown="print('onmousedownInputID', 'onmousedown work!')" onmousemove="print('onmousemoveInputID', 'onmousemove work!')" + onmouseout="print('onmouseoutInputID', 'onmouseout work!')" onmouseover="print('onmouseoverInputID', 'onmouseover work!')" + onmouseup="print('onmouseupInputID', 'onmouseup work!')" onshow="print('onshowInputID', 'onshow work!')"> <h:graphicImage id="pricsID" value="/pics/ajax_process.gif"></h:graphicImage> </rich:toolTip> </rich:panel> @@ -59,80 +70,6 @@ <f:verbatim> <br /> </f:verbatim> - - <h:panelGrid columns="2"> - <h:outputText value="Text:"></h:outputText> - <h:inputText value="#{tooltip.value}"> - <a4j:support event="onchange" reRender="tooltipID" /> - </h:inputText> - - <h:outputText value="Delay"></h:outputText> - <h:inputText value="#{tooltip.delay}"> - <a4j:support event="onchange" reRender="tooltipID" /> - </h:inputText> - - <h:outputText value="Layout:"></h:outputText> - <h:selectOneRadio value="#{tooltip.layout}"> - <f:selectItem itemLabel="inline" itemValue="inline" /> - <f:selectItem itemLabel="block" itemValue="block" /> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectOneRadio> - - <h:outputText value="Mode:"></h:outputText> - <h:selectOneRadio value="#{tooltip.mode}"> - <f:selectItem itemLabel="client" itemValue="client" /> - <f:selectItem itemLabel="ajax" itemValue="ajax" /> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectOneRadio> - <h:outputText value="Horizontal offset:"></h:outputText> - <h:inputText value="#{tooltip.horizontalOffset}"> - <a4j:support event="onchange" reRender="tooltipID" /> - </h:inputText> - - <h:outputText value="Vertical offset:"></h:outputText> - <h:inputText value="#{tooltip.verticalOffset}"> - <a4j:support event="onchange" reRender="tooltipID" /> - </h:inputText> - - <h:outputText value="Follow mouse:"></h:outputText> - <h:selectBooleanCheckbox value="#{tooltip.followMouse}"> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectBooleanCheckbox> - - <h:outputText value="Direction:" /> - <h:selectOneRadio value="#{tooltip.direction}"> - <f:selectItem itemLabel="top-right" itemValue="top-right" /> - <f:selectItem itemLabel="top-left" itemValue="top-left" /> - <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> - <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectOneRadio> - - <h:outputText value="Style:"></h:outputText> - <h:selectOneRadio value="#{tooltip.style}"> - <f:selectItem itemLabel="none" itemValue="none" /> - <f:selectItem itemLabel="border:3px; font:bold 14px;" - itemValue="border:3px; font:bold 14px;" /> - <f:selectItem - itemLabel="border:green 3px solid; background-color:yellow;" - itemValue="border:green 3px solid; background-color:yellow;" /> - <f:selectItem - itemLabel="border:green 2px solid; font-family:monospace;" - itemValue="border:green 2px solid; font-family:monospace;" /> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectOneRadio> - - <h:outputText value="Disambled:"></h:outputText> - <h:selectBooleanCheckbox value="#{tooltip.disabled}"> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectBooleanCheckbox> - - <h:outputText value="Rendered:"></h:outputText> - <h:selectBooleanCheckbox value="#{tooltip.rendered}"> - <a4j:support event="onclick" reRender="tooltipID" /> - </h:selectBooleanCheckbox> - </h:panelGrid> - </h:form> - </f:subview> - + </h:form> +</f:subview> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/TooltipProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/TooltipProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/TooltipProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,84 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="toolTipPropertySubviewID"> + <rich:simpleTogglePanel id="toolTipPropertyID" switchType="client" opened="true" label="toolTip property"> + <h:panelGrid columns="2"> + <h:outputText value="Text:"></h:outputText> + <h:inputText value="#{tooltip.value}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> + + <h:outputText value="showDelay"></h:outputText> + <h:inputText value="#{tooltip.showDelay}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> + + <h:outputText value="hideDelay"></h:outputText> + <h:inputText value="#{tooltip.hideDelay}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> + + <h:outputText value="Layout:"></h:outputText> + <h:selectOneRadio value="#{tooltip.layout}"> + <f:selectItem itemLabel="inline" itemValue="inline" /> + <f:selectItem itemLabel="block" itemValue="block" /> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectOneRadio> + + <h:outputText value="Mode:"></h:outputText> + <h:selectOneRadio value="#{tooltip.mode}"> + <f:selectItem itemLabel="client" itemValue="client" /> + <f:selectItem itemLabel="ajax" itemValue="ajax" /> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectOneRadio> + + <h:outputText value="Horizontal offset:"></h:outputText> + <h:inputText value="#{tooltip.horizontalOffset}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> + + <h:outputText value="Vertical offset:"></h:outputText> + <h:inputText value="#{tooltip.verticalOffset}"> + <a4j:support event="onchange" reRender="tooltipID" /> + </h:inputText> + + <h:outputText value="Follow mouse:"></h:outputText> + <h:selectBooleanCheckbox value="#{tooltip.followMouse}"> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectBooleanCheckbox> + + <h:outputText value="Direction:" /> + <h:selectOneRadio value="#{tooltip.direction}"> + <f:selectItem itemLabel="top-right" itemValue="top-right" /> + <f:selectItem itemLabel="top-left" itemValue="top-left" /> + <f:selectItem itemLabel="bottom-right" itemValue="bottom-right" /> + <f:selectItem itemLabel="bottom-left" itemValue="bottom-left" /> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectOneRadio> + + <h:outputText value="Style:"></h:outputText> + <h:selectOneRadio value="#{tooltip.style}"> + <f:selectItem itemLabel="none" itemValue="none" /> + <f:selectItem itemLabel="border:3px; font:bold 14px;" itemValue="border:3px; font:bold 14px;" /> + <f:selectItem itemLabel="border:green 3px solid; background-color:yellow;" + itemValue="border:green 3px solid; background-color:yellow;" /> + <f:selectItem itemLabel="border:green 2px solid; font-family:monospace;" + itemValue="border:green 2px solid; font-family:monospace;" /> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectOneRadio> + + <h:outputText value="Disambled:"></h:outputText> + <h:selectBooleanCheckbox value="#{tooltip.disabled}"> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectBooleanCheckbox> + + <h:outputText value="Rendered:"></h:outputText> + <h:selectBooleanCheckbox value="#{tooltip.rendered}"> + <a4j:support event="onclick" reRender="tooltipID" /> + </h:selectBooleanCheckbox> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/TooltipStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/TooltipStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Tooltip/TooltipStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,25 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="toolTipStraightforwardSubviewID"> + <rich:simpleTogglePanel id="toolTipStraightforwardID" switchType="client" opened="true" label="toolTip straightforward"> + <h:panelGrid columns="2"> + <h:outputText value="Test1" /> + <a4j:commandButton action="#{tooltip.bTest1}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> + + <h:outputText value="Test2" /> + <a4j:commandButton action="#{tooltip.bTest2}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> + + <h:outputText value="Test3" /> + <a4j:commandButton action="#{tooltip.bTest3}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> + + <h:outputText value="Test4" /> + <a4j:commandButton action="#{tooltip.bTest4}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> + + <h:outputText value="Test5" /> + <a4j:commandButton action="#{tooltip.bTest5}" value="run" reRender="tooltipID,toolTipPropertyID"></a4j:commandButton> + </h:panelGrid> + </rich:simpleTogglePanel> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/Tree/Tree.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Tree/Tree.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Tree/Tree.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,25 +1,30 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:subview id="treeID"> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> +<f:subview id="treeSubviewID"> <h:form> - <rich:tree id="tree" switchType="#{bean.switchType}" - value="#{bean.data}" var="data" - nodeFace="#{data.name != 'param-value' ? 'input' : 'text'}" - changeExpandListener="#{bean.onExpand}" - nodeSelectListener="#{bean.onSelect}" binding="#{bean.tree}" - onselected="window.status='selectedNode: '+event.selectedNode;" - onexpand="window.status='expandedNode: '+event.expandedNode" - oncollapse="window.status='collapsedNode: '+ event.collapsedNode" - ajaxSubmitSelection="true" reRender="outputText, selectOneListbox" - preserveModel="none" dragIndicator="treeIndicator" immediate="false" - acceptedTypes="file1" dragType="#{bean.dragOn ? 'file1' : ''}" - iconCollapsed="#{bean.iconCollapsed}" - iconExpanded="#{bean.iconExpanded}" iconLeaf="#{bean.iconLeaf}" - icon="#{bean.icon}" dropListener="#{bean.processDrop}"> + <a4j:outputPanel ajaxRendered="true"> + <h:messages /> + </a4j:outputPanel> + <rich:tree id="tree" switchType="#{bean.switchType}" value="#{bean.data}" var="data" + nodeFace="#{data.name != 'param-value' ? 'input' : 'text'}" changeExpandListener="#{bean.onExpand}" + nodeSelectListener="#{bean.onSelect}" binding="#{bean.tree}" onselected="window.status='selectedNode: '+event.selectedNode;" + onexpand="window.status='expandedNode: '+event.expandedNode" oncollapse="window.status='collapsedNode: '+ event.collapsedNode" + onclick="print('onclickInputID', 'onclick work!')" ondblclick="print('ondblclickInputID', 'ondblclick work!')" + ondragend="print('ondragendInputID', 'ondragend work!')" ondragenter="print('ondragenterInputID', 'ondragenter work!')" + ondragexit="print('ondragexitInputID', 'ondragexit work!')" ondragstart="print('ondragstartInputID', 'ondragstart work!')" + ondrop="print('ondropInputID', 'ondrop work!')" ondropend="print('ondropendInputID', 'ondropend work!')" + onkeydown="print('onkeydownInputID', 'onkeydown work!')" onkeypress="print('onkeypressInputID', 'onkeypress work!')" + onkeyup="print('onkeyupInputID', 'onkeyup work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')" + ajaxSubmitSelection="true" reRender="outputText, selectOneListbox" preserveModel="none" dragIndicator="treeIndicator" + immediate="false" acceptedTypes="file1" dragType="#{bean.dragOn ? 'file1' : ''}" iconCollapsed="#{bean.iconCollapsed}" + iconExpanded="#{bean.iconExpanded}" iconLeaf="#{bean.iconLeaf}" icon="#{bean.icon}" dropListener="#{bean.processDrop}"> + <f:facet name="icon"> <h:outputText value="icon" rendered="#{bean.renderFacets}" /> </f:facet> @@ -40,26 +45,24 @@ oncollapse="Element.removeClassName(event['treeItem'].getElement(), 'colored')" onexpand="Element.addClassName(event['treeItem'].getElement(), 'colored')"> <h:outputText value="#{data} : " /> - <h:inputText value="#{data.name}" required="true" - styleClass="inputs"> + <h:inputText value="#{data.name}" required="true" styleClass="inputs"> </h:inputText> <dnd:dndParam name="nodeParam" value="Node Parameter" /> </rich:treeNode> - <rich:treeNode type="text" nodeClass="customNode" - acceptedTypes="file2" onselected="return false;"> + <rich:treeNode type="text" nodeClass="customNode" acceptedTypes="file2" onselected="return false;"> <h:outputText value="#{data}" /> </rich:treeNode> </rich:tree> + <f:verbatim> <br /> </f:verbatim> <h:outputText value="Enter path to expand:" /> <h:inputText value="#{bean.pathToExpand}"> - <a4j:support event="onchange" reRender="tree" - action="#{bean.expandNode}" /> + <a4j:support event="onchange" reRender="tree" action="#{bean.expandNode}" /> </h:inputText> <rich:separator></rich:separator> @@ -78,8 +81,7 @@ <h:outputText value="Render facets:" /> <h:selectBooleanCheckbox value="#{bean.renderFacets}" onchange="submit();"></h:selectBooleanCheckbox> - <h:commandButton value="#{bean.commandButtonCaption}" - actionListener="#{bean.changeIcons}" /> + <h:commandButton value="#{bean.commandButtonCaption}" actionListener="#{bean.changeIcons}" /> </h:panelGrid> <f:verbatim> @@ -87,8 +89,7 @@ <br /> </f:verbatim> - <rich:tree id="testTree" var="_data" switchType="ajax" - ajaxSubmitSelection="true" preserveModel="none" value="#{bean.data1}" + <rich:tree id="testTree" var="_data" switchType="ajax" ajaxSubmitSelection="true" preserveModel="none" value="#{bean.data1}" nodeSelectListener="#{bean.onSelectInc}" nodeFace="node"> <rich:treeNode type="node"> <h:outputText value="#{_data}" /> @@ -98,8 +99,7 @@ <h:outputText value="Tree without treeNode:"></h:outputText> <rich:separator></rich:separator> - <rich:tree switchType="client" style="width:300px" - value="#{pathwayBean.pathwayTree}" var="item" nodeFace="#{item.type}"> + <rich:tree switchType="client" style="width:300px" value="#{pathwayBean.pathwayTree}" var="item" nodeFace="#{item.type}"> <rich:treeNode type="library"> <h:outputText value="#{item.type}" /> </rich:treeNode> @@ -110,10 +110,7 @@ <h:outputText value="#{item.name}" /> </rich:treeNode> </rich:tree> - + <rich:spacer></rich:spacer> - <h:commandLink value="Back" action="main"></h:commandLink> </h:form> - </f:subview> - Added: branches/3.1.x/test-applications/jsp/src/main/webapp/Tree/TreeProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/Tree/TreeProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/Tree/TreeProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,8 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="treePropertySubviewID"> + +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarth.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,57 +1,29 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - <f:subview id="virtualEarth"> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="virtualEarthSubviewID"> <h:form> - <h:panelGrid columns="2"> - <rich:virtualEarth style="width:800px;" id="gm" lat="37.97" - dashboardSize="Normal" zoom="#{virtualEarth.zoom}" mapStyle="Hybrid" - var="map" /> + <h:panelGrid columns="2"> + <rich:virtualEarth style="width:800px;" id="gm" lat="37.97" dashboardSize="Normal" zoom="#{virtualEarth.zoom}" + mapStyle="Hybrid" var="map" onclick="print('onclickInputID', 'onclick work!')" + ondblclick="print('ondblclickInputID', 'ondblclick work!')" onkeydown="print('onkeydownInputID', 'onkeydown work!')" + onkeypress="print('onkeypressInputID', 'onkeypress work!')" onkeyup="print('onkeyupInputID', 'onkeyup work!')" + onLoadMap="print('onLoadMapInputID', 'onLoadMap work!')" onmousedown="print('onmousedownInputID', 'onmousedown work!')" + onmousemove="print('onmousemoveInputID', 'onmousemove work!')" onmouseout="print('onmouseoutInputID', 'onmouseout work!')" + onmouseover="print('onmouseoverInputID', 'onmouseover work!')" onmouseup="print('onmouseupInputID', 'onmouseup work!')"/> - <h:panelGroup> - <f:verbatim> - Dashboard:<br /> - <a href="javascript:void(0);" - onclick="map.HideDashboard();return false;">Remove</a> - <a href="javascript:void(0);" - onclick="map.ShowDashboard();return false;">Show</a> - <br /> - <br /> - Type:<br /> - <a href="javascript:void(0);" - onclick="map.SetMapStyle(VEMapStyle.Road);return false;">Road</a> - <a href="javascript:void(0);" - onclick="map.SetMapStyle(VEMapStyle.Aerial);return false;">Aerial</a> - <a href="javascript:void(0);" - onclick="map.SetMapStyle(VEMapStyle.Hybrid);return false;">Hybrid</a> - <a href="javascript:void(0);" - onclick="map.SetMapStyle(VEMapStyle.Birdseye);return false;">Birdseye</a> - <br /> - <br /> - Zoom:<br /> - <a href="javascript:void(0);" onclick="map.ZoomIn();return false;">In</a> - <a href="javascript:void(0);" onclick="map.ZoomOut();return false;">Out</a> - <br /> - <br /> - <a href="javascript:void(0);" onclick="showExadel();return false;">Show - Exadel Office</a> - <br /> - <a href="javascript:void(0);" onclick="showExadelInMinsk();return false;">Show Exadel in - Belarus</a> - </f:verbatim> - </h:panelGroup> - - </h:panelGrid> - <a4j:outputPanel id="zoomer"> - <script> + </h:panelGrid> + <a4j:outputPanel id="zoomer"> + <script> function zoomIt() { map.setZoom(#{virtualEarth.zoom}); } </script> - </a4j:outputPanel> - <a4j:outputPanel> - <script> + </a4j:outputPanel> + <a4j:outputPanel> + <script> function createMarker(point,html) { var marker = new GMarker(point); GEvent.addListener(marker, "click", function() { @@ -70,10 +42,6 @@ map.SetMapStyle(VEMapStyle.Birdseye); } </script> - </a4j:outputPanel> + </a4j:outputPanel> </h:form> - <h:form> - <h:commandLink value="Back" action="main"></h:commandLink> - </h:form> - </f:subview> - +</f:subview> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/VirtualEarth/VirtualEarthProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,31 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> + +<f:subview id="virtualEarthPropertySubviewID"> + <h:panelGroup> + <f:verbatim> + Dashboard:<br /> + <a href="javascript:void(0);" onclick="map.HideDashboard();return false;">Remove</a> + <a href="javascript:void(0);" onclick="map.ShowDashboard();return false;">Show</a> + <br /> + <br /> + Type:<br /> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Road);return false;">Road</a> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Aerial);return false;">Aerial</a> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Hybrid);return false;">Hybrid</a> + <a href="javascript:void(0);" onclick="map.SetMapStyle(VEMapStyle.Birdseye);return false;">Birdseye</a> + <br /> + <br /> + Zoom:<br /> + <a href="javascript:void(0);" onclick="map.ZoomIn();return false;">In</a> + <a href="javascript:void(0);" onclick="map.ZoomOut();return false;">Out</a> + <br /> + <br /> + <a href="javascript:void(0);" onclick="showExadel();return false;">Show Exadel Office</a> + <br /> + <a href="javascript:void(0);" onclick="showExadelInMinsk();return false;">Show Exadel in Belarus</a> + </f:verbatim> + </h:panelGroup> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DataFilterSlider.xml 2007-11-14 14:14:19 UTC (rev 3983) @@ -11,7 +11,7 @@ <value>#{inventoryList}</value> </managed-property> </managed-bean> - <managed-bean> + <managed-bean> <managed-bean-name>inventoryList</managed-bean-name> <managed-bean-class>dfs.DemoInventoryList</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> Deleted: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Div.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Div.xml 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Div.xml 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" - "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> -<faces-config> - <managed-bean> - <managed-bean-name>divBean</managed-bean-name> - <managed-bean-class>div.DivBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> -</faces-config> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DragAndDrop.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DragAndDrop.xml 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-DragAndDrop.xml 2007-11-14 14:14:19 UTC (rev 3983) @@ -7,4 +7,4 @@ <managed-bean-class>dnd.DndBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> -</faces-config> + </faces-config> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Gmap.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Gmap.xml 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Gmap.xml 2007-11-14 14:14:19 UTC (rev 3983) @@ -2,14 +2,14 @@ <!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> <faces-config> - <managed-bean> - <managed-bean-name>gmap</managed-bean-name> - <managed-bean-class>gmap.Gmap</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - <managed-property> - <property-name>zoom</property-name> - <property-class>java.lang.String</property-class> - <value>10</value> - </managed-property> - </managed-bean> + <managed-bean> + <managed-bean-name>gmap</managed-bean-name> + <managed-bean-class>gmap.Gmap</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>zoom</property-name> + <property-class>java.lang.String</property-class> + <value>10</value> + </managed-property> + </managed-bean> </faces-config> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Icon.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Icon.xml 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Icon.xml 2007-11-14 14:14:19 UTC (rev 3983) @@ -4,7 +4,7 @@ <faces-config> <managed-bean> <managed-bean-name>icon</managed-bean-name> - <managed-bean-class>style.icon.Icon</managed-bean-class> + <managed-bean-class>util.icon.Icon</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> </faces-config> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-RichTest.xml 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,10 +1,10 @@ <?xml version="1.0"?> -<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" - "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" + "http://java.sun.com/dtd/web-facesconfig_1_1.dtd"> <faces-config> <managed-bean> - <managed-bean-name>richBean</managed-bean-name> - <managed-bean-class>rich.RichBean</managed-bean-class> + <managed-bean-name>richTest</managed-bean-name> + <managed-bean-class>richTest.RichTest</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> </faces-config> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-TogglePanel.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-TogglePanel.xml 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-TogglePanel.xml 2007-11-14 14:14:19 UTC (rev 3983) @@ -7,4 +7,4 @@ <managed-bean-class>togglePanel.TogglePanel</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> -</faces-config> +</faces-config> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-tooltip.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-tooltip.xml 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-tooltip.xml 2007-11-14 14:14:19 UTC (rev 3983) @@ -7,4 +7,4 @@ <managed-bean-class>tooltip.Tooltip</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> -</faces-config> \ No newline at end of file +</faces-config> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/faces-config.xml 2007-11-14 14:14:19 UTC (rev 3983) @@ -66,11 +66,11 @@ </navigation-case> <navigation-case> <from-outcome>DS</from-outcome> - <to-view-id>/DataScroller/DS.jsp</to-view-id> + <to-view-id>/DataScroller/DataScroller.jsp</to-view-id> </navigation-case> <navigation-case> <from-outcome>DT</from-outcome> - <to-view-id>/DataTable/DT.jsp</to-view-id> + <to-view-id>/DataTable/DataTable.jsp</to-view-id> </navigation-case> <navigation-case> <from-outcome>DFS</from-outcome> @@ -78,7 +78,7 @@ </navigation-case> <navigation-case> <from-outcome>DDM</from-outcome> - <to-view-id>/DropDownMenu/DDMenu.jsp</to-view-id> + <to-view-id>/DropDownMenu/DropDownMenu.jsp</to-view-id> </navigation-case> <navigation-case> <from-outcome>PanelMenu</from-outcome> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2007-11-14 14:14:19 UTC (rev 3983) @@ -16,16 +16,16 @@ /WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml, /WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml, /WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml, - /WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml, + /WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-ModalPanel.xml, /WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml, /WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml, /WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml, /WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml, /WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml, /WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml, - /WEB-INF/faces-config-jQuery.xml</param-value> + /WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-Icon.xml</param-value> </context-param> - <context-param> + <context-param> <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> <param-value>false</param-value> </context-param> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/index.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/index.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/index.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,5 +1,4 @@ <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> - <html> <head> </head> Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/jQuery/jQuery.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/jQuery/jQuery.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/jQuery/jQuery.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,10 +1,8 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> - +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> <f:subview id="jQuerySubviewID"> - <h:form id="form"> <style> .divSize_1 { width: 150px; @@ -43,8 +41,6 @@ color: #228B22; } </style> - - <h:messages /> <h:panelGrid id="panelGridID" columns="2" border="1"> <h:outputText value="add text: [li],work!, e.g. A. one [li],work!" /> <h:panelGroup> @@ -61,20 +57,18 @@ <f:verbatim> <p><span>Text1 </span>text2</p> </f:verbatim> <h:panelGroup> - <f:verbatim> - Rectangle: size: "150 x 90"; bgcolor: "dodgerblue"; - <br /> - Table: bgcolor: "bisque" - </f:verbatim> + <h:outputText value="Rectangle: size: "150 x 90"; bgcolor: "dodgerblue"" /> + <f:verbatim><br /></f:verbatim> + <h:outputText value="Table: bgcolor: "bisque"" /> </h:panelGroup> <f:verbatim><div id="div_1_ID">xx-large <br /> text </div></f:verbatim> <h:panelGroup> - <f:verbatim> - Rectangle: size: "90 x 150"; border-color: "red" - <br /> - effect(mouseover) - </f:verbatim> + <h:outputText value="Rectangle: size: "90 x 150"; border-color "red"" /> + <f:verbatim><br /></f:verbatim> + <h:outputText value="Table: bgcolor: "none"" /> + <f:verbatim><br /></f:verbatim> + <h:outputText value="effect(mouseover)" /> </h:panelGroup> <f:verbatim><div id="div_2_ID"> normal text</div></f:verbatim> </h:panelGrid> @@ -87,11 +81,10 @@ <rich:jQuery selector="#panelGridID tr" query="mouseover(function(){jQuery(this).addClass('activeTable')})"/> <rich:jQuery selector="#panelGridID tr" query="mouseout(function(){jQuery(this).removeClass('activeTable')})"/> - <rich:jQuery selector="p" timing="onload" query="find('span').html('text1').end().append('<p class='fontColor'>add text3<p>')"/> + <rich:jQuery selector="#div_2_ID" timing="onload" query="mouseover(function(){jQuery(this).fadeOut({height: 'hide'}, 500).text('New text').animate({height: 'show'}, 500)})" /> + <rich:jQuery selector="p" timing="onload" query="find('span').html('text1').end().append('<p class=\'fontColor\'>add text3<p>')"/> <rich:jQuery selector="#div_1_ID" timing="onload" query="addClass('divSize_1')" /> <rich:jQuery selector=".divSize_1" timing="onload" query="addClass('divColor_1')" /> <rich:jQuery selector="#panelGridID #div_1_ID" timing="onload" query="addClass('divTextSize_1')" /> <rich:jQuery selector="#form\\:panelGridID #div_2_ID" timing="onload" query="addClass('divSize_2')" /> - - </h:form> -</f:subview> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Action/EventInfo.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Action/EventInfo.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Action/EventInfo.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,139 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<f:subview id="EventInfoSubview"> + <f:verbatim><div style="position: relative"> + <input id="ontabenterInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ontableaveInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onLoadMapInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onselectionchangeInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ondownclickInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onupclickInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="oninitInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ongroupactivateInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onitemselectInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onsubmitInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onRowClickInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onRowDblClickInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onRowMouseDownInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onRowMouseMoveInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onRowMouseOutInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onRowMouseOverInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onRowMouseUpInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onselectInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onchangeInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onfocusInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onblurInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onclickInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="oncollapseInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="oncompleteInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ondblclickInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ondragendInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ondragenterInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ondragexitInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ondragstartInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ondropInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="ondropendInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onexpandInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onkeydownInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onkeypressInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onkeyupInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onmousedownInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onmousemoveInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onmouseoutInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onmouseoverInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onmouseupInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onselectedInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onhideInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onmouseupInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> + <f:verbatim><div style="position: relative"> + <input id="onshowInputID" type="hidden" value="don't work!" size="42" /> + </div></f:verbatim> +</f:subview> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Blank/Blank.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Blank/Blank.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Blank/Blank.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,7 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<f:subview id="calendarSubviewID"> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Blank/BlankProperty.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Blank/BlankProperty.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Blank/BlankProperty.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,7 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<f:subview id="PropertySubviewID"> +</f:subview> \ No newline at end of file Added: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Blank/BlankStraightforward.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Blank/BlankStraightforward.jsp (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Blank/BlankStraightforward.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,7 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> + +<f:subview id="StraightforwardSubviewID"> +</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div/Div.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div/Div.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div/Div.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -6,16 +6,47 @@ <html> <head> <title></title> + <script type="text/javascript"> + function print(elementID, value) { + var oldObject = window.document.getElementById(elementID); + var newObject = window.document.createElement('input'); + newObject.type = "text"; + newObject.size = oldObject.size; + newObject.value = value; + newObject.id = oldObject.id; + //if(oldObject.size) newObject.size = oldObject.size; + //if(oldObject.value) newObject.value = value; + //if(oldObject.id) newObject.id = oldObject.id; + //if(oldObject.name) newObject.name = oldObject.name; + //if(oldObject.className) newObject.className = oldObject.className; + oldObject.parentNode.replaceChild(newObject,oldObject); + } + </script> <link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> </head> <body> <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> - <div id="div_1_ID" style="position: relative; left:400px; top:400px; border-color: red, 2px;"> <div id="div_2_ID" style="position: absolute; left:-380px; top:-380px; color: blue, 2px;"> - <jsp:include page="${richBean.src}" /> + <jsp:include page="${richBean.pathComponent}" /> </div> </div> + <h:form> + <jsp:include page="${richBean.pathStraightforward}" /> + <jsp:include page="${richBean.pathProperty}" /> + </h:form> + <rich:modalPanel id="eventInfoID" minHeight="550" minWidth="200" moveable="true" resizeable="true" style="overflow: true;"> + <f:facet name="header"> + <h:outputText value="Events ..." /> + </f:facet> + <f:facet name="controls"> + <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('eventInfoID');"/> + </f:facet> + + <jsp:include page="/pages/Action/EventInfo.jsp" /> + + </rich:modalPanel> + <a4j:commandButton value="Show event" onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton> </body> </html> </f:view> \ No newline at end of file Deleted: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Div.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,57 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:view> -<html> -<head> -<title></title> -<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> -</head> -<body> - <h:form> - <h:panelGrid columns="2"> - <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu> - <h:commandLink action="#{skinBean.change}" value="set skin" /> - - <h:outputText value="Select component:" /> - <h:selectOneMenu value="#{divBean.src}" onchange="submit();"> - <f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" /> - <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" /> - <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" /> - <f:selectItem itemValue="/DataTable/DT.jsp" itemLabel="Date Table" /> - <f:selectItem itemValue="/DradAndDrop/DragAndDrop.jsp" itemLabel="Drag And Drop" /> - <f:selectItem itemValue="/DropDownMenu/DDMenu.jsp" itemLabel="Drop Down Menu" /> - <f:selectItem itemValue="/Effect/Effect.jsp" itemLabel="Effect" /> - <f:selectItem itemValue="/Gmap/Gmap.jsp" itemLabel="Gmap" /> - <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.jsp" itemLabel="Input Number Slider" /> - <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.jsp" itemLabel="Input Number Spinner" /> - <f:selectItem itemValue="/Insert/Insert.jsp" itemLabel="Insert" /> - <f:selectItem itemValue="/Message/Message.jsp" itemLabel="Message" /> - <f:selectItem itemValue="/ModalPanel/ModalPanel.jsp" itemLabel="Modal Panel" /> - <f:selectItem itemValue="/Paint2D/Paint2D.jsp" itemLabel="Paint2D" /> - <f:selectItem itemValue="/Panel/Panel.jsp" itemLabel="Panel" /> - <f:selectItem itemValue="/Panel/panel2.jsp" itemLabel="Panel2" /> - <f:selectItem itemValue="/PanelBar/PanelBar.jsp" itemLabel="Panel Bar" /> - <f:selectItem itemValue="/PanelMenu/PanelMenu.jsp" itemLabel="Panel Menu" /> - <f:selectItem itemValue="/Separator/Separator.jsp" itemLabel="Separator" /> - <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.jsp" itemLabel="Simple Toggle Panel" /> - <f:selectItem itemValue="/Spacer/Spacer.jsp" itemLabel="Spacer" /> - <f:selectItem itemValue="/SuggestionBox/SuggestionBox.jsp" itemLabel="Suggestion Box" /> - <f:selectItem itemValue="/TabPanel/TabPanel.jsp" itemLabel="Tab Panel" /> - <f:selectItem itemValue="/TogglePanel/TogglePanel.jsp" itemLabel="Toggle Panel" /> - <f:selectItem itemValue="/ToolBar/ToolBar.jsp" itemLabel="Tool Bar" /> - <f:selectItem itemValue="/Tooltip/Tooltip.jsp" itemLabel="Tooltip" /> - <f:selectItem itemValue="/Tree/Tree.jsp" itemLabel="Tree" /> - <f:selectItem itemValue="/VirtualEarth/VirtualEarth.jsp" itemLabel="Virtual Earth" /> - </h:selectOneMenu> - </h:panelGrid> - </h:form> - <div id="div_1_ID" style="position: relative; left:400px; top:400px; border-color: red, 2px;"> - <div id="div_2_ID" style="position: absolute; left:-380px; top:-380px; color: blue, 2px;"> - <jsp:include page="${divBean.src}" /> - </div> - </div> -</body> -</html> -</f:view> \ No newline at end of file Deleted: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Map.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Map.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Map.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,55 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:view> -<html> -<head> -<title></title> -<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> -</head> -<body> - <h:form> - <h:panelGrid columns="2"> - <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu> - <h:commandLink action="#{skinBean.change}" value="set skin" /> - <h:outputText value="Select component:" /> - <h:selectOneMenu value="#{divBean.src}" onchange="submit();"> - <f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" /> - <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" /> - <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" /> - <f:selectItem itemValue="/DataTable/DT.jsp" itemLabel="Date Table" /> - <f:selectItem itemValue="/DradAndDrop/DragAndDrop.jsp" itemLabel="Drag And Drop" /> - <f:selectItem itemValue="/DropDownMenu/DDMenu.jsp" itemLabel="Drop Down Menu" /> - <f:selectItem itemValue="/Effect/Effect.jsp" itemLabel="Effect" /> - <f:selectItem itemValue="/Gmap/Gmap.jsp" itemLabel="Gmap" /> - <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.jsp" itemLabel="Input Number Slider" /> - <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.jsp" itemLabel="Input Number Spinner" /> - <f:selectItem itemValue="/Insert/Insert.jsp" itemLabel="Insert" /> - <f:selectItem itemValue="/Message/Message.jsp" itemLabel="Message" /> - <f:selectItem itemValue="/ModalPanel/ModalPanel.jsp" itemLabel="Modal Panel" /> - <f:selectItem itemValue="/Paint2D/Paint2D.jsp" itemLabel="Paint2D" /> - <f:selectItem itemValue="/Panel/Panel.jsp" itemLabel="Panel" /> - <f:selectItem itemValue="/Panel/panel2.jsp" itemLabel="Panel2" /> - <f:selectItem itemValue="/PanelBar/PanelBar.jsp" itemLabel="Panel Bar" /> - <f:selectItem itemValue="/PanelMenu/PanelMenu.jsp" itemLabel="Panel Menu" /> - <f:selectItem itemValue="/Separator/Separator.jsp" itemLabel="Separator" /> - <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.jsp" itemLabel="Simple Toggle Panel" /> - <f:selectItem itemValue="/Spacer/Spacer.jsp" itemLabel="Spacer" /> - <f:selectItem itemValue="/SuggestionBox/SuggestionBox.jsp" itemLabel="Suggestion Box" /> - <f:selectItem itemValue="/TabPanel/TabPanel.jsp" itemLabel="Tab Panel" /> - <f:selectItem itemValue="/TogglePanel/TogglePanel.jsp" itemLabel="Toggle Panel" /> - <f:selectItem itemValue="/ToolBar/ToolBar.jsp" itemLabel="Tool Bar" /> - <f:selectItem itemValue="/Tooltip/Tooltip.jsp" itemLabel="Tooltip" /> - <f:selectItem itemValue="/Tree/Tree.jsp" itemLabel="Tree" /> - <f:selectItem itemValue="/VirtualEarth/VirtualEarth.jsp" itemLabel="Virtual Earth" /> - </h:selectOneMenu> - </h:panelGrid> - </h:form> - <div id="divID" style="position: absolute; top:15px; left: 10px; z-index: 1"> - <jsp:include page="SelectOneMenuPage.jsp" /> - </div> - <jsp:include page="${divBean.src}" /> -</body> -</html> -</f:view> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Rich/Rich.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -6,11 +6,43 @@ <html> <head> <title></title> + <script type="text/javascript"> + function print(elementID, value) { + var oldObject = window.document.getElementById(elementID); + var newObject = window.document.createElement('input'); + newObject.type = "text"; + newObject.size = oldObject.size; + newObject.value = value; + newObject.id = oldObject.id; + //if(oldObject.size) newObject.size = oldObject.size; + //if(oldObject.value) newObject.value = value; + //if(oldObject.id) newObject.id = oldObject.id; + //if(oldObject.name) newObject.name = oldObject.name; + //if(oldObject.className) newObject.className = oldObject.className; + oldObject.parentNode.replaceChild(newObject,oldObject); + } + </script> <link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> </head> <body> <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> - <jsp:include page="${richBean.src}" /> + <jsp:include page="${richBean.pathComponent}" /> + <h:form> + <jsp:include page="${richBean.pathStraightforward}" /> + <jsp:include page="${richBean.pathProperty}" /> + </h:form> + <rich:modalPanel id="eventInfoID" minHeight="550" minWidth="200" moveable="true" resizeable="true" style="overflow: true;"> + <f:facet name="header"> + <h:outputText value="Events ..." /> + </f:facet> + <f:facet name="controls"> + <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('eventInfoID');"/> + </f:facet> + + <jsp:include page="/pages/Action/EventInfo.jsp" /> + + </rich:modalPanel> + <a4j:commandButton value="Show event" onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton> </body> </html> </f:view> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichMenu/RichMenu.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,47 +1,58 @@ -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %> +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %> +<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %> <f:subview id="richMenuID"> - <h:form> - <h:panelGrid columns="3"> - <rich:spacer width="750px"></rich:spacer> - <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu> - <h:commandLink action="#{skinBean.change}" value="set skin" /> - - <rich:spacer width="750px"></rich:spacer> - <h:outputText value="Select component:" /> - <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> - <f:selectItem itemValue="" itemLabel="none" /> - <f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" /> - <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" /> - <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" /> - <f:selectItem itemValue="/DataTable/DT.jsp" itemLabel="Date Table" /> - <f:selectItem itemValue="/DragAndDrop/DragAndDrop.jsp" itemLabel="Drag And Drop" /> - <f:selectItem itemValue="/DropDownMenu/DDMenu.jsp" itemLabel="Drop Down Menu" /> - <f:selectItem itemValue="/Effect/Effect.jsp" itemLabel="Effect" /> - <f:selectItem itemValue="/Gmap/Gmap.jsp" itemLabel="Gmap" /> - <f:selectItem itemValue="/InputNumberSlider/InputNumberSlider.jsp" itemLabel="Input Number Slider" /> - <f:selectItem itemValue="/InputNumberSpinner/InputNumberSpinner.jsp" itemLabel="Input Number Spinner" /> - <f:selectItem itemValue="/Insert/Insert.jsp" itemLabel="Insert" /> - <f:selectItem itemValue="/Message/Message.jsp" itemLabel="Message" /> - <f:selectItem itemValue="/ModalPanel/ModalPanel.jsp" itemLabel="Modal Panel" /> - <f:selectItem itemValue="/Paint2D/Paint2D.jsp" itemLabel="Paint2D" /> - <f:selectItem itemValue="/Panel/Panel.jsp" itemLabel="Panel" /> - <f:selectItem itemValue="/Panel/Panel2.jsp" itemLabel="Panel2" /> - <f:selectItem itemValue="/PanelBar/PanelBar.jsp" itemLabel="Panel Bar" /> - <f:selectItem itemValue="/PanelMenu/PanelMenu.jsp" itemLabel="Panel Menu" /> - <f:selectItem itemValue="/Separator/Separator.jsp" itemLabel="Separator" /> - <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.jsp" itemLabel="Simple Toggle Panel" /> - <f:selectItem itemValue="/Spacer/Spacer.jsp" itemLabel="Spacer" /> - <f:selectItem itemValue="/SuggestionBox/SuggestionBox.jsp" itemLabel="Suggestion Box" /> - <f:selectItem itemValue="/TabPanel/TabPanel.jsp" itemLabel="Tab Panel" /> - <f:selectItem itemValue="/TogglePanel/TogglePanel.jsp" itemLabel="Toggle Panel" /> - <f:selectItem itemValue="/ToolBar/ToolBar.jsp" itemLabel="Tool Bar" /> - <f:selectItem itemValue="/Tooltip/Tooltip.jsp" itemLabel="Tooltip" /> - <f:selectItem itemValue="/Tree/Tree.jsp" itemLabel="Tree" /> - <f:selectItem itemValue="/VirtualEarth/VirtualEarth.jsp" itemLabel="Virtual Earth" /> - </h:selectOneMenu> - - </h:panelGrid> + <h:form id="forvDivOpthID"> + <rich:toolBar itemSeparator="none" > + <rich:toolBarGroup location="right"> + <h:panelGrid columns="1"> + <h:outputText value="Select skin: " /> + <h:selectOneMenu binding="#{skinBean.component}" onblur="submit();"> + <a4j:support action="#{skinBean.change}" event="onchange"/> + </h:selectOneMenu> + </h:panelGrid> + </rich:toolBarGroup> + + <rich:toolBarGroup location="right"> + <h:panelGrid columns="1"> + <h:outputText value="Select component:" /> + <h:selectOneMenu value="#{richBean.src}" onchange="submit();"> + <f:selectItem itemValue="Blank" itemLabel="Blank" /> + <f:selectItem itemValue="Calendar" itemLabel="Calendar" /> + <f:selectItem itemValue="DataFilterSlider" itemLabel="Data Filter Slider" /> + <f:selectItem itemValue="DataScroller" itemLabel="Date Scroller" /> + <f:selectItem itemValue="DataTable" itemLabel="Date Table" /> + <f:selectItem itemValue="DragAndDrop" itemLabel="Drag And Drop" /> + <f:selectItem itemValue="DropDownMenu" itemLabel="Drop Down Menu" /> + <f:selectItem itemValue="Effect" itemLabel="Effect" /> + <f:selectItem itemValue="Gmap" itemLabel="Gmap" /> + <f:selectItem itemValue="InputNumberSlider" itemLabel="Input Number Slider" /> + <f:selectItem itemValue="InputNumberSpinner" itemLabel="Input Number Spinner" /> + <f:selectItem itemValue="Insert" itemLabel="Insert" /> + <f:selectItem itemValue="Message" itemLabel="Message" /> + <f:selectItem itemValue="ModalPanel" itemLabel="Modal Panel" /> + <f:selectItem itemValue="Paint2D" itemLabel="Paint2D" /> + <f:selectItem itemValue="Panel" itemLabel="Panel" /> + <f:selectItem itemValue="Panel2" itemLabel="Panel2" /> + <f:selectItem itemValue="PanelBar" itemLabel="Panel Bar" /> + <f:selectItem itemValue="PanelMenu" itemLabel="Panel Menu" /> + <f:selectItem itemValue="Separator" itemLabel="Separator" /> + <f:selectItem itemValue="SimpleTogglePanel" itemLabel="Simple Toggle Panel" /> + <f:selectItem itemValue="Spacer" itemLabel="Spacer" /> + <f:selectItem itemValue="SuggestionBox" itemLabel="Suggestion Box" /> + <f:selectItem itemValue="TabPanel" itemLabel="Tab Panel" /> + <f:selectItem itemValue="TogglePanel" itemLabel="Toggle Panel" /> + <f:selectItem itemValue="ToolBar" itemLabel="Tool Bar" /> + <f:selectItem itemValue="Tooltip" itemLabel="Tooltip" /> + <f:selectItem itemValue="Tree" itemLabel="Tree" /> + <f:selectItem itemValue="VirtualEarth" itemLabel="Virtual Earth" /> + <f:selectItem itemValue="ScrollableDataTable" itemLabel="ScrollableDataTable" /> + <f:selectItem itemValue="jQuery" itemLabel="jQuery" /> + </h:selectOneMenu> + </h:panelGrid> + </rich:toolBarGroup> + </rich:toolBar> + <h:commandLink value="Back" action="main"></h:commandLink> </h:form> </f:subview> \ No newline at end of file Deleted: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichTest.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichTest.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/RichTest.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,53 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<f:view> -<html> -<head> -<title></title> -<link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> -</head> -<body> - <h:form> - <h:panelGrid columns="2"> - <h:selectOneMenu binding="#{skinBean.component}"></h:selectOneMenu> - <h:commandLink action="#{skinBean.change}" value="set skin" /> - - <h:outputText value="Select component:" /> - <h:selectOneMenu value="#{divBean.src}" onchange="submit();"> - <f:selectItem itemValue="/Calendar/Calendar.jsp" itemLabel="Calendar" /> - <f:selectItem itemValue="/DataFilterSlider/DataFilterSlider.jsp" itemLabel="Data Filter Slider" /> - <f:selectItem itemValue="/DataScroller/DS.jsp" itemLabel="Date Scroller" /> - <f:selectItem itemValue="/DataTable/DT.jsp" itemLabel="Date Table" /> - <f:selectItem itemValue="/DradAndDrop/DragAndDrop.jsp" itemLabel="Drag And Drop" /> - <f:selectItem itemValue="/DropDownMenu/DDMenu.jsp" itemLabel="Drop Down Menu" /> - <f:selectItem itemValue="/Effect/Effect.jsp" itemLabel="Effect" /> - <f:selectItem itemValue="/Gmap/Gmap.jsp" itemLabel="Gmap" /> - <f:selectItem itemValue="/inputNumberSlider/inputNumberSlider.jsp" itemLabel="Input Number Slider" /> - <f:selectItem itemValue="/inputNumberSpinner/inputNumberSpinner.jsp" itemLabel="Input Number Spinner" /> - <f:selectItem itemValue="/Insert/Insert.jsp" itemLabel="Insert" /> - <f:selectItem itemValue="/Message/Message.jsp" itemLabel="Message" /> - <f:selectItem itemValue="/ModalPanel/ModalPanel.jsp" itemLabel="Modal Panel" /> - <f:selectItem itemValue="/Paint2D/Paint2D.jsp" itemLabel="Paint2D" /> - <f:selectItem itemValue="/Panel/Panel.jsp" itemLabel="Panel" /> - <f:selectItem itemValue="/Panel/panel2.jsp" itemLabel="Panel2" /> - <f:selectItem itemValue="/PanelBar/PanelBar.jsp" itemLabel="Panel Bar" /> - <f:selectItem itemValue="/PanelMenu/PanelMenu.jsp" itemLabel="Panel Menu" /> - <f:selectItem itemValue="/Separator/Separator.jsp" itemLabel="Separator" /> - <f:selectItem itemValue="/SimpleTogglePanel/SimpleTogglePanel.jsp" itemLabel="Simple Toggle Panel" /> - <f:selectItem itemValue="/Spacer/Spacer.jsp" itemLabel="Spacer" /> - <f:selectItem itemValue="/SuggestionBox/SuggestionBox.jsp" itemLabel="Suggestion Box" /> - <f:selectItem itemValue="/TabPanel/TabPanel.jsp" itemLabel="Tab Panel" /> - <f:selectItem itemValue="/TogglePanel/TogglePanel.jsp" itemLabel="Toggle Panel" /> - <f:selectItem itemValue="/ToolBar/ToolBar.jsp" itemLabel="Tool Bar" /> - <f:selectItem itemValue="/Tooltip/Tooltip.jsp" itemLabel="Tooltip" /> - <f:selectItem itemValue="/Tree/Tree.jsp" itemLabel="Tree" /> - <f:selectItem itemValue="/VirtualEarth/VirtualEarth.jsp" itemLabel="Virtual Earth" /> - </h:selectOneMenu> - </h:panelGrid> - </h:form> - <jsp:include page="${divBean.src}" /> -</body> -</html> -</f:view> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/Map.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/Map.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/Select/Map.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -6,17 +6,48 @@ <html> <head> <title></title> + <script type="text/javascript"> + function print(elementID, value) { + var oldObject = window.document.getElementById(elementID); + var newObject = window.document.createElement('input'); + newObject.type = "text"; + newObject.size = oldObject.size; + newObject.value = value; + newObject.id = oldObject.id; + //if(oldObject.size) newObject.size = oldObject.size; + //if(oldObject.value) newObject.value = value; + //if(oldObject.id) newObject.id = oldObject.id; + //if(oldObject.name) newObject.name = oldObject.name; + //if(oldObject.className) newObject.className = oldObject.className; + oldObject.parentNode.replaceChild(newObject,oldObject); + } + </script> <link rel="stylesheet" href="<%=request.getContextPath()%>/styles/styles.css" type="text/css" /> </head> <body> <jsp:include page="/pages/RichMenu/RichMenu.jsp" /> - <div id="divID" style="position: absolute; top:60px; left: 10px; z-index: 1"> <jsp:include page="SelectOneMenuPage.jsp" /> </div> - <div id="divPageID" style="position: absolute; top:110px; left: 10px;"> - <jsp:include page="${richBean.src}" /> + <div id="divID" style="position: absolute; top:60px; left: 10px; z-index: 1"> + <jsp:include page="${richBean.pathComponent}" /> </div> + <h:form> + <jsp:include page="${richBean.pathStraightforward}" /> + <jsp:include page="${richBean.pathProperty}" /> + </h:form> + <rich:modalPanel id="eventInfoID" minHeight="550" minWidth="200" moveable="true" resizeable="true" style="overflow: true;"> + <f:facet name="header"> + <h:outputText value="Events ..." /> + </f:facet> + <f:facet name="controls"> + <h:graphicImage value="/pics/error.gif" onclick="Richfaces.hideModalPanel('eventInfoID');"/> + </f:facet> + + <jsp:include page="/pages/Action/EventInfo.jsp" /> + + </rich:modalPanel> + <a4j:commandButton value="Show event" onclick="Richfaces.showModalPanel('eventInfoID');return false;"></a4j:commandButton> </body> </html> </f:view> \ No newline at end of file Deleted: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/SelectOneMenuPage.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/SelectOneMenuPage.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/SelectOneMenuPage.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,176 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> -<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> -<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> - -<f:subview id="selectOneMenuPage"> - <h:panelGrid columns="7" cellpadding="20px" cellspacing="30px"> - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - - <h:selectOneMenu value="selectItem" > - <f:selectItem itemLabel="selectItem" itemValue="test" /> - </h:selectOneMenu> - </h:panelGrid> -</f:subview> \ No newline at end of file Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/pages/main.jsp =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/pages/main.jsp 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,6 +1,6 @@ <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> -<%@ taglib uri="http://richfaces.ajax4jsf.org/rich" prefix="rich"%> +<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%> <%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%> <html> <head> @@ -9,17 +9,25 @@ </head> <body> <f:view> - <h:form> - <div align="center"><h:outputText - value="VCP Test Application (JSF 1.1RI(1.2RI))" styleClass="maintext"></h:outputText></div> + <h:form id="mainFormID"> <rich:panel> - <h:panelGrid columns="2" cellpadding="5px"> + <f:verbatim> + <div align="center"><font size="4" color="#191970">RichFaces Test Application (JSF 1.1RI(1.2RI) with Facelets)</font></div> + </f:verbatim> + </rich:panel> + <rich:spacer></rich:spacer> + <rich:panel> + <h:panelGrid columns="2" cellpadding="5px" cellspacing="5px"> <h:commandLink value="RichFaces" action="RichTest"></h:commandLink> <h:commandLink value="Div" action="TestDiv"></h:commandLink> <h:commandLink value="Select" action="Map"></h:commandLink> <h:commandLink value="Customize page" action="CustomizePage"></h:commandLink> - </h:panelGrid> + </h:panelGrid> </rich:panel> + <rich:spacer></rich:spacer> + <rich:panel> + <h:outputText style="align:right;" value="RichFace: #{a4j.version}" /> + </rich:panel> </h:form> </f:view> </body> Added: branches/3.1.x/test-applications/jsp/src/main/webapp/styles/app.css =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/styles/app.css (rev 0) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/styles/app.css 2007-11-14 14:14:19 UTC (rev 3983) @@ -0,0 +1,29 @@ +.rich-message-label{ + padding: 0px 10px; +} + +.rich-messages-label{ + padding: 0px 10px +} + +.rich-message-marker{ +} + +.rich-message{ +} + +.errorLabel{ + color: #FF0000; +} + +.warnLabel{ + color: #0000FF; +} + +.infoLabel{ + color: #00FF00; +} + +.fatalLabel{ + color: #FF1493; +} Modified: branches/3.1.x/test-applications/jsp/src/main/webapp/styles/styles.css =================================================================== --- branches/3.1.x/test-applications/jsp/src/main/webapp/styles/styles.css 2007-11-14 12:53:58 UTC (rev 3982) +++ branches/3.1.x/test-applications/jsp/src/main/webapp/styles/styles.css 2007-11-14 14:14:19 UTC (rev 3983) @@ -1,63 +1,252 @@ +/*simple toggle panel (icon position)*/ +.dr-stglpanel-marker { + float: right; +} +/* Message and messages */ +.rich-message-label { + padding: 0px 10px; +} + +.rich-messages-label { + padding: 0px 10px +} + +.rich-message-marker { + +} + +.rich-message { + +} + +.errorLabel { + color: #FF0000; +} + +.warnLabel { + color: #0000FF; +} + +.infoLabel { + color: #00FF00; +width: inherit; +} + +.fatalLabel { + color: #FF1493; +} + .maintext { font-size: 30px !important; } -.text1{ + +.text1 { font-size: 14px !important; } -.style{ -background: teal; -border: solid 3px red; -font: bold 14px; + +.style { + background: teal; + border: solid 3px red; + font: bold 14px; } + /* inputNumderSlider Styles */ -.barStyle{ -background-color: purple !important; -border: red 3px solid; +.barStyle { + background-color: purple !important; + border: red 3px solid; } -.inputStyle -{ -background-color: lime !important; -border: red 3px solid; -font-family: monospace; + +.inputStyle { + background-color: lime !important; + border: red 3px solid; + font-family: monospace; } -.tipStyle{ -border: green 3px solid; -background-color: yellow; -font: italic bold 14px; + +.tipStyle { + border: green 3px solid; + background-color: yellow; + font: italic bold 14px; } -.handleStyle{ -border: green 3px solid; -background-color: yellow; + +.handleStyle { + border: green 3px solid; + background-color: yellow; } + /* TabPanel Styles */ -.activeTabStyle{ -background: lime; -border: solid 3px black; -font: italic 14px; +.activeTabStyle { + background: lime; + border: solid 3px black; + font: italic 14px; } -.inactiveTabStyle{ -background: gray; -border: solid 3px blue; -font: bold 14px; + +.inactiveTabStyle { + background: gray; + border: solid 3px blue; + font: bold 14px; } -.disabledTabStyle{ -background: silver; -border: dotted 3px blue; -font: small-caps 14px; + +.disabledTabStyle { + background: silver; + border: dotted 3px blue; + font: small-caps 14px; } -.contentStyle{ -background: silver; -border: 1px red; -font: 20px; + +.contentStyle { + background: silver; + border: 1px red; + font: 20px; } + /* inputNumerSpinner Styles*/ -.inputStyle{ -background: aqua ; -border: thin red; -font: fantasy 15px; +.inputStyle { + background: aqua; + border: thin red; + font: fantasy 15px; } + /* ToolBar Styles*/ -.separatorStyle{ -border: 3px solid red; -background: lime; +.separatorStyle { + border: 3px solid red; + background: lime; } + +/*Calendar*/ +.smallText { + font-size: xx-small; +} + +.largeText { + font-size: xx-large; +} + +.Selecteddayclass { + background-color: #0087FF; +} + +/*Data FilterSlider*/ +.column { + width: 75px; + font: normal 11px tahoma, sans-serif; + text-align: center; +} + +.column-index { + width: 75px; + font: normal 11px tahoma, sans-serif; + text-align: left; +} + +.list-row3 { + background-color: #ececec; +} + +.list-row1 { + background-color: #f1f6fd; +} + +.list-row2 { + background-color: #fff; +} + +.list-header { + font: bold 11px tahoma, sans-serif; + text-align: center; +} + +.list-table1 { + border: 1px solid #bed6f8; +} + +.list-table2 { + border: 1px solid #bed6f8; +} + +/*Drag and drop*/ +.dropzoneDecoration { + width: 70px; + height: 70px; + border: 2px dotted navy; +} + +.accept { + border: 3px dotted green; + padding: 10px; +} + +.reject { + border: 3px dashed red; + padding: 10px; +} + +.mousemove { + border: 3px dotted green; + padding: 5px; +} + +/*Panel2*/ +.panel { + vertical-align: top; +} + +.rich-panel-header { + color: #F00 !important; +} + +.top { + width: 200px !important; + height: 100px !important; +} + +.hea { + color: #FCC !important; +} + +.bo { + color: #F00 !important; +} + +.top2 { + width: 200px !important; + height: 100px !important; + border: 2px solid #4C9600 !important; + background-color: #E4FFC8 !important; +} + +.hea2 { + background-image: url() !important; + background-color: #4C9600 !important; + height: 18px !important; + text-align: center !important; + vertical-align: middle !important; + color: #CFF !important; + padding: 4px 0 !important; +} + +.bo2 { + color: #4C9600; +} + +.bo3 { + height: 100px; + overflow: auto; +} + +/*TabPanel*/ +.text { + font-size: 20px +} + +.bgc { + border: thick; + background-color: green +} + +/*SimpleTogglePanel*/ +.head { + background-color: aqua; +} + +.body { + background-color: pink; +} \ No newline at end of file

18 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r3982 - in branches/3.1.x/samples/richfaces-demo/src/main: webapp/templates/include and 1 other directory.

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

Author: sergeyhalipov Date: 2007-11-14 07:53:58 -0500 (Wed, 14 Nov 2007) New Revision: 3982 Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/tagInfo.xhtml Log: http://jira.jboss.com/jira/browse/RF-1344 and http://jira.jboss.com/jira/browse/RF-1262 Modified: branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java 2007-11-14 11:50:57 UTC (rev 3981) +++ branches/3.1.x/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java 2007-11-14 12:53:58 UTC (rev 3982) @@ -97,5 +97,13 @@ public void setGroup(String group) { this.group = group; } + + public String getTagInfoLocation() { + int pos = tldDocLocation.indexOf("tlddoc"); + if (pos >= 0) { + return tldDocLocation.substring(pos); + } + return tldDocLocation; + } } Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/tagInfo.xhtml =================================================================== --- branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/tagInfo.xhtml 2007-11-14 11:50:57 UTC (rev 3981) +++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/templates/include/tagInfo.xhtml 2007-11-14 12:53:58 UTC (rev 3982) @@ -1,13 +1,12 @@ -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:rich="http://richfaces.org/rich"> -<ui:composition> - <rich:tab label="Tag Information"> - <rich:insert src="/WEB-INF/tlddoc/#{path}.html" - errorContent="/templates/include/tagInfoNotes.xhtml"/> - </rich:tab> -</ui:composition>> -</html> - +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:rich="http://richfaces.org/rich"> +<ui:composition> + <rich:tab label="Tag Information"> + <rich:insert src="/WEB-INF/#{componentNavigator.currentComponent.tagInfoLocation}" + errorContent="/templates/include/tagInfoNotes.xhtml"/> + </rich:tab> +</ui:composition> +</html>

18 years, 5 months

1
0
0 / 0

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

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

Author: artdaw Date: 2007-11-14 06:50:57 -0500 (Wed, 14 Nov 2007) New Revision: 3981 Modified: trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml Log: done for 'disabled' attribute Modified: trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-11-14 11:40:29 UTC (rev 3980) +++ trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2007-11-14 11:50:57 UTC (rev 3981) @@ -67,7 +67,7 @@ </rich:dropDownMenu> ... ]]></programlisting> - + </section> <section> @@ -119,7 +119,7 @@ <para> <emphasis role="bold">Example:</emphasis> </para> - + <programlisting role="XML"><![CDATA[... <rich:dropDownMenu event="onclick" value="Item1">  @@ -274,7 +274,7 @@ <para> <emphasis role="bold">Example:</emphasis> </para> - + <programlisting role="XML"><![CDATA[... <rich:dropDownMenu value="Item1" direction="bottom-right" jointPoint="tr" horizontalOffset="-15" verticalOffset="0">  @@ -294,32 +294,62 @@ </mediaobject> </figure> + <para> The <emphasis> + <property>"disabled"</property> + </emphasis> attribute is used for disabling whole <emphasis role="bold"> + <property><rich:dropDownMenu></property> + </emphasis>, <emphasis role="bold"> + <property><rich:menuGroup></property> + </emphasis> or <emphasis role="bold"> + <property><rich:menuItem></property>. + </emphasis> + </para> + <para>An example of a menu appearance with <emphasis> + <property>"disabled"</property> + </emphasis> attribute can be seen below.</para> + <para> + <emphasis role="bold">Example:</emphasis> + </para> + + <programlisting role="XML"><![CDATA[... + <rich:dropDownMenu value="Item1"> + <rich:menuItem id="menuItem1" value="Active1"/> + <rich:menuItem id="menuItem2" value="Disabled1" disabled="true"/> + <rich:menuGroup id="menuGroup1" value="Group1"> + <rich:menuItem id="menuGroup1Item1" value="Active"/> + <rich:menuItem id="menuGroup1Item2" value="Active"/> + </rich:menuGroup> + <rich:menuItem id="menuItem3" value="Active2"/> + <rich:menuGroup id="menuGroup1Dsbld" value="Group1 dsbld." disabled="true" /> + </rich:dropDownMenu> +... + ]]></programlisting> </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> - + <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:dropDownMenu></property> - </emphasis> components at once:</para> - + <property><rich:dropDownMenu></property> + </emphasis> components at once:</para> + <itemizedlist> <listitem> <para>Redefine the corresponding skin parameters</para> </listitem> - + <listitem> <para>Add to your style sheets <emphasis> - <property>style classes</property> - </emphasis> used by a <emphasis role="bold"> - <property><rich:dropDownMenu></property> - </emphasis> component</para> + <property>style classes</property> + </emphasis> used by a <emphasis role="bold"> + <property><rich:dropDownMenu></property> + </emphasis> component</para> </listitem> </itemizedlist> </section> @@ -489,21 +519,22 @@ <row> <entry>rich-ddmenu-label</entry> - <entry>Defines styles for a wrapper <div> element of a representation element</entry> + <entry>Defines styles for a wrapper <div> element of a representation + element</entry> </row> <row> <entry>rich-ddmenu-label-select</entry> - <entry>Defines styles for a wrapper <div> element of a selected representation - element</entry> + <entry>Defines styles for a wrapper <div> element of a selected + representation element</entry> </row> <row> <entry>rich-ddmenu-label-unselect</entry> - <entry>Defines styles for a wrapper <div> element of an unselected representation - element </entry> + <entry>Defines styles for a wrapper <div> element of an unselected + representation element </entry> </row> </tbody> </tgroup> @@ -520,7 +551,7 @@ </imageobject> </mediaobject> </figure> - + <table> <title>Classes names that define a popup element</title> @@ -545,33 +576,37 @@ <entry>Defines styles for a general background list</entry> </row> - + <row> <entry>rich-menu-list-strut</entry> - - <entry>Defines styles for a wrapper <div> element for a strut of a popup list</entry> + + <entry>Defines styles for a wrapper <div> element for a strut of a popup + list</entry> </row> </tbody> </tgroup> </table> <para>In order to redefine styles for all <emphasis role="bold"> - <property><rich:dropDownMenu></property> - </emphasis> components on a page using CSS, it's enough to create classes with the + <property><rich:dropDownMenu></property> + </emphasis> components on a page using CSS, it's enough to create classes with the same names and define necessary properties in them.</para> - + <para>To change styles of particular <emphasis role="bold"> - <property><rich:dropDownMenu></property> - </emphasis> components, define your own style classes in the corresponding <emphasis - role="bold"> - <property><rich:dropDownMenu></property> - </emphasis>attributes.</para> + <property><rich:dropDownMenu></property> + </emphasis> components, define your own style classes in the corresponding <emphasis + role="bold"> + <property><rich:dropDownMenu></property> + </emphasis>attributes.</para> </section> <section> <title>Relevant Resources Links</title> <para> - <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf?c=dr...">Here</ulink> you can see the example of <emphasis role="bold"><property><rich:dropDownMenu></property></emphasis> usage and sources for the given example. - </para> + <ulink + url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf?c=dr..." + >Here</ulink> you can see the example of <emphasis role="bold"> + <property><rich:dropDownMenu></property> + </emphasis> usage and sources for the given example. </para> </section> </section>

18 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r3980 - management/design/orderingList.

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

Author: smukhina Date: 2007-11-14 06:40:29 -0500 (Wed, 14 Nov 2007) New Revision: 3980 Modified: management/design/orderingList/FuncSpec - orderingList.doc Log: http://jira.jboss.com/jira/browse/RF-1238 orderingList spec Modified: management/design/orderingList/FuncSpec - orderingList.doc =================================================================== (Binary files differ)

18 years, 5 months

1
0
0 / 0

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

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

Author: ochikvina Date: 2007-11-14 05:02:35 -0500 (Wed, 14 Nov 2007) New Revision: 3979 Modified: trunk/docs/userguide/en/src/main/docbook/included/tooltip.xml Log: http://jira.jboss.com/jira/browse/RF-1272- adding info about "for" attribute Modified: trunk/docs/userguide/en/src/main/docbook/included/tooltip.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/tooltip.xml 2007-11-14 09:25:46 UTC (rev 3978) +++ trunk/docs/userguide/en/src/main/docbook/included/tooltip.xml 2007-11-14 10:02:35 UTC (rev 3979) @@ -136,6 +136,30 @@ It is recommended to define parent component "id" for correction of <property>tooltip</property> work. </note> + <para>The attribute <emphasis><property>"for"</property></emphasis> is used for defining the <emphasis><property>"id"</property></emphasis> of an element a tooltip should be attached to. Look at the example: +</para> + + <para> + <emphasis role="bold">Example:</emphasis> + </para> + <programlisting role="XML"><![CDATA[... +<div id="elementId"> + <rich:toolTip for="elementId">Using a toolTip<rich:toolTip> + <p>The first simple example<p> +</div> +... +<div id="elementId"> + <p>The second simple example<p> +</div> +<rich:toolTip for="elementId">Using a toolTip<rich:toolTip> +... +]]></programlisting> + + <para>Here, the attribute <emphasis><property>"for"</property></emphasis> of a <emphasis role="bold"> + <property><rich:tooltip></property> + </emphasis> component is required. Whithout it an example doesn’t work because HTML elements aren't presented in component tree built by facelets. + </para> + <para> The <emphasis><property>"mode"</property></emphasis> attribute is provided you to control the way of data loading to <property>tooltip</property>. It has following values: <itemizedlist>

18 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r3978 - branches/3.1.x/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css.

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

Author: akushunin Date: 2007-11-14 04:25:46 -0500 (Wed, 14 Nov 2007) New Revision: 3978 Modified: branches/3.1.x/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss Log: RF-1345 Modified: branches/3.1.x/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss =================================================================== --- branches/3.1.x/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss 2007-11-14 09:22:25 UTC (rev 3977) +++ branches/3.1.x/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss 2007-11-14 09:25:46 UTC (rev 3978) @@ -32,7 +32,7 @@ vertical-align : top; } .dr-stglpanel-marker{ - float: left; + float: right; } ]]>

18 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r3977 - trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css.

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

Author: akushunin Date: 2007-11-14 04:22:25 -0500 (Wed, 14 Nov 2007) New Revision: 3977 Modified: trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss Log: RF-1345 Modified: trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss =================================================================== --- trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss 2007-11-13 20:53:14 UTC (rev 3976) +++ trunk/ui/simpleTogglePanel/src/main/resources/org/richfaces/renderkit/html/css/simpleTogglePanel.xcss 2007-11-14 09:22:25 UTC (rev 3977) @@ -32,7 +32,7 @@ vertical-align : top; } .dr-stglpanel-marker{ - float: left; + float: right; } ]]>

18 years, 5 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 November 2007