add date and period on timetables and missing fields on connectionlinks

34 files changed, 263 insertions, 169 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 55ea473d9..b6b129246 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://chouette.dryade.priv/ninoxe
-  revision: 7dce8d1785df25897e38d34c52f884b387f814e8
+  revision: 0f2f0ab0d030c395464f43e4d5da79f5b74a89c6
   specs:
     ninoxe (0.0.8)
       GeoRuby
@@ -161,8 +161,7 @@ GEM
     jruby-openssl (0.7.6.1)
       bouncy-castle-java (>= 1.5.0146.1)
     jruby-rack (1.1.5)
-    json (1.7.1)
-    json (1.7.1-java)
+    json (1.7.3-java)
     launchy (2.1.0)
       addressable (~> 2.2.6)
     launchy (2.1.0-java)
@@ -177,7 +176,7 @@ GEM
       treetop (~> 1.4.8)
     map_layers (0.0.5)
     mime-types (1.18)
-    multi_json (1.3.4)
+    multi_json (1.3.5)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
diff --git a/app/assets/stylesheets/time_tables.css.scss b/app/assets/stylesheets/time_tables.css.scss
index ba771262e..583af09c6 100644
--- a/app/assets/stylesheets/time_tables.css.scss
+++ b/app/assets/stylesheets/time_tables.css.scss
@@ -36,10 +36,22 @@
       }
       .period {
         padding-left:50px;
+        padding-right:450px;
       }
       .date {
         padding-left:50px;
       }
+      .odd {
+        padding-left:50px;
+        padding-right:450px;
+      }
+      .even {
+        padding-left:50px;
+        padding-right:450px;
+      }
+  .actions {
+      float: right;
+    }
 
     .summary p label {
         font-weight: bold;
@@ -139,49 +151,4 @@
   .day_type ol li label {
       padding-left: 10%;
     }
-  .periods ol {
-      float: left;
-      margin: 0;
-      padding: 0 0 0 25%;
-      width: 74%;
-      list_style: none outside none;
-  }
-  .periods ol li {
-      float: left;
-      margin: 0 O 0 0;
-      width: auto;
-      padding: 0;
-    }
-  .periods ol li fieldset legend label {
-      width: auto;
-    }
-  .periods ol li fieldset ol  {
-      padding: 0 10% 0 15%;
-      width: auto;
-    }
-  .links {
-    margin-left: 25%;
-    padding-left: 20px;
-    background: url(image-path('user_interface/ui/add.png')) no-repeat;
-   }
-  .dates ol {
-      float: left;
-      margin: 0;
-      padding: 0 0 0 25%;
-      width: 74%;
-      list_style: none outside none;
-  }
-  .dates ol li {
-      float: left;
-      margin: 0 O 0 0;
-      width: auto;
-      padding: 0;
-    }
-  .dates ol li fieldset legend label {
-      width: auto;
-    }
-  .dates ol li fieldset ol  {
-      padding: 0 10% 0 15%;
-      width: auto;
-    }
 }
diff --git a/app/controllers/time_table_dates_controller.rb b/app/controllers/time_table_dates_controller.rb
index b8eb80c54..100034394 100644
--- a/app/controllers/time_table_dates_controller.rb
+++ b/app/controllers/time_table_dates_controller.rb
@@ -18,4 +18,10 @@ class TimeTableDatesController < ChouetteController
       success.html { redirect_to referential_time_table_path(@referential,@time_table) }
     end
   end
+  
+  def destroy     
+    destroy! do |success, failure|
+      success.html { redirect_to referential_time_table_path(@referential,@time_table) }
+    end
+  end
 end
diff --git a/app/controllers/time_table_periods_controller.rb b/app/controllers/time_table_periods_controller.rb
new file mode 100644
index 000000000..0614de2d5
--- /dev/null
+++ b/app/controllers/time_table_periods_controller.rb
@@ -0,0 +1,27 @@
+class TimeTablePeriodsController < ChouetteController
+  defaults :resource_class => Chouette::TimeTablePeriod, :collection_name => 'periods'
+
+  respond_to :html
+
+  belongs_to :referential do
+    belongs_to :time_table, :parent_class => Chouette::TimeTable
+  end
+
+  def update     
+    update! do |success, failure|
+      success.html { redirect_to referential_time_table_path(@referential,@time_table) }
+    end
+  end
+
+  def create
+    create! do |success, failure|
+      success.html { redirect_to referential_time_table_path(@referential,@time_table) }
+    end
+  end
+  
+  def destroy     
+    destroy! do |success, failure|
+      success.html { redirect_to referential_time_table_path(@referential,@time_table) }
+    end
+  end
+end
diff --git a/app/views/companies/_form.erb b/app/views/companies/_form.erb
index bea95b0b4..63cb2661b 100644
--- a/app/views/companies/_form.erb
+++ b/app/views/companies/_form.erb
@@ -8,7 +8,7 @@
     <%= form.input :phone, :as => :phone %>
     <%= form.input :fax, :as => :phone %>
     <%= form.input :email, :as => :email %>              
