From d8d0c38c51bbe57b6bec1e5a9691dbe497aacf1b Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Fri, 20 May 2016 12:39:21 +0300 Subject: [PATCH] add active menu --- backend/config/main.php | 22 ++++++++++++++++++++++ backend/controllers/ArticlesController.php | 14 +++++++++++++- backend/controllers/BannerController.php | 14 +++++++++++++- backend/controllers/BgController.php | 14 +++++++++++++- backend/controllers/BlogController.php | 26 ++++++++++++-------------- backend/controllers/BrandController.php | 31 ++++++++++++------------------- backend/controllers/CategoryController.php | 26 ++++++++++++-------------- backend/controllers/CustomerController.php | 14 +++++++++++++- backend/controllers/EventController.php | 14 +++++++++++++- backend/controllers/OrdersController.php | 16 ++++++++++++++-- backend/controllers/PageController.php | 14 +++++++++++++- backend/controllers/SeoCategoryController.php | 14 +++++++++++++- backend/controllers/SeoController.php | 14 +++++++++++++- backend/controllers/SeoDynamicController.php | 14 +++++++++++++- backend/controllers/ServiceController.php | 14 +++++++++++++- backend/controllers/SiteController.php | 26 ++++++++++++-------------- backend/controllers/SliderController.php | 14 +++++++++++++- backend/controllers/SliderImageController.php | 14 +++++++++++++- backend/controllers/SubscribeController.php | 14 +++++++++++++- backend/controllers/UserController.php | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/models/Label.php | 0 backend/models/Orders.php | 0 backend/models/OrdersProducts.php | 0 backend/models/OrdersSearch.php | 0 backend/models/User.php | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/models/UserSearch.php | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ backend/views/bg/_form.php | 0 backend/views/bg/_search.php | 0 backend/views/bg/create.php | 0 backend/views/bg/index.php | 0 backend/views/bg/update.php | 0 backend/views/bg/view.php | 0 backend/views/brand/_form.php | 19 +++++++++++++++---- backend/views/customer/_form.php | 0 backend/views/customer/_search.php | 0 backend/views/customer/create.php | 0 backend/views/customer/index.php | 0 backend/views/customer/update.php | 0 backend/views/customer/view.php | 0 backend/views/layouts/main-sidebar.php | 10 ++++++++++ backend/views/orders/add.php | 0 backend/views/orders/index.php | 32 +++++++++----------------------- backend/views/orders/show.php | 0 backend/views/orders/update.php | 0 backend/views/subscribe/_form.php | 0 backend/views/subscribe/_search.php | 0 backend/views/subscribe/create.php | 0 backend/views/subscribe/index.php | 0 backend/views/subscribe/update.php | 0 backend/views/subscribe/view.php | 0 backend/views/user/_form.php | 34 ++++++++++++++++++++++++++++++++++ backend/views/user/_search.php | 43 +++++++++++++++++++++++++++++++++++++++++++ backend/views/user/create.php | 21 +++++++++++++++++++++ backend/views/user/index.php | 47 +++++++++++++++++++++++++++++++++++++++++++++++ backend/views/user/update.php | 21 +++++++++++++++++++++ backend/views/user/view.php | 41 +++++++++++++++++++++++++++++++++++++++++ backend/web/js/site.js | 11 +++-------- common/components/artboximage/ArtboxImage.php | 7 +++---- common/components/artboximage/ArtboxImageHelper.php | 0 common/config/main.php | 7 ++----- common/models/BgSearch.php | 0 common/models/CustomerSearch.php | 0 common/models/Delivery.php | 0 common/models/OrdersProducts.php | 0 common/models/Share.php | 0 common/models/SubscribeSearch.php | 0 common/models/User.php | 2 ++ common/modules/artboxfile/Module.php | 0 common/modules/artboxfile/config.php | 0 common/modules/artboxfile/controllers/ActionController.php | 0 common/modules/artboxfile/models/File.php | 0 common/modules/product/models/Brand.php | 4 +++- common/modules/product/widgets/lastProducts.php | 0 common/modules/product/widgets/specialProducts.php | 0 common/modules/product/widgets/views/product_smart.php | 0 common/modules/product/widgets/views/products_block.php | 1 + console/controllers/RbacController.php | 46 ++++++++++++++++++++++++++++++++++++++++++++++ console/migrations/m160512_153443_subscribe.php | 0 console/migrations/m160516_222821_orders.php | 0 console/migrations/m160516_234753_orders_delivery.php | 0 console/migrations/m160517_072059_delete_product_fk.php | 0 console/migrations/m160517_073502_orders_label.php | 0 console/migrations/m160518_185644_change_order.php | 0 frontend/controllers/BasketController.php | 2 +- frontend/controllers/EventController.php | 0 frontend/views/catalog/product.tmp.php | 0 frontend/views/catalog/product_item.php | 33 ++++++++++++++++----------------- frontend/views/event/_objects.php | 0 frontend/views/layouts/main-menu.php | 0 frontend/views/site/index.php | 69 +++++++++++++++++++++++++++++++++------------------------------------ frontend/web/css/ion.rangeSlider.css | 0 frontend/web/css/ion.rangeSlider.skinHTML5.css | 0 frontend/web/images/no_photo.png | Bin 9430 -> 0 bytes frontend/web/images/products/1305887984-2604-2605.jpg | Bin 224221 -> 0 bytes frontend/web/images/products/1348483804-512-2445.jpg | Bin 103925 -> 0 bytes frontend/web/images/products/1348484212-3723-3585.jpg | Bin 101549 -> 0 bytes frontend/web/images/products/1348484611-4020-7396.jpg | Bin 102770 -> 0 bytes frontend/web/images/products/1348485104-4555-7650.jpg | Bin 73228 -> 0 bytes frontend/web/images/products/1348487239-495-4299.jpg | Bin 113978 -> 0 bytes frontend/web/images/products/1348487515-4424-1546.jpg | Bin 133721 -> 0 bytes frontend/web/images/products/1348489125-7133-6866.jpg | Bin 157788 -> 0 bytes frontend/web/images/products/1348489542-702-5816.jpg | Bin 103835 -> 0 bytes frontend/web/images/products/1348490194-360-284.jpg | Bin 105396 -> 0 bytes frontend/web/images/products/1348490344-6421-5352.jpg | Bin 106638 -> 0 bytes frontend/web/images/products/1348490519-4780-1400.jpg | Bin 142623 -> 0 bytes frontend/web/images/products/1348492885-9127-2291.jpg | Bin 160833 -> 0 bytes frontend/web/images/products/1366971036-9093-9799.jpg | Bin 89526 -> 0 bytes frontend/web/images/products/1366971215-512-3729.jpg | Bin 77700 -> 0 bytes frontend/web/images/products/1366971885-6949-9056.jpg | Bin 103160 -> 0 bytes frontend/web/images/products/1372148121-6202-6680.jpg | Bin 125472 -> 0 bytes frontend/web/images/products/1372148169-4614-4290.jpg | Bin 110247 -> 0 bytes frontend/web/js/basket.js | 0 frontend/web/js/ion.rangeSlider.js | 0 frontend/web/libraries/aaa.php | 0 frontend/web/libraries/ion/css/ion.rangeSlider.skinFlat.css | 0 frontend/web/libraries/ion/css/ion.rangeSlider.skinModern.css | 0 frontend/web/libraries/ion/css/ion.rangeSlider.skinNice.css | 0 frontend/web/libraries/ion/css/ion.rangeSlider.skinSimple.css | 0 frontend/web/libraries/ion/css/normalize.css | 0 frontend/web/libraries/ion/img/sprite-skin-flat.png | Bin 304 -> 0 bytes frontend/web/libraries/ion/img/sprite-skin-modern.png | Bin 505 -> 0 bytes frontend/web/libraries/ion/img/sprite-skin-nice.png | Bin 694 -> 0 bytes frontend/web/libraries/ion/img/sprite-skin-simple.png | Bin 358 -> 0 bytes frontend/web/libraries/ion/js/ion.rangeSlider.min.js | 0 frontend/widgets/Rubrics.php | 0 frontend/widgets/views/rubrics.php | 0 126 files changed, 934 insertions(+), 175 deletions(-) mode change 100644 => 100755 backend/controllers/BgController.php mode change 100644 => 100755 backend/controllers/CustomerController.php mode change 100644 => 100755 backend/controllers/OrdersController.php mode change 100644 => 100755 backend/controllers/SubscribeController.php create mode 100644 backend/controllers/UserController.php mode change 100644 => 100755 backend/models/Label.php mode change 100644 => 100755 backend/models/Orders.php mode change 100644 => 100755 backend/models/OrdersProducts.php mode change 100644 => 100755 backend/models/OrdersSearch.php create mode 100644 backend/models/User.php create mode 100644 backend/models/UserSearch.php mode change 100644 => 100755 backend/views/bg/_form.php mode change 100644 => 100755 backend/views/bg/_search.php mode change 100644 => 100755 backend/views/bg/create.php mode change 100644 => 100755 backend/views/bg/index.php mode change 100644 => 100755 backend/views/bg/update.php mode change 100644 => 100755 backend/views/bg/view.php mode change 100644 => 100755 backend/views/customer/_form.php mode change 100644 => 100755 backend/views/customer/_search.php mode change 100644 => 100755 backend/views/customer/create.php mode change 100644 => 100755 backend/views/customer/index.php mode change 100644 => 100755 backend/views/customer/update.php mode change 100644 => 100755 backend/views/customer/view.php mode change 100644 => 100755 backend/views/orders/add.php mode change 100644 => 100755 backend/views/orders/index.php mode change 100644 => 100755 backend/views/orders/show.php mode change 100644 => 100755 backend/views/orders/update.php mode change 100644 => 100755 backend/views/subscribe/_form.php mode change 100644 => 100755 backend/views/subscribe/_search.php mode change 100644 => 100755 backend/views/subscribe/create.php mode change 100644 => 100755 backend/views/subscribe/index.php mode change 100644 => 100755 backend/views/subscribe/update.php mode change 100644 => 100755 backend/views/subscribe/view.php create mode 100644 backend/views/user/_form.php create mode 100644 backend/views/user/_search.php create mode 100644 backend/views/user/create.php create mode 100644 backend/views/user/index.php create mode 100644 backend/views/user/update.php create mode 100644 backend/views/user/view.php mode change 100644 => 100755 backend/web/js/site.js mode change 100644 => 100755 common/components/artboximage/ArtboxImage.php mode change 100644 => 100755 common/components/artboximage/ArtboxImageHelper.php mode change 100644 => 100755 common/models/BgSearch.php mode change 100644 => 100755 common/models/CustomerSearch.php mode change 100644 => 100755 common/models/Delivery.php mode change 100644 => 100755 common/models/OrdersProducts.php mode change 100644 => 100755 common/models/Share.php mode change 100644 => 100755 common/models/SubscribeSearch.php mode change 100644 => 100755 common/modules/artboxfile/Module.php mode change 100644 => 100755 common/modules/artboxfile/config.php mode change 100644 => 100755 common/modules/artboxfile/controllers/ActionController.php mode change 100644 => 100755 common/modules/artboxfile/models/File.php mode change 100644 => 100755 common/modules/product/widgets/lastProducts.php mode change 100644 => 100755 common/modules/product/widgets/specialProducts.php mode change 100644 => 100755 common/modules/product/widgets/views/product_smart.php mode change 100644 => 100755 common/modules/product/widgets/views/products_block.php create mode 100644 console/controllers/RbacController.php mode change 100644 => 100755 console/migrations/m160512_153443_subscribe.php mode change 100644 => 100755 console/migrations/m160516_222821_orders.php mode change 100644 => 100755 console/migrations/m160516_234753_orders_delivery.php mode change 100644 => 100755 console/migrations/m160517_072059_delete_product_fk.php mode change 100644 => 100755 console/migrations/m160517_073502_orders_label.php mode change 100644 => 100755 console/migrations/m160518_185644_change_order.php mode change 100644 => 100755 frontend/controllers/BasketController.php mode change 100644 => 100755 frontend/controllers/EventController.php mode change 100644 => 100755 frontend/views/catalog/product.tmp.php mode change 100644 => 100755 frontend/views/event/_objects.php mode change 100644 => 100755 frontend/views/layouts/main-menu.php mode change 100644 => 100755 frontend/web/css/ion.rangeSlider.css mode change 100644 => 100755 frontend/web/css/ion.rangeSlider.skinHTML5.css mode change 100644 => 100755 frontend/web/images/no_photo.png delete mode 100644 frontend/web/images/products/1305887984-2604-2605.jpg delete mode 100644 frontend/web/images/products/1348483804-512-2445.jpg delete mode 100644 frontend/web/images/products/1348484212-3723-3585.jpg delete mode 100644 frontend/web/images/products/1348484611-4020-7396.jpg delete mode 100644 frontend/web/images/products/1348485104-4555-7650.jpg delete mode 100644 frontend/web/images/products/1348487239-495-4299.jpg delete mode 100644 frontend/web/images/products/1348487515-4424-1546.jpg delete mode 100644 frontend/web/images/products/1348489125-7133-6866.jpg delete mode 100644 frontend/web/images/products/1348489542-702-5816.jpg delete mode 100644 frontend/web/images/products/1348490194-360-284.jpg delete mode 100644 frontend/web/images/products/1348490344-6421-5352.jpg delete mode 100644 frontend/web/images/products/1348490519-4780-1400.jpg delete mode 100644 frontend/web/images/products/1348492885-9127-2291.jpg delete mode 100644 frontend/web/images/products/1366971036-9093-9799.jpg delete mode 100644 frontend/web/images/products/1366971215-512-3729.jpg delete mode 100644 frontend/web/images/products/1366971885-6949-9056.jpg delete mode 100644 frontend/web/images/products/1372148121-6202-6680.jpg delete mode 100644 frontend/web/images/products/1372148169-4614-4290.jpg mode change 100644 => 100755 frontend/web/js/basket.js mode change 100644 => 100755 frontend/web/js/ion.rangeSlider.js mode change 100644 => 100755 frontend/web/libraries/aaa.php mode change 100644 => 100755 frontend/web/libraries/ion/css/ion.rangeSlider.skinFlat.css mode change 100644 => 100755 frontend/web/libraries/ion/css/ion.rangeSlider.skinModern.css mode change 100644 => 100755 frontend/web/libraries/ion/css/ion.rangeSlider.skinNice.css mode change 100644 => 100755 frontend/web/libraries/ion/css/ion.rangeSlider.skinSimple.css mode change 100644 => 100755 frontend/web/libraries/ion/css/normalize.css mode change 100644 => 100755 frontend/web/libraries/ion/img/sprite-skin-flat.png mode change 100644 => 100755 frontend/web/libraries/ion/img/sprite-skin-modern.png mode change 100644 => 100755 frontend/web/libraries/ion/img/sprite-skin-nice.png mode change 100644 => 100755 frontend/web/libraries/ion/img/sprite-skin-simple.png mode change 100644 => 100755 frontend/web/libraries/ion/js/ion.rangeSlider.min.js mode change 100644 => 100755 frontend/widgets/Rubrics.php mode change 100644 => 100755 frontend/widgets/views/rubrics.php diff --git a/backend/config/main.php b/backend/config/main.php index 98f3385..b5b0bd8 100755 --- a/backend/config/main.php +++ b/backend/config/main.php @@ -1,4 +1,5 @@ 'admin', 'controllerNamespace' => 'backend\controllers', 'bootstrap' => ['log'], +// 'as AccessBehavior' => [ +// 'class' => AccessBehavior::className(), +// 'rules' => +// ['permit/access' => +// [ +// [ +// 'actions' => ['role', 'permission','add-role', 'update-role','add-permission', 'update-permission' ], +// 'allow' => true, +// ] +// ] +// ], +// +// ], 'modules' => [ + 'permit' => [ + 'class' => 'developeruz\db_rbac\Yii2DbRbac', + 'params' => [ + 'userClass' => 'backend\models\User' + ] + ], + 'rubrication' => [ 'class' => 'common\modules\rubrication\Module', 'types' => [ @@ -30,6 +51,7 @@ return [ ] ], 'components' => [ + 'user' => [ 'identityClass' => 'common\models\User', 'enableAutoLogin' => true, diff --git a/backend/controllers/ArticlesController.php b/backend/controllers/ArticlesController.php index 7ad014a..8399cbf 100755 --- a/backend/controllers/ArticlesController.php +++ b/backend/controllers/ArticlesController.php @@ -8,7 +8,7 @@ use common\models\ArticlesSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; - +use developeruz\db_rbac\behaviors\AccessBehavior; /** * ArticlesController implements the CRUD actions for Articles model. */ @@ -20,6 +20,18 @@ class ArticlesController extends Controller public function behaviors() { return [ + 'access'=>[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] + ], 'verbs' => [ 'class' => VerbFilter::className(), 'actions' => [ diff --git a/backend/controllers/BannerController.php b/backend/controllers/BannerController.php index e38f1a3..ccf4e70 100755 --- a/backend/controllers/BannerController.php +++ b/backend/controllers/BannerController.php @@ -9,7 +9,7 @@ use common\models\BannerSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; - +use developeruz\db_rbac\behaviors\AccessBehavior; /** * BannerController implements the CRUD actions for Banner model. */ @@ -21,6 +21,18 @@ class BannerController extends Controller public function behaviors() { return [ + 'access'=>[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] + ], 'verbs' => [ 'class' => VerbFilter::className(), 'actions' => [ diff --git a/backend/controllers/BgController.php b/backend/controllers/BgController.php old mode 100644 new mode 100755 index fdaa0d4..f87fdd6 --- a/backend/controllers/BgController.php +++ b/backend/controllers/BgController.php @@ -8,7 +8,7 @@ use common\models\BgSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; - +use developeruz\db_rbac\behaviors\AccessBehavior; /** * BgController implements the CRUD actions for Bg model. */ @@ -20,6 +20,18 @@ class BgController extends Controller public function behaviors() { return [ + 'access'=>[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] + ], 'verbs' => [ 'class' => VerbFilter::className(), 'actions' => [ diff --git a/backend/controllers/BlogController.php b/backend/controllers/BlogController.php index b2d74d4..b92a161 100755 --- a/backend/controllers/BlogController.php +++ b/backend/controllers/BlogController.php @@ -1,7 +1,7 @@ [ - 'class' => AccessControl::className(), - 'rules' => [ - [ - 'actions' => ['login', 'error'], - 'allow' => true, - ], - [ - 'actions' => ['logout', 'index'], - 'allow' => true, - 'roles' => ['@'], - ], - ], + 'access'=>[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] ], 'verbs' => [ 'class' => VerbFilter::className(), diff --git a/backend/controllers/BrandController.php b/backend/controllers/BrandController.php index a15be2f..a7d3f22 100755 --- a/backend/controllers/BrandController.php +++ b/backend/controllers/BrandController.php @@ -1,7 +1,7 @@ [ - 'class' => AccessControl::className(), - 'rules' => [ - [ - 'actions' => ['login', 'error'], - 'allow' => true, - ], - [ - 'actions' => ['logout', 'index', 'create', 'update', 'view', 'delete'], - 'allow' => true, - 'roles' => ['@'], - ], - ], + 'access'=>[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] ], 'verbs' => [ 'class' => VerbFilter::className(), @@ -98,11 +96,6 @@ class BrandController extends Controller { $model = $this->findModel($id); - var_dump($_POST); - print "\n+++++++++++++++++++++++++++++++++++++\n"; - var_dump($_FILES); - exit; - if ($model->load(Yii::$app->request->post()) && $model->save()) { return $this->redirect(['view', 'id' => $model->brand_id]); } else { diff --git a/backend/controllers/CategoryController.php b/backend/controllers/CategoryController.php index bda3e4e..7f17727 100755 --- a/backend/controllers/CategoryController.php +++ b/backend/controllers/CategoryController.php @@ -1,7 +1,7 @@ [ - 'class' => AccessControl::className(), - 'rules' => [ - [ - 'actions' => ['login', 'error'], - 'allow' => true, - ], - [ - 'actions' => ['logout', 'index', 'create', 'update', 'view', 'delete'], - 'allow' => true, - 'roles' => ['@'], - ], - ], + 'access'=>[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] ], 'verbs' => [ 'class' => VerbFilter::className(), diff --git a/backend/controllers/CustomerController.php b/backend/controllers/CustomerController.php old mode 100644 new mode 100755 index b6e3a57..c91e15d --- a/backend/controllers/CustomerController.php +++ b/backend/controllers/CustomerController.php @@ -8,7 +8,7 @@ use common\models\CustomerSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; - +use developeruz\db_rbac\behaviors\AccessBehavior; /** * CustomerController implements the CRUD actions for Customer model. */ @@ -20,6 +20,18 @@ class CustomerController extends Controller public function behaviors() { return [ + 'access'=>[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] + ], 'verbs' => [ 'class' => VerbFilter::className(), 'actions' => [ diff --git a/backend/controllers/EventController.php b/backend/controllers/EventController.php index 748df40..29756ba 100755 --- a/backend/controllers/EventController.php +++ b/backend/controllers/EventController.php @@ -8,7 +8,7 @@ use common\models\EventSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; - +use developeruz\db_rbac\behaviors\AccessBehavior; /** * EventController implements the CRUD actions for Event model. */ @@ -20,6 +20,18 @@ class EventController extends Controller public function behaviors() { return [ + 'access'=>[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] + ], 'verbs' => [ 'class' => VerbFilter::className(), 'actions' => [ diff --git a/backend/controllers/OrdersController.php b/backend/controllers/OrdersController.php old mode 100644 new mode 100755 index 2f03b44..319f525 --- a/backend/controllers/OrdersController.php +++ b/backend/controllers/OrdersController.php @@ -12,7 +12,7 @@ use backend\models\Orders; use backend\models\OrdersProducts; use common\modules\product\models\ProductVariant; use yii\web\NotFoundHttpException; - +use developeruz\db_rbac\behaviors\AccessBehavior; class OrdersController extends Controller { @@ -22,6 +22,18 @@ class OrdersController extends Controller public function behaviors() { return [ + 'access'=>[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] + ], 'verbs' => [ 'class' => VerbFilter::className(), 'actions' => [ @@ -47,7 +59,7 @@ class OrdersController extends Controller $model = $this->findModel((int)$id); $dataProvider = new ActiveDataProvider([ - 'query' => OrdersProducts::find()->where(['order_id'=>(int)$_GET['id']]), + 'query' => OrdersProducts::find()->where(['order_id'=>(int)$id]), 'pagination' => [ 'pageSize' => 20, ], diff --git a/backend/controllers/PageController.php b/backend/controllers/PageController.php index 17c5f4f..fbe101f 100755 --- a/backend/controllers/PageController.php +++ b/backend/controllers/PageController.php @@ -8,7 +8,7 @@ use common\models\PageSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; - +use developeruz\db_rbac\behaviors\AccessBehavior; /** * PageController implements the CRUD actions for Page model. */ @@ -20,6 +20,18 @@ class PageController extends Controller public function behaviors() { return [ + 'access'=>[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] + ], 'verbs' => [ 'class' => VerbFilter::className(), 'actions' => [ diff --git a/backend/controllers/SeoCategoryController.php b/backend/controllers/SeoCategoryController.php index 433a3f5..805891a 100755 --- a/backend/controllers/SeoCategoryController.php +++ b/backend/controllers/SeoCategoryController.php @@ -8,7 +8,7 @@ use common\models\SeoCategorySearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; - +use developeruz\db_rbac\behaviors\AccessBehavior; /** * SeoCategoryController implements the CRUD actions for SeoCategory model. */ @@ -20,6 +20,18 @@ class SeoCategoryController extends Controller public function behaviors() { return [ + 'access'=>[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] + ], 'verbs' => [ 'class' => VerbFilter::className(), 'actions' => [ diff --git a/backend/controllers/SeoController.php b/backend/controllers/SeoController.php index 3ec6b7c..d92a4ac 100755 --- a/backend/controllers/SeoController.php +++ b/backend/controllers/SeoController.php @@ -8,7 +8,7 @@ use common\models\SeoSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; - +use developeruz\db_rbac\behaviors\AccessBehavior; /** * SeoController implements the CRUD actions for Seo model. */ @@ -20,6 +20,18 @@ class SeoController extends Controller public function behaviors() { return [ + 'access'=>[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] + ], 'verbs' => [ 'class' => VerbFilter::className(), 'actions' => [ diff --git a/backend/controllers/SeoDynamicController.php b/backend/controllers/SeoDynamicController.php index ba243a9..d0e5045 100755 --- a/backend/controllers/SeoDynamicController.php +++ b/backend/controllers/SeoDynamicController.php @@ -8,7 +8,7 @@ use common\models\SeoDynamicSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; - +use developeruz\db_rbac\behaviors\AccessBehavior; /** * SeoDynamicController implements the CRUD actions for SeoDynamic model. */ @@ -20,6 +20,18 @@ class SeoDynamicController extends Controller public function behaviors() { return [ + 'access'=>[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] + ], 'verbs' => [ 'class' => VerbFilter::className(), 'actions' => [ diff --git a/backend/controllers/ServiceController.php b/backend/controllers/ServiceController.php index ef229bc..4f199de 100755 --- a/backend/controllers/ServiceController.php +++ b/backend/controllers/ServiceController.php @@ -8,7 +8,7 @@ use common\models\ServiceSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; - +use developeruz\db_rbac\behaviors\AccessBehavior; /** * ServiceController implements the CRUD actions for Service model. */ @@ -20,6 +20,18 @@ class ServiceController extends Controller public function behaviors() { return [ + 'access'=>[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] + ], 'verbs' => [ 'class' => VerbFilter::className(), 'actions' => [ diff --git a/backend/controllers/SiteController.php b/backend/controllers/SiteController.php index 3b88430..e400884 100755 --- a/backend/controllers/SiteController.php +++ b/backend/controllers/SiteController.php @@ -1,6 +1,6 @@ [ - 'class' => AccessControl::className(), - 'rules' => [ - [ - 'actions' => ['login', 'error', 'go'], - 'allow' => true, - ], - [ - 'actions' => ['logout', 'index'], - 'allow' => true, - 'roles' => ['@'], - ], - ], + 'access'=>[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] ], 'verbs' => [ 'class' => VerbFilter::className(), diff --git a/backend/controllers/SliderController.php b/backend/controllers/SliderController.php index afd9155..dad2406 100755 --- a/backend/controllers/SliderController.php +++ b/backend/controllers/SliderController.php @@ -10,7 +10,7 @@ use yii\helpers\ArrayHelper; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; - +use developeruz\db_rbac\behaviors\AccessBehavior; /** * SliderController implements the CRUD actions for Slider model. */ @@ -22,6 +22,18 @@ class SliderController extends Controller public function behaviors() { return [ + 'access'=>[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] + ], 'verbs' => [ 'class' => VerbFilter::className(), 'actions' => [ diff --git a/backend/controllers/SliderImageController.php b/backend/controllers/SliderImageController.php index e0cf010..583a2c6 100755 --- a/backend/controllers/SliderImageController.php +++ b/backend/controllers/SliderImageController.php @@ -1,7 +1,7 @@ [ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] + ], 'verbs' => [ 'class' => VerbFilter::className(), 'actions' => [ diff --git a/backend/controllers/SubscribeController.php b/backend/controllers/SubscribeController.php old mode 100644 new mode 100755 index 072435d..211bddf --- a/backend/controllers/SubscribeController.php +++ b/backend/controllers/SubscribeController.php @@ -8,7 +8,7 @@ use common\models\SubscribeSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; - +use developeruz\db_rbac\behaviors\AccessBehavior; /** * SubscribeController implements the CRUD actions for Subscribe model. */ @@ -20,6 +20,18 @@ class SubscribeController extends Controller public function behaviors() { return [ + 'access'=>[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ] + ] + ], 'verbs' => [ 'class' => VerbFilter::className(), 'actions' => [ diff --git a/backend/controllers/UserController.php b/backend/controllers/UserController.php new file mode 100644 index 0000000..fc98ea7 --- /dev/null +++ b/backend/controllers/UserController.php @@ -0,0 +1,143 @@ +[ + 'class' => AccessBehavior::className(), + 'rules' => + ['site' => + [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ] + ], + 'user' => + [ + [ + 'actions' => ['index', 'create', 'update'], + 'allow' => true, + ] + ] + ], + ], + 'verbs' => [ + 'class' => VerbFilter::className(), + 'actions' => [ + 'delete' => ['POST'], + ], + ], + ]; + } + + /** + * Lists all User models. + * @return mixed + */ + public function actionIndex() + { + $searchModel = new UserSearch(); + $dataProvider = $searchModel->search(Yii::$app->request->queryParams); + + return $this->render('index', [ + 'searchModel' => $searchModel, + 'dataProvider' => $dataProvider, + ]); + } + + /** + * Displays a single User model. + * @param integer $id + * @return mixed + */ + public function actionView($id) + { + return $this->render('view', [ + 'model' => $this->findModel($id), + ]); + } + + /** + * Creates a new User model. + * If creation is successful, the browser will be redirected to the 'view' page. + * @return mixed + */ + public function actionCreate() + { + $model = new User(); + + if ($model->load(Yii::$app->request->post()) && $model->save()) { + return $this->redirect(['view', 'id' => $model->id]); + } else { + return $this->render('create', [ + 'model' => $model, + ]); + } + } + + /** + * Updates an existing User model. + * If update is successful, the browser will be redirected to the 'view' page. + * @param integer $id + * @return mixed + */ + public function actionUpdate($id) + { + $model = $this->findModel($id); + + if ($model->load(Yii::$app->request->post()) && $model->save()) { + return $this->redirect(['view', 'id' => $model->id]); + } else { + return $this->render('update', [ + 'model' => $model, + ]); + } + } + + /** + * Deletes an existing User model. + * If deletion is successful, the browser will be redirected to the 'index' page. + * @param integer $id + * @return mixed + */ + public function actionDelete($id) + { + $this->findModel($id)->delete(); + + return $this->redirect(['index']); + } + + /** + * Finds the User model based on its primary key value. + * If the model is not found, a 404 HTTP exception will be thrown. + * @param integer $id + * @return User the loaded model + * @throws NotFoundHttpException if the model cannot be found + */ + protected function findModel($id) + { + if (($model = User::findOne($id)) !== null) { + return $model; + } else { + throw new NotFoundHttpException('The requested page does not exist.'); + } + } +} diff --git a/backend/models/Label.php b/backend/models/Label.php old mode 100644 new mode 100755 index fbbc9f7..fbbc9f7 --- a/backend/models/Label.php +++ b/backend/models/Label.php diff --git a/backend/models/Orders.php b/backend/models/Orders.php old mode 100644 new mode 100755 index 982e623..982e623 --- a/backend/models/Orders.php +++ b/backend/models/Orders.php diff --git a/backend/models/OrdersProducts.php b/backend/models/OrdersProducts.php old mode 100644 new mode 100755 index 503f311..503f311 --- a/backend/models/OrdersProducts.php +++ b/backend/models/OrdersProducts.php diff --git a/backend/models/OrdersSearch.php b/backend/models/OrdersSearch.php old mode 100644 new mode 100755 index 5183ad6..5183ad6 --- a/backend/models/OrdersSearch.php +++ b/backend/models/OrdersSearch.php diff --git a/backend/models/User.php b/backend/models/User.php new file mode 100644 index 0000000..e18e01a --- /dev/null +++ b/backend/models/User.php @@ -0,0 +1,111 @@ + 255], + [['auth_key'], 'string', 'max' => 32], + [['email'], 'unique'], + [['password_reset_token'], 'unique'], + [['username'], 'unique'], + ]; + } + + /** + * @inheritdoc + */ + public function attributeLabels() + { + return [ + 'id' => 'ID', + 'username' => 'Username', + 'auth_key' => 'Auth Key', + 'password_hash' => 'Password Hash', + 'password_reset_token' => 'Password Reset Token', + 'email' => 'Email', + 'status' => 'Status', + 'created_at' => 'Created At', + 'updated_at' => 'Updated At', + ]; + } + + /** + * @return \yii\db\ActiveQuery + */ + public function getComments() + { + return $this->hasMany(Comment::className(), ['user_id' => 'id']); + } + + /** + * @return \yii\db\ActiveQuery + */ + public function getRatings() + { + return $this->hasMany(Rating::className(), ['user_id' => 'id']); + } + + /** + * @return \yii\db\ActiveQuery + */ + public function getShares() + { + return $this->hasMany(Share::className(), ['user_id' => 'id']); + } + + public function getId() + { + return $this->getPrimaryKey(); + } + + public function getUserName() + { + return $this->username; + } + + public static function findIdentity($id) + { + return static::findOne(['id' => $id, 'status' => self::STATUS_ACTIVE]); + } + +} diff --git a/backend/models/UserSearch.php b/backend/models/UserSearch.php new file mode 100644 index 0000000..5ac51e0 --- /dev/null +++ b/backend/models/UserSearch.php @@ -0,0 +1,76 @@ + $query, + ]); + + $this->load($params); + + if (!$this->validate()) { + // uncomment the following line if you do not want to return any records when validation fails + // $query->where('0=1'); + return $dataProvider; + } + + // grid filtering conditions + $query->andFilterWhere([ + 'id' => $this->id, + 'status' => $this->status, + 'created_at' => $this->created_at, + 'updated_at' => $this->updated_at, + ]); + + $query->andFilterWhere(['like', 'username', $this->username]) + ->andFilterWhere(['like', 'auth_key', $this->auth_key]) + ->andFilterWhere(['like', 'password_hash', $this->password_hash]) + ->andFilterWhere(['like', 'password_reset_token', $this->password_reset_token]) + ->andFilterWhere(['like', 'email', $this->email]); + + return $dataProvider; + } +} diff --git a/backend/views/bg/_form.php b/backend/views/bg/_form.php old mode 100644 new mode 100755 index 30dd166..30dd166 --- a/backend/views/bg/_form.php +++ b/backend/views/bg/_form.php diff --git a/backend/views/bg/_search.php b/backend/views/bg/_search.php old mode 100644 new mode 100755 index 70a8e3a..70a8e3a --- a/backend/views/bg/_search.php +++ b/backend/views/bg/_search.php diff --git a/backend/views/bg/create.php b/backend/views/bg/create.php old mode 100644 new mode 100755 index bf0913a..bf0913a --- a/backend/views/bg/create.php +++ b/backend/views/bg/create.php diff --git a/backend/views/bg/index.php b/backend/views/bg/index.php old mode 100644 new mode 100755 index a5e92cd..a5e92cd --- a/backend/views/bg/index.php +++ b/backend/views/bg/index.php diff --git a/backend/views/bg/update.php b/backend/views/bg/update.php old mode 100644 new mode 100755 index a996870..a996870 --- a/backend/views/bg/update.php +++ b/backend/views/bg/update.php diff --git a/backend/views/bg/view.php b/backend/views/bg/view.php old mode 100644 new mode 100755 index c6f5005..c6f5005 --- a/backend/views/bg/view.php +++ b/backend/views/bg/view.php diff --git a/backend/views/brand/_form.php b/backend/views/brand/_form.php index 2e02b74..939566d 100755 --- a/backend/views/brand/_form.php +++ b/backend/views/brand/_form.php @@ -10,15 +10,26 @@ use yii\widgets\ActiveForm;
- ['enctype' => 'multipart/form-data'] - ]); ?> + field($model, 'name')->textInput() ?> field($model, 'alias')->textInput(['maxlength' => true]) ?> - + $model, + 'field'=>'image', + 'size' => [ + [ + 'width'=>102, + 'height'=>57, + ] + ], + 'multi'=>false, + 'gallery' => $model->image, + 'name' => 'Загрузить изображение' + ]); + ?> field($model, 'meta_title')->textInput(['maxlength' => true]) ?> diff --git a/backend/views/customer/_form.php b/backend/views/customer/_form.php old mode 100644 new mode 100755 index 01f70af..01f70af --- a/backend/views/customer/_form.php +++ b/backend/views/customer/_form.php diff --git a/backend/views/customer/_search.php b/backend/views/customer/_search.php old mode 100644 new mode 100755 index 3a462e9..3a462e9 --- a/backend/views/customer/_search.php +++ b/backend/views/customer/_search.php diff --git a/backend/views/customer/create.php b/backend/views/customer/create.php old mode 100644 new mode 100755 index 45796e5..45796e5 --- a/backend/views/customer/create.php +++ b/backend/views/customer/create.php diff --git a/backend/views/customer/index.php b/backend/views/customer/index.php old mode 100644 new mode 100755 index b7e25bf..b7e25bf --- a/backend/views/customer/index.php +++ b/backend/views/customer/index.php diff --git a/backend/views/customer/update.php b/backend/views/customer/update.php old mode 100644 new mode 100755 index 360c058..360c058 --- a/backend/views/customer/update.php +++ b/backend/views/customer/update.php diff --git a/backend/views/customer/view.php b/backend/views/customer/view.php old mode 100644 new mode 100755 index c070573..c070573 --- a/backend/views/customer/view.php +++ b/backend/views/customer/view.php diff --git a/backend/views/layouts/main-sidebar.php b/backend/views/layouts/main-sidebar.php index 9e7010a..5c34645 100755 --- a/backend/views/layouts/main-sidebar.php +++ b/backend/views/layouts/main-sidebar.php @@ -56,6 +56,16 @@ use yii\widgets\Menu; ['label' => 'Подписка', 'url' => ['/subscribe/index']], ['label' => 'Пользователи', 'url' => ['/customer/index']], ['label' => 'Группы пользователей', 'url' => ['/group/index']], + [ + 'label' => 'Настройка ролей', + 'template'=>' {label}', + 'items' => [ + ['label' => 'Администраторы', 'url' => ['/user/index']], + ['label' => 'управление ролями', 'url' => ['/permit/access/role']], + ['label' => 'управление правами доступа', 'url' => ['/permit/access/permission']] + ] + ], + ], diff --git a/backend/views/orders/add.php b/backend/views/orders/add.php old mode 100644 new mode 100755 index 912df76..912df76 --- a/backend/views/orders/add.php +++ b/backend/views/orders/add.php diff --git a/backend/views/orders/index.php b/backend/views/orders/index.php old mode 100644 new mode 100755 index 75e48ee..8329765 --- a/backend/views/orders/index.php +++ b/backend/views/orders/index.php @@ -11,37 +11,24 @@ $this->title = 'Заказы'; $this->params['breadcrumbs'][] = $this->title; ?>

