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

24 files changed, 259 insertions, 284 deletions

diff --git a/Gemfile b/Gemfile
index 691ed4b12..1222753a8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -51,7 +51,7 @@ gem 'raphael-rails'
 
 # Use twitter bootstrap resources
 gem 'rails-assets-bootstrap-sass-official', '~> 3.1.1'
-gem 'font-awesome-sass'
+gem 'font-awesome-sass', '~> 4.2.0'
 gem 'will_paginate-bootstrap'
 gem 'simple_form'
 gem 'rails-assets-tagmanager', '~> 3.0.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5370a0e26..a68a6c154 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -136,7 +136,7 @@ GEM
     ffi (1.9.3-java)
     ffi-geos (1.0.0)
       ffi (>= 1.0.0)
-    font-awesome-sass (4.1.0)
+    font-awesome-sass (4.2.0)
       sass (~> 3.2)
     foreigner (1.6.0)
       activerecord (>= 3.0.0)
@@ -312,7 +312,7 @@ GEM
     ruby-graphviz (1.0.9)
     ruby-ole (1.2.11.7)
     rubyzip (1.1.6)
-    sass (3.3.7)
+    sass (3.4.5)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -395,7 +395,7 @@ DEPENDENCIES
   devise_invitable
   dr-apartment
   factory_girl_rails (= 1.7)
-  font-awesome-sass
+  font-awesome-sass (~> 4.2.0)
   formtastic
   georuby-ext (= 0.0.5)
   google-analytics-rails
diff --git a/app/assets/javascripts/access_points.js.coffee b/app/assets/javascripts/access_points.js.coffee
index ee5e89def..56ae24d1e 100644
--- a/app/assets/javascripts/access_points.js.coffee
+++ b/app/assets/javascripts/access_points.js.coffee
@@ -29,17 +29,4 @@ jQuery ->
 
   $('input#access_point_projection_xy').change(lon_lat_change)  
   
-  # switch visibility of access_links
-  switch_generics = (event) -> 
-    event.preventDefault()
-    $('.access_points .generics.content').toggle('slow')
-    $('a.generics .switcher').toggle()
 
-  $('.access_points a.generics').click(switch_generics)
-
-  switch_details = (event) -> 
-    event.preventDefault()
-    $('.access_points .details.content').toggle('slow')
-    $('a.details .switcher').toggle()
-
-  $('.access_points a.details').click(switch_details)
diff --git a/app/assets/stylesheets/application.css.scss.erb b/app/assets/stylesheets/application.css.scss.erb
index aefe12759..156fc75cb 100644
--- a/app/assets/stylesheets/application.css.scss.erb
+++ b/app/assets/stylesheets/application.css.scss.erb
@@ -11,6 +11,7 @@ $body-bg: #eee;
 // Modules and Variables
 @import "modules/search";
 @import "modules/index_item";
+@import "modules/icons";
 
 // Partials
 @import "partials/header";
@@ -18,6 +19,7 @@ $body-bg: #eee;
 
 // Third-party
 @import "tagmanager/tagmanager.scss";
+@import "font-awesome-sprockets";
 @import "font-awesome";
 @import "jquery.ui.all";
 @import "morris";
@@ -31,7 +33,7 @@ $body-bg: #eee;
 @import "vendor/formtastic_changes";
 @import "vendor/pagination";
 @import "vendor/map_layers";
-@import "vendor/token-input.css";
+@import "vendor/token-input";
 @import "vendor/typeahead";
 @import "vendor/bootstrap_changes";
 
