cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Converge redaction forms to use bootstrap

Browse source
This commit is contained in:
Andy Allan 2021-01-27 17:04:47 +00:00
parent c0adab7aba
commit eabc7f330b
4 changed files with 14 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/views/redactions/edit.html.erb
View file

@ -4,18 +4,8 @@
<h1><%= t ".heading" %></h1> <h1><%= t ".heading" %></h1>
<% end %> <% end %>
<%= form_for(@redaction, :html => { :class => "standard-form" }) do |f| %> <%= bootstrap_form_for(@redaction) do |f| %>
<%= f.error_messages %> <%= f.text_field :title %>
<%= f.richtext_field :description, :cols => 80, :rows => 20, :format => @redaction.description_format %>
<p> <%= f.primary %>
<%= f.label :title, t(".title") %><br />
<%= f.text_field :title %>
</p>
<p>
<%= f.label :description, t(".description") %><br />
<%= richtext_area :redaction, :description, :cols => 80, :rows => 20, :format => @redaction.description_format %>
</p>
<p>
<%= f.submit %>
</p>
<% end %> <% end %>

18
app/views/redactions/new.html.erb
View file

@ -3,18 +3,8 @@
<h1><%= t ".heading" %></h1> <h1><%= t ".heading" %></h1>
<% end %> <% end %>
<%= form_for(@redaction, :html => { :class => "standard-form" }) do |f| %> <%= bootstrap_form_for(@redaction) do |f| %>
<%= f.error_messages %> <%= f.text_field :title %>
<%= f.richtext_field :description, :cols => 80, :rows => 20, :format => @redaction.description_format %>
<p> <%= f.primary %>
<%= f.label :title, t(".title") %><br />
<%= f.text_field :title %>
</p>
<p>
<%= f.label :description, t(".description") %><br />
<%= richtext_area :redaction, :description, :cols => 80, :rows => 20, :format => @redaction.description_format %>
</p>
<p>
<%= f.submit %>
</p>
<% end %> <% end %>

6
app/views/redactions/show.html.erb
View file

@ -13,12 +13,12 @@
</div> </div>
<% if can?(:edit, Redaction) || can?(:destroy, Redaction) %> <% if can?(:edit, Redaction) || can?(:destroy, Redaction) %>
<div class="buttons"> <div>
<% if can?(:edit, Redaction) %> <% if can?(:edit, Redaction) %>
<%= button_to t(".edit"), edit_redaction_path(@redaction), :method => :get %></td> <%= link_to t(".edit"), edit_redaction_path(@redaction), :class => "btn btn-outline-primary" %>
<% end %> <% end %>
<% if can?(:destroy, Redaction) %> <% if can?(:destroy, Redaction) %>
<%= button_to t(".destroy"), @redaction, :method => "delete", :remote => true, :data => { :confirm => t(".confirm") } %> <%= link_to t(".destroy"), @redaction, :method => "delete", :class => "btn btn-outline-danger", :remote => true, :data => { :confirm => t(".confirm") } %>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>

5
config/locales/en.yml
View file

@ -116,6 +116,9 @@ en:
title: "Subject" title: "Subject"
body: "Body" body: "Body"
recipient: "Recipient" recipient: "Recipient"
redaction:
title: Title
description: Description
report: report:
category: Select a reason for your report category: Select a reason for your report
details: Please provide some more details about the problem (required). details: Please provide some more details about the problem (required).
@ -2841,7 +2844,6 @@ en:
centre_map: Centre map here centre_map: Centre map here
redactions: redactions:
edit: edit:
description: "Description"
heading: "Edit redaction" heading: "Edit redaction"
title: "Edit redaction" title: "Edit redaction"
index: index:
@ -2849,7 +2851,6 @@ en:
heading: "List of redactions" heading: "List of redactions"
title: "List of redactions" title: "List of redactions"
new: new:
description: "Description"
heading: "Enter information for new redaction" heading: "Enter information for new redaction"
title: "Creating new redaction" title: "Creating new redaction"
show: show: