5 files changed, 42 insertions, 50 deletions
diff --git a/app/views/lines/show.html.erb b/app/views/lines/show.html.erb
index cd0e6b2ac..23c65573f 100644
--- a/app/views/lines/show.html.erb
+++ b/app/views/lines/show.html.erb
@@ -51,10 +51,18 @@
   </div>
 </div>
 
+<h3 class="routes"><%= t('.itineraries') %></h3>
+<%= will_paginate @routes %>
+<div class="routes paginated_content">
+  <%= render :partial => "routes/route", :collection => @routes %>
+</div>
+<%= will_paginate @routes %>
+
 <% content_for :sidebar do %>
 <ul class="actions">
   <li><%= link_to t('lines.actions.edit'), edit_referential_line_path(@referential, @line), :class => "edit" %></li>
   <li><%= link_to  t('lines.actions.destroy'), referential_line_path(@referential, @line), :method => :delete, :confirm =>  t('lines.actions.destroy_confirm'), :class => "remove" %></li>
+  <li><%= link_to t('routes.actions.new'), new_referential_line_route_path(@referential, @line), :class => "add" %></li> 
   <br>
 </ul>
 <% end %>
diff --git a/app/views/routes/_form.html.erb b/app/views/routes/_form.html.erb
index fb4604328..96a681b13 100644
--- a/app/views/routes/_form.html.erb
+++ b/app/views/routes/_form.html.erb
@@ -4,8 +4,8 @@
     <%= form.input :published_name %>
     <%= form.input :number %>
     <%= form.input :comment %>              
-    <%= form.input :oppositerouteid, :as => :select, :collection => Hash[@line.routes.map{|r| [r.name,r.id]}] %>
-    <%= form.input :direction, :as => :select, :collection => { "Aller" => 'A', "Retour" => "R"} %>
+    <%= form.input :opposite_route, :as => :select, :collection => Hash[@line.routes.map{|r| [r.name,r.id]}] %>
+    <%= form.input :direction_code, :as => :select, :collection => Chouette::Route.directions, :include_blank => false, :member_label => Proc.new { |mode| t("directions.label.#{mode}") } %>
     <%= form.input :wayback_code, :as => :select, :collection => Chouette::Route.waybacks, :include_blank => false, :member_label => Proc.new { |mode| t("waybacks.label.#{mode}") } %>
     <% if @route.new_record? %>
       <%= form.input :objectid %>  
diff --git a/app/views/routes/_list.html.erb b/app/views/routes/_list.html.erb
deleted file mode 100644
index b253c3f75..000000000
--- a/app/views/routes/_list.html.erb
+++ /dev/null
@@ -1,21 +0,0 @@
-<%= title_tag t('routes.index.title') %> 
-
-<%= search_form_for @q, :url => referential_line_routes_path(@referential, @line), :html => {:method => :get} do |f| %>
-  <%= f.text_field :name_cont %>
-
-  <%= f.submit t('actions.search') %> <%= t("or") %>
-  <%= link_to t("cancel"), referential_line_path(@referential,@line) %>
-<% end %>
-
-<%= will_paginate @line.routes %>
-<div class="routes paginated_content">
-  <%= render :partial => "route", :collection => @line.routes %>
-</div>
-<%= will_paginate @line.routes %>
-
-<% content_for :sidebar do %>
-<ul class="actions">
-  <li><%= link_to t('routes.actions.new'), new_referential_line_route_path(@referential, @line), :class => "add" %></li> 
-</ul>
-<% end %>
-
diff --git a/app/views/routes/index.html.erb b/app/views/routes/index.html.erb
deleted file mode 100644
index fba0ef859..000000000
--- a/app/views/routes/index.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<%= title_tag t('routes.index.title') %> 
-
-<%= search_form_for @q, :url => referential_line_routes_path(@referential, @line), :html => {:method => :get} do |f| %>
-  <%= f.text_field :name_cont %>
-
-  <%= f.submit t('actions.search') %> <%= t("or") %>
-  <%= link_to t("cancel"), referential_line_path(@referential,@line) %>
-<% end %>
-
-<%= will_paginate @routes %>
-<div class="routes paginated_content">
-  <%= render :partial => "route", :collection => @routes %>
-</div>
-<%= will_paginate @routes %>
-
-<% content_for :sidebar do %>
-<ul class="actions">
-  <li><%= link_to t('routes.actions.new'), new_referential_line_route_path(@referential, @line), :class => "add" %></li> 
-</ul>
-<% end %>
diff --git a/app/views/routes/show.html.erb b/app/views/routes/show.html.erb
index 1d43c4284..aef155fec 100644
--- a/app/views/routes/show.html.erb
+++ b/app/views/routes/show.html.erb
@@ -1,11 +1,11 @@
-<%= title_tag t('routes.show.title', :route => @route.name ) %>
+<%= title_tag t('routes.show.title', :route => @route.name, :line => @line.name ) %>
 
 <div class="route_show">
 
   <div class="summary">
     <p>
       <label><%= @route.human_attribute_name(:line) %>: </label>
-      <%= link_to @line.name, [@referential, @line] %>
+      <%= link_to line_formatted_name( @line), [@referential, @line] %>
     </p>
     <p>
       <label><%= @route.human_attribute_name(:name) %>: </label>
@@ -24,12 +24,30 @@
       <%= @route.comment %>
     </p>
     <p>
-      <label><%= @route.human_attribute_name(:direction) %>: </label>
-      <%= @route.direction %>
+      <label><%= @route.human_attribute_name(:direction_code) %>: </label>
+      <% if @route.direction_code %>
+        <p><%= @route.direction_code.inspect %></p>
+        <p><%= @route.direction.inspect %></p>
+        <%= t("directions.label.#{@route.direction_code}").capitalize %>
+      <% else %>
+        <%= t(".undefined") %>
+      <% end %>
     </p>
     <p>
-      <label><%= @route.human_attribute_name(:wayback) %>: </label>
-      <%= @route.wayback %>
+      <label><%= @route.human_attribute_name(:wayback_code) %>: </label>
+      <% if @route.wayback_code %>
+        <%= t("waybacks.label.#{@route.wayback_code}").capitalize %>
+      <% else %>
+        <%= t(".undefined") %>
+      <% end %>
+    </p>
+    <p>
+      <label><%= @route.human_attribute_name(:opposite_route) %>: </label>
+      <% if @route.opposite_route %>
+        <%= link_to @route.opposite_route.name, [@referential, @line, @route] %>
+      <% else %>
+        <%= t(".no_opposite_route") %>
+      <% end %>
     </p>
     <p>
       <label><%= @route.human_attribute_name("objectid") %>: </label>
@@ -37,7 +55,7 @@
     </p>
     <p>
       <label><%= @route.human_attribute_name("creation_time") %>: </label>
-      <%= @route.creation_time %>
+      <%= l @route.creation_time %>
     </p>
     <p>
       <label><%= @route.human_attribute_name("creator_id") %>: </label>
@@ -47,6 +65,13 @@
 
 </div>
 
+<h3 class="stop_areas"><%= t('.stop_areas') %></h3>
+<%= will_paginate @stop_areas %>
+<div class="stop_areas paginated_content">
+  <%= render :partial => "stop_areas/stop_area", :collection => @stop_areas %>
+</div>
+<%= will_paginate @stop_areas %>
+
 <% 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>