Yarik / artbox-design

Commit 17bf5975a7c6812508f8f129f8b95319b60c9e96

Authored by Yarik
1 parent 86d3af8b

Links fixed

Showing 23 changed files with 137 additions and 118 deletions   Show diff stats
Inline Side-by-side
views/banner/_form.php
  Show/Hide comments   View file @17bf597
1 1 <?php
2 2  
3   - use common\models\Banner;
4   - use common\models\BannerLang;
5   - use common\modules\language\widgets\LanguageForm;
  3 + use artweb\artbox\design\models\Banner;
  4 + use artweb\artbox\design\models\BannerLang;
  5 + use artweb\artbox\language\widgets\LanguageForm;
6 6 use kartik\select2\Select2;
7 7 use yii\helpers\Html;
8 8 use yii\web\View;
... ... @@ -43,7 +43,7 @@
43 43  
44 44 <?= LanguageForm::widget([
45 45 'modelLangs' => $modelLangs,
46   - 'formView' => '@backend/views/banner/_form_language',
  46 + 'formView' => '@artweb/artbox/design/views/banner/_form_language',
47 47 'form' => $form,
48 48 ]) ?>
49 49  
... ...
views/banner/_form_language.php
  Show/Hide comments   View file @17bf597
1 1 <?php
2   - use common\models\BannerLang;
3   - use common\modules\language\models\Language;
  2 + use artweb\artbox\components\artboximage\ArtboxImageHelper;
  3 + use artweb\artbox\design\models\BannerLang;
  4 + use artweb\artbox\language\models\Language;
4 5 use yii\web\View;
5 6 use yii\widgets\ActiveForm;
6 7  
... ... @@ -25,7 +26,7 @@
25 26 ],
26 27 'pluginOptions' => [
27 28 'allowedFileExtensions' => ['jpg','gif','png'],
28   - 'initialPreview' => $model_lang->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage($model_lang->imageUrl, 'slider') : '',
  29 + 'initialPreview' => $model_lang->imageUrl ? ArtboxImageHelper::getImage($model_lang->imageUrl, 'slider') : '',
29 30 'showRemove' => false,
30 31 'overwriteInitial' => true,
31 32 'showUpload' => false,
... ...
views/banner/create.php
  Show/Hide comments   View file @17bf597
1 1 <?php
2 2  
3   - use common\models\Banner;
4   - use common\models\BannerLang;
  3 + use artweb\artbox\design\models\Banner;
  4 + use artweb\artbox\design\models\BannerLang;
5 5 use yii\helpers\Html;
6 6 use yii\web\View;
7 7  
... ...
views/banner/index.php
  Show/Hide comments   View file @17bf597
1 1 <?php
2 2  
3   - use common\models\Banner;
  3 + use artweb\artbox\design\models\Banner;
4 4 use yii\helpers\Html;
5 5 use yii\grid\GridView;
6 6  
7 7 /**
8 8 * @var yii\web\View $this
9   - * @var common\models\BannerSearch $searchModel
  9 + * @var artweb\artbox\design\models\BannerSearch $searchModel
10 10 * @var yii\data\ActiveDataProvider $dataProvider
11 11 */
12 12 $this->title = Yii::t('app', 'Banners');
... ...
views/banner/update.php
  Show/Hide comments   View file @17bf597
1 1 <?php
2 2  
3   - use common\models\Banner;
4   - use common\models\BannerLang;
  3 + use artweb\artbox\design\models\Banner;
  4 + use artweb\artbox\design\models\BannerLang;
5 5 use yii\helpers\Html;
6 6 use yii\web\View;
7 7  
... ...
views/banner/view.php
  Show/Hide comments   View file @17bf597
... ... @@ -5,7 +5,7 @@
5 5  
6 6 /**
7 7 * @var yii\web\View $this
8   - * @var common\models\Banner $model
  8 + * @var artweb\artbox\design\models\Banner $model
9 9 */
10 10 $this->title = $model->lang->title;
11 11 $this->params[ 'breadcrumbs' ][] = [
... ...
views/bg/_form.php
  Show/Hide comments   View file @17bf597
1 1 <?php
2 2  
3   - use common\models\Bg;
4   - use common\models\BgLang;
5   - use common\modules\language\widgets\LanguageForm;
  3 + use artweb\artbox\components\artboximage\ArtboxImageHelper;
  4 + use artweb\artbox\design\models\Bg;
  5 + use artweb\artbox\design\models\BgLang;
  6 + use artweb\artbox\language\widgets\LanguageForm;
6 7 use yii\helpers\Html;
7 8 use yii\web\View;
8 9 use yii\widgets\ActiveForm;
... ... @@ -41,7 +42,7 @@
41 42 'gif',
42 43 'png',
43 44 ],
44   - 'initialPreview' => $model->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'slider') : '',
  45 + 'initialPreview' => $model->imageUrl ? ArtboxImageHelper::getImage($model->imageUrl, 'slider') : '',
