From 2e8fe65b3d09a842ffc868807a26754541a291ee Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Thu, 31 May 2018 18:47:38 +0200
Subject: [PATCH] Cleans and improves management views layout

---
 .../admin/shared/_proposal_search.html.erb    | 12 +++---
 app/views/management/_account_info.html.erb   |  9 ++++-
 .../account/edit_password_manually.html.erb   | 23 +++++------
 .../budgets/create_investments.html.erb       | 40 ++++++++++++++-----
 .../budgets/investments/new.html.erb          |  2 +-
 .../budgets/print_investments.html.erb        | 27 +++++++++----
 .../budgets/support_investments.html.erb      | 40 ++++++++++++++-----
 .../document_verifications/index.html.erb     | 40 +++++++++----------
 .../management/proposals/_proposal.html.erb   |  2 +-
 app/views/management/proposals/index.html.erb | 22 +++++-----
 app/views/management/proposals/new.html.erb   |  2 +-
 app/views/management/proposals/print.html.erb |  2 +-
 .../management/user_invites/create.html.erb   |  4 +-
 .../management/user_invites/new.html.erb      | 24 +++++------
 app/views/management/users/new.html.erb       | 16 +++++---
 15 files changed, 158 insertions(+), 107 deletions(-)

diff --git a/app/views/admin/shared/_proposal_search.html.erb b/app/views/admin/shared/_proposal_search.html.erb
index 895b6ea55..5a6207d4c 100644
--- a/app/views/admin/shared/_proposal_search.html.erb
+++ b/app/views/admin/shared/_proposal_search.html.erb
@@ -1,10 +1,10 @@
 <%= form_for(Proposal.new, url: url, as: :proposal, method: :get) do |f| %>
-  <div class="row">
-    <div class="small-12 medium-6 column">
+  <div class="small-12 medium-6">
+    <div class="input-group">
       <%= text_field_tag :search, "", placeholder: t("admin.shared.proposal_search.placeholder") %>
-    </div>
-    <div class="form-inline small-12 medium-6 column">
-      <%= f.submit t("admin.shared.proposal_search.button"), class: "button" %>
+      <div class="input-group-button">
+        <%= f.submit t("admin.shared.proposal_search.button"), class: "button" %>
+      </div>
     </div>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/management/_account_info.html.erb b/app/views/management/_account_info.html.erb
index 20a6bc24d..28f141ba9 100644
--- a/app/views/management/_account_info.html.erb
+++ b/app/views/management/_account_info.html.erb
@@ -2,11 +2,16 @@
   <section class="small-12 medium-9 column">
     <div class="account-info">
 
-      <%= link_to(t("management.account_info.change_user"), logout_management_users_path, method: :delete, class: 'float-right change-user') %>
+      <%= link_to(t("management.account_info.change_user"),
+                    logout_management_users_path,
+                    method: :delete,
+                    class: "float-right btchange-user button hollow") %>
 
       <% if managed_user.level_two_or_three_verified? %>
         <p>
-          <%= t("management.account_info.identified_label") %>
+          <strong>
+            <%= t("management.account_info.identified_label") %>
+          </strong>
         </p>
       <% end %>
 
diff --git a/app/views/management/account/edit_password_manually.html.erb b/app/views/management/account/edit_password_manually.html.erb
index 8fe197d6b..fb5391fb6 100644
--- a/app/views/management/account/edit_password_manually.html.erb
+++ b/app/views/management/account/edit_password_manually.html.erb
@@ -1,20 +1,19 @@
 <h2 class="not-print"><%= t("management.account.menu.reset_password_manually") %></h2>
 
 <%= form_for managed_user, url: change_password_management_account_path do |f| %>
-  <div class="row">
-    <%= f.label :password %>
-    <p class="help-text"><%= t("management.account.edit.password.print_help") %></p>
-    <div class="columns small-6 end">
+  <%= f.label :password %>
+  <p class="help-text"><%= t("management.account.edit.password.print_help") %></p>
+  <div class="small-12 medium-6">
 
-      <div class="input-group">
-        <%= f.password_field :password, class: "input-group-field no-margin-bottom", label: false, value: nil %>
-        <span class="input-group-label">
-          <a href="#" class="show-password"><i class="icon-eye"></i></a>
-        </span>
-      </div>
-
-      <%= link_to t("management.account.edit.password.random"), '#', class: 'generate-random-value float-right' %>
+    <div class="input-group">
+      <%= f.password_field :password, class: "input-group-field no-margin-bottom", label: false, value: nil %>
+      <span class="input-group-label">
+        <a href="#" class="show-password"><span class="icon-eye"></span></a>
+      </span>
     </div>