-    <%= form.input :registration_number %>
+    <%= form.input :registrationnumber %>
     <% if @company.new_record? %>
       <%= form.input :objectid %>  
     <% else %>
diff --git a/app/views/companies/show.html.erb b/app/views/companies/show.html.erb
index 16d104969..8703bbc49 100644
--- a/app/views/companies/show.html.erb
+++ b/app/views/companies/show.html.erb
@@ -36,7 +36,7 @@
       <%= @company.email %>
     </p>
     <p>
-      <label><%= Chouette::Company.human_attribute_name("registration_number") %>: </label>
+      <label><%= Chouette::Company.human_attribute_name("registrationnumber") %>: </label>
       <%= @company.registration_number %>
     </p>
     <p>
@@ -45,7 +45,7 @@
     </p>
     <p>
       <label><%= @company.human_attribute_name("creation_time") %>: </label>
-      <%= @company.creation_time %>
+      <%= l(@company.creation_time) %>
     </p>
     <p>
       <label><%= @company.human_attribute_name("creator_id") %>: </label>
diff --git a/app/views/connection_links/_form.erb b/app/views/connection_links/_form.erb
index 31777c253..31c3e3bde 100644
--- a/app/views/connection_links/_form.erb
+++ b/app/views/connection_links/_form.erb
@@ -3,7 +3,16 @@
   <%= form.inputs do %> 
     <%= form.input :name %>
     <%= form.input :connection_link_type, :as => :select, :collection => Chouette::ConnectionLink.connection_link_types, :include_blank => false, :member_label => Proc.new { |type| t("connection_link_types.label.#{type}") }  %>
-    <%= form.input :comment %>              
+    <%= form.input :comment %>  
+    <%= form.input :link_distance %> 
+    <%= form.input :defaultduration, :as => :time ,:include_seconds => true , :label => @connection_link.human_attribute_name("default_duration")%>
+    <%= form.input :frequenttravellerduration, :as => :time ,:include_seconds => true , :label => @connection_link.human_attribute_name("frequent_traveller_duration")%>
+    <%= form.input :occasionaltravellerduration, :as => :time ,:include_seconds => true , :label => @connection_link.human_attribute_name("occasional_traveller_duration")%>
+    <%= form.input :mobilityrestrictedtravellerduration, :as => :time ,:include_seconds => true , :label => @connection_link.human_attribute_name("mobility_restricted_traveller_duration")%>
+    <%= form.input :mobility_restricted_suitability,:as => :boolean %>
+    <%= form.input :stairs_availability,:as => :boolean %>
+    <%= form.input :lift_availability,:as => :boolean %>
+
     <% if @connection_link.new_record? %>
       <%= form.input :objectid %>  
     <% else %>
diff --git a/app/views/connection_links/show.html.erb b/app/views/connection_links/show.html.erb
index da8ca5702..273d9102e 100644
--- a/app/views/connection_links/show.html.erb
+++ b/app/views/connection_links/show.html.erb
@@ -33,12 +33,51 @@
       <%= @connection_link.comment %>
     </p>
     <p>
+      <label><%= @connection_link.human_attribute_name("link_distance") %>: </label>
+      <%= @connection_link.link_distance %> 
+    </p>
+    <p>
+      <label><%= @connection_link.human_attribute_name("default_duration") %>: </label>
+      <% if (@connection_link.default_duration.present?) %>
+         <%= @connection_link.default_duration.strftime('%Hh %Mm %Ss') %>
+      <% end %>
+    </p>
+    <p>
+      <label><%= @connection_link.human_attribute_name("frequent_traveller_duration") %>: </label>
+      <% if (@connection_link.frequent_traveller_duration.present?) %>
+         <%= @connection_link.frequent_traveller_duration.strftime('%Hh %Mm %Ss') %>
+      <% end %>
+    </p>
+    <p>
+      <label><%= @connection_link.human_attribute_name("occasional_traveller_duration") %>: </label>
+      <% if (@connection_link.occasional_traveller_duration.present?) %>
+         <%= @connection_link.occasional_traveller_duration.strftime('%Hh %Mm %Ss') %>
+      <% end %>
+    </p>
+    <p>
+      <label><%= @connection_link.human_attribute_name("mobility_restricted_traveller_duration") %>: </label>
+      <% if (@connection_link.mobility_restricted_traveller_duration.present?) %>
+         <%= @connection_link.mobility_restricted_traveller_duration.strftime('%Hh %Mm %Ss') %>
+      <% end %>
+    </p>
+    <p>
+      <label><%= @connection_link.human_attribute_name("mobility_restricted_suitability") %>: </label>
+      <%= @connection_link.mobility_restricted_suitability %>
+    </p>
+    <p>
+      <label><%= @connection_link.human_attribute_name("stairs_availability") %>: </label>
+      <%= @connection_link.stairs_availability %>
+    </p>
+    <p>
+      <label><%= @connection_link.human_attribute_name("lift_availability") %>: </label>
+      <%= @connection_link.lift_availability %>
+    </p>
       <label><%= @connection_link.human_attribute_name("objectid") %>: </label>
       <%= @connection_link.objectid %>
     </p>
     <p>
       <label><%= @connection_link.human_attribute_name("creation_time") %>: </label>
