diff options
| author | Bruno Perles | 2015-11-04 13:56:57 +0100 |
|---|---|---|
| committer | Bruno Perles | 2015-11-04 13:56:57 +0100 |
| commit | e5861132506bcc245c5d7cc34f00979c3932d2ce (patch) | |
| tree | 627bc4986c5e74946bbb442ba4bd7b08b4bcda72 /app/views | |
| parent | fbafa0e7efc71aa392d0d400e1777203cc95c841 (diff) | |
| download | chouette-core-e5861132506bcc245c5d7cc34f00979c3932d2ce.tar.bz2 | |
Add a way to show vehicle journey frequency
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/routes/_route.html.erb | 47 | ||||
| -rw-r--r-- | app/views/vehicle_journeys/_vehicle_journeys.html.erb | 8 |
2 files changed, 35 insertions, 20 deletions
diff --git a/app/views/routes/_route.html.erb b/app/views/routes/_route.html.erb index 0fee47cd1..179f06a25 100644 --- a/app/views/routes/_route.html.erb +++ b/app/views/routes/_route.html.erb @@ -22,26 +22,33 @@ </div> </div> <div class="panel-body"> - <p> - <% if route.journey_patterns.size > 0 %> - <i class="fa fa-clock-o"></i><%= link_to t("vehicle_journeys.actions.index"), referential_line_route_vehicle_journeys_path(@referential, @line, route) %> - <% else %> - <%= t('.no_journey_pattern')%> - <% end%> - </p> - <p> - <% if route.opposite_route %> - <%= fonticon_wayback(route.opposite_route.wayback) %><%= link_to truncate(route.opposite_route.name, :length => 30), referential_line_route_path( @referential, @line, route.opposite_route) %> - <% else %> - <%= t('.no_opposite') %> + <p> + <% if route.journey_patterns.size > 0 %> + <i class="fa fa-clock-o"></i> + <%= link_to t("vehicle_journeys.actions.index"), referential_line_route_vehicle_journeys_path(@referential, @line, route) %> + <% else %> + <%= t('.no_journey_pattern')%> + <% end%> + </p> + <% if @line.vehicle_journey_frequencies? %> + <p> + <i class="fa fa-clock-o"></i> + <%= link_to t("vehicle_journey_frequencies.actions.index"), referential_line_route_vehicle_journey_frequencies_path(@referential, @line, route) %> + </p> <% end %> - </p> - <p> - <% if ! route.direction.blank? %> - <%= route.human_attribute_name('direction_code') %> : <%= t('directions.label.'+route.direction_code) %> - <% else %> - <br> - <% end %> - </p> + <p> + <% if route.opposite_route %> + <%= fonticon_wayback(route.opposite_route.wayback) %><%= link_to truncate(route.opposite_route.name, :length => 30), referential_line_route_path( @referential, @line, route.opposite_route) %> + <% else %> + <%= t('.no_opposite') %> + <% end %> + </p> + <p> + <% if ! route.direction.blank? %> + <%= route.human_attribute_name('direction_code') %> : <%= t('directions.label.'+route.direction_code) %> + <% else %> + <br> + <% end %> + </p> </div> </div> diff --git a/app/views/vehicle_journeys/_vehicle_journeys.html.erb b/app/views/vehicle_journeys/_vehicle_journeys.html.erb index 9d553e48b..3bff10b59 100644 --- a/app/views/vehicle_journeys/_vehicle_journeys.html.erb +++ b/app/views/vehicle_journeys/_vehicle_journeys.html.erb @@ -1,6 +1,14 @@ <div class="page_info"> <span class="search"><%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @vehicle_journeys %> + <span class="pull-right"> + <i class="fa fa-clock-o"></i> + <% if controller_name == 'vehicle_journey_frequencies' %> + <%= link_to t("vehicle_journeys.actions.show"), referential_line_route_vehicle_journeys_path(@referential, @line, @route) %> + <% else %> + <%= link_to t("vehicle_journey_frequencies.actions.show"), referential_line_route_vehicle_journey_frequencies_path(@referential, @line, @route) %> + <% end %> + </span> </div> <div class="pagination"> <%= will_paginate @vehicle_journeys, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer %> |