diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-12-02 18:21:22 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-12-02 18:22:49 +0100 |
| commit | 07935c570053e6a4cefe07de3967c53c038f4fe3 (patch) | |
| tree | 4c4068c6c37f9abd19f5220d9f793e37a21fd8b3 /ishtar_common | |
| parent | ad8bc7234067d65751892005973def88d12bcc2c (diff) | |
| download | Ishtar-07935c570053e6a4cefe07de3967c53c038f4fe3.tar.bz2 Ishtar-07935c570053e6a4cefe07de3967c53c038f4fe3.zip | |
Sheet find: link to baskets
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/models.py | 4 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/window_nav.html | 6 | ||||
| -rw-r--r-- | ishtar_common/templatetags/window_header.py | 12 |
3 files changed, 20 insertions, 2 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index b6c8fbb3d..70f65fd68 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -3477,6 +3477,10 @@ class Basket(FullSearch, OwnPerms): def cached_label(self): return unicode(self) + @property + def full_label(self): + return u"{} - {}".format(self.label, self.user) + @classmethod def get_short_menu_class(cls, pk): return 'basket' diff --git a/ishtar_common/templates/ishtar/blocks/window_nav.html b/ishtar_common/templates/ishtar/blocks/window_nav.html index 6cd4bff40..90d58d605 100644 --- a/ishtar_common/templates/ishtar/blocks/window_nav.html +++ b/ishtar_common/templates/ishtar/blocks/window_nav.html @@ -27,9 +27,9 @@ {% endif %} </div> </div> - <div class='offset-md-6 col-md-4 text-right'> + <div class='offset-md-4 col-md-6 text-right'> {% else %} - <div class='offset-md-8 col-md-4 text-right'> + <div class='offset-md-6 col-md-6 text-right'> {% endif %} {% if pin_action and item.SLUG %} <div class="btn-group btn-group-sm" role="group" @@ -38,6 +38,8 @@ onclick='$.get("{% url "pin" item.SLUG item.pk %}", function(){load_shortcut_menu(); display_info("{% trans 'Item pined in your shortcut menu.' %}")});' title="{% trans 'Pin' %}"> <i class="fa fa-thumb-tack"></i> </a> + {% block post_pin %} + {% endblock %} </div> {% endif %} <div class="btn-group btn-group-sm" role="group" aria-label="{% trans 'Actions' %}"> diff --git a/ishtar_common/templatetags/window_header.py b/ishtar_common/templatetags/window_header.py index f6fc27082..e6325d3fb 100644 --- a/ishtar_common/templatetags/window_header.py +++ b/ishtar_common/templatetags/window_header.py @@ -32,6 +32,18 @@ def window_nav(context, item, window_id, show_url, modify_url='', histo_url='', 'pin_action': pin_action} +@register.inclusion_tag('ishtar/blocks/window_find_nav.html', + takes_context=True) +def window_find_nav(context, item, window_id, show_url, modify_url='', + histo_url='', revert_url='', previous=None, nxt=None, + pin_action=False, baskets=None): + dct = window_nav(context, item, window_id, show_url, modify_url=modify_url, + histo_url=histo_url, revert_url=revert_url, + previous=previous, nxt=nxt, pin_action=pin_action) + dct['baskets'] = baskets + return dct + + @register.inclusion_tag('ishtar/blocks/window_file_nav.html', takes_context=True) def window_file_nav(context, item, window_id, previous=None, nxt=None): |