use font awesome icon for duplicate and combine actions

7 files changed, 16 insertions, 7 deletions

diff --git a/app/assets/stylesheets/main/layout.css.scss b/app/assets/stylesheets/main/layout.css.scss
index 14b364985..e11360333 100644
--- a/app/assets/stylesheets/main/layout.css.scss
+++ b/app/assets/stylesheets/main/layout.css.scss
@@ -388,6 +388,11 @@ ol.breadcrumb{
         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;
     }
diff --git a/app/controllers/time_table_combinations_controller.rb b/app/controllers/time_table_combinations_controller.rb
index 249bb5060..2af3fe630 100644
--- a/app/controllers/time_table_combinations_controller.rb
+++ b/app/controllers/time_table_combinations_controller.rb
@@ -8,13 +8,13 @@ class TimeTableCombinationsController < ChouetteController
   def create
     combination = TimeTableCombination.new( params[:time_table_combination].merge( :source_id => parent.id))
     if combination.invalid?
-      flash[:alert] = combination.errors.full_messages.join("<br/>")
+      flash[:error] = combination.errors.full_messages.join("<br/>")
     else
       begin
         combination.combine
         flash[:notice] = t('time_table_combinations.success')
       rescue
-        flash[:alert] = t('time_table_combinations.failure')
+        flash[:error] = t('time_table_combinations.failure')
       end
     end
     redirect_to referential_time_table_path(@referential, @time_table)
diff --git a/app/views/journey_patterns/_journey_pattern.html.erb b/app/views/journey_patterns/_journey_pattern.html.erb
index 046f87958..821d3ef47 100644
--- a/app/views/journey_patterns/_journey_pattern.html.erb
+++ b/app/views/journey_patterns/_journey_pattern.html.erb
@@ -8,7 +8,7 @@
     <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 %>
-        | <%= 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 => "link" %>
+        | <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>
   </div>
diff --git a/app/views/journey_patterns/show.html.erb b/app/views/journey_patterns/show.html.erb
index 1bdd5cc5e..2ea427380 100644
--- a/app/views/journey_patterns/show.html.erb
+++ b/app/views/journey_patterns/show.html.erb
@@ -46,7 +46,7 @@
 <ul class="actions">
   <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><%= 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 => "link" %></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>
 </ul>
   <%= creation_tag(@journey_pattern) %>
 <% end %>
diff --git a/app/views/routes/show.html.erb b/app/views/routes/show.html.erb
index 63f52974c..262212477 100644
--- a/app/views/routes/show.html.erb
+++ b/app/views/routes/show.html.erb
@@ -106,7 +106,7 @@
   </li>
   <% if @route.journey_patterns.size > 0 %>
   <li>
-    <i class="fa fa-clock-o"></i><%= link_to t('vehicle_journeys.actions.index'), [@referential, @line, @route, :vehicle_journeys], :class => "vehicle_journeys" %>
+    <i class="fa fa-clock-o fa-fw"></i><%= link_to t('vehicle_journeys.actions.index'), [@referential, @line, @route, :vehicle_journeys], :class => "with_fa" %>
   </li>
 <% end %>
 </ul>
diff --git a/app/views/time_tables/show.html.erb b/app/views/time_tables/show.html.erb
index 0ecad52b1..3a8e75124 100644
--- a/app/views/time_tables/show.html.erb
+++ b/app/views/time_tables/show.html.erb
@@ -139,8 +139,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><%= link_to t('time_tables.actions.duplicate'), duplicate_referential_time_table_path(@referential, @time_table), :class => "add" %></li>
-  <li><%= link_to t('time_tables.actions.combine'), '#combine_form', :class => "import" ,'data-toggle' => 'modal'%></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'), '#combine_form', 'data-toggle' => 'modal', :class => "with_fa"%></li>
 </ul>
 
 
diff --git a/config/locales/stop_points.yml b/config/locales/stop_points.yml
index 2a4c90766..540fdc650 100644
--- a/config/locales/stop_points.yml
+++ b/config/locales/stop_points.yml
@@ -19,6 +19,8 @@ en:
       subtitle: "Stops on route ordered"
       move: "Move"
       no_stop_point: "No stop point on route"
+    stop_point:
+      lines: "lines"
   activerecord:        
     models:        
       stop_point: 
@@ -49,6 +51,8 @@ fr:
       subtitle: "Arrêts dans l'ordre de parcours"
       move: "Déplacer"
       no_stop_point: "Aucun arrêt dans la séquence"
+    stop_point:
+      lines: "lignes"
   activerecord:        
     models:        
       stop_point: