Merge branch 'V2_2'

8 files changed, 28 insertions, 27 deletions

diff --git a/app/assets/stylesheets/access_links.css.scss b/app/assets/stylesheets/access_links.css.scss
index c076b30b1..b9b207de6 100644
--- a/app/assets/stylesheets/access_links.css.scss
+++ b/app/assets/stylesheets/access_links.css.scss
@@ -16,6 +16,13 @@
     
 }        
 
+#workspace.access_links.edit,#workspace.access_links.new,#workspace.access_links.create,#workspace.access_links.update
+{
+     .time_select ol {
+        padding: 0 0 0 40%;
+        width: 100%;
+     }
+}
 
 
 
diff --git a/app/assets/stylesheets/access_points.css.scss b/app/assets/stylesheets/access_points.css.scss
index 6545a32aa..6e5ea502f 100644
--- a/app/assets/stylesheets/access_points.css.scss
+++ b/app/assets/stylesheets/access_points.css.scss
@@ -35,6 +35,14 @@
     }
 }
 
+#workspace.access_points.edit,#workspace.access_points.new,#workspace.access_points.create,#workspace.access_points.update
+{
+     .time_select ol {
+        padding: 0 0 0 40%;
+        width: 100%;
+     }
+}
+
 #workspace.access_points.edit {
   legend { padding-bottom: 20px; }
 }
diff --git a/app/assets/stylesheets/connection_links.css.scss b/app/assets/stylesheets/connection_links.css.scss
index b2ad0de75..243df6da6 100644
--- a/app/assets/stylesheets/connection_links.css.scss
+++ b/app/assets/stylesheets/connection_links.css.scss
@@ -54,5 +54,11 @@
     }
 }
 
-
+#workspace.connection_links.edit,#workspace.connection_links.new,#workspace.connection_links.create,#workspace.connection_links.update
+{
+     .time_select ol {
+        padding: 0 0 0 40%;
+        width: 100%;
+     }
+}
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3b5bfdfda..8e655c68d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -19,16 +19,9 @@ module ApplicationHelper
     controller_name == "help"
   end
 
-  def test_sheet_page?
-    controller_name == "test_sheet"
-  end
-
   def help_path
     url_for(:controller => "/help", :action => "show") + '/'
   end
   
-  def test_sheet_path
-    url_for(:controller => "/test_sheet", :action => "show") + '/'
-  end
   
 end
diff --git a/app/views/compliance_check_tasks/_test_sheet_toc.html.erb b/app/views/compliance_check_tasks/_test_sheet_toc.html.erb
deleted file mode 100644
index 0605510b4..000000000
--- a/app/views/compliance_check_tasks/_test_sheet_toc.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="sidebarhelp" class="help">
-<h3>Définition des tests</h3>
-<ul>
-	<% cnt = Array[0,2,28,21] %>
-	<% for j in 1..3 do %>
-	<li>Catégorie <%= j.to_s %>
-	<ul>
-		<% 1.upto(cnt[j]) do |i| %>
-           <li><%= link_to 'Fiche '+j.to_s+'.'+i.to_s , test_sheet_path+j.to_s+"_"+i.to_s, :target => "chouette_help" %></li>
-        <% end %>
-	</ul>
-	</li>
-	<% end %>
-</ul>
-</div>
\ No newline at end of file
diff --git a/app/views/layouts/_user_links.erb b/app/views/layouts/_user_links.erb
index e5413d556..404f52172 100644
--- a/app/views/layouts/_user_links.erb
+++ b/app/views/layouts/_user_links.erb
@@ -12,7 +12,7 @@
   <li class="<%= language_class('fr') %>"><%= link_to_language :fr %></li>
   <li class="<%= language_class('en') %>"><%= link_to_language :en %></li>
   <li>
-  <% if user_signed_in?  && !help_page? && !test_sheet_page?%>
+  <% if user_signed_in?  && !help_page? %>
   <li> | </li> 
   <li>
   <%= link_to help_path , :target => "chouette_help" do %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index df641caf7..0f0d95a4b 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -28,7 +28,7 @@
         <div class="title">
           <% if selected_referential? %>
             <h1><%= @referential.name %></h1>
-          <% elsif help_page?  || test_sheet_page? %>
+          <% elsif help_page? %>
             <h1>Guide d'utilisation</h1>
           <% end %>
         </div>
@@ -38,7 +38,7 @@
       </div>
       <div class="tabs">
         <ul class="main">
-          <% if help_page? || test_sheet_page? %>
+          <% if help_page? %>
             <li><%= link_to "Aide", help_path, :class =>("current" if help_page?) %></li>
           <% elsif ! selected_referential? %>
             <% if  user_signed_in? %>
@@ -46,7 +46,7 @@
               <li class="admin"><%= tab_link_to Organisation.model_name.human, organisation_path %></li>
             <% end %>
           <% else %>
-            <li><%= link_to t("layouts.tabs.dashboard").capitalize, referential_path(@referential), :class => ("current" if current_page?(referential_path(@referential))) %></li>
+            <li><%= link_to t("layouts.tabs.dashboard").capitalize, referential_path(@referential), :class => ("current" if current_page?(referential_path(@referential)) || request.path.start_with?(referential_rule_parameter_sets_path(@referential))) %></li>
             <li><%= tab_link_to Chouette::Network, referential_networks_path(@referential) %></li>
             <li><%= tab_link_to Chouette::Company, referential_companies_path(@referential) %></li>
             <li><%= tab_link_to Chouette::GroupOfLine, referential_group_of_lines_path(@referential) %></li>
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index e2632152c..eaec6c4f5 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -8,6 +8,8 @@
 # Emended by Benjamin des Gachons and Patrick Chew : <http://www.fitima.org/docs/fiche.pdf>
 
 fr:
+  "true": "oui"
+  "false": "non"
   date:
     formats:
       default: "%d/%m/%Y"