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

12 files changed, 40 insertions, 33 deletions

diff --git a/Gemfile b/Gemfile
index 1222753a8..cd2471ed7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,9 +57,9 @@ gem 'simple_form'
 gem 'rails-assets-tagmanager', '~> 3.0.1.0'
 gem 'rails-assets-typeahead.js', '~> 0.10.5'
 gem "breadcrumbs_on_rails"
-gem 'bootstrap-timepicker-rails'
 gem 'rails-assets-typeahead.js-bootstrap3.less'
 gem 'rails-assets-respond'
+gem 'rails-assets-eonasdan-bootstrap-datetimepicker', '~> 3.1.3'
 
 # Format Output
 gem 'json'
diff --git a/Gemfile.lock b/Gemfile.lock
index 617a8cc82..f768b3d6a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -64,8 +64,6 @@ GEM
     arel (3.0.3)
     bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
-    bootstrap-timepicker-rails (0.1.3)
-      railties (>= 3.0)
     bouncy-castle-java (1.5.0146.1)
     breadcrumbs_on_rails (2.3.0)
     builder (3.0.4)
@@ -243,7 +241,12 @@ GEM
     rails-assets-bootstrap (3.1.1)
       rails-assets-jquery (>= 1.9.0)
     rails-assets-bootstrap-sass-official (3.1.1.2)
+    rails-assets-eonasdan-bootstrap-datetimepicker (3.1.3)
+      rails-assets-bootstrap (>= 3.0)
+      rails-assets-jquery (>= 1.8.3)
+      rails-assets-moment (>= 2.8.0)
     rails-assets-jquery (2.1.1)
+    rails-assets-moment (2.8.3)
     rails-assets-respond (1.4.2)
     rails-assets-tagmanager (3.0.1)
       rails-assets-jquery (>= 1.0.0)
@@ -379,7 +382,6 @@ DEPENDENCIES
   activerecord-jdbcpostgresql-adapter (~> 1.3.3)
   acts_as_list (= 0.1.6)
   acts_as_tree-1.8 (= 1.1.0)
-  bootstrap-timepicker-rails
   breadcrumbs_on_rails
   calendar_helper (= 0.2.5)
   capistrano
@@ -419,6 +421,7 @@ DEPENDENCIES
   rabl
   rails (= 3.2.18)
   rails-assets-bootstrap-sass-official (~> 3.1.1)
+  rails-assets-eonasdan-bootstrap-datetimepicker (~> 3.1.3)
   rails-assets-respond
   rails-assets-tagmanager (~> 3.0.1.0)
   rails-assets-typeahead.js (~> 0.10.5)
diff --git a/app/assets/images/logo_chouette.png b/app/assets/images/logo_chouette.png
index f5064d3cd..2b2040113 100644
--- a/app/assets/images/logo_chouette.png
+++ b/app/assets/images/logo_chouette.png
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index ed6e05c4c..01142c849 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,7 +13,9 @@
 //= require morris
 //= require bootstrap-sass-official
 //= require typeahead.js
-//= require bootstrap-timepicker
+//= require moment
+//= require moment/locale/fr
+//= require eonasdan-bootstrap-datetimepicker
 //= require tagmanager
 //= require_directory ./plugins
 //= require_directory .
diff --git a/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee b/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee
index 9945022bc..1c40ebdb5 100644
--- a/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee
+++ b/app/assets/javascripts/plugins/bootstrap_timepicker_activation.coffee
@@ -1,16 +1,11 @@
 jQuery ->
   if(!(Modernizr.inputtypes && Modernizr.inputtypes.time))    
-    $('.timepicker_basic').timepicker(
-      template: false,
-      showInputs: false,
-      minuteStep: 1,
-      showMeridian: false,
-      )
-    $('.timepicker_seconds').timepicker(
-      template: false,
-      showInputs: false,
-      minuteStep: 1,
-      secondStep: 1,
-      showMeridian: false,
-      showSeconds: true
-      ) 
\ No newline at end of file
+    $('.timepicker_basic').datetimepicker({
+       pickDate: false,
+       language: $(".dropdown.languages > a > img").attr("data-locale") || 'en',
+      })
+    $('.timepicker_seconds').datetimepicker({
+       pickDate: false,
+       language: $(".dropdown.languages > a > img").attr("data-locale") || 'en',  
+       useSeconds: true,
+      }) 
\ No newline at end of file
diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb
index 156fc75cb..3ea2b36ed 100644
--- a/app/assets/stylesheets/application.css.scss.erb
+++ b/app/assets/stylesheets/application.css.scss.erb
@@ -24,7 +24,7 @@ $body-bg: #eee;
 @import "jquery.ui.all";
 @import "morris";
 @import "formtastic";
-@import "bootstrap-timepicker";
+@import 'eonasdan-bootstrap-datetimepicker';
 
 @import "vendor/openlayers_style";
 @import "vendor/openlayers_ie6-style";
