diff --git a/app/assets/stylesheets/petitions/views/_petition-show.scss b/app/assets/stylesheets/petitions/views/_petition-show.scss index 94756fa9a..f981d39af 100644 --- a/app/assets/stylesheets/petitions/views/_petition-show.scss +++ b/app/assets/stylesheets/petitions/views/_petition-show.scss @@ -51,9 +51,13 @@ @include bold-24; margin-bottom: $gutter-two-thirds; } - .label { + .label, .note { display: block; @include core-16; margin-bottom: 5px; } + .note { + color: $secondary-text-colour; + margin-top: 10px; + } } diff --git a/app/views/admin/petitions/_petition_details.html.erb b/app/views/admin/petitions/_petition_details.html.erb index 6afb1867d..62e9d6029 100644 --- a/app/views/admin/petitions/_petition_details.html.erb +++ b/app/views/admin/petitions/_petition_details.html.erb @@ -2,14 +2,6 @@
Status
<%= @petition.state.capitalize %>
-<% if @petition.rejected? or @petition.hidden? -%> -
Rejection reason
-

<%= rejection_reason(@petition.rejection.code) %> 

- -
Rejection text
-
<%= @petition.rejection.details %> 
-<% end -%> - <% unless @petition.in_todo_list? %>
Signatures
<%= number_with_delimiter(@petition.signature_count) %> 
diff --git a/app/views/local_petitions/index.html.erb b/app/views/local_petitions/index.html.erb index afeffe035..276b173af 100644 --- a/app/views/local_petitions/index.html.erb +++ b/app/views/local_petitions/index.html.erb @@ -11,7 +11,7 @@ <% if @constituency.present? %> <% if @constituency.mp %> -

Your MP is <%= link_to @constituency.mp.name, @constituency.mp.url, rel: 'external' %>

+

Your member of parliament is <%= link_to @constituency.mp.name, @constituency.mp.url, rel: 'external' %>

<% end %>
diff --git a/app/views/petitions/_open_petition_show.html.erb b/app/views/petitions/_open_petition_show.html.erb index 291866387..df3a8e81e 100644 --- a/app/views/petitions/_open_petition_show.html.erb +++ b/app/views/petitions/_open_petition_show.html.erb @@ -29,11 +29,12 @@ <%= render 'share_petition', petition: petition %> <% end %> diff --git a/app/views/petitions/_rejected_petition_show.html.erb b/app/views/petitions/_rejected_petition_show.html.erb index 8d4378e65..15f0d8f48 100644 --- a/app/views/petitions/_rejected_petition_show.html.erb +++ b/app/views/petitions/_rejected_petition_show.html.erb @@ -17,7 +17,7 @@

Reasons for rejection

<%= rejection_description(petition.rejection.code) %> <% if petition.rejection.details? %> -

<%= petition.rejection.details %>

+

<%= auto_link(simple_format(petition.rejection.details)) %>

<% end %>