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

6 files changed, 132 insertions, 122 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index d9ee88d74..03ad2fb8d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -109,7 +109,7 @@ GEM
     bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0146.1)
-    builder (3.0.2)
+    builder (3.0.3)
     capistrano (2.13.3)
       highline
       net-scp (>= 1.0.0)
@@ -195,7 +195,6 @@ GEM
     jruby-rack (1.1.9)
     jruby-rack-worker (0.4-java)
       jruby-rack (>= 1.1.1)
-    json (1.7.5)
     json (1.7.5-java)
     json_pure (1.7.5)
     launchy (2.1.0)
diff --git a/app/views/referentials/_clean.html.erb b/app/views/referentials/_clean.html.erb
new file mode 100644
index 000000000..87a84c17f
--- /dev/null
+++ b/app/views/referentials/_clean.html.erb
@@ -0,0 +1,14 @@
+  <div id="clean_up" >
+  <%= semantic_form_for [@referential, CleanUp.new] do |form| %>
+  <%= form.inputs do %> 
+    <%= form.input :expected_date, :as => :date_picker , :wrapper_html => { :class => 'date' }%>
+    <%= form.input :keep_lines, :as => :boolean %>
+    <%= form.input :keep_stops, :as => :boolean %>
+    <%= form.input :keep_companies, :as => :boolean %>
+    <%= form.input :keep_networks, :as => :boolean %>
+    <% end %>
+    <%= form.actions do %>
+      <%= form.action :submit, :as => :button, :label => t('clean_ups.actions.clean_up') , :button_html => {:confirm => t('clean_ups.actions.confirm') }%>
+    <% end %>
+  <% end %>
+  </div>
diff --git a/app/views/referentials/_counts.html.erb b/app/views/referentials/_counts.html.erb
new file mode 100644
index 000000000..5b615d9a5
--- /dev/null
+++ b/app/views/referentials/_counts.html.erb
@@ -0,0 +1,63 @@
+  <table class="count" width="75%"> 
+  	<thead>
+  		<tr>
+  		<td  colspan="2"><%= t(".objects") %></td>
+  		<td><%= t(".count") %></td>		
+  		</tr>
+  	</thead>
+  	<tbody>
+  		<tr>
+   		<td class="object" colspan="2"><%= Referential.human_attribute_name("networks") %></td>
+  		<td class="value"> <%= @referential.networks.size %></td>		
+  		</tr>
+  		<tr>
+   		<td class="object" colspan="2"><%= Referential.human_attribute_name("companies") %></td>
+  		<td class="value"> <%= @referential.companies.size %></td>		
+  		</tr>
+  		<tr>
+   		<td class="object" colspan="2"><%= Referential.human_attribute_name("lines") %></td>
+  		<td class="value"> <%= @referential.lines.size %></td>		
+  		</tr>
+  		<tr>
+   		<td class="object" colspan="2"><%= Referential.human_attribute_name("vehicle_journeys") %></td>
+  		<td class="value"> <%= @referential.vehicle_journeys.size %></td>		
+  		</tr>
+  		<tr>
+   		<td class="object" colspan="2"><%= Referential.human_attribute_name("time_tables") %></td>
+  		<td class="value"> <%= @referential.time_tables.size %></td>		
+  		</tr>
+  		<tr>
+   		<td class="object" colspan="2"><%= Referential.human_attribute_name("connection_links") %></td>
+  		<td class="value"> <%= @referential.connection_links.size %></td>		
+  		</tr>
+  		<tr>
+   		<td class="object" colspan="2"><%= Referential.human_attribute_name("stop_areas") %></td>
+  		<td class="value"> <%= @referential.stop_areas.size %></td>		
+  		</tr>
+  		<tr>
+   		<td class="image"><%= image_tag "map/boarding_position.png"%></td>
+   		<td class="object"><%= Referential.human_attribute_name("boarding_positions") %></td>
+  		<td class="value"> <%= @referential.stop_areas.where("area_type = ?","BoardingPosition").size %></td>		
+  		</tr>
+  		<tr>
+   		<td class="image"><%= image_tag "map/quay.png"%></td>
+   		<td class="object"><%= Referential.human_attribute_name("quays") %></td>
+  		<td class="value"> <%= @referential.stop_areas.where("area_type = ?","Quay").size %></td>		
+  		</tr>
+  		<tr>
+   		<td class="image"><%= image_tag "map/commercial_stop_point.png"%></td>
+   		<td class="object"><%= Referential.human_attribute_name("commercial_stops") %></td>
+  		<td class="value"> <%= @referential.stop_areas.where("area_type = ?","CommercialStopPoint").size %></td>		
+  		</tr>
+  		<tr>
+   		<td class="image"><%= image_tag "map/stop_place.png"%></td>
+   		<td class="object"><%= Referential.human_attribute_name("stop_places") %></td>
+  		<td class="value"> <%= @referential.stop_areas.where("area_type = ?","StopPlace").size %></td>		
+  		</tr>
+  		<tr>
+   		<td class="image"><%= image_tag "map/itl.png"%></td>
+   		<td class="object"><%= Referential.human_attribute_name("itls") %></td>
+  		<td class="value"> <%= @referential.stop_areas.where("area_type = ?","ITL").size %></td>		
+  		</tr>
+  	</tbody>
+  </table>
diff --git a/app/views/referentials/_validity_out.html.erb b/app/views/referentials/_validity_out.html.erb
new file mode 100644
index 000000000..e285d2c8a
--- /dev/null
+++ b/app/views/referentials/_validity_out.html.erb
@@ -0,0 +1,35 @@
+  <table class="count" width="75%"> 
+  	<thead>
+  		<tr>
+  		<td><%= t('.validity_out_time_tables') %>: <%= tm_cnt = @referential.time_tables.validity_out_from_on?(Date.today).size %></td>
+  		</tr>
+  	</thead>
+  	<tbody>
+  		<% if tm_cnt > 0 %>
+	  		<% @referential.time_tables.validity_out_from_on?(Date.today,5).each do |tm| %>
+	  		<tr><td><%= link_to tm.comment, referential_time_table_path(@referential, tm) %></td></tr>
+	  		<% end %>
+	  		<% if tm_cnt > 5 %>
+	  			<tr><td>...</td></tr>
+            <% end %>
+  		<% end %>
+  	</tbody>
+  	</table>
+  	<p/>
+  <table class="count" width="75%"> 
+  	<thead>
+  		<tr>
+  		<td><%= t('.validity_out_soon_time_tables', :count => "7") %>: <%= tm_cnt = @referential.time_tables.validity_out_between?(Date.today,Date.today+7).size %></td>
+  		</tr>
+  	</thead>
+  	<tbody>
+  		<% if tm_cnt > 0 %>
+	  		<% @referential.time_tables.validity_out_between?(Date.today,Date.today+7,5).each do |tm| %>
+	  		<tr><td><%= link_to tm.comment, referential_time_table_path(@referential, tm) %></td></tr>
+	  		<% end %>
+	  		<% if tm_cnt > 5 %>
+	  			<tr><td>...</td></tr>
+            <% end %>
+  		<% end %>
+  	</tbody>
+  	</table>
diff --git a/app/views/referentials/show.html.erb b/app/views/referentials/show.html.erb
index e1baf0d57..79ea6b587 100644
--- a/app/views/referentials/show.html.erb
+++ b/app/views/referentials/show.html.erb
@@ -32,133 +32,24 @@
   <table width="100%">
   	<tr>
   	  <td valign="top" width="50%">	
