Merge branch 'sismo' of github.com:afimb/chouette2 into sismo

6 files changed, 43 insertions, 27 deletions

diff --git a/app/views/access_points/_form.html.erb b/app/views/access_points/_form.html.erb
index e25379d8f..adbfd0348 100644
--- a/app/views/access_points/_form.html.erb
+++ b/app/views/access_points/_form.html.erb
@@ -9,29 +9,29 @@
     :collection => Chouette::AccessPoint.access_point_types, :include_blank => false, :member_label => Proc.new { |access_point_type| t("access_types.label.#{access_point_type}") }  %>
         <%= form.input :street_name %>              
         <%= form.input :country_code %>              
+        <%= form.input :zip_code %>              
+        <%= form.input :city_name %>              
         <%= form.input :comment %>
         <%= form.input :openning_time, :as => :time_picker, :input_html => { :class => "form-control input-sm timepicker_basic"}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>
         <%= form.input :closing_time, :as => :time_picker, :input_html => { :class => "form-control input-sm timepicker_basic"}, :wrapper_html => { :class => "input-append bootstrap-timepicker" } %>
         <%= form.input :mobility_restricted_suitability,:as => :boolean %>
         <%= form.input :stairs_availability,:as => :boolean %>
         <%= form.input :lift_availability,:as => :boolean %>
-        <%= form.input :objectid, :required => !@access_point.new_record? %>
+        <%= form.input :objectid, :required => !@access_point.new_record?, :input_html => { :title => t("formtastic.titles.access_point.objectid")}  %>
         
         <%= form.inputs :name => t('access_points.show.geographic_data') do %> 
           <% if ! @referential.projection_type_label.empty? %>
             <div class="panel panel-default">
-              <div class="panel-heading">@referential.projection_type_label</div>
+              <div class="panel-heading"><%= @referential.projection_type_label %></div>
               <div class="panel-body">
-	              <%= form.input :projection_x %>
-	              <%= form.input :projection_y %>
+	              <%= form.input :projection_xy, :input_html => { :title => t("formtastic.titles.access_point.projection_xy")} %>
               </div>
             </div>	       
           <% end %>
           <div class="panel panel-default">
             <div class="panel-heading">WGS84</div>
             <div class="panel-body">
-	            <%= form.input :longitude %>
-	            <%= form.input :latitude %>
+	            <%= form.input :coordinates, :input_html => { :title => t("formtastic.titles.access_point.coordinates")} %>
             </div>
           </div>       
         <% end %>
diff --git a/app/views/access_points/show.html.erb b/app/views/access_points/show.html.erb
index d674ef88b..7cd7b4920 100644
--- a/app/views/access_points/show.html.erb
+++ b/app/views/access_points/show.html.erb
@@ -25,6 +25,14 @@
       <%= @access_point.country_code %>
     </p>
     <p>
+      <label><%= @access_point.human_attribute_name("zip_code") %>: </label>
+      <%= @access_point.zip_code %>
+    </p>
+    <p>
+      <label><%= @access_point.human_attribute_name("city_name") %>: </label>
+      <%= @access_point.city_name %>
+    </p>
+    <p>
       <label><%= @access_point.human_attribute_name("access_point_type") %>: </label>
       <%= t("access_types.label.#{@access_point.access_point_type}") %>
     </p>
@@ -85,10 +93,6 @@
 	    </p>
 	    <% end %>
     <% end %>
-    <p>
-      <label><%= @access_point.human_attribute_name("objectid") %>: </label>
-      <%= @access_point.objectid %>
-    </p>
   </div>
                            
 </div>
@@ -133,6 +137,7 @@
                          
 <% content_for :sidebar do %>
 <ul class="actions">
+  <li><%= link_to t('access_points.actions.new'), new_referential_stop_area_access_point_path(@referential,@stop_area), :class => "add" %></li>
   <li><%= link_to t('access_points.actions.edit'), edit_referential_stop_area_access_point_path(@referential, @stop_area, @access_point), :class => "edit" %></li>
   <li><%= link_to  t('access_points.actions.destroy'), referential_stop_area_access_point_path(@referential, @stop_area, @access_point), :method => :delete, :data => {:confirm =>  t('access_points.actions.destroy_confirm')}, :class => "remove" %></li>
 </ul>
diff --git a/app/views/help/index.textile b/app/views/help/index.textile
index 8907abe4d..3e0af420b 100644
--- a/app/views/help/index.textile
+++ b/app/views/help/index.textile
@@ -30,8 +30,11 @@ h4. Version 2.4.1
 ** L'export GTFS exige que l'indice de ligne soit renseigné (Mantis 26726)
 ** L'import GTFS ne tient pas compte des courses commençant après minuit (Mantis 25824)
 ** Mise en place d'un script produisant l'aide en ligne sous forme de docx (Mantis 26604)
-** L'import GTFS plante sur une course qui dessert plus de 2 fois le même arrêt (Mantis 26755)
+** L'import GTFS ne fonctionne pas sur une course qui dessert plus de 2 fois le même arrêt (Mantis 26755)
 ** L'export NeTEx produit un fichier invalide si le champ VersionDate du réseau est vide (Mantis 26434)
+** Liens cassés dans les pages d'aide (Mantis 26690)
+** La validation ne fonctionne pas si un arrêt n'est pas géolocalisé (Mantis 26931) 
+** L'import ne fonctionne pas si l'encodage du catalogue d'un ZIP n'est pas compatible UTF-8 (Mantis 27011) 
 
 h4. Version 2.4.0
 
