From 17bf5975a7c6812508f8f129f8b95319b60c9e96 Mon Sep 17 00:00:00 2001
From: yarik <yarik.nechyporuk@gmail.com>
Date: Thu, 10 Nov 2016 13:51:52 +0200
Subject: [PATCH] Links fixed

---
 views/banner/_form.php                |  8 ++++----
 views/banner/_form_language.php       |  7 ++++---
 views/banner/create.php               |  4 ++--
 views/banner/index.php                |  4 ++--
 views/banner/update.php               |  4 ++--
 views/banner/view.php                 |  2 +-
 views/bg/_form.php                    | 11 ++++++-----
 views/bg/_form_language.php           |  4 ++--
 views/bg/create.php                   |  4 ++--
 views/bg/index.php                    |  2 +-
 views/bg/update.php                   |  4 ++--
 views/bg/view.php                     |  2 +-
 views/slider-image/_form.php          | 13 +++++++------
 views/slider-image/_form_language.php |  4 ++--
 views/slider-image/create.php         |  6 +++---
 views/slider-image/index.php          |  4 ++--
 views/slider-image/update.php         |  6 +++---
 views/slider-image/view.php           |  2 +-
 views/slider/_form.php                | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------
 views/slider/create.php               |  2 +-
 views/slider/index.php                |  4 ++--
 views/slider/update.php               |  2 +-
 widgets/views/slider.php              | 72 ++++++++++++++++++++++++++++++++++++------------------------------------
 23 files changed, 137 insertions(+), 118 deletions(-)

diff --git a/views/banner/_form.php b/views/banner/_form.php
index 6585e99..d244587 100755
--- a/views/banner/_form.php
+++ b/views/banner/_form.php
@@ -1,8 +1,8 @@
 <?php
     
-    use common\models\Banner;
-    use common\models\BannerLang;
-    use common\modules\language\widgets\LanguageForm;
+    use artweb\artbox\design\models\Banner;
+    use artweb\artbox\design\models\BannerLang;
+    use artweb\artbox\language\widgets\LanguageForm;
     use kartik\select2\Select2;
     use yii\helpers\Html;
     use yii\web\View;
@@ -43,7 +43,7 @@
     
     <?= LanguageForm::widget([
         'modelLangs' => $modelLangs,
-        'formView'    => '@backend/views/banner/_form_language',
+        'formView'    => '@artweb/artbox/design/views/banner/_form_language',
         'form'        => $form,
     ]) ?>
     
diff --git a/views/banner/_form_language.php b/views/banner/_form_language.php
index 966481a..729f274 100755
--- a/views/banner/_form_language.php
+++ b/views/banner/_form_language.php
@@ -1,6 +1,7 @@
 <?php
-    use common\models\BannerLang;
-    use common\modules\language\models\Language;
+    use artweb\artbox\components\artboximage\ArtboxImageHelper;
+    use artweb\artbox\design\models\BannerLang;
+    use artweb\artbox\language\models\Language;
     use yii\web\View;
     use yii\widgets\ActiveForm;
     
