Reposition the note and user report flags

[rails.git] / app / views / issues / index.html.erb

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index a599abb994ec4907dae06a8de4164bcca495cc38..2980f5e0199d81b4182f37b8e9f2c57c425eb98a 100644 (file)
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,36 +1,44 @@
-<p id= "notice"><%= notice %></p>
-

 <% content_for :heading do %>
 <% content_for :heading do %>

-       <h1>List of existing Issues:</h1>
+  <h1><%= t ".title" %></h1>

 <% end %>
 
 <% end %>
 

-<table>
-       <thead>
-               <tr>
-                       <tr>
-                               <td style="text-align:center"><b> # </b> </td>
-                               <td style="text-align:center"><b>Issue Type </b></td>
-                               <td style="text-align:center"><b> Status </b></td>
-                               <td style="text-align:center"><b> Number of Reports</b></td>
-                               <td style="text-align:center"><b> Link to instance </b></td>
-                               <td style="text-align:center"><b> Reported User </b></td>
-                               <td style="text-align:center"></td>
-                       </tr>
-               </tr>
-       </thead>
-       <tbody>
-               <% @issues.each do |issue| %>
-                       <tr>
-                               <td style="text-align:center">Issue #<%= issue.id %> </td>
-                               <td style="text-align:center"> <%= issue.reportable_type %></td>
-                               <td style="text-align:center"><span class="count-number"> <strong><%= issue.status %></strong></span> </td>
-                               <td style="text-align:center"><%= issue.reports.count %></td>
-                               <td style="text-align:center"> <%= reportable_url(issue.reportable) %></td>
-                               <td style="text-align:center"><%= link_to issue.user.display_name , :controller => :user, :action => :view,:display_name => issue.user.display_name %></td>
-                               <td style="text-align:center"><%= link_to "Show Issue", issue %></td>
-                       </tr>
-               <% end %>
-       </tbody>
-</table>
+<%= form_tag(issues_path, :method => :get) do %>
+<p><%= t ".search_guidance" %></p>
+<%= select :status, nil, Issue.aasm.states.map(&:name).map{|state| [t("issues.states.#{state}"), state]}, { :include_blank => t(".select_status")}, data: { behavior: 'category_dropdown' } %>
+<%= select :issue_type, nil, @issue_types, { :include_blank => t(".select_type")}, data: { behavior: 'category_dropdown' } %>
+<%= text_field_tag :search_by_user, params[:search_by_user], placeholder: t(".reported_user") %>
+<%= select :last_updated_by, nil, @users.all.collect  {|f| [f.display_name, f.id]} << [ t(".not_updated"), "nil"], { :include_blank => t(".select_last_updated_by")}, data: { behavior: 'category_dropdown' } %>
+<%= submit_tag t(".search") %>
+<% end %>
+<br/>

 
 

+<% if @issues.length == 0 %>
+  <p><%= t ".issues_not_found" %></p>
+<% end %>
+
+<br/>

 
 

+<table>
+  <thead>
+    <tr>
+      <td><b><%= t ".status" %></b></td>
+      <td><b><%= t ".reports" %></b></td>
+      <td><b><%= t ".reported_item" %></b></td>
+      <td><b><%= t ".reported_user" %></b></td>
+      <td><b><%= t ".last_updated_by" %></b></td>
+      <td><b><%= t ".last_updated_at" %></b></td>
+    </tr>
+  </thead>
+  <tbody>
+    <% @issues.each do |issue| %>
+      <tr>
+        <td><%= t "issues.states.#{issue.status}" %></td>
+        <td><%= link_to t(".reports_count", :count => issue.reports_count), issue %></td>
+        <td><%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %></td>
+        <td><%= link_to issue.reported_user.display_name, :controller => :user, :action => :view, :display_name => issue.reported_user.display_name if issue.reported_user %></td>
+        <td><% if issue.user_updated %> <%= issue.user_updated.display_name %> <% else %> - <% end %></td>
+        <td><%= l(issue.updated_at.to_datetime, :format => :friendly) %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>