-      <%= @connection_link.creation_time %>
+      <%= l(@connection_link.creation_time) %>
     </p>
     <p>
       <label><%= @connection_link.human_attribute_name("creator_id") %>: </label>
diff --git a/app/views/lines/_form.erb b/app/views/lines/_form.erb
index ed0e4f9a2..1a7107e7e 100644
--- a/app/views/lines/_form.erb
+++ b/app/views/lines/_form.erb
@@ -5,7 +5,7 @@
     <%= form.input :company, :as => :select, :collection => Chouette::Company.all, :include_blank => false%>
     <%= form.input :name %>
     <%= form.input :published_name %>
-    <%= form.input :registration_number %>  
+    <%= form.input :registrationnumber %>  
     <%= form.input :number %>
     <%= form.input :transport_mode, :as => :select, :collection => Chouette::Line.transport_modes, :include_blank => false, :member_label => Proc.new { |mode| t("transport_modes.label.#{mode}") }  %>
     <%= form.input :comment %>              
diff --git a/app/views/lines/show.html.erb b/app/views/lines/show.html.erb
index e5a2d5d7f..4e7217384 100644
--- a/app/views/lines/show.html.erb
+++ b/app/views/lines/show.html.erb
@@ -21,7 +21,7 @@
       <%= @line.publishedname %>
     </p>
     <p>
-      <label><%= @line.human_attribute_name("registration_number") %>: </label>
+      <label><%= @line.human_attribute_name("registrationnumber") %>: </label>
       <%= @line.registration_number %>
     </p>
     <p>
@@ -42,7 +42,7 @@
     </p>
     <p>
       <label><%= @line.human_attribute_name("creation_time") %>: </label>
-      <%= @line.creation_time %>
+      <%= l(@line.creation_time) %>
     </p>
     <p>
       <label><%= @line.human_attribute_name("creator_id") %>: </label>
diff --git a/app/views/networks/_form.erb b/app/views/networks/_form.erb
index 4b5b7e509..e1d802dac 100644
--- a/app/views/networks/_form.erb
+++ b/app/views/networks/_form.erb
@@ -3,10 +3,10 @@
     <%= form.input :name %> 
     <%= form.input :registrationnumber %>  
     <%= form.input :comment %>
-    <%= form.input :versiondate, :as => :date %> 
+    <%= form.input :version_date, :as => :date %> 
     <%= form.input :description %>              
-    <%= form.input :sourcename %>              
-    <%= form.input :sourceidentifier %>              
+    <%= form.input :source_name %>              
+    <%= form.input :source_identifier %>              
     <% if @network.new_record? %>
       <%= form.input :objectid %>  
     <% else %>
diff --git a/app/views/networks/show.html.erb b/app/views/networks/show.html.erb
index 6822cf41e..594c670b2 100644
--- a/app/views/networks/show.html.erb
+++ b/app/views/networks/show.html.erb
@@ -8,7 +8,7 @@
       <%= @network.name %>
     </p>
     <p>
-      <label><%= Chouette::Network.human_attribute_name("registration_number") %>: </label>
+      <label><%= Chouette::Network.human_attribute_name("registrationnumber") %>: </label>
       <%= @network.registrationnumber %>
     </p>
     <p>
@@ -17,7 +17,7 @@
     </p>
     <p>
       <label><%= Chouette::Network.human_attribute_name("version_date") %>: </label>
-      <%= @network.version_date %>
+      <%= l(@network.version_date) %>
     </p>
     <p>
       <label><%= Chouette::Network.human_attribute_name("description") %>: </label>
@@ -37,7 +37,7 @@
     </p>
     <p>
       <label><%= @network.human_attribute_name("creation_time") %>: </label>
-      <%= @network.creation_time %>
+      <%= l(@network.creation_time) %>
     </p>
     <p>
       <label><%= @network.human_attribute_name("creator_id") %>: </label>
diff --git a/app/views/stop_areas/_form.html.erb b/app/views/stop_areas/_form.html.erb
index fab7c1510..ffdd9faa1 100644
--- a/app/views/stop_areas/_form.html.erb
+++ b/app/views/stop_areas/_form.html.erb
@@ -6,12 +6,16 @@
     <%= form.input :street_name %>              
     <%= form.input :country_code %>              
     <%= form.input :fare_code %>              
