<a href="#" id="menu-icon"></a>
<nav class='primary'>
<%= content_for :header %>
- <div class="btn-group">
- <div id="edit_tab" class="btn-group flex-grow-1">
- <%= link_to t("layouts.edit"),
- edit_path,
- :class => "btn btn-outline-primary geolink editlink",
- :id => "editanchor",
- :data => { :editor => preferred_editor } %>
- <button class='btn btn-outline-primary dropdown-toggle dropdown-toggle-split flex-grow-0' type='button' data-bs-toggle='dropdown'></button>
- <ul class='dropdown-menu'>
- <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
- <li>
- <%= link_to t("layouts.edit_with", :editor => t("editor.#{editor}.description")),
- edit_path(:editor => editor),
- :data => { :editor => editor },
- :class => "geolink editlink dropdown-item" %>
- </li>
- <% end %>
- </ul>
- </div>
+ <div id="edit_tab" class="btn-group">
+ <%= link_to t("layouts.edit"),
+ edit_path,
+ :class => "btn btn-outline-primary geolink editlink",
+ :id => "editanchor",
+ :data => { :editor => preferred_editor } %>
+ <button class='btn btn-outline-primary dropdown-toggle dropdown-toggle-split flex-grow-0' type='button' data-bs-toggle='dropdown'></button>
+ <ul class='dropdown-menu'>
+ <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
+ <li>
+ <%= link_to t("layouts.edit_with", :editor => t("editor.#{editor}.description")),
+ edit_path(:editor => editor),
+ :data => { :editor => editor },
+ :class => "geolink editlink dropdown-item" %>
+ </li>
+ <% end %>
+ </ul>
</div>
</nav>
- <nav class='secondary d-flex gap-2 align-items-center'>
- <ul class='nav flex-nowrap'>
+ <nav class='secondary d-flex gap-2 flex-grow-1 align-items-center'>
+ <ul id='secondary-nav-menu' class='nav flex-grow-1' data-turbo-permanent>
<% if Settings.status != "database_offline" && can?(:index, Issue) %>
- <li class="compact-hide nav-item">
+ <li class="nav-item">
<%= link_to issues_path(:status => "open"), :class => header_nav_link_class(issues_path) do %>
<%= t("layouts.issues") %>
<%= open_issues_count %>
<% end -%>
</li>
<% end %>
- <li class="compact-hide nav-item">
+ <li class="nav-item">
<%= link_to t("layouts.history"), history_path, :class => header_nav_link_class(history_path) %>
</li>
- <li class="compact-hide nav-item">
+ <li class="nav-item">
<%= link_to t("layouts.export"), export_path, :class => header_nav_link_class(export_path) %>
</li>
- <li class="compact-hide nav-item">
+ <li class="nav-item">
<%= link_to t("layouts.gps_traces"), traces_path, :class => header_nav_link_class(traces_path) %>
</li>
- <li class="compact-hide nav-item">
+ <li class="nav-item">
<%= link_to t("layouts.user_diaries"), diary_entries_path, :class => header_nav_link_class(diary_entries_path) %>
</li>
- <li class="compact-hide nav-item">
+ <li class="nav-item">
<%= link_to t("layouts.communities"), communities_path, :class => header_nav_link_class(communities_path) %>
</li>
- <li class="compact-hide nav-item">
+ <li class="nav-item">
<%= link_to t("layouts.copyright"), copyright_path, :class => header_nav_link_class(copyright_path) %>
</li>
- <li class="compact-hide nav-item">
+ <li class="nav-item">
<%= link_to t("layouts.help"), help_path, :class => header_nav_link_class(help_path) %>
</li>
- <li class="compact-hide nav-item">
+ <li class="nav-item">
<%= link_to t("layouts.about"), about_path, :class => header_nav_link_class(about_path) %>
</li>
- <li id="compact-secondary-nav" class="dropdown nav-item">
+ <li id="compact-secondary-nav" class="dropdown nav-item ms-auto">
<button class="dropdown-toggle nav-link btn btn-outline-secondary border-0 bg-body text-secondary" type="button" data-bs-toggle="dropdown"><%= t "layouts.more" %></button>
<ul class="dropdown-menu">
- <% if Settings.status != "database_offline" && can?(:index, Issue) %>
- <li>
- <%= link_to issues_path(:status => "open"), :class => "dropdown-item" do %>
- <%= t("layouts.issues") %>
- <%= open_issues_count %>
- <% end -%>
- </li>
- <% end %>
- <li><%= link_to t("layouts.history"), history_path, :class => "dropdown-item" %></li>
- <li><%= link_to t("layouts.export"), export_path, :class => "dropdown-item" %></li>
- <li><%= link_to t("layouts.gps_traces"), traces_path, :class => "dropdown-item" %></li>
- <li><%= link_to t("layouts.user_diaries"), diary_entries_path, :class => "dropdown-item" %></li>
- <li><%= link_to t("layouts.communities"), communities_path, :class => "dropdown-item" %></li>
- <li><%= link_to t("layouts.copyright"), copyright_path, :class => "dropdown-item" %></li>
- <li><%= link_to t("layouts.help"), help_path, :class => "dropdown-item" %></li>
- <li><%= link_to t("layouts.about"), about_path, :class => "dropdown-item" %></li>
</ul>
</li>
</ul>
<% if current_user && current_user.id %>
<div class='d-inline-flex dropdown user-menu logged-in'>
- <button class='d-flex gap-1 align-items-center justify-content-center dropdown-toggle btn btn-outline-secondary border-secondary-subtle bg-body text-secondary px-2 py-1 flex-grow-1' type='button' data-bs-toggle='dropdown'>
+ <button class='d-flex gap-1 align-items-center justify-content-center dropdown-toggle btn btn-outline-secondary border-secondary-subtle bg-body text-secondary px-2 py-1 flex-grow-1 mw-100' type='button' data-bs-toggle='dropdown'>
<%= user_thumbnail_tiny(current_user, :class => "user_thumbnail_tiny rounded-1 bg-body") %>
<% if current_user.new_messages.size > 0 %>
<span class="badge count-number position-static m-1"><%= current_user.new_messages.size %></span>
<% end %>
- <span class='username align-middle text-truncate'>
+ <span class='username align-middle text-truncate' dir='auto'>
<%= current_user.display_name %>
</span>
</button>
<div class='dropdown-menu dropdown-menu-end'>
<%= link_to t("users.show.my_dashboard"), dashboard_path, :class => "dropdown-item" %>
- <%= link_to inbox_messages_path, :class => "dropdown-item" do %>
+ <%= link_to messages_inbox_path, :class => "dropdown-item" do %>
<%= t("users.show.my messages") %>
<span class='badge count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
<% end %>
<%= link_to t("users.show.my profile"), current_user, :class => "dropdown-item" %>
- <%= link_to t("users.show.my settings"), edit_account_path, :class => "dropdown-item" %>
+ <%= link_to t("users.show.my_account"), edit_account_path, :class => "dropdown-item" %>
<%= link_to t("users.show.my_preferences"), preferences_path, :class => "dropdown-item" %>
<div class="dropdown-divider"></div>
- <%= yield :greeting %>
+ <% if current_user.home_location? %>
+ <%= link_to t("layouts.home"), account_home_path, :class => "dropdown-item" %>
+ <% end %>
<%= link_to t("layouts.logout"), logout_path(:referer => request.fullpath), :method => "post", :class => "geolink dropdown-item" %>
</div>
</div>
<% else %>
<div class="d-inline-flex btn-group login-menu" role="">
<%= link_to t("layouts.log_in"), login_path(:referer => request.fullpath), :class => "geolink btn btn-outline-secondary" %>
- <%= link_to t("layouts.sign_up"), user_new_path, :class => "btn btn-outline-secondary" %>
+ <%= link_to t("layouts.sign_up"), new_user_path, :class => "btn btn-outline-secondary" %>
</div>
<% end %>
</nav>
projects / rails.git / blobdiff