@@ -25,7 +26,7 @@
     ],
     'pluginOptions' => [
         'allowedFileExtensions' => ['jpg','gif','png'],
-        'initialPreview' => $model_lang->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage($model_lang->imageUrl, 'slider') : '',
+        'initialPreview' => $model_lang->imageUrl ? ArtboxImageHelper::getImage($model_lang->imageUrl, 'slider') : '',
         'showRemove' => false,
         'overwriteInitial' => true,
         'showUpload' => false,
diff --git a/views/banner/create.php b/views/banner/create.php
index d42053b..eb81fe2 100755
--- a/views/banner/create.php
+++ b/views/banner/create.php
@@ -1,7 +1,7 @@
 <?php
     
-    use common\models\Banner;
-    use common\models\BannerLang;
+    use artweb\artbox\design\models\Banner;
+    use artweb\artbox\design\models\BannerLang;
     use yii\helpers\Html;
     use yii\web\View;
     
diff --git a/views/banner/index.php b/views/banner/index.php
index 43c66bb..ce61d4e 100755
--- a/views/banner/index.php
+++ b/views/banner/index.php
@@ -1,12 +1,12 @@
 <?php
     
-    use common\models\Banner;
+    use artweb\artbox\design\models\Banner;
     use yii\helpers\Html;
     use yii\grid\GridView;
     
     /**
      * @var yii\web\View                $this
-     * @var common\models\BannerSearch  $searchModel
+     * @var artweb\artbox\design\models\BannerSearch  $searchModel
      * @var yii\data\ActiveDataProvider $dataProvider
      */
     $this->title = Yii::t('app', 'Banners');
diff --git a/views/banner/update.php b/views/banner/update.php
index 81ccfc1..6a48646 100755
--- a/views/banner/update.php
+++ b/views/banner/update.php
@@ -1,7 +1,7 @@
 <?php
     
-    use common\models\Banner;
-    use common\models\BannerLang;
+    use artweb\artbox\design\models\Banner;
+    use artweb\artbox\design\models\BannerLang;
     use yii\helpers\Html;
     use yii\web\View;
     
diff --git a/views/banner/view.php b/views/banner/view.php
index 64e1bb5..94f0446 100755
--- a/views/banner/view.php
+++ b/views/banner/view.php
@@ -5,7 +5,7 @@
     
     /**
      * @var yii\web\View         $this
-     * @var common\models\Banner $model
+     * @var artweb\artbox\design\models\Banner $model
      */
     $this->title = $model->lang->title;
     $this->params[ 'breadcrumbs' ][] = [
diff --git a/views/bg/_form.php b/views/bg/_form.php
index e6fef06..f28785e 100755
--- a/views/bg/_form.php
+++ b/views/bg/_form.php
@@ -1,8 +1,9 @@
 <?php
     
-    use common\models\Bg;
-    use common\models\BgLang;
-    use common\modules\language\widgets\LanguageForm;
+    use artweb\artbox\components\artboximage\ArtboxImageHelper;
+    use artweb\artbox\design\models\Bg;
+    use artweb\artbox\design\models\BgLang;
+    use artweb\artbox\language\widgets\LanguageForm;
     use yii\helpers\Html;
     use yii\web\View;
     use yii\widgets\ActiveForm;
@@ -41,7 +42,7 @@
                          'gif',
                          'png',
                      ],
-                     'initialPreview'        => $model->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'slider') : '',
+                     'initialPreview'        => $model->imageUrl ? ArtboxImageHelper::getImage($model->imageUrl, 'slider') : '',
                      'showRemove'            => false,
                      'overwriteInitial'      => true,
                      'showUpload'            => false,
@@ -52,7 +53,7 @@
     <?= LanguageForm::widget([
         'modelLangs' => $modelLangs,
         'form'        => $form,
-        'formView'    => '@backend/views/bg/_form_language',
+        'formView'    => '@artweb/artbox/design/views/bg/_form_language',
     ]) ?>
     
     <div class="form-group">
diff --git a/views/bg/_form_language.php b/views/bg/_form_language.php
index 13dbcc2..e0974a1 100755
--- a/views/bg/_form_language.php
+++ b/views/bg/_form_language.php
@@ -1,6 +1,6 @@
 <?php
-    use common\models\BgLang;
-    use common\modules\language\models\Language;
+    use artweb\artbox\design\models\BgLang;
+    use artweb\artbox\language\models\Language;
     use yii\web\View;
     use yii\widgets\ActiveForm;
     
diff --git a/views/bg/create.php b/views/bg/create.php
index 699a078..b5b0019 100755
--- a/views/bg/create.php
+++ b/views/bg/create.php
@@ -1,7 +1,7 @@
 <?php
     
-    use common\models\Bg;
-    use common\models\BgLang;
+    use artweb\artbox\design\models\Bg;
+    use artweb\artbox\design\models\BgLang;
     use yii\helpers\Html;
     use yii\web\View;
     
diff --git a/views/bg/index.php b/views/bg/index.php
index baf2d1b..83f7e77 100755
--- a/views/bg/index.php
+++ b/views/bg/index.php
@@ -5,7 +5,7 @@
     
     /**
      * @var yii\web\View                $this
-     * @var common\models\BgSearch      $searchModel
+     * @var artweb\artbox\design\models\BgSearch      $searchModel
      * @var yii\data\ActiveDataProvider $dataProvider
      */
     $this->title = \Yii::t('app', 'Bgs');
diff --git a/views/bg/update.php b/views/bg/update.php
index d65a61a..3922a1e 100755
--- a/views/bg/update.php
+++ b/views/bg/update.php
@@ -1,7 +1,7 @@
 <?php
     
-    use common\models\Bg;
-    use common\models\BgLang;
+    use artweb\artbox\design\models\Bg;
+    use artweb\artbox\design\models\BgLang;
     use yii\helpers\Html;
     use yii\web\View;
     
