diff --git a/common/messages/ua/app.php b/common/messages/ua/app.php index e464a27..0872a45 100644 --- a/common/messages/ua/app.php +++ b/common/messages/ua/app.php @@ -82,7 +82,7 @@ return [ 'Stable' => 'Стійкий', 'Compare' => 'Порівняти', - 'SuperGluable' => 'Суперклейкий', + 'SuperGluable' => 'Суперклейкiсть', 'Sales' => 'знижок', 'Creating sites' => 'Створення сайтів', 'Thanks for request' => 'Дякуємо за Ваш запит!', @@ -103,13 +103,16 @@ return [ 'Company Title' => 'ArtPlast', - 'Description 1' => 'Завод-виробник «Артпласт» пропонує чудовий професійний скотч. - Наш продукт витримує розтягування, високі нагрузки, - не втрачає свої якості при низьких та високих температурах.', - 'Description 2' => 'Удобство використання упаковочного скотча, стійкість і відмінні характеристики клейкості - до більшості видів поверхонь, дає можливість використовувати його - для швидкої та надійної упаковки товарів в картонні коробки, пластикову та іншу - тару для подальшого зберігання на складі або транспортування.', + 'Description 1' => 'Завод-виробник «Артпласт» пропонує вам професійний скотч. + Наш продукт витримує розтягнення, високе + навантаження, та не втрачає своїх якостей при + низьких або високих температурах.', + 'Description 2' => 'Зручність застосування пакувального скотча, + міцність та ідеальні характеристики клейкості + (до більшості видів поверхонь), дає можливість + використовувати його для швидкої та надійної + упаковки товарів в картонні короби, + пластикову або іншу тару для подальшого зберігання на складі чи транспортуванні.', 'Address 1' => 'Україна, Київ, Магнітогорська 1', diff --git a/frontend/controllers/BlogController.php b/frontend/controllers/BlogController.php deleted file mode 100755 index 4838273..0000000 --- a/frontend/controllers/BlogController.php +++ /dev/null @@ -1,245 +0,0 @@ -with( - [ - 'language', - ] - ) - ->orderBy([ 'sort' => SORT_ASC ]) - ->all(); - - $categories = Category::find() - ->with( - [ - 'language', - ] - ) - ->where(['status' => true]) - ->orderBy([ 'sort' => SORT_ASC ]) - ->all(); - - $dataProvider = new ActiveDataProvider( - [ - 'query' => Article::find() - ->orderBy( - [ - 'created_at' => SORT_DESC, - ] - ) - ->with( - [ - 'categories.language', - ] - - ) - ->joinWith('language') - ->where([ 'blog_article.status' => true ]) - ->andFilterWhere( - [ - 'ilike', - 'blog_article_lang.title', - $q, - ] - ) - ->distinct(), - 'pagination' => [ - 'pageSize' => 3, - ], - ] - ); - - return $this->render( - 'index', - [ - 'tags' => $tags, - 'categories' => $categories, - 'dataProvider' => $dataProvider, - ] - ); - } - - public function actionView($id) - { - $model = $this->findModel($id); - - $tags = Tag::find() - ->with([ 'language' ]) - ->orderBy([ 'sort' => SORT_ASC ]) - ->all(); - - return $this->render( - 'view', - [ - 'tags' => $tags, - 'model' => $model, - ] - ); - } - - public function actionCategory($id) - { - $tags = Tag::find() - ->with( - [ - 'language', - ] - ) - ->orderBy([ 'sort' => SORT_ASC ]) - ->all(); - - /** - * @var Category $model - */ - $model = Category::find() - ->where( - [ - 'id' => $id, - ] - ) - ->with( - [ - 'articles', - ] - ) - ->where(['status' => true]) - ->orderBy([ 'sort' => SORT_ASC ]) - ->one(); - - $dataProvider = new ActiveDataProvider( - [ - 'query' => $model->getArticles() - ->with( - [ - 'language', - 'categories.language', - ] - ) - ->where(['blog_article.status' => true]) - ->orderBy( - [ - 'created_at' => SORT_DESC, - ] - ), - 'pagination' => [ - 'pageSize' => 3, - ], - ] - ); - - return $this->render( - 'category', - [ - 'tags' => $tags, - 'dataProvider' => $dataProvider, - 'model' => $model, - ] - ); - } - - public function actionTag($id) - { - $tags = Tag::find() - ->with( - [ - 'language', - ] - ) - ->orderBy([ 'sort' => SORT_ASC ]) - ->all(); - - /** - * @var Category $model - */ - $model = Tag::find() - ->where( - [ - 'id' => $id, - ] - ) - ->with( - [ - 'articles', - ] - ) - ->one(); - - $dataProvider = new ActiveDataProvider( - [ - 'query' => $model->getArticles() - ->with( - [ - 'language', - 'categories.language', - ] - ) - ->where(['blog_article.status' => true]) - ->orderBy( - [ - 'created_at' => SORT_DESC, - ] - ), - 'pagination' => [ - 'pageSize' => 3, - ], - ] - ); - - return $this->render( - 'tag', - [ - 'tags' => $tags, - 'dataProvider' => $dataProvider, - 'model' => $model, - ] - ); - } - - /** - * @param $id - * - * @return Article - * @throws \yii\web\NotFoundHttpException - */ - protected function findModel($id) - { - /** - * @var Article | null $model - */ - $model = Article::find() - ->where([ 'id' => $id ]) - ->with( - [ - 'language', - 'categories.language', - 'tags.language', - ] - ) - ->andWhere([ 'status' => true ]) - ->one(); - - if (empty($model)) { - throw new NotFoundHttpException(\Yii::t('app', 'Article not found')); - } else { - return $model; - } - } - } \ No newline at end of file diff --git a/frontend/controllers/PageController.php b/frontend/controllers/PageController.php deleted file mode 100755 index 19be41b..0000000 --- a/frontend/controllers/PageController.php +++ /dev/null @@ -1,65 +0,0 @@ -findModel($id); - - /** - * @var SeoComponent $seo - */ - $mages = null; - $seo = Yii::$app->get('seo'); - $seo->setModel($model->language); - $images = null; - if (!empty($model->gallery)){ - $images = Image::find()->where(['id' => Json::decode($model->gallery)])->all(); - } - - return $this->render( - 'view', - [ - 'model' => $model, - 'images' => $images - ] - ); - } - - protected function findModel($id) - { - /** - * @var Page $model - * @var SeoComponent $seo - */ - $seo = \Yii::$app->get('seo'); - $model = Page::find() - ->where( - [ - 'id' => $id, - ] - ) - ->with('language') - ->one(); - - if (!empty($model)) { - return $model; - } else { - throw new NotFoundHttpException('Model not found'); - } - } - } \ No newline at end of file diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index 56be8ff..e876273 100755 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -67,32 +67,7 @@ ]); } - /** - * Displays contact page. - * - * @return mixed - */ - public function actionContact() - { - $contact = new Feedback(); - return $this->render( - 'contact', - [ - 'contact' => $contact, - ] - ); - } - - /** - * Displays about page. - * - * @return mixed - */ - public function actionAbout() - { - return $this->render('about'); - } - + /** * Action to view robots.txt file dinamycli * @@ -114,49 +89,5 @@ return $this->renderFile($meta[ 'uri' ]); } - public function actionFeedback() - { - Yii::$app->response->format = Response::FORMAT_JSON; - - /** - * @var Mailer $mailer - */ - $mailer = \Yii::$app->get('smtpmailer'); - $settings = Settings::getInstance(); - - if (empty(Yii::$app->request->post())) { - throw new BadRequestHttpException(); - } else { - $model = new Feedback(); - if ($model->load(Yii::$app->request->post()) && $model->save()) { - - $mailer->compose( - 'feedback', - [ - 'model' => $model, - ] - ) - ->setFrom('artbox@domain.com') - ->setTo($settings->email) - ->setSubject(\Yii::t('app', 'Feedback')) - ->send(); - - return [ - 'success' => true, - 'message' => 'Success message', - 'alert' => '
-

Success

-

- Success text -

-
', - ]; - } else { - return [ - 'success' => false, - 'error' => $model->errors, - ]; - } - } - } + } diff --git a/frontend/views/blog/_article.php b/frontend/views/blog/_article.php deleted file mode 100755 index e811949..0000000 --- a/frontend/views/blog/_article.php +++ /dev/null @@ -1,79 +0,0 @@ - - -
-
- -
-

title; ?>

-
- categories)) { ?> -

Без категории

- categories as $category) { - $i++; - ?> -

- title?> - categories)) { - echo ' '; - } else { - echo ', '; - } - ?>

