From 44b5403db55788345f30dd37fb1487ef232a7782 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 23 Jun 2017 18:19:43 +0200 Subject: [PATCH] improves styles and texts of share proposal view --- app/assets/stylesheets/layout.scss | 12 +++++++++-- app/views/proposals/share.html.erb | 32 +++++++++++++++++------------- config/locales/en.yml | 9 +++++---- config/locales/es.yml | 11 +++++----- spec/features/proposals_spec.rb | 2 +- 5 files changed, 40 insertions(+), 26 deletions(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 4359a2a31..2bca33bf5 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -806,7 +806,7 @@ form { } } - [type]:not([type=submit]):not([type=file]):not([type=checkbox]):not([type=radio]) { + [type]:not([type=submit]):not([type=file]):not([type=checkbox]):not([type=radio]):not(.close-button) { background: #f8f8f8; height: $line-height * 2; margin-bottom: rem-calc(16); @@ -893,7 +893,7 @@ form { .callout { font-size: $small-font-size; - a { + a:not(.button) { font-weight: bold; text-decoration: underline; } @@ -945,6 +945,14 @@ form { } } +.callout { + + &.highlight, + &.light { + border: 0; + } +} + // 08. User account // ---------------- diff --git a/app/views/proposals/share.html.erb b/app/views/proposals/share.html.erb index 5755e6225..f86882401 100644 --- a/app/views/proposals/share.html.erb +++ b/app/views/proposals/share.html.erb @@ -12,35 +12,39 @@ <% cache [locale_and_user_status(@proposal), @proposal, @proposal.author, Flag.flagged?(current_user, @proposal), @proposal_votes] do %>
-
+

<%= t("proposals.proposal.created") %>

-

<%= @proposal.title %>

- <%= t("proposals.show.code") %> - <%= @proposal.code %> + <%= t("proposals.proposal.share.guide") %>
+ <%= t("proposals.proposal.share.edit") %>

-

<%= t("proposals.proposal.share.guide").html_safe %>

- <%= render partial: 'shared/social_share', locals: { title: @proposal.title, url: proposal_url(@proposal) } %> -
- <% if @proposal_improvement_path.present? %> -

<%= t('proposals.proposal.improve_info', improve_info_link: link_to(t('proposals.proposal.improve_info_link'), @proposal_improvement_path)).html_safe %>

+
+

<%= t("proposals.proposal.improve_info") %>

+ <%= link_to t("proposals.proposal.improve_info_link"), @proposal_improvement_path, class: "button" %> +
<% end %> -

- <%= link_to proposal_path(@proposal), class: 'proposal' do %> - <%= t("proposals.proposal.share.view_proposal") %> - <% end %> -

+
+ <%= link_to t("proposals.proposal.share.view_proposal"), proposal_path(@proposal) %> +
+
+
+
+

+ <%= @proposal.title %>
+ <%= t("proposals.show.code") %> <%= @proposal.code %> +

+
diff --git a/config/locales/en.yml b/config/locales/en.yml index 7da965fe4..dac7bc3be 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -357,12 +357,13 @@ en: notice: retired: Proposal retired proposal: - created: "You've created a new proposal!" + created: "You've created a proposal!" share: - guide: "Now you can share it through Twitter, Facebook, Google+, Telegram or Whatsapp (if you're using a mobile device) so people can start supporting.

Before it gets shared you'll be able to change the text as you like." + guide: "Now you can share it so people can start supporting." + edit: "Before it gets shared you'll be able to change the text as you like." view_proposal: Not now, go to my proposal - improve_info: "You can also %{improve_info_link} about improving your campaign" - improve_info_link: see more information + improve_info: "Improve your campaign and get more supports" + improve_info_link: "See more information" already_supported: You have already supported this proposal. Share it! comments: one: 1 comment diff --git a/config/locales/es.yml b/config/locales/es.yml index 07c653669..5494ca497 100755 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -357,12 +357,13 @@ es: notice: retired: Propuesta retirada proposal: - created: "¡Has creado una nueva propuesta!" + created: "¡Has creado una propuesta!" share: - guide: "Ahora puedes compartirla en Twitter, Facebook, Google+, Telegram o Whatsapp (si utilizas un dispositivo móvil) para que la gente empieze a apoyarla.

Antes de que se publique el texto en las redes sociales podrás modificarlo a tu gusto" - view_proposal: "Ahora no, ver mi propuesta" - improve_info: "También puedes %{improve_info_link} de como mejorar tu campaña" - improve_info_link: ver más información + guide: "Compártela para que la gente empieze a apoyarla." + edit: "Antes de que se publique podrás modificar el texto a tu gusto." + view_proposal: "Ahora no, ir a mi propuesta" + improve_info: "Mejora tu campaña y consigue más apoyos" + improve_info_link: "Ver más información" already_supported: "¡Ya has apoyado esta propuesta, compártela!" comments: one: 1 Comentario diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index bd7cafee1..16d928f4e 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -175,7 +175,7 @@ feature 'Proposals' do click_button 'Create proposal' expect(page).to have_content 'Proposal created successfully.' - expect(page).to have_content 'You can also see more information about improving your campaign' + expect(page).to have_content 'Improve your campaign and get more supports' click_link 'Not now, go to my proposal'