45 46 'showRemove' => false,
46 47 'overwriteInitial' => true,
47 48 'showUpload' => false,
... ... @@ -52,7 +53,7 @@
52 53 <?= LanguageForm::widget([
53 54 'modelLangs' => $modelLangs,
54 55 'form' => $form,
55   - 'formView' => '@backend/views/bg/_form_language',
  56 + 'formView' => '@artweb/artbox/design/views/bg/_form_language',
56 57 ]) ?>
57 58  
58 59 <div class="form-group">
... ...
views/bg/_form_language.php
  Show/Hide comments   View file @17bf597
1 1 <?php
2   - use common\models\BgLang;
3   - use common\modules\language\models\Language;
  2 + use artweb\artbox\design\models\BgLang;
  3 + use artweb\artbox\language\models\Language;
4 4 use yii\web\View;
5 5 use yii\widgets\ActiveForm;
6 6  
... ...
views/bg/create.php
  Show/Hide comments   View file @17bf597
1 1 <?php
2 2  
3   - use common\models\Bg;
4   - use common\models\BgLang;
  3 + use artweb\artbox\design\models\Bg;
  4 + use artweb\artbox\design\models\BgLang;
5 5 use yii\helpers\Html;
6 6 use yii\web\View;
7 7  
... ...
views/bg/index.php
  Show/Hide comments   View file @17bf597
... ... @@ -5,7 +5,7 @@
5 5  
6 6 /**
7 7 * @var yii\web\View $this
8   - * @var common\models\BgSearch $searchModel
  8 + * @var artweb\artbox\design\models\BgSearch $searchModel
9 9 * @var yii\data\ActiveDataProvider $dataProvider
10 10 */
11 11 $this->title = \Yii::t('app', 'Bgs');
... ...
views/bg/update.php
  Show/Hide comments   View file @17bf597
1 1 <?php
2 2  
3   - use common\models\Bg;
4   - use common\models\BgLang;
  3 + use artweb\artbox\design\models\Bg;
  4 + use artweb\artbox\design\models\BgLang;
5 5 use yii\helpers\Html;
6 6 use yii\web\View;
7 7  
... ...
views/bg/view.php
  Show/Hide comments   View file @17bf597
... ... @@ -5,7 +5,7 @@
5 5  
6 6 /**
7 7 * @var yii\web\View $this
8   - * @var common\models\Bg $model
  8 + * @var artweb\artbox\design\models\Bg $model
9 9 */
10 10 $this->title = $model->lang->title;
11 11 $this->params[ 'breadcrumbs' ][] = [
... ...
views/slider-image/_form.php
  Show/Hide comments   View file @17bf597
1 1 <?php
2 2  
3   - use common\models\Slider;
4   - use common\models\SliderImage;
5   - use common\models\SliderImageLang;
6   - use common\modules\language\widgets\LanguageForm;
  3 + use artweb\artbox\components\artboximage\ArtboxImageHelper;
  4 + use artweb\artbox\design\models\Slider;
  5 + use artweb\artbox\design\models\SliderImage;
  6 + use artweb\artbox\design\models\SliderImageLang;
  7 + use artweb\artbox\language\widgets\LanguageForm;
7 8 use kartik\select2\Select2;
8 9 use yii\helpers\Html;
9 10 use yii\web\View;
... ... @@ -37,7 +38,7 @@
37 38 'gif',
38 39 'png',
39 40 ],
40   - 'initialPreview' => $model->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'slider') : '',
  41 + 'initialPreview' => $model->imageUrl ? ArtboxImageHelper::getImage($model->imageUrl, 'slider') : '',
