diff --git a/.htaccess b/.htaccess index 35ce115..9c37e78 100755 --- a/.htaccess +++ b/.htaccess @@ -1,5 +1,7 @@ +AddDefaultCharset utf-8 -AddDefaultCharset UTF-8 + + Options +FollowSymlinks RewriteEngine On diff --git a/backend/components/views/image_sizer.php b/backend/components/views/image_sizer.php index 0ac1589..4b9cb0d 100755 --- a/backend/components/views/image_sizer.php +++ b/backend/components/views/image_sizer.php @@ -90,8 +90,7 @@ $this->registerCssFile('@web/js/vendor/bower/jquery-file-upload/css/jquery.fileu "{$field}_picture_link"]) ?> - - +
@@ -107,6 +106,7 @@ $this->registerCssFile('@web/js/vendor/bower/jquery-file-upload/css/jquery.fileu $("#").fileupload({ dataType: 'json', + formData: {width: ,height:}, done: function (e, data) { var img = data.result.view; diff --git a/backend/controllers/EmailsController.php b/backend/controllers/EmailsController.php index a89a954..09227d9 100755 --- a/backend/controllers/EmailsController.php +++ b/backend/controllers/EmailsController.php @@ -15,6 +15,10 @@ use yii\filters\AccessControl; */ class EmailsController extends Controller { + + + public $layout = "/column"; + /** * @inheritdoc */ diff --git a/backend/controllers/NewsController.php b/backend/controllers/NewsController.php index 72aef76..7a28fcd 100755 --- a/backend/controllers/NewsController.php +++ b/backend/controllers/NewsController.php @@ -107,6 +107,16 @@ class NewsController extends BaseController } + + if(isset($model['price_list']) && !empty($model['price_list'])){ + $price_list ='
+ + Скачать список товаров +
'; + }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']."

".$deny; + $data['data'] = $model['content']."
".$price_list."
".$deny; Emails::get('news',$data,$mailing); fwrite($fp, $mailing); diff --git a/backend/controllers/PageController.php b/backend/controllers/PageController.php index c443760..594dfa0 100755 --- a/backend/controllers/PageController.php +++ b/backend/controllers/PageController.php @@ -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 */ diff --git a/backend/controllers/PartnersController.php b/backend/controllers/PartnersController.php index 616cc69..7658aec 100755 --- a/backend/controllers/PartnersController.php +++ b/backend/controllers/PartnersController.php @@ -15,6 +15,7 @@ use yii\filters\AccessControl; */ class PartnersController extends Controller { + public $layout = "/column"; /** * @inheritdoc */ diff --git a/backend/controllers/SliderController.php b/backend/controllers/SliderController.php index 15140d3..2db956f 100755 --- a/backend/controllers/SliderController.php +++ b/backend/controllers/SliderController.php @@ -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 */ diff --git a/backend/views/layouts/column.php b/backend/views/layouts/column.php index 6df5420..31f9125 100755 --- a/backend/views/layouts/column.php +++ b/backend/views/layouts/column.php @@ -342,7 +342,6 @@ $this->beginContent('@app/views/layouts/main.php'); ['label' => 'Текстовые страницы', 'url' => ['page/index']], ['label' => 'Новости', 'url' => ['news/index']], ['label' => 'Слайдер', 'url' => ['slider/index']], - ['label' => 'Партнёры', 'url' => ['partners/index']], ], ], ['label' => 'Платежные системы', 'options'=>['class'=>'label_9'], 'url' => ['#'], 'items' => [ diff --git a/backend/views/news/index.php b/backend/views/news/index.php index 7bf5303..6b72418 100755 --- a/backend/views/news/index.php +++ b/backend/views/news/index.php @@ -34,11 +34,29 @@ $this->params['breadcrumbs'][] = $this->title; //'title', //'kwords', //'descr', - - 'is_active', + [ + 'format' => 'raw', + 'filter' => [ + '1'=>'Отображаются', + '0'=>'Скрытые', + ], + 'value' => function($data){ + if($data->is_active){ + $status_img = ''; + } else { + $status_img = ''; + } + 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->params['breadcrumbs'][] = $this->title; 'attribute2' => 'date_to', ]), ], - //'img', ['class' => 'yii\grid\ActionColumn'], ], diff --git a/backend/views/news/view.php b/backend/views/news/view.php index bd566c5..f7063a4 100755 --- a/backend/views/news/view.php +++ b/backend/views/news/view.php @@ -31,8 +31,8 @@ $this->params['breadcrumbs'][] = $this->title; 'id', 'name', 'code', - 'brief:ntext', - 'content:ntext', + 'brief:html', + 'content:html', 'sort_delete', 'title', 'kwords', diff --git a/backend/views/page/_form.php b/backend/views/page/_form.php index bff3662..ad745d3 100755 --- a/backend/views/page/_form.php +++ b/backend/views/page/_form.php @@ -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; field($model, 'code')->textInput(['maxlength' => true]) ?> - field($model, 'content')->textarea(['rows' => 6]) ?> + 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') + ] + ) + ]); ?> field($model, 'sort')->textInput() ?> @@ -26,7 +34,7 @@ use yii\widgets\ActiveForm; field($model, 'descr')->textInput(['maxlength' => true]) ?> - field($model, 'is_active')->textInput() ?> + field($model, 'is_active')->checkbox() ?>
isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> diff --git a/backend/views/page/index.php b/backend/views/page/index.php index cd5d239..926d20c 100755 --- a/backend/views/page/index.php +++ b/backend/views/page/index.php @@ -25,15 +25,30 @@ $this->params['breadcrumbs'][] = $this->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 = ''; + } else { + $status_img = ''; + } + return $status_img; + }, + 'attribute'=>'is_active', + ], ['class' => 'yii\grid\ActionColumn'], ], diff --git a/backend/views/slider/_form.php b/backend/views/slider/_form.php index becf040..faca77c 100755 --- a/backend/views/slider/_form.php +++ b/backend/views/slider/_form.php @@ -14,11 +14,17 @@ use yii\widgets\ActiveForm; field($model, 'name')->textInput(['maxlength' => true]) ?> - field($model, 'img')->textInput(['maxlength' => true]) ?> + $model, + 'field'=>'img', + 'multi'=>false, + 'gallery' =>$model->img, + 'name' => 'Загрузить картинку' + ]); ?> field($model, 'url')->textInput(['maxlength' => true]) ?> - field($model, 'is_active')->textInput() ?> + field($model, 'is_active')->checkbox() ?> field($model, 'sort')->textInput() ?> diff --git a/backend/views/slider/index.php b/backend/views/slider/index.php index 8438d49..8c9026b 100755 --- a/backend/views/slider/index.php +++ b/backend/views/slider/index.php @@ -27,9 +27,32 @@ $this->params['breadcrumbs'][] = $this->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 = ''; + } else { + $status_img = ''; + } + return $status_img; + }, + 'attribute'=>'is_active', + ], // 'sort', ['class' => 'yii\grid\ActionColumn'], diff --git a/backend/web/.htaccess b/backend/web/.htaccess deleted file mode 100755 index fa96d7a..0000000 --- a/backend/web/.htaccess +++ /dev/null @@ -1,8 +0,0 @@ -RewriteEngine on - -RewriteBase / - -RewriteCond %{REQUEST_FILENAME} !-d -RewriteCond %{REQUEST_FILENAME} !-f - -RewriteRule . index.php \ No newline at end of file diff --git a/common/models/Emails.php b/common/models/Emails.php index fa02575..746da08 100755 --- a/common/models/Emails.php +++ b/common/models/Emails.php @@ -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']) { diff --git a/common/models/Page.php b/common/models/Page.php index 5290cf9..7d55a80 100755 --- a/common/models/Page.php +++ b/common/models/Page.php @@ -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' => 'Выводить', ]; } } diff --git a/common/models/Slider.php b/common/models/Slider.php index aa765c5..51b0312 100755 --- a/common/models/Slider.php +++ b/common/models/Slider.php @@ -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' => 'Сортировка', ]; } } diff --git a/frontend/controllers/NewsController.php b/frontend/controllers/NewsController.php index e0f4df3..7d83fec 100755 --- a/frontend/controllers/NewsController.php +++ b/frontend/controllers/NewsController.php @@ -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 ]); } diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index 1f042f5..896821e 100755 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -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() diff --git a/frontend/views/news/view.php b/frontend/views/news/view.php index 2fe5713..ad228a8 100755 --- a/frontend/views/news/view.php +++ b/frontend/views/news/view.php @@ -1,5 +1,5 @@ registerCssFile('/css/style/news_all.css'); $this->title = $model->name; @@ -19,18 +19,12 @@ $this->params['breadcrumbs'][] = $this->title;
diff --git a/frontend/views/page/show.php b/frontend/views/page/show.php new file mode 100644 index 0000000..ae7be64 --- /dev/null +++ b/frontend/views/page/show.php @@ -0,0 +1,5 @@ +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 diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php index fc77f20..776d259 100755 --- a/frontend/views/site/index.php +++ b/frontend/views/site/index.php @@ -581,6 +581,14 @@ use \yii\helpers\Html; 1/ 5 + +
+
+ img)); ?> + ".$one_news->name."

",['news/view', 'translit' =>$one_news->code ]) ?> +
+
+
diff --git a/frontend/web/.htaccess b/frontend/web/.htaccess deleted file mode 100755 index 35a2d28..0000000 --- a/frontend/web/.htaccess +++ /dev/null @@ -1,8 +0,0 @@ -RewriteEngine on -RewriteBase / -RewriteCond %{REQUEST_FILENAME} !-f -RewriteCond %{REQUEST_FILENAME} !-d - -RewriteRule . index.php - -Options -Indexes \ No newline at end of file -- libgit2 0.21.4