diff options
| -rw-r--r-- | ishtar/furnitures/menus.py | 61 | ||||
| -rw-r--r-- | static/media/style.css | 2 |
2 files changed, 52 insertions, 11 deletions
diff --git a/ishtar/furnitures/menus.py b/ishtar/furnitures/menus.py index 04ebb7968..6e54f407f 100644 --- a/ishtar/furnitures/menus.py +++ b/ishtar/furnitures/menus.py @@ -99,9 +99,11 @@ class Menu: model=models.IshtarUser, access_controls=['add_ishtaruser',]), ]), - SectionItem('file_management', _(u"Archaelogical file management"), - childs=[SectionItem('files', _(u"Archaelogical file"), - childs=[ + SectionItem('file_management', _(u"Archaelogical file"), + childs=[ + MenuItem('file_search', _(u"Search"), + model=models.File, + access_controls=['view_file', 'view_own_file']), MenuItem('file_creation', _(u"Creation"), model=models.File, access_controls=['add_file', 'add_own_file']), @@ -111,7 +113,6 @@ class Menu: MenuItem('file_deletion', _(u"Deletion"), model=models.File, access_controls=['delete_file', 'delete_own_file']), - ],), SectionItem('admin_act_files', _(u"Administrative act"), childs=[ MenuItem('file_administrativeact', @@ -128,9 +129,12 @@ class Menu: access_controls=['delete_file', 'delete_own_file']), ],), ]), - SectionItem('operation_management', _(u"Operation management"), - childs=[SectionItem('operation', _(u"Operation"), - childs=[ + SectionItem('operation_management', _(u"Operation"), + childs=[ + MenuItem('operation_search', _(u"Search"), + model=models.Operation, + access_controls=['view_operation', + 'view_own_operation']), MenuItem('operation_creation', _(u"Creation"), model=models.Operation, access_controls=['add_operation', @@ -147,7 +151,6 @@ class Menu: model=models.Operation, access_controls=['change_operation', 'change_own_operation']), - ],), SectionItem('admin_act_operations', _(u"Administrative act"), childs=[ @@ -168,8 +171,12 @@ class Menu: 'delete_own_operation']), ],), ]), - SectionItem('record_management', _(u"Context record management"), + SectionItem('record_management', _(u"Context record"), childs=[ + MenuItem('record_search', _(u"Search"), + model=models.ContextRecord, + access_controls=['view_contextrecord', + 'view_own_contextrecord']), MenuItem('record_creation', _(u"Creation"), model=models.ContextRecord, access_controls=['add_contextrecord', @@ -183,8 +190,12 @@ class Menu: access_controls=['delete_contextrecord', 'delete_own_contextrecord']), ]), - SectionItem('item_management', _(u"Item management"), + SectionItem('item_management', _(u"Item"), childs=[ + MenuItem('item_search', _(u"Search"), + model=models.Item, + access_controls=['view_item', + 'view_own_item']), MenuItem('item_creation', _(u"Creation"), model=models.Item, access_controls=['add_item', @@ -198,6 +209,36 @@ class Menu: access_controls=['add_treatment', 'add_own_treatment']), ]), + SectionItem('warehouse', _(u"Warehouse"), + childs=[ + MenuItem('warehouse_inventory', _(u"Inventory"), + model=models.Warehouse, + access_controls=['change_warehouse',]), + MenuItem('warehouse_recording', _(u"Recording"), + model=models.Treatment, + access_controls=['add_treatment', 'add_own_treatment']), + MenuItem('warehouse_packaging', _(u"Packaging"), + model=models.Treatment, + access_controls=['add_treatment', 'add_own_treatment']), + MenuItem('warehouse_lend', _(u"Lending"), + model=models.Treatment, + access_controls=['add_treatment', 'add_own_treatment']), + ]), + SectionItem('dashboard', _(u"Dashboard"), + childs=[ + MenuItem('dashboard_file', _(u"Files"), + model=models.File, + access_controls=['change_file',]), + MenuItem('dashboard_operation', _(u"Operations"), + model=models.Operation, + access_controls=['change_operation',]), + MenuItem('dashboard_treatment', _(u"Treatments"), + model=models.Treatment, + access_controls=['change_treatment',]), + MenuItem('dashboard_warehouse', _(u"Warehouse"), + model=models.Warehouse, + access_controls=['change_warehouse',]), + ]), ] self.items = {} diff --git a/static/media/style.css b/static/media/style.css index 3323def19..1d07afc9f 100644 --- a/static/media/style.css +++ b/static/media/style.css @@ -91,7 +91,7 @@ div#main_menu{ } div#main_menu ul{ - padding-left:1.5em; + padding-left:0.8em; cursor:pointer; list-style:none; } |