From f0e2ac8baa2aa025cb820d96630b97041307d1d7 Mon Sep 17 00:00:00 2001 From: vincent-peugnet Date: Wed, 21 Aug 2019 18:24:05 +0200 Subject: Feature : datalist with autofocus --- app/class/controller.php | 23 +++++++++++++---------- app/class/controlleradmin.php | 4 ---- app/class/controllerart.php | 2 -- app/view/templates/admin.php | 2 +- app/view/templates/backtopbar.php | 11 ++++++++++- app/view/templates/edit.php | 2 +- app/view/templates/font.php | 2 +- app/view/templates/home.php | 2 +- app/view/templates/info.php | 2 +- app/view/templates/media.php | 2 +- app/view/templates/timeline.php | 2 +- app/view/templates/user.php | 2 +- composer.json | 2 +- 13 files changed, 32 insertions(+), 26 deletions(-) diff --git a/app/class/controller.php b/app/class/controller.php index c4994f8..b925236 100644 --- a/app/class/controller.php +++ b/app/class/controller.php @@ -2,25 +2,27 @@ class Controller { - /** - * @var User - */ + /** @var User */ protected $user; - /** - * @var Routes - */ + + /** @var Routes */ protected $router; - /** - * @var Modeluser - */ + + /** @var Modeluser */ protected $usermanager; + + /** @var Modelart */ + protected $artmanager; + protected $plates; + /** @var DateTimeImmutable */ protected $now; public function __construct($router) { $this->setuser(); - $this->router = $router; + $this->router = $router; + $this->artmanager = new Modelart(); $this->initplates(); $this->now = new DateTimeImmutable(null, timezone_open("Europe/Paris")); } @@ -54,6 +56,7 @@ class Controller $commonsparams = []; $commonsparams['router'] = $this->router; $commonsparams['user'] = $this->user; + $commonsparams['pagelist'] = $this->artmanager->list(); $commonsparams['css'] = Model::csspath(); return $commonsparams; } diff --git a/app/class/controlleradmin.php b/app/class/controlleradmin.php index 2101414..e3e1b2a 100644 --- a/app/class/controlleradmin.php +++ b/app/class/controlleradmin.php @@ -3,16 +3,12 @@ class Controlleradmin extends Controller { - /** @var Modelart $artmanager */ - protected $artmanager; - /** @var Modelmedia $mediamanager */ protected $mediamanager; public function desktop() { if($this->user->isadmin()) { - $this->artmanager = new Modelart(); $artlist = $this->artmanager->list(); $this->mediamanager = new Modelmedia(); $faviconlist = $this->mediamanager->listfavicon(); diff --git a/app/class/controllerart.php b/app/class/controllerart.php index ac52043..690b260 100644 --- a/app/class/controllerart.php +++ b/app/class/controllerart.php @@ -4,7 +4,6 @@ class Controllerart extends Controller { /** @var Art2 */ protected $art; - protected $artmanager; protected $fontmanager; protected $mediamanager; @@ -14,7 +13,6 @@ class Controllerart extends Controller { parent::__construct($router); - $this->artmanager = new Modelart(); $this->fontmanager = new Modelfont(); $this->mediamanager = new Modelmedia(); diff --git a/app/view/templates/admin.php b/app/view/templates/admin.php index 98027dc..97442ac 100644 --- a/app/view/templates/admin.php +++ b/app/view/templates/admin.php @@ -5,7 +5,7 @@ - insert('backtopbar', ['user' => $user, 'tab' => 'admin']) ?> + insert('backtopbar', ['user' => $user, 'tab' => 'admin', 'pagelist' => $pagelist]) ?>
diff --git a/app/view/templates/backtopbar.php b/app/view/templates/backtopbar.php index 8e15d14..19b9cf0 100644 --- a/app/view/templates/backtopbar.php +++ b/app/view/templates/backtopbar.php @@ -2,9 +2,18 @@
- +> iseditor() ? '' : '' ?> + +iseditor()) { ?> + + + + + + +
diff --git a/app/view/templates/edit.php b/app/view/templates/edit.php index 5ce1d35..b097378 100644 --- a/app/view/templates/edit.php +++ b/app/view/templates/edit.php @@ -10,7 +10,7 @@
- insert('backtopbar', ['user' => $user, 'tab' => 'edit']) ?> + insert('backtopbar', ['user' => $user, 'tab' => 'edit', 'pagelist' => $pagelist]) ?> insert('edittopbar', ['art' => $art, 'user' => $user]) ?> diff --git a/app/view/templates/font.php b/app/view/templates/font.php index 6c53023..8fcf149 100644 --- a/app/view/templates/font.php +++ b/app/view/templates/font.php @@ -5,7 +5,7 @@ - insert('backtopbar', ['user' => $user, 'tab' => 'font']) ?> + insert('backtopbar', ['user' => $user, 'tab' => 'font', 'pagelist' => $pagelist]) ?>
diff --git a/app/view/templates/home.php b/app/view/templates/home.php index 820d185..17d0a22 100644 --- a/app/view/templates/home.php +++ b/app/view/templates/home.php @@ -8,7 +8,7 @@ - insert('backtopbar', ['user' => $user, 'tab' => 'home']) ?> + insert('backtopbar', ['user' => $user, 'tab' => 'home', 'pagelist' => $pagelist]) ?> iseditor()) { ?> diff --git a/app/view/templates/info.php b/app/view/templates/info.php index 6c28068..f1ca1f9 100644 --- a/app/view/templates/info.php +++ b/app/view/templates/info.php @@ -5,7 +5,7 @@ - insert('backtopbar', ['user' => $user, 'tab' => 'info']) ?> + insert('backtopbar', ['user' => $user, 'tab' => 'info', 'pagelist' => $pagelist]) ?>
diff --git a/app/view/templates/media.php b/app/view/templates/media.php index b13c58a..0f60368 100644 --- a/app/view/templates/media.php +++ b/app/view/templates/media.php @@ -5,7 +5,7 @@ - insert('backtopbar', ['user' => $user, 'tab' => 'media']) ?> + insert('backtopbar', ['user' => $user, 'tab' => 'media', 'pagelist' => $pagelist]) ?>
diff --git a/app/view/templates/timeline.php b/app/view/templates/timeline.php index 874b953..2db861c 100644 --- a/app/view/templates/timeline.php +++ b/app/view/templates/timeline.php @@ -8,7 +8,7 @@ - insert('backtopbar', ['user' => $user, 'tab' => 'timeline']) ?> + insert('backtopbar', ['user' => $user, 'tab' => 'timeline', 'pagelist' => $pagelist]) ?> iseditor()) { ?> diff --git a/app/view/templates/user.php b/app/view/templates/user.php index 6e302f8..21a7639 100644 --- a/app/view/templates/user.php +++ b/app/view/templates/user.php @@ -5,7 +5,7 @@ - insert('backtopbar', ['user' => $user, 'tab' => 'user']) ?> + insert('backtopbar', ['user' => $user, 'tab' => 'user', 'pagelist' => $pagelist]) ?>
diff --git a/composer.json b/composer.json index 00cd634..9146aee 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "w-cms", "description": "point'n think", - "version": "1.5.3", + "version": "1.5.4", "require": { "michelf/php-markdown": "^1.8", "league/plates": "3.*", -- cgit v1.2.3