Merge branch 'master' into moderation

[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 7acf91d9c40354b858753d1f83280dda6a7eaca5..9812c6806f2c0c59e999f9426ecd48e06de32242 100644 (file)
--- a/app/views/reports/new.html.erb
+++ b/app/views/reports/new.html.erb
@@ -1,14 +1,14 @@
 <% content_for :heading do %>
-  <h1><%= t ".title_html", :link => reportable_url(@report.issue.reportable) %></h1>
+  <h1><%= t ".title_html", :link => link_to(reportable_title(@report.issue.reportable), reportable_url(@report.issue.reportable)) %></h1>
 <% end %>
 
-<div class="disclaimer">
+<div class="report-disclaimer">
+  <%= t('issues.new.disclaimer.intro') %>
   <ul>
-    <%= t('issues.new.disclaimer.intro') %>:
-      <li> <%= t('issues.new.disclaimer.not_just_mistake') %> </li>
-      <li> <%= t('issues.new.disclaimer.unable_to_fix') %> </li>
-      <li> <%= t('issues.new.disclaimer.resolve_with_user') %> </li>
-    </ul>
+    <li> <%= t('issues.new.disclaimer.not_just_mistake') %> </li>
+    <li> <%= t('issues.new.disclaimer.unable_to_fix') %> </li>
+    <li> <%= t('issues.new.disclaimer.resolve_with_user') %> </li>
+  </ul>
 </div>
 
 <%= form_for(@report) do |f| %>
@@ -19,20 +19,20 @@
       <%= issue_form.hidden_field :reportable_type %>
     <% end %>
 
-    <div class='form-row' style='width:600px'>
-      <p><%= t('issues.new.select') %>:</p>
-
-      <div class="new-report-form">
-        <% Report.categories_for(@report.issue.reportable).each do |c| %>
-          <div style="padding-left:5px">
-            <%= radio_button :report, :category, c %>
-            <%= label_tag "report_category_#{c}", t("reports.categories.#{@report.issue.reportable.class.name}.#{c}") %> <br/>
-          </div>
-        <% end %>
-      </div>
+    <div class='form-row'>
+      <p><%= t('issues.new.select') %></p>
+      <ul>
+      <% Report.categories_for(@report.issue.reportable).each do |c| %>
+        <li>
+          <%= radio_button :report, :category, c %>
+          <%= label_tag "report_category_#{c}", t("reports.categories.#{@report.issue.reportable.class.name}.#{c}") %> <br/>
+        </li>
+      <% end %>
+      </ul>
+    </div>
 
-      <br/>
-      <%= text_area :report, :details, :cols => 20, :rows => 3, placeholder: t('issues.new.details'), required: true %>
+    <div class='form-row'>
+      <%= text_area :report, :details, :cols => 20, :rows => 5, placeholder: t('issues.new.details'), required: true %>
     </div>
 
     <div class='buttons'>