diff --git a/app/assets/stylesheets/main/access_points.css.scss b/app/assets/stylesheets/main/access_points.css.scss
index e9eda0f9e..af6a09ee7 100644
--- a/app/assets/stylesheets/main/access_points.css.scss
+++ b/app/assets/stylesheets/main/access_points.css.scss
@@ -32,35 +32,41 @@
     }
     
     .access_link_pairs {
+
+        table{
+            border: 0px;
+            border-collapse: separate;
+            border-spacing: 3px;
+        }          
         
         .link {
-          border: 2px solid black;
+            border: 2px solid black;
         }
+        
         .access_point{
-            float: left;
             padding: 3px 15px 0px 3px;
             height: 25px;        
             * { vertical-align:middle; }
             span { margin-left: 7px; }
             img { margin: 0px 5px 0px 5px;}
         }
+        
         .stop_area{
-            float: left;
             padding: 3px 15px 0px 3px;
             height: 25px;        
             * { vertical-align:middle; }
             span { margin-left: 7px; }
             img { margin: 0px 5px 0px 5px;}
         }
-      
-      .info {
-          font-size: 10px;
-          color: #777;
-          font-weight: normal;
-          padding-top: 0px;
-          padding-left: 45px;
-          padding-right: 3px;
-          padding-bottom: 3px;
+        
+        .info {
+            font-size: 10px;
+            color: #777;
+            font-weight: normal;
+            padding-top: 10px;
+            padding-left: 45px;
+            padding-right: 3px;
+            padding-bottom: 3px;
         }
     }
 
diff --git a/app/assets/stylesheets/main/layout.css.scss b/app/assets/stylesheets/main/layout.css.scss
index 4438769b8..f55a7c90f 100644
--- a/app/assets/stylesheets/main/layout.css.scss
+++ b/app/assets/stylesheets/main/layout.css.scss
@@ -112,6 +112,10 @@ ol.breadcrumb{
         
         .actions {
             margin-bottom: 20px;
+
+            li{
+                margin-bottom: 5px;
+            }
         }
         
         p {
@@ -197,115 +201,3 @@ ol.breadcrumb{
         }
     }   
 }
-
-.info {
-    font-size: 10px;
-    color: #777;
-    font-weight: normal;
-    line-height: 14px;
-    margin-top: 5px;
-    
-    a {
-        display:inline;
-        color: #777;
-    }
-    
-    .actions {
-        margin-top: 10px;
-        a {
-            color: #666;
-            padding-left: 12px;
-        }
-        
-        a.link {
-            background: url(image-path('icons/link-small.png')) no-repeat 0% 50%;
-        }
-        a.edit {
-            background: url(image-path('icons/edit-small.png')) no-repeat 0% 50%;
-        }
-        a.remove {
-            background: url(image-path('icons/remove-small.png')) no-repeat 0% 50%;
-        }
-        a.download {
-            background: url(image-path('download-small.png')) no-repeat 0% 50%;
-        }
-    }   
-}
-
-.actions {
-    a {
-        padding-left: 20px;
-    }
-    
-    /* Hack with font icon */
-    a.vehicle_journeys{
-        padding-left: 4px;
-    }
-    
-    /* to use with font awesome icon */
-    a.with_fa { 
-      padding-left: 2px;
-    }
-
-    a.visit_site{
-        background: url(image-path('icons/site.png')) no-repeat;
-    }
-
-    a.visit_event{
-        background: url(image-path('icons/event.png')) no-repeat;
-    }
-
-    a.visit_page{
-        background: url(image-path('icons/page.png')) no-repeat;
-    }
-    
-    a.add {
-        background: url(image-path('icons/add.png')) no-repeat;
-    }
-    a.edit {
-        background: url(image-path('icons/edit.png')) no-repeat;
-    }
-    a.remove {
-        background: url(image-path('icons/remove.png')) no-repeat;
-    }
-    a.export {
-        background: url(image-path('icons/export.png')) no-repeat;
-    }
-    li {
-        margin: 10px 0;
-    }
-    
-    a.add_children {
-        background: url(image-path('icons/add.png')) no-repeat;
-    }
-
-    a.add_fields {
-        background: url(image-path('icons/add.png')) no-repeat;
-    }
-
-    a.link {
-        background: url(image-path('icons/link.png')) no-repeat;
-    }
-
-    a.select_parent {
-        background: url(image-path('icons/select_parent.png')) no-repeat;
-    }
-    
-    a.select_areas {
-        background: url(image-path('icons/select_parent.png')) no-repeat;
-    }
-
-    a.calculator_edit {
-        background: url(image-path('icons/calculator_edit.png')) no-repeat;
-    }
-    a.import {
-        background: url(image-path('icons/import-small.png')) no-repeat;
-    }
-    a.export {
-        background: url(image-path('icons/export-small.png')) no-repeat;
-    }
-    a.kml {
-        background: url(image-path('icons/kml.png')) no-repeat;
-    }
-    
-}
diff --git a/app/assets/stylesheets/main/stop_areas.css.scss b/app/assets/stylesheets/main/stop_areas.css.scss
index a81b780a6..a6641bb28 100644
--- a/app/assets/stylesheets/main/stop_areas.css.scss
+++ b/app/assets/stylesheets/main/stop_areas.css.scss
@@ -101,21 +101,7 @@
             height: 25px;
         }
     }
-    .access_point {   
 
-        .access_type {
-            width: 25px;
-            height: 64px;
-            float: left;
-            margin-right: 10px;
-            
-
-            a {
-                text-decoration: none;                   
-            }
-        }
-
-    }
 }
 
 #workspace.stop_areas.select_parent
