remove objectids on show

8 files changed, 10 insertions, 42 deletions

diff --git a/app/views/companies/show.html.erb b/app/views/companies/show.html.erb
index 844832ee1..0c8585a6c 100644
--- a/app/views/companies/show.html.erb
+++ b/app/views/companies/show.html.erb
@@ -1,13 +1,9 @@
 <%= title_tag t('companies.show.title', :company => @company.name) %>
 
-<div class="line_show">
+<div class="company_show">
 
   <div class="summary">
     <p>
-      <label><%= Chouette::Company.human_attribute_name("name") %>: </label>
-      <%= @company.name %>
-    </p>
-    <p>
       <label><%= Chouette::Company.human_attribute_name("short_name") %>: </label>
       <%= @company.short_name %>
     </p>
@@ -39,15 +35,12 @@
       <label><%= Chouette::Company.human_attribute_name("registration_number") %>: </label>
       <%= @company.registration_number %>
     </p>
-    <p>
-      <label><%= Chouette::Company.human_attribute_name("objectid") %>: </label>
-      <%= @company.objectid %>
-    </p>
   </div>
 </div>
 
 <% content_for :sidebar do %>
 <ul class="actions">
+  <li><%= link_to t('companies.actions.new'), new_referential_company_path(@referential), :class => "add" %></li>
   <li><%= link_to t('companies.actions.edit'), edit_referential_company_path(@referential, @company), :class => "edit" %></li>
   <li><%= link_to  t('companies.actions.destroy'), referential_company_path(@referential, @company), :method => :delete,  :data => {:confirm =>  t('companies.actions.destroy_confirm')}, :class => "remove" %></li>
   <br>
diff --git a/app/views/group_of_lines/show.html.erb b/app/views/group_of_lines/show.html.erb
index 5e77bfe78..7ce5ddc46 100644
--- a/app/views/group_of_lines/show.html.erb
+++ b/app/views/group_of_lines/show.html.erb
@@ -4,17 +4,9 @@
   <%= @map.to_html %>
   <div class="summary">
     <p>
-      <label><%= @group_of_line.human_attribute_name("name") %>: </label>
-      <%= @group_of_line.name %>
-    </p>
-    <p>
       <label><%= @group_of_line.human_attribute_name("comment") %>: </label>
       <%= @group_of_line.comment %>
     </p>
-    <p>
-      <label><%= @group_of_line.human_attribute_name("objectid") %>: </label>
-      <%= @group_of_line.objectid %>
-    </p>
   </div>
   
   <p class="after_map" />
@@ -31,6 +23,7 @@
 
 <% content_for :sidebar do %>
 <ul class="actions">
+  <li><%= link_to t('group_of_lines.actions.new'), new_referential_group_of_line_path(@referential), :class => "add" %></li>
   <li><%= link_to t('group_of_lines.actions.edit'), edit_referential_group_of_line_path(@referential, @group_of_line), :class => "edit" %></li>
   <li><%= link_to  t('group_of_lines.actions.destroy'), referential_group_of_line_path(@referential, @group_of_line), :method => :delete, :data => {:confirm =>  t('group_of_lines.actions.destroy_confirm')} , :class => "remove" %></li>
   <br>
diff --git a/app/views/lines/show.html.erb b/app/views/lines/show.html.erb
index 2b9961ca2..cec5dc2f0 100644
--- a/app/views/lines/show.html.erb
+++ b/app/views/lines/show.html.erb
@@ -21,10 +21,6 @@
     <% end %>
     </p>
     <p>
-      <label><%= @line.human_attribute_name("name") %>: </label>
-      <%= @line.name %>
-    </p>
-    <p>
       <label><%= @line.human_attribute_name("published_name") %>: </label>
       <%= @line.published_name %>
     </p>
@@ -80,10 +76,6 @@
       <label><%= @line.human_attribute_name("comment") %>: </label>
       <%= @line.comment %>
     </p>
-    <p>
-      <label><%= @line.human_attribute_name("objectid") %>: </label>
-      <%= @line.objectid %>
-    </p>
   </div>
 </div>
 
@@ -102,8 +94,9 @@
 
 <% content_for :sidebar do %>
 <ul class="actions">
+  <li><%= link_to t('lines.actions.new'), new_referential_line_path(@referential), :class => "add" %></li>
   <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, :data => {:confirm =>  t('lines.actions.destroy_confirm')}, :class => "remove" %></li>
