diff --git a/mayan/apps/checkouts/views.py b/mayan/apps/checkouts/views.py index 02e57de9e3..df78d2987c 100644 --- a/mayan/apps/checkouts/views.py +++ b/mayan/apps/checkouts/views.py @@ -129,7 +129,6 @@ def checkin_document(request, document_pk): return HttpResponseRedirect(next) context = { - 'object_name': _(u'Document'), 'delete_view': False, 'previous': previous, 'next': next, diff --git a/mayan/apps/document_indexing/views.py b/mayan/apps/document_indexing/views.py index 5f76dc7126..1abf5dc02e 100644 --- a/mayan/apps/document_indexing/views.py +++ b/mayan/apps/document_indexing/views.py @@ -100,7 +100,6 @@ def index_setup_edit(request, index_pk): 'title': _(u'Edit index: %s') % index, 'form': form, 'index': index, - 'object_name': _(u'Index'), 'navigation_object_name': 'index', }, context_instance=RequestContext(request)) @@ -130,7 +129,6 @@ def index_setup_delete(request, index_pk): context = { 'index': index, - 'object_name': _(u'Index'), 'navigation_object_name': 'index', 'delete_view': True, 'previous': previous, @@ -155,7 +153,6 @@ def index_setup_view(request, index_pk): context = { 'object_list': object_list, 'index': index, - 'object_name': _(u'Index'), 'list_object_variable_name': 'node', 'navigation_object_name': 'index', 'title': _(u'Tree template nodes for index: %s') % index, @@ -191,7 +188,6 @@ def index_setup_document_types(request, index_pk): extra_context={ 'navigation_object_name': 'index', 'index': index, - 'object_name': _(u'Index'), } ) @@ -218,7 +214,6 @@ def template_node_create(request, parent_pk): 'title': _(u'Create child node'), 'form': form, 'index': parent_node.index, - 'object_name': _(u'Index'), 'navigation_object_name': 'index', }, context_instance=RequestContext(request)) diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index 1ea89a85c0..033b37b92c 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -201,7 +201,6 @@ def document_delete(request, document_id=None, document_id_list=None): return HttpResponseRedirect(next) context = { - 'object_name': _(u'document'), 'delete_view': True, 'previous': previous, 'next': next, @@ -507,7 +506,6 @@ def document_clear_transformations(request, document_id=None, document_id_list=N return HttpResponseRedirect(next) context = { - 'object_name': _(u'Document transformation'), 'delete_view': True, 'previous': previous, 'next': next, @@ -882,7 +880,6 @@ def document_type_edit(request, document_type_id): return render_to_response('main/generic_form.html', { 'title': _(u'Edit document type: %s') % document_type, 'form': form, - 'object_name': _(u'Document type'), 'navigation_object_name': 'document_type', 'document_type': document_type, 'next': next @@ -913,7 +910,6 @@ def document_type_delete(request, document_type_id): 'delete_view': True, 'navigation_object_name': 'document_type', 'next': next, - 'object_name': _(u'Document type'), '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.'), @@ -952,7 +948,6 @@ def document_type_filename_list(request, document_type_id): context = { 'object_list': document_type.filenames.all(), 'title': _(u'filenames for document type: %s') % document_type, - 'object_name': _(u'Document type'), 'navigation_object_name': 'document_type', 'document_type': document_type, 'list_object_variable_name': 'filename', @@ -1024,7 +1019,6 @@ def document_type_filename_delete(request, document_type_filename_id): return HttpResponseRedirect(next) context = { - 'object_name': _(u'Document type filename'), 'delete_view': True, 'previous': previous, 'next': next, diff --git a/mayan/apps/folders/views.py b/mayan/apps/folders/views.py index 5031e00347..b18260a044 100644 --- a/mayan/apps/folders/views.py +++ b/mayan/apps/folders/views.py @@ -86,7 +86,6 @@ def folder_edit(request, folder_id): 'title': _(u'Edit folder: %s') % folder, 'form': form, 'object': folder, - 'object_name': _(u'Folder'), }, context_instance=RequestContext(request)) @@ -114,7 +113,6 @@ def folder_delete(request, folder_id): return HttpResponseRedirect(next) context = { - 'object_name': _(u'Folder'), 'delete_view': True, 'previous': previous, 'next': next, @@ -145,7 +143,6 @@ class FolderDetailView(DocumentListView): 'title': _(u'Documents in folder: %s') % self.get_folder(), 'hide_links': True, 'object': self.get_folder(), - 'object_name': _(u'Folder'), } @@ -186,7 +183,6 @@ def folder_add_document(request, document_id=None, document_id_list=None): form = FolderListForm(user=request.user) context = { - 'object_name': _(u'Document'), 'form': form, 'previous': previous, 'next': next, @@ -265,7 +261,6 @@ def folder_document_remove(request, folder_id, document_id=None, document_id_lis return HttpResponseRedirect(next) context = { - 'object_name': _(u'Folder document'), 'previous': previous, 'next': next, 'object': folder diff --git a/mayan/apps/main/templates/main/base.html b/mayan/apps/main/templates/main/base.html index a4fb71e2b7..82d7b0d03b 100644 --- a/mayan/apps/main/templates/main/base.html +++ b/mayan/apps/main/templates/main/base.html @@ -318,11 +318,7 @@ {% if object_navigation_links %}
{% if navigation_object %} - {% if object_name %} -

{% blocktrans %}Actions for {{ object_name }}: {{ navigation_object }}{% endblocktrans %}

- {% else %} -

{% blocktrans %}Actions for: {{ navigation_object }}{% endblocktrans %}

- {% endif %} +

{% blocktrans %}Actions for: {{ navigation_object }}{% endblocktrans %}

{% else %}

{% trans 'Actions' %}

{% endif %} diff --git a/mayan/apps/main/templates/main/calculate_form_title.html b/mayan/apps/main/templates/main/calculate_form_title.html index 11f54c2e54..da6f1c075a 100644 --- a/mayan/apps/main/templates/main/calculate_form_title.html +++ b/mayan/apps/main/templates/main/calculate_form_title.html @@ -4,24 +4,12 @@ {{ title }} {% else %} {% if read_only %} - {% if object_name %} - {% blocktrans %}Details for {{ object_name }}: {{ object }}{% endblocktrans %} - {% else %} - {% blocktrans %}Details for: {{ object }}{% endblocktrans %} - {% endif %} + {% blocktrans %}Details for: {{ object }}{% endblocktrans %} {% else %} {% if object %} - {% if object_name %} - {% blocktrans with object as object and object_name as object_name %}Edit {{ object_name }}: {{ object }}{% endblocktrans %} - {% else %} - {% blocktrans with object as object %}Edit: {{ object }}{% endblocktrans %} - {% endif %} + {% blocktrans with object as object %}Edit: {{ object }}{% endblocktrans %} {% else %} - {% if object_name %} - {% blocktrans %}Create new {{ object_name }}{% endblocktrans %} - {% else %} - {% trans 'Create' %} - {% endif %} + {% trans 'Create' %} {% endif %} {% endif %} {% endif %} diff --git a/mayan/apps/main/templates/main/generic_confirm.html b/mayan/apps/main/templates/main/generic_confirm.html index 29dff0eb10..ffe710d5a4 100644 --- a/mayan/apps/main/templates/main/generic_confirm.html +++ b/mayan/apps/main/templates/main/generic_confirm.html @@ -38,11 +38,7 @@

{{ title }}

{% else %} {% if delete_view %} - {% if object_name %} -

{% blocktrans %}Are you sure you wish to delete {{ object_name }}: {{ object }}?{% endblocktrans %}

- {% else %} -

{% blocktrans %}Are you sure you wish to delete: {{ object }}?{% endblocktrans %}

- {% endif %} +

{% blocktrans %}Are you sure you wish to delete: {{ object }}?{% endblocktrans %}

{% endif %} {% endif %}

{{ message }}

diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py index 9a7b9a688b..2559b87466 100644 --- a/mayan/apps/metadata/views.py +++ b/mayan/apps/metadata/views.py @@ -172,7 +172,6 @@ def setup_metadata_type_edit(request, metadatatype_id): 'title': _(u'Edit metadata type: %s') % metadata_type, 'form': form, 'object': metadata_type, - 'object_name': _(u'Metadata type'), }, context_instance=RequestContext(request)) @@ -215,7 +214,6 @@ def setup_metadata_type_delete(request, metadatatype_id): return HttpResponseRedirect(next) context = { - 'object_name': _(u'Metadata type'), 'delete_view': True, 'next': next, 'previous': previous, @@ -285,7 +283,6 @@ def setup_document_type_metadata(request, document_type_id): extra_context={ 'document_type': document_type, 'navigation_object_name': 'document_type', - 'object_name': _(u'Document type'), }, grouped=True, ) diff --git a/mayan/apps/ocr/views.py b/mayan/apps/ocr/views.py index 2a097a646d..416fd9801e 100644 --- a/mayan/apps/ocr/views.py +++ b/mayan/apps/ocr/views.py @@ -31,7 +31,6 @@ def queue_document_list(request, queue_name='default'): 'title': _(u'Documents in queue: %s') % document_queue, 'hide_object': True, 'queue': document_queue, - 'object_name': _(u'Document queue'), 'navigation_object_name': 'queue', 'list_object_variable_name': 'queue_document', 'extra_columns': [ diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py index ff43b45e37..b2d4327259 100644 --- a/mayan/apps/permissions/views.py +++ b/mayan/apps/permissions/views.py @@ -31,7 +31,6 @@ from .permissions import (PERMISSION_PERMISSION_GRANT, class RoleCreateView(SingleObjectCreateView): - extra_context = {'object_name': _(u'Role')} form_class = RoleForm model = Role permissions_required = [PERMISSION_ROLE_CREATE] @@ -41,14 +40,10 @@ class RoleCreateView(SingleObjectCreateView): class RoleDeleteView(SingleObjectDeleteView): model = Role permissions_required = [PERMISSION_ROLE_DELETE] - extra_context = { - 'object_name': _(u'Role'), - } success_url = reverse_lazy('permissions:role_list') class RoleEditView(SingleObjectEditView): - extra_context = {'object_name': _(u'Role')} model = Role permissions_required = [PERMISSION_ROLE_EDIT] @@ -95,7 +90,6 @@ def role_permissions(request, role_id): return render_to_response('main/generic_detail.html', { 'form': form, 'object': role, - 'object_name': _(u'Role'), 'subtemplates_list': subtemplates_list, 'multi_select_item_properties': { 'permission_id': lambda x: x.pk, @@ -310,7 +304,6 @@ def role_members(request, role_id): right_list_title=_(u'Members of role: %s') % role, extra_context={ 'object': role, - 'object_name': _(u'Role'), }, grouped=True, ) diff --git a/mayan/apps/sources/views.py b/mayan/apps/sources/views.py index 918dc0eb4c..f5deab25d7 100644 --- a/mayan/apps/sources/views.py +++ b/mayan/apps/sources/views.py @@ -431,7 +431,6 @@ def setup_source_edit(request, source_id): 'source': source, 'navigation_object_name': 'source', 'next': next, - 'object_name': _(u'Source'), 'source_type': source.source_type, }, context_instance=RequestContext(request)) @@ -456,7 +455,6 @@ def setup_source_delete(request, source_id): context = { 'title': _(u'Are you sure you wish to delete the source: %s?') % source, 'source': source, - 'object_name': _(u'Source'), 'navigation_object_name': 'source', 'delete_view': True, 'previous': previous, @@ -502,7 +500,6 @@ def setup_source_transformation_list(request, source_id): 'object_list': SourceTransformation.transformations.get_for_object(source), 'title': _(u'Transformations for: %s') % source.fullname(), 'source': source, - 'object_name': _(u'Source'), 'navigation_object_name': 'source', 'list_object_variable_name': 'transformation', 'extra_columns': [ @@ -606,7 +603,6 @@ def setup_source_transformation_create(request, source_id): return render_to_response('main/generic_form.html', { 'form': form, 'source': source, - 'object_name': _(u'Source'), 'navigation_object_name': 'source', 'title': _(u'Create new transformation for source: %s') % source, }, context_instance=RequestContext(request)) diff --git a/mayan/apps/statistics/views.py b/mayan/apps/statistics/views.py index 32ca2eb61e..014d30af36 100644 --- a/mayan/apps/statistics/views.py +++ b/mayan/apps/statistics/views.py @@ -32,7 +32,6 @@ def namespace_details(request, namespace_id): 'object_list': namespace.statistics, 'hide_link': True, 'title': _(u'Namespace details for: %s') % namespace, - 'object_name': _(u'Namespace'), }, context_instance=RequestContext(request)) diff --git a/mayan/apps/tags/views.py b/mayan/apps/tags/views.py index 4c30f839b0..b43c45b7d1 100644 --- a/mayan/apps/tags/views.py +++ b/mayan/apps/tags/views.py @@ -88,7 +88,6 @@ def tag_attach(request, document_id=None, document_id_list=None): form = TagListForm(user=request.user) context = { - 'object_name': _(u'Document'), 'form': form, 'previous': previous, 'next': next, @@ -165,7 +164,6 @@ def tag_delete(request, tag_id=None, tag_id_list=None): return HttpResponseRedirect(next) context = { - 'object_name': _(u'Tag'), 'delete_view': True, 'previous': previous, 'next': next, @@ -209,7 +207,6 @@ def tag_edit(request, tag_id): 'title': _(u'Edit tag: %s') % tag, 'form': form, 'object': tag, - 'object_name': _(u'Tag'), }, context_instance=RequestContext(request)) @@ -225,7 +222,6 @@ class TagTaggedItemListView(DocumentListView): 'title': _(u'Documents with the tag "%s"') % self.get_tag(), 'hide_links': True, 'object': self.get_tag(), - 'object_name': _(u'Tag'), } diff --git a/mayan/apps/user_management/views.py b/mayan/apps/user_management/views.py index b1a9e4b23c..ad91ea6c3f 100644 --- a/mayan/apps/user_management/views.py +++ b/mayan/apps/user_management/views.py @@ -74,7 +74,6 @@ def user_edit(request, user_id): 'title': _(u'Edit user: %s') % user, 'form': form, 'object': user, - 'object_name': _(u'User'), }, context_instance=RequestContext(request)) @@ -130,7 +129,6 @@ def user_delete(request, user_id=None, user_id_list=None): return HttpResponseRedirect(next) context = { - 'object_name': _(u'User'), 'delete_view': True, 'previous': previous, 'next': next, @@ -192,7 +190,6 @@ def user_set_password(request, user_id=None, user_id_list=None): form = PasswordForm() context = { - 'object_name': _(u'User'), 'next': next, 'form': form, } @@ -236,7 +233,6 @@ def user_groups(request, user_id): decode_content_type=True, extra_context={ 'object': user, - 'object_name': _(u'User'), } ) @@ -278,7 +274,6 @@ def group_edit(request, group_id): 'title': _(u'Edit group: %s') % group, 'form': form, 'object': group, - 'object_name': _(u'Group'), }, context_instance=RequestContext(request)) @@ -329,7 +324,6 @@ def group_delete(request, group_id=None, group_id_list=None): return HttpResponseRedirect(next) context = { - 'object_name': _(u'Group'), 'delete_view': True, 'previous': previous, 'next': next, @@ -373,6 +367,5 @@ def group_members(request, group_id): decode_content_type=True, extra_context={ 'object': group, - 'object_name': _(u'Group'), } )