From fcb6e67cedb2d32d04f6608f263ae9f52f1e98a0 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 5 Oct 2018 18:10:10 +0200 Subject: [PATCH] Adds styles to proposals views --- app/views/proposals/created.html.erb | 26 ++++++++++++++++++-------- app/views/proposals/share.html.erb | 16 +++++++++------- app/views/proposals/show.html.erb | 7 ++++--- app/views/users/_proposal.html.erb | 10 ++++++---- 4 files changed, 37 insertions(+), 22 deletions(-) diff --git a/app/views/proposals/created.html.erb b/app/views/proposals/created.html.erb index d973ceba0..215a5e151 100644 --- a/app/views/proposals/created.html.erb +++ b/app/views/proposals/created.html.erb @@ -1,13 +1,23 @@ -
+
-
-

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

+
+

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

- <%= raw t("proposals.created.motivation_html") %> - - <%= link_to t("proposals.created.dashboard"), proposal_dashboard_path(@proposal), class: "button" if can?(:dashboard, @proposal) %> - <%= link_to t("proposals.created.publish"), publish_proposal_path(@proposal), method: :patch, class: "button" if can?(:publish, @proposal) %> -
+

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

+

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

+ + <% if can?(:dashboard, @proposal) %> + <%= link_to t("proposals.created.dashboard"), + proposal_dashboard_path(@proposal), + class: "button" %> + <% end %> + + <% if can?(:publish, @proposal) %> + <%= link_to t("proposals.created.publish"), + publish_proposal_path(@proposal), + method: :patch, class: "button" %> + <% end %> +
diff --git a/app/views/proposals/share.html.erb b/app/views/proposals/share.html.erb index 110f89822..f1a6e289b 100644 --- a/app/views/proposals/share.html.erb +++ b/app/views/proposals/share.html.erb @@ -27,13 +27,14 @@ description: @proposal.summary } %> - <% if can?(:dashboard, @proposal) %> -
-

- <%= t('.improve_it') %> + <% if can?(:dashboard, @proposal) %> +

+

+ <%= t("proposals.share.improve_it") %>

-
- <%= link_to t('.dashboard'), proposal_dashboard_path(@proposal), class: 'button' %> +
+ <%= link_to t("proposals.share.dashboard"), + proposal_dashboard_path(@proposal), class: "button expanded" %>
<% end %> @@ -41,7 +42,8 @@ <% if @proposal_improvement_path.present? %>

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

- <%= link_to t("proposals.proposal.improve_info_link"), @proposal_improvement_path, class: "button" %> + <%= link_to t("proposals.proposal.improve_info_link"), + @proposal_improvement_path, class: "button" %>
<% end %> diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb index 5759487ad..1c7ac61d5 100644 --- a/app/views/proposals/show.html.erb +++ b/app/views/proposals/show.html.erb @@ -130,9 +130,10 @@

<%= t("proposals.show.author") %>

- <%= link_to proposal_dashboard_path(@proposal), class: 'button hollow expanded', id: "proposal-dashboard-#{@proposal.id}" do %> - - <%= t("proposals.show.dashboard_proposal_link") %> + <%= link_to proposal_dashboard_path(@proposal), class: "button hollow expanded", + id: "proposal_dashboard_#{@proposal.id}" do %> + + <%= t("proposals.show.dashboard_proposal_link") %> <% end %>
<% end %> diff --git a/app/views/users/_proposal.html.erb b/app/views/users/_proposal.html.erb index 4a350b606..da9dbee9a 100644 --- a/app/views/users/_proposal.html.erb +++ b/app/views/users/_proposal.html.erb @@ -1,6 +1,8 @@ - <%= link_to proposal.title, proposal, proposal.retired? ? { class: 'retired' } : {} %> + + <%= link_to proposal.title, proposal, proposal.retired? ? { class: 'retired' } : {} %> +
<%= proposal.summary %> @@ -18,12 +20,12 @@ <%= t("users.proposals.retired_help_text") %> <% elsif can?(:dashboard, proposal) %> - <%= link_to t("proposals.show.dashboard_proposal_link"), - proposal_dashboard_path(proposal), class: 'button hollow expanded' %> + <%= link_to t("proposals.show.dashboard_proposal_link"), + proposal_dashboard_path(proposal), class: "button hollow expanded" %> <% else %> - <%= link_to t("users.proposals.see"), proposal, class: 'button hollow' %> + <%= link_to t("users.proposals.see"), proposal, class: "button hollow" %> <% end %>