Заказы

+ 'label-form','method'=>'get','action'=>['/admin/orders/index']]); ?> - - - - +]); ?> $dataProvider, 'filterModel' => $searchModel, 'columns' => [ - // ['class' => 'yii\grid\SerialColumn'], [ 'attribute' => 'id', 'format' => 'raw', 'options' => ['class' => 'btn btn-warning'], 'value' => function($model){ - return Html::button($model->id, ['id'=>$model->id, 'class' => 'btn btn-warning']); '/admin/orders/show?id=47'; - //return Html::a($model->id, ['/admin/orders/show', 'id'=>$model->id], ['class'=>'btn btn-warning'] ); - // return Html::a($data->name, ['/admin/orders/show','id'=>$data->id]); + return Html::button($model->id, ['id'=>$model->id, 'class' => 'btn btn-warning']); + } ], - /*[ - 'attribute' =>'username', - 'value'=>function($data){ - if(!empty($data->user->username))return Html::a($data->user->username, ['/admin/users/show','id'=>$data->user->id]); - }, - 'format'=>'raw', - //'contentOptions'=>['style'=>'width: 160px;'] - ], */ [ 'attribute' => 'date_time', 'value'=>'date_time', @@ -55,18 +42,15 @@ $this->params['breadcrumbs'][] = $this->title; [ 'attribute' => 'phone', 'value'=>'phone', - //'contentOptions'=>['style'=>'max-width: 300px;'] ], [ 'attribute' => 'total', 'value'=>'total', - //'contentOptions'=>['style'=>'max-width: 300px;'] ], [ 'filter' => yii\helpers\ArrayHelper::map(Label::find()->orderBy('id')->asArray()->all(), 'id', 'label'), 'attribute' => 'label', 'value' => function ($model, $key, $index, $column) { - // var_dump($model); var_dump($key); exit; return Html::activeDropDownList($model, 'label', yii\helpers\ArrayHelper::map(Label::find()->orderBy('id')->asArray()->all(), 'id', 'label'), [ @@ -84,11 +68,12 @@ $this->params['breadcrumbs'][] = $this->title; ], [ 'attribute' => 'pay', - 'value' => function ($model, $key, $index, $column) { - // var_dump($model); var_dump($key); exit; + 'filter' => [ + 0 => 'Нет',1=>'Да' + ], + 'value' => function ($model, $key, $index, $column) { return Html::activeDropDownList($model, 'pay',[0 => 'Нет',1=>'Да'], [ - // 'prompt' => 'Нет', 'onchange' => "$.ajax({ url: \"/admin/orders/payupdate\", type: \"post\", @@ -112,3 +97,4 @@ $this->params['breadcrumbs'][] = $this->title; ], ], ]) ?> + \ No newline at end of file diff --git a/backend/views/orders/show.php b/backend/views/orders/show.php old mode 100644 new mode 100755 index 75abacb..75abacb --- a/backend/views/orders/show.php +++ b/backend/views/orders/show.php diff --git a/backend/views/orders/update.php b/backend/views/orders/update.php old mode 100644 new mode 100755 index e255d66..e255d66 --- a/backend/views/orders/update.php +++ b/backend/views/orders/update.php diff --git a/backend/views/subscribe/_form.php b/backend/views/subscribe/_form.php old mode 100644 new mode 100755 index 36ef492..36ef492 --- a/backend/views/subscribe/_form.php +++ b/backend/views/subscribe/_form.php diff --git a/backend/views/subscribe/_search.php b/backend/views/subscribe/_search.php old mode 100644 new mode 100755 index e2aaf8a..e2aaf8a --- a/backend/views/subscribe/_search.php +++ b/backend/views/subscribe/_search.php diff --git a/backend/views/subscribe/create.php b/backend/views/subscribe/create.php old mode 100644 new mode 100755 index 3f6f09f..3f6f09f --- a/backend/views/subscribe/create.php +++ b/backend/views/subscribe/create.php diff --git a/backend/views/subscribe/index.php b/backend/views/subscribe/index.php old mode 100644 new mode 100755 index 68e32f3..68e32f3 --- a/backend/views/subscribe/index.php +++ b/backend/views/subscribe/index.php diff --git a/backend/views/subscribe/update.php b/backend/views/subscribe/update.php old mode 100644 new mode 100755 index 2137e89..2137e89 --- a/backend/views/subscribe/update.php +++ b/backend/views/subscribe/update.php diff --git a/backend/views/subscribe/view.php b/backend/views/subscribe/view.php old mode 100644 new mode 100755 index 7c96baa..7c96baa --- a/backend/views/subscribe/view.php +++ b/backend/views/subscribe/view.php diff --git a/backend/views/user/_form.php b/backend/views/user/_form.php new file mode 100644 index 0000000..7fd9f4d --- /dev/null +++ b/backend/views/user/_form.php @@ -0,0 +1,34 @@ + + +
+ + + + field($model, 'username')->textInput(['maxlength' => true]) ?> + + field($model, 'auth_key')->textInput(['maxlength' => true]) ?> + + field($model, 'password_hash')->textInput(['maxlength' => true]) ?> + + field($model, 'password_reset_token')->textInput(['maxlength' => true]) ?> + + field($model, 'email')->textInput(['maxlength' => true]) ?> + + field($model, 'status')->textInput() ?> + + +
+ isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> +
+ + + +
diff --git a/backend/views/user/_search.php b/backend/views/user/_search.php new file mode 100644 index 0000000..950b13d --- /dev/null +++ b/backend/views/user/_search.php @@ -0,0 +1,43 @@ + + +
+ + ['index'], + 'method' => 'get', + ]); ?> + + field($model, 'id') ?> + + field($model, 'username') ?> + + field($model, 'auth_key') ?> + + field($model, 'password_hash') ?> + + field($model, 'password_reset_token') ?> + + field($model, 'email') ?> + + field($model, 'status') ?> + + field($model, 'created_at') ?> + + field($model, 'updated_at') ?> + +
+ 'btn btn-primary']) ?> + 'btn btn-default']) ?> +
+ + + +
diff --git a/backend/views/user/create.php b/backend/views/user/create.php new file mode 100644 index 0000000..254e3e2 --- /dev/null +++ b/backend/views/user/create.php @@ -0,0 +1,21 @@ +title = 'Create User'; +$this->params['breadcrumbs'][] = ['label' => 'Users', 'url' => ['index']]; +$this->params['breadcrumbs'][] = $this->title; +?> +
+ +