+
+    <%= link_to t("management.account.edit.password.random"), '#', class: 'generate-random-value float-right' %>
   </div>
+
   <%= f.submit t("management.account.edit.password.save"), class: "button success" %>
 <% end %>
diff --git a/app/views/management/budgets/create_investments.html.erb b/app/views/management/budgets/create_investments.html.erb
index fdd7073e8..9c9f00909 100644
--- a/app/views/management/budgets/create_investments.html.erb
+++ b/app/views/management/budgets/create_investments.html.erb
@@ -1,12 +1,30 @@
-<table>
-<% @budgets.each do |budget| %>
-  <tr id="<%= dom_id(budget) %>">
-    <td><%= budget.name %></td>
-    <td><%= budget.translated_phase %></td>
-    <td align="right">
-      <%= link_to t("management.budgets.create_new_investment"),
-                  new_management_budget_investment_path(budget) %>
-    </td>
-  </tr>
+<h2><%= t("management.budgets.create_new_investment") %></h2>
+
+<% if @budgets.any? %>
+  <table>
+    <thead>
+      <tr>
+        <th><%= t("management.budgets.table_name") %></th>
+        <th><%= t("management.budgets.table_phase") %></th>
+        <th><%= t("management.budgets.table_actions") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @budgets.each do |budget| %>
+        <tr id="<%= dom_id(budget) %>">
+          <td><%= budget.name %></td>
+          <td><%= budget.translated_phase %></td>
+          <td align="right">
+            <%= link_to t("management.budgets.create_new_investment"),
+                        new_management_budget_investment_path(budget),
+                        class: "button hollow" %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="callout primary">
+    <%= t("management.budgets.no_budgets") %>
+  </div>
 <% end %>
-</table>
diff --git a/app/views/management/budgets/investments/new.html.erb b/app/views/management/budgets/investments/new.html.erb
index 20e27b9cc..1121dbd19 100644
--- a/app/views/management/budgets/investments/new.html.erb
+++ b/app/views/management/budgets/investments/new.html.erb
@@ -5,7 +5,7 @@
   </div>
 
   <div class="small-12 medium-9 column end">
-    <h1 class=""><%= t("management.budget_investments.create") %></h1>
+    <h2><%= t("management.budget_investments.create") %></h2>
 
     <%= render '/budgets/investments/form', form_url: management_budget_investments_path(@budget) %>
   </div>
diff --git a/app/views/management/budgets/print_investments.html.erb b/app/views/management/budgets/print_investments.html.erb
index d5be7c1ff..ebc7ed768 100644
--- a/app/views/management/budgets/print_investments.html.erb
+++ b/app/views/management/budgets/print_investments.html.erb
@@ -1,10 +1,21 @@
+<h2><%= t("management.budgets.print_investments") %></h2>
+
 <table>
-  <tr id="<%= dom_id(@budget) %>">
-    <td><%= @budget.name %></td>
-    <td><%= @budget.translated_phase %></td>
-    <td align="right">
-      <%= link_to t("management.budgets.print_investments"),
-        print_management_budget_investments_path(@budget) %>
-    </td>
-  </tr>
+  <thead>
+    <tr>
+      <th><%= t("management.budgets.table_name") %></th>
+      <th><%= t("management.budgets.table_phase") %></th>
+      <th><%= t("management.budgets.table_actions") %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr id="<%= dom_id(@budget) %>">
+      <td><%= @budget.name %></td>
+      <td><%= @budget.translated_phase %></td>
+      <td align="right">
+        <%= link_to t("management.budgets.print_investments"),
+          print_management_budget_investments_path(@budget) %>
+      </td>
+    </tr>
+  </tbody>
 </table>
diff --git a/app/views/management/budgets/support_investments.html.erb b/app/views/management/budgets/support_investments.html.erb
index fcd820cef..49ddc9461 100644
--- a/app/views/management/budgets/support_investments.html.erb
+++ b/app/views/management/budgets/support_investments.html.erb
@@ -1,12 +1,30 @@
-<table>
-<% @budgets.each do |budget| %>
-  <tr id="<%= dom_id(budget) %>">
-    <td><%= budget.name %></td>
-    <td><%= budget.translated_phase %></td>
-    <td align="right">
-      <%= link_to t("management.budgets.support_investments"),
-                  management_budget_investments_path(budget) %>
-    </td>
-  </tr>
+<h2><%= t("management.budgets.support_investments") %></h2>
+
+<% if @budgets.any? %>
+  <table>
+    <thead>
+      <tr>
+        <th><%= t("management.budgets.table_name") %></th>
+        <th><%= t("management.budgets.table_phase") %></th>
+        <th><%= t("management.budgets.table_actions") %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @budgets.each do |budget| %>
+        <tr id="<%= dom_id(budget) %>">
+          <td><%= budget.name %></td>
+          <td><%= budget.translated_phase %></td>
+          <td align="right">
+            <%= link_to t("management.budgets.support_investments"),
+                        management_budget_investments_path(budget),
+                        class: "button hollow" %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="callout primary">
+    <%= t("management.budgets.no_budgets") %>
+  </div>
 <% end %>
