Remove confirmation template's form icon

mayan/apps/acls/views.py

@@ -209,7 +209,6 @@ def acl_grant(request):
         'delete_view': True,
         'previous': previous,
         'next': next,
-        'form_icon': u'key_add.png',
     }
 
     context['title'] = title_prefix % {
@@ -302,7 +301,6 @@ def acl_revoke(request):
         'delete_view': True,
         'previous': previous,
         'next': next,
-        'form_icon': u'key_delete.png',
     }
 
     context['title'] = title_prefix % {
@@ -549,7 +547,6 @@ def acl_class_multiple_grant(request):
         'delete_view': True,
         'previous': previous,
         'next': next,
-        'form_icon': u'key_add.png',
     }
 
     context['title'] = title_prefix % {
@@ -628,7 +625,6 @@ def acl_class_multiple_revoke(request):
         'delete_view': True,
         'previous': previous,
         'next': next,
-        'form_icon': u'key_delete.png',
     }
 
     context['title'] = title_prefix % {

mayan/apps/checkouts/views.py

@@ -133,7 +133,6 @@ def checkin_document(request, document_pk):
         'delete_view': False,
         'previous': previous,
         'next': next,
-        'form_icon': u'basket_remove.png',
         'object': document,
     }
 

mayan/apps/django_gpg/literals.py

@@ -33,26 +33,20 @@ SIGNATURE_STATE_VALID = 'signature valid'
 SIGNATURE_STATES = {
     SIGNATURE_STATE_BAD: {
         'text': _('Bad signature.'),
-        'icon': 'cross.png'
     },
     SIGNATURE_STATE_NONE: {
         'text': _('Document not signed or invalid signature.'),
-        'icon': 'cross.png'
     },
     SIGNATURE_STATE_ERROR: {
         'text': _('Signature error.'),
-        'icon': 'cross.png'
     },
     SIGNATURE_STATE_NO_PUBLIC_KEY: {
         'text': _('Document is signed but no public key is available for verification.'),
-        'icon': 'user_silhouette.png'
     },
     SIGNATURE_STATE_GOOD: {
         'text': _('Document is signed, and signature is good.'),
-        'icon': 'document_signature.png'
     },
     SIGNATURE_STATE_VALID: {
         'text': _('Document is signed with a valid signature.'),
-        'icon': 'document_signature.png'
     },
 }

mayan/apps/django_gpg/views.py

@@ -51,7 +51,6 @@ def key_receive(request, key_id):
     return render_to_response('main/generic_confirm.html', {
         'title': _(u'Import key'),
         'message': _(u'Are you sure you wish to import key id: %s?') % key_id,
-        'form_icon': 'key_add.png',
         'next': next,
         'previous': previous,
         'submit_method': 'GET',
@@ -109,7 +108,6 @@ def key_delete(request, fingerprint, key_type):
         'title': _(u'Delete key'),
         'delete_view': True,
         'message': _(u'Are you sure you wish to delete key: %s?  If you try to delete a public key that is part of a public/private pair the private key will be deleted as well.') % key,
-        'form_icon': 'key_delete.png',
         'next': next,
         'previous': previous,
     }, context_instance=RequestContext(request))

mayan/apps/document_comments/views.py

@@ -56,7 +56,6 @@ def comment_delete(request, comment_id=None, comment_id_list=None):
         'delete_view': True,
         'previous': previous,
         'next': next,
-        'form_icon': u'comment_delete.png',
     }
     if len(comments) == 1:
         context['object'] = comments[0].content_object

mayan/apps/document_indexing/views.py

@@ -136,7 +136,6 @@ def index_setup_delete(request, index_pk):
         'previous': previous,
         'next': next,
         'title': _(u'Are you sure you with to delete the index: %s?') % index,
