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

backend/web/plugins/editormd/documentation.js

@@ -22,6 +22,7 @@ $(function ()
             //toolbar  : false,             //关闭工具栏
             //previewCodeHighlight : false, // 关闭预览 HTML 的代码块高亮，默认开启
 //            emoji: true,
+            atLink: false,
             taskList: true,
             tocm: true, // Using [TOCM]
             tex: true, // 开启科学公式TeX语言支持，默认关闭
@@ -32,7 +33,7 @@ $(function ()
             //dialogDraggable : false,    // 设置弹出层对话框不可拖动，全局通用，默认为true
             //dialogMaskOpacity : 0.4,    // 设置透明遮罩层的透明度，全局通用，默认值为0.1
             //dialogMaskBgColor : "#000", // 设置透明遮罩层的背景颜色，全局通用，默认为#fff
-            
+
             imageUpload: true,
             imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp"],
             imageUploadURL: "/documentation/documentation-admin/upload",

backend/web/plugins/editormd/languages/en.js

@@ -41,6 +41,7 @@
                 clear            : "Clear",
                 search           : "Search",
                 help             : "Help",
+                carousel         : "Carousel",
                 info             : "About " + exports.title
             },
             buttons : {

common/modules/bids/models/Bid.php

@@ -86,7 +86,7 @@ class Bid extends \common\components\ActiveRecordModel
 
             [['name', 'phone'], 'required', 'on' => self::SCENARIO_CALLBACK],
                     
-            [['name', 'message', 'text'], 'required', 'on' => self::SCENARIO_DOCUMENTATION],
+            [['name', 'message', 'text','email'], 'required', 'on' => self::SCENARIO_DOCUMENTATION],
 
             [['phone'], 'required', 'on' => self::SCENARIO_BUSINESS],
 

common/modules/documentation/assets/src/css/style.css

@@ -1729,7 +1729,7 @@ footer  .phone_hover_head {
     margin-right: 10px;
     margin-top: 2px;
 }
-.footer_info {
+.footer_info {..
   color: #93f82f;
   font-size: 15px;
   text-decoration: underline;

common/modules/documentation/assets/src/js/documentation.js

@@ -6,8 +6,24 @@ $(function ()
         var listOfImages = [];
         $(this).find('img').each(function ()
         {
-            listOfImages.push('<figure><img src="' + $(this).attr('src') + '" alt="' + $(this).attr('alt') + '"><figcaption class="text-white">' + $(this).attr('title') + '</figcaption></figure>')
+            var alt = $(this).attr('alt');
+            if (typeof alt === "undefined")
+                alt = '';
+            listOfImages.push('<figure><img class="container_documentation_owl_img" src="' + $(this).attr('src') + '" alt="' + alt + '"><figcaption class="text-white">' + alt + '</figcaption></figure>')
         })
         $(this).html(listOfImages.join('')).removeClass('owl-carousel-need-replace hidden');
     })
+
+    $('.container_documentation .container_documentation_right').find('img:not(".container_documentation_owl_img")').addClass('image-popuped').click(function ()
+    {
+        $.magnificPopup.open({
+            items: {
+                src: $(this).attr('src')
+            },
+            image: {
+                cursor: 'pointer',
+            },
+            type: 'image'
+        });
+    });
 })
\ No newline at end of file

common/modules/documentation/controllers/PageController.php

@@ -91,9 +91,9 @@ class PageController extends \common\components\BaseController
                                     'html' => '@common/modules/blog/mail/messageBlog-html',
                                     'text' => '@common/modules/blog/mail/messageBlog-text'], ['model' => $model]
                                 )
-                                ->setFrom([\common\models\Settings::getValue('bids-support-email-from') => 'Блог Task-On'])
+                                ->setFrom([\common\models\Settings::getValue('bids-support-email-from') => 'Запрос на интеграцию'])
                                 ->setTo(\common\models\Settings::getValue('article-email'))
-                                ->setSubject("Заявка на подключения к TaskOn - " . $model->primaryKey)
+                                ->setSubject("Запрос на интеграция TaskOn2 - " . $model->primaryKey)
                                 ->send();
                         $transaction->commit();
 