-</table>
diff --git a/app/views/management/document_verifications/index.html.erb b/app/views/management/document_verifications/index.html.erb
index c02d5f52b..dca693183 100644
--- a/app/views/management/document_verifications/index.html.erb
+++ b/app/views/management/document_verifications/index.html.erb
@@ -1,25 +1,23 @@
 <h2><%= t("management.document_verifications.title") %></h2>
 
-<div class="row">
-  <div class="small-12 medium-8 column">
-    <%= form_for(@document_verification,
-                 as: :document_verification,
-                 url: check_management_document_verifications_path) do |f| %>
+<div class="small-12 medium-8">
+  <%= form_for(@document_verification,
+               as: :document_verification,
+               url: check_management_document_verifications_path) do |f| %>
 
-      <div class="small-12 medium-4">
-        <%= f.select(:document_type,
-                     [[humanize_document_type("1"), 1],
-                      [humanize_document_type("2"), 2],
-                      [humanize_document_type("3"), 3]],
-                     label: t("management.document_type_label")) %>
-      </div>
-      <div class="small-12 medium-5">
-        <%= f.text_field :document_number,
-                         placeholder: t('management.document_number'),
-                         label: t("management.document_number")
-        %>
-      </div>
-      <%= f.submit t("management.check"), class: "button" %>
-    <% end %>
-  </div>
+    <div class="small-12 medium-5">
+      <%= f.select(:document_type,
+                   [[humanize_document_type("1"), 1],
+                    [humanize_document_type("2"), 2],
+                    [humanize_document_type("3"), 3]],
+                   label: t("management.document_type_label")) %>
+    </div>
+    <div class="small-12 medium-5">
+      <%= f.text_field :document_number,
+                       placeholder: t('management.document_number'),
+                       label: t("management.document_number")
+      %>
+    </div>
+    <%= f.submit t("management.check"), class: "button" %>
+  <% end %>
 </div>
diff --git a/app/views/management/proposals/_proposal.html.erb b/app/views/management/proposals/_proposal.html.erb
index be7a2e6b2..1babc3f02 100644
--- a/app/views/management/proposals/_proposal.html.erb
+++ b/app/views/management/proposals/_proposal.html.erb
@@ -1 +1 @@
-<%= render partial: 'proposals/proposal', locals: {proposal: proposal} %>
\ No newline at end of file
+<%= render partial: "proposals/proposal", locals: {proposal: proposal} %>
diff --git a/app/views/management/proposals/index.html.erb b/app/views/management/proposals/index.html.erb
index bbcdb62ef..e7cc9c0b8 100644
--- a/app/views/management/proposals/index.html.erb
+++ b/app/views/management/proposals/index.html.erb
@@ -1,22 +1,22 @@
 <main>
+  <h2><%= t("management.proposals.index.title") %></h2>
+
   <%= render 'admin/shared/proposal_search', url: management_proposals_path %>
 
-  <div class="row">
-    <div class="proposals-list small-12 column">
+  <div class="management-list">
+    <div class="proposals-list">
 
       <div class="filters">
-        <div class="small-12 medium-7 float-left">
-          <% if @search_terms %>
-            <h2>
-              <%= page_entries_info @proposals %>
-              <%= t("proposals.index.search_results_html", count: @proposals.size, search_term: @search_terms) %>
-            </h2>
-          <% end %>
-        </div>
+        <% if @search_terms %>
+          <h3>
+            <%= page_entries_info @proposals %>
+            <%= t("proposals.index.search_results_html", count: @proposals.size, search_term: @search_terms) %>
+          </h3>
+        <% end %>
 
         <%= render @proposals %>
         <%= paginate @proposals %>
       </div>
     </div>
   </div>
-</main>
\ No newline at end of file
+</main>
diff --git a/app/views/management/proposals/new.html.erb b/app/views/management/proposals/new.html.erb
index 07c7e734a..1644b5da5 100644
--- a/app/views/management/proposals/new.html.erb
+++ b/app/views/management/proposals/new.html.erb
@@ -5,7 +5,7 @@
   </div>
 
   <div class="small-12 medium-9 column end">
