From 91ae643c8ce65e6c7420e1b0ab9a3781460d5d2c Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Fri, 6 Nov 2015 14:47:37 +0200 Subject: [PATCH] upload project --- .htaccess | 2 -- backend/views/importers/index.php | 18 +----------------- backend/views/layouts/column.php | 1 - common/models/Accounts.php | 1 + frontend/assets/InternalAsset.php | 1 + frontend/assets/OuterAsset.php | 1 + frontend/controllers/SiteController.php | 8 +++----- frontend/views/layouts/internal.php | 140 +++++++++----------------------------------------------------------------------------------------------------------------------------------- frontend/views/layouts/main.php | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- frontend/views/layouts/outer.php | 186 ++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------- frontend/views/site/about.php | 304 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ frontend/views/site/about_company.php | 304 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- frontend/views/site/index.php | 2 -- frontend/web/css/general_styles.css | 159 ++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------- frontend/web/css/main.css | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ frontend/web/css/style.css | 114 ++++-------------------------------------------------------------------------------------------------------------- 16 files changed, 650 insertions(+), 862 deletions(-) create mode 100644 frontend/views/site/about.php delete mode 100644 frontend/views/site/about_company.php create mode 100644 frontend/web/css/main.css diff --git a/.htaccess b/.htaccess index 161adb4..effc303 100644 --- a/.htaccess +++ b/.htaccess @@ -6,8 +6,6 @@ - - RewriteBase / diff --git a/backend/views/importers/index.php b/backend/views/importers/index.php index af6fbe8..d42d505 100644 --- a/backend/views/importers/index.php +++ b/backend/views/importers/index.php @@ -30,23 +30,7 @@ $this->params['breadcrumbs'][] = $this->title; 'name', 'name_price', 'currency_id', - // 'delivery', - // 'email:email', - // 'info:ntext', - // 'active', - // 'PARSER_IS_ACTIVE', - // 'PARSER_COLUMN_COUNT', - // 'PARSER_FIELD_BRAND', - // 'PARSER_FIELD_ARTICLE', - // 'PARSER_FIELD_ARTICLE_PREFIX', - // 'PARSER_FIELD_PRICE', - // 'PARSER_FIELD_DESCR', - // 'PARSER_FIELD_BOX', - // 'PARSER_FIELD_ADD_BOX', - // 'PARSER_FIELD_GROUP_RG', - // 'PARSER_FIELD_SIGN', - // 'PARSER_FIELD_MULTIPLIER', - // 'price_date_update', + ['class' => 'yii\grid\ActionColumn'], ], diff --git a/backend/views/layouts/column.php b/backend/views/layouts/column.php index 433d019..1b0e910 100644 --- a/backend/views/layouts/column.php +++ b/backend/views/layouts/column.php @@ -299,7 +299,6 @@ $this->beginContent('@app/views/layouts/main.php'); ['label' => 'Администраторы', 'url' => ['user/index']], ['label' => 'Команда', 'url' => ['team/index']], ['label' => 'Группы команды', 'url' => ['team-group/index']], - ['label' => 'Цены для менеджера', 'url' => ['team-group/index']], ], ], ['label' => 'Ценообразование', 'url' => ['#'], 'items' => [ diff --git a/common/models/Accounts.php b/common/models/Accounts.php index 79eb1ea..672039d 100644 --- a/common/models/Accounts.php +++ b/common/models/Accounts.php @@ -46,6 +46,7 @@ use Yii; */ class Accounts extends \yii\db\ActiveRecord { + /** * @inheritdoc */ diff --git a/frontend/assets/InternalAsset.php b/frontend/assets/InternalAsset.php index 7fe9bb0..bb4f098 100644 --- a/frontend/assets/InternalAsset.php +++ b/frontend/assets/InternalAsset.php @@ -19,6 +19,7 @@ class InternalAsset extends AssetBundle public $baseUrl = '@web'; public $jsOptions = ['position' => \yii\web\View::POS_HEAD]; public $css = [ + 'css/main.css', 'css/general_styles.css', 'css/style/selectize.css', 'css/perfect-scrollbar/css/perfect-scrollbar.css', diff --git a/frontend/assets/OuterAsset.php b/frontend/assets/OuterAsset.php index 5f937f0..0f64340 100644 --- a/frontend/assets/OuterAsset.php +++ b/frontend/assets/OuterAsset.php @@ -19,6 +19,7 @@ class OuterAsset extends AssetBundle public $baseUrl = '@web'; public $jsOptions = ['position' => \yii\web\View::POS_HEAD]; public $css = [ + 'css/main.css', 'css/style.css', 'css/style/selectize.css', 'css/perfect-scrollbar/css/perfect-scrollbar.css', diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index 786250b..5adbe29 100644 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -18,6 +18,7 @@ use yii\filters\AccessControl; */ class SiteController extends Controller { + /** * @inheritdoc */ @@ -86,11 +87,7 @@ class SiteController extends Controller $this->layout = '/internal'; return $this->render('404'); } - public function actionAboutCompany() - { - $this->layout = '/internal'; - return $this->render('about_company'); - } + public function actionArticle() { @@ -329,6 +326,7 @@ class SiteController extends Controller */ public function actionAbout() { + $this->layout = '/internal'; return $this->render('about'); } diff --git a/frontend/views/layouts/internal.php b/frontend/views/layouts/internal.php index 258a13c..040e0f2 100644 --- a/frontend/views/layouts/internal.php +++ b/frontend/views/layouts/internal.php @@ -7,136 +7,6 @@ use yii\helpers\Html; /* @var $content string */ $this->beginContent('@app/views/layouts/main.php'); ?> - -
-
- -
- - Наши проекты - - -
-
-
- -
- - - - -