-    <%= form.input :registration_number %>
-    <%= form.input :stop_area_type, :as => :select, :collection => Chouette::StopArea.stop_area_types, :include_blank => false, :member_label => Proc.new { |stop_area_type| t("area_types.label.#{stop_area_type}") }  %>
+    <%= form.input :registrationnumber %>
     <% if @stop_area.new_record? %>
+      <%= form.input :stop_area_type, :as => :select, :collection => Chouette::StopArea.stop_area_types, :include_blank => false, :member_label => Proc.new { |stop_area_type| t("area_types.label.#{stop_area_type}") }  %>
       <%= form.input :objectid %>  
     <% else %>
       <li>
+      <label><%= @stop_area.human_attribute_name("stop_area_type") %>: </label>
+      <%= @stop_area.stop_area_type %>
+      </li>
+      <li>
       <label><%= @stop_area.human_attribute_name("objectid") %>: </label>
       <%= @stop_area.objectid %>
       </li>
@@ -25,6 +29,6 @@
 
   <%= form.buttons do %>
     <%= form.commit_button %>
-    ou <%= link_to "revenir", [@referential, @stop_area] %>
+    ou <%= link_to t('cancel'), [@referential, @stop_area] %>
   <% end %>
 <% end %>
diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb
index f558d7c9b..f4f7a9064 100644
--- a/app/views/stop_areas/show.html.erb
+++ b/app/views/stop_areas/show.html.erb
@@ -28,7 +28,7 @@
       <%= @stop_area.fare_code %>
     </p>
     <p>
-      <label><%= @stop_area.human_attribute_name("registration_number") %>: </label>
+      <label><%= @stop_area.human_attribute_name("registrationnumber") %>: </label>
       <%= @stop_area.registration_number %>
     </p>
     <p>
@@ -74,7 +74,7 @@
     </p>
     <p>
       <label><%= @stop_area.human_attribute_name("creation_time") %>: </label>
-      <%= @stop_area.creation_time %>
+      <%= l(@stop_area.creation_time) %>
     </p>
     <p>
       <label><%= @stop_area.human_attribute_name("creator_id") %>: </label>
diff --git a/app/views/time_table_dates/_form.html.erb b/app/views/time_table_dates/_form.html.erb
index 8e0461ef5..c0218eb64 100644
--- a/app/views/time_table_dates/_form.html.erb
+++ b/app/views/time_table_dates/_form.html.erb
@@ -1,6 +1,6 @@
 <%= semantic_form_for [@referential, @time_table, @time_table_date] do |form| %>
   <%= form.inputs do %> 
-    <%= form.input :date, :as => :date, :label => @time_table.human_attribute_name("date") %>
+    <%= form.input :date, :as => :date, :label => @time_table_date.human_attribute_name("date") %>
   <% end %>
   <%= form.buttons do %>
     <%= form.commit_button %>
diff --git a/app/views/time_table_periods/_form.html.erb b/app/views/time_table_periods/_form.html.erb
new file mode 100644
index 000000000..8369e9701
--- /dev/null
+++ b/app/views/time_table_periods/_form.html.erb
@@ -0,0 +1,12 @@
+<%= semantic_form_for [@referential, @time_table, @time_table_period] do |form| %>
+  <%= form.inputs do %> 
+    <%= form.input :periodstart, :as => :date, :label => @time_table_period.human_attribute_name("period_start") %>
+    <%= form.input :periodend, :as => :date, :label => @time_table_period.human_attribute_name("period_end") %>
+  <% end %>
+  <%= form.buttons do %>
+    <%= form.commit_button %>
+    <li><%= t('or') %></li>
+    <li><%= link_to t('cancel'), :back %></li>
+  <% end %>
+<% end %>
+
diff --git a/app/views/time_table_periods/new.html.erb b/app/views/time_table_periods/new.html.erb
new file mode 100644
index 000000000..5088637a1
--- /dev/null
+++ b/app/views/time_table_periods/new.html.erb
@@ -0,0 +1,4 @@
+<%= title_tag t('time_table_periods.new.title') %>
+
+<%= render "form" %>
+
diff --git a/app/views/time_tables/_date.erb b/app/views/time_tables/_date.erb
deleted file mode 100644
index 7ea217be9..000000000
--- a/app/views/time_tables/_date.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-<span class='date'><%= date.date %></span>
-</div>
\ No newline at end of file
diff --git a/app/views/time_tables/_date_fields.erb b/app/views/time_tables/_date_fields.erb
deleted file mode 100644
index 7ec895b44..000000000
--- a/app/views/time_tables/_date_fields.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class='nested-fields'>
-  <%= f.inputs :class => 'dates' do %> 
-    <%= f.input :date, :as => :date , :label => @time_table.human_attribute_name("date")%>
-    <%= f.input :time_table_id, :as => :hidden %>
-    <%= f.input :position, :as => :hidden %>
-    <%= link_to_remove_association t('actions.destroy'), f %>
-  <% end %>
-</div>
\ No newline at end of file
diff --git a/app/views/time_tables/_dates.html.erb b/app/views/time_tables/_dates.html.erb
index 3aa021536..47ae01710 100644
--- a/app/views/time_tables/_dates.html.erb
+++ b/app/views/time_tables/_dates.html.erb
@@ -1,7 +1,11 @@
-<p>:;,:;,</p>
   <ul class='dates'>
     <% @time_table.dates.each do |tmd| %>