diff --git a/views/bg/view.php b/views/bg/view.php
index d528821..5bdf2af 100755
--- a/views/bg/view.php
+++ b/views/bg/view.php
@@ -5,7 +5,7 @@
     
     /**
      * @var yii\web\View     $this
-     * @var common\models\Bg $model
+     * @var artweb\artbox\design\models\Bg $model
      */
     $this->title = $model->lang->title;
     $this->params[ 'breadcrumbs' ][] = [
diff --git a/views/slider-image/_form.php b/views/slider-image/_form.php
index b5a5df8..5c80901 100755
--- a/views/slider-image/_form.php
+++ b/views/slider-image/_form.php
@@ -1,9 +1,10 @@
 <?php
     
-    use common\models\Slider;
-    use common\models\SliderImage;
-    use common\models\SliderImageLang;
-    use common\modules\language\widgets\LanguageForm;
+    use artweb\artbox\components\artboximage\ArtboxImageHelper;
+    use artweb\artbox\design\models\Slider;
+    use artweb\artbox\design\models\SliderImage;
+    use artweb\artbox\design\models\SliderImageLang;
+    use artweb\artbox\language\widgets\LanguageForm;
     use kartik\select2\Select2;
     use yii\helpers\Html;
     use yii\web\View;
@@ -37,7 +38,7 @@
                          'gif',
                          'png',
                      ],
-                     'initialPreview'        => $model->imageUrl ? \common\components\artboximage\ArtboxImageHelper::getImage($model->imageUrl, 'slider') : '',
+                     'initialPreview'        => $model->imageUrl ? ArtboxImageHelper::getImage($model->imageUrl, 'slider') : '',
                      'overwriteInitial'      => true,
                      'showRemove'            => true,
                      'showUpload'            => false,
@@ -67,7 +68,7 @@
     <?php
         echo LanguageForm::widget([
             'modelLangs' => $modelLangs,
-            'formView'    => '@backend/views/slider-image/_form_language',
+            'formView'    => '@artweb/artbox/design/views/slider-image/_form_language',
             'form'        => $form,
         ]);
     ?>
diff --git a/views/slider-image/_form_language.php b/views/slider-image/_form_language.php
index 64b69c3..1c7d661 100755
--- a/views/slider-image/_form_language.php
+++ b/views/slider-image/_form_language.php
@@ -1,6 +1,6 @@
 <?php
-    use common\models\SliderImageLang;
-    use common\modules\language\models\Language;
+    use artweb\artbox\design\models\SliderImageLang;
+    use artweb\artbox\language\models\Language;
     use yii\web\View;
     use yii\widgets\ActiveForm;
     
diff --git a/views/slider-image/create.php b/views/slider-image/create.php
index fa38d29..8a56489 100755
--- a/views/slider-image/create.php
+++ b/views/slider-image/create.php
@@ -1,8 +1,8 @@
 <?php
     
-    use common\models\Slider;
-    use common\models\SliderImage;
-    use common\models\SliderImageLang;
+    use artweb\artbox\design\models\Slider;
+    use artweb\artbox\design\models\SliderImage;
+    use artweb\artbox\design\models\SliderImageLang;
     use yii\helpers\Html;
     use yii\helpers\Url;
     use yii\web\View;
diff --git a/views/slider-image/index.php b/views/slider-image/index.php
index 41b5c2f..29b53f8 100755
--- a/views/slider-image/index.php
+++ b/views/slider-image/index.php
@@ -1,13 +1,13 @@
 <?php
     
-    use common\models\SliderImage;
+    use artweb\artbox\design\models\SliderImage;
     use yii\helpers\Html;
     use yii\grid\GridView;
     use yii\helpers\Url;
     
     /**
      * @var yii\web\View                    $this
-     * @var common\models\SliderImageSearch $searchModel
+     * @var artweb\artbox\design\models\SliderImageSearch $searchModel
      * @var yii\data\ActiveDataProvider     $dataProvider
      * @var int                             $slider_id
      */
diff --git a/views/slider-image/update.php b/views/slider-image/update.php
index 96a3fe2..c05383c 100755
--- a/views/slider-image/update.php
+++ b/views/slider-image/update.php
@@ -1,9 +1,9 @@
 <?php
     
-    use common\models\SliderImage;
-    use common\models\SliderImageLang;
+    use artweb\artbox\design\models\SliderImage;
+    use artweb\artbox\design\models\SliderImageLang;
     use yii\helpers\Html;
-    use common\models\Slider;
+    use artweb\artbox\design\models\Slider;
     use yii\helpers\Url;
     use yii\web\View;
     
