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

Adjust header layout for user menu

Browse source
This commit is contained in:
John Firebaugh 2013-09-27 12:07:29 -07:00
parent 1b668ead62
commit f74c984a49
4 changed files with 56 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/_user_menu.html.erb
View file

@ -1,4 +1,4 @@
<div class='dropdown' id='greeting'>
<div class='dropdown'>
<a class='dropdown-toggle' data-toggle='dropdown' href="#">
<%= render :partial => 'layouts/inbox' %>
<%= @user.display_name %>

45
app/views/layouts/site.html.erb
View file

@ -77,27 +77,32 @@
</div>
</div>
<div id='top-bar'>
<ul class='secondary-actions'>
<li><%= link_to t('layouts.help'), help_path %></li>
</ul>
<% if @user and @user.id %>
<%= render :partial => "layouts/user_menu" %>
<% else %>
<ul class='secondary-actions' id='greeting'>
<li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %></li>
<li><%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %></li>
<nav class='primary'>
<ul>
<li id="view_tab">
<%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
</li><li id="edit_tab">
<%= render :partial => 'layouts/edit_menu',
:locals => { :link_text => t('layouts.edit'), :link_class => 'llz object' }%>
</li><li id="history_tab">
<%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink bbox' %>
</li>
</ul>
<% end %>
<ul id="tabnav">
<li id="view_tab">
<%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
</li><li id="edit_tab">
<%= render :partial => 'layouts/edit_menu',
:locals => { :link_text => t('layouts.edit'), :link_class => 'llz object' }%>
</li><li id="history_tab">
<%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink bbox' %>
</li>
</ul>
</nav>
<nav class='secondary'>
<% if @user and @user.id %>
<ul>
<li><%= link_to t('layouts.help'), help_path %></li>
</ul>
<%= render :partial => "layouts/user_menu" %>
<% else %>
<ul class="secondary-actions">
<li><%= link_to t('layouts.help'), help_path %></li>
<li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %></li>
<li><%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %></li>
</ul>
<% end %>
</nav>
</div>
<div class="wrapper">
<%= render :partial => "layouts/flash", :locals => { :flash => flash } %>