Adds styles and missing i18n for valuator groups 👨🏻‍🎨

app/controllers/admin/valuators_controller.rb

@@ -31,7 +31,7 @@ class Admin::ValuatorsController < Admin::BaseController
   def update
     @valuator = Valuator.find(params[:id])
     if @valuator.update(valuator_params)
-      notice = "Valuator updated successfully"
+      notice = t("admin.valuators.form.updated")
       redirect_to [:admin, @valuator], notice: notice
     else
       render :edit

app/views/admin/budget_investments/edit.html.erb

@@ -9,7 +9,7 @@
    <%= hidden_field_tag filter_name, filter_value %>
   <% end %>
 
-  <div class="row">
+  <div class="row expanded">
     <div class="small-12 column">
       <%= f.text_field :title, maxlength: Budget::Investment.title_max_length %>
     </div>
@@ -26,23 +26,27 @@
     </div>
 
     <div class="small-12 column">
+      <div class="small-12 medium-6">
         <%= f.text_field :external_url %>
       </div>
 
-    <div class="small-12 column">
+      <div class="small-12 medium-6">
         <%= f.select :heading_id, budget_heading_select_options(@budget), include_blank: t("admin.budget_investments.edit.select_heading") %>
       </div>
     </div>
+  </div>
 
-  <h2 id="classification"><%= t("admin.budget_investments.edit.classification") %></h2>
+  <div class="row expanded margin-top">
-
-  <div class="row">
 
     <div class="small-12 column">
+      <h2 id="classification"><%= t("admin.budget_investments.edit.classification") %></h2>
+
+      <div class="small-12 medium-6">
         <%= f.select(:administrator_id,
                        @admins.collect{ |a| [a.name_and_email, a.id ] },
                        { include_blank: t("admin.budget_investments.edit.undefined") }) %>
       </div>
+    </div>
 
 
     <div class="small-12 column">
@@ -59,26 +63,27 @@
                         class: 'js-tag-list' %>
     </div>
 
-    <p>Groups</p>
+    <div class="small-12 column margin-top">
-    <div class="small-12 column">
+      <%= f.label :valuator_ids, t("admin.budget_investments.edit.user_groups") %>
-      <%= f.label :valuator_ids, "Groups assigned" %>
+      <ul>
       <%= f.collection_check_boxes :valuator_group_ids, @valuator_groups, :id, :name do |group| %>
-        
+        <li><%= group.label(title: group.object.name) { group.check_box + truncate(group.object.name, length: 60) } %></li>
-        <%= group.label(title: group.object.name) { group.check_box + truncate(group.object.name, length: 60) } %>
       <% end %>
+      </ul>
     </div>
 
-    <p>Valuators</p>
     <div class="small-12 column">
+      <hr>
       <%= f.label :valuator_ids, t("admin.budget_investments.edit.assigned_valuators") %>
-
+      <ul>
         <%= f.collection_check_boxes :valuator_ids, @valuators, :id, :email do |b| %>
-          <%= b.label(title: valuator_label(b.object)) { b.check_box + truncate(b.object.description_or_email, length: 60) } %>
+            <li><%= b.label(title: valuator_label(b.object)) { b.check_box + truncate(b.object.description_or_email, length: 60) } %></li>
         <% end %>
+      </ul>
     </div>
   </div>
 
-  <div class="row margin-top">
+  <div class="row expanded margin-top">
     <% if @investment.incompatible? || @investment.winner? %>
     <div class="small-12 medium-3 column">
       <h2 id="incompatible"><%= t("admin.budget_investments.edit.compatibility") %></h2>
@@ -97,7 +102,7 @@
     </div>
   </div>
 
-  <div class="margin-top">
+  <div class="small-12 column margin-top">
     <%= f.submit(class: "button", value: t("admin.budget_investments.edit.submit_button")) %>
   </div>
 <% end %>

app/views/admin/budget_investments/show.html.erb

@@ -23,7 +23,7 @@
 </p>
 
 <p id="assigned_valuator_groups">
-  <strong>Valuator Groups:</strong>
+  <strong><%= t("admin.budget_investments.show.valuator_groups") %>:</strong>
   <% if @investment.valuator_groups.any? %>
     <%= @investment.valuator_groups.collect(&:name).join(', ') %>
   <% else %>

