From 07fd55874406974686b94ab3b9915fb9b64bf594 Mon Sep 17 00:00:00 2001
From: Gaspard Bucher <gaspard@teti.ch>
Date: Wed, 20 Nov 2013 07:24:32 +0100
Subject: [PATCH] Fixed checkboxes in admin forms.

---
 app/views/columns/_form.html.erb    |  2 +-
 app/views/groups/_form.rhtml        | 29 ++++++++++++++++-------------
 app/views/relations/_form.erb       | 24 ++++++++++++++++++------
 app/views/sites/_form.erb           | 17 +++++++++++------
 app/views/users/_form.rhtml         | 12 ++++++------
 app/views/virtual_classes/_form.erb | 14 ++++++++++++--
 public/stylesheets/admin.css        |  5 ++++-
 7 files changed, 68 insertions(+), 35 deletions(-)

diff --git a/app/views/columns/_form.html.erb b/app/views/columns/_form.html.erb
index e8591a36..d776a248 100644
--- a/app/views/columns/_form.html.erb
+++ b/app/views/columns/_form.html.erb
@@ -18,7 +18,7 @@
       <td class='label'><%= _("type")%></td>
       <td class='label'><%= _("name")%></td>
       <td class='label'><%= _("index")%></td>
-      <td class='label'><%= _("vers.")%></td>
+      <td class='label'><label for='column_versioned'><%= _("vers.")%></label></td>
     </tr>
     <tr class='ruby'>
       <td><span class='constant'><%= select('column', 'role_id', Column.roles_for_form  ) %></span></td>
diff --git a/app/views/groups/_form.rhtml b/app/views/groups/_form.rhtml
index 0a658567..b15119eb 100644
--- a/app/views/groups/_form.rhtml
+++ b/app/views/groups/_form.rhtml
@@ -16,19 +16,21 @@
   <% end %>
     <table cellspacing='0'>
       <tr><td class='label'><%= _('name')%>       </td><td><%= text_field('group', 'name',        :size=>15 ) %></td></tr>
-      <tr><td class='label'><%= _('users')%>      </td><td>
-        <%= @users.inject([]) do |list, u|
-          unless u.is_anon?
-            if (@group[:id] == visitor.site.public_group_id) || (@group[:id] == visitor.site.site_group_id)
-              list << "<input type='checkbox' name='group[user_ids][]' value='#{u.id}' class='box' checked='1' disabled='1'/>#{u.login}"
-            else
-              list << "<input type='checkbox' name='group[user_ids][]' value='#{u.id}' class='box' #{(@group && @group.user_ids.include?(u[:id])) ? "checked='1'" : ''}/>#{u.login}"
+      <tr><td class='label'><%= _('users')%>      </td>
+        <td class='boxes'>
+          <p><%= @users.inject([]) do |list, u|
+            unless u.is_anon?
+              if (@group[:id] == visitor.site.public_group_id) || (@group[:id] == visitor.site.site_group_id)
+                list << "<input type='checkbox' name='group[user_ids][]' value='#{u.id}' class='box' checked='1' disabled='1'/>#{u.login}"
+              else
+                list << "<input id='user#{u.id}' type='checkbox' name='group[user_ids][]' value='#{u.id}' class='box' #{(@group && @group.user_ids.include?(u[:id])) ? "checked='1'" : ''}/><label for='user#{u.id}'>#{u.login}</label>"
+              end
             end
-          end
-          list
-        end.join(' ') %>
-        <input type='hidden' name='group[user_ids][]' value=''/>
-        </td></tr>
+            list
+          end.join('</p><p>') %></p>
+          <input type='hidden' name='group[user_ids][]' value=''/>
+          </td>
+        </tr>
       <% if !@group.new_record? -%>
       <tr><td class='label'><%= _('replace by') %></td><td><%= select('group', 'replace_by', @groups.map{|g| [g[:name], g[:id]]} , {:include_blank => true}) %></td></tr>
       <% end -%>
@@ -36,7 +38,8 @@
       <td class='label'><%= _('auto_publish') %></td>
     <td>
       <input type='hidden' name='group[auto_publish]' value=''/>
-      <input type='checkbox' name='group[auto_publish]' value='1'<%= @group.auto_publish? ? " checked='checked'" : '' %>/> <%= _('auto_publish') %>
+      <input  id='auto_publish' type='checkbox' name='group[auto_publish]' value='1'<%= @group.auto_publish? ? " checked='checked'" : '' %>/>
+      <label for='auto_publish'><%= _('auto_publish') %></label>
     </td>
     </tr>
       <tr><td colspan='2'><input type='submit' class='btn_validate' value='<%= _('validate') %>'/></td></tr>
