diff options
| author | Marc Florisson | 2012-06-18 15:20:21 +0200 |
|---|---|---|
| committer | Marc Florisson | 2012-06-18 15:20:21 +0200 |
| commit | e5ebc2c3e9fb14742562e2e7e278f13f7b2e01c7 (patch) | |
| tree | 6605200d82586145c6d34cc9f62a1f329445c2f2 | |
| parent | bd9c5de0ce65c9a1e3ce6ef3ec19e6f9ff542ce0 (diff) | |
| download | chouette-core-e5ebc2c3e9fb14742562e2e7e278f13f7b2e01c7.tar.bz2 | |
fix vehicle_journey view
| -rw-r--r-- | app/views/vehicle_journeys/index.html.erb | 16 | ||||
| -rw-r--r-- | config/locales/vehicle_journeys.yml | 4 |
2 files changed, 17 insertions, 3 deletions
diff --git a/app/views/vehicle_journeys/index.html.erb b/app/views/vehicle_journeys/index.html.erb index 6e126e64c..c71b82824 100644 --- a/app/views/vehicle_journeys/index.html.erb +++ b/app/views/vehicle_journeys/index.html.erb @@ -10,8 +10,8 @@ <label><%= Chouette::Route.model_name.human %>: </label> <%= link_to @route.name, [@referential, @line, @route] %> </p> - <div> -<div> + </div> +</div> <h3 class="vehicle_journeys"><%= t('.vehicle_journeys') %></h3> <div class="pagination"> <div class="page_info"> @@ -59,8 +59,18 @@ <% content_for :sidebar do %> <ul class="actions"> <li> - <%= link_to t('vehicle_journeys.actions.new'), new_referential_line_route_vehicle_journey_path(@referential, @line, @route), :class => "link" %> + <%= link_to t('vehicle_journeys.actions.new'), new_referential_line_route_vehicle_journey_path(@referential, @line, @route), :class => "add" %> </li> </ul> +<h3><%= t(".selection") %></h3> + +<h4><%= Chouette::JourneyPattern.model_name.human.pluralize %></h4> + +<ul class="selection"> +<% @route.journey_patterns.each do |journey_pattern| %> +<li><%= link_with_search journey_pattern.name, "journey_pattern_id_eq" => journey_pattern.id %></li> <% end %> +<li><%= link_with_search t(".selection_all"), {"journey_pattern_id_eq" => nil}, :class => "all" %></li> +</ul> + diff --git a/config/locales/vehicle_journeys.yml b/config/locales/vehicle_journeys.yml index 8ed746e3d..12f94a191 100644 --- a/config/locales/vehicle_journeys.yml +++ b/config/locales/vehicle_journeys.yml @@ -29,6 +29,8 @@ en: index: title: Vehicle journeys on route %{route} vehicle_journeys: "Departure's times" + selection: Filter on + selection_all: All activerecord: models: vehicle_journey: @@ -87,6 +89,8 @@ fr: index: title: "Courses de la séquence d'arrêts %{route}" vehicle_journeys: "Horaires de départ aux arrêts" + selection: Filtrer sur + selection_all: Tous activerecord: models: vehicle_journey: |