-        'form_icon': u'tab_delete.png',
     }
 
     return render_to_response('main/generic_confirm.html', context,
@@ -282,7 +281,6 @@ def template_node_delete(request, node_pk):
         'previous': previous,
         'next': next,
         'title': _(u'Are you sure you with to delete the index template node: %s?') % node,
-        'form_icon': u'textfield_delete.png',
         'index': node.index,
         'node': node,
 
@@ -386,7 +384,6 @@ def rebuild_index_instances(request):
             'next': next,
             'title': _(u'Are you sure you wish to rebuild all indexes?'),
             'message': _(u'On large databases this operation may take some time to execute.'),
-            'form_icon': u'folder_page.png',
         }, context_instance=RequestContext(request))
     else:
         try:

mayan/apps/document_signatures/views.py

@@ -104,7 +104,6 @@ def document_signature_upload(request, document_pk):
 
     return render_to_response('main/generic_form.html', {
         'title': _(u'Upload detached signature for: %s') % document,
-        'form_icon': 'key_delete.png',
         'next': next,
         'form': form,
         'previous': previous,
@@ -161,7 +160,6 @@ def document_signature_delete(request, document_pk):
 
     return render_to_response('main/generic_confirm.html', {
         'title': _(u'Are you sure you wish to delete the detached signature from document: %s?') % document,
-        'form_icon': 'pencil_delete.png',
         'next': next,
         'previous': previous,
         'object': document,

mayan/apps/documents/views.py

@@ -206,7 +206,6 @@ 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]
@@ -433,7 +432,6 @@ def document_update_page_count(request, document_id=None, document_id_list=None)
     context = {
         'previous': previous,
         'title': title,
-        'form_icon': u'page_white_csharp.png',
     }
 
     if len(documents) == 1:
@@ -485,7 +483,6 @@ 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:
@@ -892,7 +889,6 @@ def document_type_delete(request, document_type_id):
         'previous': previous,
         'title': _(u'Are you sure you wish to delete the document type: %s?') % document_type,
         'message': _(u'All documents of this type will be deleted too.'),
-        'form_icon': u'layout_delete.png',
     }
 
     return render_to_response('main/generic_confirm.html', context,
@@ -1013,7 +1009,6 @@ def document_type_filename_delete(request, document_type_filename_id):
         'title': _(u'Are you sure you wish to delete the filename: %(filename)s, from document type "%(document_type)s"?') % {
             'document_type': document_type_filename.document_type, 'filename': document_type_filename
         },
-        'form_icon': u'database_delete.png',
     }
 
     return render_to_response('main/generic_confirm.html', context,
@@ -1067,7 +1062,6 @@ def document_clear_image_cache(request):
     return render_to_response('main/generic_confirm.html', {
         'previous': previous,
         'title': _(u'Are you sure you wish to clear the document image cache?'),
-        'form_icon': u'camera_delete.png',
     }, context_instance=RequestContext(request))
 
 
@@ -1139,7 +1133,6 @@ def document_version_revert(request, document_version_pk):
         'object': document_version.document,
         'title': _(u'Are you sure you wish to revert to this version?'),
         'message': _(u'All later version after this one will be deleted too.'),
-        'form_icon': u'page_refresh.png',
     }, context_instance=RequestContext(request))
 
 
@@ -1264,5 +1257,4 @@ def document_page_transformation_delete(request, document_page_transformation_id
             'document_page': document_page_transformation.document_page},
         'web_theme_hide_menus': True,
         'previous': previous,
-        'form_icon': u'pencil_delete.png',
     }, context_instance=RequestContext(request))

mayan/apps/folders/views.py

@@ -121,7 +121,6 @@ def folder_delete(request, folder_id):
         'next': next,
         'object': folder,
         'title': _(u'Are you sure you with to delete the folder: %s?') % folder,
-        'form_icon': u'folder_delete.png',
     }
 
     return render_to_response('main/generic_confirm.html', context,
@@ -272,7 +271,6 @@ def folder_document_remove(request, folder_id, document_id=None, document_id_lis
         'object_name': _(u'Folder document'),
         'previous': previous,
         'next': next,
-        'form_icon': u'delete.png',
         'object': folder
     }
     if len(folder_documents) == 1:

mayan/apps/linking/views.py

@@ -211,7 +211,6 @@ def smart_link_delete(request, smart_link_pk):
         'title': _(u'Are you sure you wish to delete smart link: %s?') % smart_link,
         'next': next,
         'previous': previous,
-        'form_icon': u'link_delete.png',
     }, context_instance=RequestContext(request))
 
 
