From 933fa75a3bfc3bfd8bb1817713b23641b271321a Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Thu, 14 Jan 2016 14:20:07 +0100 Subject: [PATCH] Changes icon and text for spending proposals --- app/assets/stylesheets/participation.scss | 11 ++++++++++- app/assets/stylesheets/variables.scss | 2 ++ app/views/admin/_menu.html.erb | 2 +- app/views/spending_proposals/index.html.erb | 2 +- app/views/spending_proposals/new.html.erb | 4 ++-- config/locales/en.yml | 4 ++-- config/locales/es.yml | 4 ++-- 7 files changed, 20 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss index ba61be077..87aed579d 100644 --- a/app/assets/stylesheets/participation.scss +++ b/app/assets/stylesheets/participation.scss @@ -272,7 +272,9 @@ // 02. New participation // - - - - - - - - - - - - - - - - - - - - - - - - - -.debate-new, .debate-edit, .proposal-new, .proposal-edit, { +.debate-new, .debate-edit, +.proposal-new, .proposal-edit, +.spending-proposal-new, .spending-proposal-edit { padding-top: $line-height; .back { @@ -293,6 +295,13 @@ opacity: .5; } + .icon-budget { + color: $budget; + font-size: rem-calc(50); + line-height: $line-height; + opacity: .5; + } + .recommendations { list-style-type: none; margin-left: 0; diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss index 3cb09718c..eeae89a61 100644 --- a/app/assets/stylesheets/variables.scss +++ b/app/assets/stylesheets/variables.scss @@ -73,6 +73,8 @@ $check: #46DB91; $proposals: #FFA42D; $proposals-border: #CC8425; +$budget: #454372; + $highlight: #E7F2FC; $featured: #FED900; diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index b27a8a73b..b075755da 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -34,7 +34,7 @@
  • > <%= link_to admin_spending_proposals_path do %> - + <%= t("admin.menu.spending_proposals") %> <% end %>
    • diff --git a/app/views/spending_proposals/index.html.erb b/app/views/spending_proposals/index.html.erb index 0bf276894..301ae2442 100644 --- a/app/views/spending_proposals/index.html.erb +++ b/app/views/spending_proposals/index.html.erb @@ -4,7 +4,7 @@

    <%= t('spending_proposals.index.title') %>

    -

    <%= t('spending_proposals.index.text') %>

    +

    <%= t('spending_proposals.index.text_html') %>

    <% if can? :create, SpendingProposal %> <%= link_to t('spending_proposals.index.create_link'), new_spending_proposal_path, class: 'button radius' %> diff --git a/app/views/spending_proposals/new.html.erb b/app/views/spending_proposals/new.html.erb index c761487ff..6909f67aa 100644 --- a/app/views/spending_proposals/new.html.erb +++ b/app/views/spending_proposals/new.html.erb @@ -1,4 +1,4 @@ -
    +
    <%= link_to spending_proposals_path, class: "left back" do %> @@ -15,7 +15,7 @@
    - +

    <%= t("spending_proposals.new.recommendations_title") %>

    • <%= t("spending_proposals.new.recommendation_one") %>
      • diff --git a/config/locales/en.yml b/config/locales/en.yml index 0c75f8ecf..94e3728fb 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -249,7 +249,7 @@ en: spending_proposals: index: title: "Participatory budgeting" - text: "Here you can send spending proposals to be considered in the frame of the annual participatory budgeting." + text_html: "Here you can send spending proposals to be considered in the frame of the annual participatory budgeting." create_link: "Create spending proposal" verified_only: "Only verified users can create spending proposals, %{verify_account}." verify_account: "verify your account" @@ -257,7 +257,7 @@ en: back_link: Back start_new: "Create spending proposal" more_info: "How do participatory budgeting works?" - recommendations_title: "Recommendations for creating a spending proposal" + recommendations_title: "How create a spending proposal" recommendation_one: "It's mandatory that the proposal makes reference to a budgetable action." recommendation_two: "Any proposal or comment suggesting illegal action will be deleted." recommendation_three: "Try to go into details when describing your spending proposal so the reviewing team undertands your points." diff --git a/config/locales/es.yml b/config/locales/es.yml index 13c0c6b50..2870f0401 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -249,7 +249,7 @@ es: spending_proposals: index: title: "Presupuestos participativos" - text: "Desde esta sección podrás sugerir propuestas de gasto que irán asociadas a las partidas de presupuestos ciudadanos. El requisito principal es que sean propuestas presupuestables." + text_html: "Desde esta sección podrás sugerir propuestas de gasto que irán asociadas a las partidas de presupuestos ciudadanos.
      El requisito principal es que sean propuestas presupuestables." create_link: "Enviar propuesta de gasto" verified_only: "Sólo los usuarios verificados pueden crear propuestas de gasto, %{verify_account}." verify_account: "verifica tu cuenta" @@ -257,7 +257,7 @@ es: back_link: Volver start_new: "Crear una propuesta de gasto" more_info: "¿Cómo funcionan los presupuestos participativos?" - recommendations_title: "Recomendaciones para crear una propuesta de gasto" + recommendations_title: "Cómo crear una propuesta de gasto" recommendation_one: "Es fundamental que haga referencia a una actuación presupuestable." recommendation_two: "Cualquier propuesta o comentario que implique acciones ilegales será eliminada." recommendation_three: "Intenta detallar lo máximo posible la propuesta para que el equipo de gobierno encargado de estudiarla tenga las menor dudas posibles."