summaryrefslogtreecommitdiff
path: root/ishtar_common/utils.py
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common/utils.py')
-rw-r--r--ishtar_common/utils.py28
1 files changed, 16 insertions, 12 deletions
diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py
index cc01f23e7..23020ac95 100644
--- a/ishtar_common/utils.py
+++ b/ishtar_common/utils.py
@@ -129,11 +129,11 @@ def cached_label_changed(sender, **kwargs):
if hasattr(instance, '_cascade_change') and instance._cascade_change:
instance.skip_history_when_saving = True
instance.save()
- if hasattr(instance, 'update_search_vector'):
- instance.update_search_vector()
updated = False
+ if hasattr(instance, 'update_search_vector'):
+ updated = instance.update_search_vector()
if hasattr(instance, '_cached_labels_bulk_update'):
- updated = instance._cached_labels_bulk_update()
+ updated = instance._cached_labels_bulk_update() or updated
if not updated and hasattr(instance, '_get_associated_cached_labels'):
for item in instance._get_associated_cached_labels():
item._cascade_change = True
@@ -176,20 +176,24 @@ def _get_image_link(item):
if not item.thumbnail or not item.thumbnail.url:
return ""
return mark_safe(u"""
- <div class="welcome-image">
- <img src="{}"/><br/>
- <em>{} - {}</em>
- <a href="#" onclick="load_window(\'{}\')">
- <i class="fa fa-info-circle" aria-hidden="true"></i>
- </a>
- <a href="." title="{}">
- <i class="fa fa-random" aria-hidden="true"></i>
- </a><br/>
+ <div class="card">
+ <img class="card-img-top" src="{}"/>
+ <div class="card-body">
+ <h4 class="card-title">{}</h4>
+ <p class="card-text">{}</p>
+ <a href="#" onclick="load_window(\'{}\')" class="btn btn-info">
+ <i class="fa fa-info-circle" aria-hidden="true"></i> {}
+ </a>
+ <a href="." title="{}" class="btn btn-secondary">
+ <i class="fa fa-random" aria-hidden="true"></i>
+ </a><br/>
+ </div>
</div>""".format(
item.thumbnail.url,
unicode(item.__class__._meta.verbose_name),
unicode(item),
reverse(item.SHOW_URL, args=[item.pk, '']),
+ unicode(_(u"Information")),
unicode(_(u"Load another random image?"))))