Fix css for index, update ninoxe and stop areas loading

7 files changed, 7 insertions, 7 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 4beea8474..6bd050f69 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://chouette.dryade.priv/ninoxe
-  revision: d081e7778be1447ce3ec0336dc84dbac471812aa
+  revision: 3c5379299d789aa0764874e3c122c75735bf8a13
   specs:
     ninoxe (0.0.8)
       GeoRuby
diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index 60600e2b4..77055853d 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -43,7 +43,7 @@ class StopAreasController < ChouetteController
   alias_method :stop_area, :resource
 
   def collection
-    @q = end_of_association_chain.search(params[:q])
+    @q = parent.present? ? parent.stop_areas.search(params[:q]) : referential.stop_areas.search(params[:q])
     @stop_areas ||= 
       begin
         stop_areas = @q.result(:distinct => true).order(:name)
diff --git a/app/views/companies/_company.erb b/app/views/companies/_company.erb
index ba8510110..34c65b798 100644
--- a/app/views/companies/_company.erb
+++ b/app/views/companies/_company.erb
@@ -1,4 +1,4 @@
-<%= div_for(company, :class => "company") do %>
+<%= div_for(company) do %>
   <%= link_to company.name, [@referential, company] %>
   <div class="info">
   	<%= company.human_attribute_name('code') %> <%= company.code %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b290ca2a8..1f9397116 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -34,7 +34,7 @@
           <% else %>
             <li><%= link_to t("layouts.tabs.dashboard"), referential_path(@referential), :class => ("current" if current_page?(referential_path(@referential))) %></li>
             <li><%= tab_link_to Chouette::Network, referential_networks_path(@referential) %></li>
-            <li><%= tab_link_to t('activerecord.models.company'), referential_companies_path(@referential) %></li>
+            <li><%= tab_link_to Chouette::Company, referential_companies_path(@referential) %></li>
             <li><%= tab_link_to Chouette::Line, referential_lines_path(@referential) %></li>
             <li><%= tab_link_to Chouette::StopArea, referential_stop_areas_path(@referential) %></li>
           <% end %>    
diff --git a/app/views/lines/_line.erb b/app/views/lines/_line.erb
index 067569835..5405bcbb5 100644
--- a/app/views/lines/_line.erb
+++ b/app/views/lines/_line.erb
@@ -1,4 +1,4 @@
-<%= div_for(line, :class => "line") do %>
+<%= div_for(line) do %>
   <%= link_to([@referential, line], :class => "preview", :title => "Ligne #{line.number}") do %>
     <div class="color">
       <% if line.number and line.number.length <= 3 %>
diff --git a/app/views/networks/_network.erb b/app/views/networks/_network.erb
index d5e10ea96..f3a0b597e 100644
--- a/app/views/networks/_network.erb
+++ b/app/views/networks/_network.erb
@@ -1,4 +1,4 @@
-<%= div_for(network, :class => "network") do %>
+<%= div_for(network) do %>
   <%= link_to network.name, [@referential, network] %>
   <div class="info">
     <div class="actions">  
diff --git a/app/views/stop_areas/_stop_area.html.erb b/app/views/stop_areas/_stop_area.html.erb
index f3b5a76d4..a0b681d48 100644
--- a/app/views/stop_areas/_stop_area.html.erb
+++ b/app/views/stop_areas/_stop_area.html.erb
@@ -1,4 +1,4 @@
-<%= div_for(stop_area, :class => "stop_area") do %>
+<%= div_for(stop_area) do %>
   <%= link_to stop_area.name, [@referential, stop_area] %>
   <div class="info">
     <p>