diff --git a/app/assets/stylesheets/modules/icons.css.scss b/app/assets/stylesheets/modules/icons.css.scss
new file mode 100644
index 000000000..3da56d1c9
--- /dev/null
+++ b/app/assets/stylesheets/modules/icons.css.scss
@@ -0,0 +1,101 @@
+a:before {
+    font-family: FontAwesome;
+    display: inline-block;
+    padding-right: 3px;
+    vertical-align: middle;
+}
+
+a.add:before { // fa-plus-circle
+               content: "\f055";
+               color: $brand-success;
+             }
+
+a.edit:before { // fa-pencil
+                content: "\f040";
+                color: $brand-warning;
+              }
+
+a.remove:before { // fa-trash
+                  content: "\f1f8";
+                  color: $brand-danger;
+                }           
+
+a.export:before { // fa-upload
+                  content: "\f093";
+                  color: $brand-info;
+                }
+
+a.import:before { // fa-download
+                  content: "\f019";
+                  color: $brand-info;
+                }
+
+a.clone:before { // fa-copy
+                 content: "\f0c5";
+                 color: $brand-success;
+               }           
+
+a.link:before { // fa-external-link
+                content: "\f08e";
+              }
+
+a.select:before {// fa-select
+                 content: "\f0a6";
+                 color: $brand-warning;
+
+                }
+
+a.calculator:before { // fa-calculator
+                      content: "\f1ec";
+                      color: $brand-warning;
+                    }
+
+a.parent:before { // fa-arrow-up
+                      content: "\f062";
+                      color: $brand-warning;
+                }
+
+a.children:before { // fa-sitemap
+                      content: "\f0e8";
+                      color: $brand-warning;
+                  }
+
+a.access_link:before { // fa-exchange
+                      content: "\f0ec";
+                      color: $brand-warning;
+                     }
+
+a.merge:before { // fa-link
+                 content: "\f0c1";
+                 color: $brand-warning;
+               }
+
+a.clock:before { // fa-clock-o
+                 content: "\f017";
+               }
+
+/* first-child makes sure to grab the first element inside
+your fa-stack. The top margin shifts the inner icon down */
+.fa-stack-1x { top: .25em; }
+
+.fa-stack {
+    /* sizes whole .fa-stack down to make them the regular sized */
+    font-size: .5em;
+    /* makes sure regular and stacked icons vertically align */
+    vertical-align: -16%;
+}
+
+/* Styles text for doc type. Oswald is a great condensed
+Google Web Font */
+.filetype-text {
+    font-size: .7em;
+    font-weight: 700;
+    font-family: 'Oswald';
+}
+
+a.kml:before {
+    content: "<span class='fa-stack'>
+<span class='fa-stack-1x filetype-text'>KML</span>
+<i class='fa fa-file-o fa-stack-2x'></i>
+</span>";
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/vendor/bootstrap_changes.css.scss b/app/assets/stylesheets/vendor/bootstrap_changes.css.scss
index 62565af7a..597c9897d 100644
--- a/app/assets/stylesheets/vendor/bootstrap_changes.css.scss
+++ b/app/assets/stylesheets/vendor/bootstrap_changes.css.scss
@@ -15,6 +15,11 @@
     span.excluded_day_type {
     }
 
+    span.bounding{
+        font-size: 11px;
+        margin-left: 5px;
+    }    
+
     .validity_out {
         color: $brand-danger;
     }
diff --git a/app/helpers/vehicle_journeys_helper.rb b/app/helpers/vehicle_journeys_helper.rb
index 1ecfe12b5..2ee8123b5 100644
--- a/app/helpers/vehicle_journeys_helper.rb
+++ b/app/helpers/vehicle_journeys_helper.rb
@@ -8,6 +8,7 @@ module VehicleJourneysHelper
       journey_pattern.id
     end
   end
+  
   def vehicle_name( vehicle)
     if !vehicle.published_journey_name.blank?
       vehicle.published_journey_name.first(8)
@@ -19,22 +20,25 @@ module VehicleJourneysHelper
       vehicle.id
     end
   end
+  
   def missing_time_check( is_present)
     return "missing" if (is_present && is_present.departure_time.nil?)
   end
+  
   def vehicle_departure(vehicle)
     first_vjas = vehicle.vehicle_journey_at_stops.first
     return "" unless first_vjas.departure_time
     l(first_vjas.departure_time, :format => :hour).gsub( /  /, ' ') 
   end
+  
   def vehicle_title( vehicle)
     return t('vehicle_journeys.vehicle_journey.title_stopless', :name => vehicle_name( vehicle)) if vehicle.vehicle_journey_at_stops.empty?
     first_vjas = vehicle.vehicle_journey_at_stops.first
     t('vehicle_journeys.vehicle_journey.title', 
-          :name => vehicle_name( vehicle),
           :stop => first_vjas.stop_point.stop_area.name,
           :time => vehicle_departure(vehicle))
   end
+  
   def edit_vehicle_title( vehicle)
     return t('vehicle_journeys.edit.title_stopless', :name => vehicle_name( vehicle)) if vehicle.vehicle_journey_at_stops.empty?
     first_vjas = vehicle.vehicle_journey_at_stops.first
@@ -43,5 +47,6 @@ module VehicleJourneysHelper
           :stop => first_vjas.stop_point.stop_area.name,
           :time => vehicle_departure(vehicle))
   end
+  
 end
 
diff --git a/app/views/access_link_pairs/_access_link_pair.html.erb b/app/views/access_link_pairs/_access_link_pair.html.erb
index 588b276b9..3e0d8a4fe 100644
--- a/app/views/access_link_pairs/_access_link_pair.html.erb
+++ b/app/views/access_link_pairs/_access_link_pair.html.erb
@@ -1,57 +1,56 @@
-<%= div_for(access_link_pair) do %>
-  <tr>
-  	<td class="link">
-    <div class="access_point">
-      <%= link_to([@referential, @stop_area, access_link_pair.access_point]) do %> 
+<tr>
+  <td>
+    <div class="link">
+      <div class="access_point">
+        <%= link_to([@referential, @stop_area, access_link_pair.access_point]) do %> 
         <%= image_tag "map/access_" + access_link_pair.access_point.access_point_type + ".png" %><span><%= access_link_pair.access_point.name %></span>        
