VItaliy 27.11.2015

Administrator
1 parent 70eb26db
Showing 24 changed files with 172 additions and 80 deletions Show diff stats
.htaccess
backend/components/views/image_sizer.php
backend/controllers/EmailsController.php
backend/controllers/NewsController.php
backend/controllers/PageController.php
backend/controllers/PartnersController.php
backend/controllers/SliderController.php
backend/views/layouts/column.php
backend/views/news/index.php
backend/views/news/view.php
backend/views/page/_form.php
backend/views/page/index.php
backend/views/slider/_form.php
backend/views/slider/index.php
backend/web/.htaccess
common/models/Emails.php
common/models/Page.php
common/models/Slider.php
frontend/controllers/NewsController.php
frontend/controllers/SiteController.php
+AddDefaultCharset utf-8
 <IfModule mod_rewrite.c>
-AddDefaultCharset UTF-8
+
+
     Options +FollowSymlinks
     RewriteEngine On
@@ -90,8 +90,7 @@ $this-&gt;registerCssFile(&#39;@web/js/vendor/bower/jquery-file-upload/css/jquery.fileu
     <?=  Html::activeHiddenInput( $model,$field,['id' => "{$field}_picture_link"]) ?>
-    <input type="hidden" name="ImageSizerForm[width]" value="<?=$width?>"/>
-    <input type="hidden" name="ImageSizerForm[height]" value="<?=$height?>"/>
+
     <input type="hidden" name="ImageSizerForm[multi]" value="<?=$multi?>"/>
     <div id="<?= $field?>_img_block">
@@ -107,6 +106,7 @@ $this-&gt;registerCssFile(&#39;@web/js/vendor/bower/jquery-file-upload/css/jquery.fileu
             $("#<?= $field?>").fileupload({
                 dataType: 'json',
+                formData: {width: <?=$width?>,height:<?=$height?>},
                 done: function (e, data) {
                     var img = data.result.view;
@@ -15,6 +15,10 @@ use yii\filters\AccessControl;
  */
 class EmailsController extends Controller
 {
+
+
+    public $layout = "/column";
+
     /**
      * @inheritdoc
      */
@@ -107,6 +107,16 @@ class NewsController extends BaseController
                 }
+
+                if(isset($model['price_list']) && !empty($model['price_list'])){
+                    $price_list ='<div>
+                        <img src="http://'.$_SERVER['SERVER_NAME'].'/images/ico_exel.png">
+                        <a href="'.'http://'.$_SERVER['SERVER_NAME'].$model['price_list'].'">Скачать список товаров</a>
+                    </div>';
+                }else {
+                    $price_list = '';
+                }
+
                 if (count($sEmails)>0) {
                     $fp = fopen('logs.txt', 'w');
                     foreach ($sEmails as $mailing) {
@@ -116,7 +126,7 @@ class NewsController extends BaseController
                         $deny = $this->deny($deny_data);
                         unset($deny_data);
-                        $data['data'] = $model['content']."<br><br>".$deny;
+                        $data['data'] = $model['content']."<br>".$price_list."<br>".$deny;
                         Emails::get('news',$data,$mailing);
                         fwrite($fp, $mailing);
@@ -2,6 +2,7 @@
 namespace backend\controllers;
+use backend\components\base\BaseController;
 use Yii;
 use common\models\Page;
 use common\models\PageSearch;
@@ -13,8 +14,12 @@ use yii\filters\AccessControl;
 /**
  * PageController implements the CRUD actions for Page model.
  */
-class PageController extends Controller
+class PageController extends BaseController
 {
+
+
+    public $layout = "/column";
+
     /**
      * @inheritdoc
      */
@@ -15,6 +15,7 @@ use yii\filters\AccessControl;
  */
 class PartnersController extends Controller
 {
+    public $layout = "/column";
     /**
      * @inheritdoc
      */
@@ -2,6 +2,7 @@
 namespace backend\controllers;
+use backend\components\base\BaseController;
 use Yii;
 use common\models\Slider;
 use common\models\SliderSearch;
@@ -13,8 +14,10 @@ use yii\filters\AccessControl;
 /**
  * SliderController implements the CRUD actions for Slider model.
  */
-class SliderController extends Controller
+class SliderController extends BaseController
 {
+
+    public $layout = "/column";
     /**
      * @inheritdoc
      */
@@ -342,7 +342,6 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
                             ['label' => 'Текстовые страницы', 'url' => ['page/index']],
                             ['label' => 'Новости', 'url' => ['news/index']],
                             ['label' => 'Слайдер', 'url' => ['slider/index']],
-                            ['label' => 'Партнёры', 'url' => ['partners/index']],
                         ],
                         ],
                         ['label' => 'Платежные системы', 'options'=>['class'=>'label_9'], 'url' => ['#'], 'items' => [
@@ -34,11 +34,29 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
              //'title',
              //'kwords',
              //'descr',
-
-             'is_active',
+            [
+                'format' => 'raw',
+                'filter' => [
+                    '1'=>'Отображаются',
+                    '0'=>'Скрытые',
+                ],
+                'value' => function($data){
+                    if($data->is_active){
+                        $status_img = '<i style="color: #008000" class="glyphicon glyphicon-ok"></i>';
+                    } else {
+                        $status_img = '<i style="color: red" class="glyphicon glyphicon-remove"></i>';
+                    }
+                    return $status_img;
+                },
+                'attribute'=>'is_active',
+            ],
              //'mail_send',
              'mails_count',
             [
+                'format' => 'image',
+                'attribute'=>'img',
+            ],
+            [
                 'label' =>'Дата',
                 'value' =>function ($data) {
                     return date('Y-m-d', $data->dt);
@@ -56,7 +74,6 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
                     'attribute2' => 'date_to',
                 ]),
             ],
-             //'img',
             ['class' => 'yii\grid\ActionColumn'],
         ],
@@ -31,8 +31,8 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'id',
             'name',
             'code',
-            'brief:ntext',
-            'content:ntext',
+            'brief:html',
+            'content:html',
             'sort_delete',
             'title',
             'kwords',
@@ -2,7 +2,8 @@
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
-
+use mihaildev\ckeditor\CKEditor;
+use mihaildev\elfinder\ElFinder;
 /* @var $this yii\web\View */
 /* @var $model common\models\Page */
 /* @var $form yii\widgets\ActiveForm */
@@ -16,7 +17,14 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'code')->textInput(['maxlength' => true]) ?>
-    <?= $form->field($model, 'content')->textarea(['rows' => 6]) ?>
+    <?=  $form->field($model, 'content')->widget(CKEditor::className(),[
+        'editorOptions' => ElFinder::ckeditorOptions('elfinder',[
+                'preset' => 'full', //разработанны стандартные настройки basic, standard, full данную возможность не обязательно использовать
+                'inline' => false, //по умолчанию false]),
+                'filebrowserUploadUrl'=>Yii::$app->getUrlManager()->createUrl('page/images-upload')
+            ]
+        )
+    ]); ?>
     <?= $form->field($model, 'sort')->textInput() ?>
@@ -26,7 +34,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'descr')->textInput(['maxlength' => true]) ?>
-    <?= $form->field($model, 'is_active')->textInput() ?>
+    <?= $form->field($model, 'is_active')->checkbox() ?>
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
@@ -25,15 +25,30 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         'columns' => [
             ['class' => 'yii\grid\SerialColumn'],
-            'id',
+            //'id',
             'name',
             'code',
-            'content:ntext',
+            //'content:ntext',
             'sort',
             // 'title',
             // 'kwords',
             // 'descr',
-            // 'is_active',
+            [
+                'format' => 'raw',
+                'filter' => [
+                    '1'=>'Отображаются',
+                    '0'=>'Скрытые',
+                ],
+                'value' => function($data){
+                    if($data->is_active){
+                        $status_img = '<i style="color: #008000" class="glyphicon glyphicon-ok"></i>';
+                    } else {
+                        $status_img = '<i style="color: red" class="glyphicon glyphicon-remove"></i>';
+                    }
+                    return $status_img;
+                },
+                'attribute'=>'is_active',
+            ],
             ['class' => 'yii\grid\ActionColumn'],
         ],
@@ -14,11 +14,17 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
-    <?= $form->field($model, 'img')->textInput(['maxlength' => true]) ?>
+    <?= \backend\components\ImageUploader::widget([
+        'model'=> $model,
+        'field'=>'img',
+        'multi'=>false,
+        'gallery' =>$model->img,
+        'name' => 'Загрузить картинку'
+    ]); ?>
     <?= $form->field($model, 'url')->textInput(['maxlength' => true]) ?>
-    <?= $form->field($model, 'is_active')->textInput() ?>
+    <?= $form->field($model, 'is_active')->checkbox() ?>
     <?= $form->field($model, 'sort')->textInput() ?>
@@ -27,9 +27,32 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'id',
             'name',
-            'img',
-            'url:url',
-            'is_active',
+            [
+                'attribute'=>'img',
+                'format' => 'raw',
+                'value' => function($data){
+                    return Html::img(\yii\helpers\Url::to($data->img),[
+                        'style' => 'width:200px;'
+                    ]);
+                },
+            ],
+            //'url:url',
+            [
+                'format' => 'raw',
+                'filter' => [
+                    '1'=>'Отображаются',
+                    '0'=>'Скрытые',
+                ],
+                'value' => function($data){
+                    if($data->is_active){
+                        $status_img = '<i style="color: #008000" class="glyphicon glyphicon-ok"></i>';
+                    } else {
+                        $status_img = '<i style="color: red" class="glyphicon glyphicon-remove"></i>';
+                    }
+                    return $status_img;
+                },
+                'attribute'=>'is_active',
+            ],
             // 'sort',
             ['class' => 'yii\grid\ActionColumn'],
-RewriteEngine on
-
-RewriteBase /
-
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteCond %{REQUEST_FILENAME} !-f
-
-RewriteRule . index.php
 \ No newline at end of file
@@ -148,24 +148,25 @@ class Emails extends \yii\db\ActiveRecord
         $letter = str_replace(array("../../../"),"http://".$_SERVER['SERVER_NAME']."/",$letter);
         $mail = new \PHPMailer();
-
+        $mail->CharSet = "UTF-8";
         $mail->From     = $from;
-        $mail->FromName = $from_name;
-        $mail->Subject  = $subject;
+        $mail->FromName =$from_name;
+        $mail->Subject  =$subject;
         $mail->MsgHTML($letter);
         $fp = fopen("Emails_log.txt","w");
         fwrite($fp, $letter);
         fclose($fp);
-        $splitEmails = explode(",",$to);
-        if (count($splitEmails)>1){
-            foreach ($splitEmails as $sEmail){
-                $mail->AddAddress($sEmail);
-
-            }
-
-        } else {
-            $mail->AddAddress($to);
-        }
+        $mail->AddAddress($to);
+//        $splitEmails = explode(",",$to);
+//        if (count($splitEmails)>1){
+//            foreach ($splitEmails as $sEmail){
+//                $mail->AddAddress($sEmail);
+//
+//            }
+//
+//        } else {
+//            $mail->AddAddress($to);
+//        }
         if ($captcha){
             if (md5($vars['code'])==$_SESSION['captcha_keystring']) {
@@ -51,14 +51,14 @@ class Page extends \yii\db\ActiveRecord
     {
         return [
             'id' => 'ID',
-            'name' => 'Name',
-            'code' => 'Code',
-            'content' => 'Content',
-            'sort' => 'Sort',
-            'title' => 'Title',
-            'kwords' => 'Kwords',
-            'descr' => 'Descr',
-            'is_active' => 'Is Active',
+            'name' => 'Название',
+            'code' => 'Алиас',
+            'content' => 'Содержание',
+            'sort' => 'Сортировка',
+            'title' => 'SEO: Title',
+            'kwords' => 'SEO: Ключевые слова',
+            'descr' => 'SEO: Описание',
+            'is_active' => 'Выводить',
         ];
     }
 }
@@ -44,11 +44,11 @@ class Slider extends \yii\db\ActiveRecord
     {
         return [
             'id' => 'ID',
-            'name' => 'Name',
-            'img' => 'Img',
-            'url' => 'Url',
-            'is_active' => 'Is Active',
-            'sort' => 'Sort',
+            'name' => 'Название',
+            'img' => 'Изображение',
+            'url' => 'Адрес перехода',
+            'is_active' => 'Выводить',
+            'sort' => 'Сортировка',
         ];
     }
 }
@@ -19,7 +19,7 @@ class NewsController extends Controller
     public function actionIndex()
     {
         $dataProvider = new ActiveDataProvider([
-            'query' => News::find(),
+            'query' => News::find()->where(['is_active'=>1]),
             'pagination' => [
                 'pageSize' => 16,
             ],
@@ -32,8 +32,10 @@ class NewsController extends Controller
     public function actionView($translit)
     {
+        $news_list = News::find()->where(['is_active'=>1])->limit(3)->all();
         return $this->render('view', [
             'model' => $this->findModel($translit),
+            'news_list' => $news_list
         ]);
     }
@@ -3,6 +3,7 @@ namespace frontend\controllers;
 use common\models\Accounts;
 use common\models\AccountsForm;
+use common\models\News;
 use common\models\Team;
 use common\models\TeamGroup;
 use Yii;
@@ -51,6 +52,8 @@ class SiteController extends Controller
     {
         $this->layout = '/outer';
+        $news_list = News::find()->where(['is_active'=>1])->limit(3)->all();
+
         if (Yii::$app->request->post()) {
             $post = Yii::$app->request->post();
@@ -64,7 +67,9 @@ class SiteController extends Controller
             }
         }
-        return $this->render('index');
+        return $this->render('index',[
+            'news_list' => $news_list
+        ]);
     }
     public function actionNotFound()
 <?php
-
+use  \yii\helpers\Html;
 $this->registerCssFile('/css/style/news_all.css');
 $this->title = $model->name;
@@ -19,18 +19,12 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
     </div>
     <div class='long_line'></div>
     <div class="go_news">
-    <a href="">
-    <div class="back_news">
-        <p class='article'>Приход товара Mecarm</p>
-        <p class="short_news">На склад поступила очередная партия товара MecArm</p>
-    </div>
-    </a>
-    <a href="">
-    <div class="next_news">
-        <p class='article'>Приход товара Mecarm</p>
-        <p class="short_news">На склад поступила очередная партия товара MecArm</p>
-    </div>
-    </a>
+    <?php foreach ($news_list as $one_news):?>
+            <div class="back_news">
+                <?=  Html::a("<p class='article'>".$one_news->name."</p>",['news/view', 'translit' =>$one_news->code ])  ?>
+                <?=  Html::a("<p class='short_news'>".$one_news->brief."</p>",['news/view', 'translit' =>$one_news->code ])  ?>
+            </div>
+    <?php endforeach; ?>
     </div>
     </div>
     <img src="/images/lonh_line.png" style="margin-top:-20px;opacity:0">
+<?php
+$this->registerMetaTag(['description' => $page->descr,'keywords'=>$page->kwords]);
+$this->title = $page->title ? $page->title: $page->name;
+$this->params['breadcrumbs'][] = $this->title;
+echo $page->content;
 \ No newline at end of file
@@ -581,6 +581,14 @@ use \yii\helpers\Html;
         <span class="number_of">1/</span>
         <span class="general_number">5</span>
         <span><img src="/images/arrow_slider_go.png"></span>
+        <?php foreach ($news_list as $one_news):?>
+            <div class="slider_tovars">
+                <div class="tovar">
+                    <?= Html::img(\yii\helpers\Url::to($one_news->img)); ?>
+                    <?=  Html::a("<p class='article'>".$one_news->name."</p>",['news/view', 'translit' =>$one_news->code ])  ?>
+                </div>
+            </div>
+        <?php endforeach; ?>
         <div class="slider_tovars">
             <div class="tovar">
                 <img src="/images/news.png">
-RewriteEngine on
-RewriteBase /
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-
-RewriteRule . index.php
-
-Options -Indexes
 \ No newline at end of file