From 3a9cc85e3691e8a15566132c38a08fed52ed719f Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Tue, 21 Jan 2014 13:08:44 +0100
Subject: [PATCH] Fixed#102 - added labels to checkbox and radiobox.

---
 app/assets/javascripts/app/views/generic/checkbox.jst.eco | 4 ++--
 app/assets/javascripts/app/views/generic/radio.jst.eco    | 2 +-
 app/assets/stylesheets/zzz.css                            | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/app/views/generic/checkbox.jst.eco b/app/assets/javascripts/app/views/generic/checkbox.jst.eco
index 8c3eca81c..a9577fff7 100644
--- a/app/assets/javascripts/app/views/generic/checkbox.jst.eco
+++ b/app/assets/javascripts/app/views/generic/checkbox.jst.eco
@@ -1,5 +1,5 @@
-<div class="<%= @attribute.class %>">
+<div class="<%= @attribute.class %> checkbox">
 <% for row in @attribute.options: %>
-    <input type="checkbox" value="<%= row.value %>" name="<%= @attribute.name %>" <%= row.checked %>> <%= row.name %> <% if row.note: %>- <%= row.note %><% end %><br/>
+    <label><input type="checkbox" value="<%= row.value %>" name="<%= @attribute.name %>" <%= row.checked %>> <%= row.name %> <% if row.note: %>- <%= row.note %><% end %></label>
 <% end %>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/generic/radio.jst.eco b/app/assets/javascripts/app/views/generic/radio.jst.eco
index 9466024a4..b7fec4300 100644
--- a/app/assets/javascripts/app/views/generic/radio.jst.eco
+++ b/app/assets/javascripts/app/views/generic/radio.jst.eco
@@ -1,5 +1,5 @@
 <div class="<%= @attribute.class %>">
 <% for row in @attribute.options: %>
-    <input type="radio" value="<%= row.value %>" name="<%= @attribute.name %>" <%= row.checked %>> <%= row.name %> <% if row.note: %>- <%= row.note %><% end %><br/>
+    <label><input type="radio" value="<%= row.value %>" name="<%= @attribute.name %>" <%= row.checked %>> <%= row.name %> <% if row.note: %>- <%= row.note %><% end %></label>
 <% end %>
 </div>
diff --git a/app/assets/stylesheets/zzz.css b/app/assets/stylesheets/zzz.css
index 175e3ecf5..d3e9a7407 100644
--- a/app/assets/stylesheets/zzz.css
+++ b/app/assets/stylesheets/zzz.css
@@ -434,6 +434,12 @@ h5 {
   width: 130px;
   margin-top: 7px;
 }
+.form-horizontal .form-group .checkbox label {
+  text-align: left;
+  width: 100%;
+  margin-top: 0;
+  margin-bottom: 4px;
+}
 
 /*
  * bootstrap changes