diff --git a/apps/common/templates/generic_list_subtemplate.html b/apps/common/templates/generic_list_subtemplate.html index 438156a1df..fd91f47b5f 100644 --- a/apps/common/templates/generic_list_subtemplate.html +++ b/apps/common/templates/generic_list_subtemplate.html @@ -68,9 +68,9 @@ {% endif %} {% for column in extra_columns %} {% if column.keep_together %} -
- {{ object|object_property:column.attribute|safe|make_non_breakable }} -
+ + {{ object|object_property:column.attribute|safe|make_non_breakable }} + {% else %} {{ object|object_property:column.attribute|safe }} {% endif %} diff --git a/apps/ocr/views.py b/apps/ocr/views.py index 13217fbd65..d29e803c31 100644 --- a/apps/ocr/views.py +++ b/apps/ocr/views.py @@ -22,6 +22,15 @@ from literals import QUEUEDOCUMENT_STATE_PENDING, \ from exceptions import AlreadyQueued +def _display_thumbnail(ocr_document): + try: + preview_url = reverse('document_preview', args=[ocr_document.document.pk]) + thumbnail_url = reverse('document_thumbnail', args=[ocr_document.document.pk]) + return u'%s' % (preview_url, thumbnail_url, _(u'thumbnail')) + except: + return u'' + + def queue_document_list(request, queue_name='default'): check_permissions(request.user, 'ocr', [PERMISSION_OCR_DOCUMENT]) @@ -38,10 +47,7 @@ def queue_document_list(request, queue_name='default'): 'object_name':_(u'document queue'), 'extra_columns':[ {'name':'document', 'attribute': lambda x: '%s' % (x.document.get_absolute_url(), x.document) if hasattr(x, 'document') else _(u'Missing document.')}, - {'name':_(u'thumbnail'), 'attribute': - lambda x: '' % (reverse('document_preview', args=[x.document.id]), - reverse('document_thumbnail', args=[x.document.id])) - }, + {'name':_(u'thumbnail'), 'attribute': lambda x: _display_thumbnail(x) }, {'name':'submitted', 'attribute': lambda x: unicode(x.datetime_submitted).split('.')[0], 'keep_together':True}, {'name':'state', 'attribute': lambda x: x.get_state_display()}, {'name':'result', 'attribute':'result'}, diff --git a/apps/web_theme/templates/web_theme_base.html b/apps/web_theme/templates/web_theme_base.html index 5fbcc7180c..505eea8a46 100644 --- a/apps/web_theme/templates/web_theme_base.html +++ b/apps/web_theme/templates/web_theme_base.html @@ -7,14 +7,14 @@ - + {% block html_title %}{% endblock %} {% block keywords %}{% endblock %} -