From 442daa2fd4686223268885266e0c91c8e533ac81 Mon Sep 17 00:00:00 2001 From: timur Date: Thu, 23 Nov 2017 17:20:46 +0200 Subject: [PATCH] img from gallery in static page --- common/config/main.php | 2 +- common/images/5_ifZKvN_QGrY6VnuFtjfPa_-Va_7x6hd3.png | Bin 21420 -> 0 bytes frontend/controllers/PageController.php | 16 ++++++++++++++-- frontend/views/page/view.php | 33 ++++++++++++++++++++++++++++++--- 4 files changed, 45 insertions(+), 6 deletions(-) mode change 100644 => 100755 common/images/5_ifZKvN_QGrY6VnuFtjfPa_-Va_7x6hd3.png diff --git a/common/config/main.php b/common/config/main.php index f739c3b..21e6410 100755 --- a/common/config/main.php +++ b/common/config/main.php @@ -5,7 +5,7 @@ 'vendorPath' => dirname(dirname(__DIR__)) . '/vendor', 'modules' => [ 'imagemanager' => [ - 'class' => 'noam148\imagemanager\Module', + 'class' => 'artbox\core\components\imagemanager\Module', 'canUploadImage' => true, 'canRemoveImage' => function () { return true; diff --git a/common/images/5_ifZKvN_QGrY6VnuFtjfPa_-Va_7x6hd3.png b/common/images/5_ifZKvN_QGrY6VnuFtjfPa_-Va_7x6hd3.png old mode 100644 new mode 100755 index b0c505a..b0c505a Binary files a/common/images/5_ifZKvN_QGrY6VnuFtjfPa_-Va_7x6hd3.png and b/common/images/5_ifZKvN_QGrY6VnuFtjfPa_-Va_7x6hd3.png differ diff --git a/frontend/controllers/PageController.php b/frontend/controllers/PageController.php index b6614a5..c027445 100755 --- a/frontend/controllers/PageController.php +++ b/frontend/controllers/PageController.php @@ -27,6 +27,15 @@ $seo = Yii::$app->get('seo'); $seo->setModel($model->lang); + if (strpos($model->lang->body, '[[gallery]]')) { + $splited = explode('[[gallery]]', $model->lang->body); + $body = array_shift($splited); + $lefts = implode('', $splited); + } else { + $body = $model->lang->body; + $lefts = null; + } + $pages = Page::find() ->with('lang') ->where( @@ -41,8 +50,11 @@ return $this->render( 'view', [ - 'model' => $model, - 'pages' => $pages, + 'model' => $model, + 'pages' => $pages, + 'images' => $model->getImages(), + 'body' => $body, + 'lefts' => $lefts, ] ); } diff --git a/frontend/views/page/view.php b/frontend/views/page/view.php index 244e927..23de4f3 100755 --- a/frontend/views/page/view.php +++ b/frontend/views/page/view.php @@ -3,12 +3,16 @@ use artbox\core\models\Page; use yii\helpers\Html; use yii\web\View; + use artbox\core\models\Image; /** * @var View $this * @var Page $model * @var Page[] $pages * @var SeoComponent $seo + * @var Image[] $images + * @var string $body + * @var string|null $lefts */ $seo = \Yii::$app->get('seo'); $this->params[ 'breadcrumbs' ][] = $seo->title; @@ -27,12 +31,35 @@
- - lang->body ?> - +
+ + +
+ + +
+ + + +
+
+
+ +
+
+
+ -- libgit2 0.21.4