diff --git a/apps/common/templates/generic_confirm.html b/apps/common/templates/generic_confirm.html index 9ce1fc0781..f340e53420 100644 --- a/apps/common/templates/generic_confirm.html +++ b/apps/common/templates/generic_confirm.html @@ -23,7 +23,12 @@ {% if next %} {% endif %} - + +
+ {% trans 'form icon' %} +
+
+ {% if title %}

{{ title }}

{% else %} @@ -47,6 +52,10 @@ {% endif %}
+ + +
+ diff --git a/apps/document_indexing/views.py b/apps/document_indexing/views.py index 08df6c2775..bb341e3222 100644 --- a/apps/document_indexing/views.py +++ b/apps/document_indexing/views.py @@ -49,6 +49,7 @@ def rebuild_index_instances(request): 'previous': previous, 'next': next, 'message': _(u'On large databases this operation may take some time to execute.'), + 'form_icon': u'folder_link.png', }, context_instance=RequestContext(request)) else: try: diff --git a/apps/documents/views.py b/apps/documents/views.py index 064ac4319c..4a7c43be74 100644 --- a/apps/documents/views.py +++ b/apps/documents/views.py @@ -443,6 +443,7 @@ def document_delete(request, document_id=None, document_id_list=None): 'delete_view': True, 'previous': previous, 'next': next, + 'form_icon': u'page_delete.png', } if len(documents) == 1: context['object'] = documents[0] @@ -726,6 +727,7 @@ def document_page_transformation_delete(request, document_page_transformation_id 'document_page': document_page_transformation.document_page}, 'previous': previous, 'web_theme_hide_menus': True, + 'form_icon': u'pencil_delete.png', }) @@ -743,6 +745,7 @@ def _find_duplicate_list(request, source_document_list=Document.objects.all(), i return render_to_response('generic_confirm.html', { 'previous': previous, 'message': _(u'On large databases this operation may take some time to execute.'), + 'form_icon': u'page_refresh.png', }, context_instance=RequestContext(request)) else: duplicated = [] @@ -800,6 +803,7 @@ def document_clear_transformations(request, document_id=None, document_id_list=N 'delete_view': True, 'previous': previous, 'next': next, + 'form_icon': u'page_paintbrush.png', } if len(documents) == 1: diff --git a/apps/folders/views.py b/apps/folders/views.py index 98a09770ba..7b8fb9560f 100644 --- a/apps/folders/views.py +++ b/apps/folders/views.py @@ -105,7 +105,8 @@ def folder_delete(request, folder_id): 'previous': previous, 'next': next, 'object': folder, - 'title': _(u'Are you sure you with to delete the folder: %s?') % folder + 'title': _(u'Are you sure you with to delete the folder: %s?') % folder, + 'form_icon': u'folder_delete.png', } return render_to_response('generic_confirm.html', context, diff --git a/apps/ocr/views.py b/apps/ocr/views.py index c689e00060..88c0b518a3 100644 --- a/apps/ocr/views.py +++ b/apps/ocr/views.py @@ -103,7 +103,8 @@ def queue_document_delete(request, queue_document_id=None, queue_document_id_lis context = { 'next': next, 'previous': previous, - 'delete_view': True + 'delete_view': True, + 'form_icon': u'hourglass_delete.png', } if len(queue_documents) == 1: @@ -260,6 +261,7 @@ def all_document_ocr_cleanup(request): 'previous': previous, 'next': next, 'message': _(u'On large databases this operation may take some time to execute.'), + 'form_icon': u'text_strikethroungh.png', }, context_instance=RequestContext(request)) else: try: diff --git a/apps/permissions/views.py b/apps/permissions/views.py index 1c5338fd7d..ca6205bd35 100644 --- a/apps/permissions/views.py +++ b/apps/permissions/views.py @@ -118,6 +118,7 @@ def role_delete(request, role_id): 'next': next, 'previous': previous, 'object_name': _(u'role'), + 'form_icon': u'medal_gold_delete.png', }) diff --git a/apps/tags/views.py b/apps/tags/views.py index 969e11a531..4c87d8ad7f 100644 --- a/apps/tags/views.py +++ b/apps/tags/views.py @@ -116,6 +116,7 @@ def tag_delete(request, tag_id=None, tag_id_list=None): 'delete_view': True, 'previous': previous, 'next': next, + 'form_icon': u'tag_blue_delete.png', } if len(tags) == 1: context['object'] = tags[0] diff --git a/apps/user_management/views.py b/apps/user_management/views.py index aad76493ec..94d95777bc 100644 --- a/apps/user_management/views.py +++ b/apps/user_management/views.py @@ -130,6 +130,7 @@ def user_delete(request, user_id=None, user_id_list=None): 'delete_view': True, 'previous': previous, 'next': next, + 'form_icon': u'user_delete.png', } if len(users) == 1: context['object'] = users[0] @@ -304,6 +305,7 @@ def group_delete(request, group_id=None, group_id_list=None): 'delete_view': True, 'previous': previous, 'next': next, + 'form_icon': u'group_delete.png', } if len(groups) == 1: context['object'] = groups[0] diff --git a/site_media/images/icons/folder_delete.png b/site_media/images/icons/folder_delete.png new file mode 100644 index 0000000000..f35b7a301e Binary files /dev/null and b/site_media/images/icons/folder_delete.png differ diff --git a/site_media/images/icons/folder_link.png b/site_media/images/icons/folder_link.png new file mode 100644 index 0000000000..06e95f2cb5 Binary files /dev/null and b/site_media/images/icons/folder_link.png differ diff --git a/site_media/images/icons/group_delete.png b/site_media/images/icons/group_delete.png new file mode 100644 index 0000000000..72f9c03984 Binary files /dev/null and b/site_media/images/icons/group_delete.png differ diff --git a/site_media/images/icons/hourglass_delete.png b/site_media/images/icons/hourglass_delete.png new file mode 100644 index 0000000000..57e4aa0cf5 Binary files /dev/null and b/site_media/images/icons/hourglass_delete.png differ diff --git a/site_media/images/icons/medal_gold_delete.png b/site_media/images/icons/medal_gold_delete.png new file mode 100644 index 0000000000..ae546e4c63 Binary files /dev/null and b/site_media/images/icons/medal_gold_delete.png differ diff --git a/site_media/images/icons/page_delete.png b/site_media/images/icons/page_delete.png new file mode 100644 index 0000000000..c7c33ddc95 Binary files /dev/null and b/site_media/images/icons/page_delete.png differ diff --git a/site_media/images/icons/page_paintbrush.png b/site_media/images/icons/page_paintbrush.png new file mode 100644 index 0000000000..c095aef11a Binary files /dev/null and b/site_media/images/icons/page_paintbrush.png differ diff --git a/site_media/images/icons/page_refresh.png b/site_media/images/icons/page_refresh.png new file mode 100644 index 0000000000..b96fc67031 Binary files /dev/null and b/site_media/images/icons/page_refresh.png differ diff --git a/site_media/images/icons/pencil_delete.png b/site_media/images/icons/pencil_delete.png new file mode 100644 index 0000000000..37b9ba6efb Binary files /dev/null and b/site_media/images/icons/pencil_delete.png differ diff --git a/site_media/images/icons/question.png b/site_media/images/icons/question.png new file mode 100644 index 0000000000..e67fe63983 Binary files /dev/null and b/site_media/images/icons/question.png differ diff --git a/site_media/images/icons/tag_blue_delete.png b/site_media/images/icons/tag_blue_delete.png new file mode 100644 index 0000000000..f3bf9e629f Binary files /dev/null and b/site_media/images/icons/tag_blue_delete.png differ diff --git a/site_media/images/icons/text_strikethroungh.png b/site_media/images/icons/text_strikethroungh.png new file mode 100644 index 0000000000..38625f84de Binary files /dev/null and b/site_media/images/icons/text_strikethroungh.png differ diff --git a/site_media/images/icons/user_delete.png b/site_media/images/icons/user_delete.png new file mode 100644 index 0000000000..ed02ebaa36 Binary files /dev/null and b/site_media/images/icons/user_delete.png differ