diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-02-22 12:16:11 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-02-22 12:16:11 +0100 |
| commit | 5c869c2648af2942a04711d2c20225ce1a0eba5c (patch) | |
| tree | 840c6d3f503e61ba0f6205f3b05377b50df7c00c | |
| parent | c66c69755e79f51f66933952ac6ac3eac361cb0f (diff) | |
| download | Ishtar-5c869c2648af2942a04711d2c20225ce1a0eba5c.tar.bz2 Ishtar-5c869c2648af2942a04711d2c20225ce1a0eba5c.zip | |
Improve navigation between sheets (HTML)
| -rw-r--r-- | ishtar_common/templates/base.html | 9 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/sheet.html | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 0b385267d..e24d4c91a 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -58,7 +58,7 @@ {% block extra_head %} {% endblock %} </head> -<body{% if current_theme%} id='{{current_theme}}'{%endif%}> +<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> {% if reminders %} @@ -76,10 +76,15 @@ {% block pre_container %}{% endblock %} <div class="container"> {% block top_content %}{% endblock %} + <nav id="window-fixed-menu" + class="navbar navbar-light flex-column"> + <a class="navbar-brand" href="#">{% trans "Sheets" %}</a> + <ul class="nav nav-pills flex-column" id="window-fixed-menu-list"> + </ul> + </nav> <div id="window_wrapper"> <div id="window" role="tablist"></div> </div> - {% if warnings %}{% for warning in warnings %} <div class="alert alert-warning alert-dismissible fade show" role="alert"> {{warning}}<button type="button" class="close" data-dismiss="alert" aria-label="Close"> diff --git a/ishtar_common/templates/ishtar/sheet.html b/ishtar_common/templates/ishtar/sheet.html index 8cfbe22ca..15737d1d7 100644 --- a/ishtar_common/templates/ishtar/sheet.html +++ b/ishtar_common/templates/ishtar/sheet.html @@ -14,7 +14,7 @@ <div class="row"> <div class="col-9"> <h5 class="mb-0"> - <a data-toggle="collapse" href="#collapse-{{window_id}}" aria-expanded="true" + <a class="card-label" data-toggle="collapse" href="#collapse-{{window_id}}" aria-expanded="true" aria-controls="collapse-{{window_id}}"> {% block head_title %}{% endblock %} </a> @@ -35,7 +35,8 @@ </a> </div> <div class='col-1 text-right'> - <a href='#' onclick='$("#{{window_id}}").hide()' title="{% trans 'Close' %}"> + <a href='#' onclick='hide_window("{{window_id}}")' + title="{% trans 'Close' %}"> <span class="fa-stack"> <i class="fa fa-circle fa-stack-2x"></i> <i class="fa fa-times fa-stack-1x fa-inverse"></i> |