diff --git a/apps/icons/literals.py b/apps/icons/literals.py index 2afea26592..a9172d5147 100644 --- a/apps/icons/literals.py +++ b/apps/icons/literals.py @@ -13,6 +13,7 @@ COG = 'cog' COMPUTER_KEY = 'computer_key' CROSS = 'cross' DRAW_AIRBRUSH = 'draw_airbrush' +DOCUMENT_SIGNATURE = 'document_signature' ERROR = 'error' GROUP = 'user', GROUP_ADD = 'group_add' @@ -34,6 +35,7 @@ PICTURES = 'pictures' PILL = 'pill' PLUGIN = 'plugin' RAINBOW = 'rainbow' +ROUTING_TURNAROUND_RIGHT = 'routing_turnaround_right' SCRIPT = 'script' STORAGE = 'storage' TABLE = 'table' @@ -45,3 +47,4 @@ USER_DELETE = 'user_delete' VCARD = 'vcard' VCARD_EDIT = 'vcard_edit' WRENCH = 'wrench' +ZOOM = 'zoom' diff --git a/apps/icons/sets/fat_cow.py b/apps/icons/sets/fat_cow.py index ce011db2f2..962cb1040c 100644 --- a/apps/icons/sets/fat_cow.py +++ b/apps/icons/sets/fat_cow.py @@ -16,6 +16,7 @@ DICTIONARY = { COMPUTER_KEY: 'computer_key.png', CROSS: 'cross.png', DRAW_AIRBRUSH: 'draw_airbrush.png', + DOCUMENT_SIGNATURE: 'document_signature.png', ERROR: 'error.png', GROUP: 'group.png', GROUP_ADD: 'group_add.png', @@ -36,6 +37,7 @@ DICTIONARY = { PILL: 'pill.png', PLUGIN: 'plugin.png', RAINBOW: 'rainbow.png', + ROUTING_TURNAROUND_RIGHT: 'routing_turnaround_right.png', SCRIPT: 'script.png', STORAGE: 'storage.png', TABLE: 'table.png', @@ -47,4 +49,5 @@ DICTIONARY = { VCARD: 'vcard.png', VCARD_EDIT: 'vcard_edit.png', WRENCH: 'wrench.png', + ZOOM: 'zoom.png', } diff --git a/apps/navigation/icons.py b/apps/navigation/icons.py index 3475b215d5..4220b5e9d8 100644 --- a/apps/navigation/icons.py +++ b/apps/navigation/icons.py @@ -1,6 +1,7 @@ from __future__ import absolute_import -from icons.literals import ERROR +from icons.literals import ERROR, ROUTING_TURNAROUND_RIGHT from icons import Icon icon_error = Icon(ERROR) +icon_navigation = Icon(ROUTING_TURNAROUND_RIGHT) diff --git a/apps/navigation/registry.py b/apps/navigation/registry.py new file mode 100644 index 0000000000..3ed92f7fd8 --- /dev/null +++ b/apps/navigation/registry.py @@ -0,0 +1,13 @@ +from __future__ import absolute_import + +from django.utils.translation import ugettext_lazy as _ + +from smart_settings import LocalScope + +from .icons import icon_navigation + +name = 'navigation' +label = _(u'Navigation') +description = _(u'Handles UI navigation, menus and links.') +icon = icon_navigation +dependencies = ['app_registry', 'permissions'] diff --git a/settings.py b/settings.py index d95ed120a9..c415edcacb 100644 --- a/settings.py +++ b/settings.py @@ -160,7 +160,7 @@ INSTALLED_APPS = ( 'common', # pagination needs to go after web_theme so that the pagination template is found 'pagination', - #'django_gpg', + 'django_gpg', 'converter', #'trash', 'user_management', diff --git a/urls.py b/urls.py index 43ebe088d5..1ced9d699d 100644 --- a/urls.py +++ b/urls.py @@ -28,7 +28,7 @@ urlpatterns = patterns('', (r'^acls/', include('acls.urls')), #(r'^document_acls/', include('document_acls.urls')), #(r'^api/', include('rest_api.urls')), - #(r'^gpg/', include('django_gpg.urls')), + (r'^gpg/', include('django_gpg.urls')), #(r'^documents/signatures/', include('document_signatures.urls')), #(r'^mailer/', include('mailer.urls')), #(r'^workflows/', include('workflows.urls')),