title) ?>

+ + render('_form', [ + 'model' => $model, + ]) ?> + +
diff --git a/backend/views/user/index.php b/backend/views/user/index.php new file mode 100644 index 0000000..92f2707 --- /dev/null +++ b/backend/views/user/index.php @@ -0,0 +1,47 @@ +title = 'Users'; +$this->params['breadcrumbs'][] = $this->title; +?> +
+ +

title) ?>

+ render('_search', ['model' => $searchModel]); ?> + +

+ 'btn btn-success']) ?> +

+ $dataProvider, + 'filterModel' => $searchModel, + 'columns' => [ + ['class' => 'yii\grid\SerialColumn'], + + 'id', + 'username', + 'auth_key', + 'password_hash', + 'password_reset_token', + + + ['class' => 'yii\grid\ActionColumn', + 'template' => '{view}  {update}  {permit}  {delete}', + 'buttons' => + [ + 'permit' => function ($url, $model) { + return Html::a('', Url::to(['/permit/user/view', 'id' => $model->id]), [ + 'title' => Yii::t('yii', 'Change user role') + ]); }, + ] + ], + ], + ]); ?> +
diff --git a/backend/views/user/update.php b/backend/views/user/update.php new file mode 100644 index 0000000..2122e27 --- /dev/null +++ b/backend/views/user/update.php @@ -0,0 +1,21 @@ +title = 'Update User: ' . $model->id; +$this->params['breadcrumbs'][] = ['label' => 'Users', 'url' => ['index']]; +$this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]]; +$this->params['breadcrumbs'][] = 'Update'; +?> +
+ +