-      <% end %>
+        <% end %>
+      </div>
+      <div class="info">
+	      <%= t("access_types.label.#{access_link_pair.access_point.access_point_type}") %>
+	    </div>
     </div>
-    <br/><br/>
-    <div class="info">
-	    <%= t("access_types.label.#{access_link_pair.access_point.access_point_type}") %>
-	</div>
-    </td>
-    <td>
-    	<% if access_link_pair.out_valid? %>
-    	   <% if access_link_pair.out_exists? %>
-    	      <%= link_to(referential_access_point_access_link_path(@referential, access_link_pair.access_point,:access_link => {:stop_area_id => access_link_pair.stop_area.id, :link_orientation_type => 'stop_area_to_access_point'})) do %>
-    	         <%= image_tag "icons/green_left_arrow.png"   %>
-    	      <% end %>
-    	   <% else %>
-    	      <%= link_to(new_referential_access_point_access_link_path(@referential, access_link_pair.access_point, :access_link => {:stop_area_id => access_link_pair.stop_area.id, :link_orientation_type => 'stop_area_to_access_point'})) do %>
-    	         <%= image_tag "icons/gray_left_arrow.png"   %>
-    	      <% end %>
-    	   <% end %>
-    	<% else %>
-    	   <%= image_tag "icons/disabled_left_arrow.png"   %>
-    	<% end %>
-    </td>
-    <td>
-    	<% if access_link_pair.in_valid? %>
-    	   <% if access_link_pair.in_exists? %>
-    	      <%= link_to(referential_access_point_access_link_path(@referential, access_link_pair.access_point, access_link_pair.from_access_point)) do %>
-    	         <%= image_tag "icons/green_right_arrow.png"   %>
-    	      <% end %>
-    	   <% else %>
-    	      <%= link_to(new_referential_access_point_access_link_path(@referential, access_link_pair.access_point, :access_link => {:stop_area_id => access_link_pair.stop_area.id, :link_orientation_type => 'access_point_to_stop_area'})) do %>
-    	         <%= image_tag "icons/gray_right_arrow.png"   %>
-    	      <% end %>
-    	   <% end %>
-    	<% else %>
-    	   <%= image_tag "icons/disabled_right_arrow.png"   %>
-    	<% end %>
-    </td>
-  	<td class="link">
-    <div class="stop_area">
-      <%= link_to([@referential, access_link_pair.stop_area]) do %> 
+  </td>
+  <td>
+    <% if access_link_pair.out_valid? %>
+    <% if access_link_pair.out_exists? %>
+    <%= link_to(referential_access_point_access_link_path(@referential, access_link_pair.access_point,:access_link => {:stop_area_id => access_link_pair.stop_area.id, :link_orientation_type => 'stop_area_to_access_point'})) do %>
+    <%= image_tag "icons/green_left_arrow.png"   %>
+    <% end %>
+    <% else %>
+    <%= link_to(new_referential_access_point_access_link_path(@referential, access_link_pair.access_point, :access_link => {:stop_area_id => access_link_pair.stop_area.id, :link_orientation_type => 'stop_area_to_access_point'})) do %>
+    <%= image_tag "icons/gray_left_arrow.png"   %>
+    <% end %>
+    <% end %>
+    <% else %>
+    <%= image_tag "icons/disabled_left_arrow.png"   %>
+    <% end %>
+  </td>
+  <td>
+    <% if access_link_pair.in_valid? %>
+    <% if access_link_pair.in_exists? %>
+    <%= link_to(referential_access_point_access_link_path(@referential, access_link_pair.access_point, access_link_pair.from_access_point)) do %>
+    <%= image_tag "icons/green_right_arrow.png"   %>
+    <% end %>
+    <% else %>
+    <%= link_to(new_referential_access_point_access_link_path(@referential, access_link_pair.access_point, :access_link => {:stop_area_id => access_link_pair.stop_area.id, :link_orientation_type => 'access_point_to_stop_area'})) do %>
+    <%= image_tag "icons/gray_right_arrow.png"   %>
+    <% end %>
+    <% end %>
+    <% else %>
+    <%= image_tag "icons/disabled_right_arrow.png"   %>
+    <% end %>
+  </td>
+  <td>
+    <div class="link">
+      <div class="stop_area">
+        <%= link_to([@referential, access_link_pair.stop_area]) do %> 
         <%= image_tag "map/" + access_link_pair.stop_area.stop_area_type + ".png" %><span><%= access_link_pair.stop_area.name %></span>        