diff --git a/views/slider-image/view.php b/views/slider-image/view.php
index 7aff7be..f22bcb0 100755
--- a/views/slider-image/view.php
+++ b/views/slider-image/view.php
@@ -6,7 +6,7 @@
     
     /**
      * @var yii\web\View              $this
-     * @var common\models\SliderImage $model
+     * @var artweb\artbox\design\models\SliderImage $model
      * @var int                       $slider_id
      */
     $this->title = \Yii::t('app', 'Slide') . ': ' . $model->id;
diff --git a/views/slider/_form.php b/views/slider/_form.php
index 4ea7c7e..b8a5a6e 100755
--- a/views/slider/_form.php
+++ b/views/slider/_form.php
@@ -1,44 +1,60 @@
 <?php
-
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-use kartik\select2\Select2;
-
-/* @var $this yii\web\View */
-/* @var $model common\models\Slider */
-/* @var $form yii\widgets\ActiveForm */
+    
+    use artweb\artbox\design\models\Slider;
+    use yii\helpers\Html;
+    use yii\widgets\ActiveForm;
+    use kartik\select2\Select2;
+    
+    /* @var $this yii\web\View */
+    /* @var $model Slider */
+    /* @var $form yii\widgets\ActiveForm */
 ?>
 
 <div class="slider-form">
-
+    
     <?php $form = ActiveForm::begin(); ?>
-
-    <?= $form->field($model, 'speed')->textInput() ?>
-
-    <?= $form->field($model, 'duration')->textInput() ?>
-
-    <?= $form->field($model, 'title')->textInput(['maxlength' => true]) ?>
-
-
-    <?= $form->field($model, 'width')->textInput(['maxlength' => true]) ?>
-
-    <?= $form->field($model, 'height')->textInput(['maxlength' => true]) ?>
-
-
-    <?= $form->field($model, 'status')->widget(Select2::className(),([
-        'name' => 'status',
-        'hideSearch' => true,
-        'data' => [1 => 'Active', 2 => 'Inactive'],
-        'options' => ['placeholder' => 'Select status...'],
-        'pluginOptions' => [
-            'allowClear' => true
-        ]
-    ])) ?>
-
+    
+    <?= $form->field($model, 'speed')
+             ->textInput() ?>
+    
+    <?= $form->field($model, 'duration')
+             ->textInput() ?>
+    
+    <?= $form->field($model, 'title')
+             ->textInput([ 'maxlength' => true ]) ?>
+    
+    
+    <?= $form->field($model, 'width')
+             ->textInput([ 'maxlength' => true ]) ?>
+    
+    <?= $form->field($model, 'height')
+             ->textInput([ 'maxlength' => true ]) ?>
+    
+    
+    <?= $form->field($model, 'status')
+             ->widget(
+                 Select2::className(),
+                 ( [
+                     'name'          => 'status',
+                     'hideSearch'    => true,
+                     'data'          => [
+                         1 => 'Active',
+                         2 => 'Inactive',
+                     ],
+                     'options'       => [ 'placeholder' => 'Select status...' ],
+                     'pluginOptions' => [
+                         'allowClear' => true,
+                     ],
+                 ] )
+             ) ?>
+    
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton(
+            $model->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'),
+            [ 'class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary' ]
+        ) ?>
     </div>
-
+    
     <?php ActiveForm::end(); ?>
 
 </div>
