Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2

3 files changed, 17 insertions, 2 deletions

diff --git a/app/views/journey_patterns/show.html.erb b/app/views/journey_patterns/show.html.erb
index 507a71cca..149f9df6a 100644
--- a/app/views/journey_patterns/show.html.erb
+++ b/app/views/journey_patterns/show.html.erb
@@ -5,6 +5,10 @@
 
   <div class="summary">
     <p>
+      <label><%= @route.human_attribute_name(:line) %>: </label>
+      <%= link_to line_formatted_name( @line), [@referential, @line] %>
+    </p>
+    <p>
       <label><%= @journey_pattern.human_attribute_name(:route) %>: </label>
       <%= link_to @route.name, [@referential, @line, @route] %>
     </p>
diff --git a/app/views/routes/_route.html.erb b/app/views/routes/_route.html.erb
index e99f418b1..416a032ea 100644
--- a/app/views/routes/_route.html.erb
+++ b/app/views/routes/_route.html.erb
@@ -10,10 +10,16 @@
     <% if route.direction.blank? %>
       <%= route.human_attribute_name('direction') %> <%= route.direction %> - 
     <% end %>
-    <%= route.human_attribute_name('wayback_code') %> <%= (route.wayback=="A") ? t('route.wayback.positive') : t('wayback.negative') %>
+    <%= route.human_attribute_name('wayback_code') %> <%= (route.wayback=="A") ? t('.wayback.positive') : t('.wayback.negative') %>
+    <% if route.journey_patterns.size > 0 %>
     <div class="actions">  
       <%= link_to t("vehicle_journeys.actions.index"), referential_line_route_vehicle_journeys_path(@referential, @line, route), :class => "link" %>
     </div>
+    <% else %>
+    <div class="actions">
+      <%= t('.no_journey_pattern')%>	
+    </div>	
+    <% end%>
   </div>
 <% end %>
 
diff --git a/app/views/routes/show.html.erb b/app/views/routes/show.html.erb
index 970ab7981..ad2ba73b4 100644
--- a/app/views/routes/show.html.erb
+++ b/app/views/routes/show.html.erb
@@ -65,7 +65,7 @@
 </div>
 
 <p class="after_map" />
-  <h3 class="route_stop_points">
+<h3 class="route_stop_points">
     <a class="stop_points"><%= t('.stop_points') %>
       <%= image_tag("icons/plus.png"  , :class => "switcher") %>
       <%= image_tag("icons/minus.png"  , :class => "switcher" , :style => "display: none;") %>
@@ -85,6 +85,7 @@
   <%= render :partial => "journey_patterns/journey_pattern", :collection => @route.journey_patterns %>
 </div>
 
+
 <% content_for :sidebar do %>
 <ul class="actions">
   <li><%= link_to t('routes.actions.edit'), edit_referential_line_route_path(@referential, @line, @route), :class => "edit" %></li>
@@ -92,12 +93,16 @@
   <li>
     <%= link_to t('stop_points.actions.sort'), [@referential, @line, @route, :stop_points], :class => "edit" %>
   </li>
+<% if @route.stop_points.size >= 2 %>
   <li>
     <%= link_to t('journey_patterns.actions.new'), new_referential_line_route_journey_pattern_path(@referential, @line, @route), :class => "add" %>
   </li>
+<% end %>
+<% if @route.journey_patterns.size > 0 %>
   <li>
     <%= link_to t('vehicle_journeys.actions.index'), [@referential, @line, @route, :vehicle_journeys], :class => "link" %>
   </li>
+<% end %>
 </ul>
 <% end %>