You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/12/05 09:23:23 UTC
svn commit: r723646 [1/3] - in /myfaces/trinidad/trunk/trinidad-impl/src:
main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/
test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/
test/resources/org/apache/myfaces/trinidadinte...
Author: matzew
Date: Fri Dec 5 00:23:23 2008
New Revision: 723646
URL: http://svn.apache.org/viewvc?rev=723646&view=rev
Log:
TRINIDAD-1303 - PDA renderers for tr:page, tr:panelPage and tr:panelPageHeader need to render facets more in line with desktop counterparts
Thanks to Tadashi Enomori for the patch
Added:
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-pda-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelPage-facets-pda.xml
Modified:
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PageHeaderLayoutRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PageLayoutRenderer.java
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-chromeType-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalPPC-golden.xml
myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/panelPage-facets.xml
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PageHeaderLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PageHeaderLayoutRenderer.java?rev=723646&r1=723645&r2=723646&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PageHeaderLayoutRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PageHeaderLayoutRenderer.java Fri Dec 5 00:23:23 2008
@@ -49,17 +49,26 @@
ContextPoppingUINode.getUINode(BRANDING_CHILD));
brandingFlow.addIndexedChild(
ContextPoppingUINode.getUINode(BRANDING_APP_CHILD));
+ brandingFlow.addIndexedChild(
+ ContextPoppingUINode.getUINode(BRANDING_APP_CONTEXTUAL_CHILD));
MarlinBean compositeRoot = new MarlinBean(STACK_LAYOUT_NAME);
// delegate all of the attributes to the RootAttribtueMap
compositeRoot.setAttributeMap(RootAttributeMap.getAttributeMap());
+ compositeRoot.addIndexedChild(
+ ContextPoppingUINode.getUINode(NAVIGATION_GLOBAL_CHILD));
+ brandingFlow.addIndexedChild(
+ ContextPoppingUINode.getUINode(MENU_SWITCH_CHILD));
+
compositeRoot.addIndexedChild(brandingFlow);
compositeRoot.addIndexedChild(
ContextPoppingUINode.getUINode(NAVIGATION1_CHILD));
compositeRoot.addIndexedChild(
ContextPoppingUINode.getUINode(NAVIGATION2_CHILD));
+ compositeRoot.addIndexedChild(
+ ContextPoppingUINode.getUINode(SEARCH_CHILD));
return compositeRoot;
}
Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PageLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PageLayoutRenderer.java?rev=723646&r1=723645&r2=723646&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PageLayoutRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PageLayoutRenderer.java Fri Dec 5 00:23:23 2008
@@ -48,27 +48,53 @@
private static UINode _createCompositeUINode()
{
+ MarlinBean globalNavigation = new MarlinBean(TABLE_LAYOUT_NAME);
+ globalNavigation.setAttributeValue(WIDTH_ATTR, ONE_HUNDRED_PERCENT_ATTRIBUTE_VALUE);
+ globalNavigation.addIndexedChild(_fullWidthTableRow(NAVIGATION_GLOBAL_CHILD));
//
// Create the page header layout
//
MarlinBean headerLayout = new MarlinBean(PAGE_HEADER_LAYOUT_NAME);
- headerLayout.setNamedChild(NAVIGATION_GLOBAL_CHILD,
- ContextPoppingUINode.getUINode(NAVIGATION_GLOBAL_CHILD));
- headerLayout.setNamedChild(NAVIGATION1_CHILD,
- ContextPoppingUINode.getUINode(NAVIGATION1_CHILD));
-
- headerLayout.setNamedChild(NAVIGATION2_CHILD, _createGlobalHeaders());
+ headerLayout.setNamedChild(MENU_SWITCH_CHILD,
+ ContextPoppingUINode.getUINode(MENU_SWITCH_CHILD));
headerLayout.setNamedChild(BRANDING_CHILD,
ContextPoppingUINode.getUINode(BRANDING_CHILD));
+
headerLayout.setNamedChild(BRANDING_APP_CHILD,
ContextPoppingUINode.getUINode(BRANDING_APP_CHILD));
+
+ headerLayout.setNamedChild(BRANDING_APP_CONTEXTUAL_CHILD,
+ ContextPoppingUINode.getUINode(BRANDING_APP_CONTEXTUAL_CHILD));
+
+ headerLayout.setNamedChild(NAVIGATION1_CHILD,
+ ContextPoppingUINode.getUINode(NAVIGATION1_CHILD));
+
+ headerLayout.setNamedChild(NAVIGATION2_CHILD, _createGlobalHeaders());
+
+ headerLayout.setNamedChild(SEARCH_CHILD,
+ ContextPoppingUINode.getUINode(SEARCH_CHILD));
// =-= bts a little bogus since this isn't really an attribute of PageHeader
headerLayout.setAttributeValue(WIDTH_ATTR, "100%");
//
+ // Create layout used for locators at the top of the page
+ //
+ MarlinBean locatorLayout = new MarlinBean(STACK_LAYOUT_NAME);
+ locatorLayout.addIndexedChild(
+ ContextPoppingUINode.getUINode(LOCATION_CHILD));
+ locatorLayout.addIndexedChild(
+ ContextPoppingUINode.getUINode(INFO_USER_CHILD));
+ locatorLayout.addIndexedChild(
+ ContextPoppingUINode.getUINode(MESSAGES_CHILD));
+ locatorLayout.addIndexedChild(
+ ContextPoppingUINode.getUINode(INFO_SUPPLEMENTAL_CHILD));
+ locatorLayout.addIndexedChild(
+ ContextPoppingUINode.getUINode(INFO_STATUS_CHILD));
+
+ //
// Create the content container containing all of the indexed children
//
// MarlinBean contentRoot = new MarlinBean(FLOW_LAYOUT_NAME);
@@ -84,54 +110,16 @@
MarlinBean pageButtonsLine = new MarlinBean(SEPARATOR_NAME);
pageButtonsLine.setAttributeValue(
RENDERED_ATTR,
- new OrBoundValue(
- PdaHtmlLafUtils.createIsRenderedBoundValue(ACTIONS_CHILD),
- PdaHtmlLafUtils.createIsRenderedBoundValue(INFO_RETURN_CHILD)));
-
-
-
+ new OrBoundValue(new BoundValue[]{
+ PdaHtmlLafUtils.createIsRenderedBoundValue(INFO_RETURN_CHILD)}));
// Create the area containing the footer
MarlinBean footerTable = new MarlinBean(TABLE_LAYOUT_NAME);
footerTable.setAttributeValue( WIDTH_ATTR, ONE_HUNDRED_PERCENT_ATTRIBUTE_VALUE);
-
- MarlinBean globalButtonsRow = new MarlinBean(ROW_LAYOUT_NAME);
- MarlinBean globalButtonsCell = new MarlinBean(CELL_FORMAT_NAME);
- globalButtonsCell.setAttributeValue( H_ALIGN_ATTR, CENTER_ATTRIBUTE_VALUE);
- globalButtonsCell.addIndexedChild(
- ContextPoppingUINode.getUINode(NAVIGATION_GLOBAL_CHILD));
- globalButtonsRow.addIndexedChild( globalButtonsCell);
- footerTable.addIndexedChild( globalButtonsRow);
-
- MarlinBean copyrightRow = new MarlinBean(ROW_LAYOUT_NAME);
- MarlinBean copyrightCell = new MarlinBean(CELL_FORMAT_NAME);
- copyrightCell.setAttributeValue( H_ALIGN_ATTR, CENTER_ATTRIBUTE_VALUE);
- copyrightCell.setStyleClass( AF_PANEL_PAGE_COPYRIGHT_STYLE_CLASS ) ;
- copyrightCell.addIndexedChild(ContextPoppingUINode.getUINode(APP_COPYRIGHT_CHILD));
- copyrightRow.addIndexedChild( copyrightCell);
- footerTable.addIndexedChild( copyrightRow);
-
-
- MarlinBean privacyRow = new MarlinBean(ROW_LAYOUT_NAME);
- MarlinBean privacyCell = new MarlinBean(CELL_FORMAT_NAME);
- privacyCell.setAttributeValue( H_ALIGN_ATTR, CENTER_ATTRIBUTE_VALUE);
- privacyCell.setStyleClass( AF_PANEL_PAGE_PRIVACY_STYLE_CLASS ) ;
- privacyCell.addIndexedChild(ContextPoppingUINode.getUINode(APP_PRIVACY_CHILD));
- privacyRow.addIndexedChild( privacyCell);
- footerTable.addIndexedChild( privacyRow);
-
-
- MarlinBean aboutRow = new MarlinBean(ROW_LAYOUT_NAME);
- MarlinBean aboutCell = new MarlinBean(CELL_FORMAT_NAME);
- aboutCell.setAttributeValue( H_ALIGN_ATTR, CENTER_ATTRIBUTE_VALUE);
- aboutCell.setStyleClass( AF_PANEL_PAGE_ABOUT_STYLE_CLASS ) ;
- aboutCell.addIndexedChild(ContextPoppingUINode.getUINode(APP_ABOUT_CHILD));
- aboutRow.addIndexedChild( aboutCell);
- footerTable.addIndexedChild( aboutRow);
-
-
-
+ footerTable.addIndexedChild(_fullWidthTableRow(APP_COPYRIGHT_CHILD));
+ footerTable.addIndexedChild(_fullWidthTableRow(APP_PRIVACY_CHILD));
+ footerTable.addIndexedChild(_fullWidthTableRow(APP_ABOUT_CHILD));
MarlinBean footer = new MarlinBean(FLOW_LAYOUT_NAME);
MarlinBean footerLine = new MarlinBean(CONTENT_FOOTER_NAME);
@@ -141,44 +129,68 @@
BoundValue renderFooter = new OrBoundValue(new BoundValue[]{
PdaHtmlLafUtils.createIsRenderedBoundValue(APP_PRIVACY_CHILD),
PdaHtmlLafUtils.createIsRenderedBoundValue(APP_ABOUT_CHILD),
- PdaHtmlLafUtils.createIsRenderedBoundValue(APP_COPYRIGHT_CHILD),
- PdaHtmlLafUtils.createIsRenderedBoundValue(NAVIGATION_GLOBAL_CHILD)
- });
+ PdaHtmlLafUtils.createIsRenderedBoundValue(APP_COPYRIGHT_CHILD)});
+
footer.setAttributeValue( RENDERED_ATTR, renderFooter);
+ MarlinBean content = new MarlinBean(STACK_LAYOUT_NAME);
+ content.addIndexedChild(contentRoot);
+ content.addIndexedChild(
+ ContextPoppingUINode.getUINode(INFO_FOOTNOTE_CHILD));
-
- MarlinBean content = new MarlinBean(STACK_LAYOUT_NAME);
- content.addIndexedChild( ContextPoppingUINode.getUINode(LOCATION_CHILD));
- content.addIndexedChild( contentRoot );
content.addIndexedChild(pageButtonsLine);
//
// Add the footer children
//
content.addIndexedChild(
- ContextPoppingUINode.getUINode(ACTIONS_CHILD));
- content.addIndexedChild(
ContextPoppingUINode.getUINode(INFO_RETURN_CHILD));
+
+ MarlinBean action = new MarlinBean(TABLE_LAYOUT_NAME);
+ action.setAttributeValue( WIDTH_ATTR, ONE_HUNDRED_PERCENT_ATTRIBUTE_VALUE);
+
+ MarlinBean actionButtonRow = new MarlinBean(ROW_LAYOUT_NAME);
+ MarlinBean actionButtonCell = new MarlinBean(CELL_FORMAT_NAME);
+ actionButtonCell.setAttributeValue( H_ALIGN_ATTR, CENTER_ATTRIBUTE_VALUE);
+ actionButtonCell.addIndexedChild(
+ ContextPoppingUINode.getUINode(ACTIONS_CHILD));
+ actionButtonRow.addIndexedChild( actionButtonCell);
+ action.addIndexedChild( actionButtonRow);
+
+
MarlinBean compositeRoot = new MarlinBean(FLOW_LAYOUT_NAME);
// delegate all of the attributes to the RootAttribtueMap
compositeRoot.setAttributeMap(RootAttributeMap.getAttributeMap());
+ compositeRoot.addIndexedChild(globalNavigation);
compositeRoot.addIndexedChild(headerLayout);
-
- compositeRoot.addIndexedChild(
- ContextPoppingUINode.getUINode( MESSAGES_CHILD ));
-
+ compositeRoot.addIndexedChild(locatorLayout);
compositeRoot.addIndexedChild(content);
-
+ compositeRoot.addIndexedChild(action);
compositeRoot.addIndexedChild(footer);
return compositeRoot;
}
+ /**
+ * Creates a faced in a table cell that occupied full width of screen for the
+ * facet name in the parameter.
+ */
+ private static MarlinBean _fullWidthTableRow (
+ String childName)
+ {
+ MarlinBean row = new MarlinBean(ROW_LAYOUT_NAME);
+ MarlinBean cell = new MarlinBean(CELL_FORMAT_NAME);
+ cell.setAttributeValue(H_ALIGN_ATTR, CENTER_ATTRIBUTE_VALUE);
+ cell.addIndexedChild(
+ ContextPoppingUINode.getUINode(childName));
+ row.addIndexedChild(cell);
+ return row;
+ }
+
/**
* Create the global headers to use to render the page. The first child is
Added: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-pda-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-pda-minimalPPC-golden.xml?rev=723646&view=auto
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-pda-minimalPPC-golden.xml (added)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-pda-minimalPPC-golden.xml Fri Dec 5 00:23:23 2008
@@ -0,0 +1,855 @@
+<results>
+ <span
+ id="mainId"
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ <div
+ class="af_navigationPane"
+ >
+
+ <span
+ class="af_navigationPane_buttons-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_buttons-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ button1
+ </a>
+ </span>
+ <span
+ class="af_navigationPane_buttons-separator"
+ >
+ |
+ </span>
+ </span>
+ <span
+ class="af_navigationPane_buttons-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_buttons-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ button2
+ </a>
+ </span>
+ <span
+ class="af_navigationPane_buttons-separator"
+ >
+ |
+ </span>
+ </span>
+ <span
+ class="af_navigationPane_buttons-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_buttons-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ button3
+ </a>
+ </span>
+ </span>
+ </div>
+ </td>
+ </tr>
+ </table>
+ <img
+ src="uri-attr:encoded-resource-url:/test-context-path/foo/foo.gif"
+ >
+
+ </img>
+ <div
+ >
+
+ </div>
+ <div
+ class="af_navigationPane_tabs"
+ >
+
+ <span
+ class="af_navigationPane_buttons-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_buttons-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ tab1
+ </a>
+ </span>
+ <span
+ class="af_navigationPane_buttons-separator"
+ >
+ |
+ </span>
+ </span>
+ <span
+ class="af_navigationPane_buttons-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_buttons-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ tab2
+ </a>
+ </span>
+ <span
+ class="af_navigationPane_buttons-separator"
+ >
+ |
+ </span>
+ </span>
+ <span
+ class="af_navigationPane_buttons-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_buttons-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ tab3
+ </a>
+ </span>
+ </span>
+ </div>
+ <div
+ >
+
+ </div>
+ <div
+ class="af_navigationPane_bar"
+ >
+
+ <span
+ class="af_navigationPane_bar-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_bar-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ bar1
+ </a>
+ </span>
+ <span
+ class="af_navigationPane_bar-separator"
+ >
+ |
+ </span>
+ </span>
+ <span
+ class="af_navigationPane_bar-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_bar-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ bar2
+ </a>
+ </span>
+ <span
+ class="af_navigationPane_bar-separator"
+ >
+ |
+ </span>
+ </span>
+ <span
+ class="af_navigationPane_bar-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_bar-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ bar3
+ </a>
+ </span>
+ </span>
+ </div>
+ <div
+ >
+
+ </div>the search facet
+ <span
+ class="af_breadCrumbs"
+ >
+
+ <nobr
+ >
+
+ <span
+ dir="ltr"
+ >
+
+ <a
+ class="af_breadCrumbs_step"
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:encoded-action-url:#"
+ >
+ path1
+ </a>
+ </span> > 
+ </nobr>
+ <nobr
+ >
+
+ <span
+ dir="ltr"
+ >
+
+ <a
+ class="af_breadCrumbs_step"
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:encoded-action-url:#"
+ >
+ path2
+ </a>
+ </span> > 
+ </nobr>
+ </span>
+ <div
+ >
+
+ </div>the infoUser facet
+ <div
+ >
+
+ </div>the messages facet
+ <div
+ >
+
+ </div>the infoStatus facet
+ <div
+ >
+
+ <h1
+ class="af_panelHeader"
+ >
+ foo
+ </h1>
+ </div>
+ <div
+ >
+
+ </div>
+ <div
+ id="panID"
+ >
+
+ <h1
+ class="af_panelHeader"
+ >
+ bar bar
+ </h1>
+ </div>
+ <div
+ >
+
+ </div>
+ <div
+ >
+
+ <h1
+ class="af_panelHeader"
+ >
+ header2
+ </h1>
+ </div>
+ <div
+ >
+
+ </div>the infoFootnote facet
+ <div
+ >
+
+ </div>
+ <hr
+ size="1"
+ >
+
+ </hr>
+ <div
+ >
+
+ </div>the infoReturn facet
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+ the actions facet
+ </td>
+ </tr>
+ </table>
+ <hr
+ size="2"
+ >
+
+ </hr>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+ the appCopyright facet
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ <a
+ class="OraLink"
+ onclick="submitForm('formId',1,{source:'_idXXX'});return false;"
+ href="uri-attr:encoded-action-url:#"
+ >
+ privacy
+ </a>
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ <a
+ class="OraLink"
+ onclick="submitForm('formId',1,{source:'_idXXX'});return false;"
+ href="uri-attr:encoded-action-url:#"
+ >
+ appAbout
+ </a>
+ </td>
+ </tr>
+ </table>
+ </span>
+<!--AttributeTest[icon,icon-uri]-->
+
+ <span
+ id="mainId"
+ >
+
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ <div
+ class="af_navigationPane"
+ >
+
+ <span
+ class="af_navigationPane_buttons-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_buttons-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ button1
+ </a>
+ </span>
+ <span
+ class="af_navigationPane_buttons-separator"
+ >
+ |
+ </span>
+ </span>
+ <span
+ class="af_navigationPane_buttons-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_buttons-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ button2
+ </a>
+ </span>
+ <span
+ class="af_navigationPane_buttons-separator"
+ >
+ |
+ </span>
+ </span>
+ <span
+ class="af_navigationPane_buttons-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_buttons-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ button3
+ </a>
+ </span>
+ </span>
+ </div>
+ </td>
+ </tr>
+ </table>
+ <img
+ src="uri-attr:encoded-resource-url:/test-context-path/foo/foo.gif"
+ >
+
+ </img>
+ <div
+ >
+
+ </div>
+ <div
+ class="af_navigationPane_tabs"
+ >
+
+ <span
+ class="af_navigationPane_buttons-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_buttons-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ tab1
+ </a>
+ </span>
+ <span
+ class="af_navigationPane_buttons-separator"
+ >
+ |
+ </span>
+ </span>
+ <span
+ class="af_navigationPane_buttons-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_buttons-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ tab2
+ </a>
+ </span>
+ <span
+ class="af_navigationPane_buttons-separator"
+ >
+ |
+ </span>
+ </span>
+ <span
+ class="af_navigationPane_buttons-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_buttons-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ tab3
+ </a>
+ </span>
+ </span>
+ </div>
+ <div
+ >
+
+ </div>
+ <div
+ class="af_navigationPane_bar"
+ >
+
+ <span
+ class="af_navigationPane_bar-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_bar-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ bar1
+ </a>
+ </span>
+ <span
+ class="af_navigationPane_bar-separator"
+ >
+ |
+ </span>
+ </span>
+ <span
+ class="af_navigationPane_bar-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_bar-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ bar2
+ </a>
+ </span>
+ <span
+ class="af_navigationPane_bar-separator"
+ >
+ |
+ </span>
+ </span>
+ <span
+ class="af_navigationPane_bar-inactive-enabled"
+ >
+
+ <span
+ class="af_navigationPane_bar-content"
+ >
+
+ <a
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:#"
+ id="uri-attr:_idXXX:_idXXX"
+ name="uri-attr:_idXXX:_idXXX"
+ >
+ bar3
+ </a>
+ </span>
+ </span>
+ </div>
+ <div
+ >
+
+ </div>the search facet
+ <span
+ class="af_breadCrumbs"
+ >
+
+ <nobr
+ >
+
+ <span
+ dir="ltr"
+ >
+
+ <a
+ class="af_breadCrumbs_step"
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:encoded-action-url:#"
+ >
+ path1
+ </a>
+ </span> > 
+ </nobr>
+ <nobr
+ >
+
+ <span
+ dir="ltr"
+ >
+
+ <a
+ class="af_breadCrumbs_step"
+ onclick="submitForm('formId',1,{source:'_idXXX:_idXXX'});return false;"
+ href="uri-attr:encoded-action-url:#"
+ >
+ path2
+ </a>
+ </span> > 
+ </nobr>
+ </span>
+ <div
+ >
+
+ </div>the infoUser facet
+ <div
+ >
+
+ </div>the messages facet
+ <div
+ >
+
+ </div>the infoStatus facet
+ <div
+ >
+
+ <h1
+ class="af_panelHeader"
+ >
+ foo
+ </h1>
+ </div>
+ <div
+ >
+
+ </div>
+ <div
+ id="panID"
+ >
+
+ <h1
+ class="af_panelHeader"
+ >
+
+ <img
+ alt=""
+ class="af_panelHeader_icon-style"
+ src="uri-attr:encoded-resource-url:icon-uri"
+ >
+
+ </img>bar bar
+ </h1>
+ </div>
+ <div
+ >
+
+ </div>
+ <div
+ >
+
+ <h1
+ class="af_panelHeader"
+ >
+ header2
+ </h1>
+ </div>
+ <div
+ >
+
+ </div>the infoFootnote facet
+ <div
+ >
+
+ </div>
+ <hr
+ size="1"
+ >
+
+ </hr>
+ <div
+ >
+
+ </div>the infoReturn facet
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+ the actions facet
+ </td>
+ </tr>
+ </table>
+ <hr
+ size="2"
+ >
+
+ </hr>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+ the appCopyright facet
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ <a
+ class="OraLink"
+ onclick="submitForm('formId',1,{source:'_idXXX'});return false;"
+ href="uri-attr:encoded-action-url:#"
+ >
+ privacy
+ </a>
+ </td>
+ </tr>
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ <a
+ class="OraLink"
+ onclick="submitForm('formId',1,{source:'_idXXX'});return false;"
+ href="uri-attr:encoded-action-url:#"
+ >
+ appAbout
+ </a>
+ </td>
+ </tr>
+ </table>
+ </span>
+</results>
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-minimalPPC-golden.xml?rev=723646&r1=723645&r2=723646&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-minimalPPC-golden.xml Fri Dec 5 00:23:23 2008
@@ -3,6 +3,24 @@
id="mainId"
>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
<div
>
@@ -34,6 +52,24 @@
header2
</h1>
</div>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
</span>
<!--AttributeTest[id,myid]-->
@@ -41,6 +77,24 @@
id="myid"
>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
<div
>
@@ -72,6 +126,24 @@
header2
</h1>
</div>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
</span>
<!--AttributeTest[shortDesc,my short desc]-->
@@ -80,6 +152,24 @@
title="my short desc"
>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
<div
>
@@ -111,6 +201,24 @@
header2
</h1>
</div>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
</span>
<!--AttributeTest[styleClass,mystyle]-->
@@ -119,6 +227,24 @@
id="mainId"
>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
<div
>
@@ -150,6 +276,24 @@
header2
</h1>
</div>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
</span>
<!--AttributeTest[onclick,null]-->
@@ -158,6 +302,24 @@
onclick="test-onclick"
>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
<div
>
@@ -189,6 +351,24 @@
header2
</h1>
</div>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
</span>
<!--AttributeTest[ondblclick,null]-->
@@ -197,6 +377,24 @@
ondblclick="test-ondblclick"
>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
<div
>
@@ -228,6 +426,24 @@
header2
</h1>
</div>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
</span>
<!--AttributeTest[onkeydown,null]-->
@@ -236,6 +452,24 @@
onkeydown="test-onkeydown"
>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
<div
>
@@ -267,6 +501,24 @@
header2
</h1>
</div>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
</span>
<!--AttributeTest[onkeypress,null]-->
@@ -275,6 +527,24 @@
onkeypress="test-onkeypress"
>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
<div
>
@@ -306,6 +576,24 @@
header2
</h1>
</div>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
</span>
<!--AttributeTest[onkeyup,null]-->
@@ -314,6 +602,24 @@
onkeyup="test-onkeyup"
>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
<div
>
@@ -345,6 +651,24 @@
header2
</h1>
</div>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
</span>
<!--AttributeTest[onmousedown,null]-->
@@ -353,6 +677,24 @@
onmousedown="test-onmousedown"
>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
<div
>
@@ -384,6 +726,24 @@
header2
</h1>
</div>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
</span>
<!--AttributeTest[onmousemove,null]-->
@@ -392,6 +752,24 @@
onmousemove="test-onmousemove"
>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
<div
>
@@ -423,6 +801,24 @@
header2
</h1>
</div>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
</span>
<!--AttributeTest[onmouseout,null]-->
@@ -431,6 +827,24 @@
onmouseout="test-onmouseout"
>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
<div
>
@@ -462,6 +876,24 @@
header2
</h1>
</div>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
</span>
<!--AttributeTest[onmouseover,null]-->
@@ -470,6 +902,24 @@
onmouseover="test-onmouseover"
>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
<div
>
@@ -501,6 +951,24 @@
header2
</h1>
</div>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
</span>
<!--AttributeTest[onmouseup,null]-->
@@ -509,6 +977,24 @@
onmouseup="test-onmouseup"
>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
<div
>
@@ -540,5 +1026,23 @@
header2
</h1>
</div>
+ <table
+ border="0"
+ cellpadding="0"
+ cellspacing="0"
+ summary=""
+ width="100%"
+ >
+
+ <tr
+ >
+
+ <td
+ align="center"
+ >
+
+ </td>
+ </tr>
+ </table>
</span>
</results>
Modified: myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-chromeType-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-chromeType-minimalPPC-golden.xml?rev=723646&r1=723645&r2=723646&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-chromeType-minimalPPC-golden.xml (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-chromeType-minimalPPC-golden.xml Fri Dec 5 00:23:23 2008
@@ -21,6 +21,10 @@
>
</img>
+ <div
+ >
+
+ </div>the search facet
</span>
<!--AttributeTest[chromeType,compact]-->
@@ -46,6 +50,10 @@
>
</img>
+ <div
+ >
+
+ </div>the search facet
</span>
<!--AttributeTest[chromeType,expanded]-->
@@ -71,5 +79,9 @@
>
</img>
+ <div
+ >
+
+ </div>the search facet
</span>
</results>