-      <% end %>
+        <% end %>
+      </div>
+      <div class="info">
+	      <%= t("area_types.label.#{access_link_pair.stop_area.stop_area_type}") %>
+	    </div>
     </div>
-    <br/><br/>
-    <div class="info">
-	    <%= t("area_types.label.#{access_link_pair.stop_area.stop_area_type}") %>
-	</div>
-    </td>
-  </tr>
-  <tr><td colspan=4>&nbsp;</td></tr>
-<% end %>
+  </td>
+</tr>
diff --git a/app/views/access_points/_access_point.html.erb b/app/views/access_points/_access_point.html.erb
index 2890cc124..020d9bd58 100644
--- a/app/views/access_points/_access_point.html.erb
+++ b/app/views/access_points/_access_point.html.erb
@@ -1,20 +1,29 @@
-<%= div_for(access_point) do %>
-  <%= link_to([@referential, @stop_area, access_point], :class => "preview") do %>
-    <div class="access_point_type">
-      <%= image_tag "map/access_" + access_point.access_point_type + ".png"   %>
-    </div>
-  <% end %>
-  <%= link_to access_point.name, [@referential, @stop_area, access_point] %>
-  <div class="info">
-    <p>      
-      <% unless access_point.geometry %>
-      <span class="warning"><%= t('.no_position') %></span> -
-      <% end %>
-    </p>
-    <p><%= t("access_types.label.#{access_point.access_point_type}") %></p>
-    <div class="actions">  
-      <%= link_to t("actions.edit"), edit_referential_stop_area_access_point_path(@referential, @stop_area, access_point), :class => "edit" %> |
-      <%= link_to t("actions.destroy"), referential_stop_area_access_point_path(@referential, @stop_area, access_point), :method => :delete, :data => {:confirm =>  t('access_points.actions.destroy_confirm')}, :class => "remove" %>
-    </div>
+<div id="index_item" class="panel panel-default access_point">
+  <div class="panel-heading">
+    <div class="panel-title clearfix">
+      <span class="pull-right">                
+        <%= link_to edit_referential_stop_area_access_point_path(@referential, @stop_area, access_point), :class => "btn btn-default btn-sm" do %>
+          <span class="fa fa-pencil"></span>
+        <% end %>
+        <%= link_to referential_stop_area_access_point_path(@referential, @stop_area, access_point), :method => :delete, :data => {:confirm =>  t('access_points.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %>
+          <span class="fa fa-trash-o"></span>
+        <% end %>
+      </span>
+      <h5>
+        <%= link_to([@referential, @stop_area, access_point], :class => "preview", :title => "#{Chouette::StopArea.model_name.human.capitalize} #{access_point.name}") do %>        
+        <span class="name">
+          <%= image_tag "map/access_" + access_point.access_point_type + ".png"   %> <%= truncate(access_point.name, :length => 20) %>          
+        </span>
+        <% end %>
+      </h5>
+    </div>                          
   </div>
-<% end %>
+  <div class="panel-body">
+     <% unless access_point.geometry %>
+     <p>           
+       <span class="warning"><%= t('.no_position') %></span> -
+     </p>
+     <% end %>
+     <p><%= t("access_types.label.#{access_point.access_point_type}") %></p>
+  </div>
+</div>
diff --git a/app/views/access_points/show.html.erb b/app/views/access_points/show.html.erb
index 925d73ee7..9f5e600e6 100644
--- a/app/views/access_points/show.html.erb
+++ b/app/views/access_points/show.html.erb
@@ -85,45 +85,23 @@
 	    </p>
 	    <% end %>
     <% end %>
-  </div>
-                           
+  </div>  
 </div>
-                
-<p class="after_map" />
-<div>
-  <h3 class="access_point_generics">
-	<a class="generics"><%= t('.generic_access_links') %>
-      <%= image_tag("icons/plus.png"  , :class => "switcher", :style => "display: none;") %>
-      <%= image_tag("icons/minus.png"  , :class => "switcher" ) %>
-    </a>
-  	
-  </h3>
-  <div class="generics content">
 
+<div>
+  <h3 class="access_point_generics"><%= t('.generic_access_links') %></h3> 
 	<div class="access_link_pairs">
-      <table>
-	  <%= render :partial => "access_link_pairs/access_link_pair", :collection => access_links_pairs(@generic_access_links) %>
-      </table>
-	</div>
-  	
+    <table>
+	    <%= render :partial => "access_link_pairs/access_link_pair", :collection => access_links_pairs(@generic_access_links) %>
+    </table>
   </div>
 
-  <h3 class="access_point_details">
-	<a class="details"><%= t('.detail_access_links') %>
-      <%= image_tag("icons/plus.png"  , :class => "switcher") %>
-      <%= image_tag("icons/minus.png"  , :class => "switcher", :style => "display: none;" ) %>
-    </a>
-  	
-  </h3>
-  <div class="details content" style="display: none;">
-
+  <h3 class="access_point_details"><%= t('.detail_access_links') %></h3>
 	<div class="access_link_pairs">
-      <table>
-	  <%= render :partial => "access_link_pairs/access_link_pair", :collection => access_links_pairs(@detail_access_links) %>
-      </table>
-	</div>
-  	
-  </div>
+    <table>
+	    <%= render :partial => "access_link_pairs/access_link_pair", :collection => access_links_pairs(@detail_access_links) %>
+    </table>
+	</div>  
 </div>
 
                          
diff --git a/app/views/connection_links/show.html.erb b/app/views/connection_links/show.html.erb
index f9689bf55..58649d245 100644
--- a/app/views/connection_links/show.html.erb
+++ b/app/views/connection_links/show.html.erb
@@ -79,7 +79,7 @@
   <li><%= link_to t('connection_links.actions.new'), new_referential_connection_link_path(@referential), :class => "add" %></li> 
   <li><%= link_to t('connection_links.actions.edit'), edit_referential_connection_link_path(@referential, @connection_link), :class => "edit" %></li>
   <li><%= link_to t('connection_links.actions.destroy'), referential_connection_link_path(@referential, @connection_link), :method => :delete,  :data => {:confirm =>  t('connection_links.actions.destroy_confirm')}, :class => "remove" %></li>
-  <li><%= link_to t('connection_links.actions.select_areas'), select_areas_referential_connection_link_path(@referential, @connection_link), :class => "select_areas" %></li>
+  <li><%= link_to t('connection_links.actions.select_areas'), select_areas_referential_connection_link_path(@referential, @connection_link), :class => "select" %></li>
   <br>
 </ul>
   <%= creation_tag(@connection_link) %>
diff --git a/app/views/journey_patterns/show.html.erb b/app/views/journey_patterns/show.html.erb
index 4ac057161..dc9e852fa 100644
--- a/app/views/journey_patterns/show.html.erb
+++ b/app/views/journey_patterns/show.html.erb
@@ -35,7 +35,7 @@
   <li><%= link_to t('journey_patterns.actions.new'), new_referential_line_route_journey_pattern_path(@referential, @line, @route), :class => "add" %></li>
   <li><%= link_to t('journey_patterns.actions.edit'), edit_referential_line_route_journey_pattern_path(@referential, @line, @route, @journey_pattern), :class => "edit" %></li>
   <li><%= link_to  t('journey_patterns.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" %></li>
-  <li><i class="fa fa-clock-o fa-fw"></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" %></li>
+  <li><%= 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 => "clock" %></li>
 </ul>
   <%= creation_tag(@journey_pattern) %>
 <% end %>
diff --git a/app/views/routes/show.html.erb b/app/views/routes/show.html.erb
index ce9e9618f..fe1a9c956 100644
--- a/app/views/routes/show.html.erb
+++ b/app/views/routes/show.html.erb
@@ -95,14 +95,14 @@
   <li><%= link_to t('routes.actions.destroy'), referential_line_route_path(@referential, @line, @route), :method => :delete, :data => {:confirm =>  t('routes.actions.destroy_confirm')}, :class => "remove" %></li>
 <% if @route.stop_points.size >= 2 %>
   <li><%= link_to t('journey_patterns.actions.new'), new_referential_line_route_journey_pattern_path(@referential, @line, @route), :class => "add" %></li>
-<% end %>
-  <li><%= link_to t('vehicle_journey_imports.new.title'), new_referential_line_route_vehicle_journey_import_path( @referential, @line, @route ), :class => "import" %></li>
-  <li><%= link_to image_tag("icons/file_csv.png") + t('vehicle_journey_exports.new.title'), referential_line_route_vehicle_journey_exports_path(@referential, @line, @route, :format => :zip), :class => "with_fa" %></li>
+  <% end %>
   <% if @route.journey_patterns.size > 0 %>
   <li>
-    <i class="fa fa-clock-o fa-fw"></i><%= link_to t('vehicle_journeys.actions.index'), [@referential, @line, @route, :vehicle_journeys], :class => "with_fa" %>
+    <%= link_to t('vehicle_journeys.actions.index'), [@referential, @line, @route, :vehicle_journeys], :class => "clock" %>
   </li>
-<% end %>
+  <% end %>
+  <li><%= link_to t('vehicle_journey_imports.new.title'), new_referential_line_route_vehicle_journey_import_path( @referential, @line, @route ), :class => "import" %></li>
+  <li><%= link_to t('vehicle_journey_exports.new.title'), referential_line_route_vehicle_journey_exports_path(@referential, @line, @route, :format => :zip), :class => "export" %></li>
 </ul>
 
   <%= creation_tag(@route) %>
diff --git a/app/views/stop_areas/index.html.erb b/app/views/stop_areas/index.html.erb
index 915e4523a..93406dc81 100644
--- a/app/views/stop_areas/index.html.erb
+++ b/app/views/stop_areas/index.html.erb
@@ -32,7 +32,7 @@
 <% content_for :sidebar do %>
 <ul class="actions">
   <li><%= link_to t('stop_areas.actions.new'), new_referential_stop_area_path(@referential), :class => "add" %></li>
-  <li><%= link_to t('stop_areas.actions.default_geometry'), default_geometry_referential_stop_areas_path(@referential), :method => :put, :class => "calculator_edit" %></li>
+  <li><%= link_to t('stop_areas.actions.default_geometry'), default_geometry_referential_stop_areas_path(@referential), :method => :put, :class => "calculator" %></li>
 </ul>
 
 <% end %>
diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb
index f9838f91b..3a6d88207 100644
--- a/app/views/stop_areas/show.html.erb
+++ b/app/views/stop_areas/show.html.erb
@@ -127,13 +127,13 @@
     <tr><td>	
 	<h4><%= t(".stop_managment") %></h4>
 	<ul class="actions">
-	   <li><font color="#D98F3B"><i class="fa fa-arrow-up fa-fw"></i></font><%= link_to t('stop_areas.actions.select_parent'), select_parent_referential_stop_area_path(@referential, @stop_area), :class => "with_fa" %></li>
+	   <li><%= link_to t('stop_areas.actions.select_parent'), select_parent_referential_stop_area_path(@referential, @stop_area), :class => "parent" %></li>
        <% if @stop_area.parent == nil %>
-	     <li><font color="green"><i class="fa fa-files-o fa-fw"></i></font><%= link_to t('stop_areas.actions.clone_as_parent'), new_referential_stop_area_stop_area_copy_path(@referential, @stop_area, :hierarchy => "parent"), :class => "with_fa" %></li>
+	     <li><%= link_to t('stop_areas.actions.clone_as_parent'), new_referential_stop_area_stop_area_copy_path(@referential, @stop_area, :hierarchy => "parent"), :class => "clone" %></li>
        <% end %>
        <% if manage_children %>
-		  <li><font color="#D98F3B"><i class="fa fa-sitemap fa-fw"></i></font><%= link_to t('stop_areas.actions.add_children'), add_children_referential_stop_area_path(@referential, @stop_area), :class => "with_fa" %></li>
-		  <li><font color="green"><i class="fa fa-files-o fa-fw"></i></font><%= link_to t('stop_areas.actions.clone_as_child'), new_referential_stop_area_stop_area_copy_path(@referential, @stop_area, :hierarchy => "child"), :class => "with_fa" %></li>
+		  <li></i></font><%= link_to t('stop_areas.actions.add_children'), add_children_referential_stop_area_path(@referential, @stop_area), :class => "children" %></li>
+		  <li><%= link_to t('stop_areas.actions.clone_as_child'), new_referential_stop_area_stop_area_copy_path(@referential, @stop_area, :hierarchy => "child"), :class => "clone" %></li>
        <% end %>
 	</ul>
     </td></tr>
@@ -142,8 +142,8 @@
     <tr><td>	
 	<h4><%= t(".access_managment") %></h4>
 	<ul class="actions">
-        <li><font color="green"><i class="fa fa-plus-circle"></i></font><%= link_to t('access_points.actions.new'), new_referential_stop_area_access_point_path(@referential,@stop_area), :class => "with_fa" %></li>
-        <li><font color="#D98F3B"><i class="fa fa-arrows-alt fa-fw"></i></font><%= link_to t('stop_areas.actions.manage_access_links'), access_links_referential_stop_area_path(@referential,@stop_area), :class => "with_fa" %></li>
+        <li><%= link_to t('access_points.actions.new'), new_referential_stop_area_access_point_path(@referential,@stop_area), :class => "add" %></li>
+        <li><%= link_to t('stop_areas.actions.manage_access_links'), access_links_referential_stop_area_path(@referential,@stop_area), :class => "access_link" %></li>
     </ul>
     </td></tr>
 	<% end %>
diff --git a/app/views/time_tables/show.html.erb b/app/views/time_tables/show.html.erb
index 7e9a5aa62..6b2233a55 100644
--- a/app/views/time_tables/show.html.erb
+++ b/app/views/time_tables/show.html.erb
@@ -11,8 +11,8 @@
   <li><%= link_to t('time_tables.actions.new'), new_referential_time_table_path(@referential), :class => "add" %></li>
   <li><%= link_to t('time_tables.actions.edit'), edit_referential_time_table_path(@referential, @time_table), :class => "edit" %></li>
   <li><%= link_to t('time_tables.actions.destroy'), referential_time_table_path(@referential, @time_table), :method => :delete, :data => {:confirm =>  t('time_tables.actions.destroy_confirm')}, :class => "remove" %></li>
-  <li><font color="green"><i class="fa fa-files-o fa-fw"></i></font><%= link_to t('time_tables.actions.duplicate'), duplicate_referential_time_table_path(@referential, @time_table), :class => "with_fa" %></li>
-  <li><font color="#D98F3B"><i class="fa fa-cogs fa-fw"></i></font><%= link_to t('time_tables.actions.combine'), new_referential_time_table_time_table_combination_path(@referential, @time_table), {:remote => true, 'data-toggle' =>  "modal", 'data-target' => '#modal_combine', :class => "with_fa"} %></li>
+  <li><%= link_to t('time_tables.actions.duplicate'), duplicate_referential_time_table_path(@referential, @time_table), :class => "clone" %></li>
+  <li><%= link_to t('time_tables.actions.combine'), new_referential_time_table_time_table_combination_path(@referential, @time_table), {:remote => true, 'data-toggle' =>  "modal", 'data-target' => '#modal_combine', :class => "merge"} %></li>
 </ul>
 
 
diff --git a/app/views/vehicle_journeys/_show_popover.html.erb b/app/views/vehicle_journeys/_show_popover.html.erb
index 895c15395..5f6fe51ea 100644
--- a/app/views/vehicle_journeys/_show_popover.html.erb
+++ b/app/views/vehicle_journeys/_show_popover.html.erb
@@ -18,7 +18,8 @@
         <span class="<%= time_table.send( day_type) ? "included_day_type" : "excluded_day_type"%> time_table_info">
           <%= time_table.human_attribute_name(day_type).first(2) %>
         </span>
-      <% end %>
+        <% end %>
+        <span class="bounding"><%= time_table_bounding( time_table) %></span>
     </li>
     <% end %>
   </ul>  
diff --git a/app/views/vehicle_journeys/_sidebar.html.erb b/app/views/vehicle_journeys/_sidebar.html.erb
index 80f70d574..8d6f310d3 100644
--- a/app/views/vehicle_journeys/_sidebar.html.erb
+++ b/app/views/vehicle_journeys/_sidebar.html.erb
@@ -1,6 +1,6 @@
   <ul class="actions">
     <li><%= link_to t('vehicle_journeys.actions.new'), new_referential_line_route_vehicle_journey_path(@referential, @line, @route), :class => "add" %></li>
 	<li><%= link_to t('vehicle_journey_imports.new.title'), new_referential_line_route_vehicle_journey_import_path( @referential, @line, @route ), :class => "import" %></li>
-    <li><%= link_to image_tag("icons/file_csv.png") + t('vehicle_journey_exports.new.title'), referential_line_route_vehicle_journey_exports_path(@referential, @line, @route, :format => :zip), :class => "with_fa" %></li>
+    <li><%= link_to t('vehicle_journey_exports.new.title'), referential_line_route_vehicle_journey_exports_path(@referential, @line, @route, :format => :zip), :class => "export" %></li>
   </ul>
 
diff --git a/config/locales/time_table_combinations.yml b/config/locales/time_table_combinations.yml
index ff15f33e2..a544b0115 100644
--- a/config/locales/time_table_combinations.yml
+++ b/config/locales/time_table_combinations.yml
@@ -6,10 +6,12 @@ en:
       union: "merge"
       intersection: "intersect"
       disjunction: "disjoin"
+    combine_form:
+      time_tables: "Time table to combine with"
   activemodel:
     attributes:
       time_table_combination:
-        combined_id: "Time table to combine with"
+        combined_id: "Time table id"
         operation: "operation"
 fr:
   time_table_combinations:
@@ -19,10 +21,11 @@ fr:
       union: "ajouter les dates"
       intersection: "conserver les dates communes"
       disjunction: "soustraire les dates"
+    combine_form:
+      time_tables: "Calendrier à combiner"
   activemodel:
     attributes:
       time_table_combination:
-        combined_name: "Calendrier à combiner"
         combined_id: "Id Calendrier"
         operation: "opération"
 
diff --git a/config/locales/time_tables.yml b/config/locales/time_tables.yml
index c4307d707..85b990716 100644
--- a/config/locales/time_tables.yml
+++ b/config/locales/time_tables.yml
@@ -12,6 +12,7 @@ en:
       edit: "Edit this timetable"
       destroy: "Remove this timetable"
       duplicate: "Duplicate this timetable"
+      combine: "Combine with another timetable"
       destroy_confirm: "Are you sure you want destroy this timetable ?"
       destroy_date_confirm: "Are you sure you want destroy this date ?"
       destroy_period_confirm: "Are you sure you want destroy this period ?"
diff --git a/config/locales/vehicle_journeys.yml b/config/locales/vehicle_journeys.yml
index ff490966b..05eb1c4cb 100644
--- a/config/locales/vehicle_journeys.yml
+++ b/config/locales/vehicle_journeys.yml
@@ -4,7 +4,7 @@ en:
       line_routes: "Line's routes"      
     vehicle_journey:
       title_stopless: "Vehicle journey %{name}"
-      title: "Vehicle journey %{name} leaving from %{stop} at %{time}"
+      title: "Vehicle journey leaving from %{stop} at %{time}"
     actions:
       index: "Vehicle time's board"
       new: "Add a new vehicle journey"
@@ -105,7 +105,7 @@ fr:
       line_routes: "Séquences d'arrêts de la ligne"  
     vehicle_journey:
       title_stopless: "Course %{name}"
-      title: "Course %{name} partant de %{stop} à %{time}"
+      title: "Course partant de %{stop} à %{time}"
     actions:
       index: "Horaires des courses"
       new: "Ajouter une course"