Author: SeanRogers
Date: 2011-02-02 21:40:56 -0500 (Wed, 02 Feb 2011)
New Revision: 21407
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Menus_and_toolbars.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels_and_containers.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richpanelMenu-richpanelMenu.xml_sample
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richpanelMenuGroup-Using_custom_icons.xml_sample
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richpanelMenuItem-Using_custom_icons.xml_sample
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-nodeType_attribute.xml_sample
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtreeNode-rendered_attribute.xml_sample
Log:
Preliminary changes to class and icon names for RF-10355
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Menus_and_toolbars.xml
===================================================================
---
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Menus_and_toolbars.xml 2011-02-03
00:52:34 UTC (rev 21406)
+++
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Menus_and_toolbars.xml 2011-02-03
02:40:56 UTC (rev 21407)
@@ -474,8 +474,8 @@
</para>
<variablelist>
<varlistentry>
- <term><varname>topExpandedIconLeft</varname></term>
- <term><varname>topExpandedIconRight</varname></term>
+ <term><varname>topGroupExpandedLeftIcon</varname></term>
+ <term><varname>topGroupExpandedRightIcon</varname></term>
<listitem>
<para>
These attributes determine the icons for the top level menu when it is expanded.
@@ -483,8 +483,8 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><varname>topCollapsedIconLeft</varname></term>
- <term><varname>topCollapsedIconRight</varname></term>
+ <term><varname>topGroupCollapsedLeftIcon</varname></term>
+ <term><varname>topGroupCollapsedRightIcon</varname></term>
<listitem>
<para>
These attributes determine the icons for the top level menu when it is collapsed.
@@ -492,8 +492,8 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><varname>topDisabledIconLeft</varname></term>
- <term><varname>topDisabledIconRight</varname></term>
+ <term><varname>topGroupDisabledLeftIcon</varname></term>
+ <term><varname>topGroupDisabledRightIcon</varname></term>
<listitem>
<para>
These attributes determine the icons for the top level menu when it is disabled.
@@ -501,8 +501,8 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><varname>groupExpandedIconLeft</varname></term>
- <term><varname>groupExpandedIconRight</varname></term>
+ <term><varname>groupExpandedLeftIcon</varname></term>
+ <term><varname>groupExpandedRightIcon</varname></term>
<listitem>
<para>
These attributes determine the icons for sub-menus that are not the top-level menu
when they are expanded.
@@ -510,8 +510,8 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><varname>groupCollapsedIconLeft</varname></term>
- <term><varname>groupCollapsedIconRight</varname></term>
+ <term><varname>groupCollapsedLeftIcon</varname></term>
+ <term><varname>groupCollapsedRightIcon</varname></term>
<listitem>
<para>
These attributes determine the icons for sub-menus that are not the top-level menu
when they are collapsed.
@@ -519,8 +519,8 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><varname>groupDisabledIconLeft</varname></term>
- <term><varname>groupDisabledIconRight</varname></term>
+ <term><varname>groupDisabledLeftIcon</varname></term>
+ <term><varname>groupDisabledRightIcon</varname></term>
<listitem>
<para>
These attributes determine the icons for sub-menus that are not the top-level menu
when they are disabled.
@@ -528,8 +528,8 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><varname>itemIconLeft</varname></term>
- <term><varname>itemIconRight</varname></term>
+ <term><varname>itemLeftIcon</varname></term>
+ <term><varname>itemRightIcon</varname></term>
<listitem>
<para>
These attributes determine the icons for items in the menus.
@@ -537,8 +537,8 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><varname>itemIconDisabledLeft</varname></term>
- <term><varname>itemIconDisabledRight</varname></term>
+ <term><varname>itemDisabledLeftIcon</varname></term>
+ <term><varname>itemDisabledRightIcon</varname></term>
<listitem>
<para>
These attributes determine the icons for items in the menus when they are
disabled.
@@ -641,29 +641,29 @@
</para>
<variablelist>
<varlistentry>
- <term><varname>iconLeftExpanded</varname></term>
- <term><varname>iconRightExpanded</varname></term>
+ <term><varname>leftExpandedIcon</varname></term>
+ <term><varname>rightExpandedIcon</varname></term>
<listitem>
<para>
- These attributes determine the icons for a menu group when it is expanded. If
unspecified, the menu group uses the <varname>groupExpandedIconLeft</varname>
and <varname>groupExpandedIconRight</varname> parameters defined in the parent
<sgmltag><rich:panelMenu></sgmltag> component.
+ These attributes determine the icons for a menu group when it is expanded. If
unspecified, the menu group uses the <varname>groupExpandedLeftIcon</varname>
and <varname>groupExpandedRightIcon</varname> parameters defined in the parent
<sgmltag><rich:panelMenu></sgmltag> component.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><varname>iconLeftCollapsed</varname></term>
- <term><varname>iconRightCollapsed</varname></term>
+ <term><varname>leftCollapsedIcon</varname></term>
+ <term><varname>rightCollapsedIcon</varname></term>
<listitem>
<para>
- These attributes determine the icons for a menu group menu when it is collapsed.
If unspecified, the menu group uses the
<varname>groupCollapsedIconLeft</varname> and
<varname>groupCollapsedIconRight</varname> parameters defined in the parent
<sgmltag><rich:panelMenu></sgmltag> component.
+ These attributes determine the icons for a menu group menu when it is collapsed.
If unspecified, the menu group uses the
<varname>groupCollapsedLeftIcon</varname> and
<varname>groupCollapsedRightIcon</varname> parameters defined in the parent
<sgmltag><rich:panelMenu></sgmltag> component.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><varname>iconLeftDisabled</varname></term>
- <term><varname>iconRightDisabled</varname></term>
+ <term><varname>leftDisabledIcon</varname></term>
+ <term><varname>rightDisabledIcon</varname></term>
<listitem>
<para>
- These attributes determine the icons for a menu group menu when it is disabled.
If unspecified, the menu group uses the
<varname>groupDisabledIconLeft</varname> and
<varname>groupDisabledIconRight</varname> parameters defined in the parent
<sgmltag><rich:panelMenu></sgmltag> component.
+ These attributes determine the icons for a menu group menu when it is disabled.
If unspecified, the menu group uses the
<varname>groupDisabledLeftIcon</varname> and
<varname>groupDisabledRightIcon</varname> parameters defined in the parent
<sgmltag><rich:panelMenu></sgmltag> component.
</para>
</listitem>
</varlistentry>
@@ -748,20 +748,20 @@
</para>
<variablelist>
<varlistentry>
- <term><varname>iconLeft</varname></term>
- <term><varname>iconRight</varname></term>
+ <term><varname>itemLeftIcon</varname></term>
+ <term><varname>itemRightIcon</varname></term>
<listitem>
<para>
- These attributes determine the icons for a menu item. If unspecified, the menu
group uses the <varname>itemIconLeft</varname> and
<varname>itemIconRight</varname> parameters defined in the parent
<sgmltag><rich:panelMenu></sgmltag> component.
+ These attributes determine the icons for a menu item. If unspecified, the menu
group uses the <varname>itemLeftIcon</varname> and
<varname>itemRightIcon</varname> parameters defined in the parent
<sgmltag><rich:panelMenu></sgmltag> component.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><varname>iconLeftDisabled</varname></term>
- <term><varname>iconRightDisabled</varname></term>
+ <term><varname>itemDisabledLeftIcon</varname></term>
+ <term><varname>itemDisabledRightIcon</varname></term>
<listitem>
<para>
- These attributes determine the icons for a menu item when it is disabled. If
unspecified, the menu group uses the <varname>itemIconDisabledLeft</varname>
and <varname>itemIconDisabledRight</varname> parameters defined in the parent
<sgmltag><rich:panelMenu></sgmltag> component.
+ These attributes determine the icons for a menu item when it is disabled. If
unspecified, the menu group uses the <varname>itemDisabledRightIcon</varname>
and <varname>itemDisabledLeftIcon</varname> parameters defined in the parent
<sgmltag><rich:panelMenu></sgmltag> component.
</para>
</listitem>
</varlistentry>
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels_and_containers.xml
===================================================================
---
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels_and_containers.xml 2011-02-03
00:52:34 UTC (rev 21406)
+++
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Panels_and_containers.xml 2011-02-03
02:40:56 UTC (rev 21407)
@@ -849,7 +849,7 @@
</para>
<variablelist>
<varlistentry>
- <term><literal>headerActive</literal> facet</term>
+ <term><literal>headerActiveClass</literal> facet</term>
<listitem>
<para>
This facet is used when the tab is the currently active tab.
@@ -857,7 +857,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>headerInactive</literal> facet</term>
+ <term><literal>headerInactiveClass</literal> facet</term>
<listitem>
<para>
This facet is used when the tab is not currently active.
@@ -865,7 +865,7 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>headerDisabled</literal> facet</term>
+ <term><literal>headerDisabledClass</literal> facet</term>
<listitem>
<para>
This facet is used when the tab is disabled.
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml
===================================================================
---
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml 2011-02-03
00:52:34 UTC (rev 21406)
+++
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Rich_inputs.xml 2011-02-03
02:40:56 UTC (rev 21407)
@@ -260,7 +260,7 @@
To add keyboard support for manual input, set
<code>enableManualInput="true"</code>. To disable the calendar from
any user input, set <code>disabled="true"</code>.
</para>
<para>
- To change the appearance of the display button from the standard calendar icon, use
the <varname>buttonIcon</varname> and
<varname>buttonIconDisabled</varname> attributes to replace the icon with a
specified file. Alternatively, use the <varname>buttonLabel</varname>
attribute to display text on the button without an icon. If
<varname>buttonLabel</varname> is specified then both the
<varname>buttonIcon</varname> and
<varname>buttonIconDisabled</varname> attributes are ignored. To hide the text
field box, set <code>showInput="false"</code>.
+ To change the appearance of the display button from the standard calendar icon, use
the <varname>buttonIcon</varname> and
<varname>buttonDisabledIcon</varname> attributes to replace the icon with a
specified file. Alternatively, use the <varname>buttonLabel</varname>
attribute to display text on the button without an icon. If
<varname>buttonLabel</varname> is specified then both the
<varname>buttonIcon</varname> and
<varname>buttonDisabledIcon</varname> attributes are ignored. To hide the text
field box, set <code>showInput="false"</code>.
</para>
<!-- TODO not in M4 -->
<!--
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml
===================================================================
---
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml 2011-02-03
00:52:34 UTC (rev 21406)
+++
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml 2011-02-03
02:40:56 UTC (rev 21407)
@@ -52,7 +52,7 @@
<section id="sect-Component_Reference-richtree-Appearance">
<title>Appearance</title>
<para>
- Different nodes in the tree can have different appearances, such as node icons,
depending on the type of data the node contains. Use the
<varname>nodeType</varname> attribute to differentiate the types of nodes; the
node is then rendered according to the
<sgmltag><rich:treeNode></sgmltag> component with the
corresponding <varname>type</varname> attribute. <xref
linkend="exam-Component_Reference-richtree-Appearance" /> shows a
<sgmltag><rich:tree></sgmltag> component with three different
child <sgmltag><rich:treeNode></sgmltag> components defined to
represent three different node appearances. Refer to <xref
linkend="sect-Component_Reference-richtreeNode-Appearance" /> for details on
customizing the appearance of <sgmltag><rich:treeNode></sgmltag>
components.
+ Different nodes in the tree can have different appearances, such as node icons,
depending on the type of data the node contains. Use the
<varname>nodeType</varname> attribute to differentiate the types of nodes; the
node is then rendered according to the
<sgmltag><rich:treeNode></sgmltag> component with the
corresponding <varname>type</varname> attribute. <xref
linkend="exam-Component_Reference-richtree-nodeType_attribute" /> shows a
<sgmltag><rich:tree></sgmltag> component with three different
child <sgmltag><rich:treeNode></sgmltag> components defined to
represent three different node appearances. Refer to <xref
linkend="sect-Component_Reference-richtreeNode-Appearance" /> for details on
customizing the appearance of <sgmltag><rich:treeNode></sgmltag>
components.
</para>
<example id="exam-Component_Reference-richtree-nodeType_attribute">
<title><varname>nodeType</varname> attribute</title>
@@ -365,7 +365,7 @@
Use the <varname>rendered</varname> attribute to determine whether the
node should actually be rendered in the tree or not. Using the
<varname>rendered</varname> attribute in combination with the
<sgmltag><rich:treeNode></sgmltag>
<varname>type</varname> attribute can allow further style differentiation
between node content, as shown in <xref
linkend="exam-Component_Reference-richtreeNode-rendered_attribute" />.
</para>
<example
id="exam-Component_Reference-richtreeNode-rendered_attribute">
- <title>rendered attribute</title>
+ <title><varname>rendered</varname> attribute</title>
<para>
The <varname>rendered</varname> attribute is used to differentiate
between music albums that are in stock and those that are not. The item
<varname>type</varname> attributes return values that are otherwise identical;
only the <property>item.exist</property> property differs, so it is used for
the <varname>rendered</varname> attribute.
</para>
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richpanelMenu-richpanelMenu.xml_sample
===================================================================
---
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richpanelMenu-richpanelMenu.xml_sample 2011-02-03
00:52:34 UTC (rev 21406)
+++
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richpanelMenu-richpanelMenu.xml_sample 2011-02-03
02:40:56 UTC (rev 21407)
@@ -1,8 +1,8 @@
<rich:panelMenu mode="ajax"
- topExpandedIconRight="chevronUp"
- topCollapsedIconRight="chevronDown"
- groupExpandedIconLeft="disc"
- groupCollapsedIconLeft="disc">
+ topGroupExpandedRightIcon="chevronUp"
+ topGroupCollapsedRightIcon="chevronDown"
+ groupExpandedLeftIcon="disc"
+ groupCollapsedLeftIcon="disc">
<rich:panelMenuGroup label="Group 1">
<rich:panelMenuItem label="Item 1.1"/>
<rich:panelMenuItem label="Item 1.2"/>
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richpanelMenuGroup-Using_custom_icons.xml_sample
===================================================================
---
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richpanelMenuGroup-Using_custom_icons.xml_sample 2011-02-03
00:52:34 UTC (rev 21406)
+++
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richpanelMenuGroup-Using_custom_icons.xml_sample 2011-02-03
02:40:56 UTC (rev 21407)
@@ -1,5 +1,5 @@
<rich:panelMenu>
- <rich:PanelMenuGroup label="Group 1"
iconLeftExpanded="\images\img1.png"
iconLeftCollapsed="\images\img2.png">
+ <rich:PanelMenuGroup label="Group 1"
leftExpandedIcon="\images\img1.png"
leftCollapsedIcon="\images\img2.png">
<!-- Nested menu components -->
</rich:panelMenuGroup>
</rich:panelMenu>
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richpanelMenuItem-Using_custom_icons.xml_sample
===================================================================
---
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richpanelMenuItem-Using_custom_icons.xml_sample 2011-02-03
00:52:34 UTC (rev 21406)
+++
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richpanelMenuItem-Using_custom_icons.xml_sample 2011-02-03
02:40:56 UTC (rev 21407)
@@ -1,5 +1,5 @@
<rich:panelMenu>
...
- <rich:panelMenuItem value="Item 1.1"
iconLeft="\images\img1.png" iconLeftDisabled="\images\img2.png" />
+ <rich:panelMenuItem value="Item 1.1"
itemLeftIcon="\images\img1.png"
itemDisabledLeftIcon="\images\img2.png" />
...
</rich:panelMenu>
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-nodeType_attribute.xml_sample
===================================================================
---
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-nodeType_attribute.xml_sample 2011-02-03
00:52:34 UTC (rev 21406)
+++
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-nodeType_attribute.xml_sample 2011-02-03
02:40:56 UTC (rev 21407)
@@ -1,11 +1,11 @@
<rich:tree style="width:300px" value="#{library.data}"
var="item" nodeType="#{item.type}">
- <rich:treeNode type="artist" iconLeaf="/images/tree/singer.png"
icon="/images/tree/singer.png">
+ <rich:treeNode type="artist"
iconLeaf="/images/tree/singer.png">
<h:outputText value="#{item.name}" />
</rich:treeNode>
- <rich:treeNode type="album" iconLeaf="/images/tree/disc.png"
icon="/images/tree/disc.png">
+ <rich:treeNode type="album"
iconLeaf="/images/tree/disc.png">
<h:outputText value="#{item.title}" />
</rich:treeNode>
- <rich:treeNode type="song" iconLeaf="/images/tree/song.png"
icon="/images/tree/song.png">
+ <rich:treeNode type="song"
iconLeaf="/images/tree/song.png">
<h:outputText value="#{item.title}" />
</rich:treeNode>
</rich:tree>
Modified:
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtreeNode-rendered_attribute.xml_sample
===================================================================
---
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtreeNode-rendered_attribute.xml_sample 2011-02-03
00:52:34 UTC (rev 21406)
+++
modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtreeNode-rendered_attribute.xml_sample 2011-02-03
02:40:56 UTC (rev 21407)
@@ -1,10 +1,11 @@
-<rich:tree style="width:300px" value="#{library.data}"
var="item" nodeFace="#{item.type}">
+<rich:tree style="width:300px" value="#{library.data}"
+ var="item" nodeFace="#{item.type}">
...
- <rich:treeNode type="album" iconLeaf="/images/tree/album.gif"
icon="/images/tree/album.gif"
+ <rich:treeNode type="album" iconLeaf="/images/tree/album.gif"
rendered="#{item.exist}">
<h:outputText value="#{item.name}" />
</rich:treeNode>
- <rich:treeNode type="album"
iconLeaf="/images/tree/album_absent.gif"
icon="/images/tree/album_absent.gif"
+ <rich:treeNode type="album"
iconLeaf="/images/tree/album_absent.gif"
rendered="#{not item.exist}">
<h:outputText value="#{item.name}" />
</rich:treeNode>