5 files changed, 33 insertions, 34 deletions
diff --git a/app/views/journey_patterns/_journey_pattern.html.erb b/app/views/journey_patterns/_journey_pattern.html.erb
index 821d3ef47..52a1fd89f 100644
--- a/app/views/journey_patterns/_journey_pattern.html.erb
+++ b/app/views/journey_patterns/_journey_pattern.html.erb
@@ -1,16 +1,29 @@
-<%= div_for(journey_pattern) do %>
-  <%= link_to journey_name(journey_pattern), [@referential, @line, @route, journey_pattern] %>
-  <div class="info">
+<div id="index_item" class="panel panel-default journey_pattern">
+  <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 %>
+          <span class="fa fa-trash-o"></span>
+        <% end %>
+      </span>
+      <h5>
+        <%= link_to([@referential, @line, @route, journey_pattern], :class => "preview", :title => "#{Chouette::JourneyPattern.model_name.human.capitalize} #{journey_pattern.name}") do %>        
+        <span class="name">
+          <%= truncate(journey_pattern.name, :length => 20) %>
+        </span>
+        <% end %>
+      </h5>
+    </div>                          
+  </div>
+  <div class="panel-body">
     <% unless journey_pattern.stop_points.empty? %>
-      <%= t('.from_to', :departure => journey_pattern.stop_points.first.stop_area.name, :arrival => journey_pattern.stop_points.last.stop_area.name) %>
-    <% end %><br>
-    <%= t('.stop_count', :count => journey_pattern.stop_points.count, :route_count => @route.stop_points.count) %> | <%= t('.vehicle_journeys_count', :count => journey_pattern.vehicle_journeys.count) %>
-    <div class="actions">  
-      <%= link_to t("actions.destroy"), referential_line_route_journey_pattern_path(@referential, @line, @route, journey_pattern), :method => :delete, :data => {:confirm =>  t('journey_patterns.actions.destroy_confirm')}, :class => "remove" %>
-      <% if journey_pattern.vehicle_journeys.count > 0 %>
-        | <i class="fa fa-clock-o"></i><%= link_to t('journey_patterns.journey_pattern.vehicle_journey_at_stops'), referential_line_route_vehicle_journeys_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => journey_pattern.id}), :class => "with_fa" %>
-      <% end %>
-    </div>
+      <p><%= t('.from_to', :departure => journey_pattern.stop_points.first.stop_area.name, :arrival => journey_pattern.stop_points.last.stop_area.name) %></p>
+    <% end %>
+    <p><%= t('.stop_count', :count => journey_pattern.stop_points.count, :route_count => @route.stop_points.count) %> | <%= t('.vehicle_journeys_count', :count => journey_pattern.vehicle_journeys.count) %></p>
+    <% if journey_pattern.vehicle_journeys.count > 0 %>
+    <p>
+      <i class="fa fa-clock-o"></i><%= link_to t('journey_patterns.journey_pattern.vehicle_journey_at_stops'), referential_line_route_vehicle_journeys_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => journey_pattern.id}), :class => "with_fa" %>
+    </p>
+    <% end %>
   </div>
-<% end %>
-
+</div>
diff --git a/app/views/journey_patterns/show.js.erb b/app/views/journey_patterns/show.js.erb
deleted file mode 100644
index aedb0fb9e..000000000
--- a/app/views/journey_patterns/show.js.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-$(function (){
-  $(".stop_points_detail").html("<%= escape_javascript(render(:partial => "stop_points_detail")) %>");
-});
-
diff --git a/app/views/routes/_stop_points_detail.html.erb b/app/views/routes/_stop_points_detail.html.erb
deleted file mode 100644
index 6c9e4afae..000000000
--- a/app/views/routes/_stop_points_detail.html.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-  <div class="page_info">
-    <span class="search"> <%= t("will_paginate.page_entries_info.list") %></span> <%= page_entries_info @stop_points %>
-  </div>
-  <div class="stop_points paginated_content">
-    <%= render :partial => "stop_points/stop_point", :collection => @stop_points %>
-  </div>
-  <div class="pagination">
-    <%= will_paginate @stop_points, :container => false %>
-  </div>
-
diff --git a/app/views/routes/show.html.erb b/app/views/routes/show.html.erb
index 22ef7fff8..ce9e9618f 100644
--- a/app/views/routes/show.html.erb
+++ b/app/views/routes/show.html.erb
@@ -61,7 +61,9 @@
     </div>
     <div id="stop_points" class="panel-collapse collapse">
       <div class="panel-body">
-        <%= render :partial => "stop_points_detail" %>
+        <div class="stop_points paginated_content">
+          <%= paginated_content( @stop_points, "stop_points/stop_point") %>
+        </div>
       </div>
     </div>
   </div>
@@ -78,7 +80,9 @@
     </div>
     <div id="journey_patterns" class="panel-collapse collapse">
       <div class="panel-body">
-        <%= render :partial => "journey_patterns/journey_pattern", :collection => @route.journey_patterns %>
+        <div class="journey_patterns paginated_content">
+          <%= paginated_content( @route.journey_patterns, "journey_patterns/journey_pattern") %>
+        </div>
       </div>
     </div>
   </div>
diff --git a/app/views/routes/show.js.erb b/app/views/routes/show.js.erb
deleted file mode 100644
index aedb0fb9e..000000000
--- a/app/views/routes/show.js.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-$(function (){
-  $(".stop_points_detail").html("<%= escape_javascript(render(:partial => "stop_points_detail")) %>");
-});
-