common/modules/documentation/models/DocContent.php

@@ -71,7 +71,7 @@ class DocContent extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['list_id'], 'required'],
+            [['list_id','priority'], 'required'],
             [['list_id'], 'integer'],
             [[ 'priority'], 'number'],
             [['list_id'], 'exist', 'skipOnError' => true, 'targetClass' => DocList::className(), 'targetAttribute' => ['list_id' => 'id']],

common/modules/documentation/models/DocList.php

@@ -226,22 +226,8 @@ class DocList extends \yii\db\ActiveRecord
 
     public function getFormatedCreatedAt()
     {
-        $mt = [
-            '01' => 'января',
-            '02' => 'февраля',
-            '03' => 'марта',
-            '04' => 'апреля',
-            '05' => 'мая',
-            '06' => 'июня',
-            '07' => 'июля',
-            '08' => 'августа',
-            '09' => 'сентября',
-            '10' => 'октября',
-            '11' => 'ноября',
-            '12' => 'декабря',
-        ];
         if (Yii::$app->language == 'ru-RU')
-            return date('d ' . $mt[date('m', $this->created_at)] . ' Y г.', $this->created_at);
+            return date('d.m.Y г.', $this->created_at);
         return Yii::$app->formatter->asDate($this->created_at, "medium");
     }
 

common/modules/documentation/models/SearchDocContent.php

@@ -83,7 +83,7 @@ class SearchDocContent extends DocContent
             'priority' => $this->priority,
         ]);
 
-//        $query->andFilterWhere(['like', 'doc_content_lang.url', $this->url]);
+        $query->andFilterWhere(['like', 'doc_content_lang.url', $this->url]);
 //        $query->andFilterWhere(['likef', 'doc_content_lang.name', $this->name]);
 
         return $dataProvider;

common/modules/documentation/views/documentation-admin/index.php

@@ -9,6 +9,7 @@ use common\modules\documentation\models\DocList;
 /* @var $this yii\web\View */
 /* @var $searchModel common\modules\documentation\models\SearchCoContent */
 /* @var $dataProvider yii\data\ActiveDataProvider */
+$modelDocList = new DocList();
 ?>
 
 <?php // echo $this->render('_search', ['model' => $searchModel]);  ?>
