diff --git a/.gitignore b/.gitignore index 569df28..9b8fc23 100755 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,5 @@ phpunit.phar # vagrant runtime /.vagrant /artweb/ -/storage \ No newline at end of file +/storage +/composer.lock diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php index 57f3331..d05a9bc 100755 --- a/backend/views/layouts/main.php +++ b/backend/views/layouts/main.php @@ -6,11 +6,11 @@ */ use artbox\core\assets\ArtboxCoreAsset; + use artbox\core\components\imagemanager\components\ImageManagerGetPath; use artbox\core\models\User; use artbox\core\models\UserData; use artbox\core\widgets\FeedbackWidget; use artbox\core\widgets\FlashWidget; - use noam148\imagemanager\components\ImageManagerGetPath; use yii\bootstrap\Html; use yii\web\View; use yii\widgets\Breadcrumbs; diff --git a/backend/views/layouts/menu_items.php b/backend/views/layouts/menu_items.php old mode 100644 new mode 100755 index 709036b..4a359b4 --- a/backend/views/layouts/menu_items.php +++ b/backend/views/layouts/menu_items.php @@ -31,11 +31,15 @@ ], [ 'label' => \Yii::t('core', 'Static pages'), - 'url' => [ 'page/index' ], + 'url' => '#', 'icon' => 'file-text', - 'active' => function () { - return \Yii::$app->controller->id === 'page'; - }, + 'items' => [ + [ + 'label' => \Yii::t('core', 'Static pages'), + 'url' => [ '/page/index' ], + 'icon' => 'file-text', + ] + ], ], [ 'label' => \Yii::t('core', 'SEO'), @@ -44,17 +48,17 @@ 'items' => [ [ 'label' => \Yii::t('core', 'Seo pages'), - 'url' => [ 'alias/index' ], + 'url' => [ '/alias/index' ], 'icon' => 'file-text', ], [ 'label' => \Yii::t('core', 'Robots'), - 'url' => [ 'settings/robots' ], + 'url' => [ '/settings/robots' ], 'icon' => 'android', ], [ 'label' => \Yii::t('core', 'Codes'), - 'url' => [ 'settings/codes' ], + 'url' => [ '/settings/codes' ], 'icon' => 'code', ], [ @@ -64,5 +68,10 @@ ], ], ], + [ + 'label' => \Yii::t('core', 'Image manager'), + 'url' => [ '/imagemanager' ], + 'icon' => 'image', + ], ] ); \ No newline at end of file diff --git a/backend/views/settings/_main_tab.php b/backend/views/settings/_main_tab.php index da1a81e..186e71e 100755 --- a/backend/views/settings/_main_tab.php +++ b/backend/views/settings/_main_tab.php @@ -1,4 +1,5 @@ textInput(); echo $form->field($model, 'logo') ->widget( - \noam148\imagemanager\components\ImageManagerInputWidget::className(), + ImageManagerInputWidget::className(), [ 'showPreview' => true, 'showDeletePickedImageConfirm' => false, diff --git a/common/config/.gitignore b/common/config/.gitignore index 0be4f93..b2e5776 100755 --- a/common/config/.gitignore +++ b/common/config/.gitignore @@ -2,4 +2,4 @@ main-local.php db* params-local.php test-local.php -#settings.php \ No newline at end of file +settings.php \ No newline at end of file diff --git a/common/config/main.php b/common/config/main.php index dab8b2e..90a5ee4 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; @@ -45,9 +45,9 @@ 'class' => SeoComponent::className(), ], 'imagemanager' => [ - 'class' => 'noam148\imagemanager\components\ImageManagerGetPath', - 'mediaPath' => dirname(dirname(__DIR__)) . '/common/images', - 'cachePath' => 'assets/images', + 'class' => 'artbox\core\components\imagemanager\components\ImageManagerGetPath', + 'mediaPath' => dirname(dirname(__DIR__)) . '/storage', + 'cachePath' => '../../storage/cache', 'useFilename' => true, 'absoluteUrl' => false, ], diff --git a/common/images/13_kkl4mozaMJ8zPlIbqSp_Fn-QoYehLYXV.jpg b/common/images/13_kkl4mozaMJ8zPlIbqSp_Fn-QoYehLYXV.jpg old mode 100644 new mode 100755 index ef352f1..ef352f1 Binary files a/common/images/13_kkl4mozaMJ8zPlIbqSp_Fn-QoYehLYXV.jpg and b/common/images/13_kkl4mozaMJ8zPlIbqSp_Fn-QoYehLYXV.jpg differ diff --git a/common/images/3_QotMz-N2qttbYPDIacZFaogulUFKe1FX.jpg b/common/images/3_QotMz-N2qttbYPDIacZFaogulUFKe1FX.jpg old mode 100644 new mode 100755 index ef352f1..ef352f1 Binary files a/common/images/3_QotMz-N2qttbYPDIacZFaogulUFKe1FX.jpg and b/common/images/3_QotMz-N2qttbYPDIacZFaogulUFKe1FX.jpg differ diff --git a/common/images/4_GqOguExNaYGZG64YgbUEmec4xKKAKK8G.jpg b/common/images/4_GqOguExNaYGZG64YgbUEmec4xKKAKK8G.jpg old mode 100644 new mode 100755 index 82f7b63..82f7b63 Binary files a/common/images/4_GqOguExNaYGZG64YgbUEmec4xKKAKK8G.jpg and b/common/images/4_GqOguExNaYGZG64YgbUEmec4xKKAKK8G.jpg differ diff --git a/common/images/5_2sVxteui6Xv-mD4vlFCQK0G38FOgqUXO.jpg b/common/images/5_2sVxteui6Xv-mD4vlFCQK0G38FOgqUXO.jpg old mode 100644 new mode 100755 index ee2e690..ee2e690 Binary files a/common/images/5_2sVxteui6Xv-mD4vlFCQK0G38FOgqUXO.jpg and b/common/images/5_2sVxteui6Xv-mD4vlFCQK0G38FOgqUXO.jpg differ diff --git a/common/images/6_nBM9N5_kUsjcCkVpJXuwwfWYnOt3N7Um.jpg b/common/images/6_nBM9N5_kUsjcCkVpJXuwwfWYnOt3N7Um.jpg old mode 100644 new mode 100755 index c5bc640..c5bc640 Binary files a/common/images/6_nBM9N5_kUsjcCkVpJXuwwfWYnOt3N7Um.jpg and b/common/images/6_nBM9N5_kUsjcCkVpJXuwwfWYnOt3N7Um.jpg differ diff --git a/common/images/7_SFsnRpreGcM6YJceVbOeAJeJ5PZpxmmo.jpg b/common/images/7_SFsnRpreGcM6YJceVbOeAJeJ5PZpxmmo.jpg old mode 100644 new mode 100755 index 0b0e38a..0b0e38a Binary files a/common/images/7_SFsnRpreGcM6YJceVbOeAJeJ5PZpxmmo.jpg and b/common/images/7_SFsnRpreGcM6YJceVbOeAJeJ5PZpxmmo.jpg differ diff --git a/common/models/Settings.php b/common/models/Settings.php index 401d317..5ae8905 100755 --- a/common/models/Settings.php +++ b/common/models/Settings.php @@ -1,7 +1,7 @@ =7.0", - "artweb/artbox-core": "~0.0.1", "yiisoft/yii2": "~2.0", "yiisoft/yii2-bootstrap": "~2.0", "yiisoft/yii2-swiftmailer": "~2.0", diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index d78dcef..e761ba2 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -12,7 +12,7 @@ use artbox\core\models\User; use common\models\Settings; use frontend\assets\AppAsset; - use noam148\imagemanager\models\ImageManager; + use artbox\core\components\imagemanager\models\ImageManager; use yii\bootstrap\ActiveForm; use yii\bootstrap\Nav; use yii\bootstrap\Html; @@ -78,7 +78,7 @@ m.parentNode.insertBefore(a, m) })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga'); - ga('create', ga_code?>, 'auto'); + ga('create', 'ga_code?>', 'auto'); ga('send', 'pageview'); -- libgit2 0.21.4