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

2 files changed, 15 insertions, 10 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>