summaryrefslogtreecommitdiff
path: root/ishtar_common/templates/base.html
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-11-08 20:33:26 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-11-08 20:34:08 +0100
commitf7f7543d603595fcfb9846f8d9eefc774bf0ecc8 (patch)
treedaa9339b15c8037f87c3601894476d5fe2f51a4e /ishtar_common/templates/base.html
parent67d5f18e392e6454dfdbddbb6c151b570c7de784 (diff)
downloadIshtar-f7f7543d603595fcfb9846f8d9eefc774bf0ecc8.tar.bz2
Ishtar-f7f7543d603595fcfb9846f8d9eefc774bf0ecc8.zip
Allow deactivation of "auto-pin" and of "pin menu" in the profile (refs #4307)
Diffstat (limited to 'ishtar_common/templates/base.html')
-rw-r--r--ishtar_common/templates/base.html8
1 files changed, 7 insertions, 1 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index ef3060a5f..a4d09c878 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -31,6 +31,7 @@
{{EXTRA_JS|safe}}
<script type='text/javascript'>
var shortcut_url = '{% url "shortcut-menu" %}';
+ {% if DISPLAY_PIN_MENU %}var show_shortcut_menu = true;{% endif %}
var alert_url = '{% url "alert-list" %}';
var get_file_url = '{% url "get-file-shortcut" %}';
var get_operation_url = '{% url "get-operation-shortcut" %}';
@@ -68,7 +69,12 @@
</head>
<body data-spy="scroll" data-target="#window-fixed-menu"{% if current_theme%} id='{{current_theme}}'{%endif%}>
{% include "navbar.html" %}
- <div id="context-menu" class="navbar navbar-expand-lg"></div>
+ <div id="context-menu" class="navbar navbar-expand-lg">
+ <div class="navbar-collapse collapse justify-content-between">
+ <span id="alert-list">
+ </span>
+ </div>
+ </div>
{% if reminders %}
<div id="reminder"><h5>{% trans "Current items" %}</h5>
{% for lbl, value in reminders %}