diff --git a/Module.php b/Module.php index 96903e3..d38f0e9 100755 --- a/Module.php +++ b/Module.php @@ -1,6 +1,6 @@ =7.0", "yiisoft/yii2": "*", - "developeruz/yii2-db-rbac": "*" + "artweb/artbox": "dev-master", + "artweb/artbox/language": "dev-master" }, "autoload": { "psr-4": { - "artweb\\artbox\\seo\\": "" + "artweb\\artbox\\design\\": "" } } } \ No newline at end of file diff --git a/controllers/BannerController.php b/controllers/BannerController.php index 77d5756..8a2b093 100755 --- a/controllers/BannerController.php +++ b/controllers/BannerController.php @@ -3,8 +3,8 @@ namespace backend\controllers; use Yii; - use common\models\Banner; - use common\models\BannerSearch; + use artweb\artbox\design\models\Banner; + use artweb\artbox\design\models\BannerSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; diff --git a/controllers/BgController.php b/controllers/BgController.php index 189ab2a..0ec05c2 100755 --- a/controllers/BgController.php +++ b/controllers/BgController.php @@ -3,8 +3,8 @@ namespace backend\controllers; use Yii; - use common\models\Bg; - use common\models\BgSearch; + use artweb\artbox\design\models\Bg; + use artweb\artbox\design\models\BgSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; diff --git a/controllers/SliderController.php b/controllers/SliderController.php index 5b955c8..9983f10 100755 --- a/controllers/SliderController.php +++ b/controllers/SliderController.php @@ -3,8 +3,8 @@ namespace backend\controllers; use Yii; - use common\models\Slider; - use common\models\SliderSearch; + use artweb\artbox\design\models\Slider; + use artweb\artbox\design\models\SliderSearch; use yii\db\ActiveQuery; use yii\web\Controller; use yii\web\NotFoundHttpException; diff --git a/controllers/SliderImageController.php b/controllers/SliderImageController.php index d576dfe..6ce3007 100755 --- a/controllers/SliderImageController.php +++ b/controllers/SliderImageController.php @@ -3,10 +3,10 @@ namespace backend\controllers; use developeruz\db_rbac\behaviors\AccessBehavior; - use common\models\Slider; + use artweb\artbox\design\models\Slider; use Yii; - use common\models\SliderImage; - use common\models\SliderImageSearch; + use artweb\artbox\design\models\SliderImage; + use artweb\artbox\design\models\SliderImageSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; diff --git a/models/Banner.php b/models/Banner.php index d52608e..02b5445 100755 --- a/models/Banner.php +++ b/models/Banner.php @@ -1,8 +1,8 @@ '\common\models\Slider', + 'targetClass' => '\artweb\artbox\design\models\Slider', 'message' => Yii::t( 'app', 'message', diff --git a/models/SliderImage.php b/models/SliderImage.php index 51b7e5f..bf1e4d5 100755 --- a/models/SliderImage.php +++ b/models/SliderImage.php @@ -1,9 +1,9 @@ where([\common\models\Slider::tableName().'.title'=>$this->title])->joinWith("sliderImage")->one(); - if($slider instanceof \common\models\Slider){ + $slider = \artweb\artbox\design\models\Slider::find()->where([\artweb\artbox\design\models\Slider::tableName().'.title'=>$this->title])->joinWith("sliderImage")->one(); + if($slider instanceof \artweb\artbox\design\models\Slider){ return $this->render('slider',[ 'slider'=>$slider, 'title'=>$this->title @@ -30,4 +29,4 @@ class Slider extends Widget } -} \ No newline at end of file +} diff --git a/widgets/views/slider.php b/widgets/views/slider.php index a2803ee..3dfacba 100644 --- a/widgets/views/slider.php +++ b/widgets/views/slider.php @@ -1,7 +1,7 @@