diff options
| -rw-r--r-- | app/views/vehicle_journey_imports/new.html.erb | 9 | ||||
| -rw-r--r-- | app/views/vehicle_journeys/index.html.erb | 12 | ||||
| -rw-r--r-- | config/locales/vehicle_journey_imports.yml | 2 |
3 files changed, 13 insertions, 10 deletions
diff --git a/app/views/vehicle_journey_imports/new.html.erb b/app/views/vehicle_journey_imports/new.html.erb index 65bfd6b17..7a0e0ac96 100644 --- a/app/views/vehicle_journey_imports/new.html.erb +++ b/app/views/vehicle_journey_imports/new.html.erb @@ -1,15 +1,6 @@ <%= title_tag t('vehicle_journey_imports.new.title') %> <div class="main_actions"> - <div class="btn-group"> - <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> - <%= t('vehicle_journey_imports.new.export_vehicle_journeys') %><span class="caret"></span> - </button> - <ul class="dropdown-menu" role="menu"> - <li><%= link_to image_tag("icons/file_csv.png") + " Csv" , referential_line_route_vehicle_journey_exports_path(@referential, @line, @route, :format => :csv) %></li> - <li><%= link_to image_tag("icons/file_excel.png") + " Excel", referential_line_route_vehicle_journey_exports_path(@referential, @line, @route, :format => :xls) %></li> - </ul> - </div> </div> <%= semantic_form_for [@referential, @line, @route, @vehicle_journey_import] do |form| %> diff --git a/app/views/vehicle_journeys/index.html.erb b/app/views/vehicle_journeys/index.html.erb index 651aea739..38c3b06f8 100644 --- a/app/views/vehicle_journeys/index.html.erb +++ b/app/views/vehicle_journeys/index.html.erb @@ -59,7 +59,19 @@ <li> <%= link_to t('.timeless'), timeless_referential_line_route_vehicle_journeys_path(@referential, @line, @route), :class => "link" %> </li> + <li> + <%= link_to t('vehicle_journey_imports.new.title'), new_referential_line_route_vehicle_journey_import_path( @referential, @line, @route ), :class => "import" %> + </li> </ul> + <div class="btn-group"> + <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> + <%= t('vehicle_journey_imports.new.export_vehicle_journeys') %><span class="caret"></span> + </button> + <ul class="dropdown-menu" role="menu"> + <li><%= link_to image_tag("icons/file_csv.png") + " Csv" , referential_line_route_vehicle_journey_exports_path(@referential, @line, @route, :format => :csv) %></li> + <li><%= link_to image_tag("icons/file_excel.png") + " Excel", referential_line_route_vehicle_journey_exports_path(@referential, @line, @route, :format => :xls) %></li> + </ul> + </div> <h4><%= t(".selection") %></h4> <h5><%= Chouette::JourneyPattern.model_name.human.pluralize %></h5> diff --git a/config/locales/vehicle_journey_imports.yml b/config/locales/vehicle_journey_imports.yml index 476996f41..5567e12e0 100644 --- a/config/locales/vehicle_journey_imports.yml +++ b/config/locales/vehicle_journey_imports.yml @@ -19,7 +19,7 @@ en: fr: vehicle_journey_imports: new: - title: "Import des horaires à l'arrêt" + title: "Import des horaires aux arrêts" export_vehicle_journeys: "Exporter les horaires existants" succcess: "L'import des données est un succès" tooltip: |