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/11/07 09:50:44 UTC

svn commit: r712086 [1/2] - in /myfaces/trinidad/trunk_1.2.x/trinidad-impl/src: main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/

Author: matzew
Date: Fri Nov  7 00:50:40 2008
New Revision: 712086

URL: http://svn.apache.org/viewvc?rev=712086&view=rev
Log:
TRINIDAD-1265 - safari:buttons in navigation pane display only vertically

Thx to Agam Dass for his patch

Modified:
    myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
    myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneBar-minimalSaf-golden.xml
    myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneButtons-minimalSaf-golden.xml
    myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneTabs-minimalSaf-golden.xml
    myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalSaf-golden.xml
    myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPageHeader-minimalSaf-golden.xml

Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java?rev=712086&r1=712085&r2=712086&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java Fri Nov  7 00:50:40 2008
@@ -787,6 +787,13 @@
     if (!isList)
     {
       appendedStyle = "display: inline;"; // style to make the table inline
+      
+      // In Safari and webkit browsers display:inline doesn't work as expected, and 
+      // display:inline-block need to be used to make the table inline.
+      if (arc.getAgent().getAgentName() == Agent.AGENT_WEBKIT)
+      {
+        appendedStyle = "display: inline-block;";
+      }
     }
     writeInlineStyles(rw, toString(itemData.get("inlineStyle")),
       appendedStyle); // user's style + what we must have on top of it
@@ -976,7 +983,14 @@
     rw.startElement("table", null);
     OutputUtils.renderLayoutTableAttributes(context, arc, "0", null);
     String appendedStyle = null;
-    appendedStyle = "display: inline;"; // style to make the table inline
+    appendedStyle = "display: inline;"; // style to make the table inline    
+      
+    // In Safari and webkit browsers display:inline doesn't work as expected, and 
+    // display:inline-block need to be used to make the table inline.
+    if (arc.getAgent().getAgentName() == Agent.AGENT_WEBKIT)
+    {
+      appendedStyle = "display: inline-block;";
+    }
     writeInlineStyles(rw, null, appendedStyle);
     rw.startElement("tbody", null);
     _writeInlineTbodyStyles(arc, rw);
