aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2014-06-30 16:01:54 +0200
committerLuc Donnet2014-06-30 16:01:54 +0200
commit05c0f38181e2962eaaaec3591b1dc8b140826536 (patch)
treec56c8aa31716e9fb40cb6dbc7f745498ee8f41c3
parentbf05e79d81b5fa9f53154317ba7049661ab732fb (diff)
downloadchouette-core-05c0f38181e2962eaaaec3591b1dc8b140826536.tar.bz2
Extract header from layout Refs #0026847
Diffstat
-rw-r--r--app/views/layouts/application.html.erb91
-rw-r--r--app/views/layouts/without_sidebar.html.erb91
-rw-r--r--app/views/shared/_footer.erb2
-rw-r--r--app/views/shared/_header.erb90
4 files changed, 93 insertions, 181 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 2e4f98c0b..5ff860a54 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -18,96 +18,7 @@
</head>
<body>
<div id="header">
- <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
- <div class="container">
- <!-- Brand and toggle get grouped for better mobile display -->
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar version"><%= APP_VERSION %></span>
- </button>
- <%= link_to referentials_path, :class =>"navbar-brand" do %>
- <%= image_tag("logo_chouette.png") %> <span class="version"><%= APP_VERSION %></span>
- <% end %>
- </div>
-
- <!-- Collect the nav links, forms, and other content for toggling -->
- <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
- <ul class="nav navbar-nav">
- <% if selected_referential? %>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= @referential.name %><b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><%= link_to t("layouts.navbar.return_to_referentials"), referentials_path %></li>
- <li class="divider"></li>
- <li role="presentation" class="dropdown-header"><%= t("layouts.navbar.select_referential") %></li>
- <% current_organisation.referentials.each do |referential| %>
- <li>
- <%= link_to @referential.name, referential_path(@referential) %>
- </li>
- <% end %>
- </ul>
- </li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t("layouts.navbar.referential_datas") %><b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><%= link_to referential_networks_path(@referential) do %>
- <%= Referential.human_attribute_name("networks") %><span class="badge pull-right"><%= @referential.networks.size %></span>
- <% end %>
- </li>
- <li><%= link_to referential_companies_path(@referential) do %>
- <%= Referential.human_attribute_name("companies") %><span class="badge pull-right"><%= @referential.companies.size %></span>
- <% end %>
- </li>
- <li><%= link_to referential_group_of_lines_path(@referential) do %>
- <%= Referential.human_attribute_name("group_of_lines") %><span class="badge pull-right"><%= @referential.group_of_lines.size %></span>
- <% end %>
- </li>
- <li><%= link_to referential_lines_path(@referential) do %>
- <%= Referential.human_attribute_name("lines") %><span class="badge pull-right"><%= @referential.lines.size %></span>
- <% end %>
- </li>
- <li><%= link_to referential_stop_areas_path(@referential) do %>
- <%= Referential.human_attribute_name("stop_areas") %><span class="badge pull-right"><%= @referential.stop_areas.size %></span>
- <% end %>
- </li>
- <li><%= link_to referential_connection_links_path(@referential) do %>
- <%= Referential.human_attribute_name("connection_links") %><span class="badge pull-right"><%= @referential.connection_links.size %></span>
- <% end %>
- </li>
- <li><%= link_to referential_time_tables_path(@referential) do %>
- <%= Referential.human_attribute_name("time_tables") %><span class="badge pull-right"><%= @referential.time_tables.size %></span>
- <% end %>
- </li>
- </ul>
- </li>
- <li><%= link_to Referential.human_attribute_name("import_tasks"), referential_import_tasks_path(@referential) %></li>
- <li><%= link_to Referential.human_attribute_name("export_tasks"), referential_exports_path(@referential) %></li>
- <li><%= link_to Referential.human_attribute_name("compliance_check_tasks"), referential_compliance_check_tasks_path(@referential) %></li>
- <% end %>
- </ul>
- <ul class="nav navbar-nav navbar-right">
- <li class="<%= language_class('fr') %>"><%= link_to_language :fr %></li>
- <li class="<%= language_class('en') %>"><%= link_to_language :en %></li>
- <li><%= link_to t('layouts.help'), help_path, :class =>("current" if help_page?), :target => "_blank" %></li>
- <% if user_signed_in? %>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="gravatar"><%= user_gravatar_image_tag current_user %></span><%= current_user.name %> <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><%= link_to t('layouts.user.profile'), edit_user_registration_path %></li>
- <li><%= link_to t('layouts.user.sign_out'), destroy_user_session_path, :method => :delete %></li>
- <li class="divider"></li>
- <li><%= tab_link_to Organisation.model_name.human, organisation_path %></li>
- </ul>
- </li>
- <% end %>
- </ul>
- </div><!-- /.navbar-collapse -->
- </div><!-- /.container-fluid -->
- </nav>
+ <%= render partial: "shared/header" %>
</div>
<div id="middle" class="container">
<div class="row">
diff --git a/app/views/layouts/without_sidebar.html.erb b/app/views/layouts/without_sidebar.html.erb
index 948070695..d07139c2f 100644
--- a/app/views/layouts/without_sidebar.html.erb
+++ b/app/views/layouts/without_sidebar.html.erb
@@ -18,96 +18,7 @@
</head>
<body>
<div id="header">
- <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
- <div class="container">
- <!-- Brand and toggle get grouped for better mobile display -->
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar version"><%= APP_VERSION %></span>
- </button>
- <%= link_to referentials_path, :class =>"navbar-brand" do %>
- <%= image_tag("logo_chouette.png") %> <span class="version"><%= APP_VERSION %></span>
- <% end %>
- </div>
-
- <!-- Collect the nav links, forms, and other content for toggling -->
- <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
- <ul class="nav navbar-nav">
- <% if selected_referential? %>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= @referential.name %><b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><%= link_to t("layouts.navbar.return_to_referentials"), referentials_path %></li>
- <li class="divider"></li>
- <li role="presentation" class="dropdown-header"><%= t("layouts.navbar.select_referential") %></li>
- <% current_organisation.referentials.each do |referential| %>
- <li>
- <%= link_to @referential.name, referential_path(@referential) %>
- </li>
- <% end %>
- </ul>
- </li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t("layouts.navbar.referential_datas") %><b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><%= link_to referential_networks_path(@referential) do %>
- <%= Referential.human_attribute_name("networks") %><span class="badge pull-right"><%= @referential.networks.size %></span>
- <% end %>
- </li>
- <li><%= link_to referential_companies_path(@referential) do %>
- <%= Referential.human_attribute_name("companies") %><span class="badge pull-right"><%= @referential.companies.size %></span>
- <% end %>
- </li>
- <li><%= link_to referential_group_of_lines_path(@referential) do %>
- <%= Referential.human_attribute_name("group_of_lines") %><span class="badge pull-right"><%= @referential.group_of_lines.size %></span>
- <% end %>
- </li>
- <li><%= link_to referential_lines_path(@referential) do %>
- <%= Referential.human_attribute_name("lines") %><span class="badge pull-right"><%= @referential.lines.size %></span>
- <% end %>
- </li>
- <li><%= link_to referential_stop_areas_path(@referential) do %>
- <%= Referential.human_attribute_name("stop_areas") %><span class="badge pull-right"><%= @referential.stop_areas.size %></span>
- <% end %>
- </li>
- <li><%= link_to referential_connection_links_path(@referential) do %>
- <%= Referential.human_attribute_name("connection_links") %><span class="badge pull-right"><%= @referential.connection_links.size %></span>
- <% end %>
- </li>
- <li><%= link_to referential_time_tables_path(@referential) do %>
- <%= Referential.human_attribute_name("time_tables") %><span class="badge pull-right"><%= @referential.time_tables.size %></span>
- <% end %>
- </li>
- </ul>
- </li>
- <li><%= link_to Referential.human_attribute_name("import_tasks"), referential_import_tasks_path(@referential) %></li>
- <li><%= link_to Referential.human_attribute_name("export_tasks"), referential_exports_path(@referential) %></li>
- <li><%= link_to Referential.human_attribute_name("compliance_check_tasks"), referential_compliance_check_tasks_path(@referential) %></li>
- <% end %>
- </ul>
- <ul class="nav navbar-nav navbar-right">
- <li class="<%= language_class('fr') %>"><%= link_to_language :fr %></li>
- <li class="<%= language_class('en') %>"><%= link_to_language :en %></li>
- <li><%= link_to t('layouts.help'), help_path, :class =>("current" if help_page?), :target => "_blank" %></li>
- <% if user_signed_in? %>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="gravatar"><%= user_gravatar_image_tag current_user %></span><%= current_user.name %> <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><%= link_to t('layouts.user.profile'), edit_user_registration_path %></li>
- <li><%= link_to t('layouts.user.sign_out'), destroy_user_session_path, :method => :delete %></li>
- <li class="divider"></li>
- <li><%= tab_link_to Organisation.model_name.human, organisation_path %></li>
- </ul>
- </li>
- <% end %>
- </ul>
- </div><!-- /.navbar-collapse -->
- </div><!-- /.container-fluid -->
- </nav>
+ <%= render partial: "shared/header" %>
</div>
<div id="middle" class="container">
<div class="row">
diff --git a/app/views/shared/_footer.erb b/app/views/shared/_footer.erb
index 059a96d4c..3ad00df77 100644
--- a/app/views/shared/_footer.erb
+++ b/app/views/shared/_footer.erb
@@ -8,7 +8,7 @@
<li><h4><%= t("layouts.footer.product.title") %></h4></li>
<li><%= link_to t("layouts.footer.product.licence"), "http://www.cecill.info/licences/Licence_CeCILL-B_V1-fr.html" %></li>
<li><%= link_to t("layouts.footer.product.source_code"), "https://github.com/afimb/chouette2" %></li>
- <li><%= link_to t("layouts.footer.product.user_group") %></li>
+ <li><%= link_to t("layouts.footer.product.user_group"), "http://www.chouette.mobi/les-utilisateurs/club-utilisateur-des-outils-chouette-et-irys/" %></li>
</ul>
</div>
<div class="col-md-3">
diff --git a/app/views/shared/_header.erb b/app/views/shared/_header.erb
new file mode 100644
index 000000000..98da232ac
--- /dev/null
+++ b/app/views/shared/_header.erb
@@ -0,0 +1,90 @@
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+ <div class="container">
+ <!-- Brand and toggle get grouped for better mobile display -->
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar version"><%= APP_VERSION %></span>
+ </button>
+ <%= link_to referentials_path, :class =>"navbar-brand" do %>
+ <%= image_tag("logo_chouette.png") %> <span class="version"><%= APP_VERSION %></span>
+ <% end %>
+ </div>
+
+ <!-- Collect the nav links, forms, and other content for toggling -->
+ <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+ <ul class="nav navbar-nav">
+ <% if selected_referential? %>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= @referential.name %><b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><%= link_to t("layouts.navbar.return_to_referentials"), referentials_path %></li>
+ <li class="divider"></li>
+ <li role="presentation" class="dropdown-header"><%= t("layouts.navbar.select_referential") %></li>
+ <% current_organisation.referentials.each do |referential| %>
+ <li>
+ <%= link_to @referential.name, referential_path(@referential) %>
+ </li>
+ <% end %>
+ </ul>
+ </li>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t("layouts.navbar.referential_datas") %><b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><%= link_to referential_networks_path(@referential) do %>
+ <%= Referential.human_attribute_name("networks") %><span class="badge pull-right"><%= @referential.networks.size %></span>
+ <% end %>
+ </li>
+ <li><%= link_to referential_companies_path(@referential) do %>
+ <%= Referential.human_attribute_name("companies") %><span class="badge pull-right"><%= @referential.companies.size %></span>
+ <% end %>
+ </li>
+ <li><%= link_to referential_group_of_lines_path(@referential) do %>
+ <%= Referential.human_attribute_name("group_of_lines") %><span class="badge pull-right"><%= @referential.group_of_lines.size %></span>
+ <% end %>
+ </li>
+ <li><%= link_to referential_lines_path(@referential) do %>
+ <%= Referential.human_attribute_name("lines") %><span class="badge pull-right"><%= @referential.lines.size %></span>
+ <% end %>
+ </li>
+ <li><%= link_to referential_stop_areas_path(@referential) do %>
+ <%= Referential.human_attribute_name("stop_areas") %><span class="badge pull-right"><%= @referential.stop_areas.size %></span>
+ <% end %>
+ </li>
+ <li><%= link_to referential_connection_links_path(@referential) do %>
+ <%= Referential.human_attribute_name("connection_links") %><span class="badge pull-right"><%= @referential.connection_links.size %></span>
+ <% end %>
+ </li>
+ <li><%= link_to referential_time_tables_path(@referential) do %>
+ <%= Referential.human_attribute_name("time_tables") %><span class="badge pull-right"><%= @referential.time_tables.size %></span>
+ <% end %>
+ </li>
+ </ul>
+ </li>
+ <li><%= link_to Referential.human_attribute_name("import_tasks"), referential_import_tasks_path(@referential) %></li>
+ <li><%= link_to Referential.human_attribute_name("export_tasks"), referential_exports_path(@referential) %></li>
+ <li><%= link_to Referential.human_attribute_name("compliance_check_tasks"), referential_compliance_check_tasks_path(@referential) %></li>
+ <% end %>
+ </ul>
+ <ul class="nav navbar-nav navbar-right">
+ <li class="<%= language_class('fr') %>"><%= link_to_language :fr %></li>
+ <li class="<%= language_class('en') %>"><%= link_to_language :en %></li>
+ <li><%= link_to t('layouts.help'), help_path, :class =>("current" if help_page?), :target => "_blank" %></li>
+ <% if user_signed_in? %>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="gravatar"><%= user_gravatar_image_tag(current_user) %></span><%= current_user.name %> <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><%= link_to t('layouts.user.profile'), edit_user_registration_path %></li>
+ <li><%= link_to t('layouts.user.sign_out'), destroy_user_session_path, :method => :delete %></li>
+ <li class="divider"></li>
+ <li><%= tab_link_to Organisation.model_name.human, organisation_path %></li>
+ </ul>
+ </li>
+ <% end %>
+ </ul>
+ </div><!-- /.navbar-collapse -->
+ </div><!-- /.container-fluid -->
+</nav>
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-11 17:51:57 +0000