diff options
| author | Michel Etienne | 2014-03-04 09:39:32 +0100 |
|---|---|---|
| committer | Michel Etienne | 2014-03-04 09:39:32 +0100 |
| commit | 63da623cf2c6e5afebb510a5b85ab69c8f1ac083 (patch) | |
| tree | 06aa2c4b07158c0e032642877c1fcf60d84b0816 /app/views | |
| parent | 3587b4b60cdcc3a832b5694b9cb0d7b7d4e7853e (diff) | |
| parent | 168af90528df18927b2e3507c10beae526d45ad1 (diff) | |
| download | chouette-core-63da623cf2c6e5afebb510a5b85ab69c8f1ac083.tar.bz2 | |
Merge branch 'V2_2'
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/compliance_check_tasks/_test_sheet_toc.html.erb | 15 | ||||
| -rw-r--r-- | app/views/layouts/_user_links.erb | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 6 |
3 files changed, 4 insertions, 19 deletions
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> |