Fix api_keys index list design and some labels to destroy item

8 files changed, 39 insertions, 20 deletions

diff --git a/app/views/api_keys/_api_key.html.erb b/app/views/api_keys/_api_key.html.erb
index 6492af3b0..c81953311 100644
--- a/app/views/api_keys/_api_key.html.erb
+++ b/app/views/api_keys/_api_key.html.erb
@@ -1,12 +1,30 @@
-<%= div_for(api_key) do %>
-    <%= api_key.token %>
-  <div class="info">
-    <%= api_key.class.human_attribute_name('name') %> <%= api_key.name %> -
-    <%= api_key.class.human_attribute_name('updated_at') %> <%= l(api_key.updated_at) %>
-    <div class="actions">  
-      <%= link_to t("actions.edit"), edit_referential_api_key_path(@referential, api_key), :class => "edit" %> |
-      <%= link_to t("actions.destroy"), referential_api_key_path(@referential, api_key), :method => :delete, :data => {:confirm =>  t('api_keys.actions.destroy_confirm')}, :class => "remove" %>
-    </div>
+<div id="index_item" class="panel panel-default api_key">
+  <div class="panel-heading">
+    <div class="panel-title clearfix">
+      <span class="pull-right">                
+        <%= link_to edit_referential_api_key_path(@referential, api_key), :class => "btn btn-default btn-sm" do %>
+          <span class="fa fa-pencil"></span>
+        <% end %>
+        <%= link_to referential_api_key_path(@referential, api_key), :method => :delete, :data => {:confirm =>  t('api_keys.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
+          <span class="fa fa-trash-o"></span>
+        <% end %>
+      </span>
+      <h5>
+        <%= link_to([@referential, api_key], :class => "preview", :title => "#{Chouette::StopArea.model_name.human.capitalize} #{api_key.name}") do %>        
+        <span class="name">
+          <%= truncate(api_key.name, :length => 20) %>          
+        </span>
+        <% end %>
+      </h5>
+    </div>                          
   </div>
-<% end %>
+  <div class="panel-body">
+    <p>      
+      <%= api_key.class.human_attribute_name('token') %> <%= truncate(api_key.token, :length => 20) %>
+    </p>
+    <p>
+      <%= api_key.class.human_attribute_name('updated_at') %> <%= l(api_key.updated_at) %>
+    </p>
+  </div>
+</div>
 
diff --git a/app/views/connection_links/_connection_link.erb b/app/views/connection_links/_connection_link.erb
index 5f7b12ec5..7996eb0f3 100644
--- a/app/views/connection_links/_connection_link.erb
+++ b/app/views/connection_links/_connection_link.erb
@@ -5,7 +5,7 @@
         <%= link_to edit_referential_connection_link_path(@referential, connection_link), :class => "btn btn-default btn-sm" do %>
           <span class="fa fa-pencil"></span>
         <% end %>
-        <%= link_to referential_connection_link_path(@referential, connection_link), :method => :delete, :data => {:confirm =>  t('companies.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
+        <%= link_to referential_connection_link_path(@referential, connection_link), :method => :delete, :data => {:confirm =>  t('connection_links.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
           <span class="fa fa-trash-o"></span>
         <% end %>
       </span>
diff --git a/app/views/journey_patterns/_journey_pattern.html.erb b/app/views/journey_patterns/_journey_pattern.html.erb
index 52a1fd89f..1bc34b2e4 100644
--- a/app/views/journey_patterns/_journey_pattern.html.erb
+++ b/app/views/journey_patterns/_journey_pattern.html.erb
@@ -2,7 +2,7 @@
   <div class="panel-heading">
     <div class="panel-title clearfix">
       <span class="pull-right">                
-        <%= link_to referential_line_route_journey_pattern_path(@referential, @line, @route, journey_pattern), :method => :delete, :data => {:confirm =>  t('companies.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
+        <%= link_to referential_line_route_journey_pattern_path(@referential, @line, @route, journey_pattern), :method => :delete, :data => {:confirm =>  t('journey_patterns.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
           <span class="fa fa-trash-o"></span>
         <% end %>
       </span>
diff --git a/app/views/referentials/_referential.erb b/app/views/referentials/_referential.erb
index f0df7eccb..1f985bc65 100644
--- a/app/views/referentials/_referential.erb
+++ b/app/views/referentials/_referential.erb
@@ -5,7 +5,7 @@
         <%= link_to edit_referential_path(referential), :class => "btn btn-default btn-sm" do %>
           <span class="fa fa-pencil"></span>
         <% end %>
-        <%= link_to referential_path(referential), :method => :delete, :data => {:confirm =>  t('companies.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
+        <%= link_to referential_path(referential), :method => :delete, :data => {:confirm =>  t('referentials.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
           <span class="fa fa-trash-o"></span>
         <% end %>
       </span>
diff --git a/app/views/referentials/show.html.erb b/app/views/referentials/show.html.erb
index 5286f7ee7..d8e209c7f 100644
--- a/app/views/referentials/show.html.erb
+++ b/app/views/referentials/show.html.erb
@@ -42,11 +42,12 @@
     </tr>
   </table>
 
-  <h3 class="api_keys"><%= t('.api_keys') %></h3>
-  
-  <div class="api_keys">
-    <%= render :partial => "api_keys/api_key", :collection => @referential.api_keys %>
+  <% if @referential.api_keys.present? %>
+  <h3 class="api_keys"><%= t('.api_keys') %></h3>  
+  <div class="api_keys paginated_content">
+    <%= paginated_content(@referential.api_keys, "api_keys/api_key") %>
   </div>
+  <% end %>
 </div>  
 
 <% content_for :sidebar do %>
diff --git a/app/views/routes/_route.html.erb b/app/views/routes/_route.html.erb
index 5a9e1f2a5..0fee47cd1 100644
--- a/app/views/routes/_route.html.erb
+++ b/app/views/routes/_route.html.erb
@@ -5,7 +5,7 @@
         <%= link_to edit_referential_line_route_path(@referential, @line, route), :class => "btn btn-default btn-sm" do %>
           <span class="fa fa-pencil"></span>
         <% end %>
-        <%= link_to referential_line_route_path(@referential, @line, route), :method => :delete, :data => {:confirm =>  t('companies.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
+        <%= link_to referential_line_route_path(@referential, @line, route), :method => :delete, :data => {:confirm =>  t('routes.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
           <span class="fa fa-trash-o"></span>
         <% end %>
       </span>
diff --git a/app/views/stop_areas/_stop_area.html.erb b/app/views/stop_areas/_stop_area.html.erb
index 2ae61b42d..6f3a22fa7 100644
--- a/app/views/stop_areas/_stop_area.html.erb
+++ b/app/views/stop_areas/_stop_area.html.erb
@@ -5,7 +5,7 @@
         <%= link_to edit_referential_stop_area_path(@referential, stop_area), :class => "btn btn-default btn-sm" do %>
           <span class="fa fa-pencil"></span>
         <% end %>
-        <%= link_to referential_stop_area_path(@referential, stop_area), :method => :delete, :data => {:confirm =>  t('companies.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
+        <%= link_to referential_stop_area_path(@referential, stop_area), :method => :delete, :data => {:confirm =>  t('stop_areas.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
           <span class="fa fa-trash-o"></span>
         <% end %>
       </span>
diff --git a/app/views/time_tables/_time_table.html.erb b/app/views/time_tables/_time_table.html.erb
index 5d7042e47..1eeb42541 100644
--- a/app/views/time_tables/_time_table.html.erb
+++ b/app/views/time_tables/_time_table.html.erb
@@ -5,7 +5,7 @@
         <%= link_to edit_referential_time_table_path(@referential, time_table), :class => "btn btn-default btn-sm" do %>
           <span class="fa fa-pencil"></span>
         <% end %>
-        <%= link_to referential_time_table_path(@referential, time_table), :method => :delete, :data => {:confirm =>  t('companies.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
+        <%= link_to referential_time_table_path(@referential, time_table), :method => :delete, :data => {:confirm =>  t('time_tables.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
           <span class="fa fa-trash-o"></span>
         <% end %>
       </span>