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 2015/05/20 10:19:51 UTC

svn commit: r1680482 - in /myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html: BootstrapClass.java standard/standard/tag/SheetRenderer.java

Author: lofwyr
Date: Wed May 20 08:19:51 2015
New Revision: 1680482

URL: http://svn.apache.org/r1680482
Log:
TOBAGO-1368: Create a new theme which uses Bootstrap
 - fix AssertionError

Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/BootstrapClass.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/BootstrapClass.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/BootstrapClass.java?rev=1680482&r1=1680481&r2=1680482&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/BootstrapClass.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/BootstrapClass.java Wed May 20 08:19:51 2015
@@ -72,7 +72,9 @@ public enum BootstrapClass implements Cs
   PANEL_TITLE("panel-title"),
   RADIO("radio"),
   ROW("row"),
-  SR_ONLY("sr-only");
+  SR_ONLY("sr-only"),
+  TABLE("table"),
+  TABLE_HOVER("table-hover");
 
   private final String name;
 

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java?rev=1680482&r1=1680481&r2=1680482&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java Wed May 20 08:19:51 2015
@@ -248,7 +248,8 @@ public class SheetRenderer extends Layou
     writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", false);
     writer.writeAttribute(HtmlAttributes.CELLPADDING, "0", false);
     writer.writeAttribute(HtmlAttributes.SUMMARY, "", false);
-    writer.writeClassAttribute(Classes.create(sheet, "bodyTable table table-hover")); // XXX table comes from bootstrap
+    writer.writeClassAttribute(Classes.create(sheet, "bodyTable").getStringValue() + " "
+        + BootstrapClass.TABLE.getName() + " " + BootstrapClass.TABLE_HOVER.getName()); // XXX
 
     if (columnWidths != null) {
       writer.startElement(HtmlElements.COLGROUP, null);