From d8bc2ef67d2ac4d275bb2e1607b52e9482f3e3cd Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Mon, 24 Apr 2017 12:52:45 +0200
Subject: [PATCH 1/4] changes name of budgets menu

---
 config/locales/es.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 7d942a1e6..bcf6e1b0f 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -215,7 +215,7 @@ es:
       proposals: Propuestas
       poll_questions: Votaciones
       see_all: Ver propuestas
-      budgets: Presupuestos ciudadanos
+      budgets: Presupuestos participativos
       spending_proposals: "Propuestas de inversión"
   legislation:
     help:

From 13c5eb981216e6f6765d001846cffc3d4a2d7171 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Mon, 24 Apr 2017 13:03:09 +0200
Subject: [PATCH 2/4] improves valuation budget investment form

---
 .../valuation/budget_investments/edit.html.erb     | 14 +++++++-------
 config/locales/valuation.en.yml                    |  2 +-
 config/locales/valuation.es.yml                    |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/valuation/budget_investments/edit.html.erb b/app/views/valuation/budget_investments/edit.html.erb
index 16dc3b59d..fa748b098 100644
--- a/app/views/valuation/budget_investments/edit.html.erb
+++ b/app/views/valuation/budget_investments/edit.html.erb
@@ -8,7 +8,7 @@
 <%= form_for(@investment, url: valuate_valuation_budget_budget_investment_path(@budget, @investment), html: {id: "valuation_budget_investment_edit_form"}) do |f| %>
   <%= render 'shared/errors', resource: @investment %>
   <div class="row">
-    <div class="small-12 medium-8 column">
+    <div class="small-12 column">
       <fieldset class="fieldset">
         <legend><%= t('valuation.budget_investments.edit.feasibility') %></legend>
         <div class="small-4 column">
@@ -38,7 +38,7 @@
   <div id="unfeasible_fields" >
 
     <div class="row">
-      <div class="small-12 medium-8 column">
+      <div class="small-12 column">
         <%= f.label :unfeasibility_explanation, t("valuation.budget_investments.edit.feasible_explanation_html") %>
         <%= f.text_area :unfeasibility_explanation, label: false, rows: 3 %>
       </div>
@@ -49,26 +49,26 @@
   <div id="feasible_fields">
 
     <div class="row">
-      <div class="small-12 medium-4 column">
+      <div class="small-12 medium-6 column">
         <%= f.label :price, "#{t('valuation.budget_investments.edit.price_html', currency: @budget.currency_symbol)}" %>
         <%= f.number_field :price, label: false, max: 1000000000000000 %>
       </div>
 
-      <div class="small-12 medium-4 column end">
+      <div class="small-12 medium-6 column end">
         <%= f.label :price_first_year, "#{t('valuation.budget_investments.edit.price_first_year_html', currency:  @budget.currency_symbol)}" %>
         <%= f.number_field :price_first_year, label: false, max: 1000000000000000 %>
       </div>
     </div>
 
     <div class="row">
-      <div class="small-12 medium-8 column">
+      <div class="small-12 column">
         <%= f.label :price_explanation, t("valuation.budget_investments.edit.price_explanation_html") %>
         <%= f.text_area :price_explanation, label: false, rows: 3 %>
       </div>
     </div>
 
     <div class="row">
-      <div class="small-12 medium-8 column">
+      <div class="small-12 medium-6 column">
         <%= f.label :duration, t("valuation.budget_investments.edit.duration_html") %>
         <%= f.text_field :duration, label: false %>
       </div>
@@ -86,7 +86,7 @@
   </div>
 
   <div class="row">
-    <div class="small-12 medium-8 column">
+    <div class="small-12 column">
       <%= f.label :internal_comments, t("valuation.budget_investments.edit.internal_comments_html") %>
       <%= f.text_area :internal_comments, label: false, rows: 3 %>
     </div>
diff --git a/config/locales/valuation.en.yml b/config/locales/valuation.en.yml
index 56cf38f4c..ecfbc113f 100644
--- a/config/locales/valuation.en.yml
+++ b/config/locales/valuation.en.yml
@@ -61,7 +61,7 @@ en:
       edit:
         dossier: Dossier
         price_html: "Price (%{currency})"
-        price_first_year_html: "Cost during the first year (%{currency})"
+        price_first_year_html: "Cost during the first year (%{currency}) <small>(optional, data not public)</small>"
         price_explanation_html: Price explanation
         feasibility: Feasibility
         feasible: Feasible
diff --git a/config/locales/valuation.es.yml b/config/locales/valuation.es.yml
index e45b57e73..b3a5c32ca 100644
--- a/config/locales/valuation.es.yml
+++ b/config/locales/valuation.es.yml
@@ -61,7 +61,7 @@ es:
       edit:
         dossier: Informe
         price_html: "Coste (%{currency}) <small>(dato público)</small>"
-        price_first_year_html: "Coste en el primer año (%{currency}) <small>(opcional, privado)</small>"
+        price_first_year_html: "Coste en el primer año (%{currency}) <small>(opcional, dato no público)</small>"
         price_explanation_html: "Informe de coste <small>(opcional, dato público)</small>"
         feasibility: Viabilidad
         feasible: Viable

From 26ce2a1ae2fdfaef7089734d840377c6f273bb6f Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Mon, 24 Apr 2017 13:12:33 +0200
Subject: [PATCH 3/4] fixes admin budgets group table

---
 app/views/admin/budgets/_group.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/budgets/_group.html.erb b/app/views/admin/budgets/_group.html.erb
index e90bd4905..6193fe287 100644
--- a/app/views/admin/budgets/_group.html.erb
+++ b/app/views/admin/budgets/_group.html.erb
@@ -1,7 +1,7 @@
 <table>
   <thead>
     <tr>
-      <th colspan="3" class="with-button">
+      <th colspan="2" class="with-button">
         <%= group.name %>
         <%= link_to t("admin.budgets.form.add_heading"), "#", class: "button float-right js-toggle-link", data: { "toggle-selector" => "#group-#{group.id}-new-heading-form" } %>
       </th>

From e7167855c4da7358fbd3fe585b41a536c152e116 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Mon, 24 Apr 2017 13:12:44 +0200
Subject: [PATCH 4/4] improves admin budgets edit page

---
 app/views/admin/budgets/edit.html.erb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/views/admin/budgets/edit.html.erb b/app/views/admin/budgets/edit.html.erb
index 94da65a31..6c54cc75b 100644
--- a/app/views/admin/budgets/edit.html.erb
+++ b/app/views/admin/budgets/edit.html.erb
@@ -1,9 +1,5 @@
 <%= back_link_to admin_budgets_path %>
 
-<div class="row">
-  <div class="small-12 medium-9 column">
-    <h2><%= t("admin.budgets.edit.title") %></h2>
+<h2><%= t("admin.budgets.edit.title") %></h2>
 
-    <%= render '/admin/budgets/form' %>
-  </div>
-</div>
+<%= render '/admin/budgets/form' %>