title) ?>

+ + render('_form', [ + 'model' => $model, + ]) ?> + +
diff --git a/backend/views/user/view.php b/backend/views/user/view.php new file mode 100644 index 0000000..2e8eb34 --- /dev/null +++ b/backend/views/user/view.php @@ -0,0 +1,41 @@ +title = $model->id; +$this->params['breadcrumbs'][] = ['label' => 'Users', 'url' => ['index']]; +$this->params['breadcrumbs'][] = $this->title; +?> +
+ +

title) ?>

+ +

+ $model->id], ['class' => 'btn btn-primary']) ?> + $model->id], [ + 'class' => 'btn btn-danger', + 'data' => [ + 'confirm' => 'Are you sure you want to delete this item?', + 'method' => 'post', + ], + ]) ?> +

+ + $model, + 'attributes' => [ + 'id', + 'username', + 'auth_key', + 'password_hash', + 'password_reset_token', + 'email:email', + 'status', + ], + ]) ?> + +
diff --git a/backend/web/js/site.js b/backend/web/js/site.js old mode 100644 new mode 100755 index 41781c3..067057b --- a/backend/web/js/site.js +++ b/backend/web/js/site.js @@ -2,14 +2,9 @@ $(document).ready(function(){ var iii = true; - // console.log(ddd); - // if (ddd) {console.log('hello var ddd is correnct') - // }else { - // console.log('var ddd is not exist'); - // }; - - console.log($('button')); - $('button').click(function(){ + + + $('body').on('click','.btn-warning', function(){ var testt = $(this); diff --git a/common/components/artboximage/ArtboxImage.php b/common/components/artboximage/ArtboxImage.php old mode 100644 new mode 100755 index e916b40..244bd62 --- a/common/components/artboximage/ArtboxImage.php +++ b/common/components/artboximage/ArtboxImage.php @@ -28,7 +28,7 @@ class ArtboxImage extends Component { 'bmp' => 'bmp', ]; - public $uploadUrl = '@web/artboxfile/action/upload'; + public $uploadUrl = '/admin/artboxfile/action/upload'; public function load($file = null, $driver = null) { if(empty($file) || !realpath($file)) { @@ -37,8 +37,7 @@ class ArtboxImage extends Component { return Image::factory($file, $driver ? $driver : $this->driver); } - public function fileinputWidget($model, $modelField = 'file', $formField = 'fileUpload', $multiple = false, $imageOnly = true) { - $uploadUrl = Yii::getAlias($this->uploadUrl); + public function fileinputWidget($model, $modelField, $formField = 'fileUpload', $multiple = false, $imageOnly = true) { $options = [ 'multiple' => $multiple, ]; @@ -55,7 +54,7 @@ class ArtboxImage extends Component { 'overwriteInitial' => !$multiple, 'showRemove' => true, 'showUpload' => false, - 'uploadUrl' => $uploadUrl, + 'uploadUrl' => $this->uploadUrl, 'uploadExtraData' => [ 'fileField' => $modelField, 'multiple' => intval($multiple), diff --git a/common/components/artboximage/ArtboxImageHelper.php b/common/components/artboximage/ArtboxImageHelper.php old mode 100644 new mode 100755 index a379b21..a379b21 --- a/common/components/artboximage/ArtboxImageHelper.php +++ b/common/components/artboximage/ArtboxImageHelper.php diff --git a/common/config/main.php b/common/config/main.php index fe09ece..91bcbce 100755 --- a/common/config/main.php +++ b/common/config/main.php @@ -130,11 +130,8 @@ return [ ], 'modules' => [ -// 'file' => [ -// 'class' => 'common\modules\file\Module', -// ], - 'artboxfile' => [ - 'class' => 'common\modules\artboxfile\Module', + 'file' => [ + 'class' => 'common\modules\file\Module', ], 'relation' => [ 'class' => 'common\modules\relation\Module', diff --git a/common/models/BgSearch.php b/common/models/BgSearch.php old mode 100644 new mode 100755 index 485aa6e..485aa6e --- a/common/models/BgSearch.php +++ b/common/models/BgSearch.php diff --git a/common/models/CustomerSearch.php b/common/models/CustomerSearch.php old mode 100644 new mode 100755 index 9cd6feb..9cd6feb --- a/common/models/CustomerSearch.php +++ b/common/models/CustomerSearch.php diff --git a/common/models/Delivery.php b/common/models/Delivery.php old mode 100644 new mode 100755 index d1a9304..d1a9304 --- a/common/models/Delivery.php +++ b/common/models/Delivery.php diff --git a/common/models/OrdersProducts.php b/common/models/OrdersProducts.php old mode 100644 new mode 100755 index 5045d61..5045d61 --- a/common/models/OrdersProducts.php +++ b/common/models/OrdersProducts.php diff --git a/common/models/Share.php b/common/models/Share.php old mode 100644 new mode 100755 index 8a2eb57..8a2eb57 --- a/common/models/Share.php +++ b/common/models/Share.php diff --git a/common/models/SubscribeSearch.php b/common/models/SubscribeSearch.php old mode 100644 new mode 100755 index 4aeca70..4aeca70 --- a/common/models/SubscribeSearch.php +++ b/common/models/SubscribeSearch.php diff --git a/common/models/User.php b/common/models/User.php index e43ab1a..71d7a0c 100755 --- a/common/models/User.php +++ b/common/models/User.php @@ -185,4 +185,6 @@ class User extends ActiveRecord implements IdentityInterface { $this->password_reset_token = null; } + + } diff --git a/common/modules/artboxfile/Module.php b/common/modules/artboxfile/Module.php old mode 100644 new mode 100755 index 72360d2..72360d2 --- a/common/modules/artboxfile/Module.php +++ b/common/modules/artboxfile/Module.php diff --git a/common/modules/artboxfile/config.php b/common/modules/artboxfile/config.php old mode 100644 new mode 100755 index d0b9c34..d0b9c34 --- a/common/modules/artboxfile/config.php +++ b/common/modules/artboxfile/config.php diff --git a/common/modules/artboxfile/controllers/ActionController.php b/common/modules/artboxfile/controllers/ActionController.php old mode 100644 new mode 100755 index f52ffbb..f52ffbb --- a/common/modules/artboxfile/controllers/ActionController.php +++ b/common/modules/artboxfile/controllers/ActionController.php diff --git a/common/modules/artboxfile/models/File.php b/common/modules/artboxfile/models/File.php old mode 100644 new mode 100755 index f5c4188..f5c4188 --- a/common/modules/artboxfile/models/File.php +++ b/common/modules/artboxfile/models/File.php diff --git a/common/modules/product/models/Brand.php b/common/modules/product/models/Brand.php index b9ab809..11d83fa 100755 --- a/common/modules/product/models/Brand.php +++ b/common/modules/product/models/Brand.php @@ -10,7 +10,7 @@ use Yii; * This is the model class for table "brand". * * @property integer $brand_id - + * @property string $remote_id * @property integer $brand_name_id * @property string $alias * @property string $image @@ -67,6 +67,7 @@ class Brand extends \yii\db\ActiveRecord [['alias', 'name'], 'string', 'max' => 250], [['image', 'meta_title'], 'string', 'max' => 255], [['meta_robots'], 'string', 'max' => 50], + [['remote_id'], 'string', 'max' => 25], [['imageUpload'], 'safe'], [['imageUpload'], 'file', 'extensions' => 'jpg, gif, png'], // [['brand_name_id'], 'exist', 'skipOnError' => true, 'targetClass' => BrandName::className(), 'targetAttribute' => ['brand_name_id' => 'brand_name_id']], @@ -89,6 +90,7 @@ class Brand extends \yii\db\ActiveRecord 'meta_desc' => Yii::t('product', 'Meta Desc'), 'meta_robots' => Yii::t('product', 'Meta Robots'), 'seo_text' => Yii::t('product', 'Seo Text'), + 'remote_id' => Yii::t('product', '1C brand name'), ]; } diff --git a/common/modules/product/widgets/lastProducts.php b/common/modules/product/widgets/lastProducts.php old mode 100644 new mode 100755 index 225b655..225b655 --- a/common/modules/product/widgets/lastProducts.php +++ b/common/modules/product/widgets/lastProducts.php diff --git a/common/modules/product/widgets/specialProducts.php b/common/modules/product/widgets/specialProducts.php old mode 100644 new mode 100755 index 3f0d5c0..3f0d5c0 --- a/common/modules/product/widgets/specialProducts.php +++ b/common/modules/product/widgets/specialProducts.php diff --git a/common/modules/product/widgets/views/product_smart.php b/common/modules/product/widgets/views/product_smart.php old mode 100644 new mode 100755 index 000591e..000591e --- a/common/modules/product/widgets/views/product_smart.php +++ b/common/modules/product/widgets/views/product_smart.php diff --git a/common/modules/product/widgets/views/products_block.php b/common/modules/product/widgets/views/products_block.php old mode 100644 new mode 100755 index 4f0d380..3c5370c --- a/common/modules/product/widgets/views/products_block.php +++ b/common/modules/product/widgets/views/products_block.php @@ -1,3 +1,4 @@ +

    diff --git a/console/controllers/RbacController.php b/console/controllers/RbacController.php new file mode 100644 index 0000000..799002f --- /dev/null +++ b/console/controllers/RbacController.php @@ -0,0 +1,46 @@ +authManager; + + // add "createPost" permission + $createPost = $auth->createPermission('createPost'); + $createPost->description = 'Create a post'; + $auth->add($createPost); + + // add "updatePost" permission + $updatePost = $auth->createPermission('updatePost'); + $updatePost->description = 'Update post'; + $auth->add($updatePost); + +// // add "author" role and give this role the "createPost" permission + $author = $auth->createRole('author'); + $auth->add($author); + $auth->addChild($author, $createPost); +// +// // add "admin" role and give this role the "updatePost" permission +// // as well as the permissions of the "author" role + $admin = $auth->createRole('admin'); + $auth->add($admin); + $auth->addChild($admin, $updatePost); + $auth->addChild($admin, $author); +// +// // Assign roles to users. 1 and 2 are IDs returned by IdentityInterface::getId() +// // usually implemented in your User model. +// $auth->assign($author, 2); +// $auth->assign($admin, 1); + + + } +} + + + diff --git a/console/migrations/m160512_153443_subscribe.php b/console/migrations/m160512_153443_subscribe.php old mode 100644 new mode 100755 index 2520be3..2520be3 --- a/console/migrations/m160512_153443_subscribe.php +++ b/console/migrations/m160512_153443_subscribe.php diff --git a/console/migrations/m160516_222821_orders.php b/console/migrations/m160516_222821_orders.php old mode 100644 new mode 100755 index 80bf1ab..80bf1ab --- a/console/migrations/m160516_222821_orders.php +++ b/console/migrations/m160516_222821_orders.php diff --git a/console/migrations/m160516_234753_orders_delivery.php b/console/migrations/m160516_234753_orders_delivery.php old mode 100644 new mode 100755 index 29cff5b..29cff5b --- a/console/migrations/m160516_234753_orders_delivery.php +++ b/console/migrations/m160516_234753_orders_delivery.php diff --git a/console/migrations/m160517_072059_delete_product_fk.php b/console/migrations/m160517_072059_delete_product_fk.php old mode 100644 new mode 100755 index 28972f9..28972f9 --- a/console/migrations/m160517_072059_delete_product_fk.php +++ b/console/migrations/m160517_072059_delete_product_fk.php diff --git a/console/migrations/m160517_073502_orders_label.php b/console/migrations/m160517_073502_orders_label.php old mode 100644 new mode 100755 index 104048e..104048e --- a/console/migrations/m160517_073502_orders_label.php +++ b/console/migrations/m160517_073502_orders_label.php diff --git a/console/migrations/m160518_185644_change_order.php b/console/migrations/m160518_185644_change_order.php old mode 100644 new mode 100755 index 07dffdc..07dffdc --- a/console/migrations/m160518_185644_change_order.php +++ b/console/migrations/m160518_185644_change_order.php diff --git a/frontend/controllers/BasketController.php b/frontend/controllers/BasketController.php old mode 100644 new mode 100755 index 81f3adc..cc37c57 --- a/frontend/controllers/BasketController.php +++ b/frontend/controllers/BasketController.php @@ -38,7 +38,7 @@ class BasketController extends Controller } $body .= "\n\r"; - if ($modelOrder->load(Yii::$app->request->post()) && $modelOrder->save() && $modelOrder->contact('borisenko.pavel@gmail.com',$body)) { + if ($modelOrder->load(Yii::$app->request->post()) && $modelOrder->save()) { foreach ($_POST['ProductVariant'] as $index=>$row) { $modelOrdersProducts = new OrdersProducts(); $mod_id = $row['id']; diff --git a/frontend/controllers/EventController.php b/frontend/controllers/EventController.php old mode 100644 new mode 100755 index db7a575..db7a575 --- a/frontend/controllers/EventController.php +++ b/frontend/controllers/EventController.php diff --git a/frontend/views/catalog/product.tmp.php b/frontend/views/catalog/product.tmp.php old mode 100644 new mode 100755 index 2b0ced3..2b0ced3 --- a/frontend/views/catalog/product.tmp.php +++ b/frontend/views/catalog/product.tmp.php diff --git a/frontend/views/catalog/product_item.php b/frontend/views/catalog/product_item.php index bbbaacd..e12e56b 100755 --- a/frontend/views/catalog/product_item.php +++ b/frontend/views/catalog/product_item.php @@ -5,23 +5,17 @@ use yii\helpers\Url;
  • - - imageUrl, 'list')?> + + image)) :?> + + + image->imageUrl, 'list')?> +
    - is_top) || !empty($product->is_new) || !empty($product->akciya)) :?> -
      - is_top)) :?> -
    • top 
      • - - is_new)) :?> -
    • new 
      • - - akciya)) :?> -
    • promo 
      • - -
    -
    diff --git a/frontend/views/event/_objects.php b/frontend/views/event/_objects.php old mode 100644 new mode 100755 index 84e2f38..84e2f38 --- a/frontend/views/event/_objects.php +++ b/frontend/views/event/_objects.php diff --git a/frontend/views/layouts/main-menu.php b/frontend/views/layouts/main-menu.php old mode 100644 new mode 100755 index 0dd0761..0dd0761 --- a/frontend/views/layouts/main-menu.php +++ b/frontend/views/layouts/main-menu.php diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php index aa141f8..079c2b7 100755 --- a/frontend/views/site/index.php +++ b/frontend/views/site/index.php @@ -16,17 +16,17 @@ $this->registerJsFile ( '; - echo SliderWidget::widget(["title"=>"HOME_SLIDER"]); - echo BannerWidget::widget(['title' => 'HOME_RIGHT']); +echo SliderWidget::widget(["title"=>"HOME_SLIDER"]); - echo '
    '; - echo BannerWidget::widget(['title' => 'HOME_UNDER_SLIDER_1']); - echo BannerWidget::widget(['title' => 'HOME_UNDER_SLIDER_2']); - echo BannerWidget::widget(['title' => 'HOME_UNDER_SLIDER_3']); - echo '
    '; +echo BannerWidget::widget(['title' => 'HOME_RIGHT']); -echo '
' +echo '
'; + +echo BannerWidget::widget(['title' => 'HOME_UNDER_SLIDER_1']); +echo BannerWidget::widget(['title' => 'HOME_UNDER_SLIDER_2']); +echo BannerWidget::widget(['title' => 'HOME_UNDER_SLIDER_3']); + +echo '
'; ?> 'rubrics', 'includes' => [117,118,119,120,121]])?> @@ -36,34 +36,31 @@ echo '
' 'top'])?> -
-

Почему

- -
-
- +

Почему

+ +
'HOME_CENTER']);?> diff --git a/frontend/web/css/ion.rangeSlider.css b/frontend/web/css/ion.rangeSlider.css old mode 100644 new mode 100755 index 68fd119..68fd119 --- a/frontend/web/css/ion.rangeSlider.css +++ b/frontend/web/css/ion.rangeSlider.css diff --git a/frontend/web/css/ion.rangeSlider.skinHTML5.css b/frontend/web/css/ion.rangeSlider.skinHTML5.css old mode 100644 new mode 100755 index 1fd2d73..1fd2d73 --- a/frontend/web/css/ion.rangeSlider.skinHTML5.css +++ b/frontend/web/css/ion.rangeSlider.skinHTML5.css diff --git a/frontend/web/images/no_photo.png b/frontend/web/images/no_photo.png old mode 100644 new mode 100755 index fc71420..fc71420 Binary files a/frontend/web/images/no_photo.png and b/frontend/web/images/no_photo.png differ diff --git a/frontend/web/images/products/1305887984-2604-2605.jpg b/frontend/web/images/products/1305887984-2604-2605.jpg deleted file mode 100644 index 7d2002f..0000000 Binary files a/frontend/web/images/products/1305887984-2604-2605.jpg and /dev/null differ diff --git a/frontend/web/images/products/1348483804-512-2445.jpg b/frontend/web/images/products/1348483804-512-2445.jpg deleted file mode 100644 index 408a581..0000000 Binary files a/frontend/web/images/products/1348483804-512-2445.jpg and /dev/null differ diff --git a/frontend/web/images/products/1348484212-3723-3585.jpg b/frontend/web/images/products/1348484212-3723-3585.jpg deleted file mode 100644 index d159571..0000000 Binary files a/frontend/web/images/products/1348484212-3723-3585.jpg and /dev/null differ diff --git a/frontend/web/images/products/1348484611-4020-7396.jpg b/frontend/web/images/products/1348484611-4020-7396.jpg deleted file mode 100644 index d8a3e02..0000000 Binary files a/frontend/web/images/products/1348484611-4020-7396.jpg and /dev/null differ diff --git a/frontend/web/images/products/1348485104-4555-7650.jpg b/frontend/web/images/products/1348485104-4555-7650.jpg deleted file mode 100644 index 61e01fa..0000000 Binary files a/frontend/web/images/products/1348485104-4555-7650.jpg and /dev/null differ diff --git a/frontend/web/images/products/1348487239-495-4299.jpg b/frontend/web/images/products/1348487239-495-4299.jpg deleted file mode 100644 index eeaf922..0000000 Binary files a/frontend/web/images/products/1348487239-495-4299.jpg and /dev/null differ diff --git a/frontend/web/images/products/1348487515-4424-1546.jpg b/frontend/web/images/products/1348487515-4424-1546.jpg deleted file mode 100644 index 01e68f7..0000000 Binary files a/frontend/web/images/products/1348487515-4424-1546.jpg and /dev/null differ diff --git a/frontend/web/images/products/1348489125-7133-6866.jpg b/frontend/web/images/products/1348489125-7133-6866.jpg deleted file mode 100644 index e239687..0000000 Binary files a/frontend/web/images/products/1348489125-7133-6866.jpg and /dev/null differ diff --git a/frontend/web/images/products/1348489542-702-5816.jpg b/frontend/web/images/products/1348489542-702-5816.jpg deleted file mode 100644 index b2663e6..0000000 Binary files a/frontend/web/images/products/1348489542-702-5816.jpg and /dev/null differ diff --git a/frontend/web/images/products/1348490194-360-284.jpg b/frontend/web/images/products/1348490194-360-284.jpg deleted file mode 100644 index d559b8b..0000000 Binary files a/frontend/web/images/products/1348490194-360-284.jpg and /dev/null differ diff --git a/frontend/web/images/products/1348490344-6421-5352.jpg b/frontend/web/images/products/1348490344-6421-5352.jpg deleted file mode 100644 index 0e63d72..0000000 Binary files a/frontend/web/images/products/1348490344-6421-5352.jpg and /dev/null differ diff --git a/frontend/web/images/products/1348490519-4780-1400.jpg b/frontend/web/images/products/1348490519-4780-1400.jpg deleted file mode 100644 index 59f0f72..0000000 Binary files a/frontend/web/images/products/1348490519-4780-1400.jpg and /dev/null differ diff --git a/frontend/web/images/products/1348492885-9127-2291.jpg b/frontend/web/images/products/1348492885-9127-2291.jpg deleted file mode 100644 index d5885a7..0000000 Binary files a/frontend/web/images/products/1348492885-9127-2291.jpg and /dev/null differ diff --git a/frontend/web/images/products/1366971036-9093-9799.jpg b/frontend/web/images/products/1366971036-9093-9799.jpg deleted file mode 100644 index 8a5f4c7..0000000 Binary files a/frontend/web/images/products/1366971036-9093-9799.jpg and /dev/null differ diff --git a/frontend/web/images/products/1366971215-512-3729.jpg b/frontend/web/images/products/1366971215-512-3729.jpg deleted file mode 100644 index d56dbbb..0000000 Binary files a/frontend/web/images/products/1366971215-512-3729.jpg and /dev/null differ diff --git a/frontend/web/images/products/1366971885-6949-9056.jpg b/frontend/web/images/products/1366971885-6949-9056.jpg deleted file mode 100644 index a912810..0000000 Binary files a/frontend/web/images/products/1366971885-6949-9056.jpg and /dev/null differ diff --git a/frontend/web/images/products/1372148121-6202-6680.jpg b/frontend/web/images/products/1372148121-6202-6680.jpg deleted file mode 100644 index 200e072..0000000 Binary files a/frontend/web/images/products/1372148121-6202-6680.jpg and /dev/null differ diff --git a/frontend/web/images/products/1372148169-4614-4290.jpg b/frontend/web/images/products/1372148169-4614-4290.jpg deleted file mode 100644 index de05f98..0000000 Binary files a/frontend/web/images/products/1372148169-4614-4290.jpg and /dev/null differ diff --git a/frontend/web/js/basket.js b/frontend/web/js/basket.js old mode 100644 new mode 100755 index 6b3fadb..6b3fadb --- a/frontend/web/js/basket.js +++ b/frontend/web/js/basket.js diff --git a/frontend/web/js/ion.rangeSlider.js b/frontend/web/js/ion.rangeSlider.js old mode 100644 new mode 100755 index ea0b5ea..ea0b5ea --- a/frontend/web/js/ion.rangeSlider.js +++ b/frontend/web/js/ion.rangeSlider.js diff --git a/frontend/web/libraries/aaa.php b/frontend/web/libraries/aaa.php old mode 100644 new mode 100755 index a32ce43..a32ce43 --- a/frontend/web/libraries/aaa.php +++ b/frontend/web/libraries/aaa.php diff --git a/frontend/web/libraries/ion/css/ion.rangeSlider.skinFlat.css b/frontend/web/libraries/ion/css/ion.rangeSlider.skinFlat.css old mode 100644 new mode 100755 index 166314e..166314e --- a/frontend/web/libraries/ion/css/ion.rangeSlider.skinFlat.css +++ b/frontend/web/libraries/ion/css/ion.rangeSlider.skinFlat.css diff --git a/frontend/web/libraries/ion/css/ion.rangeSlider.skinModern.css b/frontend/web/libraries/ion/css/ion.rangeSlider.skinModern.css old mode 100644 new mode 100755 index 13009c1..13009c1 --- a/frontend/web/libraries/ion/css/ion.rangeSlider.skinModern.css +++ b/frontend/web/libraries/ion/css/ion.rangeSlider.skinModern.css diff --git a/frontend/web/libraries/ion/css/ion.rangeSlider.skinNice.css b/frontend/web/libraries/ion/css/ion.rangeSlider.skinNice.css old mode 100644 new mode 100755 index 57b20d1..57b20d1 --- a/frontend/web/libraries/ion/css/ion.rangeSlider.skinNice.css +++ b/frontend/web/libraries/ion/css/ion.rangeSlider.skinNice.css diff --git a/frontend/web/libraries/ion/css/ion.rangeSlider.skinSimple.css b/frontend/web/libraries/ion/css/ion.rangeSlider.skinSimple.css old mode 100644 new mode 100755 index 34fc7e2..34fc7e2 --- a/frontend/web/libraries/ion/css/ion.rangeSlider.skinSimple.css +++ b/frontend/web/libraries/ion/css/ion.rangeSlider.skinSimple.css diff --git a/frontend/web/libraries/ion/css/normalize.css b/frontend/web/libraries/ion/css/normalize.css old mode 100644 new mode 100755 index 46f646a..46f646a --- a/frontend/web/libraries/ion/css/normalize.css +++ b/frontend/web/libraries/ion/css/normalize.css diff --git a/frontend/web/libraries/ion/img/sprite-skin-flat.png b/frontend/web/libraries/ion/img/sprite-skin-flat.png old mode 100644 new mode 100755 index 0f11c7c..0f11c7c Binary files a/frontend/web/libraries/ion/img/sprite-skin-flat.png and b/frontend/web/libraries/ion/img/sprite-skin-flat.png differ diff --git a/frontend/web/libraries/ion/img/sprite-skin-modern.png b/frontend/web/libraries/ion/img/sprite-skin-modern.png old mode 100644 new mode 100755 index c9060f2..c9060f2 Binary files a/frontend/web/libraries/ion/img/sprite-skin-modern.png and b/frontend/web/libraries/ion/img/sprite-skin-modern.png differ diff --git a/frontend/web/libraries/ion/img/sprite-skin-nice.png b/frontend/web/libraries/ion/img/sprite-skin-nice.png old mode 100644 new mode 100755 index 9b0a4bc..9b0a4bc Binary files a/frontend/web/libraries/ion/img/sprite-skin-nice.png and b/frontend/web/libraries/ion/img/sprite-skin-nice.png differ diff --git a/frontend/web/libraries/ion/img/sprite-skin-simple.png b/frontend/web/libraries/ion/img/sprite-skin-simple.png old mode 100644 new mode 100755 index 0dc5e68..0dc5e68 Binary files a/frontend/web/libraries/ion/img/sprite-skin-simple.png and b/frontend/web/libraries/ion/img/sprite-skin-simple.png differ diff --git a/frontend/web/libraries/ion/js/ion.rangeSlider.min.js b/frontend/web/libraries/ion/js/ion.rangeSlider.min.js old mode 100644 new mode 100755 index 11ae97f..11ae97f --- a/frontend/web/libraries/ion/js/ion.rangeSlider.min.js +++ b/frontend/web/libraries/ion/js/ion.rangeSlider.min.js diff --git a/frontend/widgets/Rubrics.php b/frontend/widgets/Rubrics.php old mode 100644 new mode 100755 index d5a868c..d5a868c --- a/frontend/widgets/Rubrics.php +++ b/frontend/widgets/Rubrics.php diff --git a/frontend/widgets/views/rubrics.php b/frontend/widgets/views/rubrics.php old mode 100644 new mode 100755 index 8f2a8be..8f2a8be --- a/frontend/widgets/views/rubrics.php +++ b/frontend/widgets/views/rubrics.php -- libgit2 0.21.4