Skip to content

T
taskonsite-архив-перенесен
Commit 46d743cb authored by john's avatar john
Browse files
Options

Merge branch 't_3031' 

3104
parents bc82070b 2dde49d5
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 111 deletions
common/modules/documentation/views/page/view.php
View file @ 46d743cb
...@@ -81,15 +81,28 @@ $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Пр ...@@ -81,15 +81,28 @@ $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Пр
<div class="faq_sec"> <div class="faq_sec">
<div class="top_line_inf"> <div class="top_line_inf2">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<ul> <ul>
<li class="active"> <li>
<a href="/faq"> <a href="/faq">
<span class="icon_info_2"> <span class="top_line_icon icon_info_new"></span>
</span>Руководство пользователя </a> Справка для пользователя
</a>
</li>
<li class="active">
<a href="/<?= common\models\Settings::getValue('documentation-home-page') ?>">
<span class="top_line_icon icon_doc_new"></span>
Документация для разработчика
</a>
</li>
<li>
<a href="/faq/video">
<span class="top_line_icon icon_video_new"></span>
Видео-инструкции
</a>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -102,8 +115,6 @@ $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Пр ...@@ -102,8 +115,6 @@ $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Пр
<div class="way"> <div class="way">
<a href="/">Главная</a> <a href="/">Главная</a>
<span>|</span> <span>|</span>
<a href="/faq">Руководство пользователя</a>
<span>|</span>
<a href="/<?= common\models\Settings::getValue('documentation-home-page') ?>">Документаци для разраотчиков</a> <a href="/<?= common\models\Settings::getValue('documentation-home-page') ?>">Документаци для разраотчиков</a>
<span>|</span> <?php echo $modelContent->name ?><br> <br> <span>|</span> <?php echo $modelContent->name ?><br> <br>
</div> </div>
......
common/modules/faq/views/faq/index.php
View file @ 46d743cb
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
use yii\helpers\Html; use yii\helpers\Html;
use yii\helpers\Url; use yii\helpers\Url;
use common\modules\blog\models\Post; use common\modules\blog\models\Post;
use common\modules\faq\models\Faq; use common\modules\faq\models\Faq;
use common\modules\faq\assets\GeneratorAsset; use common\modules\faq\assets\GeneratorAsset;
...@@ -13,68 +12,65 @@ GeneratorAsset::register($this); ...@@ -13,68 +12,65 @@ GeneratorAsset::register($this);
?> ?>
<div class="faq_sec"> <div class="faq_sec">
<?= $this->renderFile('@common/modules/faq/views/faq/menu.php') ?> <?= $this->renderFile('@common/modules/faq/views/faq/menu.php') ?>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="way"> <div class="way">
<a href="/">Главная</a> <span>|</span> <?= (strpos(Yii::$app->request->url, "/faq/video") === 0) ? "Видео-уроки" : "Справка" ?> <a href="/">Главная</a>
<br> <span>|</span> Справка для пользователя<br> <br>
<br> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="container">
<div class="row">
<?php
$i = 0;
foreach($models as $r)
{
?>
<div class="faq_rubric col-md-6 col-xs-6 col-sm-12">
<h5>
<span class="rubric_icon">
<img src="<?= $r->img;?>" height="36" alt="">
</span>
<span class="wiht_icon"><?php echo $r->name?></span>
</h5>
<div class="container">
<div class="row">
<?php <?php
$r_list = $r->faqs; $i = 0;
foreach ($models as $r) {
if ($r_list)
{
?>
<ul class="rubric_list">
<?php foreach($r_list as $rl_item)
{?>
<li>
<?php echo Html::a($rl_item->lang->title, '/faq/' . $rl_item->url)?>
</li>
<?}?>
</ul>
<?
}
?> ?>
<div class="faq_rubric col-md-6 col-xs-6 col-sm-12">
<h5>
<span class="rubric_icon">
<img src="<?= $r->img; ?>" height="36" alt="">
</span>
<span class="wiht_icon"><?php echo $r->name ?></span>
</h5>
<?php
$r_list = $r->faqs;
if ($r_list) {
?>
<ul class="rubric_list">
<?php foreach ($r_list as $rl_item) {
?>
<li>
<?php echo Html::a($rl_item->lang->title, '/faq/' . $rl_item->url) ?>
</li>
<?}?>
</ul>
<?
}
?>
</div>
<?
if ($i%2){
echo '<div class="clearfix"></div>';
}
$i++;
}?>
</div>
</div>
</div> </div>
<? <?php echo $this->render('@app/views/layouts/footer'); ?>
if ($i%2){ \ No newline at end of file
echo '<div class="clearfix"></div>';
}
$i++;
}?>
</div>
</div>
</div>
<?php echo $this->render('@app/views/layouts/footer'); ?>
\ No newline at end of file
common/modules/faq/views/faq/menu.php
View file @ 46d743cb
<?php <?php
/** /**
* Created by PhpStorm. * Created by PhpStorm.
* User: andre * User: andre
...@@ -7,21 +8,34 @@ ...@@ -7,21 +8,34 @@
*/ */
use yii\helpers\Html; use yii\helpers\Html;
use yii\helpers\Url; use yii\helpers\Url;
use common\modules\faq\models\Faq; use common\modules\faq\models\Faq;
?> ?>
<div class="top_line_inf"> <div class="top_line_inf2">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<ul> <ul>
<li <?= strpos(Yii::$app->request->url, "/faq/video") !== 0 ? 'class="active"' : "" ?>><a href="/faq"><span class="icon_info_2"></span>Справка </a></li> <li class="active">
<? /* if(isset(Faq::$section_title[Faq::SECTION_VIDEO])): ?> <a href="/faq">
<li <?= strpos(Yii::$app->request->url, "/faq/video") === 0 ? 'class="active"' : "" ?>><a href="/faq/video"><span class="icon_video"></span>Видео-уроки</a></li> <span class="top_line_icon icon_info_new"></span>
<? endif */ ?> Справка для пользователя
</ul> </a>
</div> </li>
<li>
<a href="/<?= common\models\Settings::getValue('documentation-home-page') ?>">
<span class="top_line_icon icon_doc_new"></span>
Документация для разработчика
</a>
</li>
<li>
<a href="/faq/video">
<span class="top_line_icon icon_video_new"></span>
Видео-инструкции
</a>
</li>
</ul>
</div> </div>
</div> </div>
</div> </div>
</div>
\ No newline at end of file
common/modules/faq/views/faq/view.php
View file @ 46d743cb
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
use yii\helpers\Html; use yii\helpers\Html;
use yii\helpers\Url; use yii\helpers\Url;
use common\modules\faq\models\Faq; use common\modules\faq\models\Faq;
use common\modules\faq\assets\GeneratorAsset; use common\modules\faq\assets\GeneratorAsset;
...@@ -13,47 +12,48 @@ GeneratorAsset::register($this); ...@@ -13,47 +12,48 @@ GeneratorAsset::register($this);
?> ?>
<div class="faq_sec"> <div class="faq_sec">
<?= $this->renderFile('@common/modules/faq/views/faq/menu.php') ?> <?= $this->renderFile('@common/modules/faq/views/faq/menu.php') ?>
<div class="reference_box"> <div class="reference_box">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-8 col-xs-8 col-sm-12"> <div class="col-md-8 col-xs-8 col-sm-12">
<div class="way"> <div class="way">
<a href="/">Главная</a> <a href="/">Главная</a>
<span>|</span> <?= (strpos(Yii::$app->request->url, "/faq/video") === 0) ? '<a href="/faq/video">Видео-уроки</a>' : '<a href="/faq">Справка</a>' ?> <span>|</span>
<span>|</span> <?= $model->lang->title?> <a href="/faq">Справка для пользователя</a>
</div> <span>|</span> <?= $model->lang->title ?><br> <br>
</div>
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="reference_left_box"> <div class="reference_left_box">
<h2><?= $model->lang->title;?></h2> <h2><?= $model->lang->title; ?></h2>
<div class="faq-text"> <div class="faq-text">
<?= $model->lang->text?> <?= $model->lang->text ?>
</div> </div>
<? if(!$model->alreadyVoted()): ?> <? if(!$model->alreadyVoted()): ?>
<?php echo $this->render('_yes_no_form', ['model' => $form])?> <?php echo $this->render('_yes_no_form', ['model' => $form]) ?>
<? endif ?> <? endif ?>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="col-md-4 col-xs-4 col-sm-12"> <div class="col-md-4 col-xs-4 col-sm-12">
<div class="reference_right_box"> <div class="reference_right_box">
<?php echo $this->render('_sidebar_other', ['model' => $model]);?> <?php echo $this->render('_sidebar_other', ['model' => $model]); ?>
<?php echo $this->render('_sidebar_form', ['model' => $form]);?> <?php echo $this->render('_sidebar_form', ['model' => $form]); ?>
</div>
</div> </div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
<?php echo $this->render('@app/views/layouts/footer'); ?> <?php echo $this->render('@app/views/layouts/footer'); ?>
\ No newline at end of file
frontend/config/main.php
View file @ 46d743cb
...@@ -60,13 +60,13 @@ return [ ...@@ -60,13 +60,13 @@ return [
'cache' => [ 'cache' => [
'class' => 'yii\caching\FileCache', 'class' => 'yii\caching\FileCache',
], ],
// 'view' => [ 'view' => [
// 'class' => 'rmrevin\yii\minify\View', 'class' => 'rmrevin\yii\minify\View',
// 'base_path' => '@app/web', 'base_path' => '@app/web',
// 'minify_path' => '@app/web/minify', 'minify_path' => '@app/web/minify',
// 'force_charset' => 'UTF-8', 'force_charset' => 'UTF-8',
// 'expand_imports' => true, 'expand_imports' => true,
// ], ],
'user' => [ 'user' => [
'identityClass' => 'common\modules\users\models\User', 'identityClass' => 'common\modules\users\models\User',
'identityCookie' => [ 'identityCookie' => [
......
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 - ООО "Арт Проект"