-    <li class="<%= (tmd.position%2==0) ? 'odd' : 'even' %>"><%= tmd.date %></li>
+    <li class="<%= (tmd.position%2==0) ? 'odd' : 'even' %>"><%= l tmd.date %>
+    <div class="actions">  
+      <%= link_to t("actions.destroy"), referential_time_table_time_table_date_path(@referential, @time_table,tmd), :method => :delete, :confirm =>  t('time_tables.actions.destroy_date_confirm'), :class => "remove" %>
+    </div>
+
+    </li>
     <% end %>
   </ul>
 
diff --git a/app/views/time_tables/_form.erb b/app/views/time_tables/_form.erb
index 203342cad..59cc30947 100644
--- a/app/views/time_tables/_form.erb
+++ b/app/views/time_tables/_form.erb
@@ -33,16 +33,4 @@
 <h3 class="dates"><%= t('.dates') %></h3>
 <%= render "dates" %>
 
-<% content_for :sidebar do %>
-<ul class="actions">
-  <% unless @time_table.new_record? %>
-  <li><%= link_to t('time_tables.edit.add_date'), new_referential_time_table_time_table_date_path(@referential, @time_table) %></li>
-  <% end %>
-<!-- 
-  <li><%= link_to_add_association t('time_tables.edit.add_period'), form, :periods %></li>
-  <li><%= link_to_add_association t('time_tables.edit.add_date'), form, :dates %></li>
--->
-  <br>
-</ul>
-<% end %>
 
diff --git a/app/views/time_tables/_form_period.erb b/app/views/time_tables/_form_period.erb
deleted file mode 100644
index 110bad1eb..000000000
--- a/app/views/time_tables/_form_period.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<%= semantic_form_for [@referential, @time_table_period] do |form| %>
-  <%= form.inputs do %> 
-    <%= form.input :period_start, :as => :date %>
-    <%= form.input :period_end, :as => :date %>
-  <% end %>
-<% end %>
diff --git a/app/views/time_tables/_period.erb b/app/views/time_tables/_period.erb
deleted file mode 100644
index 0be52145d..000000000
--- a/app/views/time_tables/_period.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-<span class='period'><%= period.period_start %> - <%= period.period_end %></span>
-</div>
diff --git a/app/views/time_tables/_period_fields.erb b/app/views/time_tables/_period_fields.erb
deleted file mode 100644
index 76bb506f9..000000000
--- a/app/views/time_tables/_period_fields.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class='nested-fields'>
-  <%= f.inputs :class => 'periods' do %> 
-    <%= f.input :period_start, :as => :date , :label => @time_table.human_attribute_name("period_start")%>
-    <%= f.input :period_end, :as => :date , :label => @time_table.human_attribute_name("period_end")%>
-    <%= f.input :time_table_id, :as => :hidden %>
-    <%= f.input :position, :as => :hidden %>
-    <%= link_to_remove_association t('actions.destroy'), f %>
-  <% end %>
-</div>
diff --git a/app/views/time_tables/_periods.html.erb b/app/views/time_tables/_periods.html.erb
new file mode 100644
index 000000000..9f3974735
--- /dev/null
+++ b/app/views/time_tables/_periods.html.erb
@@ -0,0 +1,10 @@
+  <ul class='periods'>
+    <% @time_table.periods.each do |tmp| %>
+    <li class='period'><%= t('time_tables.show.from')%> <%= l tmp.period_start %> <%= t('time_tables.show.to')%> <%= l tmp.period_end %>
+    <div class="actions">  
+      <%= link_to t("actions.destroy"), referential_time_table_time_table_period_path(@referential, @time_table,tmp), :method => :delete, :confirm =>  t('time_tables.actions.destroy_period_confirm'), :class => "remove" %>
+    </div>
+    </li>
+    <% end %>
+  </ul>
+
diff --git a/app/views/time_tables/show.html.erb b/app/views/time_tables/show.html.erb
index 0e6a6c6e7..0ddd49338 100644
--- a/app/views/time_tables/show.html.erb
+++ b/app/views/time_tables/show.html.erb
@@ -52,23 +52,25 @@
     </p>
     <p>
       <label><%= @time_table.human_attribute_name("creation_time") %>: </label>
