X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/84bdc5d048537729058b0549ab5a15e74a372bb8..cda8ca0607c66db191c0dfa07c275161fb29d74e:/app/views/issues/show.html.erb?ds=sidebyside

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index e8cfafb45..62bd501b7 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,47 +1,55 @@
 <% content_for :heading do %>
-<h2><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h2>
+<h1><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h1>
 <p><%= @issue.reportable.model_name.human %> : <%= link_to reportable_title(@issue.reportable), reportable_url(@issue.reportable) %></p>
-<p class="deemphasize">
+<p class="text-muted">
   <small>
     <%= @issue.assigned_role %>
-    | <%= t ".reports", :count => @issue.reports.count %>
+    <% if @issue.reports.count > 0 %>
+      | <%= t ".reports", :count => @issue.reports.count %>
+    <% else %>
+      | <%= t ".no_reports" %>
+    <% end %>
     | <%= t ".report_created_at", :datetime => l(@issue.created_at.to_datetime, :format => :friendly) %>
-    <%= " | " + t(".last_resolved_at", :datetime => l(@issue.resolved_at.to_datetime, :format => :friendly)) if @issue.resolved_at? %>
-    <%= " | " + t(".last_updated_at", :datetime => l(@issue.updated_at.to_datetime, :format => :friendly), :displayname => @issue.user_updated.display_name) if @issue.user_updated %>
+    <%= " | #{t('.last_resolved_at', :datetime => l(@issue.resolved_at.to_datetime, :format => :friendly))}" if @issue.resolved_at? %>
+    <%= " | #{t('.last_updated_at', :datetime => l(@issue.updated_at.to_datetime, :format => :friendly), :displayname => @issue.user_updated.display_name)}" if @issue.user_updated %>
   </small>
 </p>
-<p>
-  <%= link_to t('.resolve'), resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %>
-  <% if @issue.may_ignore? %>
-  | <%= link_to t('.ignore'), ignore_issue_url(@issue), :method => :post %>
-  <% end %>
-</p>
-<p><%= link_to t('.reopen'), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>
+<nav class="secondary-actions">
+  <ul class="clearfix">
+    <% if @issue.may_resolve? %>
+      <li><%= link_to t(".resolve"), resolve_issue_url(@issue), :method => :post %></li>
+    <% end %>
+    <% if @issue.may_ignore? %>
+      <li><%= link_to t(".ignore"), ignore_issue_url(@issue), :method => :post %></li>
+    <% end %>
+    <% if @issue.may_reopen? %>
+      <li><%= link_to t(".reopen"), reopen_issue_url(@issue), :method => :post %></li>
+    <% end %>
+  </ul>
+</nav>
 <% end %>
 
-<div class="report-related-block">
-
-  <div class="report-block">
+<div class="row">
+  <div class="col-md-8">
     <h3><%= t ".reports_of_this_issue" %></h3>
 
     <% if @read_reports.present? %>
-    <div class="read-reports">
+    <div class="bg-light text-muted">
       <h4><%= t ".read_reports" %></h4>
-      <%= render 'reports', reports: @read_reports %>
+      <%= render "reports", :reports => @read_reports %>
     </div>
     <% end %>
 
     <% if @unread_reports.any? %>
-    <div class="unread-reports">
+    <div>
       <h4><%= t ".new_reports" %></h4>
-      <%= render 'reports', reports: @unread_reports %>
+      <%= render "reports", :reports => @unread_reports %>
     </div>
     <% end %>
-    <br/>
   </div>
 
   <% if @issue.reported_user %>
-    <div class="related-reports">
+    <div class="col-md-4">
       <h3><%= t ".other_issues_against_this_user" %></h3>
       <% if @related_issues.count > 1 %>
         <ul>
@@ -59,4 +67,4 @@
 </div>
 
 <h3><%= t ".comments_on_this_issue" %></h3>
-<%= render 'comments', comments: @comments %>
+<%= render "comments", :comments => @comments %>