From 51ce5ca05736cc8eca3d31e78c70d107a6c01566 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 3 Apr 2015 20:51:02 -0400 Subject: [PATCH] Consolidate navigation tags, consolidate setup and tool link --- mayan/apps/acls/apps.py | 37 +++++---- mayan/apps/acls/links.py | 27 ++++--- mayan/apps/acls/templatetags/__init__.py | 0 mayan/apps/acls/templatetags/acl_tags.py | 73 ------------------ .../appearance/templates/appearance/base.html | 15 +--- .../appearance/generic_list_subtemplate.html | 2 +- .../navigation/generic_subnavigation.html | 23 ++---- .../navigation/large_button_link.html | 4 +- mayan/apps/checkouts/apps.py | 11 ++- mayan/apps/checkouts/links.py | 6 +- mayan/apps/common/__init__.py | 1 + mayan/apps/common/apps.py | 18 +++-- mayan/apps/common/links.py | 16 ++-- mayan/apps/common/menus.py | 8 ++ mayan/apps/django_gpg/apps.py | 14 ++-- mayan/apps/django_gpg/links.py | 4 +- mayan/apps/document_acls/apps.py | 4 +- mayan/apps/document_comments/apps.py | 16 ++-- mayan/apps/document_indexing/apps.py | 19 +++-- mayan/apps/document_indexing/links.py | 2 +- mayan/apps/document_signatures/apps.py | 6 +- mayan/apps/document_states/apps.py | 21 ++--- mayan/apps/document_states/links.py | 4 +- mayan/apps/documents/apps.py | 56 +++++++------- mayan/apps/documents/links.py | 6 +- mayan/apps/dynamic_search/apps.py | 8 +- mayan/apps/dynamic_search/links.py | 8 +- mayan/apps/events/apps.py | 6 +- mayan/apps/events/links.py | 4 +- mayan/apps/folders/apps.py | 31 ++++---- mayan/apps/folders/links.py | 8 +- mayan/apps/installation/apps.py | 11 +-- mayan/apps/installation/links.py | 4 +- mayan/apps/linking/apps.py | 20 ++--- mayan/apps/linking/links.py | 3 +- mayan/apps/mailer/apps.py | 6 +- mayan/apps/mailer/links.py | 6 +- mayan/apps/main/apps.py | 14 ++-- mayan/apps/main/links.py | 8 +- mayan/apps/main/urls.py | 2 + mayan/apps/main/views.py | 21 +++++ mayan/apps/metadata/apps.py | 25 +++--- mayan/apps/metadata/links.py | 5 +- mayan/apps/navigation/__init__.py | 2 +- mayan/apps/navigation/api.py | 24 ------ mayan/apps/navigation/classes.py | 44 +++++++++-- mayan/apps/navigation/forms.py | 2 - mayan/apps/navigation/links.py | 4 - .../templatetags/navigation_tags.py | 21 +---- mayan/apps/ocr/apps.py | 19 +++-- mayan/apps/ocr/links.py | 2 +- mayan/apps/permissions/apps.py | 17 ++-- mayan/apps/permissions/links.py | 19 ++--- .../apps/permissions/templatetags/__init__.py | 0 .../templatetags/permission_tags.py | 41 ---------- mayan/apps/project_setup/__init__.py | 0 mayan/apps/project_setup/api.py | 5 -- mayan/apps/project_setup/apps.py | 16 ---- mayan/apps/project_setup/links.py | 7 -- .../locale/ar/LC_MESSAGES/django.mo | Bin 539 -> 0 bytes .../locale/ar/LC_MESSAGES/django.po | 28 ------- .../locale/bg/LC_MESSAGES/django.mo | Bin 459 -> 0 bytes .../locale/bg/LC_MESSAGES/django.po | 28 ------- .../locale/bs_BA/LC_MESSAGES/django.mo | Bin 562 -> 0 bytes .../locale/bs_BA/LC_MESSAGES/django.po | 28 ------- .../locale/da/LC_MESSAGES/django.mo | Bin 456 -> 0 bytes .../locale/da/LC_MESSAGES/django.po | 28 ------- .../locale/de_CH/LC_MESSAGES/django.mo | Bin 476 -> 0 bytes .../locale/de_CH/LC_MESSAGES/django.po | 28 ------- .../locale/de_DE/LC_MESSAGES/django.mo | Bin 568 -> 0 bytes .../locale/de_DE/LC_MESSAGES/django.po | 30 ------- .../locale/en/LC_MESSAGES/django.mo | Bin 457 -> 0 bytes .../locale/en/LC_MESSAGES/django.po | 29 ------- .../locale/es/LC_MESSAGES/django.mo | Bin 576 -> 0 bytes .../locale/es/LC_MESSAGES/django.po | 29 ------- .../locale/fa/LC_MESSAGES/django.mo | Bin 556 -> 0 bytes .../locale/fa/LC_MESSAGES/django.po | 29 ------- .../locale/fr/LC_MESSAGES/django.mo | Bin 591 -> 0 bytes .../locale/fr/LC_MESSAGES/django.po | 29 ------- .../locale/hr_HR/LC_MESSAGES/django.mo | Bin 546 -> 0 bytes .../locale/hr_HR/LC_MESSAGES/django.po | 27 ------- .../locale/hu/LC_MESSAGES/django.mo | Bin 459 -> 0 bytes .../locale/hu/LC_MESSAGES/django.po | 28 ------- .../locale/id/LC_MESSAGES/django.mo | Bin 453 -> 0 bytes .../locale/id/LC_MESSAGES/django.po | 27 ------- .../locale/it/LC_MESSAGES/django.mo | Bin 457 -> 0 bytes .../locale/it/LC_MESSAGES/django.po | 28 ------- .../locale/lv/LC_MESSAGES/django.mo | Bin 492 -> 0 bytes .../locale/lv/LC_MESSAGES/django.po | 29 ------- .../locale/nb/LC_MESSAGES/django.mo | Bin 467 -> 0 bytes .../locale/nb/LC_MESSAGES/django.po | 28 ------- .../locale/nl_NL/LC_MESSAGES/django.mo | Bin 475 -> 0 bytes .../locale/nl_NL/LC_MESSAGES/django.po | 28 ------- .../locale/pl/LC_MESSAGES/django.mo | Bin 514 -> 0 bytes .../locale/pl/LC_MESSAGES/django.po | 30 ------- .../locale/pt/LC_MESSAGES/django.mo | Bin 460 -> 0 bytes .../locale/pt/LC_MESSAGES/django.po | 29 ------- .../locale/pt_BR/LC_MESSAGES/django.mo | Bin 474 -> 0 bytes .../locale/pt_BR/LC_MESSAGES/django.po | 28 ------- .../locale/ro_RO/LC_MESSAGES/django.mo | Bin 515 -> 0 bytes .../locale/ro_RO/LC_MESSAGES/django.po | 28 ------- .../locale/ru/LC_MESSAGES/django.mo | Bin 531 -> 0 bytes .../locale/ru/LC_MESSAGES/django.po | 28 ------- .../locale/sl_SI/LC_MESSAGES/django.mo | Bin 528 -> 0 bytes .../locale/sl_SI/LC_MESSAGES/django.po | 27 ------- .../locale/sq/LC_MESSAGES/django.mo | Bin 458 -> 0 bytes .../locale/sq/LC_MESSAGES/django.po | 28 ------- .../locale/tr_TR/LC_MESSAGES/django.mo | Bin 465 -> 0 bytes .../locale/tr_TR/LC_MESSAGES/django.po | 27 ------- .../locale/vi_VN/LC_MESSAGES/django.mo | Bin 470 -> 0 bytes .../locale/vi_VN/LC_MESSAGES/django.po | 28 ------- .../locale/zh_CN/LC_MESSAGES/django.mo | Bin 464 -> 0 bytes .../locale/zh_CN/LC_MESSAGES/django.po | 28 ------- .../locale/zh_TW/LC_MESSAGES/django.mo | Bin 465 -> 0 bytes .../locale/zh_TW/LC_MESSAGES/django.po | 28 ------- mayan/apps/project_setup/urls.py | 7 -- mayan/apps/project_setup/views.py | 17 ---- mayan/apps/project_tools/__init__.py | 0 mayan/apps/project_tools/api.py | 5 -- mayan/apps/project_tools/apps.py | 16 ---- mayan/apps/project_tools/links.py | 7 -- .../locale/ar/LC_MESSAGES/django.mo | Bin 539 -> 0 bytes .../locale/ar/LC_MESSAGES/django.po | 24 ------ .../locale/bg/LC_MESSAGES/django.mo | Bin 459 -> 0 bytes .../locale/bg/LC_MESSAGES/django.po | 24 ------ .../locale/bs_BA/LC_MESSAGES/django.mo | Bin 562 -> 0 bytes .../locale/bs_BA/LC_MESSAGES/django.po | 24 ------ .../locale/da/LC_MESSAGES/django.mo | Bin 456 -> 0 bytes .../locale/da/LC_MESSAGES/django.po | 24 ------ .../locale/de_CH/LC_MESSAGES/django.mo | Bin 476 -> 0 bytes .../locale/de_CH/LC_MESSAGES/django.po | 24 ------ .../locale/de_DE/LC_MESSAGES/django.mo | Bin 530 -> 0 bytes .../locale/de_DE/LC_MESSAGES/django.po | 26 ------- .../locale/en/LC_MESSAGES/django.mo | Bin 457 -> 0 bytes .../locale/en/LC_MESSAGES/django.po | 24 ------ .../locale/es/LC_MESSAGES/django.mo | Bin 518 -> 0 bytes .../locale/es/LC_MESSAGES/django.po | 25 ------ .../locale/fa/LC_MESSAGES/django.mo | Bin 514 -> 0 bytes .../locale/fa/LC_MESSAGES/django.po | 24 ------ .../locale/fr/LC_MESSAGES/django.mo | Bin 527 -> 0 bytes .../locale/fr/LC_MESSAGES/django.po | 25 ------ .../locale/hr_HR/LC_MESSAGES/django.mo | Bin 546 -> 0 bytes .../locale/hr_HR/LC_MESSAGES/django.po | 23 ------ .../locale/hu/LC_MESSAGES/django.mo | Bin 459 -> 0 bytes .../locale/hu/LC_MESSAGES/django.po | 24 ------ .../locale/id/LC_MESSAGES/django.mo | Bin 453 -> 0 bytes .../locale/id/LC_MESSAGES/django.po | 23 ------ .../locale/it/LC_MESSAGES/django.mo | Bin 457 -> 0 bytes .../locale/it/LC_MESSAGES/django.po | 24 ------ .../locale/lv/LC_MESSAGES/django.mo | Bin 492 -> 0 bytes .../locale/lv/LC_MESSAGES/django.po | 25 ------ .../locale/nb/LC_MESSAGES/django.mo | Bin 467 -> 0 bytes .../locale/nb/LC_MESSAGES/django.po | 24 ------ .../locale/nl_NL/LC_MESSAGES/django.mo | Bin 475 -> 0 bytes .../locale/nl_NL/LC_MESSAGES/django.po | 24 ------ .../locale/pl/LC_MESSAGES/django.mo | Bin 514 -> 0 bytes .../locale/pl/LC_MESSAGES/django.po | 24 ------ .../locale/pt/LC_MESSAGES/django.mo | Bin 460 -> 0 bytes .../locale/pt/LC_MESSAGES/django.po | 24 ------ .../locale/pt_BR/LC_MESSAGES/django.mo | Bin 474 -> 0 bytes .../locale/pt_BR/LC_MESSAGES/django.po | 24 ------ .../locale/ro_RO/LC_MESSAGES/django.mo | Bin 515 -> 0 bytes .../locale/ro_RO/LC_MESSAGES/django.po | 24 ------ .../locale/ru/LC_MESSAGES/django.mo | Bin 531 -> 0 bytes .../locale/ru/LC_MESSAGES/django.po | 24 ------ .../locale/sl_SI/LC_MESSAGES/django.mo | Bin 528 -> 0 bytes .../locale/sl_SI/LC_MESSAGES/django.po | 23 ------ .../locale/sq/LC_MESSAGES/django.mo | Bin 458 -> 0 bytes .../locale/sq/LC_MESSAGES/django.po | 24 ------ .../locale/tr_TR/LC_MESSAGES/django.mo | Bin 465 -> 0 bytes .../locale/tr_TR/LC_MESSAGES/django.po | 23 ------ .../locale/vi_VN/LC_MESSAGES/django.mo | Bin 470 -> 0 bytes .../locale/vi_VN/LC_MESSAGES/django.po | 24 ------ .../locale/zh_CN/LC_MESSAGES/django.mo | Bin 464 -> 0 bytes .../locale/zh_CN/LC_MESSAGES/django.po | 24 ------ .../locale/zh_TW/LC_MESSAGES/django.mo | Bin 465 -> 0 bytes .../locale/zh_TW/LC_MESSAGES/django.po | 24 ------ mayan/apps/project_tools/urls.py | 7 -- mayan/apps/project_tools/views.py | 17 ---- mayan/apps/rest_api/apps.py | 5 +- mayan/apps/rest_api/links.py | 6 +- mayan/apps/smart_settings/apps.py | 6 +- mayan/apps/smart_settings/links.py | 4 +- mayan/apps/sources/apps.py | 26 +++---- mayan/apps/sources/links.py | 5 +- mayan/apps/statistics/apps.py | 12 ++- mayan/apps/statistics/links.py | 4 +- mayan/apps/tags/apps.py | 39 +++++----- mayan/apps/tags/links.py | 22 +++--- mayan/apps/user_management/apps.py | 24 +++--- mayan/apps/user_management/links.py | 6 +- mayan/settings/base.py | 2 - mayan/urls.py | 2 - 193 files changed, 434 insertions(+), 2074 deletions(-) delete mode 100644 mayan/apps/acls/templatetags/__init__.py delete mode 100644 mayan/apps/acls/templatetags/acl_tags.py delete mode 100644 mayan/apps/navigation/links.py delete mode 100644 mayan/apps/permissions/templatetags/__init__.py delete mode 100644 mayan/apps/permissions/templatetags/permission_tags.py delete mode 100644 mayan/apps/project_setup/__init__.py delete mode 100644 mayan/apps/project_setup/api.py delete mode 100644 mayan/apps/project_setup/apps.py delete mode 100644 mayan/apps/project_setup/links.py delete mode 100644 mayan/apps/project_setup/locale/ar/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/ar/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/bg/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/bg/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/bs_BA/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/bs_BA/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/da/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/da/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/de_CH/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/de_CH/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/de_DE/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/de_DE/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/en/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/en/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/es/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/es/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/fa/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/fa/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/fr/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/fr/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/hr_HR/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/hr_HR/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/hu/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/hu/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/id/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/id/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/it/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/it/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/lv/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/lv/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/nb/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/nb/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/nl_NL/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/nl_NL/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/pl/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/pl/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/pt/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/pt/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/pt_BR/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/pt_BR/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/ro_RO/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/ro_RO/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/ru/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/ru/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/sl_SI/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/sl_SI/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/sq/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/sq/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/tr_TR/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/tr_TR/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/vi_VN/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/vi_VN/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/zh_CN/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/zh_CN/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/locale/zh_TW/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_setup/locale/zh_TW/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_setup/urls.py delete mode 100644 mayan/apps/project_setup/views.py delete mode 100644 mayan/apps/project_tools/__init__.py delete mode 100644 mayan/apps/project_tools/api.py delete mode 100644 mayan/apps/project_tools/apps.py delete mode 100644 mayan/apps/project_tools/links.py delete mode 100644 mayan/apps/project_tools/locale/ar/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/ar/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/bg/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/bg/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/bs_BA/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/bs_BA/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/da/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/da/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/de_CH/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/de_CH/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/de_DE/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/de_DE/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/en/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/en/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/es/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/es/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/fa/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/fa/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/fr/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/fr/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/hr_HR/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/hr_HR/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/hu/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/hu/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/id/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/id/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/it/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/it/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/lv/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/lv/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/nb/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/nb/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/nl_NL/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/nl_NL/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/pl/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/pl/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/pt/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/pt/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/pt_BR/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/pt_BR/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/ro_RO/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/ro_RO/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/ru/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/ru/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/sl_SI/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/sl_SI/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/sq/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/sq/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/tr_TR/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/tr_TR/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/vi_VN/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/vi_VN/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/zh_CN/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/zh_CN/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/locale/zh_TW/LC_MESSAGES/django.mo delete mode 100644 mayan/apps/project_tools/locale/zh_TW/LC_MESSAGES/django.po delete mode 100644 mayan/apps/project_tools/urls.py delete mode 100644 mayan/apps/project_tools/views.py diff --git a/mayan/apps/acls/apps.py b/mayan/apps/acls/apps.py index a86efadb28..f634672c91 100644 --- a/mayan/apps/acls/apps.py +++ b/mayan/apps/acls/apps.py @@ -4,16 +4,18 @@ from django import apps from django.db.models.signals import post_migrate from django.utils.translation import ugettext_lazy as _ -from navigation.api import register_links -from project_setup.api import register_setup +from common.menus import ( + menu_multi_item, menu_object, menu_secondary, menu_setup, menu_sidebar +) from .classes import ( AccessHolder, AccessObject, AccessObjectClass, ClassAccessHolder ) from .links import ( - acl_class_acl_detail, acl_class_acl_list, acl_class_grant, acl_class_list, - acl_class_new_holder_for, acl_class_revoke, acl_detail, acl_grant, - acl_holder_new, acl_revoke, acl_setup_valid_classes + link_acl_class_acl_detail, link_acl_class_acl_list, link_acl_class_grant, + link_acl_class_list, link_acl_class_new_holder_for, link_acl_class_revoke, + link_acl_detail, link_acl_grant, link_acl_holder_new, link_acl_revoke, + link_acl_setup_valid_classes ) from .models import CreatorSingleton @@ -28,13 +30,22 @@ class ACLsApp(apps.AppConfig): verbose_name = _('ACLs') def ready(self): - register_links([AccessObject], [acl_holder_new], menu_name='sidebar') - register_links(AccessObjectClass, [acl_class_acl_list, acl_class_new_holder_for]) - register_links(AccessHolder, [acl_detail]) - register_links(['acls:acl_setup_valid_classes', 'acls:acl_class_acl_list', 'acls:acl_class_new_holder_for', 'acls:acl_class_acl_detail', 'acls:acl_class_multiple_grant', 'acls:acl_class_multiple_revoke'], [acl_class_list], menu_name='secondary_menu') - register_links(ClassAccessHolder, [acl_class_acl_detail]) - register_links(['acls:acl_detail'], [acl_grant, acl_revoke], menu_name='multi_item_links') - register_links(['acls:acl_class_acl_detail'], [acl_class_grant, acl_class_revoke], menu_name='multi_item_links') - register_setup(acl_setup_valid_classes) + menu_sidebar.bind_links(links=[link_acl_holder_new], sources=[AccessObject]) + #register_links(AccessObjectClass, [acl_class_acl_list, acl_class_new_holder_for]) + #register_links(AccessHolder, [acl_detail]) + #register_links(ClassAccessHolder, [acl_class_acl_detail]) + #register_links(['acls:acl_detail'], [acl_grant, acl_revoke], menu_name='multi_item_links') + #register_links(['acls:acl_class_acl_detail'], [acl_class_grant, acl_class_revoke], menu_name='multi_item_links') + menu_setup.bind_links(links=[link_acl_setup_valid_classes]) post_migrate.connect(create_creator_user, dispatch_uid='create_creator_user') + + menu_secondary.bind_links( + links=[link_acl_class_list], + sources=[ + 'acls:acl_setup_valid_classes', 'acls:acl_class_acl_list', + 'acls:acl_class_new_holder_for', 'acls:acl_class_acl_detail', + 'acls:acl_class_multiple_grant', + 'acls:acl_class_multiple_revoke' + ], + ) diff --git a/mayan/apps/acls/links.py b/mayan/apps/acls/links.py index 336eb224f3..9e0800a0af 100644 --- a/mayan/apps/acls/links.py +++ b/mayan/apps/acls/links.py @@ -2,20 +2,23 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ +from navigation import Link + from .permissions import ( ACLS_CLASS_EDIT_ACL, ACLS_CLASS_VIEW_ACL, ACLS_EDIT_ACL, ACLS_VIEW_ACL ) -acl_list = {'text': _('ACLs'), 'view': 'acls:acl_list', 'famfam': 'lock', 'permissions': [ACLS_VIEW_ACL]} -acl_detail = {'text': _('Details'), 'view': 'acls:acl_detail', 'args': ['access_object.gid', 'object.gid'], 'famfam': 'key_go', 'permissions': [ACLS_VIEW_ACL]} -acl_grant = {'text': _('Grant'), 'view': 'acls:acl_multiple_grant', 'famfam': 'key_add', 'permissions': [ACLS_EDIT_ACL]} -acl_revoke = {'text': _('Revoke'), 'view': 'acls:acl_multiple_revoke', 'famfam': 'key_delete', 'permissions': [ACLS_EDIT_ACL]} -acl_holder_new = {'text': _('New holder'), 'view': 'acls:acl_holder_new', 'args': 'access_object.gid', 'famfam': 'user', 'permissions': [ACLS_EDIT_ACL]} +link_acl_list = Link(permissions=[ACLS_VIEW_ACL], text=_('ACLs'), view='acls:acl_list') -acl_setup_valid_classes = {'text': _('Default ACLs'), 'view': 'acls:acl_setup_valid_classes', 'icon': 'fa fa-lock', 'permissions': [ACLS_CLASS_VIEW_ACL]} -acl_class_list = {'text': _('Classes'), 'view': 'acls:acl_setup_valid_classes', 'famfam': 'package', 'permissions': [ACLS_CLASS_VIEW_ACL]} -acl_class_acl_list = {'text': _('ACLs for class'), 'view': 'acls:acl_class_acl_list', 'args': 'object.gid', 'famfam': 'lock_go', 'permissions': [ACLS_CLASS_VIEW_ACL]} -acl_class_acl_detail = {'text': _('Details'), 'view': 'acls:acl_class_acl_detail', 'args': ['access_object_class.gid', 'object.gid'], 'famfam': 'key_go', 'permissions': [ACLS_CLASS_VIEW_ACL]} -acl_class_new_holder_for = {'text': _('New holder'), 'view': 'acls:acl_class_new_holder_for', 'args': 'object.gid', 'famfam': 'user', 'permissions': [ACLS_CLASS_EDIT_ACL]} -acl_class_grant = {'text': _('Grant'), 'view': 'acls:acl_class_multiple_grant', 'famfam': 'key_add', 'permissions': [ACLS_CLASS_EDIT_ACL]} -acl_class_revoke = {'text': _('Revoke'), 'view': 'acls:acl_class_multiple_revoke', 'famfam': 'key_delete', 'permissions': [ACLS_CLASS_EDIT_ACL]} +link_acl_detail = Link(permissions=[ACLS_VIEW_ACL], text=_('Details'), view='acls:acl_detail', args=['access_object.gid', 'object.gid']) +link_acl_grant = Link(permissions=[ACLS_EDIT_ACL], text=_('Grant'), view='acls:acl_multiple_grant') +link_acl_revoke = Link(permissions=[ACLS_EDIT_ACL], text=_('Revoke'), view='acls:acl_multiple_revoke') +link_acl_holder_new = Link(permissions=[ACLS_EDIT_ACL], text=_('New holder'), view='acls:acl_holder_new', args='access_object.gid') +link_acl_setup_valid_classes = Link(icon='fa fa-lock', permissions=[ACLS_CLASS_VIEW_ACL], text=_('Default ACLs'), view='acls:acl_setup_valid_classes') +link_acl_class_list = Link(permissions=[ACLS_CLASS_VIEW_ACL], text=_('Classes'), view='acls:acl_setup_valid_classes') + +link_acl_class_acl_list = Link(permissions=[ACLS_CLASS_VIEW_ACL], text=_('ACLs for class'), view='acls:acl_class_acl_list', args='object.gid') +link_acl_class_acl_detail = Link(permissions=[ACLS_CLASS_VIEW_ACL], text=_('Details'), view='acls:acl_class_acl_detail', args=['access_object_class.gid', 'object.gid']) +link_acl_class_new_holder_for = Link(permissions=[ACLS_CLASS_EDIT_ACL], text=_('New holder'), view='acls:acl_class_new_holder_for', args='object.gid') +link_acl_class_grant = Link(permissions=[ACLS_CLASS_EDIT_ACL], text=_('Grant'), view='acls:acl_class_multiple_grant') +link_acl_class_revoke = Link(permissions=[ACLS_CLASS_EDIT_ACL], text=_('Revoke'), view='acls:acl_class_multiple_revoke') diff --git a/mayan/apps/acls/templatetags/__init__.py b/mayan/apps/acls/templatetags/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mayan/apps/acls/templatetags/acl_tags.py b/mayan/apps/acls/templatetags/acl_tags.py deleted file mode 100644 index f8f8471912..0000000000 --- a/mayan/apps/acls/templatetags/acl_tags.py +++ /dev/null @@ -1,73 +0,0 @@ -from __future__ import unicode_literals - -import logging - -from django.core.exceptions import PermissionDenied -from django.template import ( - Library, Node, TemplateSyntaxError, Variable, VariableDoesNotExist -) - -from acls.models import AccessEntry - -logger = logging.getLogger(__name__) -register = Library() - - -class CheckAccessNode(Node): - def __init__(self, permission_list=None, requester=None, obj=None, *args, **kwargs): - self.requester = requester - self.permission_list = permission_list - self.obj = obj - - def render(self, context): - permission_list = Variable(self.permission_list).resolve(context) - logger.debug('permission_list: %s', ','.join([unicode(p) for p in permission_list])) - - try: - # Check access_object, useful for document_page views - obj = Variable('access_object').resolve(context) - logger.debug('access_object: %s', obj) - except VariableDoesNotExist: - try: - obj = Variable(self.obj).resolve(context) - logger.debug('obj: %s', obj) - except VariableDoesNotExist: - context['access'] = False - logger.debug('no obj, access False') - return '' - - if not permission_list: - # There is no permissions list to check against which means - # this link is available for all - context['access'] = True - return '' - - requester = Variable(self.requester).resolve(context) - logger.debug('requester: %s', requester) - - if obj: - try: - AccessEntry.objects.check_accesses(permission_list, requester, obj) - except PermissionDenied: - context['access'] = False - logger.debug('access: False') - return '' - else: - context['access'] = True - logger.debug('access: True') - return '' - else: - context['access'] = False - logger.debug('No object, access: False') - return '' - - -@register.tag -def check_access(parser, token): - try: - # Splitting by None == splitting by spaces. - tag_name, args = token.contents.split(None, 1) - except ValueError: - raise TemplateSyntaxError('%r tag requires arguments' % token.contents.split()[0]) - - return CheckAccessNode(*args.split()) diff --git a/mayan/apps/appearance/templates/appearance/base.html b/mayan/apps/appearance/templates/appearance/base.html index 37dfb115ea..861e91aead 100644 --- a/mayan/apps/appearance/templates/appearance/base.html +++ b/mayan/apps/appearance/templates/appearance/base.html @@ -107,7 +107,7 @@