X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/63992d83bdf3c2489e10504957bb57ed29976803..7b05c1c060f3f85f47413ec7db984180514d3ba6:/app/views/reports/new.html.erb?ds=sidebyside

diff --git a/app/views/reports/new.html.erb b/app/views/reports/new.html.erb
index a39b5b151..8106ccfc9 100644
--- a/app/views/reports/new.html.erb
+++ b/app/views/reports/new.html.erb
@@ -1,42 +1,23 @@
 <% content_for :heading do %>
-  <h1>Report <%= reportable_url(@report.issue.reportable) %></h1>
+  <h1><%= t ".title_html", :link => link_to(reportable_title(@report.issue.reportable), reportable_url(@report.issue.reportable)) %></h1>
 <% end %>
 
-<div class="disclaimer">
-  <ul>
-    <%= t('issues.new.disclaimer.intro') %>:
-      <li> <%= t('issues.new.disclaimer.not_just_mistake') %> </li>
-      <li> <%= t('issues.new.disclaimer.unable_to_fix') %> </li>
-      <li> <%= t('issues.new.disclaimer.resolve_with_user') %> </li>
-    </ul>
+<div class="alert alert-warning">
+  <%= t(".disclaimer.intro") %>
+  <ul class="mb-0">
+    <li> <%= t(".disclaimer.not_just_mistake") %> </li>
+    <li> <%= t(".disclaimer.unable_to_fix") %> </li>
+    <li> <%= t(".disclaimer.resolve_with_user") %> </li>
+  </ul>
 </div>
 
-<%= form_for(@report) do |f| %>
-  <%= f.error_messages %>
-  <fieldset>
-    <%= f.fields_for @report.issue do |issue_form| %>
-      <%= issue_form.hidden_field :reportable_id %>
-      <%= issue_form.hidden_field :reportable_type %>
-    <% end %>
+<%= bootstrap_form_for(@report) do |f| %>
+  <%= f.fields_for @report.issue do |issue_form| %>
+    <%= issue_form.hidden_field :reportable_id %>
+    <%= issue_form.hidden_field :reportable_type %>
+  <% end %>
 
-    <div class='form-row' style='width:600px'>
-      <p><%= t('issues.new.select') %>:</p>
-
-      <div class="new-report-form">
-        <% Report.categories_for(@report.issue.reportable).each do |c| %>
-          <div style="padding-left:5px">
-            <%= radio_button :report, :category, c %>
-            <%= label_tag "report_category_#{c}", t("reports.categories.#{@report.issue.reportable.class.name}.#{c}") %> <br/>
-          </div>
-        <% end %>
-      </div>
-
-      <br/>
-      <%= text_area :report, :details, :cols => 20, :rows => 3, placeholder: t('issues.new.details'), required: true %>
-    </div>
-
-    <div class='buttons'>
-      <%= submit_tag %>
-    </div>
-  </fieldset>
+  <%= f.collection_radio_buttons :category, report_categories(@report.issue.reportable), :id, :label %>
+  <%= f.richtext_field :details, :rows => 18, :label_as_placeholder => true, :format => "markdown" %>
+  <%= f.primary %>
 <% end %>