app/views/admin/valuator_groups/_group.html.erb

@@ -1,18 +1,17 @@
-<div>
+<tr>
-  Name: <%= group.name %>
+  <td>
-</div>
+    <%= link_to group.name, admin_valuator_group_path(group) %>
+  </td>
+  <td>
+    <!-- Pending add members list COUNT -->
+  </td>
+  <td>
+    <%= link_to t("admin.actions.delete"),
+                admin_valuator_group_path(group),
+                method: :delete, class: "button hollow alert" %>
 
-<div>
+    <%= link_to t("admin.actions.edit"),
-  Members:
+                edit_admin_valuator_group_path(group),
-</div>
+                class: "button hollow" %>
-
+  </td>
-<div>
+</tr>
-  Edit:
-  <%= link_to "Edit", edit_admin_valuator_group_path(group) %>
-</div>
-
-<div>
-  Destoy:
-  <%= link_to "Destroy", admin_valuator_group_path(group), method: :delete %>
-</div>
-<br/>

app/views/admin/valuator_groups/edit.html.erb

@@ -1,4 +1,9 @@
+<%= back_link_to admin_valuator_groups_path %>
+
+<div class="small-12 medium-6 margin-top">
   <%= form_for [:admin, @group] do |f| %>
-  <%= f.text_field :name %>
+    <%= f.label :name, t("admin.valuator_groups.form.name") %>
-  <%= f.submit %>
+    <%= f.text_field :name, label: false %>
+    <%= f.submit t("admin.valuator_groups.form.edit"), class: "button success" %>
   <% end %>
+</div>

app/views/admin/valuator_groups/index.html.erb

@@ -1,4 +1,23 @@
-<%= render partial: 'group', collection: @groups %>
+<h2 class="inline-block"><%= t("admin.valuator_groups.index.title") %></h2>
 
-There are <%= @groups.count %> groups of users
+<%= link_to t("admin.valuator_groups.index.new"), new_admin_valuator_group_path, class: "button float-right" %>
-<%= link_to "Nuevo", new_admin_valuator_group_path %>
+
+<% if @groups.any? %>
+  <h3 class="margin">There are <%= @groups.count %> groups of users</h3>
+
+  <table>
+    <thead>
+      <th scope="col"><%= t("admin.valuator_groups.index.name") %></th>
+      <th scope="col"><%= t("admin.valuator_groups.index.members") %></th>
+      <th scope="col" class="small-3"><%= t("admin.shared.actions") %></th>
+    </thead>
+    <tbody>
+      <%= render partial: 'group', collection: @groups %>
+    </tbody>
+  </table>
+
+<% else %>
+  <div class="callout primary">
+    <%= t("admin.valuator_groups.index.no_groups") %>
+  </div>
+<% end %>

app/views/admin/valuator_groups/new.html.erb

@@ -1,6 +1,9 @@
-<%= form_for [:admin, @group] do |f| %>
+<%= back_link_to admin_valuator_groups_path %>
-  <%= f.text_field :name %>
-  <%= f.submit %>
-<% end %>
 
-<%= link_to "Go back", admin_valuator_groups_path %>
+<div class="small-12 medium-6 margin-top">
+  <%= form_for [:admin, @group] do |f| %>
+    <%= f.label :name, t("admin.valuator_groups.form.name") %>
+    <%= f.text_field :name, label: false %>
+    <%= f.submit t("admin.valuator_groups.form.new"), class: "button success" %>
+  <% end %>
+</div>

app/views/admin/valuator_groups/show.html.erb

@@ -1,4 +1,5 @@
-Hey there I'm group <%= @group.name %>
+<%= back_link_to admin_valuator_groups_path %>
 
-<br/>
+<h2><%= t("admin.valuator_groups.show.title", group: @group.name) %></h2>
-<%= link_to "Ver todos los grupos", admin_valuator_groups_path %>
+
+<!-- Pending add members list -->

app/views/admin/valuators/edit.html.erb

@@ -1,9 +1,20 @@
+<%= back_link_to admin_valuators_path %>
+
+<h2><%= t("admin.valuators.form.edit_title") %></h2>
+
+<div class="callout highlight">
+  <strong><%= @valuator.name %></strong><br>
+  <%= @valuator.email %>
+</div>
+
+<div class="margin-top">
   <%= form_for [:admin, @valuator] do |f| %>
     <%= f.text_field :description %>