diff --git a/views/slider/create.php b/views/slider/create.php
index 8cb53fb..6aed574 100755
--- a/views/slider/create.php
+++ b/views/slider/create.php
@@ -4,7 +4,7 @@
     
     /**
      * @var yii\web\View $this
-     * @var common\models\Slider $model
+     * @var artweb\artbox\design\models\Slider $model
      */
     $this->title = Yii::t('app', 'Create Slider');
     $this->params[ 'breadcrumbs' ][] = [
diff --git a/views/slider/index.php b/views/slider/index.php
index cd5bde4..46293cf 100755
--- a/views/slider/index.php
+++ b/views/slider/index.php
@@ -1,13 +1,13 @@
 <?php
     
-    use common\models\Slider;
+    use artweb\artbox\design\models\Slider;
     use yii\helpers\Html;
     use yii\grid\GridView;
     use yii\helpers\Url;
     
     /**
      * @var yii\web\View                $this
-     * @var common\models\SliderSearch  $searchModel
+     * @var artweb\artbox\design\models\SliderSearch  $searchModel
      * @var yii\data\ActiveDataProvider $dataProvider
      */
     $this->title = Yii::t('app', 'Sliders');
diff --git a/views/slider/update.php b/views/slider/update.php
index ff836e0..289e4ae 100755
--- a/views/slider/update.php
+++ b/views/slider/update.php
@@ -4,7 +4,7 @@
     
     /**
      * @var yii\web\View $this
-     * @var common\models\Slider $model
+     * @var artweb\artbox\design\models\Slider $model
      */
     $this->title = Yii::t('app', 'Update {modelClass}: ', [
             'modelClass' => 'Slider',
diff --git a/widgets/views/slider.php b/widgets/views/slider.php
index 3dfacba..e5b9bf6 100644
--- a/widgets/views/slider.php
+++ b/widgets/views/slider.php
@@ -1,27 +1,27 @@
 <?php
-/* @var $slider Slider*/
-use artweb\artbox\design\components\artboximage\ArtboxImageHelper;
-use artweb\artbox\design\models\Slider;
-use yii\helpers\Html;
-use yii\web\View;
-use frontend\assets\FlipclockAsset;
-FlipclockAsset::register($this);
+    /* @var $slider Slider */
+    use artweb\artbox\components\artboximage\ArtboxImageHelper;
+    use artweb\artbox\design\models\Slider;
+    use yii\helpers\Html;
+    use yii\web\View;
 
 ?>
 
 
-<div id="<?=$title?>" class="owl-carousel owl-theme">
-    <?php if($slider instanceof Slider){ foreach($slider->sliderImage as $image):
-
-
-    ?>
-    <div class="item">
-<?php
-        if(!empty($image->end_at) && strtotime($image->end_at) > strtotime(date("Y-m-d"))){
-        ?>
-        <div class="clock_centered"><div class="clock_style clock_<?= $image->primaryKey ?>"></div></div>
-        <?php $js = "var clock;
-                    clock = new FlipClock($('.clock_". $image->primaryKey ."'), {
+<div id="<?= $title ?>" class="owl-carousel owl-theme">
+    <?php if ($slider instanceof Slider) {
+        foreach ($slider->sliderImage as $image):
+            
+            ?>
+            <div class="item">
+                <?php
+                    if (!empty( $image->end_at ) && strtotime($image->end_at) > strtotime(date("Y-m-d"))) {
+                        ?>
+                        <div class="clock_centered">
+                            <div class="clock_style clock_<?= $image->primaryKey ?>"></div>
+                        </div>
+                        <?php $js = "var clock;
+                    clock = new FlipClock($('.clock_" . $image->primaryKey . "'), {
                         clockFace: 'DailyCounter',
                         language: 'ru',
                         classes: {
@@ -36,26 +36,26 @@ FlipclockAsset::register($this);
                         },
                     });
 
-                    clock.setTime(".(strtotime($image->end_at) - strtotime(date('Y-m-d H:i:s'))).");
+                    clock.setTime(" . ( strtotime($image->end_at) - strtotime(date('Y-m-d H:i:s')) ) . ");
                     clock.setCountdown(true);
                     clock.start();";
-        $this->registerJs($js,View::POS_LOAD) ?>
-
-
-        <?php
-        }?>
-        <?= Html::a(Html::img(ArtboxImageHelper::getImageSrc($image->imageUrl,'slider')), $image->url)?>
-    </div>
-
-
-
-<?php endforeach; }
+                        $this->registerJs($js, View::POS_LOAD) ?>
+                        
+                        
+                        <?php
+                    } ?>
+                <?= Html::a(Html::img(ArtboxImageHelper::getImageSrc($image->imageUrl, 'slider')), $image->url) ?>
+            </div>
+        
+        
+        <?php endforeach;
+    }
     ?>
 </div>
 <?php
-$dur = $slider->duration ?  $slider->duration : 5000;
-$speed = $slider->speed ?  $slider->speed : 500;
-$js="	$(\"#$title\").owlCarousel({
+    $dur = $slider->duration ? $slider->duration : 5000;
+    $speed = $slider->speed ? $slider->speed : 500;
+    $js = "	$(\"#$title\").owlCarousel({
       navigation : true, // Show next and prev buttons
       slideSpeed : 500,
       autoplayTimeout:$dur,
@@ -72,7 +72,7 @@ $js="	$(\"#$title\").owlCarousel({
         owl.trigger('owl.prev');
     })
      ";
-
-$this->registerJs($js,View::POS_READY);
+    
+    $this->registerJs($js, View::POS_READY);
 
 ?>
--
libgit2 0.21.4