From d526c2effaec769ba33abf509642a6c43e4847dc Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Wed, 30 Mar 2016 12:58:15 +0200
Subject: [PATCH] Improves styles for spending proposals show

---
 app/assets/stylesheets/participation.scss  | 12 ++---
 app/views/_votes.html.erb/_form.html.erb   | 51 ----------------------
 app/views/_votes.html.erb/new.html.erb     | 27 ------------
 app/views/_votes.html.erb/show.html.erb    | 34 ---------------
 app/views/spending_proposals/show.html.erb |  4 +-
 5 files changed, 6 insertions(+), 122 deletions(-)
 delete mode 100644 app/views/_votes.html.erb/_form.html.erb
 delete mode 100644 app/views/_votes.html.erb/new.html.erb
 delete mode 100644 app/views/_votes.html.erb/show.html.erb

diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index eb2945deb..7e14626a3 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -335,7 +335,7 @@
 // 03. Show participation
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
-.debate-show, .proposal-show {
+.debate-show, .proposal-show, .investment-project-show {
 
   .social-share-full .social-share-button {
     display:inline;
@@ -350,12 +350,11 @@
     vertical-align: rem-calc(10);
   }
 
-
   .edit-debate, .edit-proposal {
     margin-bottom: 0;
   }
 
-  .debate-info, .proposal-info {
+  .debate-info, .proposal-info, .investment-project-info {
     clear: both;
     color: $text-medium;
     font-size: $small-font-size;
@@ -613,24 +612,21 @@
     .icon-debates, .icon-proposals, .icon-budget {
       font-size: rem-calc(18);
       line-height: $line-height;
-      position: absolute;
+      margin-left: rem-calc(6);
       top: 0;
     }
 
     .icon-debates {
       color: $debates;
-      left: rem-calc(48);
     }
 
     .icon-proposals {
       color: $proposals;
-      left: rem-calc(72);
     }
 
     .icon-budget {
       color: $budget;
       font-size: $small-font-size;
-      left: rem-calc(122);
     }
 
     .debate-info, .proposal-info, .investment-project-info {
@@ -809,7 +805,7 @@
   }
 }
 
-.investment-project {
+.investment-project, .investment-project-show {
 
   .supports {
     @include supports;
diff --git a/app/views/_votes.html.erb/_form.html.erb b/app/views/_votes.html.erb/_form.html.erb
deleted file mode 100644
index 0d6ef0402..000000000
--- a/app/views/_votes.html.erb/_form.html.erb
+++ /dev/null
@@ -1,51 +0,0 @@
-<%= form_for(@spending_proposal, url: form_url) do |f| %>
-  <%= render 'shared/errors', resource: @spending_proposal %>
-
-  <div class="row">
-    <div class="small-12 column">
-      <%= f.label :title, t("spending_proposals.form.title") %>
-      <%= f.text_field :title, maxlength: SpendingProposal.title_max_length, placeholder: t("spending_proposals.form.title"), label: false %>
-    </div>
-
-    <div class="ckeditor small-12 column">
-      <%= f.label :description, t("spending_proposals.form.description") %>
-      <%= f.cktext_area :description, maxlength: SpendingProposal.description_max_length, ckeditor: { language: I18n.locale }, label: false %>
-    </div>
-
-    <div class="small-12 column">
-      <%= f.label :external_url, t("spending_proposals.form.external_url") %>
-      <%= f.text_field :external_url, placeholder: t("spending_proposals.form.external_url"), label: false %>
-    </div>
-
-    <div class="small-12 column">
-      <%= f.label :geozone_id,  t("spending_proposals.form.geozone") %>
-      <%= f.select :geozone_id, geozone_select_options, {include_blank: t("geozones.none"), label: false} %>
-    </div>
-
-    <div class="small-12 column">
-      <%= f.label :association_name, t("spending_proposals.form.association_name_label") %>
-      <%= f.text_field :association_name, placeholder: t("spending_proposals.form.association_name"), label: false %>
-    </div>
-
-    <div class="small-12 column">
-      <% if @spending_proposal.new_record? %>
-        <%= f.label :terms_of_service do %>
-          <%= f.check_box :terms_of_service, title: t('form.accept_terms_title'), label: false %>
-          <span class="checkbox">
-            <%= t("form.accept_terms",
-                policy: link_to(t("form.policy"), "/privacy", target: "blank"),
-                conditions: link_to(t("form.conditions"), "/conditions", target: "blank")).html_safe %>
-          </span>
-        <% end %>
-      <% end %>
-    </div>
-
-    <div class="small-12 column">
-      <%= f.simple_captcha input_html: { required: false } %>
-    </div>
-
-    <div class="actions small-12 column">
-      <%= f.submit(class: "button", value: t("spending_proposals.form.submit_buttons.#{action_name}")) %>
-    </div>
-  </div>
-<% end %>
\ No newline at end of file
diff --git a/app/views/_votes.html.erb/new.html.erb b/app/views/_votes.html.erb/new.html.erb
deleted file mode 100644
index a8d35338f..000000000
--- a/app/views/_votes.html.erb/new.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="spending-proposal-new row margin-top">
-
-  <div class="small-12 medium-9 column">
-    <%= link_to spending_proposals_path, class: "back" do %>
-      <span class="icon-angle-left"></span>
-      <%= t("spending_proposals.new.back_link") %>
-    <% end %>
-    <h1><%= t("spending_proposals.new.start_new") %></h1>
-    <div data-alert class="callout primary">
-      <%= link_to "/spending_proposals_info", title: t('shared.target_blank_html'), target: "_blank" do %>
-        <%= t("spending_proposals.new.more_info")%>
-      <% end %>
-    </div>
-    <%= render "spending_proposals/form", form_url: spending_proposals_url %>
-  </div>
-
-  <div class="small-12 medium-3 column">
-    <span class="icon-budget float-right"></span>
-    <h2><%= t("spending_proposals.new.recommendations_title") %></h2>
-    <ul class="recommendations">
-      <li><%= t("spending_proposals.new.recommendation_one") %></li>
-      <li><%= t("spending_proposals.new.recommendation_two") %></li>
-      <li><%= t("spending_proposals.new.recommendation_three") %></li>
-    </ul>
-  </div>
-
-</div>
\ No newline at end of file
diff --git a/app/views/_votes.html.erb/show.html.erb b/app/views/_votes.html.erb/show.html.erb
deleted file mode 100644
index 1aaa3d805..000000000
--- a/app/views/_votes.html.erb/show.html.erb
+++ /dev/null
@@ -1,34 +0,0 @@
-<% provide :title do %><%= @spending_proposal.title %><% end %>
-
-<section class="proposal-show">
-  <div id="<%= dom_id(@spending_proposal) %>" class="row">
-    <div class="small-12 medium-9 column">
-
-      <h1><%= @spending_proposal.title %></h1>
-
-      <div class="spending-proposal-info">
-        <%= render '/shared/author_info', resource: @spending_proposal %>
-
-        <span class="bullet">&nbsp;&bull;&nbsp;</span>
-        <%= l @spending_proposal.created_at.to_date %>
-        <span class="bullet">&nbsp;&bull;&nbsp;</span>
-        <%= geozone_name(@spending_proposal) %>
-      </div>
-
-      <%= safe_html_with_links @spending_proposal.description.html_safe %>
-
-      <% if @spending_proposal.external_url.present? %>
-        <div class="document-link">
-          <%= text_with_links @spending_proposal.external_url %>
-        </div>
-      <% end %>
-
-    </div>
-
-    <div id="<%= dom_id(@spending_proposal) %>_votes" class="small-12 medium-3 column text-center">
-        <%= render 'votes',
-                  { spending_proposal: @spending_proposal, vote_url: vote_spending_proposal_path(@spending_proposal, value: 'yes') } %>
-    </div>
-
-  </div>
-</section>
\ No newline at end of file
diff --git a/app/views/spending_proposals/show.html.erb b/app/views/spending_proposals/show.html.erb
index 38616f28a..c68a1eacc 100644
--- a/app/views/spending_proposals/show.html.erb
+++ b/app/views/spending_proposals/show.html.erb
@@ -1,12 +1,12 @@
 <% provide :title do %><%= @spending_proposal.title %><% end %>
 
-<section class="proposal-show">
+<section class="investment-project-show">
   <div id="<%= dom_id(@spending_proposal) %>" class="row">
     <div class="small-12 medium-9 column">
 
       <h1><%= @spending_proposal.title %></h1>
 
-      <div class="spending-proposal-info">
+      <div class="investment-project-info">
         <%= render '/shared/author_info', resource: @spending_proposal %>
 
         <span class="bullet">&nbsp;&bull;&nbsp;</span>