From 7e28f88b86a19ea4e9b366594dac5f6b340edfdb Mon Sep 17 00:00:00 2001 From: Naomi Date: Fri, 9 Nov 2018 14:59:25 +0000 Subject: [PATCH] Shiny new menu at top of screen! --- config/install/system.menu.openc.yml | 7 -- .../system.menu.opencase-add-actors.yml | 7 -- config/install/system.menu.opencase-admin.yml | 7 -- config/install/system.menu.opencase.yml | 7 ++ config/install/views.view.cases.yml | 2 +- .../opencase_defaults.links.menu.yml | 8 +-- .../block.block.opencase_reporting_menu.yml | 23 ------- .../opencase_reporting.links.menu.yml | 6 ++ opencase.links.menu.yml | 65 ++++++++++++++----- 9 files changed, 68 insertions(+), 64 deletions(-) delete mode 100644 config/install/system.menu.openc.yml delete mode 100644 config/install/system.menu.opencase-add-actors.yml delete mode 100644 config/install/system.menu.opencase-admin.yml create mode 100644 config/install/system.menu.opencase.yml delete mode 100644 modules/opencase_reporting/config/install/block.block.opencase_reporting_menu.yml create mode 100644 modules/opencase_reporting/opencase_reporting.links.menu.yml diff --git a/config/install/system.menu.openc.yml b/config/install/system.menu.openc.yml deleted file mode 100644 index c225cfd..0000000 --- a/config/install/system.menu.openc.yml +++ /dev/null @@ -1,7 +0,0 @@ -langcode: en -status: true -dependencies: { } -id: openc -label: 'OpenCase Global' -description: '' -locked: false diff --git a/config/install/system.menu.opencase-add-actors.yml b/config/install/system.menu.opencase-add-actors.yml deleted file mode 100644 index 052e638..0000000 --- a/config/install/system.menu.opencase-add-actors.yml +++ /dev/null @@ -1,7 +0,0 @@ -langcode: en -status: true -dependencies: { } -id: opencase-add-actors -label: 'OpenCase Add Actors' -description: '' -locked: false diff --git a/config/install/system.menu.opencase-admin.yml b/config/install/system.menu.opencase-admin.yml deleted file mode 100644 index 0252841..0000000 --- a/config/install/system.menu.opencase-admin.yml +++ /dev/null @@ -1,7 +0,0 @@ -langcode: en -status: true -dependencies: { } -id: opencase-admin -label: 'OpenCase Admin' -description: 'Administer OpenCase ' -locked: false diff --git a/config/install/system.menu.opencase.yml b/config/install/system.menu.opencase.yml new file mode 100644 index 0000000..b2baecb --- /dev/null +++ b/config/install/system.menu.opencase.yml @@ -0,0 +1,7 @@ +langcode: en +status: true +dependencies: { } +id: opencase +label: OpenCase +description: 'Main navigation menu for OpenCase' +locked: false diff --git a/config/install/views.view.cases.yml b/config/install/views.view.cases.yml index 1343167..1443c55 100644 --- a/config/install/views.view.cases.yml +++ b/config/install/views.view.cases.yml @@ -584,7 +584,7 @@ display: admin_label: '' empty: true tokenize: false - content: "

No cases found

\n

You do not have access to any existing cases.

\n

To add a new case, first search for the person you want to add a case to. If they are not on the system yet you can add them using the Add actors menu in the left sidebar.

\n" + content: "

No cases found

\n

You do not have access to any existing cases.

\n

To add a new case, first search for the person you want to add a case to. If they are not on the system yet you can add them using the Add People. menu.