diff --git a/app/views/relations/_form.erb b/app/views/relations/_form.erb
index c6acd161..a6c0a820 100644
--- a/app/views/relations/_form.erb
+++ b/app/views/relations/_form.erb
@@ -19,13 +19,25 @@
       <td class="dark"><%= select('relation', 'target_kpath', Node.kpaths_for_form ) %></td>
     </tr>
     <tr><td class="label" ><%= _('type') %></td>
-      <td class="light" >
-        <%= radio_button("relation", "target_unique", true , :checked => @relation.target_unique?) %> <%= _('has_one') %><br/>
-        <%= radio_button("relation", "target_unique", false, :checked => !@relation.target_unique?) %> <%= _('has_many') %>
+      <td class="light boxes" >
+        <p>
+        <%= radio_button("relation", "target_unique", true , :checked => @relation.target_unique?) %>
+        <label for='relation_target_unique_true'><%= _('has_one') %></label>
+        </p>
+        <p>
+        <%= radio_button("relation", "target_unique", false, :checked => !@relation.target_unique?) %>
+        <label for='relation_target_unique_false'><%= _('has_many') %></label>
+        </p>
       </td>
-      <td class="dark" >
-        <%= radio_button("relation", "source_unique", true , :checked => @relation.source_unique?) %> <%= _('has_one') %><br/>
-        <%= radio_button("relation", "source_unique", false, :checked => !@relation.source_unique?) %> <%= _('has_many') %>
+      <td class="dark boxes" >
+        <p>
+        <%= radio_button("relation", "source_unique", true , :checked => @relation.source_unique?) %>
+        <label for='relation_source_unique_true'><%= _('has_one') %></label>
+        </p>
+        <p>
+        <%= radio_button("relation", "source_unique", false, :checked => !@relation.source_unique?) %>
+        <label for='relation_source_unique_false'><%= _('has_many') %></label>
+        </p>
       </td>
     </tr>
     <tr><td class="label" ><%= _('role') %></td>
diff --git a/app/views/sites/_form.erb b/app/views/sites/_form.erb
index 92140ce4..cecd7b9c 100644
--- a/app/views/sites/_form.erb
+++ b/app/views/sites/_form.erb
@@ -26,12 +26,17 @@
     <tr><td class='label'><%= _('API group') %></td><td><%= select('site', 'api_group_id',  visitor.all_groups.map{|g| [g.name, g.id]}, {:include_blank => true, :selected => @site.api_group_id} ) %></td></tr>
     <% end %>
     
-    <tr><td class='label'><%= _('options') %></td><td>
-    <% Site.attributes_for_form(@site.is_alias?)[:bool].each do |sym| -%>
-    <input type='hidden' name='site[<%= sym %>]' value=''/>
-    <input type='checkbox' name='site[<%= sym %>]' value='1'<%= @site.send(sym) ? " checked='checked'" : '' %>/> <%= _(sym.to_s) %><br/>
-    <% end -%>
-    </td></tr>
+    <tr><td class='label'><%= _('options') %></td>
+      <td class='boxes'>
+      <% Site.attributes_for_form(@site.is_alias?)[:bool].each do |sym| -%>
+      <p>
+        <input type='hidden' name='site[<%= sym %>]' value=''/>
+        <input  id='site_<%= sym %>' type='checkbox' name='site[<%= sym %>]' value='1'<%= @site.send(sym) ? " checked='checked'" : '' %>/>
+        <label for='site_<%= sym %>'><%= _(sym.to_s) %></label>
+      </p>
+      <% end -%>
+      </td>
+    </tr>
     <% if !@site.new_record? && !@site.is_alias? %>
     <tr><td class='label'><%= _('action') %></td><td id='messages<%= @site[:id] %>'>
       <ul>
diff --git a/app/views/users/_form.rhtml b/app/views/users/_form.rhtml
index 3671aaa8..284f7843 100644
--- a/app/views/users/_form.rhtml
+++ b/app/views/users/_form.rhtml
@@ -34,15 +34,15 @@
       <tr><td class='label'><%= _("time zone")%>  </td><td><select name='user[time_zone]'><%= options_for_select([''] + TZInfo::Timezone.all_identifiers, @user[:time_zone] || '') %></select></td></tr>
       <tr><td class='label'><%= _("login_attempt_count")%>  </td><td><%= check_box('user', 'login_attempt_count', {}, 0, @user.login_attempt_count) %> reset</td></tr>
     <% unless @user.is_anon? -%>
