From f3e8dc276a23474c6b5601c988df6b036ca4fdfa Mon Sep 17 00:00:00 2001
From: Michel Etienne
Date: Thu, 25 Sep 2014 16:39:48 +0200
Subject: terminate breadcrumb integration

---
 app/controllers/access_links_controller.rb        |  4 ++--
 app/controllers/access_points_controller.rb       |  2 +-
 app/helpers/breadcrumb_helper.rb                  |  4 ++--
 app/views/access_links/_form.html.erb             |  2 +-
 app/views/connection_links/_form.erb              |  2 +-
 app/views/journey_patterns/edit.html.erb          | 13 -------------
 app/views/vehicle_journeys/edit.html.erb          | 13 -------------
 app/views/vehicle_journeys/new.html.erb           | 13 -------------
 spec/views/vehicle_journeys/edit.html.erb_spec.rb |  6 ------
 spec/views/vehicle_journeys/new.html.erb_spec.rb  |  6 ------
 10 files changed, 7 insertions(+), 58 deletions(-)

diff --git a/app/controllers/access_links_controller.rb b/app/controllers/access_links_controller.rb
index 31d183034..b22dd75a8 100644
--- a/app/controllers/access_links_controller.rb
+++ b/app/controllers/access_links_controller.rb
@@ -19,8 +19,8 @@ class AccessLinksController < ChouetteController
     @access_point = Chouette::AccessPoint.find(params[:access_point_id])
     @access_link = Chouette::AccessLink.find(params[:id])
     @stop_area = @access_link.stop_area
-    show! do
-      build_breadcrumb :show
+    show! do |format|
+      format.html {build_breadcrumb :show}
     end
   end
   
diff --git a/app/controllers/access_points_controller.rb b/app/controllers/access_points_controller.rb
index 8e1f4664b..ca8e0b156 100644
--- a/app/controllers/access_points_controller.rb
+++ b/app/controllers/access_points_controller.rb
@@ -30,7 +30,7 @@ class AccessPointsController < ChouetteController
         }
         
       end
-      build_breadcrumb :show
+      format.html {build_breadcrumb :show}
     end
   end
   
diff --git a/app/helpers/breadcrumb_helper.rb b/app/helpers/breadcrumb_helper.rb
index 23cf6a6f2..5999b6005 100644
--- a/app/helpers/breadcrumb_helper.rb
+++ b/app/helpers/breadcrumb_helper.rb
@@ -172,8 +172,8 @@ module BreadcrumbHelper
       label = obj.class.model_name.human+" "+obj.id.to_s
     end
     
-    if label.length > 12
-      label[0..8]+"..."
+    if label.length > 20
+      label[0..16]+"..."
     else
       label  
     end
