diff --git a/mayan/apps/acls/icons.py b/mayan/apps/acls/icons.py new file mode 100644 index 0000000000..1c6a5ffbcb --- /dev/null +++ b/mayan/apps/acls/icons.py @@ -0,0 +1,5 @@ +from __future__ import absolute_import, unicode_literals + +from appearance.classes import Icon + +icon_acl_list = Icon(driver_name='fontawesome', symbol='lock') diff --git a/mayan/apps/acls/links.py b/mayan/apps/acls/links.py index e7bd35458f..6133478695 100644 --- a/mayan/apps/acls/links.py +++ b/mayan/apps/acls/links.py @@ -5,6 +5,7 @@ from django.utils.translation import ugettext_lazy as _ from navigation import Link +from .icons import icon_acl_list from .permissions import permission_acl_view, permission_acl_edit @@ -27,24 +28,25 @@ def get_kwargs_factory(variable_name): link_acl_delete = Link( - permissions=(permission_acl_edit,), permissions_related='content_object', - tags='dangerous', text=_('Delete'), view='acls:acl_delete', - args='resolved_object.pk' + args='resolved_object.pk', permissions=(permission_acl_edit,), + permissions_related='content_object', tags='dangerous', text=_('Delete'), + view='acls:acl_delete', ) link_acl_list = Link( - permissions=(permission_acl_view,), text=_('ACLs'), view='acls:acl_list', - kwargs=get_kwargs_factory('resolved_object') + kwargs=get_kwargs_factory('resolved_object'), + permissions=(permission_acl_view,), text=_('ACLs'), view='acls:acl_list' ) link_acl_list_with_icon = Link( - icon='fa fa-lock', permissions=(permission_acl_view,), text=_('ACLs'), - view='acls:acl_list', kwargs=get_kwargs_factory('resolved_object') + icon_class=icon_acl_list, kwargs=get_kwargs_factory('resolved_object'), + permissions=(permission_acl_view,), text=_('ACLs'), view='acls:acl_list' ) link_acl_create = Link( + kwargs=get_kwargs_factory('resolved_object'), permissions=(permission_acl_edit,), text=_('New ACL'), - view='acls:acl_create', kwargs=get_kwargs_factory('resolved_object') + view='acls:acl_create' ) link_acl_permissions = Link( - permissions=(permission_acl_edit,), permissions_related='content_object', - text=_('Permissions'), view='acls:acl_permissions', - args='resolved_object.pk' + args='resolved_object.pk', permissions=(permission_acl_edit,), + permissions_related='content_object', text=_('Permissions'), + view='acls:acl_permissions', ) diff --git a/mayan/apps/appearance/templates/navigation/large_button_link.html b/mayan/apps/appearance/templates/navigation/large_button_link.html index 24a71c6d9b..19c9d353c8 100644 --- a/mayan/apps/appearance/templates/navigation/large_button_link.html +++ b/mayan/apps/appearance/templates/navigation/large_button_link.html @@ -1,7 +1,7 @@
{% if link.icon %}{% endif %} - {% if link.icon_class %}{{ link.icon_class.render }}{% endif %} + {% if link.icon_class %}{{ link.icon_class.render }}{% endif %}
{{ link.text }} diff --git a/mayan/apps/authentication/icons.py b/mayan/apps/authentication/icons.py new file mode 100644 index 0000000000..10b52482cb --- /dev/null +++ b/mayan/apps/authentication/icons.py @@ -0,0 +1,6 @@ +from __future__ import absolute_import, unicode_literals + +from appearance.classes import Icon + +icon_logout = Icon(driver_name='fontawesome', symbol='sign-out-alt') +icon_password_change = Icon(driver_name='fontawesome', symbol='key') diff --git a/mayan/apps/authentication/links.py b/mayan/apps/authentication/links.py index 2c625fc477..cbcccdce1e 100644 --- a/mayan/apps/authentication/links.py +++ b/mayan/apps/authentication/links.py @@ -4,16 +4,18 @@ from django.utils.translation import ugettext_lazy as _ from navigation import Link +from .icons import icon_logout, icon_password_change + def has_usable_password(context): return context['request'].user.has_usable_password link_logout = Link( - html_extra_classes='non-ajax', icon='fa fa-sign-out-alt', + html_extra_classes='non-ajax', icon_class=icon_logout, text=_('Logout'), view='authentication:logout_view' ) link_password_change = Link( - condition=has_usable_password, icon='fa fa-key', text=_('Change password'), - view='authentication:password_change_view' + condition=has_usable_password, icon_class=icon_password_change, + text=_('Change password'), view='authentication:password_change_view' ) diff --git a/mayan/apps/cabinets/icons.py b/mayan/apps/cabinets/icons.py new file mode 100644 index 0000000000..5b77a6786c --- /dev/null +++ b/mayan/apps/cabinets/icons.py @@ -0,0 +1,6 @@ +from __future__ import absolute_import, unicode_literals + +from appearance.classes import Icon + +icon_cabinet_create = Icon(driver_name='fontawesome', symbol='plus') +icon_cabinet_list = Icon(driver_name='fontawesome', symbol='columns') diff --git a/mayan/apps/cabinets/links.py b/mayan/apps/cabinets/links.py index cd231f4b58..4432ad3a8c 100644 --- a/mayan/apps/cabinets/links.py +++ b/mayan/apps/cabinets/links.py @@ -8,6 +8,7 @@ from acls.links import link_acl_list from documents.permissions import permission_document_view from navigation import Link +from .icons import icon_cabinet_create, icon_cabinet_list from .permissions import ( permission_cabinet_add_document, permission_cabinet_create, permission_cabinet_delete, permission_cabinet_edit, @@ -17,9 +18,9 @@ from .permissions import ( # Document links link_document_cabinet_list = Link( - icon='fa fa-columns', permissions=(permission_document_view,), + args='resolved_object.pk', icon_class=icon_cabinet_list, + permissions=(permission_document_view,), text=_('Cabinets'), view='cabinets:document_cabinet_list', - args='resolved_object.pk' ) link_document_cabinet_remove = Link( args='resolved_object.pk', @@ -27,9 +28,8 @@ link_document_cabinet_remove = Link( text=_('Remove from cabinets'), view='cabinets:document_cabinet_remove' ) link_cabinet_add_document = Link( - permissions=(permission_cabinet_add_document,), + args='object.pk', permissions=(permission_cabinet_add_document,), text=_('Add to cabinets'), view='cabinets:cabinet_add_document', - args='object.pk' ) link_cabinet_add_multiple_documents = Link( text=_('Add to cabinets'), view='cabinets:cabinet_add_multiple_documents' @@ -52,25 +52,25 @@ link_custom_acl_list = copy.copy(link_acl_list) link_custom_acl_list.condition = cabinet_is_root link_cabinet_child_add = Link( - permissions=(permission_cabinet_create,), text=_('Add new level'), - view='cabinets:cabinet_child_add', args='object.pk' + args='object.pk', permissions=(permission_cabinet_create,), + text=_('Add new level'), view='cabinets:cabinet_child_add' ) link_cabinet_create = Link( - icon='fa fa-plus', permissions=(permission_cabinet_create,), + icon_class=icon_cabinet_create, permissions=(permission_cabinet_create,), text=_('Create cabinet'), view='cabinets:cabinet_create' ) link_cabinet_delete = Link( - permissions=(permission_cabinet_delete,), tags='dangerous', - text=_('Delete'), view='cabinets:cabinet_delete', args='object.pk' + args='object.pk', permissions=(permission_cabinet_delete,), + tags='dangerous', text=_('Delete'), view='cabinets:cabinet_delete' ) link_cabinet_edit = Link( - permissions=(permission_cabinet_edit,), text=_('Edit'), - view='cabinets:cabinet_edit', args='object.pk' + args='object.pk', permissions=(permission_cabinet_edit,), text=_('Edit'), + view='cabinets:cabinet_edit' ) link_cabinet_list = Link( - icon='fa fa-columns', text=_('All'), view='cabinets:cabinet_list' + icon_class=icon_cabinet_list, text=_('All'), view='cabinets:cabinet_list' ) link_cabinet_view = Link( - permissions=(permission_cabinet_view,), text=_('Details'), - view='cabinets:cabinet_view', args='object.pk' + args='object.pk', permissions=(permission_cabinet_view,), text=_('Details'), + view='cabinets:cabinet_view' ) diff --git a/mayan/apps/cabinets/menus.py b/mayan/apps/cabinets/menus.py index a68970615d..fe3abbf9b1 100644 --- a/mayan/apps/cabinets/menus.py +++ b/mayan/apps/cabinets/menus.py @@ -4,6 +4,8 @@ from django.utils.translation import ugettext_lazy as _ from navigation import Menu +from .icons import icon_cabinet_list + menu_cabinets = Menu( - icon='fa fa-columns', label=_('Cabinets'), name='cabinets menu' + icon_class=icon_cabinet_list, label=_('Cabinets'), name='cabinets menu' ) diff --git a/mayan/apps/checkouts/icons.py b/mayan/apps/checkouts/icons.py new file mode 100644 index 0000000000..751e2a6060 --- /dev/null +++ b/mayan/apps/checkouts/icons.py @@ -0,0 +1,5 @@ +from __future__ import absolute_import, unicode_literals + +from appearance.classes import Icon + +icon_checkout_info = Icon(driver_name='fontawesome', symbol='shopping-cart') diff --git a/mayan/apps/checkouts/links.py b/mayan/apps/checkouts/links.py index fbf4a8a372..99a3038f06 100644 --- a/mayan/apps/checkouts/links.py +++ b/mayan/apps/checkouts/links.py @@ -4,6 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from navigation import Link +from .icons import icon_checkout_info from .permissions import ( permission_document_checkout, permission_document_checkin, permission_document_checkin_override @@ -27,24 +28,23 @@ def is_not_checked_out(context): link_checkout_list = Link( - icon='fa fa-shopping-cart', text=_('Checkouts'), + icon_class=icon_checkout_info, text=_('Checkouts'), view='checkouts:checkout_list' ) link_checkout_document = Link( - condition=is_not_checked_out, permissions=(permission_document_checkout,), + args='object.pk', condition=is_not_checked_out, + permissions=(permission_document_checkout,), text=_('Check out document'), view='checkouts:checkout_document', - args='object.pk' ) link_checkin_document = Link( - condition=is_checked_out, permissions=( + args='object.pk', condition=is_checked_out, permissions=( permission_document_checkin, permission_document_checkin_override ), text=_('Check in document'), view='checkouts:checkin_document', - args='object.pk' + ) link_checkout_info = Link( - icon='fa fa-shopping-cart', permissions=( + args='resolved_object.pk', icon_class=icon_checkout_info, permissions=( permission_document_checkin, permission_document_checkin_override, permission_document_checkout ), text=_('Check in/out'), view='checkouts:checkout_info', - args='resolved_object.pk' ) diff --git a/mayan/apps/common/icons.py b/mayan/apps/common/icons.py new file mode 100644 index 0000000000..7072827a7e --- /dev/null +++ b/mayan/apps/common/icons.py @@ -0,0 +1,7 @@ +from __future__ import absolute_import, unicode_literals + +from appearance.classes import Icon + +icon_about = Icon(driver_name='fontawesome', symbol='info') +icon_check_version = Icon(driver_name='fontawesome', symbol='sync') +icon_current_user_details = Icon(driver_name='fontawesome', symbol='user') diff --git a/mayan/apps/common/links.py b/mayan/apps/common/links.py index 9ccce29e5d..2bb78b72db 100644 --- a/mayan/apps/common/links.py +++ b/mayan/apps/common/links.py @@ -5,6 +5,9 @@ from django.utils.translation import ugettext_lazy as _ from navigation import Link +from .icons import ( + icon_about, icon_check_version, icon_current_user_details +) from .permissions_runtime import permission_error_log_view @@ -27,14 +30,14 @@ def get_kwargs_factory(variable_name): link_about = Link( - icon='fa fa-info', text=_('About this'), view='common:about_view' + icon_class=icon_about, text=_('About this'), view='common:about_view' ) link_check_version = Link( - icon='fa fa-sync', text=_('Check for updates'), + icon_class=icon_check_version, text=_('Check for updates'), view='common:check_version_view' ) link_current_user_details = Link( - icon='fa fa-user', text=_('User details'), + icon_class=icon_current_user_details, text=_('User details'), view='common:current_user_details' ) link_current_user_edit = Link( diff --git a/mayan/apps/documents/icons.py b/mayan/apps/documents/icons.py index a6828296ed..b019ce3550 100644 --- a/mayan/apps/documents/icons.py +++ b/mayan/apps/documents/icons.py @@ -2,7 +2,9 @@ from __future__ import absolute_import, unicode_literals from appearance.classes import Icon -icon_document_preview = Icon(symbol='eye') -icon_document_properties = Icon(symbol='info') -icon_document_version_list = Icon(symbol='code-branch') -icon_document_pages = Icon(symbol='copy') +icon_document_preview = Icon(driver_name='fontawesome', symbol='eye') +icon_document_properties = Icon(driver_name='fontawesome', symbol='info') +icon_document_version_list = Icon( + driver_name='fontawesome', symbol='code-branch' +) +icon_document_pages = Icon(driver_name='fontawesome', symbol='copy') diff --git a/mayan/apps/mayan_statistics/icons.py b/mayan/apps/mayan_statistics/icons.py new file mode 100644 index 0000000000..9c0237384d --- /dev/null +++ b/mayan/apps/mayan_statistics/icons.py @@ -0,0 +1,5 @@ +from __future__ import absolute_import, unicode_literals + +from appearance.classes import Icon + +icon_statistics = Icon(driver_name='fontawesome', symbol='sort-numeric-up') diff --git a/mayan/apps/mayan_statistics/links.py b/mayan/apps/mayan_statistics/links.py index 61ac4a0f39..2b9b678729 100644 --- a/mayan/apps/mayan_statistics/links.py +++ b/mayan/apps/mayan_statistics/links.py @@ -4,6 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from navigation import Link +from .icons import icon_statistics from .permissions import permission_statistics_view # Translators: 'Queue' here is the verb, to queue a statistic to update @@ -24,6 +25,6 @@ link_namespace_list = Link( view='statistics:namespace_list' ) link_statistics = Link( - icon='fa fa-sort-numeric-up', permissions=(permission_statistics_view,), + icon_class=icon_statistics, permissions=(permission_statistics_view,), text=_('Statistics'), view='statistics:namespace_list' ) diff --git a/mayan/apps/metadata/icons.py b/mayan/apps/metadata/icons.py new file mode 100644 index 0000000000..56005aeb49 --- /dev/null +++ b/mayan/apps/metadata/icons.py @@ -0,0 +1,5 @@ +from __future__ import absolute_import, unicode_literals + +from appearance.classes import Icon + +icon_metadata_view = Icon(driver_name='fontawesome', symbol='pencil-alt') diff --git a/mayan/apps/metadata/links.py b/mayan/apps/metadata/links.py index 7b581ca49f..88f717287c 100644 --- a/mayan/apps/metadata/links.py +++ b/mayan/apps/metadata/links.py @@ -5,6 +5,7 @@ from django.utils.translation import ugettext_lazy as _ from documents.permissions import permission_document_type_edit from navigation import Link +from .icons import icon_metadata_view from .permissions import ( permission_metadata_document_add, permission_metadata_document_edit, permission_metadata_document_remove, permission_metadata_document_view, @@ -13,12 +14,12 @@ from .permissions import ( ) link_metadata_add = Link( - permissions=(permission_metadata_document_add,), text=_('Add metadata'), - view='metadata:metadata_add', args='object.pk' + args='object.pk', permissions=(permission_metadata_document_add,), + text=_('Add metadata'), view='metadata:metadata_add', ) link_metadata_edit = Link( - permissions=(permission_metadata_document_edit,), text=_('Edit metadata'), - view='metadata:metadata_edit', args='object.pk' + args='object.pk', permissions=(permission_metadata_document_edit,), + text=_('Edit metadata'), view='metadata:metadata_edit' ) link_metadata_multiple_add = Link( text=_('Add metadata'), view='metadata:metadata_multiple_add' @@ -30,38 +31,35 @@ link_metadata_multiple_remove = Link( text=_('Remove metadata'), view='metadata:metadata_multiple_remove' ) link_metadata_remove = Link( - permissions=(permission_metadata_document_remove,), + args='object.pk', permissions=(permission_metadata_document_remove,), text=_('Remove metadata'), view='metadata:metadata_remove', - args='object.pk' ) link_metadata_view = Link( - icon='fa fa-pencil-alt', permissions=(permission_metadata_document_view,), - text=_('Metadata'), view='metadata:metadata_view', - args='resolved_object.pk' + args='resolved_object.pk', icon_class=icon_metadata_view, + permissions=(permission_metadata_document_view,), text=_('Metadata'), + view='metadata:metadata_view', ) link_setup_document_type_metadata_types = Link( - permissions=(permission_document_type_edit,), text=_('Metadata types'), - view='metadata:setup_document_type_metadata_types', - args='resolved_object.pk' + args='resolved_object.pk', permissions=(permission_document_type_edit,), + text=_('Metadata types'), view='metadata:setup_document_type_metadata_types', ) link_setup_metadata_type_document_types = Link( - permissions=(permission_document_type_edit,), text=_('Document types'), - view='metadata:setup_metadata_type_document_types', - args='resolved_object.pk' + args='resolved_object.pk', permissions=(permission_document_type_edit,), + text=_('Document types'), view='metadata:setup_metadata_type_document_types', ) link_setup_metadata_type_create = Link( permissions=(permission_metadata_type_create,), text=_('Create new'), view='metadata:setup_metadata_type_create' ) link_setup_metadata_type_delete = Link( - permissions=(permission_metadata_type_delete,), tags='dangerous', - text=_('Delete'), view='metadata:setup_metadata_type_delete', - args='object.pk') + args='object.pk', permissions=(permission_metadata_type_delete,), + tags='dangerous', text=_('Delete'), view='metadata:setup_metadata_type_delete', +) link_setup_metadata_type_edit = Link( - permissions=(permission_metadata_type_edit,), text=_('Edit'), - view='metadata:setup_metadata_type_edit', args='object.pk' + args='object.pk', permissions=(permission_metadata_type_edit,), + text=_('Edit'), view='metadata:setup_metadata_type_edit' ) link_setup_metadata_type_list = Link( - icon='fa fa-pencil-alt', permissions=(permission_metadata_type_view,), + icon_class=icon_metadata_view, permissions=(permission_metadata_type_view,), text=_('Metadata types'), view='metadata:setup_metadata_type_list' ) diff --git a/mayan/apps/motd/icons.py b/mayan/apps/motd/icons.py new file mode 100644 index 0000000000..96683fed50 --- /dev/null +++ b/mayan/apps/motd/icons.py @@ -0,0 +1,5 @@ +from __future__ import absolute_import, unicode_literals + +from appearance.classes import Icon + +icon_message_list = Icon(driver_name='fontawesome', symbol='bullhorn') diff --git a/mayan/apps/motd/links.py b/mayan/apps/motd/links.py index 8b454857af..9d771469b2 100644 --- a/mayan/apps/motd/links.py +++ b/mayan/apps/motd/links.py @@ -4,6 +4,7 @@ from django.utils.translation import ugettext_lazy as _ from navigation import Link +from .icons import icon_message_list from .permissions import ( permission_message_create, permission_message_delete, permission_message_edit, @@ -14,14 +15,14 @@ link_message_create = Link( view='motd:message_create' ) link_message_delete = Link( - permissions=(permission_message_delete,), tags='dangerous', - text=_('Delete'), view='motd:message_delete', args='object.pk' + args='object.pk', permissions=(permission_message_delete,), + tags='dangerous', text=_('Delete'), view='motd:message_delete' ) link_message_edit = Link( - permissions=(permission_message_edit,), text=_('Edit'), - view='motd:message_edit', args='object.pk' + args='object.pk', permissions=(permission_message_edit,), text=_('Edit'), + view='motd:message_edit' ) link_message_list = Link( - icon='fa fa-bullhorn', text=_('Message of the day'), + icon_class=icon_message_list, text=_('Message of the day'), view='motd:message_list' )