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

Conflicts:
	app/views/imports/new.html.erb

13 files changed, 41 insertions, 19 deletions

diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss
index b9a715465..e93ec699c 100644
--- a/app/assets/stylesheets/layout.css.scss
+++ b/app/assets/stylesheets/layout.css.scss
@@ -7,6 +7,15 @@ $text_color: #222;
 
 @import "user_interface/layout";
 
+#header .infos div.title h1 {
+          border: 1px solid white;
+          font-size: 30px;
+          margin: 20px 0 0 100px;
+          padding: 3px 15px 3px 15px;
+          font-weight: bold;
+}
+
+
 #sidebar ul {
     padding: 0 8px;
 
diff --git a/app/maps/connection_link_map.rb b/app/maps/connection_link_map.rb
index a6fb8517c..897da8a5d 100644
--- a/app/maps/connection_link_map.rb
+++ b/app/maps/connection_link_map.rb
@@ -17,8 +17,11 @@ class ConnectionLinkMap < ApplicationMap
       page << map.add_layer(google_hybrid) 
       page << map.add_layer(google_satellite) 
 
+      page.assign "stop_areas_layer", kml_layer(polymorphic_path([referential, connection_link, :stop_areas], :format => :kml), :styleMap => StyleMap::StopAreasStyleMap.new.style_map) 
+      page << map.add_layer(:stop_areas_layer)
+      page << map.add_control( hover_control_display_name(:stop_areas_layer) )
       #page << map.add_layer(kml_layer(connection_link, :styleMap => StyleMap::ConnectionLinkStyleMap.new( :style => connection_link_style).style_map))
-      page << map.add_layer(kml_layer(polymorphic_path([referential, connection_link, :stop_areas], :format => :kml), :styleMap => StyleMap::StopAreasStyleMap.new.style_map))
+      #page << map.add_layer(kml_layer(polymorphic_path([referential, connection_link, :stop_areas], :format => :kml), :styleMap => StyleMap::StopAreasStyleMap.new.style_map))
       page << map.zoom_to_extent(bounds) if bounds
     end
   end
diff --git a/app/views/connection_links/select_areas.html.erb b/app/views/connection_links/select_areas.html.erb
index 0c46395d7..2df3831b4 100644
--- a/app/views/connection_links/select_areas.html.erb
+++ b/app/views/connection_links/select_areas.html.erb
@@ -9,7 +9,8 @@
   
   <%= form.buttons do %>
     <%= form.commit_button %>
-    ou <%= link_to "revenir", [@referential, @connection_link] %>
+    <%= t('or') %>
+    <%= link_to t('cancel'), [@referential, @connection_link] %>
   <% end %>
 </div>
 <% end %>
diff --git a/app/views/help/documentation.textile b/app/views/help/documentation.textile
new file mode 100644
index 000000000..2b3d1ff93
--- /dev/null
+++ b/app/views/help/documentation.textile
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Documentation
+---
+
+La documentation de Chouette est disponible sur le site "Chouette.mobi":http://www.chouette.mobi/spip.php?rubrique15
\ No newline at end of file
diff --git a/app/views/help/toc.textile b/app/views/help/toc.textile
index 8a0d204f5..1ce35cac2 100644
--- a/app/views/help/toc.textile
+++ b/app/views/help/toc.textile
@@ -7,6 +7,7 @@ h3. Sommaire
 
 # "G&eacute;n&eacute;ralit&eacute;s":introduction
 ## "Normalisation":normalisation
+## "Documentation":documentation
 # "Espaces de donn&eacute;es":dataspaces
 # "R&eacute;seaux":networks
 # "Transporteurs":companies
diff --git a/app/views/imports/new.html.erb b/app/views/imports/new.html.erb
index 6d4fd50e3..1b797b0d6 100644
--- a/app/views/imports/new.html.erb
+++ b/app/views/imports/new.html.erb
@@ -21,7 +21,7 @@
     <%= form.buttons do %>
       <%= form.commit_button true %>
       <li><%= t('or') %></li>
-      <li><%= link_to t('back'), :back %></li>
+      <li><%= link_to t('cancel'), :back %></li>
     <% end %>
   <% end %>
 <% end %>
diff --git a/app/views/journey_patterns/_form.html.erb b/app/views/journey_patterns/_form.html.erb
index ef2bcc9d2..b6c37ab1b 100644
--- a/app/views/journey_patterns/_form.html.erb
+++ b/app/views/journey_patterns/_form.html.erb
@@ -4,8 +4,8 @@
     <%= form.input :published_name %>
     <%= form.input :registration_number %>              
     <%= form.input :comment %>              
-    <%= form.input :stop_point_ids, :as => :check_boxes, :collection => @route.stop_points.map { |s| [s.stop_area.name, s.id.to_s]} %>              
-    <% if @route.new_record? %>
+    <%= form.input :stop_point_ids, :as => :check_boxes, :collection => @route.stop_points.map { |s| [s.stop_area.name, s.id.to_s]}, :input_html => (@journey_pattern.new_record? ? { :checked => 'checked' }:{}) %>              
+    <% if @journey_pattern.new_record? %>
       <%= form.input :objectid %>  
     <% else %>
       <li>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 110594cb5..4eb3b1b70 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -22,7 +22,7 @@
           <% if selected_referential? %>
             <h1><%= @referential.name %></h1>
           <% elsif help_page? %>