41 42 'overwriteInitial' => true,
42 43 'showRemove' => true,
43 44 'showUpload' => false,
... ... @@ -67,7 +68,7 @@
67 68 <?php
68 69 echo LanguageForm::widget([
69 70 'modelLangs' => $modelLangs,
70   - 'formView' => '@backend/views/slider-image/_form_language',
  71 + 'formView' => '@artweb/artbox/design/views/slider-image/_form_language',
71 72 'form' => $form,
72 73 ]);
73 74 ?>
... ...
views/slider-image/_form_language.php
  Show/Hide comments   View file @17bf597
1 1 <?php
2   - use common\models\SliderImageLang;
3   - use common\modules\language\models\Language;
  2 + use artweb\artbox\design\models\SliderImageLang;
  3 + use artweb\artbox\language\models\Language;
4 4 use yii\web\View;
5 5 use yii\widgets\ActiveForm;
6 6  
... ...
views/slider-image/create.php
  Show/Hide comments   View file @17bf597
1 1 <?php
2 2  
3   - use common\models\Slider;
4   - use common\models\SliderImage;
5   - use common\models\SliderImageLang;
  3 + use artweb\artbox\design\models\Slider;
  4 + use artweb\artbox\design\models\SliderImage;
  5 + use artweb\artbox\design\models\SliderImageLang;
6 6 use yii\helpers\Html;
7 7 use yii\helpers\Url;
8 8 use yii\web\View;
... ...
views/slider-image/index.php
  Show/Hide comments   View file @17bf597
1 1 <?php
2 2  
3   - use common\models\SliderImage;
  3 + use artweb\artbox\design\models\SliderImage;
4 4 use yii\helpers\Html;
5 5 use yii\grid\GridView;
6 6 use yii\helpers\Url;
7 7  
8 8 /**
9 9 * @var yii\web\View $this
10   - * @var common\models\SliderImageSearch $searchModel
  10 + * @var artweb\artbox\design\models\SliderImageSearch $searchModel
11 11 * @var yii\data\ActiveDataProvider $dataProvider
12 12 * @var int $slider_id
13 13 */
... ...
views/slider-image/update.php
  Show/Hide comments   View file @17bf597
1 1 <?php
2 2  
3   - use common\models\SliderImage;
4   - use common\models\SliderImageLang;
  3 + use artweb\artbox\design\models\SliderImage;
  4 + use artweb\artbox\design\models\SliderImageLang;
5 5 use yii\helpers\Html;
6   - use common\models\Slider;
  6 + use artweb\artbox\design\models\Slider;
7 7 use yii\helpers\Url;
8 8 use yii\web\View;
9 9  
... ...
views/slider-image/view.php
  Show/Hide comments   View file @17bf597
... ... @@ -6,7 +6,7 @@
6 6  
7 7 /**
8 8 * @var yii\web\View $this
9   - * @var common\models\SliderImage $model
  9 + * @var artweb\artbox\design\models\SliderImage $model
10 10 * @var int $slider_id
11 11 */
12 12 $this->title = \Yii::t('app', 'Slide') . ': ' . $model->id;
... ...
views/slider/_form.php
  Show/Hide comments   View file @17bf597
1 1 <?php
2   -
3   -use yii\helpers\Html;
4   -use yii\widgets\ActiveForm;
5   -use kartik\select2\Select2;
6   -
7   -/* @var $this yii\web\View */
8   -/* @var $model common\models\Slider */
9   -/* @var $form yii\widgets\ActiveForm */
  2 +
  3 + use artweb\artbox\design\models\Slider;
  4 + use yii\helpers\Html;
  5 + use yii\widgets\ActiveForm;
  6 + use kartik\select2\Select2;
  7 +
  8 + /* @var $this yii\web\View */
  9 + /* @var $model Slider */
  10 + /* @var $form yii\widgets\ActiveForm */
10 11 ?>
11 12  
12 13 <div class="slider-form">
13   -
  14 +