@@ -35,7 +36,8 @@ use common\modules\documentation\models\DocList;
         ],
         [
             'attribute' => 'list_id',
-            'filter' => ArrayHelper::map(DocList::find()->all(), 'id', 'name'),
+//            'filter' => ArrayHelper::map(DocList::find()->all(), 'id', 'lang.name'),
+            'filter' => $modelDocList->getParentList($searchModel->list, 0, 0, true),
             'format' => 'text',
             'value' => function($data) {
                 if ($data->list && $data->list->lang)

common/modules/documentation/views/documentation-list-admin/_form.php

@@ -50,7 +50,7 @@ $blocks = \common\modules\content\models\CoBlocks::find()->all();
     <?= $form->field($model, 'parent_id')->dropDownList($model->getParentList($model), ['class' => 'form-control', 'prompt' => 'Выберите родительский раздел']) ?>
     <?=
     $form->field($model, 'active', [
-        'template' => '{input}<a href="#" class="btn btn-xs btn-success m-l-5 disabled">Пункт меню скрыт от пользователя / Пункт меню виднен для пользователю</a>'
+        'template' => '{input}<a href="#" class="btn btn-xs btn-success m-l-5 disabled">Пункт меню скрыт от пользователя / Пункт меню виден для пользователя</a>'
     ])->checkbox([
         'data-theme' => 'self',
         'data-render' => 'switchery',

common/modules/documentation/views/documentation-list-admin/index.php

@@ -47,7 +47,7 @@ $parentList = $searchModel->getParentList($searchModel, 0, 0, true);
         [
             'attribute' => 'active',
             'value' => function($model) {
-                $list = ['0' => 'Пункт меню скрыт от пользователя ', '1' => 'Пункт меню виднен для пользователю'];
+                $list = ['0' => 'Пункт меню скрыт от пользователя ', '1' => 'Пункт меню виден для пользователя'];
                 return ArrayHelper::getValue($list, $model->active);
             }
         ],

common/modules/documentation/views/documentation-list-admin/sort.php

@@ -52,7 +52,7 @@ SortableGridView::widget([
             'header' => $searchModel->getAttributeLabel('active'),
             'attribute' => 'active',
             'value' => function($model) {
-                $list = ['0' => 'Пункт меню скрыт от пользователя ', '1' => 'Пункт меню виднен для пользователю'];
+                $list = ['0' => 'Пункт меню скрыт от пользователя ', '1' => 'Пункт меню виден для пользователя'];
                 return ArrayHelper::getValue($list, $model->active);
             }
         ],

common/modules/documentation/views/documentation-list-admin/view.php

@@ -47,7 +47,7 @@ DetailView::widget([
         [
             'attribute' => 'active',
             'value' => function($model) {
-                $list = ['0' => 'Пункт меню скрыт от пользователя ', '1' => 'Пункт меню виднен для пользователю'];
+                $list = ['0' => 'Пункт меню скрыт от пользователя ', '1' => 'Пункт меню виден для пользователя'];
                 return ArrayHelper::getValue($list, $model->active);
             }
         ],

common/modules/documentation/views/page/_request_access.php

@@ -8,8 +8,8 @@ use common\modules\bids\models\Bid;
     <div id="request_access" class="popup popup_2 blog_form_2">
         <div class="txtbtnclose"><?= \Yii::t('blog', 'Close') ?></div>
         <span class="popup__title"><?= \Yii::t('blog', 'Connection request') ?></span>
-        <p><strong><?= \Yii::t('blog', 'Access to the repository (the source code platform Task On 2) is sent on request. Detailed documentation can be found in the "<a href="/platforma-taskon">Developer Guide </a>"') ?></strong></p>
-        <br>
+        <p><strong><?= \Yii::t('blog', 'Access to the repository (the source code platform Task On 2) is sent on request.') ?></strong></p>
+        
 
         <?php
         $model = new Bid();

common/modules/documentation/views/page/view.php

@@ -51,7 +51,7 @@ $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Пр
                 </section>
                 <!-- Promo Banner-->
                 <section class="promo-box" style="background-image: url(images/promo-box/promo_box_bg.jpg);">
-                    <!-- Choose between .overlay-dark (#000) or .overlay-light (#fff) with default opacity of 50%. You can overrride default color and opacity values via 'style' attribute.--><!-- <span class="overlay-dark" style="opacity: .35;"></span> -->
+                <!-- Choose between .overlay-dark (#000) or .overlay-light (#fff) with default opacity of 50%. You can overrride default color and opacity values via 'style' attribute.--><!-- <span class="overlay-dark" style="opacity: .35;"></span> -->
                     <div class="promo-box-content padding-top-1x padding-bottom-1x">
                         <h4 class="promo_title"><span>Заказать</span> <br> <span>разработку на</span> <br> <span>платформе</span></h4>
                         <div class="promo_logo">
@@ -59,15 +59,18 @@ $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Пр
                         </div>
                         <div class="text-center">
                             <div class="promo_txt">
-                                <p class="text-thin">Отправьте заявку на расчет</p>
+                                <p class="text-thin">Отправить заявку на доступ</p>
                             </div>
-                            <a class="btn btn-promo btn-long popup-form" href="#request_access">
+                            <a class="btn_green_sm btn-long popup-form" href="#request_access">
                                 <!--Запросить расчет-->
                                 Запросить доступ
                             </a>
                         </div>
                     </div>
                 </section>
+                <!-- new 02.04.19 -->
+                <a href="http://demo.task-on.com/?utm_source=task-oncom&utm_medium=cpc&utm_campaign=docprogrammer&utm_term=demo" target="_blank" class="btn_info_box margin-top-1x"><span>Демо-доступ к платформе TaskOn 2</span></a>             
+                <!-- new end 02.04.19 -->
             </div>
         </div>
     </div>
@@ -81,15 +84,28 @@ $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Пр
 
 
 <div class="faq_sec">
-    <div class="top_line_inf">
+    <div class="top_line_inf2">
         <div class="container">
             <div class="row">
                 <div class="col-sm-12">
                     <ul>
-                        <li class="active">
+                        <li>
                             <a href="/faq">
-                                <span class="icon_info_2">
-                                </span>Руководство пользователя </a>
+                                <span class="top_line_icon icon_info_new"></span>
+                                Справка для пользователя 
+                            </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>
                     </ul>
                 </div>
@@ -102,8 +118,6 @@ $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Пр
                 <div class="way">
                     <a href="/">Главная</a>
                     <span>|</span>    
-                    <a href="/faq">Руководство пользователя</a>
-                    <span>|</span>    
                     <a href="/<?= common\models\Settings::getValue('documentation-home-page') ?>">Документаци для разраотчиков</a>
                     <span>|</span>   <?php echo $modelContent->name ?><br> <br>
                 </div>
@@ -118,17 +132,17 @@ $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Пр
         <div class="container padding-bottom-3x mb-2">
             <div class="row"> 
                 <!-- Content-->
-                <div class="col-xl-8 col-lg-7 order-lg-2">
+                <div class="col-xl-9 col-lg-8 order-lg-2">
                     <!-- Post-->
 
 
                     <h1><?php echo $modelContent->name ?></h1>
                     <div class="single-post-meta">
 
-                        <div class="meta-link"><i class="icon-clock"></i> <?= $model->list->getFormatedCreatedAt() ?></div>
+                        <div class="meta-link"><i class="icon-clock"></i> Обновлено: <?= $model->list->getFormatedCreatedAt() ?></div>
 
                     </div>
-                    <?php echo $modelContent->html ?>	
+                    <?php echo str_replace(['<!-- ¿¿¿CAROUSEL_BEGIN¿¿¿ -->', '<!-- ¿¿¿CAROUSEL_END¿¿¿ -->'], ['<div class="owl-carousel owl-carousel-need-replace hidden" data-owl-carousel="{ &quot;nav&quot;: true, &quot;dots&quot;: true, &quot;loop&quot;: true }">', '</div>'], $modelContent->html) ?>	
 
                     <div class="single-post-footer">
                         <div class="column">
@@ -174,7 +188,7 @@ $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Пр
 
                 </div>
                 <!-- Sidebar          -->
-                <div class="col-xl-4 col-lg-5 order-lg-1">
+                <div class="col-xl-3 col-lg-4 order-lg-1">
                     <button class="sidebar-toggle position-left" data-toggle="modal" data-target="#modalBlogSidebar"><i class="icon-layout"></i></button>
                     <aside class="sidebar sidebar-offcanvas">
                         <!-- Widget Categories-->
@@ -187,24 +201,28 @@ $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Пр
                         </section>
 
                         <!-- Promo Banner-->
-                        <section class="promo-box" style="background-image: url(/images/promo-box/promo_box_bg.jpg);">
+                        <section class="promo-box" style="background-image: url(/images/faq/blockquote_box_line.png);">
                         <!-- Choose between .overlay-dark (#000) or .overlay-light (#fff) with default opacity of 50%. You can overrride default color and opacity values via 'style' attribute.--><!-- <span class="overlay-dark" style="opacity: .35;"></span> -->
                             <div class="promo-box-content padding-top-1x padding-bottom-1x">
-                                <h4 class="promo_title"><span>Заказать</span> <br> <span>разработку на</span> <br> <span>платформе</span></h4>
+                                <h4 class="promo_title"><span>Скачать</span> <br> <span>платформу</span> <br> <span>TaskOn 2</span></h4>
                                 <div class="promo_logo">
                                     <img src="/images/promo-box/promo_logo.png" alt="">
                                 </div>
                                 <div class="text-center">
                                     <div class="promo_txt">
-                                        <p class="text-thin">Отправьте заявку на расчет</p>
+                                        <p class="text-thin">Отправить заявку на доступ</p>
                                     </div>
-                                    <a class="btn btn-promo btn-long popup-form" href="#request_access">
+                                    <a class="btn_green_sm btn-long popup-form" href="#request_access">
                                         <!--Запросить расчет-->
                                         Запросить доступ
                                     </a>
                                 </div>
                             </div>
+
                         </section>
+                        <!-- new 02.04.19 -->
+                        <a href="http://demo.task-on.com/?utm_source=task-oncom&utm_medium=cpc&utm_campaign=docprogrammer&utm_term=demo" target="_blank" class="btn_info_box margin-top-1x"><span>Демо-доступ к платформе TaskOn 2</span></a>             
+                        <!-- new end 02.04.19 -->
                     </aside>
                 </div>
             </div>
@@ -212,4 +230,4 @@ $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Пр
     </div>
 </div>
 <?php echo $this->render('@app/views/layouts/footer') ?>
-<?php echo $this->render('_request_access') ?>
+<?php echo $this->render('_request_access') ?>
\ No newline at end of file

common/modules/faq/assets/GeneratorAsset.php

@@ -6,19 +6,33 @@ use yii\web\AssetBundle;
 
 class GeneratorAsset extends AssetBundle
 {
-    public $sourcePath = '@common/modules/faq/assets/src';
 
+    public $sourcePath = '@common/modules/faq/assets/src';
     public $css = [
         'css/generator.css',
         'css/style.css',
         'css/responsive.css',
+        //
+        'css/fonts.css',
+        'css/faq.css',
+        "css/editormd.css",
+        "css/vendor.min.css",
+        "css/styles.css",
+        "css/setup_recomends.css",
+        "/plugins/tooltipster-master/tooltipster.css",
     ];
     public $js = [
         'js/generator.js',
+        //
+        'js/faq.js',
+        'js/owl.js',
+        'js/accordion.js',
+        '/plugins/tooltipster-master/jquery.tooltipster.js',
     ];
     public $depends = [
         'yii\web\JqueryAsset',
         'yii\bootstrap\BootstrapAsset',
 //        'backend\assets\AppAsset'
     ];
+
 }

common/modules/faq/assets/src/css/faq.css

+.faq_sec ol {
+    list-style: none;
+}
+.faq_sec img {
+    max-width: 100%;
+}
+.faq_sec p img ,
+.faq_sec li img {
+    margin-top: 20px;
+    margin-bottom: 20px
+}
\ No newline at end of file

common/modules/faq/assets/src/css/fonts.css

+@font-face {
+  font-family: "RobotoRegular";
+  src: url("../fonts/RobotoRegular/RobotoRegular.eot");
+  src: url("../fonts/RobotoRegular/RobotoRegular.eot@") format("embedded-opentype"), url("../fonts/RobotoRegular/RobotoRegular.woff") format("woff"), url("../fonts/RobotoRegular/RobotoRegular.ttf") format("truetype");
+  font-style: normal;
+  font-weight: normal;
+}
+@font-face {
+  font-family: "RobotoLight";
+  src: url("../fonts/RobotoLight/RobotoLight.eot");
+  src: url("../fonts/RobotoLight/RobotoLight.eot@") format("embedded-opentype"), url("../fonts/RobotoLight/RobotoLight.woff") format("woff"), url("../fonts/RobotoLight/RobotoLight.ttf") format("truetype");
+  font-style: normal;
+  font-weight: normal;
+}
+@font-face {
+  font-family: "RobotoMedium";
+  src: url("../fonts/RobotoMedium/RobotoMedium.eot");
+  src: url("../fonts/RobotoMedium/RobotoMedium.eot@") format("embedded-opentype"), url("../fonts/RobotoMedium/RobotoMedium.woff") format("woff"), url("../fonts/RobotoMedium/RobotoMedium.ttf") format("truetype");
+  font-style: normal;
+  font-weight: normal;
+}
+@font-face {
+  font-family: "RobotoBold";
+  src: url("../fonts/RobotoBold/RobotoBold.eot");
+  src: url("../fonts/RobotoBold/RobotoBold.eot@") format("embedded-opentype"), url("../fonts/RobotoBold/RobotoBold.woff") format("woff"), url("../fonts/RobotoBold/RobotoBold.ttf") format("truetype");
+  font-style: normal;
+  font-weight: normal;
+}