-      <%= @time_table.creation_time %>
+      <%= l @time_table.creation_time %>
     </p>
     <p>
       <label><%= @time_table.human_attribute_name("creator_id") %>: </label>
       <%= @time_table.creator_id %>
     </p>
   </div>
-  
   <h3 class="dates"><%= t('.dates') %></h3>
   <%= render "dates" %>
+  <h3 class="periods"><%= t('.periods') %></h3>
+  <%= render "periods" %>
 </div>
 
 <% content_for :sidebar do %>
 <ul class="actions">
-  <li><%= link_to t('time_tables.edit.add_date'), new_referential_time_table_time_table_date_path(@referential, @time_table), :class => 'add' %></li>
   <li><%= link_to t('time_tables.actions.edit'), edit_referential_time_table_path(@referential, @time_table), :class => "edit" %></li>
-  <li><%= link_to  t('time_tables.actions.destroy'), referential_time_table_path(@referential, @time_table), :method => :delete, :confirm =>  t('time_tables.actions.destroy_confirm'), :class => "remove" %></li>
+  <li><%= link_to t('time_tables.actions.destroy'), referential_time_table_path(@referential, @time_table), :method => :delete, :confirm =>  t('time_tables.actions.destroy_confirm'), :class => "remove" %></li>
+  <li><%= link_to t('time_tables.show.add_date'), new_referential_time_table_time_table_date_path(@referential, @time_table), :class => 'add' %></li>
+  <li><%= link_to t('time_tables.show.add_period'), new_referential_time_table_time_table_period_path(@referential, @time_table), :class => 'add' %></li>
   <br>
 </ul>
 <% end %>
diff --git a/config/locales/companies.yml b/config/locales/companies.yml
index a61e43ed4..b6b3db0d7 100644
--- a/config/locales/companies.yml
+++ b/config/locales/companies.yml
@@ -20,7 +20,7 @@ en:
       company: "Companies"
     attributes:
       company:
-        registration_number: "Registration number"
+        registrationnumber: "Registration number"
         name: "Name"
         short_name: "Short name"
         organizational_unit: "Unit"
@@ -36,7 +36,7 @@ en:
   formtastic:
     hints:
       company:
-        registration_number: only alphanumerical or underscore characters 
+        registrationnumber: only alphanumerical or underscore characters 
         objectid: "[prefix]:Company:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
 
 fr:
@@ -61,7 +61,7 @@ fr:
       company: "Transporteurs"
     attributes:
       company:
-        registration_number: "Numéro d'enregistrement"
+        registrationnumber: "Numéro d'enregistrement"
         name: "Nom"
         short_name: "Nom court"
         organizational_unit: "Nom d'unité dans la société"
@@ -77,6 +77,6 @@ fr:
   formtastic:
     hints:
       company:
-        registration_number: "caractères autorisés : alphanumériques et 'souligné'" 
+        registrationnumber: "caractères autorisés : alphanumériques et 'souligné'" 
         objectid: "[prefixe]:Company:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
 
diff --git a/config/locales/connection_links.yml b/config/locales/connection_links.yml
index 09ccfebe1..43602d5dd 100644
--- a/config/locales/connection_links.yml
+++ b/config/locales/connection_links.yml
@@ -5,9 +5,7 @@ en:
       edit: Edit this connection link
       destroy: Remove this connection link
       destroy_confirm: Are you sure you want destroy this connection link?
-      select_departure: Select start of link
-      select_arrival: Select end of link
-      select_areas: "Select start/end of link"
+      select_areas: "Update start/end of link"
     new:
       title: Add a new connection link
     edit:
@@ -39,15 +37,15 @@ en:
         undefined: not yet set
         name: Name
         comment: Comment
-        linkdistance: Distance
+        link_distance: Distance
         connection_link_type: Type
-        defaultduration: Average duration
-        frequenttravellerduration: Regular passenger duration
-        occasionaltravellerduration: Occasional passenger duration
-        mobilityrestrictedtravellerduration: Mobility reduced passenger duration
-        mobilityrestrictedsuitability: Mobility reduced passenger suitable
-        stairsavailability: Escalator
-        liftavailability: Lift
+        default_duration: Average duration
+        frequent_traveller_duration: Regular passenger duration
+        occasional_traveller_duration: Occasional passenger duration
+        mobilit_yrestricted_traveller_duration: Mobility reduced passenger duration
+        mobility_restricted_suitability: Mobility reduced passenger suitable
+        stairs_availability: Escalator
+        lift_availability: Lift
         objectid: Neptune identifier
         object_version: Version
         creation_time: Created on