-      <tr><td class='label'><%= _("groups")%>     </td><td>
-      <%= @groups.inject([]) do |list, g|
+      <tr><td class='label'><%= _("groups")%>     </td><td class='boxes'>
+      <p><%= @groups.inject([]) do |list, g|
         if g[:id] == visitor.site.public_group_id || g[:id] == visitor.site.site_group_id
-          list << "<input type='checkbox' name='user[group_ids][]' value='#{g.id}' class='box' checked='1' disabled='1' />#{g.name}"
+          list << "<input id='group#{g.id}' type='checkbox' name='user[group_ids][]' value='#{g.id}' class='box' checked='1' disabled='1' /><label for='group#{g.id}'>#{g.name}</label>"
         else
-          list << "<input type='checkbox' name='user[group_ids][]' value='#{g.id}' class='box' #{(@user && @user.group_set_ids.include?(g[:id])) ? "checked='1'" : ''}/>#{g.name}"
+          list << "<input id='group#{g.id}' type='checkbox' name='user[group_ids][]' value='#{g.id}' class='box' #{(@user && @user.group_set_ids.include?(g[:id])) ? "checked='1'" : ''}/><label for='group#{g.id}'>#{g.name}</label>"
         end
         list
-      end.join(" ") %>
+      end.join("</p><p>") %></p>
       <input type='hidden' name='user[group_ids][]' value=''/>
       </td></tr>
     <% end -%>
@@ -62,7 +62,7 @@
         <input type='checkbox' name='user[use_acls]' value='1' class='box'<%= @user.use_acls? ? " checked='checked'" : ''%>/>
       </td>
     </tr>
-    <tr><td colspan='2'><%= node_form %></td></tr>
+    <tr><td colspan='2' class='nform'><%= node_form %></td></tr>
     <tr><td colspan='2'><p class='btn_validate'><input type='submit' value='<%= _('validate') %>'/></p></td></tr>
   </table>
   </form>
diff --git a/app/views/virtual_classes/_form.erb b/app/views/virtual_classes/_form.erb
index ffe21b43..35a62eca 100644
--- a/app/views/virtual_classes/_form.erb
+++ b/app/views/virtual_classes/_form.erb
@@ -40,8 +40,18 @@
     <tr><td class='label'><%= _('prop eval') %></td><td><%= text_area('virtual_class', 'prop_eval', :rows => 2, :cols => 30) %></td></tr>
 
     <tr><td class='label'><%= _('edit group') %></td><td><%= select('virtual_class', 'create_group_id',  visitor.all_groups.map{|g| [g.name, g.id]} ) %></td></tr>
-    <tr><td class='label'><%= _('auto create discussion')%></td><td><%= check_box('virtual_class', 'auto_create_discussion') %></td></tr>
-    <tr><td class='label'><%= _('monolingual') %></td><td><%= check_box('virtual_class', 'monolingual') %></td></tr>
+    <tr>
+      <td class='label'>
+        <label for='virtual_class_auto_create_discussion'><%= _('auto create discussion')%></label>
+      </td>
+      <td><%= check_box('virtual_class', 'auto_create_discussion') %></td>
+    </tr>
+    <tr>
+      <td class='label'>
+        <label for='virtual_class_monolingual'><%= _('monolingual') %></label>
+      </td>
+      <td><%= check_box('virtual_class', 'monolingual') %></td>
+    </tr>
     <tr><td class='label'><%= _('content_type')%></td><td><%= text_field('virtual_class', 'content_type') %></td></tr>
 <% end -%>
     <tr><td class='label'><%= _('icon')%>      </td><td><%= text_field('virtual_class', 'icon',        :size=>15 ) %></td></tr>
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 0e6e45c9..c504234d 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -97,7 +97,7 @@ ul.actions select { width:186px; }
 .actions .errors li { margin-left:0.4em; background:inherit; line-height:1.2em;}
 
 /* forms */
-label { font-size:0.9em; font-weight:bold; display:block; color:#5C1515; margin:10px 0 5px; clear:left;}
+.nform label { font-size:0.9em; font-weight:bold; display:block; color:#5C1515; margin:10px 0 5px; clear:left;}
 
 .comment { font-style:italic; color:#777}
 .comment strong {font-weight:bold; font-style:italic;}
@@ -110,3 +110,6 @@ label { font-size:0.9em; font-weight:bold; display:block; color:#5C1515; margin:
 .virtual_class .nav.constant {color: #003F9D;}
 .role .constant {color:#0C9616;}
 .role .nav.constant {color:#05540B;}
+.boxes p {margin:2px 0}
+.boxes input {}
+.boxes label {padding-left:8px; }
\ No newline at end of file