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

Merge remote-tracking branch 'upstream/pull/4822'

Browse source
This commit is contained in:
Tom Hughes 2024-05-21 18:34:52 +01:00
commit 56a34d85cc
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,7 +83,9 @@
<div class='d-inline-flex dropdown user-menu logged-in'> <div class='d-inline-flex dropdown user-menu logged-in'>
<button class='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='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'>
<%= user_thumbnail_tiny(current_user, :width => 25, :height => 25, :class => "user_thumbnail_tiny rounded-1 bg-body") %> <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25, :class => "user_thumbnail_tiny rounded-1 bg-body") %>
<%= render :partial => "layouts/inbox" %> <% if current_user.new_messages.size > 0 %>
<span class="badge count-number m-1"><%= current_user.new_messages.size %></span>
<% end %>
<span class="user-button"> <span class="user-button">
<span class='username'> <span class='username'>
<%= current_user.display_name %> <%= current_user.display_name %>

3
app/views/layouts/_inbox.html.erb
View file

@ -1,3 +0,0 @@
<% if current_user.new_messages.size > 0 %>
<span id="inboxanchor" class="badge count-number m-1"><%= current_user.new_messages.size %></span>
<% end %>