Skip to content

T
taskonsite-архив-перенесен
Commit 5d555cc7 authored by Роман's avatar Роман
Browse files
Options

#1309 Исправлена ошибка при сохранении кейса без указания позиции, добавлена... 

#1309 Исправлена ошибка при сохранении кейса без указания позиции, добавлена возможность указывать теги script/style в tinymce
parent 773e930f
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 55 deletions
backend/controllers/SiteController.php
View file @ 5d555cc7
......@@ -2,7 +2,9 @@
namespace backend\controllers;
use Yii;
use yii\base\InvalidParamException;
use yii\filters\AccessControl;
use yii\web\BadRequestHttpException;
use yii\web\Controller;
use common\models\LoginForm;
......@@ -111,6 +113,11 @@ class SiteController extends Controller
]);
}
/**
* @param $token
* @return string|\yii\web\Response
* @throws BadRequestHttpException
*/
public function actionResetPassword($token)
{
if (!Yii::$app->user->isGuest)
......
backend/web/js/form-load.js
View file @ 5d555cc7
......@@ -22,7 +22,7 @@ $(function() {
theme: "modern",
language: "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]",
extended_valid_elements: "span[id|name|class|style],i[id|name|class|style],ul[id|name|class|style],li[id|name|class|style],script[type|src],style",
height: '350px',
menubar: "edit insert view format table tools",
plugins: [
......
common/components/LangRequest.php
View file @ 5d555cc7
......@@ -94,7 +94,7 @@ class LangRequest extends Request
throw new InvalidConfigException('Unable to determine the path info of the current request.');
}
if ($pathInfo[0] === '/')
if (substr($pathInfo, 0, 1) === '/')
{
$pathInfo = substr($pathInfo, 1);
}
......
common/modules/content/models/CoContent.php
View file @ 5d555cc7
......@@ -127,6 +127,7 @@ class CoContent extends \common\components\ActiveRecordModel
[['url'], 'string', 'max' => 250],
[['url'], 'unique', 'targetAttribute' => ['url', 'category_id']],
[['category_id', 'custom'], 'safe'],
[['position'], 'default', 'value' => 0],
];
}
......
frontend/views/layouts/block/cases.php
View file @ 5d555cc7
......@@ -18,21 +18,11 @@ $models = CaseContent::find()
<div class="row">
<?php foreach ($models as $model) : ?>
<? if(!$model->previewType || $model->previewType->type == CasesPreviewType::PREVIEW_SQUARE): ?>
<?php if(!$model->previewType || $model->previewType->type == CasesPreviewType::PREVIEW_SQUARE): ?>
<div class="col-md-6 col-xs-6 col-sm-12">
<!-- <div class="keys_block_small">-->
<!-- <a href="--><?//=Url::to(['/'.$model->url])?><!--">-->
<!-- <img src="--><?//= $model->preview ?><!--" height="338" width="455" alt="">-->
<!-- <div class="keys_small_title"--><?//if($model->custom==CoContent::CUSTOM_WHITE){?><!--style="color:#fff;"--><?//}?><!-->--><?//=$model->lang->title?><!--</div>-->
<!-- </a>-->
<!-- <div class="keys_small_foot">-->
<!-- <a href="--><?//= Url::to(['/'.$model->url]) ?><!--" class="keys_small_btn_more"><span>--><?//=Yii::t('case', 'Read more')?><!--</span></a>-->
<!-- <a class="keys_small_tags">--><?//= $model->previewType->tag ? "#{$model->previewType->tag}" : "" ?><!--</a>-->
<!-- </div>-->
<!-- </div>-->
<a href="<?=Url::to(['/'.$model->url])?>" class="keys_block_small">
<img src="<?=$model->preview?>" height="338" width="455">
<div class="keys_small_title" <?if($model->custom==CoContent::CUSTOM_WHITE){?>style="color:#fff;"<?}?>><?=$model->lang->title?></div>
<div class="keys_small_title" <?php if($model->custom==CoContent::CUSTOM_WHITE){?>style="color:#fff;"<?php }?>><?=$model->lang->title?></div>
<div class="keys_small_foot">
<div class="keys_small_btn_more">
<span><?=Yii::t('case', 'Read more')?></span>
......@@ -41,14 +31,14 @@ $models = CaseContent::find()
</div>
</a>
</div>
<? elseif($model->previewType->type == CasesPreviewType::PREVIEW_RECTANGLE): ?>
<?php elseif($model->previewType->type == CasesPreviewType::PREVIEW_RECTANGLE): ?>
<div class="col-md-12 col-xs-12 col-sm-12">
<a href="<?=Url::to(['/'.$model->url])?>" class="keys_block_small big">
<img class="img_lg" src="<?=$model->preview?>" height="338" width="940">
<? if($model->preview_mob):?>
<?php if($model->preview_mob):?>
<img class="img_sm" src="<?=$model->preview_mob?>" height="338" width="455">
<? endif ?>
<div class="keys_small_title" <?if($model->custom==CoContent::CUSTOM_WHITE){?>style="color:#fff;"<?}?>><?=$model->lang->title?></div>
<?php endif; ?>
<div class="keys_small_title" <?php if($model->custom==CoContent::CUSTOM_WHITE){?>style="color:#fff;"<?php }?>><?=$model->lang->title?></div>
<div class="keys_small_foot">
<div class="keys_small_btn_more">
<span><?=Yii::t('case', 'Read more')?></span>
......@@ -56,37 +46,9 @@ $models = CaseContent::find()
<span class="keys_small_tags"><?= $model->previewType->tag ? "# {$model->previewType->tag}" : "" ?></span>
</div>
</a>
<!-- <div class="keys_block_big">-->
<!-- <a href="--><?//=Url::to(['/'.$model->url])?><!--">-->
<!-- <picture>-->
<!-- <source srcset="images/keys_big338.jpg" media="(max-width: 768px)">-->
<!-- <img src="images/keys_big1.jpg" height="338" width="940" alt="">-->
<!-- </picture>-->
<!-- <div class="keys_small_title"--><?//if($model->custom==CoContent::CUSTOM_WHITE){?><!--style="color:#fff;"--><?//}?><!-->--><?//=$model->lang->title?><!--</div>-->
<!-- <div class="keys_small_foot">-->
<!-- <a href="--><?//=Url::to(['/'.$model->url])?><!--" class="keys_small_btn_more"><span>--><?//=Yii::t('case', 'Read more')?><!--</span></a>-->
<!-- <a class="keys_small_tags">--><?//= $model->previewType->tag ? "#{$model->previewType->tag}" : "" ?><!--</a>-->
<!-- </div>-->
<!-- </a>-->
<!-- </div>-->
</div>
<? endif ?>
<?php endif; ?>
<?php endforeach; ?>
</div>
<!-- <div class="row">
<div class="col-md-12 col-xs-12 col-sm-12">
<div class="keys_block_big">
<picture>
<source srcset="images/keys_big338.jpg" media="(max-width: 768px)">
<img src="/images/keys_big1.jpg" height="338" width="940" alt="">
</picture>
<div class="keys_small_title">Он-лайн сервис по подбору аналогов оборудования</div>
<div class="keys_small_foot">
<a href="#" class="keys_small_btn_more"><span>Подробнее</span></a>
<a href="#" class="keys_small_tags"># Big data</a>
</div>
</div>
</div>
</div> -->
<?php endif; ?>
\ No newline at end of file
frontend/views/layouts/block/projects.php
View file @ 5d555cc7
......@@ -31,7 +31,7 @@ $caseCount = CoContent::find()->where([
<a href="<?=Url::to(['/' . $model->url])?>" class="others_project__subtitle_a"><?=$model->lang->title?></a>
<p class="others_project__txt"><?=$model->lang->text?></p>
<a href="<?=Url::to(['/' . $model->url])?>" class="others_project__bt"><?=Yii::t('projects', 'See more')?></a>
<a href="<?=Url::to(['/portfolio'])?>" class="others_project__link"><?=Yii::t('projects', 'All projects')?> <?if($caseCount>20){?>(<?=$caseCount;?>)<?}?></a>
<a href="<?=Url::to(['/portfolio'])?>" class="others_project__link"><?=Yii::t('projects', 'All projects')?> <?php if($caseCount>20){?>(<?=$caseCount;?>)<?php }?></a>
</div>
<img src="<?=$model->preview?>" height="476" width="489">
</div>
......
frontend/views/layouts/block/social.php
View file @ 5d555cc7
......@@ -3,10 +3,10 @@ use common\models\Settings;
?>
<ul class="social_link">
<?php $s = Settings::getValue('social-link-vk'); if($s): ?><li><a href="<?=$s?>" class="soc_item"><i class="fa fa-vk"></i></a></li><? endif; ?>
<?php $s = Settings::getValue('social-link-fb'); if($s): ?><li><a href="<?=$s?>" class="soc_item"><i class="fbicon"></i></a></li><? endif; ?>
<?php $s = Settings::getValue('social-link-youtube'); if($s): ?><li><a href="<?=$s?>" class="soc_item"><i class="fa fa-youtube"></i></a></li><? endif; ?>
<?php $s = Settings::getValue('social-link-instagram'); if($s): ?><li><a href="<?=$s?>" class="soc_item"><i class="fa fa-instagram"></i></a></li><? endif; ?>
<?php $s = Settings::getValue('social-link-twitter'); if($s): ?><li><a href="<?=$s?>" class="soc_item"><i class="fa fa-twitter"></i></a></li><? endif; ?>
<?php $s = Settings::getValue('social-link-google'); if($s): ?><li><a href="<?=$s?>" class="soc_item"><i class="gplusicon"></i></a></li><? endif; ?>
<?php $s = Settings::getValue('social-link-vk'); if($s): ?><li><a href="<?=$s?>" class="soc_item"><i class="fa fa-vk"></i></a></li><?php endif; ?>
<?php $s = Settings::getValue('social-link-fb'); if($s): ?><li><a href="<?=$s?>" class="soc_item"><i class="fbicon"></i></a></li><?php endif; ?>
<?php $s = Settings::getValue('social-link-youtube'); if($s): ?><li><a href="<?=$s?>" class="soc_item"><i class="fa fa-youtube"></i></a></li><?php endif; ?>
<?php $s = Settings::getValue('social-link-instagram'); if($s): ?><li><a href="<?=$s?>" class="soc_item"><i class="fa fa-instagram"></i></a></li><?php endif; ?>
<?php $s = Settings::getValue('social-link-twitter'); if($s): ?><li><a href="<?=$s?>" class="soc_item"><i class="fa fa-twitter"></i></a></li><?php endif; ?>
<?php $s = Settings::getValue('social-link-google'); if($s): ?><li><a href="<?=$s?>" class="soc_item"><i class="gplusicon"></i></a></li><?php endif; ?>
</ul>
\ No newline at end of file
frontend/views/layouts/head.php
View file @ 5d555cc7
......@@ -53,4 +53,4 @@ endif;?>
<?php $this->registerCssFile('/css/main-v1.css');?>
<?php $this->registerCssFile('/css/main-v2.css');?>
<? Yii::$app->view->registerAssetFiles('/') ?>
<?php Yii::$app->view->registerAssetFiles('/') ?>
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 - ООО "Арт Проект"