-  <table class="count" width="75%"> 
-  	<thead>
-  		<tr>
-  		<td  colspan="2"><%= t(".objects") %></td>
-  		<td><%= t(".count") %></td>		
-  		</tr>
-  	</thead>
-  	<tbody>
-  		<tr>
-   		<td class="object" colspan="2"><%= Referential.human_attribute_name("networks") %></td>
-  		<td class="value"> <%= @referential.networks.size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="object" colspan="2"><%= Referential.human_attribute_name("companies") %></td>
-  		<td class="value"> <%= @referential.companies.size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="object" colspan="2"><%= Referential.human_attribute_name("lines") %></td>
-  		<td class="value"> <%= @referential.lines.size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="object" colspan="2"><%= Referential.human_attribute_name("vehicle_journeys") %></td>
-  		<td class="value"> <%= @referential.vehicle_journeys.size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="object" colspan="2"><%= Referential.human_attribute_name("time_tables") %></td>
-  		<td class="value"> <%= @referential.time_tables.size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="object" colspan="2"><%= Referential.human_attribute_name("connection_links") %></td>
-  		<td class="value"> <%= @referential.connection_links.size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="object" colspan="2"><%= Referential.human_attribute_name("stop_areas") %></td>
-  		<td class="value"> <%= @referential.stop_areas.size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="image"><%= image_tag "map/boarding_position.png"%></td>
-   		<td class="object"><%= Referential.human_attribute_name("boarding_positions") %></td>
-  		<td class="value"> <%= @referential.stop_areas.where("area_type = ?","BoardingPosition").size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="image"><%= image_tag "map/quay.png"%></td>
-   		<td class="object"><%= Referential.human_attribute_name("quays") %></td>
-  		<td class="value"> <%= @referential.stop_areas.where("area_type = ?","Quay").size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="image"><%= image_tag "map/commercial_stop_point.png"%></td>
-   		<td class="object"><%= Referential.human_attribute_name("commercial_stops") %></td>
-  		<td class="value"> <%= @referential.stop_areas.where("area_type = ?","CommercialStopPoint").size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="image"><%= image_tag "map/stop_place.png"%></td>
-   		<td class="object"><%= Referential.human_attribute_name("stop_places") %></td>
-  		<td class="value"> <%= @referential.stop_areas.where("area_type = ?","StopPlace").size %></td>		
-  		</tr>
-  		<tr>
-   		<td class="image"><%= image_tag "map/itl.png"%></td>
-   		<td class="object"><%= Referential.human_attribute_name("itls") %></td>
-  		<td class="value"> <%= @referential.stop_areas.where("area_type = ?","ITL").size %></td>		
-  		</tr>
-  	</tbody>
-  </table>
+  <%= render "counts" %>
   </td>
   <td valign="top" >
