X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d5f02968f6f2dd153c74844e818a4d2b2ae24991..c3ad6aa2923c03aeeea0b57033b0a9238d262aa2:/app/views/issues/new.html.erb

diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index 5f9c7ce08..dc2ee044e 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -1,78 +1,43 @@
 <% content_for :heading do %>
-    <h1>Report a new Issue for <%= reportable_url(@issue.reportable) %></h1>
+  <h1>Report <%= reportable_url(@issue.reportable) %></h1>
 <% end %>
 
-<%= form_for(@issue) do |f| %>
-    <%= f.error_messages %>
-        <fieldset>
-            <div class='form-row'>
-                <%= f.hidden_field :reportable_id %>
-                <%= f.hidden_field :reportable_type %>
-                <%= f.hidden_field :reported_user_id %>
-            </div>
-
-            <div class='form-row'>
-                <p>Select one (or more) reasons for your report:</p>
-                
-                <div class="new-report-form">
-                    <div class="new-report-checkbox">
-                    <%= check_box_tag :spam, "[SPAM]" %>
-                    </div>
-                    <div class="new-report-string">
-                        <%= label_tag "This #{@issue.reportable.class.name} is/contains spam." %> <br/>
-                    </div>
-                </div>
-                <br/>
+<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>
 
-                <div class="new-report-form">
-                    <div class="new-report-checkbox">
-                    <%= check_box_tag :offensive, "[OFFENSIVE]" %>
-                    </div>
-                    <div class="new-report-string">
-                        <%= label_tag "This #{@issue.reportable.class.name} is obscene/offensive." %> <br/>
-                    </div>
-                </div>
-                <br/>
-                
-                <div class="new-report-form">
-                    <div class="new-report-checkbox">
-                    <%= check_box_tag :threat, "[THREAT]" %>
-                    </div>
-                    <div class="new-report-string">
-                        <%= label_tag "This #{@issue.reportable.class.name} contains a threat." %> <br/>
-                    </div>
-                </div>
-                <br/>
+<%= form_for(@issue) do |f| %>
+  <%= f.error_messages %>
+  <fieldset>
+    <div class='form-row'>
+      <%= f.hidden_field :reportable_id %>
+      <%= f.hidden_field :reportable_type %>
+      <%= f.hidden_field :reported_user_id %>
+    </div>
 
-                <% if @issue.reportable.class.name == "User" %>
-                    <div class="new-report-form">
-                        <div class="new-report-checkbox">
-                        <%= check_box_tag :vandal, "[VANDAL]" %>
-                        </div>
-                        <div class="new-report-string">
-                            <%= label_tag "This #{@issue.reportable.class.name} is a vandal." %> <br/>
-                        </div>
-                    </div>
-                    <br/>
-                <% end %>
+    <div class='form-row' style='width:600px'>
+      <p><%= t('issues.new.select') %>:</p>
 
-                <div class="new-report-form">
-                    <div class="new-report-checkbox">
-                    <%= check_box_tag :other, "[OTHER]" %>
-                    </div>
-                    <div class="new-report-string">
-                        <%= label_tag "Other." %> <br/>
-                    </div>
-                </div>
-                <br/>
+      <div class="new-report-form">
+        <% @report_strings_yaml.each do |k,v| %>
+          <div style="padding-left:5px">
+            <%= radio_button_tag :report_type, v[:type].to_s %>
+            <%= label_tag v[:details].to_s %> <br/>
+          </div>
+        <% end %>
+      </div>
 
-                <label class="standard-label"><b><%= t 'issue.new.message' -%>: </b></label> <br/>
-                <%= text_area :report, :details, :cols => 80, :rows => 20, placeholder: "Please provide some more details into the problem. (This field cannot be left blank!)" %>
-            </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>
-<% end %>
\ No newline at end of file
+    <div class='buttons'>
+      <%= submit_tag %>
+    </div>
+  </fieldset>
+<% end %>