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/21 14:35:23 UTC
svn commit: r1680857 - in
/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main:
java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/
resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/
Author: lofwyr
Date: Thu May 21 12:35:22 2015
New Revision: 1680857
URL: http://svn.apache.org/r1680857
Log:
TOBAGO-1368: Create a new theme which uses Bootstrap
- fix Sheet Header
- fix row height
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
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js
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=1680857&r1=1680856&r2=1680857&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 Thu May 21 12:35:22 2015
@@ -771,7 +771,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, "headerTable table")); // XXX table comes from bootstrap
+ writer.writeClassAttribute(
+ Classes.create(sheet, "headerTable").getStringValue() + " " + BootstrapClass.TABLE.getName());
writeColgroup(writer, columnWidths);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js?rev=1680857&r1=1680856&r2=1680857&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js Thu May 21 12:35:22 2015
@@ -237,17 +237,6 @@ Tobago.Sheet.prototype.doKeyEvent = func
Tobago.Sheet.setup2 = function (sheets) {
- // set the height of the header-cells to the height of the td (height: 100% doesn't work)
- jQuery(sheets).find(".tobago-sheet-headerCell").each(function () {
- var div = jQuery(this);
- div.height(div.parent().height());
- });
-
- // set the height of the header-cells to the height of the td (height: 100% doesn't work)
- jQuery(sheets).children(".tobago-sheet-headerDiv").each(function () {
- jQuery(this).height(jQuery(this).children(":first").height());
- });
-
jQuery(sheets).each(function() {
Tobago.Sheet.resetInputFieldSize(jQuery(this));
});