From d8e7ce5798c4d72fea8e846293d5838224d82b1b Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 31 Jan 2020 21:38:20 +0300 Subject: [PATCH] feat(admin-plugin): update navigation state in all controllers #211 --- .../admin/app/Controllers/ApiController.php | 3 +-- .../app/Controllers/EntriesController.php | 24 ++++++++----------- .../app/Controllers/SettingsController.php | 2 +- .../app/Controllers/SnippetsController.php | 2 +- .../app/Controllers/TemplatesController.php | 2 +- .../app/Controllers/ThemesController.php | 4 ++-- .../admin/app/Controllers/ToolsController.php | 1 - 7 files changed, 16 insertions(+), 22 deletions(-) diff --git a/site/plugins/admin/app/Controllers/ApiController.php b/site/plugins/admin/app/Controllers/ApiController.php index ed43955a..ab95a952 100644 --- a/site/plugins/admin/app/Controllers/ApiController.php +++ b/site/plugins/admin/app/Controllers/ApiController.php @@ -84,8 +84,7 @@ class ApiController extends Controller 'buttons' => [ 'api_tokens_add' => [ 'link' => $this->router->pathFor('admin.api_tokens.add') . '?api=' . $api, - 'title' => __('admin_create_new_' . $api . '_token'), - 'attributes' => ['class' => 'navigation-top-primary__item'], + 'title' => __('admin_create_new_' . $api . '_token') ], ], ] diff --git a/site/plugins/admin/app/Controllers/EntriesController.php b/site/plugins/admin/app/Controllers/EntriesController.php index 6a444b00..0749f480 100644 --- a/site/plugins/admin/app/Controllers/EntriesController.php +++ b/site/plugins/admin/app/Controllers/EntriesController.php @@ -361,7 +361,7 @@ class EntriesController extends Controller 'entries_type' => [ 'link' => $this->router->pathFor('admin.entries.type') . '?id=' . $this->getEntryID($query), 'title' => __('admin_type'), - 'attributes' => ['class' => 'btn active'] + 'active' => true ] ] ] @@ -467,7 +467,7 @@ class EntriesController extends Controller 'entries_move' => [ 'link' => $this->router->pathFor('admin.entries.move'), 'title' => __('admin_move'), - 'attributes' => ['class' => 'btn active'] + 'active' => true ] ] ] @@ -544,7 +544,7 @@ class EntriesController extends Controller 'entries_type' => [ 'link' => $this->router->pathFor('admin.entries.rename') . '?id=' . $this->getEntryID($query), 'title' => __('admin_rename'), - 'attributes' => ['class' => 'btn active'] + 'active' => true ] ] ] @@ -691,14 +691,14 @@ class EntriesController extends Controller 'edit_entry_source' => [ 'link' => $this->router->pathFor('admin.entries.edit') . '?id=' . $this->getEntryID($query) . '&type=source', 'title' => __('admin_source'), - 'attributes' => ['class' => 'btn active'] + 'active' => true ], ], 'buttons' => [ 'save_entry' => [ 'link' => 'javascript:;', 'title' => __('admin_save'), - 'attributes' => ['class' => 'js-save-form-submit btn'] + 'type' => 'action' ], ] ] @@ -733,7 +733,6 @@ class EntriesController extends Controller 'edit_entry_source' => [ 'link' => $this->router->pathFor('admin.entries.edit') . '?id=' . $this->getEntryID($query) . '&type=source', 'title' => __('admin_source'), - ], ] ] @@ -759,30 +758,27 @@ class EntriesController extends Controller 'links' => [ 'entries' => [ 'link' => $this->router->pathFor('admin.entries.index') . '?id=' . implode('/', array_slice(explode("/", $this->getEntryID($query)), 0, -1)), - 'title' => __('admin_entries'), - + 'title' => __('admin_entries') ], 'edit_entry' => [ 'link' => $this->router->pathFor('admin.entries.edit') . '?id=' . $this->getEntryID($query) . '&type=editor', 'title' => __('admin_editor'), - 'attributes' => ['class' => 'btn active'] + 'active' => true ], 'edit_entry_media' => [ 'link' => $this->router->pathFor('admin.entries.edit') . '?id=' . $this->getEntryID($query) . '&type=media', - 'title' => __('admin_media'), - + 'title' => __('admin_media') ], 'edit_entry_source' => [ 'link' => $this->router->pathFor('admin.entries.edit') . '?id=' . $this->getEntryID($query) . '&type=source', - 'title' => __('admin_source'), - + 'title' => __('admin_source') ], ], 'buttons' => [ 'save_entry' => [ 'link' => 'javascript:;', 'title' => __('admin_save'), - 'attributes' => ['class' => 'js-save-form-submit btn'] + 'type' => 'action' ], ] ] diff --git a/site/plugins/admin/app/Controllers/SettingsController.php b/site/plugins/admin/app/Controllers/SettingsController.php index dc764b19..c25ced64 100644 --- a/site/plugins/admin/app/Controllers/SettingsController.php +++ b/site/plugins/admin/app/Controllers/SettingsController.php @@ -109,7 +109,7 @@ class SettingsController extends Controller 'save' => [ 'link' => 'javascript:;', 'title' => __('admin_save'), - 'attributes' => ['class' => 'js-save-form-submit btn'], + 'type' => 'action' ], ], ] diff --git a/site/plugins/admin/app/Controllers/SnippetsController.php b/site/plugins/admin/app/Controllers/SnippetsController.php index a2e53205..d3917417 100644 --- a/site/plugins/admin/app/Controllers/SnippetsController.php +++ b/site/plugins/admin/app/Controllers/SnippetsController.php @@ -138,7 +138,7 @@ class SnippetsController extends Controller 'save_snippet' => [ 'link' => 'javascript:;', 'title' => __('admin_save'), - 'attributes' => ['class' => 'js-save-form-submit btn'], + 'type' => 'action', ], ], ] diff --git a/site/plugins/admin/app/Controllers/TemplatesController.php b/site/plugins/admin/app/Controllers/TemplatesController.php index d58a1a2f..ce7ceb8b 100644 --- a/site/plugins/admin/app/Controllers/TemplatesController.php +++ b/site/plugins/admin/app/Controllers/TemplatesController.php @@ -179,7 +179,7 @@ class TemplatesController extends Controller 'save_template' => [ 'link' => 'javascript:;', 'title' => __('admin_save'), - 'attributes' => ['class' => 'js-save-form-submit btn'], + 'type' => 'action', ], ], ] diff --git a/site/plugins/admin/app/Controllers/ThemesController.php b/site/plugins/admin/app/Controllers/ThemesController.php index e8cce2b1..a392cc13 100644 --- a/site/plugins/admin/app/Controllers/ThemesController.php +++ b/site/plugins/admin/app/Controllers/ThemesController.php @@ -48,7 +48,7 @@ class ThemesController extends Controller 'themes_get_more' => [ 'link' => 'https://github.com/flextype/themes', 'title' => __('admin_get_more_themes'), - 'attributes' => ['class' => 'btn', 'target' => '_blank'], + 'target' => '_blank', ], ], ] @@ -250,7 +250,7 @@ class ThemesController extends Controller 'save_theme_settings' => [ 'link' => 'javascript:;', 'title' => __('admin_save'), - 'attributes' => ['class' => 'js-save-form-submit btn'], + 'type' => 'action', ], ], ] diff --git a/site/plugins/admin/app/Controllers/ToolsController.php b/site/plugins/admin/app/Controllers/ToolsController.php index 13c762df..0bddef41 100644 --- a/site/plugins/admin/app/Controllers/ToolsController.php +++ b/site/plugins/admin/app/Controllers/ToolsController.php @@ -113,7 +113,6 @@ class ToolsController extends Controller 'id' => 'clear-cache-all', 'link' => $this->router->pathFor('admin.tools.clearCacheAllProcess'), 'title' => __('admin_clear_cache_all'), - ], ], ]