svn commit: r1688582 - in /myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main: java/org/apache/myfaces/tobago/renderkit/html/ java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ resources/org/apache/myface...

[lo...@apache.org]

Author: lofwyr
Date: Wed Jul  1 08:08:43 2015
New Revision: 1688582

URL: http://svn.apache.org/r1688582
Log:
TOBAGO-1470: fix layout of tc:date

Modified:
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/TobagoClass.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/DateRenderer.java
    myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/TobagoClass.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/TobagoClass.java?rev=1688582&r1=1688581&r2=1688582&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/TobagoClass.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/TobagoClass.java Wed Jul  1 08:08:43 2015
@@ -28,12 +28,13 @@ import org.apache.myfaces.tobago.renderk
  */
 public enum TobagoClass implements CssItem {
 
-  POPUP("tobago-popup"),
-  MESSAGES("tobago-messages");
+  MESSAGES("tobago-messages"),
+  PANEL("tobago-panel"),
+  POPUP("tobago-popup");
 
   private final String name;
 
-  private TobagoClass(final String name) {
+  TobagoClass(final String name) {
     this.name = 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/DateRenderer.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/DateRenderer.java?rev=1688582&r1=1688581&r2=1688582&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/DateRenderer.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/DateRenderer.java Wed Jul  1 08:08:43 2015
@@ -29,6 +29,7 @@ import org.apache.myfaces.tobago.renderk
 import org.apache.myfaces.tobago.renderkit.html.HtmlButtonTypes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
 import org.apache.myfaces.tobago.renderkit.html.JsonUtils;
+import org.apache.myfaces.tobago.renderkit.html.TobagoClass;
 import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 import org.slf4j.Logger;
@@ -72,6 +73,9 @@ public class DateRenderer extends InRend
     final String pattern = date.getPattern();
 
     writer.startElement(HtmlElements.DIV, null);
+    writer.writeClassAttribute(TobagoClass.PANEL);
+
+    writer.startElement(HtmlElements.DIV, null);
     writer.writeClassAttribute(BootstrapClass.INPUT_GROUP);
 
     super.encodeBegin(facesContext, component);
@@ -105,5 +109,6 @@ public class DateRenderer extends InRend
 
     writer.endElement(HtmlElements.DIV);
 
+    writer.endElement(HtmlElements.DIV);
   }
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css
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/style/tobago.css?rev=1688582&r1=1688581&r2=1688582&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/style/tobago.css (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/style/tobago.css Wed Jul  1 08:08:43 2015
@@ -47,7 +47,9 @@
 }
 
 .tobago-flexLayout > .form-control:nth-child(n+2),
-.tobago-flexLayout > .tobago-out:nth-child(n+2) {
+.tobago-flexLayout > .input-group:nth-child(n+2),
+.tobago-flexLayout > .tobago-out:nth-child(n+2),
+.tobago-flexLayout > .tobago-panel:nth-child(n+2) {
     margin-left: 5px;
 }