aboutsummaryrefslogtreecommitdiffstats
path: root/app/views/layouts
diff options
context:
space:
mode:
authorAlban Peignier2012-04-16 14:56:38 +0200
committerAlban Peignier2012-04-16 14:56:38 +0200
commitcda5d74c245e03c194996a3cfe5221785474d12b (patch)
treef43323e16d0d60c54e645db1ae1c63e1b4f611b1 /app/views/layouts
parenta3b6f1c459e409023a1ef531e4f6f8084731a8f9 (diff)
downloadchouette-core-cda5d74c245e03c194996a3cfe5221785474d12b.tar.bz2
Manage help texts with a dedicated HelpController. Refs #12
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/_user_links.erb6
-rw-r--r--app/views/layouts/application.html.erb8
2 files changed, 9 insertions, 5 deletions
diff --git a/app/views/layouts/_user_links.erb b/app/views/layouts/_user_links.erb
index f82d4d7b4..ccbe17596 100644
--- a/app/views/layouts/_user_links.erb
+++ b/app/views/layouts/_user_links.erb
@@ -9,11 +9,11 @@
<% end %>
<li> | </li>
- <li class="<%= language_class("fr") %>"><%= link_to_language :fr %></li>
- <li class="<%= language_class("en") %>"><%= link_to_language :en %></li>
+ <li class="<%= language_class('fr') %>"><%= link_to_language :fr %></li>
+ <li class="<%= language_class('en') %>"><%= link_to_language :en %></li>
<li>
<li> | </li>
- <%= link_to "/help/index" do %>
+ <%= link_to help_path 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 ceafd8944..f75b138fe 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -21,6 +21,8 @@
<div class="title">
<% if selected_referential? %>
<h1><%= @referential.name %></h1>
+ <% elsif help_page? %>
+ <h1>Documentation</h1>
<% end %>
</div>
<div class="interaction">
@@ -29,8 +31,10 @@
</div>
<div class="tabs">
<ul class="main">
- <% unless selected_referential? %>
- <li><%= tab_link_to Referential, referentials_path %></li>
+ <% if help_page? %>
+ <li><%= link_to "Aide", help_path, :class => "current" %></li>
+ <% elsif ! selected_referential? %>
+ <li><%= tab_link_to Referential, referentials_path, :class => "current" %></li>
<% 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>