@@ -331,7 +330,6 @@ def smart_link_condition_delete(request, smart_link_condition_pk):
         'title': _(u'Are you sure you wish to delete smart link condition: "%s"?') % smart_link_condition,
         'next': next,
         'previous': previous,
-        'form_icon': u'cog_delete.png',
     }, context_instance=RequestContext(request))
 
 

mayan/apps/main/templates/main/generic_confirm.html

@@ -1,6 +1,7 @@
 {% extends 'main/base.html' %}
 
 {% load i18n %}
+{% load static %}
 
 {% block title %} :: {% trans 'Confirm' %} {{ title }}{% endblock %}
 
@@ -30,7 +31,7 @@
                 {% endif %}
 
                 <div style="float: left; margin-right: 10px;">
-                    <img style="margin-top: 12px;" src="{{ STATIC_URL }}images/icons/{{ form_icon|default:'question.png' }}" alt="{% trans 'form icon' %}" />
+                    <img style="margin-top: 12px;" src="{% static 'images/icons/question.png' %}" alt="{% trans 'question bubble' %}" />
                 </div>
                 <div style="float: left; width: 90%;">
                 {% if title %}

mayan/apps/metadata/views.py

@@ -371,7 +371,6 @@ def setup_metadata_type_delete(request, metadatatype_id):
         'previous': previous,
         'object': metadata_type,
         'title': _(u'Are you sure you wish to delete the metadata type: %s?') % metadata_type,
-        'form_icon': u'xhtml_delete.png',
     }
 
     return render_to_response('main/generic_confirm.html', context,

mayan/apps/ocr/views.py

@@ -78,7 +78,6 @@ def queue_document_delete(request, queue_document_id=None, queue_document_id_lis
         'next': next,
         'previous': previous,
         'delete_view': True,
-        'form_icon': u'hourglass_delete.png',
     }
 
     if len(queue_documents) == 1:
@@ -159,7 +158,6 @@ def re_queue_document(request, queue_document_id=None, queue_document_id_list=No
     context = {
         'next': next,
         'previous': previous,
-        'form_icon': u'hourglass_add.png',
     }
 
     if len(queue_documents) == 1:
@@ -188,7 +186,6 @@ def all_document_ocr_cleanup(request):
             'next': next,
             'title': _(u'Are you sure you wish to clean up all the pages content?'),
             '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:

mayan/apps/permissions/views.py

@@ -43,7 +43,6 @@ class RoleDeleteView(SingleObjectDeleteView):
     permissions_required = [PERMISSION_ROLE_DELETE]
     extra_context = {
         'object_name': _(u'Role'),
-        'form_icon': u'medal_gold_delete.png'
     }
     success_url = reverse_lazy('permissions:role_list')
 
@@ -155,7 +154,6 @@ def permission_grant(request):
     context = {
         'previous': previous,
         'next': next,
-        'form_icon': u'key_add.png',
     }
 
     context['title'] = _(u'Are you sure you wish to grant the %(permissions_label)s %(title_suffix)s?') % {
@@ -217,7 +215,6 @@ def permission_revoke(request):
     context = {
         'previous': previous,
         'next': next,
-        'form_icon': u'key_delete.png',
     }
 
     context['title'] = _(u'Are you sure you wish to revoke the %(permissions_label)s %(title_suffix)s?') % {

mayan/apps/tags/views.py

@@ -170,7 +170,6 @@ 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]
@@ -271,7 +270,6 @@ def tag_remove(request, document_id=None, document_id_list=None, tag_id=None, ta
     context = {
         'previous': previous,
         'next': next,
-        'form_icon': u'tag_blue_delete.png',
     }
 
     template = 'main/generic_confirm.html'

mayan/apps/user_management/views.py

@@ -135,7 +135,6 @@ 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]
@@ -336,7 +335,6 @@ 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]