Merge branch 'sismo' of github.com:afimb/chouette2 into sismo

7 files changed, 12 insertions, 35 deletions

diff --git a/Gemfile b/Gemfile
index 4fe2e5632..d86691037 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,8 +48,7 @@ gem 'font-awesome-sass'
 gem 'will_paginate-bootstrap'
 gem 'simple_form'
 gem 'tagmanager-rails', '~> 3.0.1.0'
-#gem 'typeahead-rails', '~> 0.10.1'
-gem "twitter-typeahead-rails", :git => "https://github.com/ldonnet/twitter-typeahead-rails"
+gem 'typeahead-rails', '~> 0.10.5'
 gem "breadcrumbs_on_rails"
 gem 'bootstrap-timepicker-rails'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 03309d76a..f010c1b6f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,15 +12,6 @@ GIT
       foreigner (= 1.6.0)
       georuby-ext (= 0.0.5)
 
-GIT
-  remote: https://github.com/ldonnet/twitter-typeahead-rails
-  revision: 97466061dc7999ba1c7d153fba7ced8df846431a
-  specs:
-    twitter-typeahead-rails (0.10.2)
-      actionpack (>= 3.1)
-      jquery-rails
-      railties (>= 3.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -351,6 +342,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
+    typeahead-rails (0.10.5)
     tzinfo (0.3.40)
     uglifier (1.2.7)
       execjs (>= 0.3.0)
@@ -439,7 +431,7 @@ DEPENDENCIES
   tagmanager-rails (~> 3.0.1.0)
   therubyracer (~> 0.10.2)
   therubyrhino
-  twitter-typeahead-rails!
+  typeahead-rails (~> 0.10.5)
   uglifier (>= 1.0.3)
   warbler
   will_paginate (~> 3.0)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index b20582b76..5b03dce78 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,7 +12,7 @@
 //= require raphael
 //= require morris
 //= require bootstrap
-//= require twitter/typeahead.min
+//= require typeahead.min
 //= require bootstrap-timepicker
 //= require tagmanager
 //= require_directory ./plugins
diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb
index 348ab3ef0..8708d53c4 100644
--- a/app/assets/stylesheets/application.css.scss.erb
+++ b/app/assets/stylesheets/application.css.scss.erb
@@ -25,7 +25,7 @@ $body-bg: #eee;
 @import "jquery.ui.all";
 @import "morris";
 @import "formtastic";
-@import "twitter-typeahead-rails";
+@import "typeahead-rails";
 @import "bootstrap-timepicker";
 
 @import "vendor/openlayers_style";
diff --git a/app/views/time_tables/_form.erb b/app/views/time_tables/_form.erb
index 24e72e676..bb98d2d1e 100644
--- a/app/views/time_tables/_form.erb
+++ b/app/views/time_tables/_form.erb
@@ -6,16 +6,10 @@
     <%= form.input :tag_search, :input_html => { class: "tm-input typeahead", :placeholder => t("formtastic.placeholders.time_table.tag_search") } %>
     <%= form.input :tag_list, :as => :hidden, :input_html => { :id => "tag_list" } %>
     
-    <%= form.input :objectid, :required => !@time_table.new_record?, :input_html => { :title => t("formtastic.titles.time_table.objectid")} %>  
+    <%= form.input :objectid, :required => !@time_table.new_record?, :input_html => { :title => t("formtastic.titles.time_table.objectid")} %>
   <% end %>
   
-  <h3 class="time_table_periods">
-	<a class="periods"><%= @time_table.human_attribute_name("periods") %>
-      <%= image_tag("icons/plus.png"  , :class => "switcher", :style => "display: none;") %>
-      <%= image_tag("icons/minus.png"  , :class => "switcher" ) %>
-    </a>
-  	
-  </h3>
+  <h3 class="time_table_periods"><%= @time_table.human_attribute_name("periods") %></h3>
   <div id="periods_content">
 	  <%= form.inputs :class => 'day_type' do %> 
 	    <label class="day_type_label"><%= @time_table.human_attribute_name("day_types") %></label>
@@ -37,12 +31,7 @@
 	  :"data-association-insertion-node" => "div#periods"%>
   </div>
   
-  <h3 class="time_table_dates">
-	  <a class="dates"><%= @time_table.human_attribute_name("dates") %>
-      <%= image_tag("icons/plus.png"  , :class => "switcher", :style => "display: none;") %>
-      <%= image_tag("icons/minus.png"  , :class => "switcher" ) %>
-    </a>
-  </h3>
+  <h3 class="time_table_dates"><%= @time_table.human_attribute_name("dates") %></h3>
   <div id="dates_content">
     <div id="dates">
 		  <%= form.semantic_fields_for :dates, @time_table.dates.where("in_out = true").to_a do |p| %>
@@ -55,12 +44,7 @@
 	  :"data-association-insertion-node" => "div#dates" %>
   </div>
 
-  <h3 class="time_table_dates">
-	<a class="excluded_dates"><%= @time_table.human_attribute_name("excluded_dates") %>
-      <%= image_tag("icons/plus.png"  , :class => "switcher", :style => "display: none;") %>
-      <%= image_tag("icons/minus.png"  , :class => "switcher" ) %>
-    </a>
-  </h3>
+  <h3 class="time_table_dates"><%= @time_table.human_attribute_name("excluded_dates") %></h3>
   <div id="excluded_dates_content">
 	  <div id="excluded_dates">
 		  <%= form.semantic_fields_for :dates, @time_table.dates.where("in_out = false").to_a do |p| %>
diff --git a/app/views/vehicle_journeys/_form.html.erb b/app/views/vehicle_journeys/_form.html.erb
index 5713a61df..8074e6811 100644
--- a/app/views/vehicle_journeys/_form.html.erb
+++ b/app/views/vehicle_journeys/_form.html.erb
@@ -19,7 +19,7 @@
     <% unless @vehicle_journey.vehicle_journey_at_stops.empty? ||
        @vehicle_journey.vehicle_journey_at_stops.any? { |vjas| vjas.departure_time.nil? } %>    <div class="vehicle_journey_at_stops">     
       <div class="well">
-        <span class="title">Décaler tous les horaires de la course en fonction de ceux existants</span>
+	<span class="title"><%= t(".slide_title") %></span>
         <div>
           <span><%= t(".set") %></span> <%= select_tag "", options_for_select( [ [t('.slide_departure'), "departure"], [t('.slide_arrival'), "arrival"] ] ), :class => "departure_or_arrival" %> <span><%= t(".to") %></span>
           <%= select_hour(@vehicle_journey.vehicle_journey_at_stops.first.departure_time.hour) %>
diff --git a/config/locales/vehicle_journeys.yml b/config/locales/vehicle_journeys.yml
index 0e1b5ad34..a7e751674 100644
--- a/config/locales/vehicle_journeys.yml
+++ b/config/locales/vehicle_journeys.yml
@@ -22,6 +22,7 @@ en:
       to_departures: "Copy arrivals to departures"
       time_tables: "Associated calendars to vehicle journey"
       slide: "Slide"
+      slide_title: "Shift all hours of the vehicle journey based on existing ones"
       slide_departure: "Shift 1° departure time"
       slide_arrival: "Shift 1° arrival time"
     timeless:
@@ -114,6 +115,7 @@ fr:
       to_arrivals: "Copie départs vers arrivées"
       to_departures: "Copie arrivées vers départs"
       time_tables: "Calendriers associés à la course"
+      slide_title: "Décaler tous les horaires de la course en fonction de ceux existants"
       slide_departure: "Fixer 1° horaire départ à"
       slide_arrival: "Fixer 1° horaire arrivée à"
     timeless: