Просмотр исходного кода

Merge branch 'master' of https://github.com/unaio/una

AntonLV 3 лет назад
Родитель
Сommit
3401de7452

+ 35 - 0
inc/js/editor.quill.js

@@ -91,6 +91,41 @@ function bx_editor_init(oEditor, oParams){
         
         var Embed = Quill.import('blots/embed');
         
+        const BaseLink = Quill.import("formats/link");
+        class Link extends BaseLink {
+            format(name, value) {
+                if (["href", "target"].indexOf(name) > -1) {
+                    if (value) {
+                        this.domNode.setAttribute(name, value);
+                    } else {
+                        this.domNode.removeAttribute(name);
+                    }
+                } else {
+                    super.format(name, value);
+                    if (name == 'link'){
+                         if (!value.startsWith(oParams.root_url) && (value.startsWith('http://') || value.startsWith('https://'))){
+                            this.domNode.setAttribute("target", "_blank");  
+                        }
+                        else{
+                            this.domNode.removeAttribute('target');
+                        }
+                    }
+                }
+            }
+            static create(value) {
+                const node = super.create(value);
+                node.setAttribute("href", this.sanitize(value));
+                if (!value.startsWith(oParams.root_url) && (value.startsWith('http://') || value.startsWith('https://'))){
+                    node.setAttribute("target", "_blank");  
+                }
+                else{
+                    node.removeAttribute('target');
+                }
+                return node;
+            }
+        }
+        Quill.register(Link, true);
+        
         class MenthionLink extends Embed {
             static create(value) {
                 let node = super.create(value);

+ 2 - 2
modules/base/groups/template/cover_block.html

@@ -18,10 +18,10 @@
                 <div class="bx-base-pofile-cover-user relative flex flex-col flex-colmt-6 pt-6 sm:pb-1">
                     <div class="bx-base-profile-cover-title-bages min-w-0 flex-1 mb-4">
                         <bx_if:show_title_as_tag>
-                            <h1 class="bx-def-unit-info text-4xl font-bold text-gray-900 dark:text-gray-50 text-center sm:truncate">__title__</h1>
+                            <h1 class="bx-def-unit-info text-2xl font-bold text-gray-900 dark:text-gray-50 text-center sm:truncate">__title__</h1>
                         </bx_if:show_title_as_tag>
                         <bx_if:show_title_as_text>
-                            <div class="bx-def-unit-info text-4xl font-bold text-gray-900 dark:text-gray-50 text-center sm:truncate">__title__</div>
+                            <div class="bx-def-unit-info text-2xl font-bold text-gray-900 dark:text-gray-50 text-center sm:truncate">__title__</div>
                         </bx_if:show_title_as_text>
                         <div class="bx-base-profile-cover-meta-holder">
                             <div class="bx-base-profile-cover-meta flex flex-row flex-wrap justify-center mt-6 md:mt-2 -ml-1  text-base font-medium">__meta__</div>

+ 0 - 2
modules/base/profile/classes/BxBaseModProfileTemplate.php

@@ -521,8 +521,6 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
         ];
         
         $bShowClickable = !isset($aParams['show_clickable']) || $aParams['show_clickable'] === true; //--- Is available for UseAsBlock appearance only.
-        if ($sCoverTweak != '')
-            $bShowClickable = false;
         
         if($bUseAsBlock && $bShowClickable)
             $sClass .= ' bx-clickable';

+ 2 - 2
modules/boonex/artificer/data/template/mod_groups/cover_block.html

@@ -15,10 +15,10 @@
                 <div class="bx-base-pofile-cover-user relative flex flex-col flex-colmt-6 pt-6 sm:pb-1">
                     <div class="bx-base-profile-cover-title-bages min-w-0 flex-1 mb-4">
                         <bx_if:show_title_as_tag>
-                            <h1 class="bx-def-unit-info text-4xl font-bold text-gray-900 dark:text-gray-50 text-center sm:truncate">__title__</h1>
+                            <h1 class="bx-def-unit-info text-2xl font-bold text-gray-900 dark:text-gray-50 text-center sm:truncate">__title__</h1>
                         </bx_if:show_title_as_tag>
                         <bx_if:show_title_as_text>
-                            <div class="bx-def-unit-info text-4xl font-bold text-gray-900 dark:text-gray-50 text-center sm:truncate">__title__</div>
+                            <div class="bx-def-unit-info text-2xl font-bold text-gray-900 dark:text-gray-50 text-center sm:truncate">__title__</div>
                         </bx_if:show_title_as_text>
                         <div class="bx-base-profile-cover-meta-holder">
                             <div class="bx-base-profile-cover-meta flex flex-row flex-wrap justify-center mt-6 md:mt-2 -ml-1  text-base font-medium">__meta__</div>

+ 2 - 2
modules/boonex/artificer/data/template/mod_profile/cover_block.html

@@ -32,10 +32,10 @@
                 <div class="bx-base-pofile-cover-user relative flex flex-col flex-colmt-6 pt-6 sm:pb-1">
                     <div class="bx-base-profile-cover-title-bages min-w-0 flex-1 mb-4">
                         <bx_if:show_title_as_tag>
-                            <h1 class="bx-def-unit-info text-4xl font-bold text-gray-900 dark:text-gray-50 text-center sm:truncate">__title__</h1>
+                            <h1 class="bx-def-unit-info text-2xl font-bold text-gray-900 dark:text-gray-50 text-center sm:truncate">__title__</h1>
                         </bx_if:show_title_as_tag>
                         <bx_if:show_title_as_text>
-                            <div class="bx-def-unit-info text-4xl font-bold text-gray-900 dark:text-gray-50 text-center sm:truncate">__title__</div>
+                            <div class="bx-def-unit-info text-2xl font-bold text-gray-900 dark:text-gray-50 text-center sm:truncate">__title__</div>
                         </bx_if:show_title_as_text>
                         <div class="bx-base-profile-cover-meta-holder">
                             <div class="bx-base-profile-cover-meta flex flex-row flex-wrap justify-center mt-6 md:mt-2 -ml-1  text-base font-medium">__meta__</div>

+ 1 - 1
template/css/uploaders.css

@@ -26,7 +26,6 @@
     flex-wrap: wrap;
     justify-content: flex-start;
     grid-gap: 0.5rem;
-    margin-bottom: 0.5rem;
 }
 .bx-base-general-icon-wrapper{
     position: relative;
@@ -112,6 +111,7 @@
     border:none;
     margin:0;
     padding:0;
+    float: right;
 }
 
 .border-dashed {