@@ -64,9 +62,7 @@ fr:
       edit: Modifier cette correspondance
       destroy: Supprimer cette correspondance
       destroy_confirm: Etes vous sûr de détruire cette correspondance ?
-      select_departure: "Sélectionner l'arrêt de départ"
-      select_arrival: "Sélectionner l'arrêt d'arrivée"
-      select_areas: "Sélectionner les départ/arrivée"
+      select_areas: "Modifier les départs/arrivées"
     new:
       title: Ajouter une correspondance
     edit:
@@ -98,15 +94,15 @@ fr:
         undefined: non défini
         name: Nom
         comment: Commentaire
-        linkdistance: Distance
+        link_distance: Distance
         connection_link_type: Type
-        defaultduration: Durée moyenne
-        frequenttravellerduration: Durée pour un habitué
-        occasionaltravellerduration: Durée pour un voyageur occasionnel
-        mobilityrestrictedtravellerduration: Durée pour un voyageur à mobilité réduite
-        mobilityrestrictedsuitability: Accès pour personne à mobilité réduite
-        stairsavailability: Escalator
-        liftavailability: Ascenseur
+        default_duration: Durée moyenne
+        frequent_traveller_duration: Durée pour un habitué
+        occasional_traveller_duration: Durée pour un voyageur occasionnel
+        mobility_restricted_traveller_duration: Durée pour un voyageur à mobilité réduite
+        mobility_restricted_suitability: Accès pour personne à mobilité réduite
+        stairs_availability: Escalator
+        lift_availability: Ascenseur
         objectid: Identifiant Neptune
         object_version: Version
         creation_time: Créé le
diff --git a/config/locales/lines.yml b/config/locales/lines.yml
index a2ba7df95..7e565f24b 100644
--- a/config/locales/lines.yml
+++ b/config/locales/lines.yml
@@ -24,7 +24,7 @@ en:
       line:
         network: Network
         company: Company
-        registration_number: Registration number
+        registrationnumber: Registration number
         name: Name
         published_name: Published name        
         number: Number
@@ -37,7 +37,7 @@ en:
   formtastic:
     hints:
       line:
-        registration_number: only alphanumerical or underscore characters 
+        registrationnumber: only alphanumerical or underscore characters 
         objectid: "[prefix]:Line:[unique_key] : prefix contains only alphanumerical or underscore characters, unique_key accepts also minus character"
 
 fr:
@@ -66,7 +66,7 @@ fr:
       line:
         network: Réseau
         company: Transporteur
-        registration_number: "Numéro d'enregistrement"
+        registrationnumber: "Numéro d'enregistrement"
         name: Nom
         published_name: Nom public        
         number: Indice
@@ -79,6 +79,6 @@ fr:
   formtastic:
     hints:
       line:
-        registration_number: "caractères autorisés : alphanumériques et 'souligné'" 
+        registrationnumber: "caractères autorisés : alphanumériques et 'souligné'" 
         objectid: "[prefixe]:Line:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
 
diff --git a/config/locales/networks.yml b/config/locales/networks.yml
index 4a95bc7cf..6b0070933 100644
--- a/config/locales/networks.yml
+++ b/config/locales/networks.yml
@@ -23,15 +23,15 @@ en:
         registrationnumber: "Registration number"
         name: "Name"
         comment: "Comments"
-        versiondate: "Date of this network's version"
+        version_date: "Date of this network's version"
         description: Description
-        sourcetype: Source type
-        sourcename: Source name
-        sourceidentifier: Source identifier        
+        source_type: Source type
+        source_name: Source name
+        source_identifier: Source identifier        
         objectid: Neptune identifier
-        objectversion: Version
-        creationtime: Created on
-        creatorid: Created by 
+        object_version: Version
+        creation_time: Created on
+        creator_id: Created by 
   formtastic:
     hints:
       network:
@@ -62,15 +62,15 @@ fr:
         registrationnumber: "Numéro d'enregistrement"
         name: "Nom"
         comment: "Commentaire"
-        versiondate: Date de version
+        version_date: Date de version
         description: Description
-        sourcetype: "Type de système origine"
-        sourcename: "Nom du système origine"
-        sourceidentifier: "Identifiant du système origine"        
+        source_type: "Type de système origine"
+        source_name: "Nom du système origine"
+        source_identifier: "Identifiant du système origine"        
         objectid: "Identifiant Neptune"
-        objectversion: "Version"
-        creationtime: "Créé le"
-        creatorid: "Créé par"
+        object_version: "Version"
+        creation_time: "Créé le"
+        creator_id: "Créé par"
   formtastic:
     hints:
       network:
diff --git a/config/locales/stop_areas.yml b/config/locales/stop_areas.yml
index db12e4fc4..bb5d02869 100644
--- a/config/locales/stop_areas.yml
+++ b/config/locales/stop_areas.yml
@@ -35,9 +35,9 @@ en:
     attributes:
       stop_area:
         name: Name
