diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php index a3e7932..43c6e63 100755 --- a/backend/views/layouts/main.php +++ b/backend/views/layouts/main.php @@ -39,207 +39,226 @@ beginPage(); ?> - - - - - - - <?= Html::encode($this->title) ?> - head() ?> - - - beginBody(); ?> -
+ + + + + + + <?= Html::encode($this->title) ?> + head() ?> + + + beginBody(); ?> +
+ +
+ +
+
-
- -
-
- - -
- - -
-
- $userData->fullname, - 'title' => \Yii::t('core', 'Change image'), - 'class' => 'img-circle profile_img', - ] - ), - [ 'profile/index' ] - ) - ?> -
-
- -

- fullname, - [ 'profile/index' ], - [ - 'title' => \Yii::t('core', 'Change name'), - ] - ); - ?> -

-
-
-
- - -
- - - - - -
-
- - -
- - - -
- - - -
- params[ 'h1' ] )): ?> -
-
-

params[ 'h1' ] ?>

-
-
- -
-
- -
- - + 'fa fa-', + ] + ) . Html::tag('span', 'Artbox!'), + [ 'site/index' ], [ - 'links' => isset( $this->params[ 'breadcrumbs' ] ) ? $this->params[ 'breadcrumbs' ] : [], + 'class' => 'site_title', ] - ) ?> - - -
- - -
- -
- + ); + ?> +
+
+ + +
+
+ $userData->fullname, + 'title' => \Yii::t('core', 'Change image'), + 'class' => 'img-circle profile_img', + ] + ), + [ 'profile/index' ] + ) + ?> +
+
+ +

+ fullname, + [ 'profile/index' ], + [ + 'title' => \Yii::t('core', 'Change name'), + ] + ); + ?> +

+
+
+
+ + +
+ + + + + +
+
+ + +
+ +
+ - + +
+ params[ 'h1' ])): ?> +
+
+

params[ 'h1' ] ?>

