myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r929992 - in /myfaces/tobago/trunk/theme: charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/ richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/opera/style/ r...
Date Thu, 01 Apr 2010 14:44:09 GMT
Author: lofwyr
Date: Thu Apr  1 14:44:08 2010
New Revision: 929992

URL: http://svn.apache.org/viewvc?rev=929992&view=rev
Log:
TOBAGO-828: 
 - Working on sheet, because of changed box-model (content-box)
 - Fixing: Header is not visible
 - Cleanup

Removed:
    myfaces/tobago/trunk/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/opera/style/
    myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/opera/style/
    myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/opera/style/
Modified:
    myfaces/tobago/trunk/theme/charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/style.css
    myfaces/tobago/trunk/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/style/style.css
    myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css
    myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
    myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
    myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/mozilla/style/style.css
    myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css
    myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css

Modified: myfaces/tobago/trunk/theme/charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/style.css?rev=929992&r1=929991&r2=929992&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/style.css
(original)
+++ myfaces/tobago/trunk/theme/charlotteville/src/main/resources/org/apache/myfaces/tobago/renderkit/html/charlotteville/standard/style/style.css
Thu Apr  1 14:44:08 2010
@@ -124,6 +124,7 @@ li.tobago-menu-selected {
 }
 
 /* Sheet ---------------------------------------------------------------------- */
+
 .tobago-sheet-header-div {
   border-bottom: 1px solid #FADC9F;
 }
