diff --git a/apps/tags/__init__.py b/apps/tags/__init__.py index 5a4f3a360d..b063a64d78 100644 --- a/apps/tags/__init__.py +++ b/apps/tags/__init__.py @@ -3,8 +3,6 @@ from __future__ import absolute_import from django.utils.translation import ugettext_lazy as _ from acls.api import class_permissions -#afrom backups.api import AppBackup, ModelBackup -#from app_registry import register_app, UnableToRegister from common.utils import encapsulate from documents.models import Document from navigation.api import (bind_links, register_top_menu, @@ -15,7 +13,7 @@ from taggit.managers import TaggableManager from .links import (tag_list, tag_create, tag_attach, tag_document_remove_multiple, tag_document_list, tag_delete, tag_edit, - tag_tagged_item_list, tag_multiple_delete, tag_acl_list) + tag_tagged_item_list, tag_multiple_delete, tag_acl_list, tag_menu_link) from .permissions import (PERMISSION_TAG_ATTACH, PERMISSION_TAG_REMOVE, PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT, PERMISSION_TAG_VIEW) @@ -41,7 +39,7 @@ register_model_list_columns(Document, [ bind_links([Tag], [tag_tagged_item_list, tag_edit, tag_delete, tag_acl_list]) register_multi_item_links(['tag_list'], [tag_multiple_delete]) bind_links([Tag, 'tag_list', 'tag_create'], [tag_list, tag_create], menu_name='secondary_menu') -register_top_menu('tags', link=Link(text=_(u'tags'), view='tag_list', sprite='tag_blue', children_view_regex=[r'^tag_(list|create|delete|edit|tagged|acl)'])) +register_top_menu('tags', link=tag_menu_link) bind_links([Document], [tag_document_list], menu_name='form_header') bind_links(['document_tags', 'tag_remove', 'tag_multiple_remove', 'tag_attach'], [tag_attach], menu_name='sidebar') @@ -59,10 +57,3 @@ class_permissions(Tag, [ ]) Document.add_to_class('tags', TaggableManager()) - -#try: -# app = register_app('tags', _(u'Tags')) -#except UnableToRegister: -# pass -#else: -# AppBackup(app, [ModelBackup()]) diff --git a/apps/tags/icons.py b/apps/tags/icons.py new file mode 100644 index 0000000000..0e3e56677b --- /dev/null +++ b/apps/tags/icons.py @@ -0,0 +1,15 @@ +from __future__ import absolute_import + +from icons.literals import (TAG_BLUE, TAG_BLUE_ADD, TAG_BLUE_DELETE, TAG_BLUE_EDIT, + PAGE, LOCK) +from icons import Icon + +icon_tag_list = Icon(TAG_BLUE) +icon_tag_create = Icon(TAG_BLUE_ADD) +icon_tag_attach = Icon(TAG_BLUE_ADD) +icon_tag_document_remove = Icon(TAG_BLUE_DELETE) +icon_document_list = Icon(TAG_BLUE) +icon_tag_delete = Icon(TAG_BLUE_DELETE) +icon_tag_edit = Icon(TAG_BLUE_EDIT) +icon_tagged_item_list = Icon(PAGE) +icon_tag_acl_list = Icon(LOCK) diff --git a/apps/tags/links.py b/apps/tags/links.py index 2b9a2f986e..087d604824 100644 --- a/apps/tags/links.py +++ b/apps/tags/links.py @@ -7,15 +7,20 @@ from acls.permissions import ACLS_VIEW_ACL from .permissions import (PERMISSION_TAG_CREATE, PERMISSION_TAG_ATTACH, PERMISSION_TAG_REMOVE, PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT) +from .icons import (icon_tag_list, icon_tag_create, icon_tag_attach, icon_tag_document_remove, + icon_document_list, icon_tag_delete, icon_tag_edit, icon_tagged_item_list, + icon_tag_acl_list) -tag_list = Link(text=_(u'tag list'), view='tag_list', sprite='tag_blue') -tag_create = Link(text=_(u'create new tag'), view='tag_create', sprite='tag_blue_add', permissions=[PERMISSION_TAG_CREATE]) -tag_attach = Link(text=_(u'attach tag'), view='tag_attach', args='object.pk', sprite='tag_blue_add', permissions=[PERMISSION_TAG_ATTACH]) -tag_document_remove = Link(text=_(u'remove'), view='tag_remove', args=['object.pk', 'document.pk'], sprite='tag_blue_delete', permissions=[PERMISSION_TAG_REMOVE]) -tag_document_remove_multiple = Link(text=_(u'remove'), view='tag_multiple_remove', args='document.pk', sprite='tag_blue_delete', permissions=[PERMISSION_TAG_REMOVE]) -tag_document_list = Link(text=_(u'tags'), view='document_tags', args='object.pk', sprite='tag_blue', permissions=[PERMISSION_TAG_REMOVE, PERMISSION_TAG_ATTACH], children_view_regex=['tag']) -tag_delete = Link(text=_(u'delete'), view='tag_delete', args='object.pk', sprite='tag_blue_delete', permissions=[PERMISSION_TAG_DELETE]) -tag_edit = Link(text=_(u'edit'), view='tag_edit', args='object.pk', sprite='tag_blue_edit', permissions=[PERMISSION_TAG_EDIT]) -tag_tagged_item_list = Link(text=_(u'tagged documents'), view='tag_tagged_item_list', args='object.pk', sprite='page') -tag_multiple_delete = Link(text=_(u'delete'), view='tag_multiple_delete', sprite='tag_blue_delete', permissions=[PERMISSION_TAG_DELETE]) -tag_acl_list = Link(text=_(u'ACLs'), view='tag_acl_list', args='object.pk', sprite='lock', permissions=[ACLS_VIEW_ACL]) +tag_list = Link(text=_(u'tag list'), view='tag_list', icon=icon_tag_list) +tag_create = Link(text=_(u'create new tag'), view='tag_create', icon=icon_tag_create, permissions=[PERMISSION_TAG_CREATE]) +tag_attach = Link(text=_(u'attach tag'), view='tag_attach', args='object.pk', icon=icon_tag_attach, permissions=[PERMISSION_TAG_ATTACH]) +tag_document_remove = Link(text=_(u'remove'), view='tag_remove', args=['object.pk', 'document.pk'], icon=icon_tag_document_remove, permissions=[PERMISSION_TAG_REMOVE]) +tag_document_remove_multiple = Link(text=_(u'remove'), view='tag_multiple_remove', args='document.pk', icon=icon_tag_document_remove, permissions=[PERMISSION_TAG_REMOVE]) +tag_document_list = Link(text=_(u'tags'), view='document_tags', args='object.pk', icon=icon_document_list, permissions=[PERMISSION_TAG_REMOVE, PERMISSION_TAG_ATTACH], children_view_regex=['tag']) +tag_delete = Link(text=_(u'delete'), view='tag_delete', args='object.pk', icon=icon_tag_delete, permissions=[PERMISSION_TAG_DELETE]) +tag_multiple_delete = Link(text=_(u'delete'), view='tag_multiple_delete', icon=icon_tag_delete, permissions=[PERMISSION_TAG_DELETE]) +tag_edit = Link(text=_(u'edit'), view='tag_edit', args='object.pk', icon=icon_tag_edit, permissions=[PERMISSION_TAG_EDIT]) +tag_tagged_item_list = Link(text=_(u'tagged documents'), view='tag_tagged_item_list', args='object.pk', icon=icon_tagged_item_list) +tag_acl_list = Link(text=_(u'ACLs'), view='tag_acl_list', args='object.pk', icon=icon_tag_acl_list, permissions=[ACLS_VIEW_ACL]) + +tag_menu_link = Link(text=_(u'tags'), view='tag_list', icon=icon_tag_list, children_view_regex=[r'^tag_(list|create|delete|edit|tagged|acl)']) diff --git a/apps/tags/registry.py b/apps/tags/registry.py new file mode 100644 index 0000000000..c7e26d7ee5 --- /dev/null +++ b/apps/tags/registry.py @@ -0,0 +1,10 @@ +from __future__ import absolute_import + +from django.utils.translation import ugettext_lazy as _ + +from .icons import icon_tag_list + +label = _(u'Tagging') +#description = _(u'Central place to store and display app statistics.') +dependencies = ['app_registry', 'icons', 'navigation'] +icon = icon_tag_list diff --git a/settings.py b/settings.py index 33df5909fc..8b45130af0 100644 --- a/settings.py +++ b/settings.py @@ -173,12 +173,12 @@ INSTALLED_APPS = ( 'maintenance', 'storage', 'documents', - #'tags', + 'tags', #'folders', #'dynamic_search', #'document_comments', #'document_signatures', - #'linking', + 'linking', 'metadata', #'ocr', 'main', diff --git a/urls.py b/urls.py index d32ea4dfbf..f9a72355c1 100644 --- a/urls.py +++ b/urls.py @@ -16,11 +16,11 @@ urlpatterns = patterns('', #(r'^folders/', include('folders.urls')), #(r'^search/', include('dynamic_search.urls')), #(r'^ocr/', include('ocr.urls')), - #(r'^tags/', include('tags.urls')), + (r'^tags/', include('tags.urls')), #(r'^comments/', include('document_comments.urls')), (r'^user_management/', include('user_management.urls')), (r'^metadata/', include('metadata.urls')), - #(r'^linking/', include('linking.urls')), + (r'^linking/', include('linking.urls')), #(r'^document_indexing/', include('document_indexing.urls')), (r'^history/', include('history.urls')), (r'^converter/', include('converter.urls')),