+  <li><%= link_to t('lines.actions.destroy'), referential_line_path(@referential, @line), :method => :delete, :data => {: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> 
 </ul>
   <%= creation_tag(@line) %>
diff --git a/app/views/networks/show.html.erb b/app/views/networks/show.html.erb
index 273a04aed..e7b103dda 100644
--- a/app/views/networks/show.html.erb
+++ b/app/views/networks/show.html.erb
@@ -4,10 +4,6 @@
   <%= @map.to_html %>
   <div class="summary">
     <p>
-      <label><%= Chouette::Network.human_attribute_name("name") %>: </label>
-      <%= @network.name %>
-    </p>
-    <p>
       <label><%= Chouette::Network.human_attribute_name("registration_number") %>: </label>
       <%= @network.registration_number %>
     </p>
@@ -33,15 +29,12 @@
       <label><%= Chouette::Network.human_attribute_name("source_identifier") %>: </label>
       <%= @network.source_identifier %>
     </p>
-    <p>
-      <label><%= Chouette::Network.human_attribute_name("objectid") %>: </label>
-      <%= @network.objectid %>
-    </p>
   </div>
 </div>
 
 <% content_for :sidebar do %>
 <ul class="actions">
+  <li><%= link_to t('networks.actions.new'), new_referential_network_path(@referential), :class => "add" %></li>
   <li><%= link_to t('networks.actions.edit'), edit_referential_network_path(@referential, @network), :class => "edit" %></li>
   <li><%= link_to  t('networks.actions.destroy'), referential_network_path(@referential, @network), :method => :delete, :data => {:confirm =>  t('networks.actions.destroy_confirm')}, :class => "remove" %></li>
   <br>
diff --git a/app/views/routes/show.html.erb b/app/views/routes/show.html.erb
index 262212477..3a9504775 100644
--- a/app/views/routes/show.html.erb
+++ b/app/views/routes/show.html.erb
@@ -48,10 +48,6 @@
         <%= t(".no_opposite_route") %>
       <% end %>
     </p>
-    <p>
-      <label><%= @route.human_attribute_name("objectid") %>: </label>
-      <%= @route.objectid %>
-    </p>
   </div>
 
 </div>
@@ -94,6 +90,7 @@
 
 <% content_for :sidebar do %>
 <ul class="actions">
+  <li><%= link_to t('routes.actions.new'), new_referential_line_route_path(@referential, @line), :class => "add" %></li> 
   <li><%= link_to t('routes.actions.edit'), edit_referential_line_route_path(@referential, @line, @route), :class => "edit" %></li>
   <li><%= link_to t('routes.actions.destroy'), referential_line_route_path(@referential, @line, @route), :method => :delete, :data => {:confirm =>  t('routes.actions.destroy_confirm')}, :class => "remove" %></li>
 <% if @route.stop_points.size >= 2 %>
diff --git a/app/views/vehicle_journeys/_form.html.erb b/app/views/vehicle_journeys/_form.html.erb
index e785c70dc..7e03eba2a 100644
--- a/app/views/vehicle_journeys/_form.html.erb
+++ b/app/views/vehicle_journeys/_form.html.erb
@@ -1,6 +1,7 @@
 <%= semantic_form_for [@referential, @line, @route, @vehicle_journey] do |form| %>
   <%= form.inputs do %>
     <%= form.input :journey_pattern, :as => :select, :collection => @route.journey_patterns, :member_label => Proc.new { |jp| journey_name(jp) }  %>
+    <%= form.input :number %>
     <%= form.input :published_journey_name %>
     <%= form.input :published_journey_identifier %>
     <%= form.input :comment %>
diff --git a/app/views/vehicle_journeys/show.html.erb b/app/views/vehicle_journeys/show.html.erb
index 01f44c7b0..45f4fcdb1 100644
--- a/app/views/vehicle_journeys/show.html.erb
+++ b/app/views/vehicle_journeys/show.html.erb
@@ -60,10 +60,6 @@
       <label><%= @vehicle_journey.human_attribute_name("vehicle_type_identifier") %>: </label>
       <%= @vehicle_journey.vehicle_type_identifier %>
     </p>
-    <p>
-      <label><%= @vehicle_journey.human_attribute_name("objectid") %>: </label>
-      <%= @vehicle_journey.objectid %>
-    </p>
   </div>
 </div>
 <h3><%= @vehicle_journey.human_attribute_name(:vehicle_journey_at_stop_ids) %></h3>
diff --git a/config/locales/vehicle_journeys.yml b/config/locales/vehicle_journeys.yml
index 01a59217a..f945793ea 100644
--- a/config/locales/vehicle_journeys.yml
+++ b/config/locales/vehicle_journeys.yml
@@ -60,6 +60,7 @@ en:
         time_tables: "Calendars"
         time_slot: "Time Slot"
         company: "Company"
+        number: "Number"
         comment: "Comments"
         status_value: "Status Value"
         transport_mode_name: "Transport Mode"
@@ -151,6 +152,7 @@ fr:
         time_tables: "Calendriers"
         time_slot: "Fréquence"
         company: "Transporteur"
+        number: "Numéro"
         comment: "Commentaires"
         status_value: "Etat de trafic"
         transport_mode_name: "Mode de transport"