- -

- formatter->asDate($model->created_at); ?> - -

-
-

body_preview; ?>

-

- $model->alias - ], - [ - 'class' => 'btn btn-template-main', - ] - ) ?> -

-
-
-
diff --git a/frontend/views/blog/category.php b/frontend/views/blog/category.php deleted file mode 100755 index 23b831d..0000000 --- a/frontend/views/blog/category.php +++ /dev/null @@ -1,114 +0,0 @@ -get('seo'); - - $this->params[ 'breadcrumbs' ][] = [ - 'label' => \Yii::t('app', 'Блог'), - 'url' => [ 'blog/index' ], - ]; - - $this->params[ 'breadcrumbs' ][] = $seo->title; - -?> - -
-
-
- - - - - - - - - - - - - - $dataProvider, - 'itemView' => '_article', - 'options' => [ - 'class' => 'col-md-9', - 'id' => 'blog-listing-medium', - ], - 'layout' => '{items}{pager}', - ] - ); ?> - - - - - - -
- - - - - - - - - - -
- - - - -
- -
- -
- \ No newline at end of file diff --git a/frontend/views/blog/index.php b/frontend/views/blog/index.php deleted file mode 100755 index 195f9e7..0000000 --- a/frontend/views/blog/index.php +++ /dev/null @@ -1,139 +0,0 @@ -get('seo'); - - $this->params[ 'breadcrumbs' ][] = \Yii::t('app', 'Блог'); - -?> - -
-
-
- - - - - - - - - - - - - - $dataProvider, - 'itemView' => '_article', - 'options' => [ - 'class' => 'col-md-9', - 'id' => 'blog-listing-medium', - ], - 'layout' => '{items}{pager}', - ] - ); ?> - - - - - - -
- - - - - - - - - - - - - - - -
- - - - -
- -
- -
- \ No newline at end of file diff --git a/frontend/views/blog/tag.php b/frontend/views/blog/tag.php deleted file mode 100755 index b96e8ca..0000000 --- a/frontend/views/blog/tag.php +++ /dev/null @@ -1,115 +0,0 @@ -get('seo'); - - $this->params[ 'breadcrumbs' ][] = [ - 'label' => \Yii::t('app', 'Блог'), - 'url' => [ 'blog/index' ], - ]; - - $this->params[ 'breadcrumbs' ][] = $seo->title; - -?> - -
-
-
- - - - - - - - - - - - - - $dataProvider, - 'itemView' => '_article', - 'options' => [ - 'class' => 'col-md-9', - 'id' => 'blog-listing-medium', - ], - 'layout' => '{items}{pager}', - ] - ); ?> - - - - - - -
- - - - - - - - - - -
- - - - -
- -
- -
- \ No newline at end of file diff --git a/frontend/views/blog/view.php b/frontend/views/blog/view.php deleted file mode 100755 index a1a0caf..0000000 --- a/frontend/views/blog/view.php +++ /dev/null @@ -1,223 +0,0 @@ -params[ 'breadcrumbs' ][] = [ - 'label' => \Yii::t('app', 'Блог'), - 'url' => [ 'blog/index' ], - ]; - - $this->params[ 'breadcrumbs' ][] = $model->title; - -?> - -
-
- -
- - - -
- -

