consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes indentation on proposals show

Browse Source
This commit is contained in:
decabeza
2018-06-08 15:15:08 +02:00
parent 67713eb980
commit 879b63ae5d
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/views/proposals/show.html.erb
View File

@@ -1,7 +1,7 @@
<% provide :title do %><%= @proposal.title %><% end %> <% provide :title do %><%= @proposal.title %><% end %>
<% content_for :meta_description do %><%= @proposal.summary %><% end %> <% content_for :meta_description do %><%= @proposal.summary %><% end %>
<% provide :social_media_meta_tags do %> <% provide :social_media_meta_tags do %>
<%= render "shared/social_media_meta_tags", <%= render "shared/social_media_meta_tags",
social_url: proposal_url(@proposal), social_url: proposal_url(@proposal),
social_title: @proposal.title, social_title: @proposal.title,
social_description: @proposal.summary, social_description: @proposal.summary,
@@ -12,7 +12,11 @@
<%= render "shared/canonical", href: proposal_url(@proposal) %> <%= render "shared/canonical", href: proposal_url(@proposal) %>
<% end %> <% end %>
<% cache [locale_and_user_status(@proposal), @proposal, @proposal.author, Flag.flagged?(current_user, @proposal), @proposal_votes] do %> <% cache [locale_and_user_status(@proposal),
@proposal,
@proposal.author,
Flag.flagged?(current_user, @proposal),
@proposal_votes] do %>
<div class="proposal-show"> <div class="proposal-show">
<div id="<%= dom_id(@proposal) %>" class="row"> <div id="<%= dom_id(@proposal) %>" class="row">
<div class="small-12 medium-9 column"> <div class="small-12 medium-9 column">
@@ -23,7 +27,8 @@
<div data-alert class="callout alert margin-top proposal-retired"> <div data-alert class="callout alert margin-top proposal-retired">
<strong> <strong>
<%= t("proposals.show.retired_warning") %><br> <%= t("proposals.show.retired_warning") %><br>
<%= link_to t("proposals.show.retired_warning_link_to_explanation"), "#retired_explanation" %> <%= link_to t("proposals.show.retired_warning_link_to_explanation"),
"#retired_explanation" %>
</strong> </strong>
</div> </div>
<% elsif @proposal.conflictive? %> <% elsif @proposal.conflictive? %>
@@ -101,7 +106,10 @@
<% if @proposal.retired? %> <% if @proposal.retired? %>
<div id="retired_explanation" class="callout"> <div id="retired_explanation" class="callout">
<h2><%= t('proposals.show.retired') %>: <%= t("proposals.retire_options.#{@proposal.retired_reason}") unless @proposal.retired_reason == 'other' %></h2> <h2>
<%= t("proposals.show.retired") %>:
<%= t("proposals.retire_options.#{@proposal.retired_reason}") unless @proposal.retired_reason == 'other' %>
</h2>
<%= simple_format text_with_links(@proposal.retired_explanation), {}, sanitize: false %> <%= simple_format text_with_links(@proposal.retired_explanation), {}, sanitize: false %>
</div> </div>
<% end %> <% end %>