You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2012/03/06 14:53:07 UTC
svn commit: r1297474 - in /myfaces/tobago/branches/tobago-tree-table: ./
tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/
tobago-theme/tobago-theme-scarborough/src/main/resources/org...
Author: lofwyr
Date: Tue Mar 6 13:53:07 2012
New Revision: 1297474
URL: http://svn.apache.org/viewvc?rev=1297474&view=rev
Log:
merged from trunk
Modified:
myfaces/tobago/branches/tobago-tree-table/ (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
Propchange: myfaces/tobago/branches/tobago-tree-table/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 6 13:53:07 2012
@@ -1 +1 @@
-/myfaces/tobago/trunk:1226794-1295032
+/myfaces/tobago/trunk:1226794-1297473
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-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-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=1297474&r1=1297473&r2=1297474&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Tue Mar 6 13:53:07 2012
@@ -101,7 +101,10 @@ public class SheetRenderer extends Layou
// Outer sheet div
writer.startElement(HtmlElements.DIV, sheet);
writer.writeIdAttribute(sheetId);
- writer.writeClassAttribute(Classes.create(sheet, "outer"));
+ final String css = Classes.create(sheet).getStringValue() + " " + Classes.create(sheet, "outer").getStringValue();
+ // todo: please remove the "outer" sub in the future,
+ // todo: it was renamed from tobago-sheet-outer to tobago-sheet because of naming conventions.
+ writer.writeClassAttribute(css);
writer.writeStyleAttribute(style);
UICommand clickAction = null;
UICommand dblClickAction = null;
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css?rev=1297474&r1=1297473&r2=1297474&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css Tue Mar 6 13:53:07 2012
@@ -865,11 +865,13 @@ hr.tobago-separator {
/* sheet ------------------------------------------------------------------ */
-.tobago-sheet-outer {
+.tobago-sheet {
overflow: hidden;
position: relative;
}
+/* XXX deprecated: .tobago-sheet-outer please use .tobago-sheet */
+
.tobago-sheet-headerDiv {
height: 20px;
width: 100%;