diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-09-14 21:06:08 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-09-14 21:06:59 +0200 |
| commit | bb4a57dcfa0c107c414c39a70521cd557a8eb215 (patch) | |
| tree | 70a40286ddb371bcdaf30819c56827d89c39b220 | |
| parent | af5ff7546e622378867badccb9500764e089b01b (diff) | |
| download | Ishtar-bb4a57dcfa0c107c414c39a70521cd557a8eb215.tar.bz2 Ishtar-bb4a57dcfa0c107c414c39a70521cd557a8eb215.zip | |
Add a link to the sheet in image galleries
| -rw-r--r-- | ishtar_common/static/js/ishtar.js | 1 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/window_image.html | 13 | ||||
| -rw-r--r-- | ishtar_common/templatetags/link_to_window.py | 8 | ||||
| -rw-r--r-- | version.py | 4 |
4 files changed, 16 insertions, 10 deletions
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index 2ec398e99..2c2a72e17 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -617,6 +617,7 @@ function load_window(url, speed, on_success, no_jump){ $("#window").append(html); $("#" + last_window).show(); update_window_menu(); + $(".lg-close").click(); // close a potential lightgallery view if (!no_jump){ // jump to this window var url = location.href; diff --git a/ishtar_common/templates/ishtar/blocks/window_image.html b/ishtar_common/templates/ishtar/blocks/window_image.html index 66e6a9e2f..dcf0c2f5e 100644 --- a/ishtar_common/templates/ishtar/blocks/window_image.html +++ b/ishtar_common/templates/ishtar/blocks/window_image.html @@ -1,14 +1,16 @@ -{% load i18n %}{% if item.images.count %} +{% load i18n link_to_window %}{% if item.images.count %} {% if output == "ODT" or output == "PDF"%} {% include "ishtar/blocks/window_image_odt.html" %} {% else %} +{% trans "Sheet" as sheet_lbl %} <div class="lightgallery-captions"> {% if item.main_image %}{% with image=item.main_image %} <div id="lightgallery-{{window_id}}-caption-0"> <span class="close">×</span> {% include "ishtar/blocks/window_image_detail.html" %} - <a href="{% url 'edit-document' image.pk %}"> - {% trans "Modify" %} <i class="fa fa-pencil"></i> + {{image|simple_link_to_window:sheet_lbl}} + <a href="{% url 'edit-document' image.pk %}" class="display_details"> + <i class="fa fa-pencil"></i> <small>{% trans "Modify" %}</small> </a> </div> {% endwith %}{% endif %} @@ -16,8 +18,9 @@ <div id="lightgallery-{{window_id}}-caption-{{forloop.counter}}"> <span class="close">×</span> {% include "ishtar/blocks/window_image_detail.html" %} - <a href="{% url 'edit-document' image.pk %}"> - {% trans "Modify" %} <i class="fa fa-pencil"></i> + {{image|simple_link_to_window:sheet_lbl}} + <a href="{% url 'edit-document' image.pk %}" class="display_details"> + <i class="fa fa-pencil"></i> <small>{% trans "Modify" %}</small> </a> </div> {% endfor %} diff --git a/ishtar_common/templatetags/link_to_window.py b/ishtar_common/templatetags/link_to_window.py index 86a1978de..6f0db9dc1 100644 --- a/ishtar_common/templatetags/link_to_window.py +++ b/ishtar_common/templatetags/link_to_window.py @@ -9,17 +9,19 @@ register = Library() @register.filter -def simple_link_to_window(item): +def simple_link_to_window(item, caption=""): if not hasattr(item, 'SLUG'): return "" + if caption: + caption = " <small>{}</small>".format(caption) lock = "" if getattr(item, "locked", None): lock = ' <i class="fa fa-lock text-danger" aria-hidden="true"></i>' return mark_safe( u' <a class="display_details" href="#" ' u'onclick="load_window(\'{}\')">' - u'<i class="fa fa-info-circle" aria-hidden="true"></i>{}</a>'.format( - reverse("show-" + item.SLUG, args=[item.pk, '']), lock)) + u'<i class="fa fa-info-circle" aria-hidden="true"></i>{}{}</a>'.format( + reverse("show-" + item.SLUG, args=[item.pk, '']), lock, caption)) @register.filter diff --git a/version.py b/version.py index c2df0e9e2..b76a17701 100644 --- a/version.py +++ b/version.py @@ -1,5 +1,5 @@ -# 3.0.dev.7 -VERSION = (3, 0, 'dev', 7) +# 3.0.dev.8 +VERSION = (3, 0, 'dev', 8) def get_version(): |