From 41c1326498e4896b6af6861e99909e5381667750 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 23 Apr 2019 04:28:31 -0400 Subject: [PATCH] Add checkout icons, remove sidebar menu use Signed-off-by: Roberto Rosario --- mayan/apps/checkouts/apps.py | 4 ++-- mayan/apps/checkouts/icons.py | 8 ++++++++ mayan/apps/checkouts/links.py | 8 ++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/mayan/apps/checkouts/apps.py b/mayan/apps/checkouts/apps.py index 19d6e6b1ca..6c82248b3d 100644 --- a/mayan/apps/checkouts/apps.py +++ b/mayan/apps/checkouts/apps.py @@ -10,7 +10,7 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.acls.classes import ModelPermission from mayan.apps.common.apps import MayanAppConfig -from mayan.apps.common.menus import menu_facet, menu_main, menu_sidebar +from mayan.apps.common.menus import menu_facet, menu_main, menu_secondary from mayan.apps.dashboards.dashboards import dashboard_main from mayan.apps.events import ModelEventType from mayan.celery import app @@ -116,7 +116,7 @@ class CheckoutsApp(MayanAppConfig): menu_facet.bind_links(links=(link_check_out_info,), sources=(Document,)) menu_main.bind_links(links=(link_check_out_list,), position=98) - menu_sidebar.bind_links( + menu_secondary.bind_links( links=(link_check_out_document, link_check_in_document), sources=( 'checkouts:check_out_info', 'checkouts:check_out_document', diff --git a/mayan/apps/checkouts/icons.py b/mayan/apps/checkouts/icons.py index bfe9d53000..c062fd4724 100644 --- a/mayan/apps/checkouts/icons.py +++ b/mayan/apps/checkouts/icons.py @@ -2,6 +2,14 @@ from __future__ import absolute_import, unicode_literals from mayan.apps.appearance.classes import Icon +icon_check_in_document = Icon( + driver_name='fontawesome-dual', primary_symbol='shopping-cart', + secondary_symbol='minus' +) +icon_check_out_document = Icon( + driver_name='fontawesome-dual', primary_symbol='shopping-cart', + secondary_symbol='plus' +) icon_check_out_info = Icon(driver_name='fontawesome', symbol='shopping-cart') icon_dashboard_check_outs = Icon( driver_name='fontawesome', symbol='shopping-cart' diff --git a/mayan/apps/checkouts/links.py b/mayan/apps/checkouts/links.py index 16169687fb..8d2ba53f0b 100644 --- a/mayan/apps/checkouts/links.py +++ b/mayan/apps/checkouts/links.py @@ -4,7 +4,9 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.navigation import Link -from .icons import icon_check_out_info +from .icons import ( + icon_check_in_document, icon_check_out_document, icon_check_out_info +) from .permissions import ( permission_document_check_out, permission_document_check_in, permission_document_check_in_override, @@ -34,11 +36,13 @@ link_check_out_list = Link( ) link_check_out_document = Link( args='object.pk', condition=is_not_checked_out, + icon_class=icon_check_out_document, permissions=(permission_document_check_out,), text=_('Check out document'), view='checkouts:check_out_document', ) link_check_in_document = Link( - args='object.pk', condition=is_checked_out, permissions=( + args='object.pk', icon_class=icon_check_in_document, + condition=is_checked_out, permissions=( permission_document_check_in, permission_document_check_in_override ), text=_('Check in document'), view='checkouts:check_in_document', )