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 2010/07/30 13:22:58 UTC
svn commit: r980740 - in
/myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main:
java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/
resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/
Author: bommel
Date: Fri Jul 30 11:22:58 2010
New Revision: 980740
URL: http://svn.apache.org/viewvc?rev=980740&view=rev
Log:
(TOBAGO-904) Problem with tc:selectOneChoice in sheet
Modified:
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/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/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=980740&r1=980739&r2=980740&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 Fri Jul 30 11:22:58 2010
@@ -266,9 +266,9 @@ public class SheetRenderer extends Layou
writer.writeClassAttribute("tobago-sheet-header-div");
HtmlStyleMap headerStyle = (HtmlStyleMap) attributes.get(ATTR_STYLE_HEADER);
+ Integer zIndex = getZIndex(facesContext);
if (headerStyle != null) {
- Integer zIndex = getZIndex(facesContext);
- headerStyle.put("z-index", zIndex);
+ headerStyle.put("z-index", zIndex+1);
writer.writeStyleAttribute(headerStyle);
}
@@ -298,22 +298,18 @@ public class SheetRenderer extends Layou
writer.endElement(HtmlConstants.DIV);
writer.endElement(HtmlConstants.DIV);
- writer.endElement(HtmlConstants.DIV);
+
if (ClientProperties.getInstance(facesContext).getUserAgent().isMsie()) {
writer.startElement(HtmlConstants.IFRAME, null);
writer.writeIdAttribute(sheetId + "_header_div" + SUBCOMPONENT_SEP + HtmlConstants.IFRAME);
writer.writeClassAttribute("tobago-sheet-header-iframe");
- final StringBuilder iFrameStyle = new StringBuilder();
- Integer zIndex = getZIndex(facesContext);
- iFrameStyle.append("z-index: ");
- iFrameStyle.append(zIndex + 2);
- iFrameStyle.append("; ");
- iFrameStyle.append(headerStyle);
- writer.writeAttribute(HtmlAttributes.STYLE, iFrameStyle.toString(), false);
+ headerStyle.put("z-index", zIndex);
+ writer.writeAttribute(HtmlAttributes.STYLE, headerStyle.toString(), false);
writer.writeAttribute(HtmlAttributes.SRC, ResourceManagerUtil.getBlankPage(facesContext), false);
writer.writeAttribute(HtmlAttributes.FRAMEBORDER, "0", false);
writer.endElement(HtmlConstants.IFRAME);
}
+ writer.endElement(HtmlConstants.DIV);
// end rendering header
}
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=980740&r1=980739&r2=980740&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 Fri Jul 30 11:22:58 2010
@@ -37,6 +37,15 @@
}
+.tobago-sheet-header-iframe {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ left: 0;
+ filter:alpha(opacity=0);
+}
+
.tobago-sheet-header-table {
padding: 0px 0px 0px 0px;
width: 100%;