-  <table class="count" width="75%"> 
-  	<thead>
-  		<tr>
-  		<td><%= t('.validity_out_time_tables') %>: <%= tm_cnt = @referential.time_tables.validity_out_from_on?(Date.today).size %></td>
-  		</tr>
-  	</thead>
-  	<tbody>
-  		<% if tm_cnt > 0 %>
-	  		<% @referential.time_tables.validity_out_from_on?(Date.today,5).each do |tm| %>
-	  		<tr><td><%= link_to tm.comment, referential_time_table_path(@referential, tm) %></td></tr>
-	  		<% end %>
-	  		<% if tm_cnt > 5 %>
-	  			<tr><td>...</td></tr>
-            <% end %>
-  		<% end %>
-  	</tbody>
-  	</table>
-  	<p/>
-  <table class="count" width="75%"> 
-  	<thead>
-  		<tr>
-  		<td><%= t('.validity_out_soon_time_tables', :count => "7") %>: <%= tm_cnt = @referential.time_tables.validity_out_between?(Date.today,Date.today+7).size %></td>
-  		</tr>
-  	</thead>
-  	<tbody>
-  		<% if tm_cnt > 0 %>
-	  		<% @referential.time_tables.validity_out_between?(Date.today,Date.today+7,5).each do |tm| %>
-	  		<tr><td><%= link_to tm.comment, referential_time_table_path(@referential, tm) %></td></tr>
-	  		<% end %>
-	  		<% if tm_cnt > 5 %>
-	  			<tr><td>...</td></tr>
-            <% end %>
-  		<% end %>
-  	</tbody>
-  	</table>
+  <%= render "validity_out" %>
   </td>
   </tr>
   </table>
 </div>  
 
 <% content_for :sidebar do %>
-<ul class="actions">
-  <li><%= link_to t('referentials.actions.edit'), edit_referential_path(@referential), :class => "edit" %></li>
-  <li><%= link_to t('referentials.actions.destroy'), referential_path(@referential), :method => :delete, :confirm =>  t('referentials.actions.destroy_confirm'), :class => "remove" %></li>
-  <br>
-</ul>
+  <ul class="actions">
+    <li><%= link_to t('referentials.actions.edit'), edit_referential_path(@referential), :class => "edit" %></li>
+    <li><%= link_to t('referentials.actions.destroy'), referential_path(@referential), :method => :delete, :confirm =>  t('referentials.actions.destroy_confirm'), :class => "remove" %></li>
+    <br>
+  </ul>
 
   <h3><%= t('.clean_up') %></h3>
-  <div id="clean_up" >
-  <%= semantic_form_for [@referential, CleanUp.new] do |form| %>
-  <%= form.inputs do %> 
-    <%= form.input :expected_date, :as => :date_picker , :wrapper_html => { :class => 'date' }%>
-    <%= form.input :keep_lines, :as => :boolean %>
-    <%= form.input :keep_stops, :as => :boolean %>
-    <%= form.input :keep_companies, :as => :boolean %>
-    <%= form.input :keep_networks, :as => :boolean %>
-    <% end %>
-    <%= form.actions do %>
-      <%= form.action :submit, :as => :button, :label => t('clean_ups.actions.clean_up') , :button_html => {:confirm => t('clean_ups.actions.confirm') }%>
-    <% end %>
-  <% end %>
-  </div>
+  <%= render "clean" %>
 
 
 <% end %>
diff --git a/config/locales/referentials.yml b/config/locales/referentials.yml
index 9500175a7..e6dd49bd0 100644
--- a/config/locales/referentials.yml
+++ b/config/locales/referentials.yml
@@ -8,11 +8,15 @@ en:
       vehicle_journeys: vehicle journeys
       time_tables: time tables
       title: Data space
+      clean_up: Clean up
+      validity_out_time_tables: Closed timetables
+      validity_out_soon_time_tables: Timetables closed in %{count} days   
+    counts:    
       objects: Data space elements
       count: count
-      clean_up: Clean up
+    validity_out:
       validity_out_time_tables: Closed timetables
-      validity_out_soon_time_tables: Timetables closed in %{count} days    
+      validity_out_soon_time_tables: Timetables closed in %{count} days   
     new:
       title: Create a new data space
       submit: "Create a data space"
@@ -74,9 +78,13 @@ fr:
       vehicle_journeys: courses
       time_tables: calendriers
       title: Espace de données
+      clean_up: Purge des données obsolètes
+      validity_out_time_tables: Calendriers échus
+      validity_out_soon_time_tables: Calendriers à échoir dans %{count} jours    
+    counts:    
       objects: Eléments 
       count: Qté
-      clean_up: Purge des données obsolètes
+    validity_out:
       validity_out_time_tables: Calendriers échus
       validity_out_soon_time_tables: Calendriers à échoir dans %{count} jours    
     new: