Fixed existing tests

[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 2a6cd66f943bb8826e33e85a0871234784e3034b..e42ec19a627e101eb01dfca5d69f136d2ff04f39 100644 (file)
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -1,21 +1,38 @@
 <% content_for :heading do %>
 <% 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'>
 <% end %>
 
 <%= form_for(@issue) do |f| %>
     <%= 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>

+

             <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>
+
+                <% @report_strings_yaml.each do |k,v| %>
+                    <div class="new-report-form">
+                        <div class="new-report-checkbox">
+                        <%= radio_button_tag :report_type, v[:type].to_s %>
+                        </div>
+                        <div class="new-report-string">
+                            <%= label_tag v[:details].to_s %> <br/>
+                        </div>
+                    </div>
+                    <br/>
+                <% end %> 
+                
+                <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