svn commit: r1198815 - in /tapestry/tapestry5/trunk/tapestry-core/src/main: java/org/apache/tapestry5/corelib/components/Checklist.java resources/org/apache/tapestry5/default.css

[drobiazko]

Author: drobiazko
Date: Mon Nov  7 17:04:47 2011
New Revision: 1198815

URL: http://svn.apache.org/viewvc?rev=1198815&view=rev
Log:
TAP5-1550: Position labels on the left of the checkboxes.

Modified:
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checklist.java
    
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/default.css

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checklist.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checklist.java?rev=1198815&r1=1198814&r2=1198815&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checklist.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checklist.java
 Mon Nov  7 17:04:47 2011
@@ -114,10 +114,6 @@ public class Checklist extends AbstractF
         {
             final String clientId = 
javaScriptSupport.allocateClientId(componentResources);
 
-            writer.element("label", "for", clientId);
-            writer.write(model.getLabel());
-            writer.end();
-
             final String clientValue = encoder.toClient(model.getValue());
 
             final Element checkbox = writer.element("input", "type", 
"checkbox", "id", clientId, "name", getControlName(), "value", clientValue);
@@ -127,6 +123,10 @@ public class Checklist extends AbstractF
                 checkbox.attribute("checked", "checked");
             }
             writer.end();
+
+            writer.element("label", "for", clientId);
+            writer.write(model.getLabel());
+            writer.end();
         }
     }
 

Modified: 
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/default.css
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/default.css?rev=1198815&r1=1198814&r2=1198815&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/default.css
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/default.css
 Mon Nov  7 17:04:47 2011
@@ -210,12 +210,8 @@ DIV.t-checklist-row {
 }
 
 DIV.t-checklist-row LABEL {
-    width: 150px;
-    display: block;
-    float: left;
     text-align: right;
-    clear: left;
-    padding-right: 3px;
+    padding-left: 5px;
     vertical-align: middle;
 }