Merge remote-tracking branch 'upstream/pull/2280'

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

diff --git a/app/views/reports/new.html.erb b/app/views/reports/new.html.erb
index 7023667fe7317737428ccbeb69ed7ce3cfbb82ec..f152049ef51737d42d7a56ffeacf1bca6e05a7ac 100644 (file)
--- a/app/views/reports/new.html.erb
+++ b/app/views/reports/new.html.erb
@@ -3,11 +3,11 @@
 <% end %>
 
 <div class="report-disclaimer">
 <% end %>
 
 <div class="report-disclaimer">

-  <%= t('.disclaimer.intro') %>
+  <%= t(".disclaimer.intro") %>

   <ul>
   <ul>

-    <li> <%= t('.disclaimer.not_just_mistake') %> </li>
-    <li> <%= t('.disclaimer.unable_to_fix') %> </li>
-    <li> <%= t('.disclaimer.resolve_with_user') %> </li>
+    <li> <%= t(".disclaimer.not_just_mistake") %> </li>
+    <li> <%= t(".disclaimer.unable_to_fix") %> </li>
+    <li> <%= t(".disclaimer.resolve_with_user") %> </li>

   </ul>
 </div>
 
   </ul>
 </div>
 


@@ -20,19 +20,19 @@
     <% end %>
 
     <div class='form-row'>
     <% end %>
 
     <div class='form-row'>

-      <p><%= t('.select') %></p>
+      <p><%= t(".select") %></p>

       <ul>
       <% Report.categories_for(@report.issue.reportable).each do |c| %>
         <li>
       <ul>
       <% Report.categories_for(@report.issue.reportable).each do |c| %>
         <li>

-          <%= radio_button :report, :category, c %>
-          <%= label_tag "report_category_#{c}", t(".categories.#{@report.issue.reportable.class.name.underscore}.#{c}") %> <br/>
+          <%= radio_button :report, :category, c, :required => true %>
+          <%= label_tag "report_category_#{c}", t(".categories.#{@report.issue.reportable.class.name.underscore}.#{c}_label") %> <br />

         </li>
       <% end %>
       </ul>
     </div>
 
     <div class='form-row'>
         </li>
       <% end %>
       </ul>
     </div>
 
     <div class='form-row'>

-      <%= text_area :report, :details, :cols => 20, :rows => 5, placeholder: t('.details'), required: true %>
+      <%= text_area :report, :details, :cols => 20, :rows => 5, :placeholder => t(".details") %>

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