diff --git a/app/views/routes/_form.html.erb b/app/views/routes/_form.html.erb
index 508593d07..ff4a4403e 100644
--- a/app/views/routes/_form.html.erb
+++ b/app/views/routes/_form.html.erb
@@ -13,9 +13,11 @@
 		<%= form.semantic_fields_for :stop_points, :include_id => false, :label => "TOTO" do |p| %>
           <%= render "stop_point_fields",  :f => p, :test1 => "oiuoiu" %>
 		<% end %>
-    <div class="links">
+      <div class="links">
 	    <%= link_to_add_association t("routes.actions.add_stop_point"), form, :stop_points, :class => 'add_stop_point' %>
-    </div>
+      <br/>
+        <%= link_to t('routes.actions.new_stop_point'), new_referential_stop_area_path(@referential), {:class => "add", :target => "_blank"} %>
+      </div>
 	</div>
 
    <%= form.actions do %>
diff --git a/app/views/stop_areas/_form.html.erb b/app/views/stop_areas/_form.html.erb
index a51c11da5..38545e0ea 100644
--- a/app/views/stop_areas/_form.html.erb
+++ b/app/views/stop_areas/_form.html.erb
@@ -15,21 +15,21 @@
           <div class="panel panel-default">
             <div class="panel-heading"><%= @referential.projection_type_label %></div>
             <div class="panel-body">
-	      <%= form.input :projection_x %>
-	      <%= form.input :projection_y %>
+	      <%= form.input :projection_xy, :input_html => { :title => t("formtastic.titles.stop_area.projection_xy")} %>
             </div>
           </div>	       
-	<% end %>
+	    <% end %>
         <div class="panel panel-default">
           <div class="panel-heading">WGS84</div>
           <div class="panel-body">
-	    <%= form.input :longitude %>
-	    <%= form.input :latitude %>
+	    <%= form.input :coordinates, :input_html => { :title => t("formtastic.titles.stop_area.coordinates")} %>
           </div>
         </div>       
-        <%= form.input :registration_number %>
+        <%= form.input :registration_number, :input_html => { :title => t("formtastic.titles.stop_area.registration_number")} %>
         <%= form.input :street_name %>              
         <%= form.input :country_code %>              
+        <%= form.input :zip_code %>              
+        <%= form.input :city_name %>              
         <%= form.input :fare_code %>              
         <%= form.input :nearest_topic_name %>              
         <%= form.input :comment, :as => :text %>              
@@ -40,7 +40,7 @@
 	  <%= form.input :lift_availability,:as => :boolean %>	     
         <% end %>
 
-        <%= form.input :objectid, :required => !@stop_area.new_record? %>  
+        <%= form.input :objectid, :required => !@stop_area.new_record?, :input_html => { :title => t("formtastic.titles.stop_area.objectid")} %>  
 
       <% end %>
 
@@ -94,9 +94,10 @@
   );
 
   $('.typeahead').on('typeahead:selected', function($e, datum) {
-    $('input[name="stop_area[longitude]"]').val(datum.lon);
-    $('input[name="stop_area[latitude]"]').val(datum.lat);
+    $('input[name="stop_area[coordinates]"]').val(datum.lat+","+datum.lon);
+    $('input[name="stop_area[coordinates]"]').change();
     $('input[name="stop_area[street_name]"]').val(datum.road);
-    $('input[name="stop_area[country_code]"]').val(datum.postcode);
+    $('input[name="stop_area[zip_code]"]').val(datum.postcode);
+    $('input[name="stop_area[city_name]"]').val(datum.city);
   })
 </script>
diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb
index d812ff4e3..dc2e60349 100644
--- a/app/views/stop_areas/show.html.erb
+++ b/app/views/stop_areas/show.html.erb
@@ -26,6 +26,14 @@
       <%= @stop_area.country_code %>
     </p>
     <p>
+      <label><%= @stop_area.human_attribute_name("zip_code") %>: </label>
+      <%= @stop_area.zip_code %>
+    </p>
+    <p>
+      <label><%= @stop_area.human_attribute_name("city_name") %>: </label>
+      <%= @stop_area.city_name %>
+    </p>
+    <p>
       <label><%= @stop_area.human_attribute_name("fare_code") %>: </label>
       <%= @stop_area.fare_code %>
     </p>
@@ -84,10 +92,6 @@
 		    <% end %>
 	    <% end %>
     <% end %>
-    <p>
-      <label><%= @stop_area.human_attribute_name("objectid") %>: </label>
-      <%= @stop_area.objectid %>
-    </p>
   </div>
 </div>
 <p class="after_map" />
@@ -110,6 +114,7 @@
     <table>
     <tr><td>	
 	<ul class="actions">
+      <li><%= link_to t('stop_areas.actions.new'), new_referential_stop_area_path(@referential), :class => "add" %></li>
 	  <li><%= link_to t('stop_areas.actions.edit'), edit_referential_stop_area_path(@referential, @stop_area), :class => "edit" %></li>
 	  <li><%= link_to  t('stop_areas.actions.destroy'), referential_stop_area_path(@referential, @stop_area), :method => :delete, :data => {:confirm =>  t('stop_areas.actions.destroy_confirm')}, :class => "remove" %></li>
 	</ul>