title; ?>

- - tags)) { ?> - - - -

formatter->asDate( - $model->created_at - ); ?>

- -
- - body; ?> - -
- - - -

2 comments

- - -
-
-

- -

-
-
-
Julie Alma
-

September 23, 2011 в 12:00

-

Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. - Aenean ultricies mi vitae est. Mauris placerat eleifend leo.

-

Ответить -

-
-
- - - -
- -
-

- -

-
- -
-
Louise Armero
-

23 сентября 2012 в 12:00

-

Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. - Aenean ultricies mi vitae est. Mauris placerat eleifend leo.

-

Ответить -

-
- -
- -
- - - -
- -

Leave comment

- -
-
- -
-
- - -
-
- -
- -
-
-
- - -
-
-
- -
-
-
- - -
-
-
- -
-
- -
-
- - -
- -
- - */ - ?> -
- - - - - - -
- - - - - - - - - - -
- - - - -
- - -
- - - - \ No newline at end of file diff --git a/frontend/views/page/view.php b/frontend/views/page/view.php deleted file mode 100755 index 5ef900a..0000000 --- a/frontend/views/page/view.php +++ /dev/null @@ -1,71 +0,0 @@ -get('seo'); - $this->params[ 'breadcrumbs' ][] = $seo->title; -?> - -
-
- -
- - -
-
-
- - body ?> - -
-
- - -
- - -
- - - -
- - - - - - - - - -
- - -
- -
- diff --git a/frontend/views/site/_contact.php b/frontend/views/site/_contact.php deleted file mode 100644 index db56a63..0000000 --- a/frontend/views/site/_contact.php +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - field($model,'name')->textInput([ - 'class' => 'input-wr' - ])->label(null);?> - field($model,'phone')->textInput([ - 'class' => 'input-wr' - ])->label(null)?> - field($model,'email')->input('email',[ - 'class' => 'input-wr' - ])->label(null);?> - 'button-wr']);?> - \ No newline at end of file diff --git a/frontend/views/site/about.php b/frontend/views/site/about.php deleted file mode 100755 index cb9050d..0000000 --- a/frontend/views/site/about.php +++ /dev/null @@ -1,89 +0,0 @@ -get('seo'); - $this->params[ 'breadcrumbs' ][] = $seo->title; -?> -
-
-
-
- -
-

