diff options
| author | Michel Etienne | 2012-07-05 17:26:40 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-07-05 17:26:40 +0200 |
| commit | d44b24c660c528f199f9b9e596b6db8225f8208b (patch) | |
| tree | 9d59306f345471d9e3aa2a47355182ef8f82fdf9 /app/views/layouts | |
| parent | 34cb941725dd15aecb5906f674a196574577567b (diff) | |
| download | chouette-core-d44b24c660c528f199f9b9e596b6db8225f8208b.tar.bz2 | |
workaround for textile special chars
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/_user_links.erb | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/app/views/layouts/_user_links.erb b/app/views/layouts/_user_links.erb index cef586598..aa70e8c18 100644 --- a/app/views/layouts/_user_links.erb +++ b/app/views/layouts/_user_links.erb @@ -15,7 +15,7 @@ <% if user_signed_in? %> <li> | </li> <li> - <%= link_to help_path , :target => "help" do %> + <%= link_to help_path , :target => "chouette_help" do %> <span class="help"><%= t('layouts.help') %></span> <% end %> </li> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a03a7a8cc..aebbc9f04 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -23,10 +23,8 @@ <div class="title"> <% if selected_referential? %> <h1><%= @referential.name %></h1> - <% elsif help_page? %> + <% elsif help_page? || test_sheet_page? %> <h1>Guide d'utilisation</h1> - <% elsif test_sheet_page? %> - <h1>Description des tests de validation</h1> <% end %> </div> <div class="interaction"> @@ -35,12 +33,11 @@ </div> <div class="tabs"> <ul class="main"> - <% if help_page? %> - <li><%= link_to "Aide", help_path, :class => "current" %></li> - <% elsif test_sheet_page? %> - <li><%= link_to "Tests", test_sheet_path+"1.1", :class => "current" %></li> + <% if help_page? || test_sheet_page? %> + <li><%= link_to "Aide", help_path, :class =>("current" if help_page?) %></li> + <li><%= link_to "Tests de validation", test_sheet_path+"1.1", :class =>("current" if test_sheet_page?) %></li> <% elsif ! selected_referential? %> - <li><%= link_to Referential.model_name.human.capitalize.pluralize, referentials_path, :class => ("current" if current_page?(referentials_path)) %></li> + <li><%= link_to Referential.model_name.human.capitalize.pluralize, referentials_path, :class => ("current" if current_page?(referentials_path) || current_page?(root_url)) %></li> <li><%= tab_link_to FileValidation, file_validations_path %></li> <% else %> <li><%= link_to t("layouts.tabs.dashboard"), referential_path(@referential), :class => ("current" if current_page?(referential_path(@referential))) %></li> |