-    <h1 class=""><%= t("management.proposals.create_proposal") %></h1>
+    <h2><%= t("management.proposals.create_proposal") %></h2>
     <%= render "proposals/form", form_url: management_proposals_url %>
   </div>
 
diff --git a/app/views/management/proposals/print.html.erb b/app/views/management/proposals/print.html.erb
index d321ee140..b4dfa9281 100644
--- a/app/views/management/proposals/print.html.erb
+++ b/app/views/management/proposals/print.html.erb
@@ -1,6 +1,6 @@
 <main>
   <div class="row">
-    <div class="proposals-list small-12 column">
+    <div class="proposals-list">
       <a id="print_link" href="javascript:window.print();" class="button warning float-right">
         <%= t('management.proposals.print.print_button') %>
       </a>
diff --git a/app/views/management/user_invites/create.html.erb b/app/views/management/user_invites/create.html.erb
index 3e346e4f2..701da0620 100644
--- a/app/views/management/user_invites/create.html.erb
+++ b/app/views/management/user_invites/create.html.erb
@@ -1,9 +1,9 @@
 <div class="small-12 medium-8 column">
   <%= back_link_to %>
 
-  <h1><%= t('management.user_invites.create.title') %></h1>
+  <h2><%= t("management.user_invites.create.title") %></h2>
 
   <div class="callout success">
-    <%= t('management.user_invites.create.success_html', count: @emails.count) %>
+    <%= t("management.user_invites.create.success_html", count: @emails.count) %>
   </div>
 </div>
diff --git a/app/views/management/user_invites/new.html.erb b/app/views/management/user_invites/new.html.erb
index 969ca8fdf..1da11498d 100644
--- a/app/views/management/user_invites/new.html.erb
+++ b/app/views/management/user_invites/new.html.erb
@@ -1,14 +1,12 @@
-<div class="small-12 medium-8 column">
-  <h1><%= t('management.user_invites.new.title') %></h1>
+<h2><%= t("management.user_invites.new.title") %></h2>
 
-  <%= form_tag management_user_invites_path do %>
-    <label><%= t('management.user_invites.new.label') %></label>
-    <p class="help-text" id="emails-help-text"><%= t('management.user_invites.new.info') %></p>
-    <%= text_area_tag "emails", nil, rows: 5,
-                      placeholder: t('management.user_invites.new.info'),
-                      aria: {describedby: "emails-help-text"} %>
-    <div class="small-12 medium-6">
-      <input type="submit" name="" value="<%= t('management.user_invites.new.submit') %>", class="button hollow expanded">
-    </div>
-  <% end %>
-</div>
+<%= form_tag management_user_invites_path do %>
+  <label><%= t('management.user_invites.new.label') %></label>
+  <p class="help-text" id="emails-help-text"><%= t('management.user_invites.new.info') %></p>
+  <%= text_area_tag "emails", nil, rows: 5,
+                    placeholder: t('management.user_invites.new.info'),
+                    aria: {describedby: "emails-help-text"} %>
+  <div class="small-12 medium-6 large-3">
+    <input type="submit" name="" value="<%= t('management.user_invites.new.submit') %>", class="button expanded">
+  </div>
+<% end %>
diff --git a/app/views/management/users/new.html.erb b/app/views/management/users/new.html.erb
index fd28a1248..651229034 100644
--- a/app/views/management/users/new.html.erb
+++ b/app/views/management/users/new.html.erb
@@ -1,11 +1,8 @@
-<p><%= t("management.users.create_user_info") %></p>
+<h2><%= t("management.users.create_user_info") %></h2>
 
-<%= render 'management/user_permissions',
-      message: t("management.document_verifications.in_census_has_following_permissions"),
-      permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %>
+<div class="small-12 medium-6 column">
 
-<div class="row verification account">
-  <div class="small-12 medium-6 column">
+  <div class="verification account">
     <%= form_for @user, url: management_users_path do |f| %>
       <%= f.hidden_field :document_type %>
       <%= f.hidden_field :document_number %>
@@ -27,3 +24,10 @@
   </div>
 </div>
 
+<div class="small-12 medium-6 column">
+  <div class="callout">
+    <%= render "management/user_permissions",
+                message: t("management.document_verifications.in_census_has_following_permissions"),
+                permissions: [:debates, :create_proposals, :support_proposals, :vote_proposals] %>
+  </div>
+</div>