+
+
+ +
+
+ +
+ + isset($this->params[ 'breadcrumbs' ]) ? $this->params[ 'breadcrumbs' ] : [], + ] + ) ?> + + +
+ + +
+ +
- endBody(); ?> - +
+ +
+ + + + endBody(); ?> + endPage(); ?> diff --git a/backend/views/layouts/menu_blog.php b/backend/views/layouts/menu_blog.php new file mode 100644 index 0000000..b7fb0fa --- /dev/null +++ b/backend/views/layouts/menu_blog.php @@ -0,0 +1,34 @@ + \Yii::t('app', 'Blog'), + 'url' => '#', + 'icon' => 'pencil-square', + 'items' => [ + [ + 'label' => \Yii::t('catalog', 'Articles'), + 'url' => [ 'blog-article/index' ], + 'icon' => 'file-text', + ], + [ + 'label' => \Yii::t('catalog', 'Categories'), + 'url' => [ 'blog-category/index' ], + 'icon' => 'book', + ], + [ + 'label' => \Yii::t('catalog', 'Tags'), + 'url' => [ 'blog-tag/index' ], + 'icon' => 'tag', + ], + ], + ], + [ + 'label' => \Yii::t('catalog', 'Comments'), + 'url' => [ 'comment/index' ], + 'icon' => 'comment-o', + 'active' => function () { + return \Yii::$app->controller->id === 'comment'; + }, + ], + ]; \ No newline at end of file diff --git a/backend/views/layouts/menu_items.php b/backend/views/layouts/menu_items.php deleted file mode 100755 index 67012d7..0000000 --- a/backend/views/layouts/menu_items.php +++ /dev/null @@ -1,192 +0,0 @@ -get('urlManagerFrontend', false)) { - $homeLink = [ - [ - 'label' => \Yii::t('core', 'My website'), - 'url' => $urlManagerFrontend->createUrl([ 'site/index' ]), - 'icon' => 'home', - 'template' => '{icon}{label}{badge}', - 'options' => [ - 'class' => 'homepage_link', - ], - ], - ]; - } - return array_merge( - $homeLink, - [ - [ - 'label' => \Yii::t('core', 'Main'), - 'url' => [ '/site/index' ], - 'icon' => ( \Yii::$app->controller->id === 'site' ) ? 'check' : 'undo', - 'active' => function () { - return \Yii::$app->controller->id === 'site'; - }, - ], - [ - 'label' => \Yii::t('core', 'Static pages'), - 'url' => [ 'page/index' ], - 'icon' => 'file-text', - 'active' => function () { - return \Yii::$app->controller->id === 'page'; - }, - ], - [ - 'label' => \Yii::t('core', 'SEO'), - 'url' => '#', - 'icon' => 'bolt', - 'items' => [ - [ - 'label' => \Yii::t('core', 'Seo pages'), - 'url' => [ 'alias/index' ], - 'icon' => 'file-text', - ], - [ - 'label' => \Yii::t('core', 'Robots'), - 'url' => [ 'settings/robots' ], - 'icon' => 'android', - ], - [ - 'label' => \Yii::t('core', 'Codes'), - 'url' => [ 'settings/codes' ], - 'icon' => 'code', - ], - [ - 'label' => \Yii::t('core', 'Sitemap'), - 'url' => [ '/sitemap/index' ], - 'icon' => 'map-signs', - ], - ], - ], - [ - 'label' => \Yii::t('app', 'Catalog'), - 'url' => '#', - 'icon' => 'tags', - 'items' => [ - [ - 'label' => \Yii::t('catalog', 'Categories'), - 'url' => [ 'category/index' ], - 'icon' => 'file-text', - ], - [ - 'label' => \Yii::t('catalog', 'Brands'), - 'url' => [ 'brand/index' ], - 'icon' => 'file-text', - ], - [ - 'label' => \Yii::t('catalog', 'Products'), - 'url' => [ 'product/index' ], - 'icon' => 'gift', - ], - [ - 'label' => \Yii::t('catalog', 'Import'), - 'url' => [ 'import/index' ], - 'icon' => 'download', - ], - [ - 'label' => \Yii::t('catalog', 'Export'), - 'url' => [ 'export/index' ], - 'icon' => 'upload', - ], - ], - ], - [ - 'label' => \Yii::t('app', 'Options'), - 'url' => '#', - 'icon' => 'filter', - 'items' => [ - [ - 'label' => \Yii::t('app', 'Options for products'), - 'url' => '#', - 'items' => [ - [ - 'label' => \Yii::t('app', 'Complementary'), - 'url' => [ 'product-option-group-complementary/index' ], - ], - [ - 'label' => \Yii::t('app', 'Exclusion'), - 'url' => [ 'product-option-group-exclusion/index' ], - ], - ], - ], - [ - 'label' => \Yii::t('app', 'Options for variants'), - 'url' => '#', - 'items' => [ - [ - 'label' => \Yii::t('app', 'Complementary'), - 'url' => [ 'variant-option-group-complementary/index' ], - ], - [ - 'label' => \Yii::t('app', 'Exclusion'), - 'url' => [ 'variant-option-group-exclusion/index' ], - ], - ], - ], - ], - ], - [ - 'label' => \Yii::t('app', 'Blog'), - 'url' => '#', - 'icon' => 'pencil-square', - 'items' => [ - [ - 'label' => \Yii::t('catalog', 'Articles'), - 'url' => [ 'blog-article/index' ], - 'icon' => 'file-text', - ], - [ - 'label' => \Yii::t('catalog', 'Categories'), - 'url' => [ 'blog-category/index' ], - 'icon' => 'book', - ], - [ - 'label' => \Yii::t('catalog', 'Tags'), - 'url' => [ 'blog-tag/index' ], - 'icon' => 'tag', - ], - ], - ], - [ - 'label' => \Yii::t('order', 'Order'), - 'url' => '#', - 'icon' => 'archive', - 'items' => [ - [ - 'label' => \Yii::t('order', 'Orders'), - 'url' => [ 'order/index' ], - 'icon' => 'first-order', - ], - [ - 'label' => \Yii::t('order', 'Label'), - 'url' => [ 'label/index' ], - 'icon' => 'tag', - ], - [ - 'label' => \Yii::t('order', 'Delivery'), - 'url' => [ 'delivery/index' ], - 'icon' => 'truck', - ], - [ - 'label' => \Yii::t('order', 'Payment'), - 'url' => [ 'payment/index' ], - 'icon' => 'money', - ], - ], - ], - [ - 'label' => \Yii::t('catalog', 'Comments'), - 'url' => [ 'comment/index' ], - 'icon' => 'comment-o', - 'active' => function () { - return \Yii::$app->controller->id === 'comment'; - }, - ], - ] - ); \ No newline at end of file diff --git a/backend/views/layouts/menu_main.php b/backend/views/layouts/menu_main.php new file mode 100755 index 0000000..709036b --- /dev/null +++ b/backend/views/layouts/menu_main.php @@ -0,0 +1,68 @@ +get('urlManagerFrontend', false)) { + $homeLink = [ + [ + 'label' => \Yii::t('core', 'My website'), + 'url' => $urlManagerFrontend->createUrl([ 'site/index' ]), + 'icon' => 'home', + 'template' => '{icon}{label}{badge}', + 'options' => [ + 'class' => 'homepage_link', + ], + ], + ]; + } + return array_merge( + $homeLink, + [ + [ + 'label' => \Yii::t('core', 'Main'), + 'url' => [ '/site/index' ], + 'icon' => ( \Yii::$app->controller->id === 'site' ) ? 'check' : 'undo', + 'active' => function () { + return \Yii::$app->controller->id === 'site'; + }, + ], + [ + 'label' => \Yii::t('core', 'Static pages'), + 'url' => [ 'page/index' ], + 'icon' => 'file-text', + 'active' => function () { + return \Yii::$app->controller->id === 'page'; + }, + ], + [ + 'label' => \Yii::t('core', 'SEO'), + 'url' => '#', + 'icon' => 'bolt', + 'items' => [ + [ + 'label' => \Yii::t('core', 'Seo pages'), + 'url' => [ 'alias/index' ], + 'icon' => 'file-text', + ], + [ + 'label' => \Yii::t('core', 'Robots'), + 'url' => [ 'settings/robots' ], + 'icon' => 'android', + ], + [ + 'label' => \Yii::t('core', 'Codes'), + 'url' => [ 'settings/codes' ], + 'icon' => 'code', + ], + [ + 'label' => \Yii::t('core', 'Sitemap'), + 'url' => [ '/sitemap/index' ], + 'icon' => 'map-signs', + ], + ], + ], + ] + ); \ No newline at end of file diff --git a/backend/views/layouts/menu_shop.php b/backend/views/layouts/menu_shop.php new file mode 100644 index 0000000..69c06f7 --- /dev/null +++ b/backend/views/layouts/menu_shop.php @@ -0,0 +1,99 @@ + \Yii::t('app', 'Catalog'), + 'url' => '#', + 'icon' => 'tags', + 'items' => [ + [ + 'label' => \Yii::t('catalog', 'Categories'), + 'url' => [ 'category/index' ], + 'icon' => 'file-text', + ], + [ + 'label' => \Yii::t('catalog', 'Brands'), + 'url' => [ 'brand/index' ], + 'icon' => 'file-text', + ], + [ + 'label' => \Yii::t('catalog', 'Products'), + 'url' => [ 'product/index' ], + 'icon' => 'gift', + ], + [ + 'label' => \Yii::t('catalog', 'Import'), + 'url' => [ 'import/index' ], + 'icon' => 'download', + ], + [ + 'label' => \Yii::t('catalog', 'Export'), + 'url' => [ 'export/index' ], + 'icon' => 'upload', + ], + ], + ], + [ + 'label' => \Yii::t('app', 'Options'), + 'url' => '#', + 'icon' => 'filter', + 'items' => [ + [ + 'label' => \Yii::t('app', 'Options for products'), + 'url' => '#', + 'items' => [ + [ + 'label' => \Yii::t('app', 'Complementary'), + 'url' => [ 'product-option-group-complementary/index' ], + ], + [ + 'label' => \Yii::t('app', 'Exclusion'), + 'url' => [ 'product-option-group-exclusion/index' ], + ], + ], + ], + [ + 'label' => \Yii::t('app', 'Options for variants'), + 'url' => '#', + 'items' => [ + [ + 'label' => \Yii::t('app', 'Complementary'), + 'url' => [ 'variant-option-group-complementary/index' ], + ], + [ + 'label' => \Yii::t('app', 'Exclusion'), + 'url' => [ 'variant-option-group-exclusion/index' ], + ], + ], + ], + ], + ], + [ + 'label' => \Yii::t('order', 'Order'), + 'url' => '#', + 'icon' => 'archive', + 'items' => [ + [ + 'label' => \Yii::t('order', 'Orders'), + 'url' => [ 'order/index' ], + 'icon' => 'first-order', + ], + [ + 'label' => \Yii::t('order', 'Label'), + 'url' => [ 'label/index' ], + 'icon' => 'tag', + ], + [ + 'label' => \Yii::t('order', 'Delivery'), + 'url' => [ 'delivery/index' ], + 'icon' => 'truck', + ], + [ + 'label' => \Yii::t('order', 'Payment'), + 'url' => [ 'payment/index' ], + 'icon' => 'money', + ], + ], + ], + ]; \ No newline at end of file diff --git a/backend/views/site/index.php b/backend/views/site/index.php index 185e5ff..90980bc 100755 --- a/backend/views/site/index.php +++ b/backend/views/site/index.php @@ -83,8 +83,8 @@ 'header' => 'Диаграмма', ] ) ?> - -
+ +
diff --git a/backend/web/js/analytics.js b/backend/web/js/analytics.js index ea956fd..155b1c3 100755 --- a/backend/web/js/analytics.js +++ b/backend/web/js/analytics.js @@ -86,7 +86,12 @@ $( 'colors': [ "#A8E3D6", "#9ABCC3" - ] + ], + "labelRadius": 5, + + "radius": "42%", + "innerRadius": "60%", + "labelText": "[[title]]", } ); // Replacing table stabs -- libgit2 0.21.4