From 6dafe90c11c5eb992aebc40eef9d6a125894e26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20A=2E=20L=C3=B3pez=20L=C3=B3pez?= Date: Thu, 19 Mar 2020 02:28:29 -0400 Subject: [PATCH] ENH: image gallery --- assets/css/backend.css | 2 +- controllers/backend/MediaController.php | 15 +++++++----- models/MediaSearch.php | 1 - views/backend/media/_image.php | 19 +++++++++------ views/backend/media/_search.php | 32 ++++++++++++------------- views/backend/media/_view.php | 2 +- views/backend/media/images-gallery.php | 14 +++++------ views/backend/media/index.php | 10 ++++++-- 8 files changed, 53 insertions(+), 42 deletions(-) diff --git a/assets/css/backend.css b/assets/css/backend.css index 70fd1dc..d23858b 100644 --- a/assets/css/backend.css +++ b/assets/css/backend.css @@ -18,7 +18,7 @@ h2 span, h3 span, h4 span, h5 span, h6 span { } #image-gallery-modal .col-md-3 { - padding: 0; + /*padding: 0;*/ } #image-gallery-modal .modal-body { diff --git a/controllers/backend/MediaController.php b/controllers/backend/MediaController.php index 3c132e8..22b56da 100755 --- a/controllers/backend/MediaController.php +++ b/controllers/backend/MediaController.php @@ -3,6 +3,7 @@ namespace daxslab\website\controllers\backend; use daxslab\website\models\Media; +use daxslab\website\models\MediaSearch; use Yii; use yii\data\ActiveDataProvider; use yii\filters\VerbFilter; @@ -33,15 +34,17 @@ public function behaviors() */ public function actionIndex() { - $dataProvider = new ActiveDataProvider([ - 'query' => Yii::$app->website->getMedias() - ->orderBy('filename'), - 'pagination' => [ - 'route' => Url::toRoute(["/{$this->module->id}/media/index"]), - ], + $searchModel = new MediaSearch([ + 'website_id' => Yii::$app->website->id, ]); + $dataProvider = $searchModel->search(Yii::$app->request->queryParams); + $dataProvider->sort->defaultOrder = [ + 'created_at' => SORT_DESC, + ]; + $dataProvider->pagination->route = Url::toRoute(['/website/media/index']); return $this->render('index', [ + 'searchModel' => $searchModel, 'dataProvider' => $dataProvider, ]); } diff --git a/models/MediaSearch.php b/models/MediaSearch.php index 0bfeddb..224b775 100755 --- a/models/MediaSearch.php +++ b/models/MediaSearch.php @@ -5,7 +5,6 @@ use Yii; use yii\base\Model; use yii\data\ActiveDataProvider; -use backend\models\Media; /** * MediaSearch represents the model behind the search form of `backend\models\Media`. diff --git a/views/backend/media/_image.php b/views/backend/media/_image.php index 4d47e6b..ef27e2d 100644 --- a/views/backend/media/_image.php +++ b/views/backend/media/_image.php @@ -4,10 +4,15 @@ ?> -thumbnailer->get($model->url, 300, 300), [ - 'alt' => $model->filename, - 'class' => 'img-fluid', - 'data-url' => $model->url, - 'data-id' => $model->id, -]) -?> +
+ thumbnailer->get($model->url, 300, 300), [ + 'alt' => $model->filename, + 'class' => 'img-fluid card-img-top', + 'data-url' => $model->url, + 'data-id' => $model->id, + ]) + ?> +
+

filename ?>

+
+
diff --git a/views/backend/media/_search.php b/views/backend/media/_search.php index 597437a..7c87c78 100644 --- a/views/backend/media/_search.php +++ b/views/backend/media/_search.php @@ -2,10 +2,15 @@ use yii\helpers\Html; use yii\widgets\ActiveForm; +use yii\helpers\Url; /* @var $this yii\web\View */ /* @var $model backend\models\MediaSearch */ /* @var $form yii\widgets\ActiveForm */ + +$mimeTypeOptions = Yii::$app->website->getMedias()->select('mime_type')->column(); +$mimeTypeOptions = array_combine($mimeTypeOptions, $mimeTypeOptions); + ?>