Avoid submit_tag to avoid 'Save changes' default

[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 98fbbaa2d345525ffc4e266fcc0c6fda4bd75cc5..56de810c21fe3efd9446e47404962e2abdeb8468 100644 (file)
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,41 +1,46 @@
-<p id= "notice"><%= notice %></p>
-

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

-       <h1>List of <%= @user_role %> issues:</h1>
+  <h1><%= t ".title" %></h1>

 <% end %>
 
 <%= form_tag(issues_path, :method => :get) do %>
 <% end %>
 
 <%= form_tag(issues_path, :method => :get) do %>

-       <%= text_field_tag :search_by_user, params[:search_by_user], placeholder: "Search by Reported User" %>
-       <%= submit_tag "Search" %>
+<p><%= t ".search_guidance" %></p>
+<%= select :status, nil, [['open', 0], ['resolved', 2], ['ignored', 1]], { :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/>
 <% end %>
 <br/>

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

 <br/>
 
 <table>
 <br/>
 
 <table>

-       <thead>
-               <tr>
-                       <tr>
-                               <td><b> Status </b></td>
-                               <td><b> Number of Reports</b></td>
-                               <td><b> Last updated at</b></td>
-                               <td><b> Link to instance </b></td>
-                               <td><b> Reported User </b></td>
-                               <td></td>
-                       </tr>
-               </tr>
-       </thead>
-       <tbody>
-               <% @issues.each do |issue| %>
-                       <tr>
-                               <td><span class="count-number"> <strong><%= issue.status %></strong></span> </td>
-                               <td><%= issue.reports.count %></td>
-                               <td><%= issue.updated_at.strftime('%H:%M, %m/%d/%y') %></td>
-                               <td> <%= reportable_url(issue.reportable) %></td>
-                               <td><%= link_to issue.user.display_name , :controller => :user, :action => :view,:display_name => issue.user.display_name %></td>
-                               <td><b><%= link_to "Show Reports", issue %></b></td>
-                       </tr>
-               <% end %>
-       </tbody>
+  <thead>
+    <tr>
+      <td><b><%= t ".status" %></b></td>
+      <td><b><%= t ".number_of_reports" %></b></td>
+      <td><b><%= t ".last_updated_at" %></b></td>
+      <td><b><%= t ".last_updated_by" %></b></td>
+      <td><b><%= t ".link_to_reports" %></b></td>
+      <td><b><%= t ".reported_user" %></b></td>
+      <td><b><%= t ".link_to_reported_instance" %></b></td>
+    </tr>
+  </thead>
+  <tbody>
+    <% @issues.each do |issue| %>
+      <tr>
+        <td><%= issue.status.humanize %></td>
+        <td style="text-align:center;"><%= issue.reports_count %></td>
+        <td><%= l(issue.updated_at.to_datetime, :format => :friendly) %></td>
+        <td><% if issue.user_updated %> <%= issue.user_updated.display_name %> <% else %> - <% end %></td>
+        <td><%= reports_url(issue) %></td>
+        <td><%= link_to issue.reported_user.display_name , :controller => :user, :action => :view, :display_name => issue.reported_user.display_name %></td>
+        <td><%= instance_url(issue.reportable) %></td>
+      </tr>
+    <% end %>
+  </tbody>

 </table>
 </table>

-
-