diff --git a/app/views/access_links/_form.html.erb b/app/views/access_links/_form.html.erb
index b0138c1bd..2ce44542f 100644
--- a/app/views/access_links/_form.html.erb
+++ b/app/views/access_links/_form.html.erb
@@ -15,7 +15,7 @@
       <%= form.input :default_duration, :as => :extended_time_picker, :size => 8, :step => :seconds, :label => @access_link.human_attribute_name("default_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>       
       <%= form.input :frequent_traveller_duration, :as => :extended_time_picker, :size => 8, :step => :seconds, :include_seconds => true, :label => @access_link.human_attribute_name("frequent_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>      
       <%= form.input :occasional_traveller_duration, :as => :extended_time_picker, :size => 8, :include_seconds => true, :label => @access_link.human_attribute_name("occasional_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>        
-      <%= form.input :mobility_restricted_traveller_duration, :as => :extended_time_picker, :include_seconds => true, :label => @access_link.human_attribute_name("mobility_restricted_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>
+      <%= form.input :mobility_restricted_traveller_duration, :as => :extended_time_picker,:size => 8, :include_seconds => true, :label => @access_link.human_attribute_name("mobility_restricted_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>
     <% end %>
    <% end %>
    <%= form.actions do %>
diff --git a/app/views/connection_links/_form.erb b/app/views/connection_links/_form.erb
index fdc6ce018..54ac7088e 100644
--- a/app/views/connection_links/_form.erb
+++ b/app/views/connection_links/_form.erb
@@ -15,7 +15,7 @@
     <%= form.input :default_duration, :as => :extended_time_picker, :size => 8, :step => :seconds, :label => @connection_link.human_attribute_name("default_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>       
     <%= form.input :frequent_traveller_duration, :as => :extended_time_picker, :size => 8, :step => :seconds, :include_seconds => true, :label => @connection_link.human_attribute_name("frequent_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>      
     <%= form.input :occasional_traveller_duration, :as => :extended_time_picker, :size => 8, :include_seconds => true, :label => @connection_link.human_attribute_name("occasional_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>        
-    <%= form.input :mobility_restricted_traveller_duration, :as => :extended_time_picker, :include_seconds => true, :label => @connection_link.human_attribute_name("mobility_restricted_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>
+    <%= form.input :mobility_restricted_traveller_duration, :as => :extended_time_picker,:size => 8, :include_seconds => true, :label => @connection_link.human_attribute_name("mobility_restricted_traveller_duration"), :input_html => { :class => "form-control input-sm timepicker_seconds", :step => 1}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>
   <% end %>  
 
    <%= form.actions do %>
diff --git a/app/views/journey_patterns/edit.html.erb b/app/views/journey_patterns/edit.html.erb
index 33adb6d7d..33fac2a6c 100644
--- a/app/views/journey_patterns/edit.html.erb
+++ b/app/views/journey_patterns/edit.html.erb
@@ -1,17 +1,4 @@
 <%= title_tag t('journey_patterns.edit.title', :journey_pattern => @journey_pattern.name ) %>
 
-<div class="journey_pattern">
-  <div class="summary">
-    <p>
-      <label><%= @route.human_attribute_name(:line) %>: </label>
-      <%= link_to line_formatted_name( @line), [@referential, @line] %>
-    </p>
-    <p>
-      <label><%= Chouette::Route.model_name.human %>: </label>
-      <%= link_to @route.name, [@referential, @line, @route] %>
-    </p>
-  <div>
-<div>
-
 <%= render "form" %>
 
diff --git a/app/views/vehicle_journeys/edit.html.erb b/app/views/vehicle_journeys/edit.html.erb
index dba18248e..51653a34a 100644
--- a/app/views/vehicle_journeys/edit.html.erb
+++ b/app/views/vehicle_journeys/edit.html.erb
@@ -1,17 +1,4 @@
 <%= title_tag edit_vehicle_title(@vehicle_journey) %>
 
-<div class="vehicle_journey">
-  <div class="summary">
-    <p>
-      <label><%= @route.human_attribute_name(:line) %>: </label>
-      <%= link_to line_formatted_name( @line), [@referential, @line] %>
-    </p>
-    <p>
-      <label><%= @vehicle_journey.human_attribute_name(:route) %>: </label>
-      <%= link_to @route.name, [@referential, @line, @route] %>
-    </p>
-  </div>
-</div>
-
 <%= render "form" %>
 
diff --git a/app/views/vehicle_journeys/new.html.erb b/app/views/vehicle_journeys/new.html.erb
index db344438e..a32e9cc31 100644
--- a/app/views/vehicle_journeys/new.html.erb
+++ b/app/views/vehicle_journeys/new.html.erb
@@ -1,17 +1,4 @@
 <%= title_tag t('vehicle_journeys.new.title') %>
 
-<div class="vehicle_journey">
-  <div class="summary">
-    <p>
-      <label><%= @route.human_attribute_name(:line) %>: </label>
-      <%= link_to line_formatted_name( @line), [@referential, @line] %>
-    </p>
-    <p>
-      <label><%= @vehicle_journey.human_attribute_name(:route) %>: </label>
-      <%= link_to @route.name, [@referential, @line, @route] %>
-    </p>
-  <div>
-<div>
-
 <%= render "form" %>
 
diff --git a/spec/views/vehicle_journeys/edit.html.erb_spec.rb b/spec/views/vehicle_journeys/edit.html.erb_spec.rb
index a3eb871e2..c7db87706 100644
--- a/spec/views/vehicle_journeys/edit.html.erb_spec.rb
+++ b/spec/views/vehicle_journeys/edit.html.erb_spec.rb
@@ -11,12 +11,6 @@ describe "/vehicle_journeys/edit" do
     render
     view.should render_template(:partial => "_form")
   end
-  context "summary part" do
-    it "should render route name" do
-      render
-      rendered.should have_selector( ".summary a", :text => route.name)
-    end
-  end
 
 end
 
diff --git a/spec/views/vehicle_journeys/new.html.erb_spec.rb b/spec/views/vehicle_journeys/new.html.erb_spec.rb
index 495b667bd..bc0d68c2d 100644
--- a/spec/views/vehicle_journeys/new.html.erb_spec.rb
+++ b/spec/views/vehicle_journeys/new.html.erb_spec.rb
@@ -11,12 +11,6 @@ describe "/vehicle_journeys/new" do
     render
     view.should render_template(:partial => "_form")
   end
-  context "summary part" do
-    it "should render route name" do
-      render
-      rendered.should have_selector( ".summary a", :text => route.name)
-    end
-  end
 
 end
 
-- 
cgit v1.2.3