About Artbox

-
- -

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc,

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

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.

-

Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim.

-
-
-
-
-
-
- -
-
-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.

-

Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim.

-
-
-
-
-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.

-

Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a,

-

Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt.

-
-
- -
-
-
-
-
- -
-
-
- -
- -
-
-
-
-
diff --git a/frontend/views/site/contact.php b/frontend/views/site/contact.php deleted file mode 100755 index e92020d..0000000 --- a/frontend/views/site/contact.php +++ /dev/null @@ -1,162 +0,0 @@ -title = \Yii::t('app', 'Contact'); - $this->params[ 'breadcrumbs' ][] = $this->title; -MapAsset::register($this); - $js = <<< JS -window.lat = {$settings->lat}; -window.lon = {$settings->lon}; -JS; - - $this->registerJs($js, View::POS_END); - $module = \Yii::$app->getModule('contact'); -?> - -
-
- -
- -
-
-
-
-

We are here to help you

-
- -

Are you curious about something? Do you have some kind of problem with our products? As am hastily invited settled at limited civilly fortune me. Really spring in extent an by. Judge but built gay party world. Of so am - he remember although required. Bachelor unpacked be advanced at. Confined in declared marianne is vicinity.

-

Please feel free to contact us, our customer service center is working for you 24/7.

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

Address

-

- street )) { - echo $settings->street; - if (!empty( $settings->house )) { - echo " " . $settings->house; - } - echo Html::tag('br'); - } - if (!empty( $settings->city )) { - echo $settings->city; - if (!empty( $settings->country )) { - echo Html::tag('strong', ", " . $settings->country); - } - } - ?> -

-
- -
- - -
- phone )) { - ?> -
-
- -
-

Call center

-

This number is toll free if calling from Great Britain otherwise we advise you to use the electronic form of communication .

-

- phone), 'tel:' . $settings->phone); - ?> -