\n" plugin_id: text_custom cache_metadata: max-age: -1 diff --git a/modules/opencase_defaults/opencase_defaults.links.menu.yml b/modules/opencase_defaults/opencase_defaults.links.menu.yml index 4c47c50..0c6f110 100644 --- a/modules/opencase_defaults/opencase_defaults.links.menu.yml +++ b/modules/opencase_defaults/opencase_defaults.links.menu.yml @@ -1,12 +1,12 @@ -opencase_reporting.clients: +opencase_defaults.report_on_clients: title: 'Clients' description: 'Report on clients' - menu_name: opencase_reporting + parent: opencase_defaults.reporting_menu url: internal:/opencase/reporting/clients weight: 0 -opencase_reporting.volunteers: +opencase_defaults.report_on_volunteers: title: 'Volunteers' description: 'Report on volunteers' - menu_name: opencase_reporting + parent: opencase_defaults.reporting_menu url: internal:/opencase/reporting/volunteers weight: 1 diff --git a/modules/opencase_reporting/config/install/block.block.opencase_reporting_menu.yml b/modules/opencase_reporting/config/install/block.block.opencase_reporting_menu.yml deleted file mode 100644 index abb64f7..0000000 --- a/modules/opencase_reporting/config/install/block.block.opencase_reporting_menu.yml +++ /dev/null @@ -1,23 +0,0 @@ -langcode: en -status: true -dependencies: - config: - - system.menu.opencase_reporting - module: - - system - theme: - - bartik -id: opencase_reporting_menu -theme: bartik -region: sidebar_first -weight: -8 -provider: null -plugin: 'system_menu_block:opencase_reporting' -settings: - id: 'system_menu_block:opencase_reporting' - label: 'Reporting' - provider: system - label_display: visible - level: 1 - depth: 0 -visibility: { } diff --git a/modules/opencase_reporting/opencase_reporting.links.menu.yml b/modules/opencase_reporting/opencase_reporting.links.menu.yml new file mode 100644 index 0000000..aac5c6b --- /dev/null +++ b/modules/opencase_reporting/opencase_reporting.links.menu.yml @@ -0,0 +1,6 @@ +opencase_defaults.reporting_menu: + title: 'Reporting' + description: 'Report on clients' + menu_name: opencase + url: internal:# + weight: 100 diff --git a/opencase.links.menu.yml b/opencase.links.menu.yml index 8f22d8b..3cf3c6f 100644 --- a/opencase.links.menu.yml +++ b/opencase.links.menu.yml @@ -1,40 +1,75 @@ +opencase.all-cases: + title: 'My cases' + description: '' + menu_name: opencase + url: internal:/opencase/all-cases + weight: 0 + +opencase.opencase_add_people_menu: + title: 'Add people' + description: 'Add more people to OpenCase' + menu_name: opencase + url: internal:# + weight: 1 +opencase.add_people_links: + class: Drupal\opencase\Plugin\Menu\AddActorsMenuLink + deriver: Drupal\opencase\Plugin\Derivative\AddActorsMenuLink + menu_name: opencase + parent: opencase.opencase_add_people_menu + +opencase.opencase_admin_menu: + title: 'Administration' + description: 'Management and Configuration' + menu_name: opencase + url: internal:# + weight: 100 opencase.manage_user_logins: title: 'Manage user logins' description: 'Manage who can access the system' - menu_name: opencase-admin + menu_name: opencase + parent: opencase.opencase_admin_menu url: internal:/admin/people weight: 0 -opencase.manage_actor_types: - title: 'Manage actor types' - description: 'Configure types of actors and their fields' - menu_name: opencase-admin +opencase.manage_person_types: + title: 'Manage person types' + description: 'Configure types of people and their fields' + menu_name: opencase + parent: opencase.opencase_admin_menu url: internal:/admin/opencase/oc_actor_type weight: 1 opencase.manage_case_types: title: 'Manage case types' description: 'Configure types of cases and their fields' - menu_name: opencase-admin + menu_name: opencase + parent: opencase.opencase_admin_menu url: internal:/admin/opencase/oc_case_type weight: 2 opencase.manage_activity_types: title: 'Manage activity types' description: 'Configure types of activities and their fields' - menu_name: opencase-admin + menu_name: opencase + parent: opencase.opencase_admin_menu url: internal:/admin/opencase/oc_activity_type weight: 3 + +opencase.opencase_support_menu: + title: 'Support' + description: 'Get help and advice' + menu_name: opencase + url: internal:# + weight: 101 opencase.view_documentation: title: 'Read documentation' description: 'Find out about OpenCase and how it works' - menu_name: openc + menu_name: opencase + parent: opencase.opencase_support_menu url: https://hoegrammer.gitbooks.io/opencase/content/ weight: 0 -opencase.send_feedback: - title: 'Send feedback' +opencase.contact_developers: + title: 'Contact OpenCase' description: 'Contact the OpenCase developers' - menu_name: openc + menu_name: opencase + parent: opencase.opencase_support_menu url: internal:/contact weight: 1 -opencase.add_actors_links: - class: Drupal\opencase\Plugin\Menu\AddActorsMenuLink - deriver: Drupal\opencase\Plugin\Derivative\AddActorsMenuLink - menu_name: opencase-add-actors +