diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php index 8852b9e..9a95474 100644 --- a/backend/views/layouts/main.php +++ b/backend/views/layouts/main.php @@ -5,10 +5,13 @@ * @var \yii\web\View $this */ + use artweb\artbox\core\widgets\FleshWidget; + use hiqdev\assets\pnotify\PNotifyAsset; use yii\helpers\Html; + use yii\web\View; $bundle = yiister\gentelella\assets\Asset::register($this); - + ?> beginPage(); ?> @@ -133,23 +136,7 @@ - - -
- - - - - - - - - - - - -
- + @@ -165,99 +152,31 @@ @@ -302,12 +221,7 @@ -
- -
-
-
+ endBody(); ?> diff --git a/common/config/bootstrap.php b/common/config/bootstrap.php old mode 100644 new mode 100755 index 93d0185..a40e27a --- a/common/config/bootstrap.php +++ b/common/config/bootstrap.php @@ -3,3 +3,4 @@ Yii::setAlias('@common', dirname(__DIR__)); Yii::setAlias('@frontend', dirname(dirname(__DIR__)) . '/frontend'); Yii::setAlias('@backend', dirname(dirname(__DIR__)) . '/backend'); Yii::setAlias('@console', dirname(dirname(__DIR__)) . '/console'); +Yii::setAlias('@artbox-core', dirname(dirname(__DIR__)) . '/artweb/artbox-core'); diff --git a/common/config/main.php b/common/config/main.php old mode 100644 new mode 100755 index c9071d1..58e25bc --- a/common/config/main.php +++ b/common/config/main.php @@ -5,5 +5,13 @@ return [ 'cache' => [ 'class' => 'yii\caching\FileCache', ], + 'i18n' => [ + 'translations' => [ + 'core' => [ + 'class' => 'yii\i18n\PhpMessageSource', + 'basePath' => '@artbox-core/messages', + ], + ], + ], ], ]; diff --git a/common/config/params.php b/common/config/params.php old mode 100644 new mode 100755 index 4ec9ba6..4ec9ba6 --- a/common/config/params.php +++ b/common/config/params.php diff --git a/common/config/settings.php b/common/config/settings.php index f9a5f50..a1aed26 100755 --- a/common/config/settings.php +++ b/common/config/settings.php @@ -2,8 +2,8 @@ return [ 1 => [ - 'id' => 1, - 'name' => 'Administrator', + 'id' => '1', + 'name' => 'Admin', 'description' => 'Site administrator', ], ]; \ No newline at end of file diff --git a/common/config/test.php b/common/config/test.php old mode 100644 new mode 100755 index c952c41..c952c41 --- a/common/config/test.php +++ b/common/config/test.php diff --git a/composer.json b/composer.json index 84a130c..ee27402 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,8 @@ "yiister/yii2-gentelella": "~1.0", "hiqdev/yii2-asset-icheck": "1.0.2.5", "noam148/yii2-image-manager": "*", - "yii2tech/filedb": "^1.0" + "yii2tech/filedb": "^1.0", + "hiqdev/yii2-asset-pnotify": "^2.1" }, "require-dev": { "yiisoft/yii2-debug": "~2.0.0", diff --git a/composer.lock b/composer.lock index 48ff691..c2d2953 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "273c41f822738cb68bec5cafba6f54f5", - "content-hash": "c2ffd5778bd51c266dfd00c514847f0a", + "hash": "b77198c9b7dc6a47b379a7f696023839", + "content-hash": "ecbd5dfde30e425db5d104f468df4ee5", "packages": [ { "name": "bower-asset/bootstrap", @@ -285,6 +285,68 @@ ] }, { + "name": "bower-asset/pnotify", + "version": "2.1.0", + "source": { + "type": "git", + "url": "https://github.com/sciactive/pnotify.git", + "reference": "4ca6d8089ec45997ae7be37efc51f1ddad336933" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sciactive/pnotify/zipball/4ca6d8089ec45997ae7be37efc51f1ddad336933", + "reference": "4ca6d8089ec45997ae7be37efc51f1ddad336933", + "shasum": "" + }, + "type": "bower-asset-library", + "extra": { + "bower-asset-main": [ + "src/pnotify.core.js", + "src/pnotify.core.min.js", + "src/pnotify.buttons.js", + "src/pnotify.buttons.min.js", + "src/pnotify.callbacks.js", + "src/pnotify.callbacks.min.js", + "src/pnotify.confirm.js", + "src/pnotify.confirm.min.js", + "src/pnotify.desktop.js", + "src/pnotify.desktop.min.js", + "src/pnotify.history.js", + "src/pnotify.history.min.js", + "src/pnotify.nonblock.js", + "src/pnotify.nonblock.min.js", + "src/pnotify.core.css", + "src/pnotify.core.min.css", + "src/pnotify.buttons.css", + "src/pnotify.buttons.min.css", + "src/pnotify.history.css", + "src/pnotify.history.min.css" + ], + "bower-asset-ignore": [ + "build-cache/", + "build-tools/", + "includes/", + "oxygen/", + "devnote*.*", + "index.html", + "README.md", + "testing.html", + "buildcustom.php", + "package.json", + "src/pnotify.tooltip.js", + "src/pnotify.tooltip.min.js", + "src/pnotify.mobile.js", + "src/pnotify.mobile.min.js" + ] + }, + "license": [ + "GPL-3.0", + "LGPL-3.0", + "MPL-1.1" + ], + "description": "JavaScript notification plugin." + }, + { "name": "bower-asset/punycode", "version": "v1.3.2", "source": { @@ -574,6 +636,68 @@ "time": "2016-03-30 10:59:26" }, { + "name": "hiqdev/yii2-asset-pnotify", + "version": "2.1.0", + "source": { + "type": "git", + "url": "https://github.com/hiqdev/yii2-asset-pnotify.git", + "reference": "d5bfa39fba84741523238e53b85ef7c2f37b789f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hiqdev/yii2-asset-pnotify/zipball/d5bfa39fba84741523238e53b85ef7c2f37b789f", + "reference": "d5bfa39fba84741523238e53b85ef7c2f37b789f", + "shasum": "" + }, + "require": { + "bower-asset/pnotify": "2.1.0" + }, + "type": "package", + "autoload": { + "psr-4": { + "hiqdev\\assets\\pnotify\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Andrii Vasyliev", + "email": "sol@hiqdev.com", + "homepage": "https://hipanel.com/", + "role": "Project lead" + }, + { + "name": "Andrey Klochok", + "email": "tafid@hiqdev.com", + "homepage": "https://hiqdev.com/", + "role": "Lead frontend developer" + }, + { + "name": "Yuriy Myronchuk", + "email": "bladeroot@hiqdev.com", + "homepage": "https://hiqdev.com/", + "role": "QA Lead" + }, + { + "name": "Dmitry Naumenko", + "email": "silverfire@hiqdev.com", + "homepage": "http://silverfire.me/", + "role": "Lead backend developer" + } + ], + "description": "Yii2 Asset Pnotify", + "homepage": "https://github.com/hiqdev/yii2-asset-pnotify", + "keywords": [ + "asset", + "pnotify", + "yii2" + ], + "time": "2015-09-09 15:16:38" + }, + { "name": "imagine/imagine", "version": "v0.6.3", "source": { -- libgit2 0.21.4