You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2009/02/18 15:31:03 UTC
svn commit: r745525 - in /myfaces/tobago/branches/tobago-1.0.x/theme:
scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/
scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/mozil...
Author: bommel
Date: Wed Feb 18 14:31:03 2009
New Revision: 745525
URL: http://svn.apache.org/viewvc?rev=745525&view=rev
Log:
(TOBAGO-698) In FF3 sheet footer overlaps popup
temporary workaround until TOBAGO-745 is resolved
Modified:
myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/style/tobago-sheet.css
myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago-sheet.css
myfaces/tobago/branches/tobago-1.0.x/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/tobago-sheet.css
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java?rev=745525&r1=745524&r2=745525&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java Wed Feb 18 14:31:03 2009
@@ -73,7 +73,7 @@
if (zIndex == null) {
zIndex = 0;
}
-
+ facesContext.getExternalContext().getRequestMap().put(TobagoConstants.ATTR_ZINDEX, zIndex);
final StringBuilder contentStyle = new StringBuilder();
if (component.getWidth() != null) {
contentStyle.append("width: ");
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=745525&r1=745524&r2=745525&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Wed Feb 18 14:31:03 2009
@@ -87,6 +87,7 @@
import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
import org.apache.myfaces.tobago.util.StringUtil;
import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
+import org.apache.myfaces.tobago.TobagoConstants;
import javax.faces.application.Application;
import javax.faces.component.UIColumn;
@@ -267,8 +268,16 @@
writer.startElement(HtmlConstants.DIV, null);
writer.writeIdAttribute(sheetId + "_header_div");
writer.writeClassAttribute("tobago-sheet-header-div");
+
HtmlStyleMap headerStyle = (HtmlStyleMap) attributes.get(ATTR_STYLE_HEADER);
if (headerStyle != null) {
+ Integer zIndex = (Integer) facesContext.getExternalContext().getRequestMap().get(TobagoConstants.ATTR_ZINDEX);
+ if (zIndex == null) {
+ zIndex = 1;
+ } else {
+ zIndex = zIndex + 4;
+ }
+ headerStyle.put("z-index", zIndex);
writer.writeStyleAttribute(headerStyle);
}
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/style/tobago-sheet.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/style/tobago-sheet.css?rev=745525&r1=745524&r2=745525&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/style/tobago-sheet.css (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/style/tobago-sheet.css Wed Feb 18 14:31:03 2009
@@ -39,14 +39,12 @@
margin-right: -5px;
position: relative;
/*-moz-box-sizing: border-box;*/
- z-index: 1000;
}
.tobago-sheet-header-sort-div {
position: relative;
- z-index: 1000;
margin-top: 6px;
margin-left: -13px;
margin-right: 5px;
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago-sheet.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago-sheet.css?rev=745525&r1=745524&r2=745525&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago-sheet.css (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago-sheet.css Wed Feb 18 14:31:03 2009
@@ -31,7 +31,7 @@
left: 0px;
top: 0px;
white-space: nowrap;
- z-index: 2;
+ z-index: 1;
box-sizing: border-box;
-moz-box-sizing: border-box;
@@ -157,7 +157,6 @@
}
.tobago-sheet-footer {
- z-index: 1000;
position: absolute;
left: 0px;
top: 0px;
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/tobago-sheet.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/tobago-sheet.css?rev=745525&r1=745524&r2=745525&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/tobago-sheet.css (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/tobago-sheet.css Wed Feb 18 14:31:03 2009
@@ -67,7 +67,6 @@
.tobago-sheet-footer {
- z-index: 1000;
background: #E2E2E2;
font: bold 10px arial, helvetica, sans-serif;
color: #333333;