diff --git a/app/assets/stylesheets/main/layout.css.scss b/app/assets/stylesheets/main/layout.css.scss
index f55a7c90f..90da0cc6d 100644
--- a/app/assets/stylesheets/main/layout.css.scss
+++ b/app/assets/stylesheets/main/layout.css.scss
@@ -27,13 +27,20 @@ ol.breadcrumb{
         img {
             height: 40px;       
         }
+        
+        .brand_name{
+            margin-left: 3px;              
+            margin-right: 3px;            
+            font-size: 20px;
+            font-family: monospace;
+            font-weight: bold;
+        }
 
         .version
-        {       
-            margin-left: 3px;
+        {                   
             vertical-align: text-top;
             color: white;
-            font-size: 13px;
+            font-size: 12px;
         }
     }
     
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 4106e38cf..0ddea8356 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -1,7 +1,7 @@
 module UsersHelper
 
   def user_gravatar_image_tag(user, size = 64)
-    gravatar_image_tag user.email, :alt => user.name, :class => "preview", :gravatar => { :default => user_default_avatar , :size => size }
+    gravatar_image_tag user.email, :alt => "", :class => "preview", :gravatar => { :default => user_default_avatar , :size => size }
   end
 
   def user_default_avatar
diff --git a/app/views/shared/_header.erb b/app/views/shared/_header.erb
index 81d75d1ae..3b7c90926 100644
--- a/app/views/shared/_header.erb
+++ b/app/views/shared/_header.erb
@@ -10,7 +10,7 @@
         <span class="icon-bar version"><%= APP_VERSION %></span>
       </button>
       <%= link_to referentials_path, :class =>"navbar-brand" do %>
-      <%= image_tag("logo_chouette.png") %> <span class="version"><%= APP_VERSION %></span>
+       <%= image_tag("logo_chouette.png") %><span class="brand_name">CHOUETTE</span></i><span class="version"><%= APP_VERSION %></span>
       <% end %>
     </div>
 
@@ -75,17 +75,17 @@
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown languages">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-            <%= image_tag("language_engine/#{selected_language}_flag.png") %><b class='caret'></b>
+            <%= image_tag("language_engine/#{selected_language}_flag.png", { :'data-locale' => "#{selected_language}" } ) %><b class='caret'></b>
           </a>
           <ul class="dropdown-menu">
-            <li><%= link_to_language :fr %></li>
-            <li><%= link_to_language :en %></li>
+            <li><%= link_to_language :fr, { :class => language_class( :fr ) } %></li>
+            <li><%= link_to_language :en, { :class => language_class( :en  ) } %></li>
           </ul>
         </li>        
         <li><%= link_to t('layouts.help'), help_path, :class =>("current" if help_page?), :target => "chouette_help" %></li>
         <% if user_signed_in?  %>
         <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="gravatar"><%= user_gravatar_image_tag(current_user, 16) %></span><%= current_user.name %> <b class="caret"></b></a>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="gravatar"><%= user_gravatar_image_tag(current_user, 16) %></span><%= truncate(current_user.name, :length => 20) %> <b class="caret"></b></a>
           <ul class="dropdown-menu">
             <li><%= link_to t('layouts.user.profile'), edit_user_registration_path %></li>
             <li><%= link_to t('layouts.user.sign_out'), destroy_user_session_path, :method => :delete %></li>
diff --git a/app/views/users/_form.html.erb b/app/views/users/_form.html.erb
index 3b19dddf2..ff452c924 100644
--- a/app/views/users/_form.html.erb
+++ b/app/views/users/_form.html.erb
@@ -6,6 +6,6 @@
 
    <%= form.actions do %>
      <%= form.action :submit, :as => :button %> 
-     <%= form.action :cancel, :as => :link %>
+     <%= form.action :cancel, :as => :link , :url => organisation_path %>
    <% end %>
 <% end %>
diff --git a/app/views/vehicle_journeys/_vehicle_journeys.html.erb b/app/views/vehicle_journeys/_vehicle_journeys.html.erb
index 187849cd3..ecdb12c6e 100644
--- a/app/views/vehicle_journeys/_vehicle_journeys.html.erb
+++ b/app/views/vehicle_journeys/_vehicle_journeys.html.erb
@@ -13,7 +13,7 @@
       </th>
       <% @vehicle_journeys.each do |vj| %>
       <th class="vehicle_journey">
-        <button data-style="primary" data-container="body" rel="popover" data-toggle="popover" title='<%= link_to(vehicle_title(vj), [@referential, @line, @route, vj] ) %> <%= link_to('<span class="fa fa-pencil"></span>'.html_safe, ["edit", @referential, @line, @route, vj], :class => "btn btn-default btn-sm" ) %>' data-placement= "top" data-content='<%= render( partial: "show_popover", :locals => { :vehicle_journey => vj }) %>' class="vehicle_journey_popover btn btn-default btn-sm"><i class='fa fa-search'></i></button>
+        <button data-style="primary" data-container="body" rel="popover" data-toggle="popover" data-title='<%= link_to(vehicle_title(vj), [@referential, @line, @route, vj] ) %> <%= link_to('<span class="fa fa-pencil"></span>'.html_safe, ["edit", @referential, @line, @route, vj], :class => "btn btn-default btn-sm" ) %>' data-placement= "top" data-content='<%= render( partial: "show_popover", :locals => { :vehicle_journey => vj }) %>' class="vehicle_journey_popover btn btn-default btn-sm"><i class='fa fa-search'></i></button>
       </th>
       <% end %>
     </tr>
diff --git a/config/locales/companies.yml b/config/locales/companies.yml
index 09b010cc9..aad451fc8 100644
--- a/config/locales/companies.yml
+++ b/config/locales/companies.yml
@@ -28,7 +28,7 @@ en:
         short_name: "Short name"
         organizational_unit: "Unit"
         operating_department_name: "Department"
-        code: "Postcode"
+        code: "Code"
         phone: "Phone number"
         fax: "Fax number"
         email: "Email"
@@ -72,7 +72,7 @@ fr:
         short_name: "Nom court"
         organizational_unit: "Nom d'unité dans la société"
         operating_department_name: "Nom du département dans la société"
-        code: "Code postal"
+        code: "Code"
         phone: "Numéro de téléphone"
         fax: "Numéro de fax"
         email: "Email"