@@ -1210,8 +1224,17 @@
   {
     rw.startElement("table", null);
     OutputUtils.renderLayoutTableAttributes(context, arc, "0", null);
+    
+    String appendedStyle = "display: inline;";    
+      
+    // In Safari and webkit browsers display:inline doesn't work as expected, and 
+    // display:inline-block need to be used to make the table inline.
+    if (arc.getAgent().getAgentName() == Agent.AGENT_WEBKIT)
+    {
+      appendedStyle = "display: inline-block;";
+    }
     writeInlineStyles(rw, toString(itemData.get("inlineStyle")),
-      "display: inline;"); // user's style + what we must have on top of it
+      appendedStyle); // user's style + what we must have on top of it
     rw.writeAttribute("title", itemData.get("shortDesc"), null);
     StringBuilder itemStyleClass = new StringBuilder();
     String userStyleClass = toString(itemData.get("styleClass"));

Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneBar-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneBar-minimalSaf-golden.xml?rev=712086&r1=712085&r2=712086&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneBar-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneBar-minimalSaf-golden.xml Fri Nov  7 00:50:40 2008
@@ -9,7 +9,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -53,7 +53,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -97,7 +97,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -140,7 +140,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -184,7 +184,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -228,7 +228,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -272,7 +272,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -316,7 +316,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -360,7 +360,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -404,7 +404,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -448,7 +448,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -492,7 +492,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -536,7 +536,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -580,7 +580,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -624,7 +624,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -668,7 +668,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -712,7 +712,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -756,7 +756,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -800,7 +800,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -844,7 +844,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -888,7 +888,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -932,7 +932,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -976,7 +976,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1020,7 +1020,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1064,7 +1064,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1108,7 +1108,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1152,7 +1152,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1196,7 +1196,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1240,7 +1240,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1284,7 +1284,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1328,7 +1328,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1372,7 +1372,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1416,7 +1416,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1460,7 +1460,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1504,7 +1504,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1548,7 +1548,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1592,7 +1592,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1636,7 +1636,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1680,7 +1680,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_bar-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           

Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneButtons-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneButtons-minimalSaf-golden.xml?rev=712086&r1=712085&r2=712086&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneButtons-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneButtons-minimalSaf-golden.xml Fri Nov  7 00:50:40 2008
@@ -9,7 +9,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -53,7 +53,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -97,7 +97,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -140,7 +140,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -184,7 +184,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -228,7 +228,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -272,7 +272,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -316,7 +316,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -360,7 +360,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -403,7 +403,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -447,7 +447,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -491,7 +491,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -535,7 +535,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -579,7 +579,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -623,7 +623,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -667,7 +667,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -711,7 +711,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -755,7 +755,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -799,7 +799,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -843,7 +843,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -887,7 +887,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -931,7 +931,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -975,7 +975,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1019,7 +1019,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1063,7 +1063,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1107,7 +1107,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1151,7 +1151,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1195,7 +1195,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1239,7 +1239,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1283,7 +1283,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1327,7 +1327,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1371,7 +1371,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1415,7 +1415,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1459,7 +1459,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1503,7 +1503,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1547,7 +1547,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1591,7 +1591,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1635,7 +1635,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1679,7 +1679,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1723,7 +1723,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-active-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1767,7 +1767,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1811,7 +1811,7 @@
              cellpadding="0"
              cellspacing="0"
              class="af_navigationPane_buttons-inactive-enabled"
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           

Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneTabs-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneTabs-minimalSaf-golden.xml?rev=712086&r1=712085&r2=712086&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneTabs-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/navigationPaneTabs-minimalSaf-golden.xml Fri Nov  7 00:50:40 2008
@@ -9,7 +9,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -155,7 +155,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -301,7 +301,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -455,7 +455,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -601,7 +601,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -747,7 +747,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -902,7 +902,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1048,7 +1048,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1194,7 +1194,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1349,7 +1349,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1495,7 +1495,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1641,7 +1641,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1796,7 +1796,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -1942,7 +1942,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -2088,7 +2088,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -2243,7 +2243,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -2389,7 +2389,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -2535,7 +2535,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -2690,7 +2690,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -2836,7 +2836,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -2982,7 +2982,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -3137,7 +3137,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -3283,7 +3283,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -3429,7 +3429,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -3584,7 +3584,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -3730,7 +3730,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -3876,7 +3876,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -4031,7 +4031,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -4177,7 +4177,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -4323,7 +4323,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -4478,7 +4478,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -4624,7 +4624,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -4770,7 +4770,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -4925,7 +4925,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -5071,7 +5071,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -5217,7 +5217,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -5372,7 +5372,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -5518,7 +5518,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           
@@ -5664,7 +5664,7 @@
              cellpadding="0"
              cellspacing="0"
              class=""
-             style="display: inline;"
+             style="display: inline-block;"
              summary=""
             >
           

Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalSaf-golden.xml?rev=712086&r1=712085&r2=712086&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelPage-facets-minimalSaf-golden.xml Fri Nov  7 00:50:40 2008
@@ -76,7 +76,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class="af_navigationPane_buttons-inactive-enabled"
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >
                   
@@ -120,7 +120,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class="af_navigationPane_buttons-inactive-enabled"
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >
                   
@@ -164,7 +164,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class="af_navigationPane_buttons-inactive-enabled"
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >
                   
@@ -214,7 +214,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class=""
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >
                   
@@ -360,7 +360,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class=""
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >
                   
@@ -506,7 +506,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class=""
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >
                   
@@ -679,7 +679,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class="af_navigationPane_bar-inactive-enabled"
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >
                   
@@ -723,7 +723,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class="af_navigationPane_bar-inactive-enabled"
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >
                   
@@ -767,7 +767,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class="af_navigationPane_bar-inactive-enabled"
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >
                   
@@ -1403,7 +1403,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class="af_navigationPane_buttons-inactive-enabled"
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >
                   
@@ -1447,7 +1447,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class="af_navigationPane_buttons-inactive-enabled"
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >
                   
@@ -1491,7 +1491,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class="af_navigationPane_buttons-inactive-enabled"
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >
                   
@@ -1541,7 +1541,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class=""
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >
                   
@@ -1687,7 +1687,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class=""
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >
                   
@@ -1833,7 +1833,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class=""
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >
                   
@@ -2006,7 +2006,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class="af_navigationPane_bar-inactive-enabled"
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >
                   
@@ -2050,7 +2050,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class="af_navigationPane_bar-inactive-enabled"
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >
                   
@@ -2094,7 +2094,7 @@
                      cellpadding="0"
                      cellspacing="0"
                      class="af_navigationPane_bar-inactive-enabled"
-                     style="display: inline;"
+                     style="display: inline-block;"
                      summary=""
                     >