+    <div class="small-12 medium-6">
       <%= f.select :valuator_group_id,
                    @valuator_groups.map {|group| [group.name, group.id] },
                    { include_blank: true } %>
-  <%= f.submit %>
+    </div>
+    <%= f.submit t("admin.valuators.form.update"), class: "button success" %>
   <% end %>
-
+</div>
-<%= link_to "Go back", admin_valuator_path(@valuator) %>

app/views/admin/valuators/index.html.erb

@@ -1,9 +1,9 @@
-<h2><%= t("admin.valuators.index.title") %></h2>
+<h2 class="inline-block"><%= t("admin.valuators.index.title") %></h2>
+
+<%= link_to t("admin.valuators.index.valuator_groups"), admin_valuator_groups_path, class: "button hollow float-right" %>
 
 <%= render "admin/shared/user_search", url: search_admin_valuators_path %>
 
-<%= link_to "Grupos de evaluadores", admin_valuator_groups_path %>
-
 <div id="valuators">
   <% if @valuators.any? %>
     <h3 class="margin"><%= page_entries_info @valuators %></h3>
@@ -13,13 +13,13 @@
         <th scope="col"><%= t("admin.valuators.index.name") %></th>
         <th scope="col"><%= t("admin.valuators.index.email") %></th>
         <th scope="col"><%= t("admin.valuators.index.description") %></th>
-        <th scope="col">Grupo</th>
+        <th scope="col"><%= t("admin.valuators.index.group") %></th>
         <th scope="col"><%= t("admin.actions.actions") %></th>
       </thead>
       <tbody>
         <% @valuators.each do |valuator| %>
           <tr>
-            <td><%= valuator.name %></td>
+            <td><%= link_to valuator.name, admin_valuator_path(valuator) %></td>
             <td><%= valuator.email %></td>
             <td>
               <% if valuator.description.present? %>
@@ -29,16 +29,20 @@
               <% end %>
             </td>
             <td>
+              <% if valuator.valuator_group.present? %>
                 <%= valuator.valuator_group.try(:name) %>
+              <% else %>
+                <%= t("admin.valuators.index.no_group") %>
+              <% end %>
             </td>
             <td>
-              <%= link_to "Edit",
+              <%= link_to t("admin.actions.edit"),
                           edit_admin_valuator_path(valuator),
-                          class: "button hollow expanded" %>
+                          class: "button hollow" %>
               <%= link_to t("admin.valuators.valuator.delete"),
                           admin_valuator_path(valuator),
                           method: :delete,
-                          class: "button hollow alert expanded" %>
+                          class: "button hollow alert" %>
             </td>
           </tr>
         <% end %>

app/views/admin/valuators/show.html.erb

@@ -1,7 +1,30 @@
-<div>Name: <%= @valuator.name %></div>
+<%= back_link_to admin_valuators_path %>
-<div>Description <%= @valuator.description %></div>
-<div>Email: <%= @valuator.email %></div>
-<div>Group: <%= @valuator.valuator_group.try(:name) %></div>
 
-<%= link_to "See all evaluators", admin_valuators_path %>
+<%= link_to t("admin.actions.edit"), edit_admin_valuator_path(@valuator), class: "button hollow float-right" %>
-<%= link_to "Edit", edit_admin_valuator_path(@valuator) %>
+
+<div class="clear"></div>
+
+<h2><%= @valuator.name %></h2>
+
+<div class="callout highlight">
+  <p>
+    <strong><%= t("admin.valuators.show.email") %></strong><br>
+    <%= @valuator.email %>
+  </p>
+  <p>
+    <strong><%= t("admin.valuators.show.description") %></strong><br>
+    <% if @valuator.description.present? %>
+      <%= @valuator.description %>
+    <% else %>
+      <%= t("admin.valuators.show.no_description") %>
+    <% end %>
+  </p>
+  <p>
+    <strong><%= t("admin.valuators.show.group") %></strong><br>
+    <% if @valuator.valuator_group.present? %>
+      <%= @valuator.valuator_group.try(:name) %>
+    <% else %>
+      <%= t("admin.valuators.show.no_group") %>
+    <% end %>
+  </p>
+</div>

