diff options
| author | Michel Etienne | 2012-09-04 09:42:37 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-09-04 09:42:37 +0200 |
| commit | 61602193fa72fdf9fd23d1b114ca1821c8628e57 (patch) | |
| tree | 1950ae7093ed68f23714c2c4c8b9861f47cc7ef4 /app/views | |
| parent | aeb3be94a261146d06e6eb18223f36455b541b7d (diff) | |
| parent | fb36cca1d37fa86316a98b0105d2120e33764852 (diff) | |
| download | chouette-core-61602193fa72fdf9fd23d1b114ca1821c8628e57.tar.bz2 | |
Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/application.html.erb | 8 | ||||
| -rw-r--r-- | app/views/referentials/index.html.erb | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 417f677c3..c15bcf13f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -35,9 +35,11 @@ <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(:count=>2), referentials_path, :class => ("current" if current_page?(referentials_path) || current_page?(root_url)) %></li> - <li><%= tab_link_to FileValidation.model_name.human(:count=>2), file_validations_path %></li> - <li class="admin"><%= tab_link_to Organisation.model_name.human, organisation_path %></li> + <% if user_signed_in? %> + <li><%= link_to Referential.model_name.human(:count=>2), referentials_path, :class => ("current" if current_page?(referentials_path) || current_page?(root_url)) %></li> + <li><%= tab_link_to FileValidation.model_name.human(:count=>2), file_validations_path %></li> + <li class="admin"><%= tab_link_to Organisation.model_name.human, organisation_path %></li> + <% end %> <% 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> diff --git a/app/views/referentials/index.html.erb b/app/views/referentials/index.html.erb index 528c7b13b..a9d990b11 100644 --- a/app/views/referentials/index.html.erb +++ b/app/views/referentials/index.html.erb @@ -1,6 +1,8 @@ <%= title_tag Referential.model_name.human.pluralize %> +<div class="referentials"> <%= render :partial => "referential", :collection => @referentials %> +</div> <% content_for :sidebar do %> <ul class="actions"> |