14 15 <?php $form = ActiveForm::begin(); ?>
15   -
16   - <?= $form->field($model, 'speed')->textInput() ?>
17   -
18   - <?= $form->field($model, 'duration')->textInput() ?>
19   -
20   - <?= $form->field($model, 'title')->textInput(['maxlength' => true]) ?>
21   -
22   -
23   - <?= $form->field($model, 'width')->textInput(['maxlength' => true]) ?>
24   -
25   - <?= $form->field($model, 'height')->textInput(['maxlength' => true]) ?>
26   -
27   -
28   - <?= $form->field($model, 'status')->widget(Select2::className(),([
29   - 'name' => 'status',
30   - 'hideSearch' => true,
31   - 'data' => [1 => 'Active', 2 => 'Inactive'],
32   - 'options' => ['placeholder' => 'Select status...'],
33   - 'pluginOptions' => [
34   - 'allowClear' => true
35   - ]
36   - ])) ?>
37   -
  16 +
  17 + <?= $form->field($model, 'speed')
  18 + ->textInput() ?>
  19 +
  20 + <?= $form->field($model, 'duration')
  21 + ->textInput() ?>
  22 +
  23 + <?= $form->field($model, 'title')
  24 + ->textInput([ 'maxlength' => true ]) ?>
  25 +
  26 +
  27 + <?= $form->field($model, 'width')
  28 + ->textInput([ 'maxlength' => true ]) ?>
  29 +
  30 + <?= $form->field($model, 'height')
  31 + ->textInput([ 'maxlength' => true ]) ?>
  32 +
  33 +
  34 + <?= $form->field($model, 'status')
  35 + ->widget(
  36 + Select2::className(),
  37 + ( [
  38 + 'name' => 'status',
  39 + 'hideSearch' => true,
  40 + 'data' => [
  41 + 1 => 'Active',
  42 + 2 => 'Inactive',
  43 + ],
  44 + 'options' => [ 'placeholder' => 'Select status...' ],
  45 + 'pluginOptions' => [
  46 + 'allowClear' => true,
  47 + ],
  48 + ] )
  49 + ) ?>
  50 +