config/locales/en/admin.yml

@@ -13,6 +13,7 @@ en:
       unmark_featured: Unmark featured
       edit: Edit
       configure: Configure
+      delete: Delete
     banners:
       index:
         title: Banners
@@ -176,7 +177,6 @@ en:
           undecided: "Undecided"
         selected: "Selected"
         select: "Select"
-        download_current_selection: "Download current selection"
         table_id: "ID"
         table_title: "Title"
         table_supports: "Supports"
@@ -223,6 +223,7 @@ en:
         documents: "Documents"
         see_documents: "See documents (%{count})"
         no_documents: "Without documents"
+        valuator_groups: "Valuator Groups"
       edit:
         classification: Classification
         compatibility: Compatibility
@@ -236,6 +237,7 @@ en:
         tags: Tags
         tags_placeholder: "Write the tags you want separated by commas (,)"
         undefined: Undefined
+        user_groups: "Groups"
       search_unfeasible: Search unfeasible
     milestones:
       index:
@@ -581,6 +583,9 @@ en:
         description: Description
         no_description: No description
         no_valuators: There are no valuators.
+        valuator_groups: "Valuator Groups"
+        group: "Group"
+        no_group: "No group"
       valuator:
         description_placeholder: 'Description (optional)'
         add: Add to valuators
@@ -596,6 +601,29 @@ en:
         in_evaluation_count: In evaluation
         total_count: Total
         cost: Cost
+      form:
+        edit_title: "Valuators: Edit valuator"
+        update: "Update valuator"
+        updated: "Valuator updated successfully"
+      show:
+        description: "Description"
+        email: "Email"
+        group: "Group"
+        no_description: "Without description"
+        no_group: "Without group"
+    valuator_groups:
+      index:
+        title: "Valuator groups"
+        new: "Create valuators group"
+        name: "Name"
+        members: "Members"
+        no_groups: "There are no valuator groups"
+      show:
+        title: "Valuators group: %{group}"
+      form:
+        name: "Group name"
+        new: "Create valuators group"
+        edit: "Save valuators group"
     poll_officers:
       index:
         title: Poll officers

config/locales/es/admin.yml

@@ -13,6 +13,7 @@ es:
       unmark_featured: Quitar destacado
       edit: Editar
       configure: Configurar
+      delete: Borrar
     banners:
       index:
         title: Banners
@@ -222,6 +223,7 @@ es:
         documents: "Documentos"
         see_documents: "Ver documentos (%{count})"
         no_documents: "Sin documentos"
+        valuator_groups: "Grupos de evaluadores"
       edit:
         classification: Clasificación
         compatibility: Compatibilidad
@@ -235,6 +237,7 @@ es:
         tags: Etiquetas
         tags_placeholder: "Escribe las etiquetas que desees separadas por comas (,)"
         undefined: Sin definir
+        user_groups: "Grupos"
       search_unfeasible: Buscar inviables
     milestones:
       index:
@@ -580,6 +583,9 @@ es:
         description: Descripción
         no_description: Sin descripción
         no_valuators: No hay evaluadores.
+        valuator_groups: "Grupo de evaluadores"
+        group: "Grupo"
+        no_group: "Sin grupo"
       valuator:
         description_placeholder: 'Descripción (opcional)'
         add: Añadir como evaluador
@@ -595,6 +601,29 @@ es:
         in_evaluation_count: En evaluación
         total_count: Total
         cost: Coste total
+      form:
+        edit_title: "Evaluadores: Editar evaluador"
+        update: "Actualizar evaluador"
+        updated: "Evaluador actualizado correctamente"
+      show:
+        description: "Descripción"
+        email: "Email"
+        group: "Grupo"
+        no_description: "Sin descripción"
+        no_group: "Sin grupo"
+    valuator_groups:
+      index:
+        title: "Grupos de evaluadores"
+        new: "Crear grupo de evaluadores"
+        name: "Nombre"
+        members: "Miembros"
+        no_groups: "No hay grupos de evaluadores"
+      show:
+        title: "Grupo de evaluadores: %{group}"
+      form:
+        name: "Nombre del grupo"
+        new: "Crear grupo de evaluadores"
+        edit: "Guardar grupo de evaluadores"
     poll_officers:
       index:
         title: Presidentes de mesa