diff options
| author | Michel Etienne | 2012-04-01 22:02:15 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-04-01 22:02:15 +0200 |
| commit | 8997a187061244ad086a3985b94a6369d68c837e (patch) | |
| tree | 7861c3a3c430b4a3e04acb1973f295ee53943d6d /app/views/layouts | |
| parent | b2c92498973afe7922763429d90a478df90df87f (diff) | |
| download | chouette-core-8997a187061244ad086a3985b94a6369d68c837e.tar.bz2 | |
cleaning tilda files
Diffstat (limited to 'app/views/layouts')
| -rw-r--r-- | app/views/layouts/application.html.erb | 2 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb~ | 36 |
2 files changed, 1 insertions, 37 deletions
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e1d3be438..b290ca2a8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -33,9 +33,9 @@ <li><%= tab_link_to Referential, referentials_path %></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::Line, referential_lines_path(@referential) %></li> <li><%= tab_link_to Chouette::Network, referential_networks_path(@referential) %></li> <li><%= tab_link_to t('activerecord.models.company'), referential_companies_path(@referential) %></li> + <li><%= tab_link_to Chouette::Line, referential_lines_path(@referential) %></li> <li><%= tab_link_to Chouette::StopArea, referential_stop_areas_path(@referential) %></li> <% end %> </ul> diff --git a/app/views/layouts/application.html.erb~ b/app/views/layouts/application.html.erb~ deleted file mode 100644 index 183dd3b57..000000000 --- a/app/views/layouts/application.html.erb~ +++ /dev/null @@ -1,36 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <title>Kyriel - <%= title %></title> - <%= stylesheet_link_tag :application %> - <%= javascript_include_tag :application %> - <%= csrf_meta_tag %> - <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> - <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" /> - </head> - <body> - <div id="header"> - <div class="infos"> - </div> - - <div class="tabs"> - <ul class="main"> - - </ul> - </div> - </div> - <div id="body"> - <div id="flash"> - <% flash.each_pair do |type, message| %> - <%= content_tag :div, message, :class => type %> - <% end %> - </div> - <div id="workspace" class="<%= controller_name %> <%= action_name %>"> - <%= yield %> - </div> - <div id="sidebar"> - <%= yield :sidebar %> - </div> - </div> - </body> -</html> |