UI changes + Redirection after creating report fixed

[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..a2f43e9553f3a01c07b90a2c5d0138f3b0026c35 100644 (file)
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -1,21 +1,44 @@
 <% content_for :heading do %>
-    <h1>Report a new Issue for <%= reportable_url(@issue.reportable) %></h1>
+    <h1>Report <%= reportable_url(@issue.reportable) %></h1>
 <% end %>
 
+<div class="disclaimer">
+    <ul>
+    <%= t('issues.new.disclaimer.placeholder') %>:
+        <li> --> <%= t('issues.new.disclaimer.placeholder1') %> </li>   
+        <li> --> <%= t('issues.new.disclaimer.placeholder2') %> </li>   
+        <li> --> <%= t('issues.new.disclaimer.placeholder3') %> </li>   
+    </ul>
+</div>
+
 <%= 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 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." %>
+
+            <div class='form-row' style='width:600px'>
+                <p><%= t('issues.new.select') %>:</p>
+
+                <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>
+                
+                <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