Add new sidebar main menu
Add a left side menu navigation style. The main app navigation links will be displayed here. The notification, user and system tools are now displayed at the top navigation bar. Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
@@ -31,7 +31,9 @@ from .links import (
|
||||
link_setup, link_tools, separator_user_label, text_user_label
|
||||
)
|
||||
from .literals import DELETE_STALE_UPLOADS_INTERVAL, MESSAGE_SQLITE_WARNING
|
||||
from .menus import menu_about, menu_main, menu_secondary, menu_user
|
||||
from .menus import (
|
||||
menu_about, menu_secondary, menu_topbar, menu_user
|
||||
)
|
||||
from .queues import * # NOQA - Force queues registration
|
||||
from .settings import (
|
||||
setting_auto_logging, setting_production_error_log_path,
|
||||
@@ -90,7 +92,10 @@ class CommonApp(MayanAppConfig):
|
||||
warnings.warn(force_text(MESSAGE_SQLITE_WARNING))
|
||||
|
||||
Template(
|
||||
name='main_menu', template_name='appearance/main_menu.html'
|
||||
name='menu_main', template_name='appearance/menu_main.html'
|
||||
)
|
||||
Template(
|
||||
name='menu_sidebar', template_name='appearance/menu_sidebar.html'
|
||||
)
|
||||
|
||||
app.conf.beat_schedule.update(
|
||||
@@ -139,7 +144,7 @@ class CommonApp(MayanAppConfig):
|
||||
)
|
||||
)
|
||||
|
||||
menu_main.bind_links(links=(menu_about, menu_user,), position=99)
|
||||
menu_topbar.bind_links(links=(menu_about, menu_user,), position=99)
|
||||
menu_secondary.bind_links(
|
||||
links=(link_object_error_list_clear,), sources=(
|
||||
'common:object_error_list',
|
||||
|
||||
@@ -9,7 +9,7 @@ from .icons import icon_menu_about, icon_menu_user
|
||||
__all__ = (
|
||||
'menu_about', 'menu_facet', 'menu_list_facet', 'menu_main', 'menu_object',
|
||||
'menu_multi_item', 'menu_secondary', 'menu_setup', 'menu_sidebar',
|
||||
'menu_tools', 'menu_user'
|
||||
'menu_tools', 'menu_topbar', 'menu_user'
|
||||
)
|
||||
|
||||
menu_about = Menu(
|
||||
@@ -24,6 +24,7 @@ menu_secondary = Menu(name='secondary menu')
|
||||
menu_setup = Menu(name='setup menu')
|
||||
menu_sidebar = Menu(name='sidebar menu')
|
||||
menu_tools = Menu(name='tools menu')
|
||||
menu_topbar = Menu(name='menu topbar')
|
||||
menu_user = Menu(
|
||||
icon_class=icon_menu_user, name='user menu', label=_('User')
|
||||
)
|
||||
|
||||
@@ -18,7 +18,7 @@ class CommonAPITestCase(BaseAPITestCase):
|
||||
@override_settings(LANGUAGE_CODE='de')
|
||||
def test_template_detail_view(self):
|
||||
self.login_user()
|
||||
template_main_menu = Template.get(name='main_menu')
|
||||
template_main_menu = Template.get(name='menu_main')
|
||||
response = self.client.get(template_main_menu.get_absolute_url())
|
||||
|
||||
self.assertContains(
|
||||
@@ -26,7 +26,7 @@ class CommonAPITestCase(BaseAPITestCase):
|
||||
)
|
||||
|
||||
def test_template_detail_anonymous_view(self):
|
||||
template_main_menu = Template.get(name='main_menu')
|
||||
template_main_menu = Template.get(name='menu_main')
|
||||
response = self.client.get(template_main_menu.get_absolute_url())
|
||||
self.assertNotContains(
|
||||
response=response, text=TEST_TEMPLATE_RESULT, status_code=403
|
||||
|
||||
Reference in New Issue
Block a user