aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorLuc Donnet2012-06-18 15:25:09 +0200
committerLuc Donnet2012-06-18 15:25:09 +0200
commit5e90d11a3bdfdb0731e670f3cd1b60660735e469 (patch)
tree7fc49ee4b236aab71851a7e764caf945671cf75c /app
parent600ecce74a0d0aab36352d072849df67c6f1da46 (diff)
parente5ebc2c3e9fb14742562e2e7e278f13f7b2e01c7 (diff)
downloadchouette-core-5e90d11a3bdfdb0731e670f3cd1b60660735e469.tar.bz2
Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2
Diffstat (limited to 'app')
-rw-r--r--app/views/vehicle_journeys/index.html.erb16
1 files changed, 13 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>
+