Merge branch 't_3031'

3031O

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/editormd.js

@@ -3520,7 +3520,7 @@
     editormd.firstUpperCase = editormd.ucfirst = firstUpperCase;
 
     editormd.urls = {
-        atLinkBase: "https://github.com/"
+        atLinkBase: "https://task-on.com/"
     };
 
     editormd.regexs = {
@@ -3758,7 +3758,9 @@
 
             markdownToC.push(toc);
 
-            var headingHTML = "<h" + level + " id=\"h" + level + "-" + this.options.headerPrefix + id + "\">";
+            var headingHTML = "<h" + level 
+//                    + " id=\"h" + level + "-" + this.options.headerPrefix + id + "\""
+                    +">";
 
             headingHTML += "<a name=\"" + text + "\" class=\"reference-link\"></a>";
             headingHTML += "<span class=\"header-link octicon octicon-link\"></span>";

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

@@ -14,7 +14,7 @@ $(function ()
         $(this).html(listOfImages.join('')).removeClass('owl-carousel-need-replace hidden');
     })
 
-    $('.container_documentation .container_documentation_right').find('img:not(".container_documentation_owl_img")').click(function ()
+    $('.container_documentation .container_documentation_right').find('img:not(".container_documentation_owl_img")').addClass('image-popuped').click(function ()
     {
         $.magnificPopup.open({
             items: {

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/views/page/view.php

@@ -115,17 +115,17 @@ $this->registerMetaTag(['property' => 'og:site_name', 'content' => 'Арт Пр
     <!-- Off-Canvas Wrapper-->
     <div class="offcanvas-wrapper" id="box1">
         <!-- Page Content-->
-        <div class="container container_documentation padding-bottom-3x mb-2">
+        <div class="container padding-bottom-3x mb-2">
             <div class="row"> 
                 <!-- Content-->
-                <div class="col-xl-8 col-lg-7 order-lg-2 container_documentation_right">
+                <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 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) ?>	
@@ -174,7 +174,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-->