cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add current state to all nav elements

Browse source
This commit is contained in:
John Firebaugh 2013-10-02 11:52:56 -07:00
parent d3bf4149e0
commit 2ba4bf3744
3 changed files with 24 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/assets/stylesheets/common.css.scss
View file

@ -393,12 +393,8 @@ nav.primary {
border-top-color: #ccc; border-top-color: #ccc;
} }
} }
}
.site-index #view_tab, > ul li.current {
.changeset-list #history_tab,
.site-export #export_tab,
.site-edit #edit_tab {
background-color: $green; background-color: $green;
.tab { .tab {
@ -408,6 +404,7 @@ nav.primary {
.caret { .caret {
border-top-color: #fff; border-top-color: #fff;
} }
}
} }
nav.secondary { nav.secondary {
@ -423,6 +420,10 @@ nav.secondary {
padding: 5px 5px; padding: 5px 5px;
} }
> ul li.current a {
color: darken($darkgrey, 25%);
}
.user-menu { .user-menu {
$border: 1px solid $grey; $border: 1px solid $grey;

4
app/helpers/application_helper.rb
View file

@ -96,4 +96,8 @@ module ApplicationHelper
def body_class def body_class
[params[:controller], "#{params[:controller]}-#{params[:action]}", @extra_body_class].compact.join(" ") [params[:controller], "#{params[:controller]}-#{params[:action]}", @extra_body_class].compact.join(" ")
end end
def current_page_class(path)
:current if current_page?(path)
end
end end

16
app/views/layouts/_header.html.erb
View file

@ -7,9 +7,9 @@
</h1> </h1>
<nav class='primary'> <nav class='primary'>
<ul> <ul>
<li id="view_tab"> <li id="view_tab" class="<%= current_page_class(root_path) %>">
<%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %> <%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
</li><li id="edit_tab" class="dropdown"> </li><li id="edit_tab" class="dropdown <%= current_page_class(edit_path) %>">
<%= link_to t('layouts.edit'), edit_path, :class => "tab geolink llz object", <%= link_to t('layouts.edit'), edit_path, :class => "tab geolink llz object",
:id => 'editanchor', :id => 'editanchor',
:data => { :editor => preferred_editor } :data => { :editor => preferred_editor }
@ -24,19 +24,19 @@
</li> </li>
<% end %> <% end %>
</ul> </ul>
</li><li id="history_tab"> </li><li id="history_tab" class="<%= current_page_class(browse_changesets_path) %>">
<%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink llz' %> <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink llz' %>
</li><li id="export_tab"> </li><li id="export_tab" class="<%= current_page_class(export_path) %>">
<%= link_to t('layouts.export'), export_path, :class => 'tab geolink llz' %> <%= link_to t('layouts.export'), export_path, :class => 'tab geolink llz' %>
</li> </li>
</ul> </ul>
</nav> </nav>
<nav class='secondary'> <nav class='secondary'>
<ul> <ul>
<li><%= link_to t('layouts.gps_traces'), traces_path %></li> <li class="<%= current_page_class(traces_path) %>"><%= link_to t('layouts.gps_traces'), traces_path %></li>
<li><%= link_to t('layouts.user_diaries'), diary_path %></li> <li class="<%= current_page_class(diary_path) %>"><%= link_to t('layouts.user_diaries'), diary_path %></li>
<li><%= link_to t('layouts.help'), help_path %></li> <li class="<%= current_page_class(help_path) %>"><%= link_to t('layouts.help'), help_path %></li>
<li><%= link_to t('layouts.about'), about_path %></li> <li class="<%= current_page_class(about_path) %>"><%= link_to t('layouts.about'), about_path %></li>
</ul> </ul>
<% if @user %> <% if @user %>
<div class='dropdown user-menu'> <div class='dropdown user-menu'>