@@ -163,4 +164,3 @@ li.tobago-menu-selected {
 .tobago-sheet-paging-input {
   border: 1px #660000 solid;
 }
-

Modified: myfaces/tobago/trunk/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css?rev=929992&r1=929991&r2=929992&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css
(original)
+++ myfaces/tobago/trunk/theme/richmond/src/main/resources/org/apache/myfaces/tobago/renderkit/html/richmond/standard/style/style.css
Thu Apr  1 14:44:08 2010
@@ -415,10 +415,10 @@ li.tobago-menu-selected {
   border-color: #000000;
 }
 
-/* sheet ----------------------------------------------------------------- */
+/* Sheet ----------------------------------------------------------------- */
+
 .tobago-sheet-header-div {
   border-bottom: 1px solid #d6ebff;
-
 }
 
 .tobago-sheet-header  {
@@ -428,7 +428,6 @@ li.tobago-menu-selected {
   font: bold 13px arial, helvetica, sans-serif;
 }
 
-
 .tobago-sheet-body-div {
   background: #EBEFEB;
 }
@@ -446,7 +445,6 @@ li.tobago-menu-selected {
 	color: highlighttext;
 }
 
-
 .tobago-sheet-footer {
   border-top: 1px dotted #3366CC;
   background: #ffffff;
@@ -458,4 +456,3 @@ li.tobago-menu-selected {
 .tobago-sheet-paging-input {
   border: 1px #3366CC solid;
 }
-

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=929992&r1=929991&r2=929992&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
(original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
Thu Apr  1 14:44:08 2010
@@ -226,51 +226,17 @@ public class SheetRenderer extends Layou
       writer.endElement(HtmlConstants.INPUT);
     }
 
-
     final boolean showHeader = sheet.isShowHeader();
-    if (showHeader) {
-      // begin rendering header
-      writer.startElement(HtmlConstants.DIV, null);
-      writer.writeIdAttribute(sheetId + "_header_div");
-      writer.writeClassAttribute("tobago-sheet-header-div");
-      // todo: style is empty in the moment
-      writer.writeStyleAttribute(new Style());
-
-      int columnCount = 0;
-      Measure sortMarkerWidth = getAscendingMarkerWidth(facesContext, sheet);
-      String imageAscending = contextPath + resourceManager.getImage(facesContext, "image/ascending.gif");
-      String imageDescending = contextPath + resourceManager.getImage(facesContext, "image/descending.gif");
-      String img = resourceManager.getImage(facesContext, "image/unsorted.gif", true);
-      String imageUnsorted = image1x1;
-      if (img != null) {
-        imageUnsorted = contextPath + img;
-      }
-      for (UIColumn column : renderedColumnList) {
-        renderColumnHeader(facesContext, writer, sheet, columnCount, column,
-            imageAscending, imageDescending, imageUnsorted, image1x1, sortMarkerWidth);
-        columnCount++;
-      }
-      writer.startElement(HtmlConstants.DIV, null);
-      writer.writeIdAttribute(sheetId + "_header_box_filler");
-      writer.writeClassAttribute("tobago-sheet-header-box tobago-sheet-header-filler");
-      writer.writeAttribute(HtmlAttributes.STYLE, "width: 0px", false);
-
-      writer.startElement(HtmlConstants.DIV, null);
-      writer.writeClassAttribute("tobago-sheet-header");
-      writer.flush();
-      writer.write(" ");
-      writer.endElement(HtmlConstants.DIV);
-
-      writer.endElement(HtmlConstants.DIV);
-      writer.endElement(HtmlConstants.DIV);
-      // end rendering header
-    }
 
 // BEGIN RENDER BODY CONTENT
     Style bodyStyle = new Style();
     bodyStyle.setPosition(Position.RELATIVE);
     bodyStyle.setWidth(sheet.getCurrentWidth());
-    bodyStyle.setHeight(sheetHeight.subtract(footerHeight));
+    sheetHeight = sheetHeight.subtract(footerHeight);
+    if (showHeader) {
+      sheetHeight = sheetHeight.subtract(getResourceManager().getThemeMeasure(facesContext,
sheet, "headerHeight"));
+    }
+    bodyStyle.setHeight(sheetHeight);
 
     writer.startElement(HtmlConstants.DIV, null);
     writer.writeIdAttribute(sheetId + "_data_div");
@@ -291,7 +257,6 @@ public class SheetRenderer extends Layou
     }
     sheetBodyStyle.setHeight(null);
 
-
     writer.startElement(HtmlConstants.TABLE, null);
     writer.writeAttribute(HtmlAttributes.CELLSPACING, 0);
     writer.writeAttribute(HtmlAttributes.CELLPADDING, 0);
@@ -423,7 +388,7 @@ public class SheetRenderer extends Layou
       writer.writeIdAttribute(
           sheetId + "_data_row_" + visibleIndex + "_column_filler");
       writer.writeClassAttribute("tobago-sheet-cell-outer");
-      writer.writeStyleAttribute("width: 0px;");
+      writer.writeStyleAttribute("width:0px;");
       writer.flush();
       writer.write(" ");
 
@@ -441,6 +406,11 @@ public class SheetRenderer extends Layou
 
 // END RENDER BODY CONTENT
 
+    if (showHeader) {
+      renderColumnHeaders(
+          facesContext, sheet, writer, resourceManager, contextPath, sheetId, image1x1, renderedColumnList);
+    }
+
     final String showRowRange
         = getPagingAttribute(sheet, Attributes.SHOW_ROW_RANGE);
     final String showPageRange
@@ -452,9 +422,8 @@ public class SheetRenderer extends Layou
         || isValidPagingValue(showPageRange)
         || isValidPagingValue(showDirectLinks)) {
       Style footerStyle = new Style(bodyStyle);
-      footerStyle.setPosition(null); // todo: may be removed later; later the body has not
position set.
+      footerStyle.setPosition(null);
       footerStyle.setHeight(footerHeight);
-      footerStyle.setTop(sheetHeight.subtract(footerHeight));
 
       //  "height", MessageFormat.format("{0}px", footerHeight));
       //  + " top: " + (sheetHeight - footerHeight) + "px;";
@@ -627,23 +596,21 @@ public class SheetRenderer extends Layou
     // estimate need of height-scrollbar on client, if yes we have to consider
     // this when calculating column width's
 
-    final Object forceScroolbar
-        = sheet.getAttributes().get(Attributes.FORCE_VERTICAL_SCROLLBAR);
-    if (forceScroolbar != null) {
-      if ("true".equals(forceScroolbar)) {
+    final Object forceScrollbar = sheet.getAttributes().get(Attributes.FORCE_VERTICAL_SCROLLBAR);
+    if (forceScrollbar != null) {
+      if ("true".equals(forceScrollbar)) {
         return true;
-      } else if ("false".equals(forceScroolbar)) {
+      } else if ("false".equals(forceScrollbar)) {
         return false;
-      } else if (!"auto".equals(forceScroolbar)) {
-        LOG.warn("Illegal value for attibute 'forceVerticalScrollbar' : \""
-            + forceScroolbar + "\"");
+      } else if (!"auto".equals(forceScrollbar)) {
+        LOG.warn("Illegal value for attribute 'forceVerticalScrollbar': '" + forceScrollbar
+ "'");
       }
     }
 
     if (style.getHeight() != null) {
       int first = sheet.getFirst();
       int rows = Math.min(sheet.getRowCount(), first + sheet.getRows()) - first;
-      LOG.error("20; // FIXME: make dynamic (was removed by changing the layouting");
+      LOG.error("20; // FIXME: make dynamic (was removed by changing the layout");
       Measure heightNeeded = getFooterHeight(facesContext, sheet)
               .add(getRowPadding(facesContext, sheet).add(20/*fixme*/).multiply(rows))
               .add(20); // FIXME: make dynamic (was removed by changing the layouting
@@ -749,6 +716,42 @@ public class SheetRenderer extends Layou
     writer.endElement(HtmlConstants.IMG);
   }
 
+  private void renderColumnHeaders(
+      FacesContext facesContext, UISheet sheet, TobagoResponseWriter writer, ResourceManager
resourceManager,
+      String contextPath, String sheetId, String image1x1, List<UIColumn> renderedColumnList)
throws IOException {
+    // begin rendering header
+    writer.startElement(HtmlConstants.DIV, null);
+    writer.writeIdAttribute(sheetId + "_header_div");
+    writer.writeClassAttribute("tobago-sheet-header-div");
+
+    int columnCount = 0;
+    Measure sortMarkerWidth = getAscendingMarkerWidth(facesContext, sheet);
+    String imageAscending = contextPath + resourceManager.getImage(facesContext, "image/ascending.gif");
+    String imageDescending = contextPath + resourceManager.getImage(facesContext, "image/descending.gif");
+    String img = resourceManager.getImage(facesContext, "image/unsorted.gif", true);
+    String imageUnsorted = image1x1;
+    if (img != null) {
+      imageUnsorted = contextPath + img;
+    }
+    for (UIColumn column : renderedColumnList) {
+      renderColumnHeader(facesContext, writer, sheet, columnCount, column,
+          imageAscending, imageDescending, imageUnsorted, image1x1, sortMarkerWidth);
+      columnCount++;
+    }
+    writer.startElement(HtmlConstants.SPAN, null);
+    writer.writeIdAttribute(sheetId + "_header_box_filler");
+    writer.writeClassAttribute("tobago-sheet-header-box tobago-sheet-header-filler");
+    writer.writeStyleAttribute("width:0px");
+
+    writer.startElement(HtmlConstants.SPAN, null);
+    writer.writeClassAttribute("tobago-sheet-header");
+    writer.endElement(HtmlConstants.SPAN);
+
+    writer.endElement(HtmlConstants.SPAN);
+    writer.endElement(HtmlConstants.DIV);
+    // end rendering header
+  }
+
   private void renderColumnHeader(
       FacesContext facesContext, TobagoResponseWriter writer, UISheet component,
       int columnIndex, UIColumn column, String imageAscending, String imageDescending, String
imageUnsorted,
@@ -757,9 +760,9 @@ public class SheetRenderer extends Layou
     Application application = facesContext.getApplication();
 
     List<Integer> columnWidths = component.getWidthList();
-    String divWidth = "width: " + columnWidths.get(columnIndex) + "px;";
+    String divWidth = "width:" + columnWidths.get(columnIndex) + "px;";
 
-    writer.startElement(HtmlConstants.DIV, null);
+    writer.startElement(HtmlConstants.SPAN, null);
     writer.writeIdAttribute(sheetId + "_header_box_" + columnIndex);
     writer.writeClassAttribute("tobago-sheet-header-box");
     writer.writeAttribute(HtmlAttributes.STYLE, divWidth, false);
@@ -814,7 +817,7 @@ public class SheetRenderer extends Layou
 
     String align = (String) column.getAttributes().get(Attributes.ALIGN);
 
-    writer.startElement(HtmlConstants.DIV, null);
+    writer.startElement(HtmlConstants.SPAN, null);
     writer.writeIdAttribute(sheetId + "_header_outer_" + columnIndex);
     //if (columnIndex == 0) {
     //  writer.writeClassAttribute("tobago-sheet-header"+ sorterClass + " tobago-sheet-header-first-column");
@@ -833,21 +836,19 @@ public class SheetRenderer extends Layou
       resizerClass = "tobago-sheet-header-resize tobago-sheet-header-resize-cursor";
       renderColumnHeaderLabel(facesContext, writer, column, sortMarkerWidth, align, image1x1);
     }
-    writer.endElement(HtmlConstants.DIV);
+    writer.endElement(HtmlConstants.SPAN);
 
-    writer.startElement(HtmlConstants.DIV, null);
+    writer.startElement(HtmlConstants.SPAN, null);
     writer.writeIdAttribute(sheetId + "_header_resizer_" + columnIndex);
     writer.writeClassAttribute(resizerClass);
-    writer.flush();
-    writer.write("&nbsp;");
-    writer.endElement(HtmlConstants.DIV);
+    writer.endElement(HtmlConstants.SPAN);
 // ############################################
 // ############################################
     if (sortable && !(column instanceof UIColumnSelector)) {
       if (sorterImage == null && imageUnsorted != null) {
         sorterImage = imageUnsorted;
       }
-      writer.startElement(HtmlConstants.DIV, null);
+      writer.startElement(HtmlConstants.SPAN, null);
       writer.writeClassAttribute("tobago-sheet-header-sort-div");
       if (sortTitle != null) {
         writer.writeAttribute(HtmlAttributes.TITLE, sortTitle, true);
@@ -861,12 +862,12 @@ public class SheetRenderer extends Layou
         }
         writer.endElement(HtmlConstants.IMG);
       }
-      writer.endElement(HtmlConstants.DIV);
+      writer.endElement(HtmlConstants.SPAN);
     }
 // ############################################
 // ############################################
 
-    writer.endElement(HtmlConstants.DIV);
+    writer.endElement(HtmlConstants.SPAN);
   }
 
 

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/style/style.css?rev=929992&r1=929991&r2=929992&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/style/style.css
(original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla/style/style.css
Thu Apr  1 14:44:08 2010
@@ -20,67 +20,15 @@
  * agent: mozilla
  */
 
-/* workaround for tree div problem.
-without a border the div get�s a scrollbar */
-/*
-.tobago-tree-default  {
-  border: 1px solid transparent;
-}
-*/
-
 /* Box ---------------------------------------------------------------- */
 /* fix scrollbar problem in divs without height set*/
 div.tobago-box-no-height {
   padding-bottom: 1px;
 }
 
-/* Tree -------------------------------------------------------------------- */
-
 /* toolBar -------------------------------------------------------------------- */
 
 .tobago-toolBar-button-menu-background-image {
   width: 20px;
   height: 17px;
 }
-
-/* Sheet ------------------------------------------------------------------ */
-.tobago-sheet-header-div {
-	overflow: -moz-scrollbars-none;
-	-moz-box-sizing: border-box;
-	text-align: top;
-}
-
-.tobago-sheet-header-box {
-	display: -moz-inline-box;
-	-moz-box-sizing: border-box;
-	height: 20px;
-}
-
-
-.tobago-sheet-header {
-	-moz-box-sizing: border-box;
-	-moz-box-flex: 1;
-}
-
-.tobago-sheet-header-resize {
-	line-height: 12px;
-	margin-left: -5px;
-	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;
-}
-
-.tobago-sheet-body-div {
-	-moz-box-sizing: border-box;
-}

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css?rev=929992&r1=929991&r2=929992&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css
(original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/msie/style/style.css
Thu Apr  1 14:44:08 2010
@@ -84,9 +84,3 @@ textarea.tobago-richTextEditor-body {
 a:link.tobago-toolBar-button-link, a:visited.tobago-toolBar-button-link, a:active.tobago-toolBar-button-link
{
    color: #000000;
 }
-
-/* Sheet ------------------------------------------------------------------ */
-.tobago-sheet-paging-input {
-  margin-top: -1px;
-  margin-bottom: -1px;
-}

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties?rev=929992&r1=929991&r2=929992&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
(original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
Thu Apr  1 14:44:08 2010
@@ -153,6 +153,7 @@ Sheet.leftOffset=0
 Sheet.topOffset=0
 Sheet.rightOffset=0
 Sheet.bottomOffset=0
+Sheet.scrollbarWidth=19
 
 Tab.paddingWidth=0
 Tab.paddingHeight=0

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css?rev=929992&r1=929991&r2=929992&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
(original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
Thu Apr  1 14:44:08 2010
@@ -1152,8 +1152,6 @@ iframe.tobago-menu-ie6bugfix {
 .tobago-sheet-outer-div {
   overflow: hidden;
   position: relative;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
 }
 
 .tobago-sheet-header-div {
@@ -1166,9 +1164,6 @@ iframe.tobago-menu-ie6bugfix {
   top: 0;
   white-space: nowrap;
   z-index: 2;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
-
 }
 
 .tobago-sheet-header-table {
@@ -1179,20 +1174,20 @@ iframe.tobago-menu-ie6bugfix {
 
 .tobago-sheet-header-box{
    border-color: #ddeeff #6688aa #6688aa #ddeeff;
-	/*border-color: red black green yellow;*/
 	border-style: solid;
 	border-width: 1px;
-	overflow: hidden;
-	position: relative;
+  /* 20px - borderTop 1px - borderBottom 1px = 18px */
+  height: 18px;
 	vertical-align: top;
-	display: inline;
-	height: 100%;
+  display: inline-block;
+  position: relative;
 	padding: 0;
+  overflow: hidden;
 	text-overflow: ellipsis;
-
+  z-index: 3;
 }
 
-.tobago-sheet-header{
+.tobago-sheet-header {
 	background-color: #bbccdd;
 	height: 100%;
 	overflow: hidden;
@@ -1201,6 +1196,7 @@ iframe.tobago-menu-ie6bugfix {
 	white-space: nowrap;
 	width: 100%;
   text-align: center;
+  display: inline-block;
 }
 
 .tobago-sheet-header-sortable {
@@ -1216,8 +1212,12 @@ iframe.tobago-menu-ie6bugfix {
 }
 
 .tobago-sheet-header-resize{
-	font-size: 100%;
-	height: 100%;
+  display: inline-block;
+  z-index: 4;
+  position: absolute;
+  top: 0;
+  right: -5px;
+  height: 100%;
 	overflow: hidden;
 	right: -5px;
 	top: 0;
@@ -1229,6 +1229,7 @@ iframe.tobago-menu-ie6bugfix {
 }
 
 .tobago-sheet-header-sort-div {
+  display: inline-block;
   cursor: pointer;
 	height: 100%;
 	overflow: hidden;
@@ -1288,14 +1289,11 @@ div.tobago-sheet-cell-inner span {
 }
 
 .tobago-sheet-footer {
-  z-index: 1000;
-  position: absolute;
+  position: relative;
   left: 0;
   top: 0;
   text-align: center;
   overflow: hidden;
-  box-sizing: border-box;
-  -moz-box-sizing: border-box;
 }
 
 .tobago-sheet-paging-span-left {
@@ -1306,6 +1304,7 @@ div.tobago-sheet-cell-inner span {
 .tobago-sheet-paging-span-center {
 
 }
+
 .tobago-sheet-paging-span-right {
   position : absolute;
   top: 0;
@@ -1313,12 +1312,14 @@ div.tobago-sheet-cell-inner span {
 }
 
 .tobago-sheet-paging-input {
+  position: relative;
   width: 30px;
-  height: 20px;
+  height: 16px;
   padding-top: 0;
+  padding-bottom: 0;
+  margin-top: 0;
+  margin-bottom: 0;
   text-align: center;
-  vertical-align: top;
-
 }
 
 .tobago-sheet-paging-pages-span {

Modified: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/mozilla/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/mozilla/style/style.css?rev=929992&r1=929991&r2=929992&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/mozilla/style/style.css
(original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/mozilla/style/style.css
Thu Apr  1 14:44:08 2010
@@ -64,9 +64,3 @@ label.tobago-label-default  {
   width: 15px;
   height: 12px;
 }
-
-/* sheet -------------------------------------------------------- */
-
-.tobago-sheet-header-box {
-	height: 19px;
-}

Modified: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css?rev=929992&r1=929991&r2=929992&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css
(original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css
Thu Apr  1 14:44:08 2010
@@ -43,10 +43,3 @@ label.tobago-label-default  {
 a:link.tobago-toolBar-button-link, a:visited.tobago-toolBar-button-link, a:active.tobago-toolBar-button-link
{
    color: #660000;
 }
-
-/* Sheet -------------------------------------------------------- */
-.tobago-sheet-paging-input {
-
-  height: 14px;
-
-}

Modified: myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css?rev=929992&r1=929991&r2=929992&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
(original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
Thu Apr  1 14:44:08 2010
@@ -802,8 +802,6 @@ hr.tobago-separator-default {
   left: 1px;
   height: 20px;
   border-bottom: 1px solid #ffffff;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
 }
 .tobago-sheet-header-box {
   border-color: #b8b6b6 #ffffff #d7d7d7 #b8b6b6;
@@ -870,10 +868,8 @@ hr.tobago-separator-default {
 }
 
 .tobago-sheet-paging-input {
-  height: 15px;
+  height: 11px;
   width: 25px;
-  margin-top: 0px;
-  margin-bottom: 0px;
   font: bold 10px arial, helvetica, sans-serif;
   border: 1px solid black;
 }



Mime
View raw message