-            <h1>Documentation</h1>
+            <h1>Guide d'utilisation</h1>
           <% end %>
         </div>
         <div class="interaction">
diff --git a/app/views/stop_areas/add_children.html.erb b/app/views/stop_areas/add_children.html.erb
index a8b29146a..ff3323dab 100644
--- a/app/views/stop_areas/add_children.html.erb
+++ b/app/views/stop_areas/add_children.html.erb
@@ -8,7 +8,8 @@
   
   <%= form.buttons do %>
     <%= form.commit_button %>
-    ou <%= link_to "revenir", [@referential, @stop_area] %>
+    <%= t('or') %>
+    <%= link_to t('cancel'), [@referential, @stop_area] %>
   <% end %>
 </div>
 <% end %>
diff --git a/app/views/stop_areas/select_parent.html.erb b/app/views/stop_areas/select_parent.html.erb
index bf361b869..26baf984a 100644
--- a/app/views/stop_areas/select_parent.html.erb
+++ b/app/views/stop_areas/select_parent.html.erb
@@ -8,7 +8,8 @@
   
   <%= form.buttons do %>
     <%= form.commit_button %>
-    ou <%= link_to "revenir", [@referential, @stop_area] %>
+    <%= t('or') %>
+    <%= link_to t('cancel'), [@referential, @stop_area] %>
   <% end %>
 </div>
 <% end %>
diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb
index 41d7576b5..28867de45 100644
--- a/app/views/stop_areas/show.html.erb
+++ b/app/views/stop_areas/show.html.erb
@@ -93,7 +93,6 @@
       <%= link_to([@referential, @stop_area.parent]) do %> 
         <%= image_tag "map/" + @stop_area.parent.stop_area_type + ".png"   %><span><%= @stop_area.parent.name %></span>        
       <% end %>
-      <%= link_to image_tag("user_interface/ui/remove.png"), referential_stop_area_path(@referential, @stop_area.parent), :method => :delete, :confirm =>  t('stop_areas.actions.destroy_confirm'), :class => "remove" %>
     </div> 
     <div class="link"><%= image_tag "icons/link.png"%></div>
     <% else %>
@@ -114,7 +113,6 @@
         <%= link_to([@referential, child]) do %> 
           <%= image_tag "map/" + child.stop_area_type + ".png"   %><span><%= child.name %></span>         
         <% end %>  
-        <%= link_to image_tag("user_interface/ui/remove.png"), referential_stop_area_path(@referential, child), :method => :delete, :confirm =>  t('stop_areas.actions.destroy_confirm'), :class => "remove" %>
       </div>
       <% end %>
     </div> 
diff --git a/config/locales/stop_areas.yml b/config/locales/stop_areas.yml
index 1029e7e21..d6050cc79 100644
--- a/config/locales/stop_areas.yml
+++ b/config/locales/stop_areas.yml
@@ -8,8 +8,8 @@ en:
       edit: Edit this stop
       destroy: Remove this stop
       destroy_confirm: Are you sure you want destroy this stop?
-      select_parent: Select Parent
-      add_children: Add Children
+      select_parent: Manage Parent
+      add_children: Manage Children
     new:
       title: Add a new stop
     edit:
@@ -26,9 +26,9 @@ en:
       selection_all: All
       area_type: Area Type
     select_parent:
-      title: Select parent of stop area %{stop_area} 
+      title: Manage parent of stop area %{stop_area} 
     add_children:
-      title: Add children of stop area %{stop_area} 
+      title: Manage children of stop area %{stop_area} 
   activerecord:        
     models:        
       stop_area: 
@@ -73,8 +73,8 @@ fr:
       edit: Modifier cet arrêt
       destroy: Supprimer cet arrêt
       destroy_confirm: Etes vous sûr de détruire cet arrêt ?
-      select_parent: Sélectionner le parent
-      add_children: Ajouter un fils
+      select_parent: Gérer le parent
+      add_children: Gérer les fils
     new:
       title: Ajouter un arrêt
     edit:
@@ -91,9 +91,9 @@ fr:
       selection_all: Tous
       area_type: "Type d'arrêt"
     select_parent:
-      title: "Sélection du parent de l'arrêt %{stop_area}"
+      title: "Gérer le parent de l'arrêt %{stop_area}"
     add_children:
-      title: "Ajouter les enfants de l'arrêt %{stop_area}"
+      title: "Gérer les fils de l'arrêt %{stop_area}"
   activerecord:        
     models:        
       stop_area: 
@@ -121,7 +121,7 @@ fr:
         object_version: Version
         creation_time: Créé le
         creator_id: Créé par
-        children_ids: Enfants 
+        children_ids: Fils 
         parent: Parent
   formtastic:
     hints:
diff --git a/spec/requests/referentials_spec.rb b/spec/requests/referentials_spec.rb
index 51e68cd13..54e63c33c 100644
--- a/spec/requests/referentials_spec.rb
+++ b/spec/requests/referentials_spec.rb
@@ -16,6 +16,8 @@ describe "Referentials" do
       let!(:referentials) {  Array.new(2) { create(:referential) } } 
 
       it "should show n referentials" do
+        pending
+
         visit referentials_path
         page.should have_content(referentials.first.name)
         page.should have_content(referentials.last.name)