X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/683722ed5c1b3224a04c23b4d175a0638964f713..cf4cfc530ae54abee7b6a0dccbc9d4603ab35611:/app/views/issues/new.html.erb

diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index 2a6cd66f9..499035db6 100644
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -6,16 +6,73 @@
     <%= f.error_messages %>
         <fieldset>
             <div class='form-row'>
-                <%= f.hidden_field :reportable_id, :value => params[:reportable_id] %>
-                <%= f.hidden_field :reportable_type, :value => params[:reportable_type] %>
-                <%= f.hidden_field :user_id, :value => params[:user_id] %>
+                <%= f.hidden_field :reportable_id %>
+                <%= f.hidden_field :reportable_type %>
+                <%= f.hidden_field :reported_user_id %>
             </div>
+
             <div class='form-row'>
-                <label class="standard-label"><%= t 'issue.new.message' -%></label>
-                <%= text_area :report, :details, :cols => 80, :rows => 20, placeholder: "Tell us what's wrong! Any information you can give will go on to help moderators a long way." %>
+                <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} " + t('issues.report_strings.spam') %> <br/>
+                    </div>
+                </div>
+                <br/>
+
+                <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} " + t('issues.report_strings.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} " + t('issues.report_strings.threat') %> <br/>
+                    </div>
+                </div>
+                <br/>
+
+                <% 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} " + t('issues.report_strings.vandal') %> <br/>
+                        </div>
+                    </div>
+                    <br/>
+                <% end %>
+
+                <div class="new-report-form">
+                    <div class="new-report-checkbox">
+                    <%= check_box_tag :other, "[OTHER]" %>
+                    </div>
+                    <div class="new-report-string">
+                        <%= label_tag t('issues.report_strings.other') %> <br/>
+                    </div>
+                </div>
+                <br/>
+
+                <label class="standard-label"><b><%= t 'issue.new.message' -%>: </b></label> <br/>
+                <%= text_area :report, :details, :cols => 80, :rows => 20, placeholder: t('issues.new.details'), required: true %>
             </div>
+
             <div class='buttons'>
                 <%= submit_tag %>
             </div>
+        
         </fieldset>
 <% end %>
\ No newline at end of file