invenio-app-rdm 12.0.0.dev8__py2.py3-none-any.whl → 14.0.0b1.dev8__py2.py3-none-any.whl

invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm/administration_page.html

@@ -0,0 +1,15 @@
+{# -*- coding: utf-8 -*-
+
+  This file is part of Invenio.
+  Copyright (C) 2015-2025 CERN.
+
+  Invenio is free software; you can redistribute it and/or modify it
+  under the terms of the MIT License; see LICENSE file for more details.
+#}
+
+{%- extends "invenio_theme/page.html" -%}
+
+{%- block css %}
+  {{ super()}}
+  <link rel="stylesheet" href="/static/css/json-diff-kit.css">
+{%- endblock css %}

invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm/default_static_page.html

@@ -1,6 +1,7 @@
 {#
 # This file is part of Invenio.
-# Copyright (C) 2022 CERN.
+# Copyright (C) 2022-2024 CERN.
+# Copyright (C) 2024 KTH Royal Institute of Technology.
 #
 # Invenio is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -19,15 +20,14 @@
 {% extends config.PAGES_BASE_TEMPLATE %}
 
 {% set title = page.title %}
-
 {% block page_body %}
 <div class="ui container rel-mt-2">
-	<div class="row">
-	  	<div class="col-xs-12">
-			<h1>{{ page.title|safe }}</h1>
-			{% block content %}{{ page.content|safe }}{% endblock %}
-		</div>
-	</div>
+    <div class="row">
+          <div class="col-xs-12 rich-input-content">
+            <h1>{{ page.title|safe }}</h1>
+            {% block content %}{{ page.content|safe }}{% endblock %}
+        </div>
+    </div>
 </div>
 {% endblock %}
 

invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm/files_integrity_report/email/files_integrity_report.html

@@ -2,30 +2,30 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2022 CERN.
+# Copyright (C) 2024 KTH Royal Institute of Technology.
+# Copyright (C) 2025 Northwestern University.
 #
 # Invenio App RDM is free software; you can redistribute it and/or modify it
 # under the terms of the MIT License; see LICENSE file for more details.
 -#}
 
-{% set BASE_URL = config.SITE_UI_URL %}
-
-The following files were flagged as 'unhealthy'. This means that the checksum check failed or timed out. Please take any action if needed.
+{{ _("The following files were flagged as 'unhealthy'. This means that the checksum check failed or timed out. Please take any action if needed.") }}
 
 {% for entry in entries -%}
-{{ "ID: %s" | format(entry.file.id) }}
-{{ "URI: %s" | format(entry.file.uri) }}
+{{ _("ID: {}").format(entry.file.id) }}
+{{ _("URI: {}").format(entry.file.uri) }}
 {%- if 'filename' in entry %}
-{{ "Name: %s" | format(entry.filename) }}
+{{ _("Name: {}").format(entry.filename) }}
 {%- endif %}
-{{ "Created: %s" | format(entry.file.created) }}
-{{ "Checksum: %s" | format(entry.file.checksum) }}
-{{ "Last check date: %s" | format(entry.file.last_check_at) }}
-{{ "Last check FAILED with result: %s" | format(entry.file.last_check) }}
+{{ _("Created: {}").format(entry.file.created) }}
+{{ _("Checksum: {}").format(entry.file.checksum) }}
+{{ _("Last check date: {}").format(entry.file.last_check_at) }}
+{{ _("Last check FAILED with result: {}").format(entry.file.last_check) }}
 {%- if 'record' in entry %}
-{{ "Record: %s/records/%s" | format(BASE_URL, entry.record.id) }}
+{{ _("Record: {}").format(invenio_url_for("invenio_app_rdm_records.record_detail", pid_value=entry.record.id)) }}
 {%- endif %}
 {%- if 'draft' in entry %}
-{{ "Draft: %s/uploads/%s" | format(BASE_URL, entry.draft.id) }}
+{{ _("Draft: {}").format(invenio_url_for("invenio_app_rdm_records.deposit_edit", pid_value=entry.draft.id)) }}
 {%- endif %}
 {{ "-" * 80 }}
 {% endfor %}

invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm/footer.html

@@ -2,87 +2,45 @@
 
   Copyright (C) 2019-2020 CERN.
   Copyright (C) 2019-2020 Northwestern University.
-  Copyright (C)      2021 Graz University of Technology.
+  Copyright (C) 2021 Graz University of Technology.
+  Copyright (C) 2024 KTH Royal Institute of Technology.
 
   Invenio App RDM is free software; you can redistribute it and/or modify it
   under the terms of the MIT License; see LICENSE file for more details.
 #}
+{%- block footer_top %}
 
-<footer id="rdm-footer-element">
-  {%- block footer_top %}
-    <div class="footer-top">
-      <div class="ui container">
-        {%- block footer_top_left %}
-          <div class="ui grid">
-            <div class="rdm-footer five wide tablet two wide computer column">
-              <h2 class="ui small header">{{_("About InvenioRDM")}}</h2>
-              {% trans invenio_rdm="http://inveniosoftware.org/products/rdm" %}
-              <p><a href="{{invenio_rdm}}">Product page</a></p>
-              {% endtrans %}
-              {% trans invenio_rdm_features="https://inveniosoftware.org/products/rdm/#features" %}
-              <p><a href="{{invenio_rdm_features}}">Features</a></p>
-              {% endtrans %}
-              {% trans invenio_rdm_roadmap="https://inveniosoftware.org/products/rdm/roadmap/" %}
-              <p><a href="{{invenio_rdm_roadmap}}">Roadmap</a></p>
-              {% endtrans %}
-              {% trans invenio_rdm_demo_site="http://inveniordm.web.cern.ch" %}
-              <p><a href="{{invenio_rdm_demo_site}}">Demo site</a></p>
-              {% endtrans %}
-            </div>
-            <div class="rdm-footer five wide tablet two wide computer column">
-              <h2 class="ui small header">{{_ ("Get involved")}}</h2>
-              {% trans invenio_rdm_gh="https://github.com/inveniosoftware/invenio-app-rdm" %}
-              <p><a href="{{invenio_rdm_gh}}">GitHub</a></p>
-              {% endtrans %}
-              {% trans invenio_rdm_milestones="https://github.com/inveniosoftware/product-rdm" %}
-              <p><a href="{{invenio_rdm_milestones}}">Project Milestones</a></p>
-              {% endtrans %}
-              {% trans invenio_rdm_docs_site="http://inveniordm.docs.cern.ch" %}
-              <p><a href="{{invenio_rdm_docs_site}}">Documentation</a></p>
-              {% endtrans %}
-            </div>
-            <div class="rdm-footer five wide tablet two wide computer column">
-              <h2 class="ui small header">{{_ ("Community")}}</h2>
-              {% trans invenio_rdm_chatroom="https://discord.gg/8qatqBC" %}
-              <p><a href="{{invenio_rdm_chatroom}}">Chatroom</a></p>
-              {% endtrans %}
-              {% trans invenio_rdm_talk="https://invenio-talk.web.cern.ch/c/projects/invenio-rdm" %}
-              <p><a href="{{invenio_rdm_talk}}">Forum</a></p>
-              {% endtrans %}
-              {% trans invenio_events="https://inveniosoftware.org/events/" %}
-              <p><a href="{{invenio_events}}">Events & training</a></p>
-              {% endtrans %}
-            </div>
-
-          {%- endblock footer_top_left %}
-          <div class="six wide column right aligned">
-            {%- block footer_top_right %}
-            {%- endblock footer_top_right %}
-          </div>
+  <div class="footer-top">
+    <div class="ui container app-rdm-footer">
+      {%- block footer_top_left %}
+        <div class="ui grid app-rdm-footer">
+        <div class="rdm-footer five wide tablet two wide computer column">
+          <h2 class="ui small header">{{ _("About InvenioRDM") }}</h2>
+          <p><a href="http://inveniosoftware.org/products/rdm">{{ _("Product page") }}</a></p>
+          <p><a href="https://inveniosoftware.org/products/rdm/#features">{{ _("Features") }}</a></p>
+          <p><a href="https://inveniosoftware.org/products/rdm/roadmap/">{{ _("Roadmap") }}</a></p>
+          <p><a href="http://inveniordm.web.cern.ch">{{ _("Demo site") }}</a></p>
         </div>
-      </div>
-    </div>
-    {%- endblock footer_top %}
-    {%- block footer_bottom %}
-    <div class="footer-bottom sub-footer">
-      <div class="ui container">
-        <div class="ui grid">
-          <div class="eight wide column left middle aligned">
-            {%- block footer_bottom_left %}
-            {% trans invenio_rdm="http://inveniosoftware.org/products/rdm" %}Powered by <a
-              href="{{invenio_rdm}}">InvenioRDM</a>{% endtrans %}
-            {%- endblock footer_bottom_left %}
-          </div>
-          <div class="eight wide column right aligned">
-            {%- block footer_bottom_right %}
-            {%- if config.I18N_LANGUAGES %}
-            {% from "invenio_i18n/macros/language_selector.html" import language_selector_dropdown %}
-            {{ language_selector_dropdown() }}
-            {%- endif %}
-            {%- endblock footer_bottom_right %}
-          </div>
+        <div class="rdm-footer five wide tablet two wide computer column">
+          <h2 class="ui small header">{{ _("Get involved") }}</h2>
+          <p><a href="https://github.com/inveniosoftware/invenio-app-rdm">{{ _("GitHub") }}</a></p>
+          <p><a href="https://github.com/inveniosoftware/product-rdm">{{ _("Project Milestones") }}</a></p>
+          <p><a href="http://inveniordm.docs.cern.ch">{{ _("Documentation") }}</a></p>
+        </div>
+        <div class="rdm-footer five wide tablet two wide computer column">
+          <h2 class="ui small header">{{ _("Community") }}</h2>
+          <p><a href="https://discord.gg/8qatqBC">{{ _("Chatroom") }}</a></p>
+          <p><a href="https://invenio-talk.web.cern.ch/c/projects/invenio-rdm">{{ _("Forum") }}</a></p>
+          <p><a href="https://inveniosoftware.org/events/">{{ _("Events & training") }}</a></p>
         </div>
+
+      {%- endblock footer_top_left %}
+      <div class="six wide column right aligned">
+        {%- block footer_top_right %}
+        {%- endblock footer_top_right %}
+      </div>
       </div>
     </div>
-    {%- endblock footer_bottom %}
-</footer>
+
+  </div>
+{%- endblock footer_top %}

invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm/header.html

@@ -1,8 +1,9 @@
 {#
     -*- coding: utf-8 -*-
-    Copyright (C) 2019-2020 CERN.
+    Copyright (C) 2019-2025 CERN.
     Copyright (C) 2019-2020 Northwestern University.
     Copyright (C) 2021 New York University.
+    Copyright (C) 2024 KTH Royal Institute of Technology.
 
     Invenio App RDM is free software; you can redistribute it and/or modify it
     under the terms of the MIT License; see LICENSE file for more details.
@@ -10,16 +11,23 @@
 
 <div>
   <header class="theme header">
-    {%- block site_banner %}
-    {%- endblock site_banner %}
+    {%- block user_impersonation %}
+      {%- if '_impersonator_id' in session %}
+        <div class="ui negative flashed top attached manage m-0 big message">
+          <div class="ui container">
+            <div class="header">
+              <i class="ui spy big icon"></i><strong>{{ _('Impersonated session') }}</strong>
+            </div>
+            {{ _('You must logout after you finish with you inquiry!') }}
+          </div>
+        </div>
+      {%- endif %}
+    {%- endblock user_impersonation %}
+
     <div class="outer-navbar">
-      {%- block banner %}
-        {% from 'invenio_banners/banner.html' import banner %}
-        {{ banner() }}
-      {%- endblock banner %}
       {%- block navbar %}
       <div class="ui container invenio-header-container">
-        <nav id="invenio-nav" class="ui inverted menu borderless stackable p-0">
+        <nav id="invenio-nav" class="ui inverted menu borderless p-0">
           <div class="item logo p-0">
             {%- block navbar_header %}
                 {%- block brand %}
@@ -27,7 +35,7 @@
                     <a class="logo-link" href="/">
                       <img class="ui image rdm-logo"
                             src="{{ url_for('static', filename=config.THEME_LOGO) }}"
-                            alt="{{ _(config.THEME_SITENAME) }}"/>
+                            alt="{{ _(config.THEME_SITENAME) }} {{ _('home') }}"/>
                     </a>
                   {%- else %}
                     <a class="logo" href="/">{{ _(config.THEME_SITENAME) }}</a>
@@ -45,12 +53,11 @@
               aria-expanded="false"
               aria-controls="invenio-menu"
             >
-              <span class="navicon"></span>
+              <span class="navicon" aria-hidden="true"></span>
             </button>
           </div>
 
-          <div
-            role="menu"
+          <nav
             id="invenio-menu"
             aria-labelledby="rdm-burger-menu-icon"
             class="ui fluid menu borderless mobile-hidden"
@@ -60,7 +67,7 @@
               class="ui button transparent"
               aria-label="{{ _('Close menu') }}"
             >
-              <span class="navicon"></span>
+              <span class="navicon" aria-hidden="true"></span>
             </button>
 
             {%- if config.THEME_SEARCHBAR %}
@@ -74,29 +81,31 @@
                 {%- if item.children %}
                   <div class="item">
                     <div class="dropdown {{ ' active' if item.active else '' }}">
-                      <a role="menuitem"
-                         class="dropdown-toggle"
-                         data-toggle="dropdown"
-                         aria-haspopup="true"
-                         aria-expanded="false"
-                         href="{{ item.url }}"
+                      <a role="button"
+                        class="dropdown-toggle"
+                        data-toggle="dropdown"
+                        aria-haspopup="menu"
+                        aria-expanded="false"
+                        href="{{ item.url }}"
                       >
                         {{ item.text|safe }}
                         <b class="caret"></b>
                       </a>
-                      <ul class="dropdown-menu">{{ loop(item.children|sort(attribute='order')) }}</ul>
+                      <ul role="menu" class="dropdown-menu">
+                        {{ loop(item.children|sort(attribute='order')) }}
+                      </ul>
                     </div>
                   </div>
                 {%- else %}
-                  <div class="{{' item active' if item.active and loop.depth == 0 else ' item' }}">
-                    <a role="menuitem" href="{{ item.url }}">{{ item.text|safe }}</a>
+                  <div class="{{ 'item active' if item.active else 'item' }}">
+                    <a href="{{ item.url }}">{{ item.text|safe }}</a>
                   </div>
                 {%- endif %}
               {%- endfor %}
 
               {% for item in current_menu.submenu('actions').children|sort(attribute='order') if item.visible recursive %}
-                <div class="item">
-                  <a role="menuitem" href="{{ item.url }}">{{ item.text|safe }}</a>
+                <div class="{{ 'item active' if item.active else 'item' }}">
+                  <a href="{{ item.url }}">{{ item.text|safe }}</a>
                 </div>
               {% endfor %}
             {%- endblock navbar_nav %}
@@ -105,8 +114,8 @@
               <div class="right menu item">
                 {%- if config.ACCOUNTS and current_user.is_authenticated %}
                   {% for item in current_menu.submenu('notifications').children|sort(attribute='order') if item.visible recursive %}
-                    <div class="item inbox">
-                      <a role="menuitem" href="{{ item.url }}" aria-label="{{ _("Requests") }}">
+                    <div class="{{'item active' if item.active else 'item' }} inbox">
+                      <a href="{{ item.url }}" aria-label="{{ _('Requests') }}">
                         <i class="fitted inbox icon inverted"></i>
                         <span class="mobile tablet only inline">{{ _("Inbox") }}</span>
                       </a>
@@ -116,11 +125,17 @@
                 {%- include config.THEME_HEADER_LOGIN_TEMPLATE %}
               </div>
             {%- endblock navbar_right %}
-          </div>
+          </nav>
         </nav>
+      </div>
       {%- endblock navbar %}
     </div>
 
+    {%- block site_banner %}
+      {% from 'invenio_banners/banner.html' import banner %}
+      {{ banner() }}
+    {%- endblock site_banner %}
+
     {%- block flashmessages %}
       {%- from "invenio_theme/macros/messages.html" import flashed_messages with context -%}
       {{ flashed_messages() }}

invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm/header_frontpage.html

@@ -33,8 +33,10 @@
           <div class="sixteen wide mobile eight wide computer column center aligned">
             <form action="{{ url_for('invenio_search_ui.search') }}" class="ui form" role="search">
               <div class="ui fluid big action input">
-                <input type="text" name="q" class="form-control" placeholder="{{ _('Search') }}">
-                <button type="submit" class="ui icon search button" aria-label="{{ _('Search') }}"><i class="search icon"></i></button>
+                <input type="text" name="q" class="form-control" aria-label="{{ _('Search') }}" placeholder="{{ _('Search') }}">
+                <button type="submit" class="ui icon search button" aria-label="{{ _('Search') }}">
+                  <i class="search icon"></i>
+                </button>
               </div>
             </form>
           </div>

invenio_app_rdm/theme/templates/semantic-ui/invenio_app_rdm/header_login.html

@@ -9,126 +9,157 @@
 
 
 {%- if config.ACCOUNTS %}
-    {%- if not current_user.is_authenticated %}
-        <form>
-            <a href="{{ url_for_security('login', next=request.path) }}"
-               class="ui button">
-                <i class="sign-in icon"></i>
-                {{ _('Log in') }}</a>
-            {% if security.registerable %}
-                <a href="{{ url_for_security('register') }}" class="ui button signup">
-                    <i class="edit outline icon"></i>
-                    {{ _('Sign up') }}
-                </a>
-            {% endif %}
-        </form>
-    {%- else %}
+  {%- if not current_user.is_authenticated %}
+    <form>
+      <a
+        href="{{ url_for_security('login', next=request.path) }}"
+        class="ui button auth-button" aria-busy="false" aria-live="polite" aria-label="{{ _('Log in') }}"
+      >
+        <i class="sign-in icon auth-icon" aria-hidden="true"></i>
+        {{ _('Log in') }}
+      </a>
+      {% if security.registerable %}
+        <a href="{{ url_for_security('register') }}" class="ui button signup">
+          <i class="edit outline icon"></i>
+          {{ _('Sign up') }}
+        </a>
+      {% endif %}
+    </form>
+  {%- else %}
+
+    {# Desktop Quick-create ("plus") menu #}
+    {%- set plus_menu_items = current_menu.submenu('plus').children %}
+    {%- if plus_menu_items %}
+      <div
+        id="quick-create-dropdown"
+        class="rdm-plus-menu rdm-plus-menu-responsive ui dropdown floating pr-15 computer only"
+      >
+        <a
+          id="quick-create-dropdown-btn"
+          role="button"
+          aria-controls="quick-create-menu"
+          aria-label="{{ _('Quick create') }}"
+          aria-expanded="false"
+          aria-haspopup="menu"
+        >
+          <i class="fitted plus icon inverted" aria-hidden="true"></i>
+          <i class="fitted dropdown icon inverted" aria-hidden="true"></i>
+        </a>
+
+        <div role="menu" aria-labelledby="quick-create-dropdown-btn" id="quick-create-menu" class="menu">
+          {%- for item in plus_menu_items if item.visible %}
+            <a role="menuitem" class="item" href="{{ item.url }}">{{ item.text|safe }}</a>
+          {%- endfor %}
+        </div>
+      </div>
+
+      {# Mobile/Tablet Quick create ("plus") menu #}
+      <div class="sub-menu mobile tablet only">
+        <h2 class="ui small header">{{ _("Actions") }}</h2>
+        <div role="menu">
+          {%- for item in plus_menu_items if item.visible %}
+            <a role="menuitem" class="item" href="{{ item.url }}">
+              <i class="plus icon"></i>
+              {{ item.text|safe }}
+            </a>
+          {%- endfor %}
+        </div>
+      </div>
+    {% endif %}
+
+    {# Desktop Account dropdown menu #}
+    {%- if config.USERPROFILES %}
+      <div id="user-profile-dropdown" class="ui floating dropdown computer only">
+        <button
+          id="user-profile-dropdown-btn"
+          class="ui right labeled right floated icon button text"
+          aria-controls="user-profile-menu"
+          aria-expanded="false"
+          aria-haspopup="menu"
+          aria-label="{{ _('My account') }}"
+        >
+          <span>
+            <i class="user icon" aria-hidden="true"></i>
+            {{ current_user.email|truncate(31,true) }}
+          </span>
+          <i class="dropdown icon" aria-hidden="true"></i>
+        </button>
+
+        <div
+          id="user-profile-menu"
+          class="ui menu"
+          role="menu"
+          aria-labelledby="user-profile-dropdown-btn"
+        >
+          {%- for item in current_menu.submenu('settings').children if item.visible %}
+            <a role="menuitem" class="item" href="{{ item.url }}" tabindex="-1">
+              {{ item.text|safe }}
+            </a>
+          {%- endfor %}
 
-        {# Quick-create ("plus") menu #}
-        {%- set plus_menu_items = current_menu.submenu('plus').children %}
-        {%- if plus_menu_items %}
-          <div role="menuitem" class="rdm-plus-menu rdm-plus-menu-responsive ui dropdown floating pr-15 computer only" aria-label="{{ _("Quick create") }}">
-              <i class="fitted plus icon inverted"></i>
-              <i class="fitted dropdown icon inverted"></i>
-              <div class="menu">
-                  {%- for item in plus_menu_items if item.visible %}
-                    <a class="item" href="{{ item.url }}">{{ item.text|safe }} </a>
-                  {%- endfor %}
-              </div>
-          </div>
-
-          <div class="sub-menu mobile tablet only">
-            <h2 class="ui small header">{{ _("Actions") }}</h2>
-
-            {%- for item in plus_menu_items if item.visible %}
-              <a role="menuitem" class="item" href="{{ item.url }}">
-                <i class="plus icon"></i>
-                {{ item.text|safe }}
-              </a>
-            {%- endfor %}
-          </div>
-        {% endif %}
-
-        {%- if config.USERPROFILES %}
-          <div role="menuitem" id="user-profile-dropdown" class="ui floating dropdown computer only">
-            <button id="user-profile-dropdown-btn"
-                    class="ui right labeled right floated icon button text"
-                    aria-controls="user-profile-menu"
-                    aria-expanded="false"
-                    aria-haspopup="menu"
-                    aria-label="{{ _('My account') }}"
-            >
-              <span>
-                <i class="user icon"></i>
-                {{ current_user.email|truncate(31,true) }}
-              </span>
-              <i class="dropdown icon"></i>
-            </button>
-
-            <div id="user-profile-menu"
-                 class="ui menu"
-                 role="menu"
-                 aria-labelledby="user-profile-dropdown-btn"
-            >
-              {%- for item in current_menu.submenu('settings').children if item.visible %}
-                <a role="menuitem" class="item" href="{{ item.url }}" tabindex="-1">
-                  {{ item.text|safe }}
-                </a>
-              {%- endfor %}
-
-              <div class="ui divider"></div>
-
-              {% set ns = namespace(admin_menu=False) %} 
-              {%- for item in current_menu.submenu('profile-admin').children if item.visible %}
-                {% set ns.admin_menu = True %}
-                <a role="menuitem" class="item" href="{{ item.url }}" tabindex="-1">
-                  {{ item.text|safe }}
-                </a>
-              {%- endfor %} 
-              {% if ns.admin_menu %}
-                <div class="ui divider"></div>
-              {% endif %}  
-
-              <a role="menuitem" class="item" href="{{ url_for_security('logout') }}" tabindex="-1">
-                <i class="sign-out icon"></i>
-                {{ _('Log out') }}
-              </a>
-            </div>
-          </div>
-
-          <div class="sub-menu mobile tablet only">
-            <h2 class="ui small header">{{ _("My account") }}</h2>
-
-            {%- for item in current_menu.submenu('settings').children if item.visible %}
-              <a role="menuitem" class="item" href="{{ item.url }}">
-                {{ item.text|safe }}
-              </a>
-            {%- endfor %}
+          <div class="ui divider"></div>
 
+          {% set ns = namespace(admin_menu=False) %}
+          {%- for item in current_menu.submenu('profile-admin').children if item.visible %}
+            {% set ns.admin_menu = True %}
+            <a role="menuitem" class="item" href="{{ item.url }}" tabindex="-1">
+              {{ item.text|safe }}
+            </a>
+          {%- endfor %}
+          {% if ns.admin_menu %}
             <div class="ui divider"></div>
+          {% endif %}
+
+          <a role="menuitem" href="{{ url_for_security('logout') }}" tabindex="-1"
+            class="item auth-button" aria-busy="false" aria-live="polite" aria-label="{{ _('Log out') }}"
+          >
+            <i class="sign-out icon auth-icon" aria-hidden="true"></i>
+            {{ _('Log out') }}
+          </a>
+        </div>
+      </div>
+
+      {# Mobile/Tablet Account menu #}
+      <div class="sub-menu mobile tablet only">
+        <h2 class="ui small header">{{ _("My account") }}</h2>
 
-            {% set ns = namespace(admin_menu=False) %} 
-            {%- for item in current_menu.submenu('profile-admin').children if item.visible %}
-              {% set ns.admin_menu = True %}
-              <a role="menuitem" class="item" href="{{ item.url }}">
-                {{ item.text|safe }}
-              </a>
-            {%- endfor %}
-            {% if ns.admin_menu %}
-              <div class="ui divider"></div>
-            {% endif %}  
-
-            <a role="menuitem" class="item" href="{{ url_for_security('logout') }}">
-                <i class="sign-out icon"></i>
-                {{ _('Log out') }}
+        <div role="menu">
+          {%- for item in current_menu.submenu('settings').children if item.visible %}
+            <a role="menuitem" class="item" href="{{ item.url }}">
+              {{ item.text|safe }}
             </a>
-          </div>
+          {%- endfor %}
 
-        {%- else %}
-          <a role="button" href="{{ url_for_security('logout') }}" class="ui button">
-            <i class="sign-out icon"></i>
+          <div class="ui divider"></div>
+
+          {% set ns = namespace(admin_menu=False) %}
+          {%- for item in current_menu.submenu('profile-admin').children if item.visible %}
+            {% set ns.admin_menu = True %}
+            <a role="menuitem" class="item" href="{{ item.url }}">
+              {{ item.text|safe }}
+            </a>
+          {%- endfor %}
+
+          {% if ns.admin_menu %}
+            <div class="ui divider"></div>
+          {% endif %}
+
+          <a role="menuitem" href="{{ url_for_security('logout') }}"
+            class="item auth-button" aria-busy="false" aria-live="polite" aria-label="{{ _('Log out') }}"
+          >
+            <i class="sign-out icon auth-icon" aria-hidden="true"></i>
             {{ _('Log out') }}
           </a>
-        {%- endif %}
+        </div>
+      </div>
+
+    {%- else %}
+      <a role="button" href="{{ url_for_security('logout') }}"
+        class="ui button auth-button" aria-busy="false" aria-live="polite" aria-label="{{ _('Log out') }}"
+      >
+        <i class="sign-out icon auth-icon" aria-hidden="true"></i>
+        {{ _('Log out') }}
+      </a>
     {%- endif %}
+  {%- endif %}
 {%- endif %}