Skip to content

T
taskonsite-архив-перенесен
Commit 21a0719f authored by Виталий Мурашко's avatar Виталий Мурашко
Browse files
Options

Merge branch 'master' of http://git.task-on.com/ktask/task-on.com 

Conflicts:
	frontend/config/main.php
parents 537639a4 5dc7cfda
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1980 additions and 721 deletions
backend/config/main.php
View file @ 21a0719f
......@@ -14,6 +14,7 @@ return [
'language' => 'ru-RU',
'defaultRoute' => '/main/main-admin/index',
'modules' => [
'languages' => ['class' => 'common\modules\languages\Module'],
'content' => ['class' => 'common\modules\content\Module'],
'faq' => ['class' => 'common\modules\faq\Module'],
'reviews' => ['class' => 'common\modules\reviews\Module'],
......
backend/web/js/triggers/conditions/admin-block.js
View file @ 21a0719f
// Метод добавляющий новое условие
$(document).on('click', 'a.add_condition', function() {
var id = $(this).data('id');
var container = $(this).closest('div.btn-group').parent().children('div.conditions-block');
var key = $(this).closest('tr').data('key');
$.ajax({
url: '/triggers/trigger-admin/getconditionhtml',
data: {
id: id
id: id,
key: key
},
method: 'GET',
success: function(response) {
......@@ -15,6 +18,7 @@ $(document).on('click', 'a.add_condition', function() {
})
});
// Метод добавляющий новую строку "И"
$(document).on('click', 'button.add-and-condition', function() {
var container = $(this).closest('table').children('tbody');
......
common/components/BaseController.php
View file @ 21a0719f
......@@ -51,7 +51,6 @@ abstract class BaseController extends Controller
public function beforeAction($action)
{
/*if(substr($currentUrl, -1) == '/' && $currentUrl!="/") {
$urlWithoutSlash = substr($currentUrl, 0, -1);
return $this->redirect($urlWithoutSlash,true,301);
......@@ -282,16 +281,6 @@ abstract class BaseController extends Controller
}
protected function performAjaxValidation($model)
{
if (isset($_POST['ajax']))
{
echo CActiveForm::validate($model);
Yii::$app->end();
}
}
/**
* Возвращает модель по атрибуту и удовлетворяющую скоупам,
* или выбрасывает 404
......
common/components/LangRequest.php 0 → 100644
View file @ 21a0719f
<?php
namespace common\components;
use Yii;
use yii\web\Request;
use common\modules\languages\models\Languages;
class LangRequest extends Request
{
private $_lang_url;
public function getLangUrl()
{
if ($this->_lang_url === null)
{
$this->_lang_url = $this->getUrl();
$url_list = explode('/', $this->_lang_url);
$lang_url = isset($url_list[1]) ? $url_list[1] : null;
Languages::setCurrent($lang_url);
if( $lang_url !== null && $lang_url === Languages::getCurrent()->url &&
strpos($this->_lang_url, Languages::getCurrent()->url) === 1 )
{
$this->_lang_url = substr($this->_lang_url, strlen(Languages::getCurrent()->url) + 1);
}
}
return $this->_lang_url;
}
protected function resolvePathInfo()
{
$pathInfo = $this->getLangUrl();
if (($pos = strpos($pathInfo, '?')) !== false)
{
$pathInfo = substr($pathInfo, 0, $pos);
}
$pathInfo = urldecode($pathInfo);
// try to encode in UTF8 if not so
// http://w3.org/International/questions/qa-forms-utf-8.html
if (!preg_match('%^(?:
[\x09\x0A\x0D\x20-\x7E] # ASCII
| [\xC2-\xDF][\x80-\xBF] # non-overlong 2-byte
| \xE0[\xA0-\xBF][\x80-\xBF] # excluding overlongs
| [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2} # straight 3-byte
| \xED[\x80-\x9F][\x80-\xBF] # excluding surrogates
| \xF0[\x90-\xBF][\x80-\xBF]{2} # planes 1-3
| [\xF1-\xF3][\x80-\xBF]{3} # planes 4-15
| \xF4[\x80-\x8F][\x80-\xBF]{2} # plane 16
)*$%xs', $pathInfo)
)
{
$pathInfo = utf8_encode($pathInfo);
}
$scriptUrl = $this->getScriptUrl();
$baseUrl = $this->getBaseUrl();
if (strpos($pathInfo, $scriptUrl) === 0)
{
$pathInfo = substr($pathInfo, strlen($scriptUrl));
}
elseif ($baseUrl === '' || strpos($pathInfo, $baseUrl) === 0)
{
$pathInfo = substr($pathInfo, strlen($baseUrl));
}
elseif (isset($_SERVER['PHP_SELF']) && strpos($_SERVER['PHP_SELF'], $scriptUrl) === 0)
{
$pathInfo = substr($_SERVER['PHP_SELF'], strlen($scriptUrl));
}
else
{
throw new InvalidConfigException('Unable to determine the path info of the current request.');
}
if ($pathInfo[0] === '/')
{
$pathInfo = substr($pathInfo, 1);
}
return (string) $pathInfo;
}
}
\ No newline at end of file
common/components/UrlManager.php
View file @ 21a0719f
<?php
namespace common\components;
use common\modules\languages\models\Languages;
class UrlManager extends \yii\web\UrlManager {
public function parseRequest($request){
$pages = \common\modules\content\models\CoContent::find([])->all();
public function parseRequest($request)
{
$pages = \common\modules\content\models\CoContent::find()->all();
$rules = [];
foreach($pages as $page) {
//$rules[$page->url] = \yii\helpers\Url::toRoute(['/content/page/view','id' => $page->id]);
$rules['<page:('.$page->url.')>'] = \yii\helpers\Url::toRoute(['/content/page/view']);
foreach($pages as $page)
{
$rules['<page:('.$page->url.')>'] = 'content/page/view';
}
$this->addRules($rules, false);
//die(print_r($request->getPathInfo()));
return parent::parseRequest($request);
}
public function createUrl($params)
{
if(isset($params['lang_id']))
{
//Если указан идентификатор языка, то делаем попытку найти язык в БД,
//иначе работаем с языком по умолчанию
$lang = Languages::findOne($params['lang_id']);
if($lang === null)
{
$lang = Languages::getDefaultLang();
}
unset($params['lang_id']);
}
else
{
//Если не указан параметр языка, то работаем с текущим языком
$lang = Languages::getCurrent();
}
//Получаем сформированный URL(без префикса идентификатора языка)
$url = parent::createUrl($params);
//Добавляем к URL префикс - буквенный идентификатор языка
if($url == '/')
{
return '/' . $lang->url;
}
else
{
return '/' . $lang->url . $url;
}
}
}
common/components/activeRecordBehaviors/MetaTagBehavior.php
View file @ 21a0719f
......@@ -7,9 +7,6 @@ use \common\models\MetaTags;
class MetaTagBehavior extends Behavior
{
public $language = 'ru';
public function events()
{
return [
......@@ -21,26 +18,29 @@ class MetaTagBehavior extends Behavior
public function Save($event)
{
$attributes = \Yii::$app->request->post('MetaTags');
if ($attributes)
$meta = \Yii::$app->request->post('MetaTags');
if ($meta)
{
$meta_tag = MetaTags::find()->where([
'object_id' => $this->owner->id,
'model_id' => get_class($this->owner),
'language' => $this->language,
])->one();
if (!$meta_tag)
foreach ($meta as $lang_id => $attributes)
{
$meta_tag = new MetaTags;
}
$meta_tag = MetaTags::find()->where([
'object_id' => $this->owner->id,
'model_id' => get_class($this->owner),
'lang_id' => $lang_id,
])->one();
$attributes['object_id'] = $this->owner->id;
$attributes['model_id'] = get_class($this->owner);
$attributes['language'] = $this->language;
if (!$meta_tag)
{
$meta_tag = new MetaTags;
}
$meta_tag->setAttributes( $attributes );
if(!$meta_tag->save()) die(print_r($meta_tag->errors));
$attributes['object_id'] = $this->owner->id;
$attributes['model_id'] = get_class($this->owner);
$attributes['lang_id'] = $lang_id;
$meta_tag->setAttributes( $attributes );
if(!$meta_tag->save()) die(print_r($meta_tag->errors));
}
}
return true;
......@@ -48,17 +48,20 @@ class MetaTagBehavior extends Behavior
public function Insert($event)
{
$attributes = \Yii::$app->request->post('MetaTags');
if ($attributes )
$meta = \Yii::$app->request->post('MetaTags');
if ($meta)
{
$meta_tag = new MetaTags;
foreach ($meta as $lang_id => $attributes)
{
$meta_tag = new MetaTags;
$attributes['object_id'] = $this->owner->id;
$attributes['model_id'] = get_class($this->owner);
$attributes['language'] = 'ru';
$attributes['object_id'] = $this->owner->id;
$attributes['model_id'] = get_class($this->owner);
$attributes['lang_id'] = $lang_id;
$meta_tag->setAttributes( $attributes );
$meta_tag->save(false);
$meta_tag->setAttributes($attributes);
$meta_tag->save(false);
}
}
return true;
......@@ -66,19 +69,11 @@ class MetaTagBehavior extends Behavior
public function Delete($event)
{
$model = MetaTags::find()
->where([
'object_id' => $this->owner->id,
'model_id' => get_class($this->owner)
])->one();
if(!empty($model)) $model->delete();
MetaTags::deleteAll([
'object_id' => $this->owner->id,
'model_id' => get_class($this->owner)
]);
return true;
}
}
common/models/MetaTags.php
View file @ 21a0719f
......@@ -37,12 +37,11 @@ class MetaTags extends \common\components\ActiveRecordModel
public function rules()
{
return [
[['object_id', 'model_id', 'language'], 'required'],
[['object_id', 'created_at', 'updated_at'], 'integer'],
[['object_id', 'model_id', 'lang_id'], 'required'],
[['object_id', 'created_at', 'updated_at', 'lang_id'], 'integer'],
[['model_id'], 'string', 'max' => 50],
[['language'], 'string', 'max' => 5],
[['title', 'keywords', 'description'], 'string', 'max' => 300],
[['object_id', 'model_id'], 'unique', 'targetAttribute' => ['object_id', 'model_id'], 'message' => 'The combination of ID объекта and Модель has already been taken.']
[['object_id', 'model_id', 'lang_id'], 'unique', 'targetAttribute' => ['object_id', 'model_id', 'lang_id'], 'message' => 'The combination of ID объекта and Модель has already been taken.']
];
}
......@@ -55,10 +54,10 @@ class MetaTags extends \common\components\ActiveRecordModel
'id' => Yii::t('content', 'ID'),
'object_id' => Yii::t('content', 'ID объекта'),
'model_id' => Yii::t('content', 'Модель'),
'language' => Yii::t('content', 'Язык'),
'title' => /*Yii::t('content', 'Заголовок')*/'Title',
'keywords' => /*Yii::t('content', 'Ключевые слова')*/'Keywords',
'description' => /*Yii::t('content', 'Описание')*/ 'Description',
'lang_id' => Yii::t('content', 'Язык'),
'title' => 'Title',
'keywords' => 'Keywords',
'description' => 'Description',
'created_at' => Yii::t('content', 'Создано'),
'updated_at' => Yii::t('content', 'Отредактирован'),
];
......
common/modules/content/components/CoBlocksLangBehavior.php 0 → 100644
View file @ 21a0719f
<?php
namespace common\modules\content\components;
use Yii;
use yii\base\Behavior;
use yii\db\ActiveRecord;
use common\modules\content\models\CoBlocksLang;
class CoBlocksLangBehavior extends Behavior
{
public function events()
{
return [
ActiveRecord::EVENT_AFTER_UPDATE => 'Save',
ActiveRecord::EVENT_AFTER_INSERT => 'Insert',
ActiveRecord::EVENT_AFTER_DELETE => 'Delete',
];
}
public function Save($event)
{
$langs = Yii::$app->request->post('CoBlocksLang');
if ($langs)
{
foreach ($langs as $lang_id => $attributes)
{
$lang = CoBlocksLang::find()->where([
'block_id' => $this->owner->id,
'lang_id' => $lang_id,
])->one();
if (!$lang)
{
$lang = new CoBlocksLang;
}
$attributes['block_id'] = $this->owner->id;
$attributes['lang_id'] = $lang_id;
$lang->setAttributes( $attributes );
if(!$lang->save()) die(print_r($lang->errors));
}
}
return true;
}
public function Insert($event)
{
$langs = Yii::$app->request->post('CoBlocksLang');
if ($langs)
{
foreach ($langs as $lang_id => $attributes)
{
$meta_tag = new CoBlocksLang;
$attributes['block_id'] = $this->owner->id;
$attributes['lang_id'] = $lang_id;
$meta_tag->setAttributes($attributes);
$meta_tag->save(false);
}
}
return true;
}
public function Delete($event)
{
CoBlocksLang::deleteAll([
'block_id' => $this->owner->id
]);
return true;
}
}
common/modules/content/components/CoContentLangBehavior.php 0 → 100644
View file @ 21a0719f
<?php
namespace common\modules\content\components;
use Yii;
use yii\base\Behavior;
use yii\db\ActiveRecord;
use common\modules\content\models\CoContentLang;
class CoContentLangBehavior extends Behavior
{
public function events()
{
return [
ActiveRecord::EVENT_AFTER_UPDATE => 'Save',
ActiveRecord::EVENT_AFTER_INSERT => 'Insert',
ActiveRecord::EVENT_AFTER_DELETE => 'Delete',
];
}
public function Save($event)
{
$langs = Yii::$app->request->post('CoContentLang');
if ($langs)
{
foreach ($langs as $lang_id => $attributes)
{
$lang = CoContentLang::find()->where([
'content_id' => $this->owner->id,
'lang_id' => $lang_id,
])->one();
if (!$lang)
{
$lang = new CoContentLang;
}
$attributes['content_id'] = $this->owner->id;
$attributes['lang_id'] = $lang_id;
$lang->setAttributes( $attributes );
if(!$lang->save()) die(print_r($lang->errors));
}
}
return true;
}
public function Insert($event)
{
$langs = Yii::$app->request->post('CoContentLang');
if ($langs)
{
foreach ($langs as $lang_id => $attributes)
{
$meta_tag = new CoContentLang;
$attributes['content_id'] = $this->owner->id;
$attributes['lang_id'] = $lang_id;
$meta_tag->setAttributes($attributes);
$meta_tag->save(false);
}
}
return true;
}
public function Delete($event)
{
CoContentLang::deleteAll([
'content_id' => $this->owner->id
]);
return true;
}
}
common/modules/content/controllers/BlockAdminController.php
View file @ 21a0719f
......@@ -3,12 +3,15 @@
namespace common\modules\content\controllers;
use Yii;
use common\modules\content\models\CoBlocks;
use common\modules\content\models\SearchCoBlocks;
use common\components\AdminController;
use yii\web\NotFoundHttpException;
use yii\filters\VerbFilter;
use common\modules\content\models\CoBlocks;
use common\modules\content\models\CoBlocksLang;
use common\modules\content\models\SearchCoBlocks;
use common\modules\languages\models\Languages;
/**
* BlockAdminController implements the CRUD actions for CoBlocks model.
*/
......@@ -21,9 +24,6 @@ class BlockAdminController extends AdminController
'Update' => 'Редактирование контента',
'Delete' => 'Удаление контента',
'View' => 'Просмотр контента',
'Createcontent' => 'Добавление данных контента',
'Updatecontent' => 'Редактирование данных контента',
'Deletecontent' => 'Удаление данных контента',
];
}
......@@ -78,7 +78,48 @@ class BlockAdminController extends AdminController
*/
public function actionCreate()
{
return $this->actionUpdate();
$model = new CoBlocks;
$langs = [];
foreach (Languages::find()->all() as $lang)
{
$lng = new CoBlocksLang;
$lng->lang_id = $lang->id;
$langs[$lang->id] = $lng;
}
Yii::$app->controller->page_title = 'Добавить блок';
Yii::$app->controller->breadcrumbs = [
['Управление блоками' => \yii\helpers\Url::toRoute('manage')],
'Добавить блок',
];
if (Yii::$app->request->isPost)
{
$transaction = Yii::$app->db->beginTransaction();
try
{
$model->attributes = Yii::$app->request->post('CoBlocks');
if($model->save())
{
$transaction->commit();
return $this->redirect(['manage']);
}
}
catch (\Exception $e)
{
$transaction->rollBack();
throw $e;
}
}
return $this->render('create', [
'model' => $model,
'langs' => $langs
]);
}
/**
......@@ -87,33 +128,57 @@ class BlockAdminController extends AdminController
* @param string $id
* @return mixed
*/
public function actionUpdate($id=null)
public function actionUpdate($id)
{
if(empty($id)){
$model = new CoBlocks();
\yii::$app->controller->page_title = 'Создание блока';
\yii::$app->controller->breadcrumbs = [
['Список блоков' => \yii\helpers\Url::toRoute('manage')],
'Создание блока'
];
}
else {
$model = $this->findModel($id);
\yii::$app->controller->page_title = 'Редактирование блока';
\yii::$app->controller->breadcrumbs = [
['Список блоков' => \yii\helpers\Url::toRoute('manage')],
'Редактирование блока'
];
}
if ($model->load(Yii::$app->request->post()) && $model->save()) {
return $this->redirect(['manage']);
} else {
$form = new \common\components\BaseForm('/common/modules/content/forms/BlockForm', $model);
return $this->render('update', [
'model' => $model,
'form' => $form->out,
]);
}
$model = $this->findModel($id);
$langs = [];
foreach (Languages::find()->all() as $lang)
{
$lng = $model->getLang($lang->id)->one();
if(!$lng)
{
$lng = new CoBlocksLang;
$lng->lang_id = $lang->id;
}
$langs[$lang->id] = $lng;
}
Yii::$app->controller->page_title = 'Редактировать блок';
Yii::$app->controller->breadcrumbs = [
['Управление блоками' => \yii\helpers\Url::toRoute('manage')],
'Редактировать блок',
];
if (Yii::$app->request->isPost)
{
$transaction = Yii::$app->db->beginTransaction();
try
{
$model->attributes = Yii::$app->request->post('CoBlocks');
if($model->save())
{
$transaction->commit();
return $this->redirect(['manage']);
}
}
catch (\Exception $e)
{
$transaction->rollBack();
throw $e;
}
}
return $this->render('update', [
'model' => $model,
'langs' => $langs
]);
}
/**
......
common/modules/content/controllers/PageController.php
View file @ 21a0719f
......@@ -20,8 +20,8 @@ class PageController extends \common\components\BaseController
public function actionView($id = null, $page = null)
{
if(empty($id) && empty($page)) {
if(!\Yii::$app->user->isGuest)
return $this->redirect(\yii\helpers\Url::toRoute('/scoring/clients/cabinet'));
// if(!\Yii::$app->user->isGuest)
// return $this->redirect(\yii\helpers\Url::toRoute('/scoring/clients/cabinet'));
$page = '/';
}
if(!empty($id))
......@@ -33,10 +33,10 @@ class PageController extends \common\components\BaseController
$model = CoContent::findOne(['url' => $page]);
}
$content = $model->getContent();
$this->meta_title = $model->metaTags->title . ' - ' . \Yii::$app->params['name'];
$this->meta_description = $model->metaTags->description;
$this->meta_keywords = $model->metaTags->keywords;
$content = $model->lang->content;
$this->meta_title = $model->metaTag->title . ' - ' . \Yii::$app->params['name'];
$this->meta_description = $model->metaTag->description;
$this->meta_keywords = $model->metaTag->keywords;
return $this->render('view', ['content'=>$content]);
}
......
common/modules/content/forms/ContentDataForm.php deleted 100644 → 0
View file @ 537639a4
<?php
use yii\helpers\ArrayHelper;
return [
'activeForm'=>[
'id' => 'controller-form',
],
'elements' => [
'content_id' => [
'type' => 'dropdownlist',
'items' => ArrayHelper::map(\common\modules\content\models\CoContent::find()->all(), 'id', 'name'),
'class' => 'form-control',
],
'title' => ['type' => 'text', 'class' => 'form-control'],
'short_description' => ['type' => 'textarea', 'class' => 'form-control'],
'description' => ['type' => 'textarea', 'class' => 'form-control'],
],
'buttons' => [
'submit' => ['type' => 'submit', 'value' => 'Cохранить']
]
];
common/modules/content/forms/ContentForm.php deleted 100644 → 0
View file @ 537639a4
<?php
use yii\helpers\ArrayHelper;
use yii\helpers\Html;
use \common\modules\content\models\CoContent;
$blocks = \common\modules\content\models\CoBlocks::find()->all();
$block_hint = '';
if(count($blocks)) {
$block_hint .= "<ul>\n";
foreach($blocks as $block) {
$block_hint .= "<li>{{$block->name}} {$block->title}</li>\n";
}
$block_hint .= "</ul>\n";
}
return [
'activeForm'=>[
'id' => 'controller-form',
'options' => [
'enctype' => 'multipart/form-data'
],
],
'elements' => [
'category_id' => [
'type' => 'dropdownlist',
'items' => ArrayHelper::map(\common\modules\content\models\CoCategory::find()->all(), 'id', 'name'),
'empty' => 'Без привязки к категории',
'class' => 'form-control',
'hint' => 'Для того что бы было проще сортировать данную страницу в общем списке вы можете привязать ее к определенной категории. Список категории настраивается
' . Html::a('тут',['/content/category-admin/manage']) . '.',
],
'url' => [
'type' => 'text',
'class' => 'form-control',
'hint' => 'Для создания ЧПУ («Человеку Понятный Урл») укажите латинскими буквами путь, например, razdel/podrazdel/nazvanie_stranici.html ',
],
'name' => [
'type' => 'text',
'class' => 'form-control',
'hint' => 'Название страницы не будет отображаться пользователям сайта и служит исключительно для служебного пользования в Панель управления.',
],
'title' => [
'type' => 'text',
'class' => 'form-control',
'hint' => 'Заголовок страницы виден пользователю сайта и как правило оформляется в тег &lt;h1&gt;. Если дизайном страницы не предусмотрен вывод заголовка, то он не будет выводиться даже если был введен в данное поле.',
],
($model->preview?Html::img(\Yii::$app->params['frontUrl'] . CoContent::PHOTO_FOLDER . $model->preview):''),
'image' => ['type' => 'file', 'class' => 'form-control',],
'text' => [
'type' => 'textarea',
'class' => 'form-control',
'label' => 'Текст редактируемый на странице<br>'.$block_hint,
],
'active' => [
'type' => 'checkbox',
'template' => '{input}<a href="#" class="btn btn-xs btn-success m-l-5 disabled">Страница скрыта от пользователя / Страница видна пользователю</a>',
'opts' => [
'data-theme' => 'self',
// 'data-secondary-color' => "#79C137",
'data-render' => "switchery",
'label' => ' ',
],
],
// 'created_at' => ['type' => 'text', 'class' => 'form-control'],
// 'updated_at' => ['type' => 'text', 'class' => 'form-control'],
],
'buttons' => [
'submit' => ['type' => 'submit', 'value' => 'Cохранить']
]
];
common/modules/content/models/CoBlocks.php
View file @ 21a0719f
......@@ -4,6 +4,9 @@ namespace common\modules\content\models;
use Yii;
use common\modules\languages\models\Languages;
use common\modules\content\models\CoBlocksLang;
/**
* This is the model class for table "co_blocks".
*
......@@ -25,25 +28,34 @@ class CoBlocks extends \common\components\ActiveRecordModel
return 'co_blocks';
}
public function name() {
public function name()
{
return 'Блоки';
}
/**
* @inheritdoc
*/
public function behaviors()
{
return [
'langs' => [
'class' => 'common\modules\content\components\CoBlocksLangBehavior',
]
];
}
/**
* @inheritdoc
*/
public function rules()
{
return [
[['title', 'name', 'text'], 'required'],
[['text'], 'string'],
[['date_create', 'category_id'], 'safe'],
[['lang'], 'string', 'max' => 2],
[['module'], 'string', 'max' => 100],
[['title', 'name'], 'required'],
[['category_id'], 'safe'],
[['title'], 'string', 'max' => 250],
[['name'], 'string', 'max' => 50],
[['lang', 'title'], 'unique', 'targetAttribute' => ['lang', 'title'], 'message' => 'The combination of Язык and Заголовок has already been taken.'],
[['lang', 'name'], 'unique', 'targetAttribute' => ['lang', 'name'], 'message' => 'The combination of Язык and Название (англ.) has already been taken.']
[['name'], 'unique']
];
}
......@@ -58,35 +70,29 @@ class CoBlocks extends \common\components\ActiveRecordModel
'title' => Yii::t('content', 'Заголовок'),
'name' => Yii::t('content', 'Наименование виджета'),
'text' => Yii::t('content', 'Текст'),
'date_create' => Yii::t('content', 'Добавлено'),
'category_id' => 'Категория',
];
}
public function getLang($lang_id = null)
{
$lang_id = ($lang_id === null)? Languages::getCurrent()->id: $lang_id;
return $this->hasOne(CoBlocksLang::className(), ['block_id' => 'id'])->where('lang_id = :lang_id', [':lang_id' => $lang_id]);
}
/**
* @block string name block
* @return HTML string
*/
public static function printBlock($block) {
$model = self::findOne(['name'=>$block]);
return $model->text;
public static function printBlock($block)
{
$model = self::findOne(['name' => $block]);
return $model->lang->text;
}
public static function printStaticBlock($block, $addPath = false)
{
return \yii::$app->getView()->render( '@app/views/layouts/block/' . $block . '.php');
return Yii::$app->getView()->render( '@app/views/layouts/block/' . $block . '.php');
}
public function afterFind() {
parent::afterFind();
if(Yii::$app->controller->id !='block-admin')
$this->text = \common\components\AppManager::prepareWidget($this->text);
$this->text = str_replace('../../../','/',$this->text);
}
public function beforeSave($insert) {
$this->text = str_replace("../../../source/","http://taskon.soc-zaim.ru/source/",$this->text);
return parent::beforeSave($insert);
}
}
common/modules/content/models/CoBlocksLang.php 0 → 100644
View file @ 21a0719f
<?php
namespace common\modules\content\models;
use Yii;
use common\modules\languages\models\Languages;
/**
* This is the model class for table "co_blocks_lang".
*
* @property integer $id
* @property integer $block_id
* @property integer $lang_id
* @property string $name
* @property string $title
* @property string $text
*
* @property CoBlocks $block
* @property Languages $lang
*/
class CoBlocksLang extends \common\components\ActiveRecordModel
{
/**
* @inheritdoc
*/
public static function tableName()
{
return 'co_blocks_lang';
}
public function name()
{
return 'Языковые блоки';
}
/**
* @inheritdoc
*/
public function behaviors()
{
return [
];
}
/**
* @inheritdoc
*/
public function rules()
{
return [
[['block_id', 'lang_id',], 'required'],
[['block_id', 'lang_id'], 'integer'],
[['text'], 'string'],
[['block_id'], 'exist', 'skipOnError' => true, 'targetClass' => CoBlocks::className(), 'targetAttribute' => ['block_id' => 'id']],
[['lang_id'], 'exist', 'skipOnError' => true, 'targetClass' => Languages::className(), 'targetAttribute' => ['lang_id' => 'id']],
];
}
/**
* @inheritdoc
*/
public function attributeLabels()
{
return [
'id' => 'ID',
'block_id' => 'Block ID',
'lang_id' => 'Lang ID',
'text' => 'Текст',
];
}
public function afterFind()
{
parent::afterFind();
if(Yii::$app->controller->id !='block-admin')
{
$this->text = \common\components\AppManager::prepareWidget($this->text);
}
$this->text = str_replace('../../../', '/', $this->text);
}
/**
* @return \yii\db\ActiveQuery
*/
public function getBlock()
{
return $this->hasOne(CoBlocks::className(), ['id' => 'block_id']);
}
/**
* @return \yii\db\ActiveQuery
*/
public function getLang()
{
return $this->hasOne(Languages::className(), ['id' => 'lang_id']);
}
}
common/modules/content/models/CoContent.php
View file @ 21a0719f
......@@ -4,8 +4,9 @@ namespace common\modules\content\models;
use Yii;
use common\modules\content\models\CoBlocks;
use common\modules\languages\models\Languages;
use common\models\MetaTags;
use yii\base\Controller;
/**
* This is the model class for table "co_content".
*
......@@ -43,6 +44,9 @@ class CoContent extends \common\components\ActiveRecordModel
return [
'meta' => [
'class' => 'common\components\activeRecordBehaviors\MetaTagBehavior',
],
'langs' => [
'class' => 'common\modules\content\components\CoContentLangBehavior',
]
];
}
......@@ -60,11 +64,11 @@ class CoContent extends \common\components\ActiveRecordModel
public function rules()
{
return [
[['active', 'created_at', 'updated_at'], 'integer'],
[['active'], 'integer'],
[['image'], 'file', 'skipOnEmpty' => true, 'extensions' => 'png, jpg, jpeg, gif'],
[['url', 'name', 'text'], 'required'],
[['url', 'name', 'title'], 'string', 'max' => 250],
[['category_id', 'text'], 'safe']
[['url'], 'required'],
[['url'], 'string', 'max' => 250],
[['category_id'], 'safe']
];
}
......@@ -90,62 +94,49 @@ class CoContent extends \common\components\ActiveRecordModel
/**
* @return \yii\db\ActiveQuery
*/
public function getMetaTags() {
return $this->hasOne(MetaTags::className(), [
'object_id' => 'id',
/* */
])->where([
'model_id' => get_class($this),
'language' => 'ru',]);
public function getMetaTags($lang_id = null)
{
$query = $this->hasOne(MetaTags::className(), ['object_id' => 'id'])->where(['model_id' => get_class($this)]);
if($lang_id)
{
$query->andWhere(['lang_id' => $lang_id]);
}
return $query;
}
/**
* @return \yii\db\ActiveQuery
*/
public function getCategory()
public function getMetaTag($lang_id = null)
{
return $this->hasOne(CoCategory::className(), ['id' => 'category_id']);
$lang_id = ($lang_id === null)? Languages::getCurrent()->id: $lang_id;
return $this->hasOne(MetaTags::className(), ['object_id' => 'id'])->where([
'model_id' => get_class($this),
'lang_id' => $lang_id
]);
}
/**
* @return html
* @return \yii\db\ActiveQuery
*/
public function getContent() {
$content = $this->text;
$content = \common\components\AppManager::prepareWidget($content);
$blocks = CoBlocks::find()->all();
$arrWhatReplace = [];
$arrReplace = [];
$arrWhatReplaceNext = [];
$arrReplaceNext = [];
foreach($blocks as $block) {
$arrWhatReplace[] = '{' . $block->name . '}';
$arrReplace[] = $block->text;
$arrWhatReplaceNext[] = '[' . $block->name . ']';
$arrReplaceNext[] = $block->text;
}
public function getCategory()
{
return $this->hasOne(CoCategory::className(), ['id' => 'category_id']);
}
$arrWhatReplaceNext[] = '[about-reviews]';
$arrReplaceNext[] = \common\modules\content\models\CoBlocks::printStaticBlock('about-reviews', true);
$arrWhatReplaceNext[] = '[content-phone]';
$arrReplaceNext[] = \common\models\Settings::getValue('content-phone');
$arrWhatReplaceNext[] = '[cases]';
$arrReplaceNext[] = \common\modules\content\models\CoBlocks::printStaticBlock('cases', true);
$arrWhatReplaceNext[] = '[projects]';
$arrReplaceNext[] = \common\modules\content\models\CoBlocks::printStaticBlock('projects', true);
$arrWhatReplaceNext[] = '[case-subscribe]';
$arrReplaceNext[] = \common\modules\content\models\CoBlocks::printStaticBlock('case-subscribe', true);
$arrWhatReplaceNext[] = '[footer]';
$arrReplaceNext[] = \Yii::$app->getView()->render('@app/views/layouts/footer');
$arrWhatReplaceNext[] = '[footer-index]';
$arrReplaceNext[] = \Yii::$app->getView()->render('@app/views/layouts/footer-index');
return str_replace($arrWhatReplaceNext, $arrReplaceNext,str_replace($arrWhatReplace, $arrReplace, $content));
public function getLang($lang_id = null)
{
$lang_id = ($lang_id === null)? Languages::getCurrent()->id: $lang_id;
return $this->hasOne(CoContentLang::className(), ['content_id' => 'id'])->where('lang_id = :lang_id', [':lang_id' => $lang_id]);
}
public function beforeSave($insert) {
$this->text = str_replace("../../../source/","/source/",$this->text);
return parent::beforeSave($insert);
public function getLangs()
{
return $this->hasMany(CoContentLang::className(), ['content_id' => 'id']);
}
private function getPath()
......
common/modules/content/models/CoContentData.php deleted 100644 → 0
View file @ 537639a4
<?php
namespace common\modules\content\models;
use Yii;
/**
* This is the model class for table "co_content_data".
*
* @property integer $id
* @property integer $content_id
* @property string $title
* @property string $short_description
* @property string $description
* @property integer $created_at
* @property integer $updated_at
*
* @property CoContent $content
*/
class CoContentData extends \common\components\ActiveRecordModel
{
/**
* @inheritdoc
*/
public static function tableName()
{
return 'co_content_data';
}
public function name() {
return 'Содержание контента';
}
/**
* @inheritdoc
*/
public function rules()
{
return [
[['content_id', 'created_at', 'updated_at'], 'integer'],
[['description'], 'string'],
[['title'], 'string', 'max' => 250],
[['short_description'], 'string', 'max' => 255]
];
}
/**
* @inheritdoc
*/
public function attributeLabels()
{
return [
'id' => Yii::t('content', 'ID'),
'content_id' => Yii::t('content', 'Content ID'),
'title' => Yii::t('content', 'Title'),
'short_description' => Yii::t('content', 'Short Description'),
'description' => Yii::t('content', 'Description'),
'created_at' => Yii::t('content', 'Created At'),
'updated_at' => Yii::t('content', 'Updated At'),
];
}
/**
* @return \yii\db\ActiveQuery
*/
public function getContent()
{
return $this->hasOne(CoContent::className(), ['id' => 'content_id']);
}
}
common/modules/content/models/CoContentLang.php 0 → 100644
View file @ 21a0719f
<?php
namespace common\modules\content\models;
use Yii;
use common\modules\content\models\CoContent;
use common\modules\languages\models\Languages;
use common\modules\content\models\CoBlocks;
/**
* This is the model class for table "co_content_lang".
*
* @property integer $id
* @property integer $content_id
* @property integer $lang_id
* @property string $name
* @property string $title
* @property string $text
*
* @property CoContent $content
* @property Languages $lang
*/
class CoContentLang extends \common\components\ActiveRecordModel
{
/**
* @inheritdoc
*/
public static function tableName()
{
return 'co_content_lang';
}
/**
* @inheritdoc
*/
public function rules()
{
return [
[['content_id', 'lang_id', 'name', 'title'], 'required'],
[['content_id', 'lang_id'], 'integer'],
[['text'], 'string'],
[['name', 'title'], 'string', 'max' => 250],
[['content_id'], 'exist', 'skipOnError' => true, 'targetClass' => CoContent::className(), 'targetAttribute' => ['content_id' => 'id']],
[['lang_id'], 'exist', 'skipOnError' => true, 'targetClass' => Languages::className(), 'targetAttribute' => ['lang_id' => 'id']],
];
}
/**
* @inheritdoc
*/
public function behaviors()
{
return [
];
}
/**
* @inheritdoc
*/
public function name()
{
return 'Языковой контент';
}
/**
* @inheritdoc
*/
public function attributeLabels()
{
return [
'id' => Yii::t('content', 'ID'),
'name' => Yii::t('content', 'Name'),
'image' => 'Превью',
'title' => Yii::t('content', 'Title'),
'text' => Yii::t('content', 'Content'),
];
}
public function beforeSave($insert)
{
$this->text = str_replace("../../../source/","/source/",$this->text);
return parent::beforeSave($insert);
}
/**
* @return \yii\db\ActiveQuery
*/
public function getLang()
{
return $this->hasOne(Languages::className(), ['id' => 'lang_id']);
}
/**
* @return html
*/
public function getContent()
{
$content = $this->text;
$content = \common\components\AppManager::prepareWidget($content);
$arrWhatReplace = [];
$arrReplace = [];
$arrWhatReplaceNext = [];
$arrReplaceNext = [];
$blocks = CoBlocks::find()->all();
foreach($blocks as $block)
{
if($block->lang)
{
$arrWhatReplace[] = '{' . $block->name . '}';
$arrReplace[] = $block->lang->text;
$arrWhatReplaceNext[] = '[' . $block->name . ']';
$arrReplaceNext[] = $block->lang->text;
}
}
$arrWhatReplaceNext[] = '[about-reviews]';
$arrReplaceNext[] = CoBlocks::printStaticBlock('about-reviews', true);
$arrWhatReplaceNext[] = '[reviews]';
$arrReplaceNext[] = CoBlocks::printStaticBlock('reviews', true);
$arrWhatReplaceNext[] = '[content-phone]';
$arrReplaceNext[] = \common\models\Settings::getValue('content-phone');
$arrWhatReplaceNext[] = '[cases]';
$arrReplaceNext[] = CoBlocks::printStaticBlock('cases', true);
$arrWhatReplaceNext[] = '[projects]';
$arrReplaceNext[] = CoBlocks::printStaticBlock('projects', true);
$arrWhatReplaceNext[] = '[case-subscribe]';
$arrReplaceNext[] = CoBlocks::printStaticBlock('case-subscribe', true);
$arrWhatReplaceNext[] = '[footer]';
$arrReplaceNext[] = \Yii::$app->getView()->render('@app/views/layouts/footer');
$arrWhatReplaceNext[] = '[footer-index]';
$arrReplaceNext[] = \Yii::$app->getView()->render('@app/views/layouts/footer-index');
return str_replace($arrWhatReplaceNext, $arrReplaceNext,str_replace($arrWhatReplace, $arrReplace, $content));
}
}
common/modules/content/models/SearchCoBlocks.php
View file @ 21a0719f
......@@ -19,7 +19,7 @@ class SearchCoBlocks extends CoBlocks
{
return [
[['id'], 'integer'],
[['lang', 'title', 'name', 'text', 'date_create', 'category_id'], 'safe'],
[['lang', 'title', 'name', 'category_id'], 'safe'],
];
}
......@@ -57,14 +57,12 @@ class SearchCoBlocks extends CoBlocks
$query->andFilterWhere([
'id' => $this->id,
'date_create' => $this->date_create,
'category_id' => $this->category_id,
]);
$query->andFilterWhere(['like', 'lang', $this->lang])
->andFilterWhere(['like', 'title', $this->title])
->andFilterWhere(['like', 'name', $this->name])
->andFilterWhere(['like', 'text', $this->text]);
->andFilterWhere(['like', 'name', $this->name]);
return $dataProvider;
}
......
common/modules/content/models/SearchCoContent.php
View file @ 21a0719f
......@@ -19,7 +19,7 @@ class SearchCoContent extends CoContent
{
return [
[['id', 'category_id', 'active', 'created_at', 'updated_at'], 'integer'],
[['url', 'name', 'title'], 'safe'],
[['url'], 'safe'],
];
}
......@@ -63,9 +63,7 @@ class SearchCoContent extends CoContent
'updated_at' => $this->updated_at,
]);
$query->andFilterWhere(['like', 'url', $this->url])
->andFilterWhere(['like', 'name', $this->name])
->andFilterWhere(['like', 'title', $this->title]);
$query->andFilterWhere(['like', 'url', $this->url]);
return $dataProvider;
}
......
common/modules/content/views/block-admin/_form.php
View file @ 21a0719f
......@@ -2,29 +2,80 @@
use yii\helpers\Html;
use yii\widgets\ActiveForm;
use yii\helpers\ArrayHelper;
use common\modules\content\models\CoBlocks;
/* @var $this yii\web\View */
/* @var $model common\modules\content\models\CoBlocks */
/* @var $form yii\widgets\ActiveForm */
$this->registerJsFile('/plugins/tinymce/js/tinymce/tinymce.min.js', ['position' => \yii\web\View::POS_END ]);
$js = <<<JS
tinymce.init({
selector: "textarea",theme: "modern",
language: "ru_RU",
custom_elements: "emstart,emend,header,main,span",
extended_valid_elements: "span[id|name|class|style],i[id|name|class|style],ul[id|name|class|style],li[id|name|class|style]",
height: '350px',
menubar: "edit insert view format table tools",
plugins: [
"advlist autolink link image code lists charmap print preview hr anchor pagebreak",
"searchreplace wordcount visualblocks visualchars insertdatetime media nonbreaking",
"table contextmenu directionality emoticons paste textcolor responsivefilemanager"
],
toolbar1: "undo redo | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | styleselect",
toolbar2: "| responsivefilemanager | link unlink anchor | image media | forecolor backcolor | print preview code ",
image_advtab: true ,
forced_root_block : false,
external_filemanager_path:"/filemanager/",
filemanager_title:"Responsive Filemanager" ,
external_plugins: { "filemanager" : "/filemanager/plugin.min.js"}
});
JS;
$this->registerJs($js, \yii\web\View::POS_READY, 'tinymceLoad');
?>
<div class="co-blocks-form">
<div class="co-content-form">
<?php $form = ActiveForm::begin([
'options' => [
'enctype' => 'multipart/form-data'
]
]); ?>
<?= $form->field($model, 'category_id')->dropDownList(ArrayHelper::map(\common\modules\content\models\CoCategory::find()->all(), 'id', 'name'), [
'prompt' => 'Без привязки к категории',
'class' => 'form-control',
])->hint('Для того что бы было проще сортировать данную страницу в общем списке вы можете привязать ее к определенной категории. Список категории настраивается ' . Html::a('тут',['/content/category-admin/manage']) . '.') ?>
<?php $form = ActiveForm::begin(); ?>
<?= $form->field($model, 'name')->textInput(['maxlength' => 250])->hint('Название страницы не будет отображаться пользователям сайта и служит исключительно для служебного пользования в Панель управления.') ?>
<?= $form->field($model, 'lang')->textInput(['maxlength' => true]) ?>
<?= $form->field($model, 'title')->textInput(['maxlength' => 250])->hint('Заголовок страницы виден пользователю сайта и как правило оформляется в тег &lt;h1&gt;. Если дизайном страницы не предусмотрен вывод заголовка, то он не будет выводиться даже если был введен в данное поле.') ?>
<?= $form->field($model, 'title')->textInput(['maxlength' => true]) ?>
<ul class="nav nav-pills">
<?php $c = 0; foreach ($langs as $i => $block) : $c++; ?>
<li class="<?=($c==1?'active':'')?>"><a href="#lang-<?=$block->lang->url?>" data-toggle="tab"><?=$block->lang->name?></a></li>
<?php endforeach; ?>
</ul>
<?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
<div class="tab-content">
<?php $c = 0; foreach ($langs as $block) : $c++;
$lang_id = $block->lang->id; ?>
<div class="tab-pane fade <?=($c==1?'active in':'')?>" id="lang-<?=$block->lang->url;?>">
<?= $form->field($model, 'text')->textarea(['rows' => 6]) ?>
<?= $form->field($block, '['.$lang_id.']text')->textArea() ?>
<?= $form->field($model, 'date_create')->textInput() ?>
</div>
<?php endforeach; ?>
</div>
<div class="form-group">
<?= Html::submitButton($model->isNewRecord ? Yii::t('reviews', 'Create') : Yii::t('reviews', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>
<div class="form-group">
<?= Html::submitButton('Сохранить', ['class' => 'btn btn-success']) ?>
</div>
<?php ActiveForm::end(); ?>
......
common/modules/content/views/block-admin/_search.php deleted 100644 → 0
View file @ 537639a4
<?php
use yii\helpers\Html;
use yii\widgets\ActiveForm;
/* @var $this yii\web\View */
/* @var $model common\modules\content\models\SearchCoBlocks */
/* @var $form yii\widgets\ActiveForm */
?>
<div class="co-blocks-search">
<?php $form = ActiveForm::begin([
'action' => ['index'],
'method' => 'get',
]); ?>
<?= $form->field($model, 'id') ?>
<?= $form->field($model, 'lang') ?>
<?= $form->field($model, 'title') ?>
<?= $form->field($model, 'name') ?>
<?= $form->field($model, 'text') ?>
<?php // echo $form->field($model, 'date_create') ?>
<div class="form-group">
<?= Html::submitButton(Yii::t('reviews', 'Search'), ['class' => 'btn btn-primary']) ?>
<?= Html::resetButton(Yii::t('reviews', 'Reset'), ['class' => 'btn btn-default']) ?>
</div>
<?php ActiveForm::end(); ?>
</div>
common/modules/content/views/block-admin/create.php
View file @ 21a0719f
<?php
echo $form;
\ No newline at end of file
use yii\helpers\Html;
/* @var $this yii\web\View */
/* @var $model common\modules\content\models\CoBlocks */
$this->title = Yii::t('content', 'Create Co Blocks');
$this->params['breadcrumbs'][] = ['label' => Yii::t('content', 'Co Blocks'), 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="co-blocks-create">
<?= $this->render('_form', [
'model' => $model,
'langs' => $langs
]) ?>
</div>
common/modules/content/views/block-admin/update.php
View file @ 21a0719f
<?php
echo $form;
\ No newline at end of file
use yii\helpers\Html;
/* @var $this yii\web\View */
/* @var $model common\modules\content\models\CoBlocks */
$this->title = Yii::t('content', 'Update Co Blocks');
$this->params['breadcrumbs'][] = ['label' => Yii::t('content', 'Co Blocks'), 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="co-blocks-update">
<?= $this->render('_form', [
'model' => $model,
'langs' => $langs
]) ?>
</div>
common/modules/content/views/content-admin/_form.php
View file @ 21a0719f
......@@ -2,33 +2,123 @@
use yii\helpers\Html;
use yii\widgets\ActiveForm;
use yii\helpers\ArrayHelper;
use common\modules\content\models\CoContent;
use common\modules\content\widgets\MetaTagsWidget;
/* @var $this yii\web\View */
/* @var $model common\modules\content\models\CoContent */
/* @var $form yii\widgets\ActiveForm */
$this->registerJsFile('/plugins/switchery/switchery.min.js', ['position' => \yii\web\View::POS_HEAD ]);
$this->registerCssFile('/plugins/switchery/switchery.min.css', ['position' => \yii\web\View::POS_HEAD ]);
$this->registerJsFile('/js/form-slider-switcher.demo.min.js', ['position' => \yii\web\View::POS_HEAD ]);
$this->registerJsFile('/plugins/tinymce/js/tinymce/tinymce.min.js', ['position' => \yii\web\View::POS_END ]);
$js = <<<JS
FormSliderSwitcher.init();
tinymce.init({
selector: "textarea",theme: "modern",
language: "ru_RU",
custom_elements: "emstart,emend,header,main,span",
extended_valid_elements: "span[id|name|class|style],i[id|name|class|style],ul[id|name|class|style],li[id|name|class|style]",
height: '350px',
menubar: "edit insert view format table tools",
plugins: [
"advlist autolink link image code lists charmap print preview hr anchor pagebreak",
"searchreplace wordcount visualblocks visualchars insertdatetime media nonbreaking",
"table contextmenu directionality emoticons paste textcolor responsivefilemanager"
],
toolbar1: "undo redo | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | styleselect",
toolbar2: "| responsivefilemanager | link unlink anchor | image media | forecolor backcolor | print preview code ",
image_advtab: true ,
forced_root_block : false,
external_filemanager_path:"/filemanager/",
filemanager_title:"Responsive Filemanager" ,
external_plugins: { "filemanager" : "/filemanager/plugin.min.js"}
});
JS;
$this->registerJs($js, \yii\web\View::POS_READY, 'switcheryLoad');
$blocks = \common\modules\content\models\CoBlocks::find()->all();
?>
<div class="co-content-form">
<?php $form = ActiveForm::begin(); ?>
<?php $form = ActiveForm::begin([
'options' => [
'enctype' => 'multipart/form-data'
]
]); ?>
<?= $form->field($model, 'category_id')->dropDownList(ArrayHelper::map(\common\modules\content\models\CoCategory::find()->all(), 'id', 'name'), [
'prompt' => 'Без привязки к категории',
'class' => 'form-control',
])->hint('Для того что бы было проще сортировать данную страницу в общем списке вы можете привязать ее к определенной категории. Список категории настраивается ' . Html::a('тут',['/content/category-admin/manage']) . '.') ?>
<?= $form->field($model, 'url')->textInput(['maxlength' => 250])->hint('Для создания ЧПУ («Человеку Понятный Урл») укажите латинскими буквами путь, например, razdel/podrazdel/nazvanie_stranici.html') ?>
<?= $form->field($model, 'active', [
'template' => '{input}<a href="#" class="btn btn-xs btn-success m-l-5 disabled">Страница скрыта от пользователя / Страница видна пользователю</a>'
])->checkbox([
'data-theme' => 'self',
'data-render' => 'switchery',
'data-classname' => 'switchery',
'label' => ' '
], false); ?>
<?php if($model->preview)
{
echo Html::img(\Yii::$app->params['frontUrl'] . CoContent::PHOTO_FOLDER . $model->preview);
} ?>
<?= $form->field($model, 'image')->fileInput() ?>
<ul class="nav nav-pills">
<?php $c = 0; foreach ($langs as $i => $content) : $c++; ?>
<li class="<?=($c==1?'active':'')?>"><a href="#lang-<?=$content->lang->url?>" data-toggle="tab"><?=$content->lang->name?></a></li>
<?php endforeach; ?>
</ul>
<?php
$block_hint = '';
if(count($blocks))
{
$block_hint .= "<ul>\n";
foreach($blocks as $block) {
$block_hint .= "<li>{{$block->name}} {$block->title}</li>\n";
}
<?= $form->field($model, 'category_id')->textInput() ?>
$block_hint .= "</ul>\n";
}
?>
<?= $form->field($model, 'url')->textInput(['maxlength' => 250]) ?>
<div class="tab-content">
<?php $c = 0; foreach ($langs as $content) : $c++;
$lang_id = $content->lang->id; ?>
<div class="tab-pane fade <?=($c==1?'active in':'')?>" id="lang-<?=$content->lang->url;?>">
<?= $form->field($model, 'name')->textInput(['maxlength' => 250]) ?>
<?= $form->field($content, '['.$lang_id.']name')->textInput(['maxlength' => 250])->hint('Название страницы не будет отображаться пользователям сайта и служит исключительно для служебного пользования в Панель управления.') ?>
<?= $form->field($model, 'title')->textInput(['maxlength' => 250]) ?>
<?= $form->field($content, '['.$lang_id.']title')->textInput(['maxlength' => 250])->hint('Заголовок страницы виден пользователю сайта и как правило оформляется в тег &lt;h1&gt;. Если дизайном страницы не предусмотрен вывод заголовка, то он не будет выводиться даже если был введен в данное поле.') ?>
<?= $form->field($model, 'active')->textInput() ?>
<?= $form->field($content, '['.$lang_id.']text')->textArea()->hint($block_hint) ?>
<?= $form->field($model, 'created_at')->textInput() ?>
<?= MetaTagsWidget::widget([
'model' => $meta[$lang_id],
'form' => $form,
])?>
<?= $form->field($model, 'updated_at')->textInput() ?>
</div>
<?php endforeach; ?>
</div>
<div class="form-group">
<?= Html::submitButton($model->isNewRecord ? Yii::t('content', 'Create') : Yii::t('content', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>
<div class="form-group">
<?= Html::submitButton('Сохранить', ['class' => 'btn btn-success']) ?>
</div>
<?php ActiveForm::end(); ?>
......
common/modules/content/views/content-admin/_search.php deleted 100644 → 0
View file @ 537639a4
<?php
use yii\helpers\Html;
use yii\widgets\ActiveForm;
/* @var $this yii\web\View */
/* @var $model common\modules\content\models\SearchCoContent */
/* @var $form yii\widgets\ActiveForm */
?>
<div class="co-content-search">
<?php $form = ActiveForm::begin([
'action' => ['index'],
'method' => 'get',
]); ?>
<?= $form->field($model, 'id') ?>
<?= $form->field($model, 'category_id') ?>
<?= $form->field($model, 'url') ?>
<?= $form->field($model, 'name') ?>
<?= $form->field($model, 'title') ?>
<?php // echo $form->field($model, 'active') ?>
<?php // echo $form->field($model, 'created_at') ?>
<?php // echo $form->field($model, 'updated_at') ?>
<div class="form-group">
<?= Html::submitButton(Yii::t('content', 'Search'), ['class' => 'btn btn-primary']) ?>
<?= Html::resetButton(Yii::t('content', 'Reset'), ['class' => 'btn btn-default']) ?>
</div>
<?php ActiveForm::end(); ?>
</div>
common/modules/content/views/content-admin/create.php
View file @ 21a0719f
......@@ -12,10 +12,10 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<div class="co-content-create">
<h1><?= Html::encode($this->title) ?></h1>
<?= $this->render('_form', [
'model' => $model,
'meta' => $meta,
'langs' => $langs
]) ?>
</div>
common/modules/content/views/content-admin/index.php
View file @ 21a0719f
......@@ -20,7 +20,7 @@ use yii\grid\GridView;
'dataProvider' => $dataProvider,
//'filterModel' => $searchModel,
'columns' => [
'name',
// 'name',
//'url:url',
[
'attribute' => 'url',
......@@ -40,17 +40,15 @@ use yii\grid\GridView;
],
[
'class' => 'common\components\ColorActionColumn',
'template' => '{copy} {update} {delete}',
'template' => '{update} {delete}',
'buttons' => [
// Дмитрий Королев: хочется посмотреть как это будет вглядеть
'copy' => function ($url, $model, $key) {
return '<a href="'.Url::toRoute(['copypage', 'id' => $model->id]).'">'.Html::beginTag('i', [
'title' => "Копировать страницу",
'data-toggle' => 'tooltip',
'class' => 'fa fa-copy fa-lg'
]) . Html::endTag('i') . '</a>';
},
// 'copy' => function ($url, $model, $key) {
// return '<a href="'.Url::toRoute(['copy', 'id' => $model->id]).'">'.Html::beginTag('i', [
// 'title' => "Копировать страницу",
// 'data-toggle' => 'tooltip',
// 'class' => 'fa fa-copy fa-lg'
// ]) . Html::endTag('i') . '</a>';
// },
],
],
],
......
common/modules/content/views/content-admin/update.php
View file @ 21a0719f
<?php
echo $form;
\ No newline at end of file
use yii\helpers\Html;
/* @var $this yii\web\View */
/* @var $model common\modules\content\models\CoContent */
$this->title = Yii::t('content', 'Update Co Content');
$this->params['breadcrumbs'][] = ['label' => Yii::t('content', 'Co Contents'), 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
<div class="co-content-update">
<?= $this->render('_form', [
'model' => $model,
'meta' => $meta,
'langs' => $langs,
]) ?>
</div>
\ No newline at end of file
common/modules/content/views/content-admin/updatecontent.php deleted 100644 → 0
View file @ 537639a4
<?php
$blocks = \common\modules\content\models\CoBlocks::find()->all();
if(count($blocks)) {
echo "<ul>";
foreach($blocks as $block) {
echo "<li>{{$block->name}} {$block->title}</li>";
}
echo "</ul><hr />";
}
echo $form;
common/modules/content/widgets/MetaTagsWidget.php 0 → 100644
View file @ 21a0719f
<?php
namespace common\modules\content\widgets;
use Yii;
use yii\helpers\Html;
class MetaTagsWidget extends \yii\bootstrap\Widget
{
public $form;
public $model;
public function run()
{
return $this->render('meta-tags', [
'model' => $this->model,
'form' => $this->form,
]);
}
}
common/modules/content/widgets/views/meta-tags.php 0 → 100644
View file @ 21a0719f
<?php
use yii\helpers\Html;
echo Html::tag('h4', 'Meta-теги страницы:');
echo $form->field($model, '['.$model->lang_id.']title')->textInput();
echo $form->field($model, '['.$model->lang_id.']description')->textInput();
echo $form->field($model, '['.$model->lang_id.']keywords')->textInput();
\ No newline at end of file
common/modules/languages/controllers/LanguageAdminController.php
View file @ 21a0719f
......@@ -19,7 +19,8 @@ class LanguageAdminController extends AdminController
'Manage' => 'Управление языками',
'Create' => 'Добавить язык',
'Update' => 'Редактированть язык',
'View' => 'Просмотр языка',
'View' => 'Просмотр языка',
'Delete' => 'Удаление языка',
];
}
......@@ -78,7 +79,7 @@ class LanguageAdminController extends AdminController
$model = new Languages();
if ($model->load(Yii::$app->request->post()) && $model->save()) {
return $this->redirect(['view', 'id' => $model->id]);
return $this->redirect(['manage']);
} else {
return $this->render('create', [
'model' => $model,
......@@ -97,7 +98,7 @@ class LanguageAdminController extends AdminController
$model = $this->findModel($id);
if ($model->load(Yii::$app->request->post()) && $model->save()) {
return $this->redirect(['view', 'id' => $model->id]);
return $this->redirect(['manage']);
} else {
return $this->render('update', [
'model' => $model,
......@@ -115,7 +116,7 @@ class LanguageAdminController extends AdminController
{
$this->findModel($id)->delete();
return $this->redirect(['index']);
return $this->redirect(['manage']);
}
/**
......
common/modules/languages/models/Languages.php
View file @ 21a0719f
......@@ -3,17 +3,30 @@
namespace common\modules\languages\models;
use Yii;
use yii\behaviors\TimestampBehavior;
use yii\db\Expression;
/**
* This is the model class for table "languages".
*
* @property integer $id
* @property string $code
* @property string $codeFull
* @property string $url
* @property string $local
* @property string $name
*/
class Languages extends \common\components\ActiveRecordModel
{
//Переменная, для хранения текущего объекта языка
static $current = null;
const DEFAULT_TRUE = 1;
const DEFAULT_FALSE = 0;
public static $defaults_title = [
self::DEFAULT_TRUE => 'Да',
self::DEFAULT_FALSE => 'Нет',
];
/**
* @inheritdoc
*/
......@@ -33,11 +46,12 @@ class Languages extends \common\components\ActiveRecordModel
public function rules()
{
return [
[['code', 'codeFull', 'name'], 'required'],
[['code'], 'string', 'max' => 2],
[['codeFull'], 'string', 'max' => 5],
[['url', 'local', 'name'], 'required'],
[['default'], 'safe'],
[['url'], 'string', 'max' => 2],
[['local'], 'string', 'max' => 5],
[['name'], 'string', 'max' => 15],
[['name'], 'unique']
[['url'], 'unique']
];
}
......@@ -47,10 +61,90 @@ class Languages extends \common\components\ActiveRecordModel
public function attributeLabels()
{
return [
'id' => Yii::t('languages', 'ID'),
'code' => Yii::t('languages', 'Language Code'),
'codeFull' => Yii::t('languages', 'Locale Code'),
'name' => Yii::t('languages', 'Name'),
'id' => 'ID',
'url' => 'Идентификатор для отображения в URL',
'local' => 'Язык пользователя (локаль)',
'name' => 'Название',
'default' => 'По умолчанию',
];
}
/**
* @inheritdoc
*/
public function behaviors()
{
return [
[
'class' => TimestampBehavior::className(),
'createdAtAttribute' => null,
'updatedAtAttribute' => null,
'value' => new Expression('NOW()'),
],
];
}
public function beforeSave($insert)
{
if (parent::beforeSave($insert))
{
if($this->default)
{
static::updateAll(['default' => self::DEFAULT_FALSE], ['default' => self::DEFAULT_TRUE]);
}
return true;
}
else
{
return false;
}
}
//Получение текущего объекта языка
static function getCurrent()
{
if(self::$current === null)
{
self::$current = self::getDefaultLang();
}
return self::$current;
}
//Установка текущего объекта языка и локаль пользователя
static function setCurrent($url = null)
{
$language = self::getLangByUrl($url);
self::$current = ($language === null) ? self::getDefaultLang() : $language;
Yii::$app->language = self::$current->local;
}
//Получения объекта языка по умолчанию
static function getDefaultLang()
{
return static::find()->where('`default` = :default', [':default' => self::DEFAULT_TRUE])->one();
}
//Получения объекта языка по буквенному идентификатору
static function getLangByUrl($url = null)
{
if ($url === null)
{
return null;
}
else
{
$language = static::find()->where('url = :url', [':url' => $url])->one();
if ($language === null)
{
return null;
}
else
{
return $language;
}
}
}
}
common/modules/languages/models/SearchLanguages.php
View file @ 21a0719f
......@@ -18,8 +18,8 @@ class SearchLanguages extends Languages
public function rules()
{
return [
[['id'], 'integer'],
[['code', 'codeFull', 'name'], 'safe'],
[['id', 'default'], 'integer'],
[['url', 'local', 'name', 'default'], 'safe'],
];
}
......@@ -57,10 +57,11 @@ class SearchLanguages extends Languages
$query->andFilterWhere([
'id' => $this->id,
'default' => $this->default,
]);
$query->andFilterWhere(['like', 'code', $this->code])
->andFilterWhere(['like', 'codeFull', $this->codeFull])
$query->andFilterWhere(['like', 'url', $this->url])
->andFilterWhere(['like', 'local', $this->local])
->andFilterWhere(['like', 'name', $this->name]);
return $dataProvider;
......
common/modules/languages/views/language-admin/_form.php
View file @ 21a0719f
......@@ -12,14 +12,16 @@ use yii\widgets\ActiveForm;
<?php $form = ActiveForm::begin(); ?>
<?= $form->field($model, 'code')->textInput(['maxlength' => 2]) ?>
<?= $form->field($model, 'url')->textInput(['maxlength' => 2]) ?>
<?= $form->field($model, 'codeFull')->textInput(['maxlength' => 5]) ?>
<?= $form->field($model, 'local')->textInput(['maxlength' => 5]) ?>
<?= $form->field($model, 'name')->textInput(['maxlength' => 15]) ?>
<?= $form->field($model, 'default')->checkbox() ?>
<div class="form-group">
<?= Html::submitButton($model->isNewRecord ? Yii::t('content', 'Create') : Yii::t('content', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
<?= Html::submitButton('Сохранить', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
</div>
<?php ActiveForm::end(); ?>
......
common/modules/languages/views/language-admin/create.php
View file @ 21a0719f
......@@ -12,8 +12,6 @@ $this->params['breadcrumbs'][] = $this->title;
?>
<div class="languages-create">
<h1><?= Html::encode($this->title) ?></h1>
<?= $this->render('_form', [
'model' => $model,
]) ?>
......
common/modules/languages/views/language-admin/index.php
View file @ 21a0719f
......@@ -3,6 +3,8 @@
use yii\helpers\Html;
use yii\grid\GridView;
use common\modules\languages\models\Languages;
/* @var $this yii\web\View */
/* @var $searchModel common\modules\languages\models\SearchLanguages */
/* @var $dataProvider yii\data\ActiveDataProvider */
......@@ -12,18 +14,26 @@ use yii\grid\GridView;
<?php // echo $this->render('_search', ['model' => $searchModel]); ?>
<p>
<?= Html::a(Yii::t('languages', 'Create Languages'), ['create'], ['class' => 'btn btn-success']) ?>
<?= Html::a('Добавить', ['create'], ['class' => 'btn btn-success']) ?>
</p>
<?= \common\components\zii\AdminGrid::widget([
'dataProvider' => $dataProvider,
'filterModel' => $searchModel,
'columns' => [
['class' => 'yii\grid\SerialColumn'],
// ['class' => 'yii\grid\SerialColumn'],
'code',
'codeFull',
'url',
'local',
'name',
[
'attribute' => 'default',
'filter' => Html::dropDownList($searchModel->formName() . '[default]', $searchModel->default, Languages::$defaults_title, ['class' => 'form-control', 'prompt' => '']),
'value' => function($model)
{
return Languages::$defaults_title[$model->default];
}
],
[
'class' => 'common\components\ColorActionColumn',
......
common/modules/languages/views/language-admin/update.php
View file @ 21a0719f
......@@ -14,8 +14,6 @@ $this->params['breadcrumbs'][] = Yii::t('content', 'Update');
?>
<div class="languages-update">
<h1><?= Html::encode($this->title) ?></h1>
<?= $this->render('_form', [
'model' => $model,
]) ?>
......
common/modules/languages/views/language-admin/view.php
View file @ 21a0719f
......@@ -29,9 +29,10 @@ $this->params['breadcrumbs'][] = $this->title;
'model' => $model,
'attributes' => [
'id',
'code',
'codeFull',
'url',
'local',
'name',
'default',
],
]) ?>
......
common/modules/languages/widgets/Languages.php 0 → 100644
View file @ 21a0719f
<?php
namespace common\modules\languages\widgets;
use common\modules\languages\models\Languages as Model;
class Languages extends \yii\bootstrap\Widget
{
public function init(){}
public function run()
{
return $this->render('languages', [
'current' => Model::getCurrent(),
'langs' => Model::find()->where('id != :current_id', [':current_id' => Model::getCurrent()->id])->all(),
'count' => Model::find()->count(),
]);
}
}
\ No newline at end of file
common/modules/languages/widgets/views/languages.php 0 → 100644
View file @ 21a0719f
<?php
use yii\helpers\Html;
?>
<?php if($count > 2) : ?>
<div class="lang_check">
<?= Html::a('<i class="icon-arrowDown"></i>' . $current->name, '#', ['class' => 'd_menu']) ?>
<?php foreach ($langs as $i => $lang): ?>
<?= Html::a('<i class="icon-arrowRight"></i>' . $lang->name, '/' . $lang->url . Yii::$app->getRequest()->getLangUrl(), ['class' => 'd_menu_hide']) ?>
<?php endforeach;?>
</div>
<?php else : ?>
<nav class="top_nav clearfix">
<ul>
<?php foreach ($langs as $lang):?>
<li><?= Html::a($lang->name, '/' . $lang->url . Yii::$app->getRequest()->getLangUrl()) ?></li>
<?php endforeach;?>
</ul>
</nav>
<?php endif; ?>
\ No newline at end of file
common/modules/reviews/forms/ReviewForm.php
View file @ 21a0719f
......@@ -13,10 +13,6 @@ return [
'elements' => [
'title' => [
'type' => 'text',
],
'lang' => [
'type' => 'dropdownlist',
'items' => ArrayHelper::map(\common\modules\languages\models\Languages::find()->all(),'code','name')
],
($model->photo?Html::img(\Yii::$app->params['frontUrl'] . Reviews::PHOTO_FOLDER . $model->photo):''),
'image' => ['type' => 'file', 'class' => 'form-control',],
......
common/modules/reviews/models/Reviews.php
View file @ 21a0719f
......@@ -101,7 +101,7 @@ class Reviews extends \common\components\ActiveRecordModel
[['text', 'state', 'attendant_products'], 'string'],
[['admin_id'], 'adminIdValidate'],
[['date', 'answer', 'good', 'bad', 'date_create', 'notification_date', 'rate_usability', 'rate_loyality', 'rate_profit', 'title', 'order', 'photo', 'state', 'video'], 'safe'],
[['lang'], 'string', 'max' => 2],
// [['lang'], 'string', 'max' => 2],
[['title'], 'string', 'max' => 250],
[['email', 'video'], 'string', 'max' => 255]
];
......
common/modules/triggers/components/conditions/Conditions.php
View file @ 21a0719f
......@@ -8,6 +8,7 @@
*/
namespace common\modules\triggers\components\conditions;
use common\modules\triggers\controllers\TriggerAdminController;
use yii\web\ServerErrorHttpException;
class Conditions {
......@@ -88,11 +89,43 @@ class Conditions {
return null;
}
public static function getConditionHtml($id, $key, $values=array()){
$condition = Conditions::init()->getConditionById($id);
$condition_key = rand(100,999);
$result = '<div class="alert alert-info alert-dismissible" role="alert">';
$result.= '<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>';
$result.= '<strong>Условие: '.$condition->getName().'</strong>';
$result.= '<input type="hidden" name="Conditions['.$key.']['.$condition->getId().$condition_key.'][id]" value="'.$condition->getId().'"/>';
foreach($condition->getParams($key, $condition_key, $values) as $param) {
$result.=$param;
}
$result.= '</div>';
return $result;
}
/**
* @param array $condition_array
* @param null $key
* @return string
*/
public function getControlArea(){
$html = '<div class="conditions-block"></div>';
public static function getControlButtons($condition_array=array(), $key=null){
$key = ($key!==null) ? $key : rand(100000,999999);
return '<tr data-key='.$key.'><td>'.Conditions::init()->getControlArea($condition_array, $key).'</td></tr>';
}
/**
* @param array $condition_array
* @param $key
* @return string
*/
public function getControlArea($condition_array=array(), $key=null){
$html = '<div class="conditions-block">';
if (count($condition_array)>0) {
foreach($condition_array as $condition) {
$html .= self::getConditionHtml($condition['id'], ($key!==null) ? $key : rand(100000,999999), (array_key_exists('params', $condition)) ? $condition['params'] : array());
}
}
$html .= '</div>';
$html .= '<div class="btn-group" role="group">';
$html .= '<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="glyphicon glyphicon-plus"></i></button>';
$html .= '<ul class="dropdown-menu">';
......
common/modules/triggers/components/conditions/vendor/ConditionBase.php 0 → 100644
View file @ 21a0719f
<?php
namespace common\modules\triggers\components\conditions\vendor;
use common\modules\triggers\components\conditions\Conditions;
use yii\helpers\Html;
class ConditionBase {
protected static $conditionClass;
public $name;
public $config = [];
/**
* @param string $conditionName
* @return mixed
*/
public static function init($conditionName=__CLASS__){
return self::$conditionClass=new $conditionName(null);
}
/**
* @return mixed
*/
public function getId(){
$class=self::$conditionClass;
return $class::CONDITION_ID;
}
/**
* @param $constant
* @return bool
*/
public static function defined($constant){
return (defined('static::'.$constant)) ? true : false;
}
/**
* @return string
*/
public function getName(){
if (property_exists($this, 'name') && $this->name!==null) {
return $this->name;
} else {
return 'Name not found';
}
}
/**
* @param $group_key
* @param $condition_key
* @param array $values
* @return array
*/
public function getParams($group_key, $condition_key, $values=array()){
$result = [];
if (isset($this->config['params'])) {
foreach($this->config['params'] as $name=>$param) {
$type = (empty($param['type'])) ? 'text' : $param['type'];
switch($type) {
case 'text':
default:
$result[] = '<input type="text" value="'.((array_key_exists($name, $values)) ? $values[$name] : '').'" name="Conditions['.$group_key.']['.$this->getId().$condition_key.'][params]['.$name.']" class="form-control" style="margin-top: 5px;" placeholder="'.((isset($param['placeholder'])) ? $param['placeholder'] : '').'"/>';
break;
}
}
}
return $result;
}
}
\ No newline at end of file
common/modules/triggers/components/conditions/vendor/ConditionInterface.php 0 → 100644
View file @ 21a0719f
<?php
namespace common\modules\triggers\components\conditions\vendor;
interface ConditionInterface {
// Функция инициализации
public static function init($conditionName=null);
}
\ No newline at end of file
common/modules/triggers/controllers/TriggerAdminController.php
View file @ 21a0719f
......@@ -8,9 +8,9 @@
namespace common\modules\triggers\controllers;
use Yii;
use common\modules\triggers\components\conditions\Conditions;
use common\modules\triggers\components\conditions\vendor\ConditionBase;
use Yii;
use common\components\AdminController;
use common\modules\triggers\models\TriggerTrigger;
use yii\data\ActiveDataProvider;
......@@ -35,21 +35,15 @@ class TriggerAdminController extends AdminController {
}
public function actionGetandconditionhtml(){
return Json::encode('<tr><td>'.Conditions::init()->getControlArea().'</td></tr>');
$result = Conditions::getControlButtons();
return (Yii::$app->request->isAjax) ? Json::encode($result) : $result;
}
public function actionGetconditionhtml($id){
$condition = Conditions::init()->getConditionById($id);
$result = $this->renderPartial(
'condition-html',
[
'object' => $condition
]
);
public function actionGetconditionhtml($id, $key){
$result = Conditions::getConditionHtml($id, $key);
return Json::encode($result);
}
public function actionTesting(){
return $this->render(
'testing'
......@@ -79,6 +73,7 @@ class TriggerAdminController extends AdminController {
$model = new TriggerTrigger();
if ($model->load(Yii::$app->request->post())) {
$model->conditions = Yii::$app->request->post('Conditions');
$datetime=new \DateTime();
$model->owner_id = Yii::$app->user->getId();
$model->date_create=$datetime->format('Y-m-d H:i:s');
......@@ -88,16 +83,15 @@ class TriggerAdminController extends AdminController {
'manage'
]
);
} else {
$form = new \common\components\BaseForm('/common/modules/triggers/forms/TriggerForm', $model);
return $this->render(
'create',
[
'model' => $model,
'form' => $form
]
);
}
$form = new \common\components\BaseForm('/common/modules/triggers/forms/TriggerForm', $model);
return $this->render(
'create',
[
'model' => $model,
'form' => $form
]
);
}
/**
......@@ -107,8 +101,10 @@ class TriggerAdminController extends AdminController {
public function actionUpdate($id){
/** @var TriggerTrigger $model */
$model = TriggerTrigger::findOne($id);
$model->setScenario('update');
if ($model->load(Yii::$app->request->post())) {
$model->conditions = Yii::$app->request->post('Conditions');
$datetime=new \DateTime();
$model->owner_id = Yii::$app->user->getId();
$model->date_create=$datetime->format('Y-m-d H:i:s');
......
common/modules/triggers/forms/TriggerForm.php
View file @ 21a0719f
<?php
/** @var \common\components\BaseForm $this */
/** @var \common\modules\triggers\models\TriggerTrigger $model */
use \common\modules\triggers\components\conditions\Conditions;
Yii::$app->controller->view->registerJsFile('/js/triggers/conditions/admin-block.js');
$model = $this->model;
// Формируем html будущей таблицы, открыли тег
$table = '<table class="table table-bordered">';
// Формируем тело будущей таблицы
$table .= '<tbody>';
$table .= '<tr>';
$table .= '<td>'.Conditions::init()->getControlArea().'</td>';
$table .= '<tr>';
$table .= '</tbody>';
// Формируем футер
$table .= '<tfoot>';
$table .= '<td><button type="button" class="btn btn-primary add-and-condition">Добавить условие "И"</button></td>';
$table .= '</tfoot>';
// Закрываем таблицу
$table .= '</table>';
Yii::$app->controller->view->registerJsFile('/js/triggers/conditions/admin-block.js');
return [
'activeForm' => [
'id' => 'trigger-form'
],
'elements' => [
'table' => $table,
'table' => $model->getConditionTable(),
'active' => [
'type' => 'checkbox'
],
......
common/modules/triggers/models/TriggerCondition.php
View file @ 21a0719f
......@@ -10,10 +10,12 @@ use Yii;
* @property integer $id
* @property integer $group_number
* @property integer $trigger_id
* @property integer $condition_id
*
* @property TriggerTrigger $trigger
* @property TriggerParam[] $triggerParams
*/
class TriggerCondition extends \yii\db\ActiveRecord
class TriggerCondition extends \common\components\ActiveRecordModel
{
/**
* @inheritdoc
......@@ -23,18 +25,27 @@ class TriggerCondition extends \yii\db\ActiveRecord
return 'trigger_condition';
}
public function name()
{
return 'Условия триггера';
}
/**
* @inheritdoc
*/
public function rules()
{
return [
[['group_number', 'trigger_id'], 'required'],
[['group_number', 'trigger_id'], 'integer'],
[['group_number', 'trigger_id', 'condition_id'], 'required'],
[['group_number', 'trigger_id', 'condition_id'], 'integer'],
[['trigger_id'], 'exist', 'skipOnError' => true, 'targetClass' => TriggerTrigger::className(), 'targetAttribute' => ['trigger_id' => 'id']],
];
}
public function behaviors(){
return [];
}
/**
* @inheritdoc
*/
......@@ -44,6 +55,7 @@ class TriggerCondition extends \yii\db\ActiveRecord
'id' => 'ID',
'group_number' => 'Group Number',
'trigger_id' => 'Trigger ID',
'condition_id' => 'Идентификатор условия'
];
}
......@@ -54,4 +66,12 @@ class TriggerCondition extends \yii\db\ActiveRecord
{
return $this->hasOne(TriggerTrigger::className(), ['id' => 'trigger_id']);
}
/**
* @return \yii\db\ActiveQuery
*/
public function getTriggerParams()
{
return $this->hasMany(TriggerParam::className(), ['condition_id' => 'id']);
}
}
common/modules/triggers/models/TriggerParam.php 0 → 100644
View file @ 21a0719f
<?php
namespace common\modules\triggers\models;
use Yii;
/**
* This is the model class for table "trigger_param".
*
* @property integer $id
* @property integer $condition_id
* @property string $key
* @property string $value
*
* @property TriggerCondition $condition
*/
class TriggerParam extends \yii\db\ActiveRecord
{
/**
* @inheritdoc
*/
public static function tableName()
{
return 'trigger_param';
}
/**
* @inheritdoc
*/
public function rules()
{
return [
[['condition_id'], 'required'],
[['condition_id'], 'integer'],
[['key', 'value'], 'string'],
[['condition_id'], 'exist', 'skipOnError' => true, 'targetClass' => TriggerCondition::className(), 'targetAttribute' => ['condition_id' => 'id']],
];
}
/**
* @inheritdoc
*/
public function attributeLabels()
{
return [
'id' => 'ID',
'condition_id' => 'Condition ID',
'key' => 'Key',
'value' => 'Value',
];
}
/**
* @return \yii\db\ActiveQuery
*/
public function getCondition()
{
return $this->hasOne(TriggerCondition::className(), ['id' => 'condition_id']);
}
}
common/modules/triggers/models/TriggerTrigger.php
View file @ 21a0719f
......@@ -2,6 +2,7 @@
namespace common\modules\triggers\models;
use common\modules\triggers\components\conditions\Conditions;
use Yii;
use common\modules\users\models\User;
......@@ -21,9 +22,90 @@ use common\modules\users\models\User;
* @property TriggerConnection[] $triggerConnections
* @property User $owner
*/
class TriggerTrigger extends \yii\db\ActiveRecord
class TriggerTrigger extends \common\components\ActiveRecordModel
{
public $conditions;
const PAGE_SIZE = 10;
public $conditions = [];
public function name()
{
return 'Триггеры';
}
public function afterFind(){
/** @var TriggerCondition $condition */
foreach($this->triggerConditions as $condition) {
$this->conditions[$condition->group_number][$condition->getPrimaryKey()] = [
'id' => $condition->condition_id
];
foreach($condition->triggerParams as $param) {
$this->conditions[$condition->group_number][$condition->getPrimaryKey()]['params'][$param->key] = $param->value;
}
}
}
public function afterSave($insert,$changedAttributes){
parent::afterSave($insert,$changedAttributes);
if ($this->scenario == 'update') {
foreach($this->triggerConditions as $condition) {
TriggerParam::deleteAll(['condition_id' => $condition->getPrimaryKey()]);
TriggerCondition::deleteAll(['id' => $condition->getPrimaryKey()]);
}
}
// Сбросили ключи
$this->conditions = array_values($this->conditions);
// Перебираем условия в цикле
foreach($this->conditions as $group_index=>$condition_array) {
foreach($condition_array as $condition) {
$conditionModel = new TriggerCondition();
$conditionModel->group_number = $group_index;
$conditionModel->trigger_id = $this->id;
$conditionModel->condition_id = $condition['id'];
if ($conditionModel->save()) {
if (array_key_exists('params', $condition)) {
foreach($condition['params'] as $key=>$param) {
$paramModel = new TriggerParam();
$paramModel->condition_id = $conditionModel->getPrimaryKey();
$paramModel->key = $key;
$paramModel->value = $param;
if (!$paramModel->save())
echo current(current($paramModel->getErrors()));
}
}
}
}
}
}
public function getConditionTable(){
// Формируем html будущей таблицы, открыли тег
$table = '<table class="table table-bordered">';
// Формируем тело будущей таблицы
$table .= '<tbody>';
// Если есть ошибка
if ($this->getErrors('conditions')) {
$error = $this->getErrors('conditions');
$table .= '<tr><td style="color: red;">'.$error[0].'</td></tr>';
}
// Тут добавляем кнопки управления
if (count($this->conditions)>0) {
foreach($this->conditions as $condition_array) {
$table .= self::getControlButtons($condition_array);
}
} else
$table .= self::getControlButtons();
$table .= '</tbody>';
// Формируем футер
$table .= '<tfoot>';
$table .= '<td><button type="button" class="btn btn-primary add-and-condition">Добавить условие "И"</button></td>';
$table .= '</tfoot>';
// Закрываем таблицу
$table .= '</table>';
return $table;
}
/**
* @inheritdoc
......@@ -33,6 +115,11 @@ class TriggerTrigger extends \yii\db\ActiveRecord
return 'trigger_trigger';
}
public function behaviors()
{
return [];
}
/**
* @inheritdoc
*/
......@@ -40,10 +127,15 @@ class TriggerTrigger extends \yii\db\ActiveRecord
{
return [
[['active', 'owner_id', 'timeout', 'message_template_id'], 'integer'],
[['name', 'owner_id'], 'required'],
[['name', 'owner_id', 'timeout'], 'required'],
[['description'], 'string'],
[['date_create'], 'safe'],
[['name'], 'string', 'max' => 255],
[['conditions'], function($attribute, $params) {
if (!is_array($this->$attribute) || count($this->$attribute)===0) {
$this->addError($attribute, 'Conditions is empty or has a wrong format');
}
},'skipOnEmpty'=>false, 'skipOnError'=>false],
[['owner_id'], 'exist', 'skipOnError' => true, 'targetClass' => User::className(), 'targetAttribute' => ['owner_id' => 'id']],
];
}
......@@ -62,7 +154,7 @@ class TriggerTrigger extends \yii\db\ActiveRecord
'date_create' => 'Дата создания',
'timeout' => 'Задержка перед выполнением (секунд)',
'message_template_id' => 'Шаблон письма',
'conditions' => 'Шаблон письма',
'conditions' => 'Условия',
];
}
......@@ -89,4 +181,11 @@ class TriggerTrigger extends \yii\db\ActiveRecord
{
return $this->hasOne(User::className(), ['id' => 'owner_id']);
}
public function scenarios(){
return [
'default' => ['active','name','description','owner_id','date_create','timeout','message_template_id','conditions'],
'update' => ['active','name','description','owner_id','date_create','timeout','message_template_id','conditions'],
];
}
}
common/modules/triggers/views/trigger-admin/condition-html.php
View file @ 21a0719f
<?php use \common\modules\triggers\components\conditions\Conditions; ?>
<?php $condition_key = rand(100,999); ?>
<div class="alert alert-info alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<strong>Условие: <?php echo $object->getName(); ?></strong>
<input type="hidden" name="Conditions[<?php echo $key; ?>][<?php echo $object->getId().$condition_key; ?>][id]" value="<?php echo $object->getId(); ?>"/>
<?php
foreach($object->getParams() as $param) {
foreach($object->getParams($key, $condition_key) as $param) {
echo $param;
}
?>
......
common/modules/triggers/views/trigger-admin/testing.php 0 → 100644
View file @ 21a0719f
<?php
use \common\modules\triggers\components\conditions\Conditions;
$q = Conditions::init()->getConditionById(2);
var_dump($q->params);
\ No newline at end of file
console/config/main.php
View file @ 21a0719f
......@@ -28,7 +28,7 @@ return [
],
'db' => [
'class' => 'yii\db\Connection',
'dsn' => 'mysql:host=localhost;dbname=mfo',
'dsn' => 'mysql:host=localhost;dbname=taskon',
'username' => 'root',
'password' => '',
'charset' => 'utf8',
......
console/migrations/m160202_053232_fix_language_table.php 0 → 100644
View file @ 21a0719f
<?php
use yii\db\Migration;
class m160202_053232_fix_language_table extends Migration
{
// Use safeUp/safeDown to run migration code within a transaction
public function safeUp()
{
$this->update('languages', ['codeFull' => 'en-EN'], ['code' => 'en']);
$this->update('languages', ['codeFull' => 'ru-RU'], ['code' => 'ru']);
$this->renameColumn('languages', 'codeFull', 'local');
$this->renameColumn('languages', 'code', 'url');
$this->addColumn('languages', 'default', 'smallint(6) NOT NULL DEFAULT 0');
$this->update('languages', ['default' => 1], ['url' => 'ru']);
}
public function safeDown()
{
$this->renameColumn('languages', 'local', 'codeFull');
$this->renameColumn('languages', 'url', 'code');
$this->update('languages', ['codeFull' => 'eng'], ['code' => 'en']);
$this->update('languages', ['codeFull' => 'rus'], ['code' => 'ru']);
$this->dropColumn('languages', 'default');
}
}
console/migrations/m160202_104337_upgrade_content.php 0 → 100644
View file @ 21a0719f
<?php
use yii\db\Schema;
use yii\db\Migration;
class m160202_104337_upgrade_content extends Migration
{
// Use safeUp/safeDown to run migration code within a transaction
public function safeUp()
{
Yii::$app->db->createCommand('ALTER TABLE `co_blocks` ENGINE = InnoDB;')->execute();
Yii::$app->db->createCommand('ALTER TABLE `co_blocks` CHANGE `id` `id` INT(11) NOT NULL AUTO_INCREMENT;')->execute();
$this->createTable(
'co_content_lang',
[
'id' => Schema::TYPE_PK,
'content_id' => Schema::TYPE_INTEGER.'(11) NOT NULL',
'lang_id' => Schema::TYPE_INTEGER.'(11) NOT NULL',
'name' => Schema::TYPE_STRING.'(250) NOT NULL',
'title' => Schema::TYPE_STRING.'(250) NOT NULL',
'text' => 'longtext DEFAULT NULL',
]
);
$this->addForeignKey(
'fk_content_lang_lang_id_languages_id',
'co_content_lang', 'lang_id',
'languages', 'id'
);
$this->addForeignKey(
'fk_content_lang_content_id_content_id',
'co_content_lang', 'content_id',
'co_content', 'id'
);
$this->createTable(
'co_blocks_lang',
[
'id' => Schema::TYPE_PK,
'block_id' => Schema::TYPE_INTEGER.'(11) NOT NULL',
'lang_id' => Schema::TYPE_INTEGER.'(11) NOT NULL',
'name' => Schema::TYPE_STRING.'(50) NOT NULL',
'title' => Schema::TYPE_STRING.'(250) NOT NULL',
'text' => 'longtext DEFAULT NULL',
]
);
$this->addForeignKey(
'fk_blocks_lang_lang_id_languages_id',
'co_blocks_lang', 'lang_id',
'languages', 'id'
);
$this->addForeignKey(
'fk_blocks_lang_blocks_id_blocks_id',
'co_blocks_lang', 'block_id',
'co_blocks', 'id'
);
$this->dropColumn('co_blocks', 'date_create');
$this->dropTable('co_content_data');
}
public function safeDown()
{
$this->dropForeignKey('fk_content_lang_lang_id_languages_id', 'co_content_lang');
$this->dropForeignKey('fk_content_lang_content_id_content_id', 'co_content_lang');
$this->dropForeignKey('fk_blocks_lang_lang_id_languages_id', 'co_blocks_lang');
$this->dropForeignKey('fk_blocks_lang_blocks_id_blocks_id', 'co_blocks_lang');
$this->dropTable('co_content_lang');
$this->dropTable('co_blocks_lang');
$this->addColumn('co_blocks', 'date_create', Schema::TYPE_TIMESTAMP . ' NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP');
$this->createTable(
'co_content_data',
[
'id' => Schema::TYPE_PK,
]
);
}
}
console/migrations/m160202_163727_fix_metatags.php 0 → 100644
View file @ 21a0719f
<?php
use yii\db\Schema;
use yii\db\Migration;
class m160202_163727_fix_metatags extends Migration
{
// Use safeUp/safeDown to run migration code within a transaction
public function safeUp()
{
$this->renameColumn('meta_tags', 'language', 'lang_id');
$this->alterColumn('meta_tags', 'lang_id', Schema::TYPE_INTEGER.'(11) DEFAULT NULL');
$this->truncateTable('meta_tags');
$this->addForeignKey(
'fk_meta_tags_lang_id_languages_id',
'meta_tags', 'lang_id',
'languages', 'id'
);
}
public function safeDown()
{
$this->dropForeignKey('fk_meta_tags_lang_id_languages_id', 'meta_tags');
$this->renameColumn('meta_tags', 'lang_id', 'language');
$this->alterColumn('meta_tags', 'language', Schema::TYPE_STRING.'(5) NOT NULL');
}
}
console/migrations/m160202_173116_fix_index_meta_tags.php 0 → 100644
View file @ 21a0719f
<?php
use yii\db\Migration;
class m160202_173116_fix_index_meta_tags extends Migration
{
// Use safeUp/safeDown to run migration code within a transaction
public function safeUp()
{
$this->dropIndex('object_id', 'meta_tags');
$this->createIndex('unique_object_model_lang', 'meta_tags', ['object_id', 'lang_id', 'model_id'], true);
}
public function safeDown()
{
$this->dropIndex('unique_object_model_lang', 'meta_tags');
$this->createIndex('object_id', 'meta_tags', ['object_id', 'model_id'], true);
}
}
console/migrations/m160203_080816_fix_content.php 0 → 100644
View file @ 21a0719f
<?php
use yii\db\Schema;
use yii\db\Migration;
class m160203_080816_fix_content extends Migration
{
// Use safeUp/safeDown to run migration code within a transaction
public function safeUp()
{
$this->dropColumn('co_blocks_lang', 'name');
$this->dropColumn('co_blocks_lang', 'title');
$this->dropColumn('co_blocks', 'lang');
$this->dropColumn('co_blocks', 'module');
$this->dropColumn('co_content', 'name');
$this->dropColumn('co_content', 'title');
$this->dropColumn('co_content', 'text');
}
public function safeDown()
{
$this->addColumn('co_blocks_lang', 'name', Schema::TYPE_STRING.'(50) NOT NULL');
$this->addColumn('co_blocks_lang', 'title', Schema::TYPE_STRING.'(250) NOT NULL');
$this->addColumn('co_blocks', 'lang', "char(2) DEFAULT 'ru'");
$this->addColumn('co_blocks', 'module', Schema::TYPE_STRING.'(100) NOT NULL');
$this->addColumn('co_content', 'name', Schema::TYPE_STRING.'(250) NOT NULL');
$this->addColumn('co_content', 'title', Schema::TYPE_STRING.'(250) NOT NULL');
$this->addColumn('co_content', 'text', 'longtext DEFAULT NULL');
}
}
console/migrations/m160203_090311_drop_column_blocks.php 0 → 100644
View file @ 21a0719f
<?php
use yii\db\Migration;
class m160203_090311_drop_column_blocks extends Migration
{
public function up()
{
$this->dropColumn('co_blocks', 'text');
}
public function down()
{
$this->createColumn('co_blocks', 'text', 'longtext NOT NULL');
}
}
frontend/config/main.php
View file @ 21a0719f
......@@ -61,6 +61,9 @@ return [
],
],
'components' => [
'request' => [
'class' => 'common\components\LangRequest'
],
'cache' => [
'class' => 'yii\caching\FileCache',
],
......@@ -98,7 +101,11 @@ return [
'translations' => [
'*' => [
'class' => 'yii\i18n\PhpMessageSource',
'sourceLanguage' => 'ru-RU',
'basePath' => '@frontend/messages',
'sourceLanguage' => 'en',
'fileMap' => [
//'main' => 'main.php',
],
],
],
],
......@@ -146,11 +153,8 @@ return [
'showScriptName' => false,
'enableStrictParsing' => true,
'rules' => [
//TEMP
'keys' => 'site/keys',
'contacts' => 'site/contacts',
['pattern' => 'sitemap', 'route' => 'sitemap/default/index', 'suffix' => '.xml'],
'source/<_u>/<_f>/<file>' => '@backend/web/<_u>/<_f>/<file>',
'' => 'content/page/view',
'reviews' => 'reviews/review/index',
......
frontend/controllers/SiteController.php
View file @ 21a0719f
......@@ -99,10 +99,10 @@ class SiteController extends BaseController
{
$model = \common\modules\content\models\CoContent::findOne(['url' => 'site/error']);
$content = $model->getContent();
$this->meta_title = $model->metaTags->title . ' - ' . \Yii::$app->params['name'];
$this->meta_description = $model->metaTags->description;
$this->meta_keywords = $model->metaTags->keywords;
$content = $model->lang->content;
$this->meta_title = $model->metaTag->title . ' - ' . \Yii::$app->params['name'];
$this->meta_description = $model->metaTag->description;
$this->meta_keywords = $model->metaTag->keywords;
return $this->render('error', ['content'=>$content]);
}
......
frontend/messages/ru-RU/menu.php 0 → 100644
View file @ 21a0719f
<?php
return [
'About' => 'О компании',
'Portfolio' => 'Портфолио',
'Blog' => 'Блог',
'Contacts' => 'Контакты',
'Analytics school' => 'Школа аналитики',
];
\ No newline at end of file
frontend/views/layouts/block/about-reviews.php
View file @ 21a0719f
......@@ -22,7 +22,7 @@ $reviews = Reviews::find()
<?php if($review->photo) : ?>
<div class="col-md-3 col-xs-4 col-sm-12">
<div class="rev_img">
<?=Html::img(Reviews::PHOTO_FOLDER . $review->photo);?>
<img src="<?=Reviews::PHOTO_FOLDER . $review->photo?>">
</div>
</div>
<?php endif; ?>
......
frontend/views/layouts/block/cases.php
View file @ 21a0719f
......@@ -13,8 +13,8 @@ $models = CoContent::find()
<?php foreach ($models as $model) : ?>
<div class="col-md-6 col-xs-6 col-sm-12">
<div class="keys_block_small">
<?=Html::img([CoContent::PHOTO_FOLDER . $model->preview], ['height' => '338', 'width' => '455'])?>
<div class="keys_small_title"><?=$model->title?></div>
<img src="<?=CoContent::PHOTO_FOLDER . $model->preview?>" height="338" width="455">
<div class="keys_small_title"><?=$model->lang->title?></div>
<div class="keys_small_foot">
<?=Html::a('<span>Подробнее</span>', ['/'.$model->url], ['class' => 'keys_small_btn_more'])?>
<!-- <a href="#" class="keys_small_tags"># Big data</a> -->
......
frontend/views/layouts/block/projects.php
View file @ 21a0719f
......@@ -21,12 +21,12 @@ $cases = CoContent::find()->where(['category_id' => 4]);
<?php foreach ($models as $model) : ?>
<div>
<div class="others_project">
<span class="others_project__subtitle"><?=$model->title?></span>
<p class="others_project__txt"><?=$model->text?></p>
<span class="others_project__subtitle"><?=$model->lang->title?></span>
<p class="others_project__txt"><?=$model->lang->text?></p>
<a href="<?=Url::to(['/' . $model->url])?>" class="others_project__bt">Подробнее</a>
<a href="<?=Url::to(['/case'])?>" class="others_project__link">Все проекты (<?=$cases->count();?>)</a>
</div>
<?=Html::img([CoContent::PHOTO_FOLDER . $model->preview], ['height' => '476', 'width' => '489'])?>
<img src="<?=CoContent::PHOTO_FOLDER . $model->preview?>" height="476" width="489">
</div>
<?php endforeach; ?>
......
frontend/views/layouts/block/reviews.php 0 → 100644
View file @ 21a0719f
<?php
use \common\modules\reviews\models\Reviews;
use yii\helpers\Html;
$reviews = Reviews::find()
->where(['state' => 'active'])
->orderBy('created_at DESC')
->all();
?>
<?php if($reviews) : ?>
<section class="rev_sec">
<div class="container">
<div class="row" style="margin-top:50px;">
<div class="col-md-12 col-xs-12 col-sm-12">
<span class="rev_title">Отзывы о нас</span>
</div>
</div>
<?php foreach ($reviews as $review) : ?>
<?php if(!$review->video) : ?>
<div class="row">
<?php if($review->photo) : ?>
<div class="col-md-3 col-xs-4 col-sm-12">
<div class="rev_img">
<img src="<?=Reviews::PHOTO_FOLDER . $review->photo?>">
</div>
</div>
<?php endif; ?>
<div class="col-md-8 col-xs-8 col-sm-12">
<div class="rev_name"><?=$review->title?></div>
<div class="rev_txt"><?=$review->text?></div>
</div>
</div>
<?php else : ?>
<div class="rev_video_block">
<div class="row">
<div class="col-md-6 col-xs-12 col-sm-12">
<div class="rev_video">
<iframe width="417" height="199" src="<?=$review->video?>" frameborder="0" allowfullscreen></iframe>
</div>
</div>
<div class="col-md-6 col-xs-12 col-sm-12">
<div class="rev_video_name"><?=$review->title?></div>
<div class="rev_video_desc">
<?=$review->text?>
</div>
</div>
</div>
</div>
<?php endif; ?>
<?php endforeach; ?>
</div>
</section>
<?php endif; ?>
<?php echo $this->render('@app/views/layouts/footer'); ?>
\ No newline at end of file
frontend/views/layouts/footer-index.php
View file @ 21a0719f
......@@ -41,7 +41,7 @@
<div class="row">
<div class="col-md-3 col-xs-3 col-sm-12">
<div class="foot_logo">
<img src="images/foot_logo.png" height="51" width="192" alt="">
<img src="/images/foot_logo.png" height="51" width="192" alt="">
</div>
</div>
<div class="col-md-6 col-xs-6 col-sm-12">
......@@ -55,7 +55,7 @@
</ul>
</div>
<div class="col-md-3 col-xs-3 col-sm-12">
<div class="taskon"><img src="images/taskon.png" height="31" width="100" alt=""></div>
<div class="taskon"><img src="/images/taskon.png" height="31" width="100" alt=""></div>
<div class="copyring">Powered by Taskon <br /> Собственная разработка Арт Проект</div>
</div>
</div>
......
frontend/views/layouts/header.php
View file @ 21a0719f
<?php
use yii\helpers\Html;
use yii\helpers\Url;
use common\modules\languages\widgets\Languages;
?>
<nav class="menu">
<div class="toggle_block"><a href="#" class="toggle-mnu"><span></span></a></div>
<div class="phone_menu"><?=\common\models\Settings::getValue('content-phone')?></div>
<ul>
<li><a href="/about" class="link">О компании</a></li>
<li><a href="/case" class="link">Кейсы</a></li>
<li><a href="#" class="link">Блог</a></li>
<?php /*<li><a href="/school" class="link">Школа аналитики</a></li>*/ ?>
<li><a href="/contacts" class="link">Контакты</a></li>
<li><?=Html::a(\Yii::t('menu', 'About'), ['/about']);?></li>
<li><?=Html::a(\Yii::t('menu', 'Portfolio'), ['/case']);?></li>
<li><?=Html::a(\Yii::t('menu', 'Blog'), ['/#']);?></li>
<!-- <li><?=Html::a(\Yii::t('menu', 'Analytics school'), ['/school']);?></li> -->
<li><?=Html::a(\Yii::t('menu', 'Contacts'), ['/contacts']);?></li>
</ul>
</nav>
......@@ -14,26 +22,21 @@
<div class="container">
<div class="row">
<div class="col-md-2 col-xs-3 col-sm-12">
<a href="/" class="logo">
<a href="<?=Url::to(['/'])?>" class="logo">
<img src="/images/logo.png" height="34" width="125" alt="">
</a>
</div>
<div class="col-md-7 col-xs-6 col-sm-12">
<nav class="top_nav clearfix">
<ul>
<li><a href="/about">О компании</a></li>
<li><a href="/case">Кейсы</a></li>
<li><a href="#">Блог</a></li>
<?php /*<li><a href="/school">Школа аналитики</a></li>*/ ?>
<li><a href="/contacts">Контакты</a></li>
<li><a href="#">ENG</a></li>
<!-- <li><a href="#">RUS</a></li> -->
<li><?=Html::a(\Yii::t('menu', 'About'), ['/about']);?></li>
<li><?=Html::a(\Yii::t('menu', 'Portfolio'), ['/case']);?></li>
<li><?=Html::a(\Yii::t('menu', 'Blog'), ['/#']);?></li>
<!-- <li><?=Html::a(\Yii::t('menu', 'Analytics school'), ['/school']);?></li> -->
<li><?=Html::a(\Yii::t('menu', 'Contacts'), ['/contacts']);?></li>
</ul>
</nav>
<!-- <div class="lang_check">
<a href="#" class="d_menu"><i class="icon-arrowDown"></i>ENG</a>
<a href="#" class="d_menu_hide"><i class="icon-arrowRight"></i>RUS</a>
</div> -->
<?= Languages::widget();?>
</div>
<div class="col-md-3 col-xs-3 col-sm-12">
<span class="top_phone"><?=\common\models\Settings::getValue('content-phone')?></span>
......
frontend/views/site/contacts.php
View file @ 21a0719f
......@@ -17,7 +17,7 @@ use \common\models\Settings;
</duv>
</div>
<div class="row">
<div class="col-md-7 col-xs-6 col-sm 12">
<div class="col-md-6 col-xs-6 col-sm 12">
<div class="cont_block">
<div class="cont_block__city">Москва</div>
<div class="cont_block__phone"><strong>Телефон:</strong> <?=Settings::getValue('contacts-phone-moscow')?></div>
......@@ -27,7 +27,7 @@ use \common\models\Settings;
</div>
<a href="#tabmap" class="view_sheme_link scrollto show-scheme" data-tab="moscow">Смотреть схему</a>
</div>
<div class="col-md-5 col-xs-6 col-sm 12">
<div class="col-md-6 col-xs-6 col-sm 12">
<div class="cont_block">
<div class="cont_block__city">Казань</div>
<div class="cont_block__phone"><strong>Телефон:</strong> <?=Settings::getValue('contacts-phone-kazan')?></div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

task-on.com - ООО "Арт Проект"