-
- - -
- - email )) { - ?> -
- -
-
- -
-

Electronic support

-

Please feel free to write an email to us or to use our electronic ticketing system .

-
    -
  • - email), - 'mailto:' . $settings->email - ); - ?> -
  • -
-
- -
- -
- -
- -
- -
- -
-
-

Contact form

-
-
- -
- renderForm($this)?> - -
-
- - -
- - -
- -
- - -
- -
\ No newline at end of file diff --git a/frontend/views/site/error.php b/frontend/views/site/error.php old mode 100755 new mode 100644 index 26be2c8..26be2c8 --- a/frontend/views/site/error.php +++ b/frontend/views/site/error.php diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php old mode 100755 new mode 100644 index 70a3154..70a3154 --- a/frontend/views/site/index.php +++ b/frontend/views/site/index.php diff --git a/frontend/views/site/login.php b/frontend/views/site/login.php deleted file mode 100644 index 56ea98e..0000000 --- a/frontend/views/site/login.php +++ /dev/null @@ -1,39 +0,0 @@ -title = 'Login'; -$this->params['breadcrumbs'][] = $this->title; -?> -
-

title) ?>

- -

Please fill out the following fields to login:

- -
-
- 'login-form']); ?> - - field($model, 'username')->textInput(['autofocus' => true]) ?> - - field($model, 'password')->passwordInput() ?> - - field($model, 'rememberMe')->checkbox() ?> - -
- If you forgot your password you can . -
- -
- 'btn btn-primary', 'name' => 'login-button']) ?> -
- - -
-
-
diff --git a/frontend/views/site/requestPasswordResetToken.php b/frontend/views/site/requestPasswordResetToken.php deleted file mode 100644 index 9f6822e..0000000 --- a/frontend/views/site/requestPasswordResetToken.php +++ /dev/null @@ -1,31 +0,0 @@ -title = 'Request password reset'; -$this->params['breadcrumbs'][] = $this->title; -?> -
-

title) ?>

- -

Please fill out your email. A link to reset password will be sent there.

- -
-
- 'request-password-reset-form']); ?> - - field($model, 'email')->textInput(['autofocus' => true]) ?> - -
- 'btn btn-primary']) ?> -
- - -
-
-
diff --git a/frontend/views/site/resetPassword.php b/frontend/views/site/resetPassword.php deleted file mode 100644 index 36ef452..0000000 --- a/frontend/views/site/resetPassword.php +++ /dev/null @@ -1,31 +0,0 @@ -title = 'Reset password'; -$this->params['breadcrumbs'][] = $this->title; -?> -
-

title) ?>

- -

Please choose your new password:

- -
-
- 'reset-password-form']); ?> - - field($model, 'password')->passwordInput(['autofocus' => true]) ?> - -
- 'btn btn-primary']) ?> -
- - -
-
-
diff --git a/frontend/views/site/signup.php b/frontend/views/site/signup.php deleted file mode 100644 index de9dad6..0000000 --- a/frontend/views/site/signup.php +++ /dev/null @@ -1,35 +0,0 @@ -title = 'Signup'; -$this->params['breadcrumbs'][] = $this->title; -?> -
-

title) ?>

- -

Please fill out the following fields to signup:

- -
-
- 'form-signup']); ?> - - field($model, 'username')->textInput(['autofocus' => true]) ?> - - field($model, 'email') ?> - - field($model, 'password')->passwordInput() ?> - -
- 'btn btn-primary', 'name' => 'signup-button']) ?> -
- - -
-
-
diff --git a/frontend/web/js/script.js b/frontend/web/js/script.js index dd2cd2d..dc77bc2 100644 --- a/frontend/web/js/script.js +++ b/frontend/web/js/script.js @@ -5,6 +5,7 @@ $(document).ready(function() { openMobMenuNew(); closeMobMenu(); phoneMask('#feedback-phone'); + phoneMask("input[name='Feedback[phone]']"); anchor(); fixedHeader(); -- libgit2 0.21.4