diff --git a/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc b/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc index 26e766501..6eb871263 100644 --- a/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc +++ b/app/availableplugins/ApiConnector/templates/ApiSources/fields.inc @@ -27,10 +27,11 @@ // This view does currently not support read-only if($vv_action == 'add' || $vv_action == 'edit') { -// XXX should probably do something better than for section headers... - print "" . __d('api_connector', 'field.ApiSources.push_mode') . ""; + + print '

  • ' . __d('api_connector', 'field.ApiSources.push_mode') . '

    • '; print $this->Field->banner(__d('api_connector', 'information.endpoint.push', [$vv_push_endpoint])); print $this->Field->control('api_user_id'); + } diff --git a/app/resources/locales/en_US/menu.po b/app/resources/locales/en_US/menu.po index 17a4593af..72e4011aa 100644 --- a/app/resources/locales/en_US/menu.po +++ b/app/resources/locales/en_US/menu.po @@ -30,13 +30,13 @@ msgstr "Available {0} Artifacts" msgid "available.filters" msgstr "Available Filters" +msgid "co.all" +msgstr "All" + msgid "co.artifacts" msgstr "Artifacts" -msgid "co.artifacts.char" -msgstr "A" - -msgid "co.Attributes" +msgid "co.attributes" msgstr "Attributes" msgid "co.configuration" @@ -48,9 +48,6 @@ msgstr "Configuration for the current CO" msgid "co.configuration.short" msgstr "Config" -msgid "co.configuration.char" -msgstr "C" - msgid "co.configuration.panel.title" msgstr "Configuration" @@ -87,6 +84,12 @@ msgstr "Connect external data to Person records" msgid "co.connections.provisioning_targets.desc" msgstr "Create access to applications and services" +msgid "co.features.all" +msgstr "All Features" + +msgid "co.groups" +msgstr "Groups" + msgid "co.operations" msgstr "Operations" @@ -102,9 +105,6 @@ msgstr "Manage this CO's asynchronous process queue" msgid "co.operations.reports.desc" msgstr "Create, view, and export reports" -msgid "co.groups" -msgstr "Groups" - msgid "co.people" msgstr "People" @@ -135,9 +135,6 @@ msgstr "Review and manage people in your collaboration (CO Person Records)" msgid "co.registries" msgstr "Registries" -msgid "co.registries.char" -msgstr "R" - msgid "co.structure" msgstr "Structure" diff --git a/app/resources/locales/en_US/operation.po b/app/resources/locales/en_US/operation.po index 5dcc26e72..e96526bfe 100644 --- a/app/resources/locales/en_US/operation.po +++ b/app/resources/locales/en_US/operation.po @@ -70,7 +70,7 @@ msgid "configure.plugin" msgstr "Configure Plugin" msgid "dashboard.configuration" -msgstr "Manage {0} Configuration" +msgstr "{0} Configuration" msgid "deactivate" msgstr "Deactivate" diff --git a/app/src/Controller/DashboardsController.php b/app/src/Controller/DashboardsController.php index 5c66ae07e..96b8902b1 100644 --- a/app/src/Controller/DashboardsController.php +++ b/app/src/Controller/DashboardsController.php @@ -57,42 +57,6 @@ public function initialize(): void { // for configuration, dashboard, and registries actions $this->Breadcrumb->skipParents(['/^\/dashboards/']); } - - /** - * Render the CO Registries Dashboard. - * - * @since COmanage Registry v5.0.0 - */ - - public function artifacts() { - $cur_co = $this->getCO(); - - $this->set('vv_title', __d('menu', 'artifacts', [$cur_co->name])); - - // Construct the set of primary registry objects, which - // we want to order by the localized text string. - - // We're assuming that the permission for each of these items is the same as for - // registries() itself, ie: CMP or CO Admin. But plausibly some of this stuff - // could be delegated to (eg) a COU Admin at some point... - - $artifactMenuItems = [ - __d('controller', 'ExtIdentitySourceRecords', [99]) => [ - 'icon' => 'assignment', - 'controller' => 'ext_identity_source_records', - 'action' => 'index' - ], - __d('controller', 'Jobs', [99]) => [ - 'icon' => 'assignment', - 'controller' => 'jobs', - 'action' => 'index' - ] - ]; - - ksort($artifactMenuItems); - - $this->set('vv_artifacts_menu_items', $artifactMenuItems); - } /** * Render the CO Configuration Dashboard. @@ -103,7 +67,7 @@ public function artifacts() { public function configuration() { $cur_co = $this->getCO(); - $this->set('vv_title', __d('operation', 'dashboard.configuration', $cur_co->name)); + $this->set('vv_title', __d('menu', 'co.features.all')); // Construct the set of configuration items. For everything except CO Settings // we want to order by the localized text string. @@ -143,11 +107,12 @@ public function configuration() { 'controller' => 'provisioning_targets', 'action' => 'index' ], - __d('controller', 'Reports', [99]) => [ - 'icon' => 'summarize', - 'controller' => 'reports', - 'action' => 'index' - ], +// XXX restore when Reports are ready to be exposed. +// __d('controller', 'Reports', [99]) => [ +// 'icon' => 'summarize', +// 'controller' => 'reports', +// 'action' => 'index' +// ], __d('controller', 'Types', [99]) => [ 'icon' => 'widgets', 'controller' => 'types', @@ -192,37 +157,7 @@ public function configuration() { ksort($platformMenuItems); $this->set('vv_platform_menu_items', $platformMenuItems); - } - - /** - * Render a Dashboard. - * - * @since COmanage Registry v5.0.0 - * @param int $id Dashboard ID - */ - - public function dashboard(?int $id=null) { - // XXX placeholder - } - - /** - * Render the CO Registries Dashboard. - * - * @since COmanage Registry v5.0.0 - */ - public function registries() { - $cur_co = $this->getCO(); - - $this->set('vv_title', __d('menu', 'registries', [$cur_co->name])); - - // Construct the set of primary registry objects, which - // we want to order by the localized text string. - - // We're assuming that the permission for each of these items is the same as for - // registries() itself, ie: CMP or CO Admin. But plausibly some of this stuff - // could be delegated to (eg) a COU Admin at some point... - $registryMenuItems = [ __d('controller', 'Groups', [99]) => [ 'icon' => 'people', @@ -240,10 +175,38 @@ public function registries() { 'action' => 'index' ] ]; - + ksort($registryMenuItems); - + $this->set('vv_registries_menu_items', $registryMenuItems); + + $artifactMenuItems = [ + __d('controller', 'ExtIdentitySourceRecords', [99]) => [ + 'icon' => 'assignment', + 'controller' => 'ext_identity_source_records', + 'action' => 'index' + ], + __d('controller', 'Jobs', [99]) => [ + 'icon' => 'assignment', + 'controller' => 'jobs', + 'action' => 'index' + ] + ]; + + ksort($artifactMenuItems); + + $this->set('vv_artifacts_menu_items', $artifactMenuItems); + } + + /** + * Render a Dashboard. + * + * @since COmanage Registry v5.0.0 + * @param int $id Dashboard ID + */ + + public function dashboard(?int $id=null) { + // XXX placeholder } /** diff --git a/app/templates/Cos/select.php b/app/templates/Cos/select.php index 6d938b50e..b62bb20a5 100644 --- a/app/templates/Cos/select.php +++ b/app/templates/Cos/select.php @@ -28,8 +28,8 @@ // XXX See registry/app/View/Pages/home.ctp for various error messages we should // render based on the user's state, include op.home.no.collabs if empty ?> -
    -
    +
    +

    diff --git a/app/templates/Dashboards/artifacts.php b/app/templates/Dashboards/artifacts.php deleted file mode 100644 index ea41467a7..000000000 --- a/app/templates/Dashboards/artifacts.php +++ /dev/null @@ -1,54 +0,0 @@ - - -
    -
    -

    -
    -
    - -
    -
      - $cfg): ?> -
    • - ' . $cfg['icon'] . '' - . '' . $label . ''; - print $this->Html->link( - $linkContent, - ['plugin' => null, - 'controller' => $cfg['controller'], - 'action' => $cfg['action'], - '?' => ['co_id' => $vv_cur_co->id]], - ['escape' => false] - ); - ?> -
      • - -
    -
    diff --git a/app/templates/Dashboards/configuration.php b/app/templates/Dashboards/configuration.php index cd16fba0f..10c307cb7 100644 --- a/app/templates/Dashboards/configuration.php +++ b/app/templates/Dashboards/configuration.php @@ -26,9 +26,12 @@ */ ?> -
    -
    -

    +
    +
    +

    +
    + +
    @@ -53,9 +56,15 @@ -

    + +

    + + +

    + +
      $cfg): ?>
    • @@ -74,6 +83,46 @@
    + +

    +
      + $cfg): ?> +
    • + ' . $cfg['icon'] . '' + . '' . $label . ''; + print $this->Html->link( + $linkContent, + ['plugin' => null, + 'controller' => $cfg['controller'], + 'action' => $cfg['action'], + '?' => ['co_id' => $vv_cur_co->id]], + ['escape' => false] + ); + ?> +
      • + +
    + +

    +
      + $cfg): ?> +
    • + ' . $cfg['icon'] . '' + . '' . $label . ''; + print $this->Html->link( + $linkContent, + ['plugin' => null, + 'controller' => $cfg['controller'], + 'action' => $cfg['action'], + '?' => ['co_id' => $vv_cur_co->id]], + ['escape' => false] + ); + ?> +
      • + +
    @@ -98,8 +147,4 @@
    Alert->alert(__d('information','cmp.config.notice', $noticeUrls), 'information', true) ?>
    - - -
    - -
    \ No newline at end of file + \ No newline at end of file diff --git a/app/templates/Dashboards/registries.php b/app/templates/Dashboards/registries.php deleted file mode 100644 index fd6226e05..000000000 --- a/app/templates/Dashboards/registries.php +++ /dev/null @@ -1,58 +0,0 @@ - - -
    -
    -

    -
    -
    - -
    -
      - $cfg): ?> -
    • - ' . $cfg['icon'] . '' - . '' . $label . ''; - print $this->Html->link( - $linkContent, - ['plugin' => null, - 'controller' => $cfg['controller'], - 'action' => $cfg['action'], - '?' => ['co_id' => $vv_cur_co->id]], - ['escape' => false] - ); - ?> -
      • - -
    -
    - -
    - -
    \ No newline at end of file diff --git a/app/templates/Dashboards/search.php b/app/templates/Dashboards/search.php index 2f3cddf28..3481f9fd2 100644 --- a/app/templates/Dashboards/search.php +++ b/app/templates/Dashboards/search.php @@ -42,8 +42,8 @@ } ?> -
    -
    +
    +

    diff --git a/app/templates/ExternalIdentitySources/retrieve.php b/app/templates/ExternalIdentitySources/retrieve.php index 6ad48a2d0..d872ddd46 100644 --- a/app/templates/ExternalIdentitySources/retrieve.php +++ b/app/templates/ExternalIdentitySources/retrieve.php @@ -37,8 +37,8 @@ print $this->element('subnavigation', $subnav); ?> -
    -
    +
    +

    element('subnavigation', $subnav); ?> -
    -
    +
    +

    diff --git a/app/templates/ProvisioningTargets/status.php b/app/templates/ProvisioningTargets/status.php index 4c8527537..6df0f712a 100644 --- a/app/templates/ProvisioningTargets/status.php +++ b/app/templates/ProvisioningTargets/status.php @@ -28,8 +28,8 @@ use App\Lib\Util\StringUtilities; ?> -
    -
    +
    +

    diff --git a/app/templates/Standard/add-edit-view.php b/app/templates/Standard/add-edit-view.php index 34110943d..bf5b4ae33 100644 --- a/app/templates/Standard/add-edit-view.php +++ b/app/templates/Standard/add-edit-view.php @@ -83,8 +83,8 @@ } ?> -
    -
    +
    +

    diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php index 3eed39cd6..d856ed8b8 100644 --- a/app/templates/Standard/index.php +++ b/app/templates/Standard/index.php @@ -85,8 +85,8 @@ } ?> -
    -
    +
    +

    diff --git a/app/templates/element/menuMain.php b/app/templates/element/menuMain.php index 7d5a3ea1c..9ce8fc912 100644 --- a/app/templates/element/menuMain.php +++ b/app/templates/element/menuMain.php @@ -102,54 +102,21 @@