-        registration_number: Registration number
+        registrationnumber: Registration number
         comment: Comments
-        areatype: Area type
+        stop_area_type: Area type
         nearest_topic_name: Nearest point of interest
         street_name: Street name
         country_code: INSEE code
@@ -51,7 +51,7 @@ en:
         objectid: Neptune identifier
         object_version: Version
         creation_time: Created on
-        creator_id: Created by 
+        creatorid: Created by 
         children_ids: Children 
         parent: Parent
   formtastic:
@@ -97,10 +97,10 @@ fr:
     attributes:
       stop_area:
         name: Nom
-        registration_number: "Numéro d'enregistrement"
+        registrationnumber: "Numéro d'enregistrement"
         published_name: Nom public        
         comment: Commentaire
-        area_type: "Type d'arrêt"
+        stop_area_type: "Type d'arrêt"
         nearest_topic_name: "Point d'intérêt le plus proche"
         street_name: Nom de la rue
         country_code: Code INSEE
@@ -111,7 +111,7 @@ fr:
         longlattype: Projection
         longitude: Longitude
         latitude: Latitude
-        object_id: Identifiant Neptune
+        objectid: Identifiant Neptune
         object_version: Version
         creation_time: Créé le
         creator_id: Créé par
@@ -120,7 +120,7 @@ fr:
   formtastic:
     hints:
       stop_area:
-        registration_number: "caractères autorisés : alphanumériques et 'souligné'" 
+        registrationnumber: "caractères autorisés : alphanumériques et 'souligné'" 
         objectid: "[prefixe]:StopArea:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
 
 
diff --git a/config/locales/time_table_dates.yml b/config/locales/time_table_dates.yml
new file mode 100644
index 000000000..7f0fc6497
--- /dev/null
+++ b/config/locales/time_table_dates.yml
@@ -0,0 +1,21 @@
+en:
+  time_table_dates:
+    new:
+      title: "Timetable : add a new date"
+  activerecord:        
+    models:        
+      time_table_date: Date
+    attributes:
+      time_table_date:
+        date: Calendar date
+        
+fr:
+  time_table_dates:
+    new:
+      title: "Calendrier : ajouter une date"
+  activerecord:        
+    models:        
+      time_table_date: Date
+    attributes:
+      time_table_date:
+        date: Date
diff --git a/config/locales/time_table_periods.yml b/config/locales/time_table_periods.yml
new file mode 100644
index 000000000..6d71cd681
--- /dev/null
+++ b/config/locales/time_table_periods.yml
@@ -0,0 +1,23 @@
+en:
+  time_table_periods:
+    new:
+      title: "Timetable : add a new period"
+  activerecord:        
+    models:        
+      time_table_period: Period
+    attributes:
+      time_table_period:
+        period_start: From
+        period_end: To
+
+fr:
+  time_table_periods:
+    new:
+      title: "Calendrier : ajouter une période d'application"
+  activerecord:        
+    models:        
+      time_table_period: Période
+    attributes:
+      time_table_period:
+        period_start: Du
+        period_end: Au
diff --git a/config/locales/time_tables.yml b/config/locales/time_tables.yml
index 93795a40e..5e0f44be7 100644
--- a/config/locales/time_tables.yml
+++ b/config/locales/time_tables.yml
@@ -6,12 +6,18 @@ en:
       edit: Edit this timetable
       destroy: Remove this timetable
       destroy_confirm: Are you sure you want destroy this timetable?
+      destroy_date_confirm: Are you sure you want destroy this date ?
+      destroy_period_confirm: Are you sure you want destroy this period ?
     new:
       title: Add a new timetable
     edit:
       title: Update timetable %{time_table}
     show:
       title: Timetable %{time_table}
+      dates: "Application dates"
+      periods: "Application periods"
+      from: from
+      to: to
       add_period: Add a period
       add_date: Add a date
     index:
@@ -58,14 +64,20 @@ fr:
       edit: Modifier ce calendrier
       destroy: Supprimer ce calendrier
       destroy_confirm: Etes vous sûr de détruire ce calendrier ?
+      destroy_date_confirm: Etes vous sûr de détruire cette date ?
+      destroy_period_confirm: Etes vous sûr de détruire cette période ?
     new:
       title: Ajouter un calendrier
     edit:
       title: "Modifier le calendrier %{time_table}"
-      add_period: Ajouter une période
-      add_date: Ajouter une date
     show:
       title: Calendrier %{time_table}
+      dates: "Dates d'application"
+      periods: "Périodes d'application"
+      from: du
+      to: au
+      add_period: Ajouter une période
+      add_date: Ajouter une date
     index:
       comment: Description
       title: calendriers