svn commit: r985866 - in /myfaces/tobago/trunk: tobago-example/tobago-example-demo/src/main/webapp/ tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/ tobago-theme/tobago-theme-...

[lo...@apache.org]

Author: lofwyr
Date: Mon Aug 16 10:46:50 2010
New Revision: 985866

URL: http://svn.apache.org/viewvc?rev=985866&view=rev
Log:
TOBAGO-606: layout
 -  improve separator

Modified:
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/footer.xhtml
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
    myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
    myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/footer.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/footer.xhtml?rev=985866&r1=985865&r2=985866&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/footer.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/footer.xhtml Mon Aug 16 10:46:50 2010
@@ -29,9 +29,9 @@
       <tc:gridLayout columns="fixed;fixed;fixed;fixed;fixed;*" rows="fixed;fixed"/>
     </f:facet>
 
-    <tc:cell spanX="6">
-      <tc:separator/>
-    </tc:cell>
+    <tc:separator>
+      <tc:gridLayoutConstraint columnSpan="6"/>
+    </tc:separator>
 
     <tc:button immediate="true"
                image="image/prev.gif"

Modified: myfaces/tobago/trunk/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/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css?rev=985866&r1=985865&r2=985866&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css Mon Aug 16 10:46:50 2010
@@ -711,14 +711,22 @@ span.tobago-progress {
   position: absolute;
 }
 
-.tobago-separator hr {
-  border: 1px inset #000000;
+/* without label */
+
+hr.tobago-separator {
+  border: 1px inset #ddeeff;
+  height: 0;
   margin: 0;
+  position: absolute;
 }
 
+/* with label */
+
 .tobago-separator-start hr {
+  border: 1px inset #ddeeff;
+  height: 0;
+  margin: 0;
   width: 20px;
-  position: static;
 }
 
 .tobago-separator-label {
@@ -730,7 +738,15 @@ span.tobago-progress {
 
 .tobago-separator-end {
   width: 100%;
+/*
   position: static;
+*/
+}
+
+.tobago-separator-end hr {
+  border: 1px inset #ddeeff;
+  height: 0;
+  margin: 0;
 }
 
 /* sheet ------------------------------------------------------------------ */

Modified: myfaces/tobago/trunk/tobago-theme/tobago-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/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css?rev=985866&r1=985865&r2=985866&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css Mon Aug 16 10:46:50 2010
@@ -423,9 +423,9 @@ tobago-selectOneChoice-markup-readonly {
 
 /* separator ------------------------------------------------------------------- */
 
-.tobago-separator hr {
-  border: 0 solid #000000;
-  border-bottom-width: 1px;
+hr.tobago-separator, .tobago-separator-start hr, .tobago-separator-end hr {
+  border-top: 1px solid #000000;
+  border-bottom: 0 solid #000000;
 }
 
 /* sheet -------------------------------------------------------- */

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java?rev=985866&r1=985865&r2=985866&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java Mon Aug 16 10:46:50 2010
@@ -86,6 +86,7 @@ public class SeparatorRenderer extends L
       writer.writeIdAttribute(separator.getClientId(facesContext));
       writer.writeClassAttribute(Classes.create(component));
       Style style = new Style(facesContext, separator);
+      style.setHeight(Measure.ZERO); // not nice
       writer.writeStyleAttribute(style);
       writer.endElement(HtmlElements.HR);
     }