Finish app navigation updates

This commit is contained in:
Roberto Rosario
2015-04-05 00:14:28 -04:00
parent 94f8d8700e
commit bc50d0e321
15 changed files with 180 additions and 184 deletions

View File

@@ -5,11 +5,12 @@ from django.utils.translation import ugettext_lazy as _
from hkp import Key as KeyServerKey
from common import menu_setup
from common import menu_object, menu_setup, menu_sidebar
from .api import Key
from .links import (
key_delete, key_query, key_receive, link_key_setup, public_keys
link_key_delete, link_key_query, link_key_receive, link_key_setup,
link_public_keys
)
@@ -18,8 +19,7 @@ class DjangoGPGApp(apps.AppConfig):
verbose_name = _('Django GPG')
def ready(self):
# TODO: convert
#register_links(['django_gpg:key_delete', 'django_gpg:key_public_list', 'django_gpg:key_query'], [public_keys, key_query], menu_name='sidebar')
#register_links(Key, [key_delete])
#register_links(KeyServerKey, [key_receive])
menu_object.bind_links(links=[link_key_delete], sources=[Key])
menu_object.bind_links(links=[link_key_receive], sources=[KeyServerKey])
menu_setup.bind_links(links=[link_key_setup])
menu_sidebar.bind_links(links=[link_public_keys, link_key_query], sources=['django_gpg:key_delete', 'django_gpg:key_public_list', 'django_gpg:key_query'])

View File

@@ -9,9 +9,9 @@ from .permissions import (
PERMISSION_KEYSERVER_QUERY
)
private_keys = {'text': _('Private keys'), 'view': 'django_gpg:key_private_list', 'args': 'object.pk', 'icon': 'fa fa-key', 'permissions': [PERMISSION_KEY_VIEW]}
public_keys = {'text': _('Public keys'), 'view': 'django_gpg:key_public_list', 'args': 'object.pk', 'icon': 'fa fa-key', 'permissions': [PERMISSION_KEY_VIEW]}
key_delete = {'text': _('Delete'), 'view': 'django_gpg:key_delete', 'args': ['object.fingerprint', 'object.type'], 'famfam': 'key_delete', 'permissions': [PERMISSION_KEY_DELETE]}
key_query = {'text': _('Query keyservers'), 'view': 'django_gpg:key_query', 'famfam': 'zoom', 'permissions': [PERMISSION_KEYSERVER_QUERY]}
key_receive = {'text': _('Import'), 'view': 'django_gpg:key_receive', 'args': 'object.keyid', 'famfam': 'key_add', 'keep_query': True, 'permissions': [PERMISSION_KEY_RECEIVE]}
link_private_keys = Link(icon='fa fa-key', permissions=[PERMISSION_KEY_VIEW], text=_('Private keys'), view='django_gpg:key_private_list', args='object.pk')
link_public_keys = Link(icon='fa fa-key', permissions=[PERMISSION_KEY_VIEW], text=_('Public keys'), view='django_gpg:key_public_list', args='object.pk')
link_key_delete = Link(permissions=[PERMISSION_KEY_DELETE], text=_('Delete'), view='django_gpg:key_delete', args=['object.fingerprint', 'object.type'])
link_key_query = Link(text=_('Query keyservers'), view='django_gpg:key_query', permissions=[PERMISSION_KEYSERVER_QUERY])
link_key_receive = Link(keep_query=True, permissions=[PERMISSION_KEY_RECEIVE], text=_('Import'), view='django_gpg:key_receive', args='object.keyid')
link_key_setup = Link(icon='fa fa-key', permissions=[PERMISSION_KEY_VIEW], text=_('Key management'), view='django_gpg:key_public_list', args='object.pk')