From: Tom Hughes Date: Thu, 28 Jan 2021 10:36:38 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/3073' X-Git-Tag: live~2780 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f9811827317220eac86a16d7d9a2f67205d35ff1?hp=d257e678429a84c6759f8d64566a91a2f61bfca8 Merge remote-tracking branch 'upstream/pull/3073' --- diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index d44e0bb3d..1a792e873 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -47,26 +47,28 @@ <% if @note.status == "open" %> <% if current_user -%> -
- -
+ +
+ +
+
<% if current_user.moderator? -%> - " class="deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, "json") %>"> + " class="btn btn-light" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, "json") %>"> <% end -%> - " data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= close_note_url(@note, "json") %>"> - " data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= comment_note_url(@note, "json") %>" disabled="1"> + " class="btn btn-primary" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= close_note_url(@note, "json") %>"> + " class="btn btn-primary" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= comment_note_url(@note, "json") %>" disabled="1">
<% end -%> <% else %> -
+ -
+
<% if current_user and current_user.moderator? -%> - " class="deemphasize" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, "json") %>"> + " class="btn btn-light" data-note-id="<%= @note.id %>" data-method="DELETE" data-url="<%= note_url(@note, "json") %>"> <% end -%> <% if current_user -%> - " data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_note_url(@note, "json") %>"> + " class="btn btn-primary" data-note-id="<%= @note.id %>" data-method="POST" data-url="<%= reopen_note_url(@note, "json") %>"> <% end -%>
diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb index a04022304..6a90dbbff 100644 --- a/app/views/issues/_comments.html.erb +++ b/app/views/issues/_comments.html.erb @@ -1,4 +1,4 @@ -
+
<% comments.each do |comment| %>
@@ -13,13 +13,13 @@
<% end %>
-
-
- <%= form_for @new_comment, :url => issue_comments_path(@issue) do |f| %> - <%= richtext_area :issue_comment, :body, :cols => 10, :rows => 8, :required => true %> - <%= label_tag :reassign, t(".reassign_param") %> <%= check_box_tag :reassign, true %> -
-
- <%= f.submit %> + +
+ <%= bootstrap_form_for @new_comment, :url => issue_comments_path(@issue) do |f| %> + <%= f.richtext_field :body, :cols => 80, :rows => 20, :hide_label => true %> + <%= f.form_group do %> + <%= f.check_box :reassign, { :label => t(".reassign_param"), :id => "reassign", :name => "reassign", :checked => false }, true, false %> + <% end %> + <%= f.primary %> <% end %>
diff --git a/app/views/redactions/edit.html.erb b/app/views/redactions/edit.html.erb index aff2af919..e9b5beaac 100644 --- a/app/views/redactions/edit.html.erb +++ b/app/views/redactions/edit.html.erb @@ -4,18 +4,8 @@

<%= t ".heading" %>

<% end %> -<%= form_for(@redaction, :html => { :class => "standard-form" }) do |f| %> - <%= f.error_messages %> - -

- <%= f.label :title, t(".title") %>
- <%= f.text_field :title %> -

-

- <%= f.label :description, t(".description") %>
- <%= richtext_area :redaction, :description, :cols => 80, :rows => 20, :format => @redaction.description_format %> -

-

- <%= f.submit %> -

+<%= bootstrap_form_for(@redaction) do |f| %> + <%= f.text_field :title %> + <%= f.richtext_field :description, :cols => 80, :rows => 20, :format => @redaction.description_format %> + <%= f.primary %> <% end %> diff --git a/app/views/redactions/new.html.erb b/app/views/redactions/new.html.erb index 02e729b35..64089b2b0 100644 --- a/app/views/redactions/new.html.erb +++ b/app/views/redactions/new.html.erb @@ -3,18 +3,8 @@

<%= t ".heading" %>

<% end %> -<%= form_for(@redaction, :html => { :class => "standard-form" }) do |f| %> - <%= f.error_messages %> - -

- <%= f.label :title, t(".title") %>
- <%= f.text_field :title %> -

-

- <%= f.label :description, t(".description") %>
- <%= richtext_area :redaction, :description, :cols => 80, :rows => 20, :format => @redaction.description_format %> -

-

- <%= f.submit %> -

+<%= bootstrap_form_for(@redaction) do |f| %> + <%= f.text_field :title %> + <%= f.richtext_field :description, :cols => 80, :rows => 20, :format => @redaction.description_format %> + <%= f.primary %> <% end %> diff --git a/app/views/redactions/show.html.erb b/app/views/redactions/show.html.erb index cf5116ede..22d17cd5d 100644 --- a/app/views/redactions/show.html.erb +++ b/app/views/redactions/show.html.erb @@ -13,12 +13,12 @@
<% if can?(:edit, Redaction) || can?(:destroy, Redaction) %> -
+
<% if can?(:edit, Redaction) %> - <%= button_to t(".edit"), edit_redaction_path(@redaction), :method => :get %> + <%= link_to t(".edit"), edit_redaction_path(@redaction), :class => "btn btn-outline-primary" %> <% end %> <% 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 %> diff --git a/config/locales/en.yml b/config/locales/en.yml index ea24854c6..f2f5616a8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -116,6 +116,9 @@ en: title: "Subject" body: "Body" recipient: "Recipient" + redaction: + title: Title + description: Description report: category: Select a reason for your report details: Please provide some more details about the problem (required). @@ -2841,7 +2844,6 @@ en: centre_map: Centre map here redactions: edit: - description: "Description" heading: "Edit redaction" title: "Edit redaction" index: @@ -2849,7 +2851,6 @@ en: heading: "List of redactions" title: "List of redactions" new: - description: "Description" heading: "Enter information for new redaction" title: "Creating new redaction" show: