Issue reopens on Reports coming in after instance update

[rails.git] / app / views / issues / new.html.erb

diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
index 476e06be2bfd2f5eb3494718923636c7c0601786..499035db68974e48abbb534f0ad7cd9b1b8a94c7 100644 (file)
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -10,12 +10,69 @@
                 <%= f.hidden_field :reportable_type %>
                 <%= f.hidden_field :reported_user_id %>
             </div>
                 <%= f.hidden_field :reportable_type %>
                 <%= f.hidden_field :reported_user_id %>
             </div>

+

             <div class='form-row'>
             <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>

+

             <div class='buttons'>
                 <%= submit_tag %>
             </div>
             <div class='buttons'>
                 <%= submit_tag %>
             </div>

+        

         </fieldset>
 <% end %>
\ No newline at end of file
         </fieldset>
 <% end %>
\ No newline at end of file