050 -0400-192

-
- -
-
-
- - - - -
- - - - -
- -

Войти

- Личный кабинет -
- -
- -

Корзина

- 7 товаров -
- - -
- +
+ + + + + isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [], + ]) ?> +
@@ -914,5 +793,4 @@ $this->beginContent('@app/views/layouts/main.php'); - endContent() ?> \ No newline at end of file diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index f674378..9b62b0e 100644 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -9,7 +9,8 @@ use yii\bootstrap\NavBar; use yii\widgets\Breadcrumbs; use frontend\assets\AppAsset; use common\widgets\Alert; - +use \yii\widgets\Menu; +use \yii\helpers\Url; ?> beginPage() ?> @@ -26,7 +27,137 @@ use common\widgets\Alert; beginBody() ?> +
+
+ [ + ['label' => 'О компании', 'url'=>Url::toRoute('/site/about')], + ['label' => 'Каталоги', 'url'=>'/page/FAQ'], + ['label' => 'Оптовикам','url'=>'/events/index'], + ['label' => 'Поставщикам','url'=>'/articles/index'], + ['label' => 'Оплата и доставка', 'url'=>Url::toRoute('/site/contact')], + ['label' => 'Контакты', 'url'=>Url::toRoute('/site/contact')], + ], + ]); + ?> +
+ + Наши проекты + + +
+
+
+ +
+ + + + +

050 -0400-192

+
+ +
+
+
+ + + + +
+ + + + +
+ +

Войти

+ Личный кабинет +
+ +
+ +

Корзина

+ 7 товаров +
+ +
endBody() ?> diff --git a/frontend/views/layouts/outer.php b/frontend/views/layouts/outer.php index 72187fd..8a76776 100644 --- a/frontend/views/layouts/outer.php +++ b/frontend/views/layouts/outer.php @@ -2,153 +2,28 @@ use yii\widgets\Breadcrumbs; use yii\helpers\Html; +use \yii\widgets\Menu; +use \yii\helpers\Url; \frontend\assets\OuterAsset::register($this); /* @var $content string */ $this->beginContent('@app/views/layouts/main.php'); ?> -
-
- -
- - Наши проекты - - -
-
-
-
- - - - -

050 -0400-192

-
- -
-
-
- - - - -
- - - - -
- -

Войти

- Личный кабинет -
- -
- -

Корзина

- 7 товаров -
- - -