38 51 <div class="form-group">
39   - <?= Html::submitButton($model->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
  52 + <?= Html::submitButton(
  53 + $model->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'),
  54 + [ 'class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary' ]
  55 + ) ?>
40 56 </div>
41   -
  57 +
42 58 <?php ActiveForm::end(); ?>
43 59  
44 60 </div>
... ...
views/slider/create.php
  Show/Hide comments   View file @17bf597
... ... @@ -4,7 +4,7 @@
4 4  
5 5 /**
6 6 * @var yii\web\View $this
7   - * @var common\models\Slider $model
  7 + * @var artweb\artbox\design\models\Slider $model
8 8 */
9 9 $this->title = Yii::t('app', 'Create Slider');
10 10 $this->params[ 'breadcrumbs' ][] = [
... ...
views/slider/index.php
  Show/Hide comments   View file @17bf597
1 1 <?php
2 2  
3   - use common\models\Slider;
  3 + use artweb\artbox\design\models\Slider;
4 4 use yii\helpers\Html;
5 5 use yii\grid\GridView;
6 6 use yii\helpers\Url;
7 7  
8 8 /**
9 9 * @var yii\web\View $this
10   - * @var common\models\SliderSearch $searchModel
  10 + * @var artweb\artbox\design\models\SliderSearch $searchModel
11 11 * @var yii\data\ActiveDataProvider $dataProvider
12 12 */
13 13 $this->title = Yii::t('app', 'Sliders');
... ...
views/slider/update.php
  Show/Hide comments   View file @17bf597
... ... @@ -4,7 +4,7 @@
4 4  
5 5 /**
6 6 * @var yii\web\View $this
7   - * @var common\models\Slider $model
  7 + * @var artweb\artbox\design\models\Slider $model
8 8 */
9 9 $this->title = Yii::t('app', 'Update {modelClass}: ', [
10 10 'modelClass' => 'Slider',
... ...
widgets/views/slider.php
  Show/Hide comments   View file @17bf597
1 1 <?php
2   -/* @var $slider Slider*/
3   -use artweb\artbox\design\components\artboximage\ArtboxImageHelper;
4   -use artweb\artbox\design\models\Slider;
5   -use yii\helpers\Html;
6   -use yii\web\View;
7   -use frontend\assets\FlipclockAsset;
8   -FlipclockAsset::register($this);
  2 + /* @var $slider Slider */
  3 + use artweb\artbox\components\artboximage\ArtboxImageHelper;
  4 + use artweb\artbox\design\models\Slider;
  5 + use yii\helpers\Html;
  6 + use yii\web\View;
9 7  
10 8 ?>
11 9  
12 10  
13   -<div id="<?=$title?>" class="owl-carousel owl-theme">
14   - <?php if($slider instanceof Slider){ foreach($slider->sliderImage as $image):
15   -
16   -
17   - ?>
18   - <div class="item">
19   -<?php
20   - if(!empty($image->end_at) && strtotime($image->end_at) > strtotime(date("Y-m-d"))){
21   - ?>
22   - <div class="clock_centered"><div class="clock_style clock_<?= $image->primaryKey ?>"></div></div>
23   - <?php $js = "var clock;
24   - clock = new FlipClock($('.clock_". $image->primaryKey ."'), {
  11 +<div id="<?= $title ?>" class="owl-carousel owl-theme">
  12 + <?php if ($slider instanceof Slider) {
  13 + foreach ($slider->sliderImage as $image):
  14 +
  15 + ?>
  16 + <div class="item">
  17 + <?php
  18 + if (!empty( $image->end_at ) && strtotime($image->end_at) > strtotime(date("Y-m-d"))) {
  19 + ?>
  20 + <div class="clock_centered">
  21 + <div class="clock_style clock_<?= $image->primaryKey ?>"></div>
  22 + </div>
  23 + <?php $js = "var clock;
  24 + clock = new FlipClock($('.clock_" . $image->primaryKey . "'), {
25 25 clockFace: 'DailyCounter',
26 26 language: 'ru',
27 27 classes: {
... ... @@ -36,26 +36,26 @@ FlipclockAsset::register($this);
36 36 },
37 37 });
38 38  
39   - clock.setTime(".(strtotime($image->end_at) - strtotime(date('Y-m-d H:i:s'))).");
  39 + clock.setTime(" . ( strtotime($image->end_at) - strtotime(date('Y-m-d H:i:s')) ) . ");
40 40 clock.setCountdown(true);
41 41 clock.start();";
42   - $this->registerJs($js,View::POS_LOAD) ?>
43   -
44   -
45   - <?php
46   - }?>
47   - <?= Html::a(Html::img(ArtboxImageHelper::getImageSrc($image->imageUrl,'slider')), $image->url)?>
48   - </div>
49   -
50   -
51   -
52   -<?php endforeach; }
  42 + $this->registerJs($js, View::POS_LOAD) ?>
  43 +
  44 +
  45 + <?php
  46 + } ?>
  47 + <?= Html::a(Html::img(ArtboxImageHelper::getImageSrc($image->imageUrl, 'slider')), $image->url) ?>
  48 + </div>
  49 +
  50 +
  51 + <?php endforeach;
  52 + }
53 53 ?>
54 54 </div>
55 55 <?php
56   -$dur = $slider->duration ? $slider->duration : 5000;
57   -$speed = $slider->speed ? $slider->speed : 500;
58   -$js=" $(\"#$title\").owlCarousel({
  56 + $dur = $slider->duration ? $slider->duration : 5000;
  57 + $speed = $slider->speed ? $slider->speed : 500;
  58 + $js = " $(\"#$title\").owlCarousel({
59 59 navigation : true, // Show next and prev buttons
60 60 slideSpeed : 500,
61 61 autoplayTimeout:$dur,
... ... @@ -72,7 +72,7 @@ $js=&quot; $(\&quot;#$title\&quot;).owlCarousel({
72 72 owl.trigger('owl.prev');
73 73 })
74 74 ";
75   -
76   -$this->registerJs($js,View::POS_READY);
  75 +
  76 + $this->registerJs($js, View::POS_READY);
77 77  
78 78 ?>
... ...