Improves styles

app/assets/stylesheets/admin.scss

@@ -332,7 +332,7 @@ body.admin {
   }
 }
 
-.account-info, .login-as {
+.account-info, .login-as, .info {
   background-color: #e7e7e7;
   border-radius: rem-calc(3);
   font-size: rem-calc(16);
@@ -344,3 +344,8 @@ body.admin {
     font-size: rem-calc(18);
   }
 }
+
+.info p {
+  margin-bottom: 0;
+}
+

app/views/admin/spending_proposals/_written_by_author.html.erb

@@ -1,22 +1,26 @@
-<h2><%= t "admin.spending_proposals.show.heading", id: @spending_proposal.id %></h2>
-<h1><%= @spending_proposal.title %></h1>
+<div class="callout primary float-right">
+  <%= t "admin.spending_proposals.show.heading", id: @spending_proposal.id %>
+</div>
 
-<div class="row small-collapse">
-  <div class="small-12 medium-4 columns">
+<br>
+<h1 class="inline-block"><%= @spending_proposal.title %></h1>
+
+<div class="row small-collapse info">
+  <div class="small-12 medium-4 column">
     <p>
       <strong><%= t("admin.spending_proposals.show.geozone") %>:</strong>
       <%= geozone_name(@spending_proposal) %>
     </p>
   </div>
 
-  <div class="small-12 medium-4 columns">
+  <div class="small-12 medium-4 column">
     <p>
       <strong><%= t("admin.spending_proposals.show.by") %>:</strong>
       <%= link_to @spending_proposal.author.name, admin_user_path(@spending_proposal.author) %>
     </p>
   </div>
 
-  <div class="small-12 medium-4 columns">
+  <div class="small-12 medium-4 column">
     <p>
       <strong><%= t("admin.spending_proposals.show.sent") %>:</strong>
       <%= l @spending_proposal.created_at, format: :datetime %>
@@ -32,7 +36,7 @@
 <% end %>
 
 <% if @spending_proposal.external_url.present? %>
-  <p><%= text_with_links @spending_proposal.external_url %></p>
+  <p><%= text_with_links @spending_proposal.external_url %>&nbsp;<i class="icon-external small"></i></p>
 <% end %>
 
 <%= safe_html_with_links @spending_proposal.description %>

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

@@ -1,27 +1,27 @@
 <h2><%= t("admin.spending_proposals.index.title") %></h2>
 
-<div>
+<div class="row margin">
   <%= form_tag admin_spending_proposals_path, method: :get, enforce_utf8: false do %>
-    <div class="small-12 medium-4 column float-right">
-      <%= select_tag :tag_name,
-                     options_for_select(spending_proposal_tags_select_options, params[:tag_name]),
-                     { prompt: t("admin.spending_proposals.index.tags_filter_all"),
-                       label: false,
-                       class: "js-submit-on-change" } %>
+    <div class="small-12 medium-4 column">
+      <%= select_tag :administrator_id,
+                      options_for_select(admin_select_options, params[:administrator_id]),
+                      { prompt: t("admin.spending_proposals.index.administrator_filter_all"),
+                        label: false,
+                        class: "js-submit-on-change" } %>
     </div>
-    <div class="small-12 medium-4 column float-right">
+    <div class="small-12 medium-4 column">
       <%= select_tag :geozone_id,
                      options_for_select(geozone_select_options.unshift([t("geozones.none"), "all"]), params[:geozone_id]),
                      { prompt: t("admin.spending_proposals.index.geozone_filter_all"),
                        label: false,
                        class: "js-submit-on-change" } %>
     </div>
-    <div class="small-12 medium-4 column float-right">
-      <%= select_tag :administrator_id,
-                      options_for_select(admin_select_options, params[:administrator_id]),
-                      { prompt: t("admin.spending_proposals.index.administrator_filter_all"),
-                        label: false,
-                        class: "js-submit-on-change" } %>
+    <div class="small-12 medium-4 column">
+      <%= select_tag :tag_name,
+                     options_for_select(spending_proposal_tags_select_options, params[:tag_name]),
+                     { prompt: t("admin.spending_proposals.index.tags_filter_all"),
+                       label: false,
+                       class: "js-submit-on-change" } %>
     </div>
   <% end %>
 </div>
@@ -41,23 +41,16 @@
       </td>
       <td class="small">
         <% if spending_proposal.administrator.present? %>
-          <span title="<%= t('admin.spending_proposals.index.admin_assigned') %>"><%= spending_proposal.administrator.name %></span>
+          <span title="<%= t('admin.spending_proposals.index.assigned_admin') %>"><%= spending_proposal.administrator.name %></span>
         <% else %>
           <%= t("admin.spending_proposals.index.no_admin_assigned") %>
         <% end %>
       </td>
       <td class="small">
-        <% case spending_proposal.valuators.size %>
-        <% when 0 %>
+        <% if spending_proposal.valuators.size == 0 %>
           <%= t("admin.spending_proposals.index.no_valuators_assigned") %>
-        <% when 1 %>
-          <span title="<%= t('admin.spending_proposals.index.valuators_assigned', count: 1) %>">
-            <%= spending_proposal.valuators.first.name %>
-          </span>
         <% else %>
-          <span title="<%= spending_proposal.valuators.map(&:name).join(', ') %>">
-            <%= t('admin.spending_proposals.index.valuators_assigned', count: spending_proposal.valuators.size) %>
-          </span>
+          <%= spending_proposal.valuators.collect(&:name).join(', ') %>
         <% end %>
       </td>
       <td class="small">

config/locales/admin.en.yml

@@ -158,14 +158,14 @@ en:
           valuating: Under valuation
           valuation_finished: Valuation finished
         title: Investment projects for participatory budgeting
-        admin_assigned: Assigned administrator
+        assigned_admin: Assigned administrator
         no_admin_assigned: No admin assigned
-        valuators_assigned:
-          one: Assigned valuator
-          other: "%{count} valuators assigned"
         no_valuators_assigned: No valuators assigned
       show:
+        assigned_admin: Assigned administrator
+        assigned_valuators: Assigned valuators
         back: Back
+        classification: Clasification
         heading: "Investment project %{id}"
         edit_button: Edit
         association_name: Association
@@ -173,6 +173,8 @@ en:
         sent: Sent
         geozone: Scope
         dossier: Dossier
+        tags: Tags
+        undefined: Undefined
       edit:
         classification: Clasification
         assigned_valuators: Valuators

config/locales/admin.es.yml

@@ -158,14 +158,14 @@ es:
           valuating: En evaluación
           valuation_finished: Evaluación finalizada
         title: Propuestas de inversión para presupuestos participativos
-        admin_assigned: Administrador asignado
+        assigned_admin: Administrador asignado
         no_admin_assigned: Sin admin asignado
-        valuators_assigned:
-          one: Evaluador asignado
-          other: "%{count} evaluadores asignados"
         no_valuators_assigned: Sin evaluador
       show:
+        assigned_admin: Administrador asignado
+        assigned_valuators: Evaluadores asignados
         back: Volver
+        classification: Clasificación
         heading: Propuesta de inversión %{id}
         edit_button: Editar
         association_name: Asociación
@@ -173,6 +173,8 @@ es:
         sent: Fecha
         geozone: Ámbito
         dossier: Informe
+        tags: Etiquetas
+        undefined: Sin definir
       edit:
         classification: Clasificación
         assigned_valuators: Evaluadores