Răsfoiți Sursa

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

AntonLV 3 ani în urmă
părinte
comite
ca31ca4461
28 a modificat fișierele cu 136 adăugiri și 54 ștergeri
  1. 1 1
      inc/classes/BxDolForm.php
  2. 1 1
      inc/classes/BxDolUploader.php
  3. 2 0
      inc/js/classes/BxDolPage.js
  4. 8 3
      inc/js/classes/BxDolUploader.js
  5. 3 0
      inc/js/editor.quill.js
  6. 13 17
      inc/js/functions.js
  7. 3 0
      inc/utils.inc.php
  8. 3 2
      modules/base/groups/template/cover_block.html
  9. 13 6
      modules/base/profile/classes/BxBaseModProfileTemplate.php
  10. 1 1
      modules/base/profile/template/cover.html
  11. 7 5
      modules/base/profile/template/cover_block.html
  12. 41 0
      modules/boonex/artificer/data/template/mod_groups/cover_block.html
  13. 1 1
      modules/boonex/artificer/data/template/mod_profile/cover.html
  14. 8 6
      modules/boonex/artificer/data/template/mod_profile/cover_block.html
  15. 4 1
      modules/boonex/artificer/data/template/system/css/cover.css
  16. 1 1
      modules/boonex/decorous/data/template/bx_organizations/cover.html
  17. 1 1
      modules/boonex/decorous/data/template/bx_persons/cover.html
  18. 1 0
      modules/boonex/files/template/form_ghost_template_upload.html
  19. 2 0
      modules/boonex/forum/template/css/carusel.css
  20. 2 2
      modules/boonex/forum/template/entry-preview.html
  21. 1 1
      modules/boonex/groups/install/sql/enable.sql
  22. 1 1
      modules/boonex/timeline/template/type_post.html
  23. 11 0
      plugins_public/tailwind/css/tailwind.css
  24. 0 0
      plugins_public/tailwind/css/tailwind.min.css
  25. 4 1
      template/css/cover.css
  26. 1 1
      template/css/editor.quill.css
  27. 1 1
      template/layout_bar_content_bar.html
  28. 1 1
      template/layout_top_area_bar_content_bar.html

+ 1 - 1
inc/classes/BxDolForm.php

@@ -1647,7 +1647,7 @@ class BxDolFormCheckerHelper
         $s = str_replace('T', ' ', $s);
         $s = str_replace('Z', ':00', $s);
 
-        return self::checkPreg ($s, '#^\d+\-\d+\-\d+[\sT]{1}\d+:\d+[:\d+]$#');
+        return self::checkPreg ($s, '#^\d+\-\d+\-\d+[\sT]{1}\d+:\d+(:\d+)?(\+\d+:\d+)?$#');
     }
     static public function checkPreg ($s, $r)
     {

+ 1 - 1
inc/classes/BxDolUploader.php

@@ -488,7 +488,7 @@ abstract class BxDolUploader extends BxDolFactory
         $this->_sUploadErrorMessages = '';
     }
 
-    protected function appendUploadErrorMessage ($s)
+    public function appendUploadErrorMessage ($s)
     {
         $this->_sUploadErrorMessages .= ($this->_sUploadErrorMessages ? "\n" : '') . $s;
     }

+ 2 - 0
inc/js/classes/BxDolPage.js

@@ -32,6 +32,8 @@ BxDolPage.prototype.init = function() {
         $(this).html($(this).attr('source'));
         $.getJSON(sUrlRoot + '/embed.php?', {a: 'get_link', l: $(this).attr('source')}, $this.embededCallback($(this)));
     });
+    
+    bx_process_links();
 };
 
 BxDolPage.prototype.embededCallback = function(item)

+ 8 - 3
inc/js/classes/BxDolUploader.js

@@ -9,6 +9,8 @@
 /**
  * Simple Uploader js class
  */
+
+
 function BxDolUploaderBase (sUploaderObject, sStorageObject, sUniqId, options) {
 
     this.init(sUploaderObject, sStorageObject, sUniqId, options);
@@ -463,6 +465,7 @@ function BxDolUploaderHTML5 (sUploaderObject, sStorageObject, sUniqId, options)
         var $this = this;
         var _options = {
             allowProcess: false,
+            allowPaste: false,
             allowRevert: false,
             allowRemove: false,
             imagePreviewHeight: 100,
@@ -577,6 +580,8 @@ function BxDolUploaderHTML5 (sUploaderObject, sStorageObject, sUniqId, options)
             _options.acceptedFileTypes = aAcceptableFiles;
         }
         
+      
+        
         if (o.resizeWidth || o.resizeHeight){
             _options.allowImageResize = true;
             _options.imageResizeTargetWidth = o.resizeWidth;
@@ -597,12 +602,12 @@ function BxDolUploaderHTML5 (sUploaderObject, sStorageObject, sUniqId, options)
             FilePondPluginImageResize,
             
         );
-
         this._uploader = FilePond.create(
             document.querySelector('#' + this._sDivId),
             $.extend({}, _options, o)
         );    
-        this.initPasteEditor();
+        // need to be activated if catch paste needed
+        //this.initPasteEditor();
     }
 
     this.onUploadCompleted = function (sErrorMsg) {        
@@ -1055,7 +1060,7 @@ BxDolImageTweak.prototype.changePosition = function (){
     $(".bx-image-edit-source-" + $this._sUniqueId).parent().append("<div class='bx-image-edit-move-info'><i class='sys-icon sys-colored arrows-alt '></i>" + _t('_sys_uploader_image_reposition_info') + "</div>");
     $(".bx-image-edit-source-" + $this._sUniqueId).addClass('bx-image-edit-move').bind('dragover', function(e){
         $(".bx-image-edit-source-" + $this._sUniqueId).parent().find('.bx-image-edit-move-info').remove();
-        $(".bx-image-edit-source-" + $this._sUniqueId).css('background-position', " 0px " + e.offsetY/500*100 + '%');
+        $(".bx-image-edit-source-" + $this._sUniqueId).css('background-position', " 0px " + e.offsetY / $(e.currentTarget).height() * 100 + '%');
     });
     with ($this._oContainerButtons) {
         find('.bx-image-edit-buttons-cancel').removeClass('hidden');

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

@@ -246,6 +246,9 @@ function bx_editor_init(oEditor, oParams){
     var oConfig = {              
          theme: oParams.skin,
          modules: {
+            clipboard: {
+                matchVisual: false
+            },
             syntax: true, 
             imageResize: {},
             toolbar: oParams.toolbar,

+ 13 - 17
inc/js/functions.js

@@ -956,17 +956,7 @@ function bx_time(sLang, isAutoupdate, sRootSel) {
         if ('undefined' !== typeof(eElement)) {
             // process js time
             eElement.bxTime();
-            
-            // process links in container
-            $('.bx-lnk-cnt .bx-lnk-src:not(.bx-inited)').each(function() {
-                $(this).addClass('bx-inited');
-                var sUrl = $(this).prop('href');
-                $(this).parents('.bx-lnk-cnt').first().addClass('cursor-pointer').click(function(oEvent){
-                    if ($(oEvent.target).closest('a').length == 0 && $(oEvent.target).closest('button').length == 0 && $(oEvent.target).closest('form').length == 0 &&  $(oEvent.target).closest('input').length == 0){
-                        location.href = sUrl;
-                    }
-                });
-            });
+            bx_process_links();
             
             // process web forms
             if ($.isFunction($.fn.addWebForms))
@@ -1422,15 +1412,21 @@ function bx_regexp_escape(s)
         .replace(/[|\\{}()[\]^$+*?.]/mg, '\\$&')
         .replace(/-/mg, '\\x2d');
 }
-
-function bx_click_area(link, event)
+function bx_process_links()
 {
-    var oEl = $(event.srcElement);
-    if (oEl.parents('A').length == 0){
-        location.href = link;
-    }
+    // process links in container
+    $('.bx-lnk-cnt .bx-lnk-src:not(.bx-inited)').each(function() {
+        $(this).addClass('bx-inited');
+        var sUrl = $(this).prop('href');
+        $(this).parents('.bx-lnk-cnt').first().addClass('cursor-pointer').click(function(oEvent){
+            if ($(oEvent.target).closest('a').length == 0 && $(oEvent.target).closest('button').length == 0 && $(oEvent.target).closest('form').length == 0 &&  $(oEvent.target).closest('input').length == 0){
+                location.href = sUrl;
+            }
+        });
+    });
 }
 
+
 function bx_redirect_for_external_links (e)
 {
     if ('undefined' === typeof(aDolOptions.sys_confirmation_before_redirect) || 'on' !== aDolOptions.sys_confirmation_before_redirect)

+ 3 - 0
inc/utils.inc.php

@@ -231,6 +231,9 @@ function bx_process_output ($mixedData, $iDataType = BX_DATA_TEXT, $mixedParams
 
     case BX_DATA_HTML:
         $s = bx_linkify_html($mixedData, 'class="' . BX_DOL_LINK_CLASS . '"');
+            
+        // remove empty tags from html content https://github.com/unaio/una/issues/4203
+        $s = preg_replace("/(((<\w+>)+[ \n(<br>)]*(<\/\w+>)+)+)|<br>/", '', $s);    
         return $mixedParams && is_array($mixedParams) && in_array('no_process_macro', $mixedParams) ? $s : bx_process_macros($s);
     case BX_DATA_TEXT_MULTILINE:
         $s = $mixedData;

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

@@ -8,9 +8,9 @@
                         <div class="absolute top-6 -right-1/4 w-2/3 h-2/3 bg-green-700 filter blur-3xl z-0 opacity-50 animate-goo"></div>
                     </div>
                     <div class="bx-base-pofile-cover-image relative h-64 lg:h-40 max-w-7xl mx-auto opacity-100 __add_class__">
-                        <a class="bx-base-pofile-cover-image box-border absolute h-full w-full" href="__cover_href__" >
+                        <p class="bx-base-pofile-cover-image box-border absolute h-full w-full" >
                             <img class="bx-base-pofile-cover-image h-64 mx-auto w-full object-cover bg-cover lg:h-40 rounded-t z-10 __img_class__ bx-image-edit-source-__unique_id__" style="background-image:url(__cover_url__);__cover_settins__" src="<bx_icon_url:spacer.gif />" />
-                        </a>
+                        </p>
                     </div>
                 </div>
             </bx_if:show_cover>
@@ -36,6 +36,7 @@
                 </div>
                 __show_data__
             </div>
+            __cover_tweak__
         </div>
     </div>
 </div>

+ 13 - 6
modules/base/profile/classes/BxBaseModProfileTemplate.php

@@ -275,6 +275,8 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
         $aTmplVars = $this->prepareCover($aData, array_merge($aParams, [
             'use_as_block' => true
         ]));
+    
+        $this->addCss(array('cover.css'));
         
         return $this->parseHtmlByName('cover_block.html', $aTmplVars);
     }
@@ -419,29 +421,34 @@ class BxBaseModProfileTemplate extends BxBaseModGeneralTemplate
 
             $aTmplVarsShowAvatar = array(
                 'add_class' => $sAddClassPicture,
-                'letter' => mb_substr($sTitle, 0, 1),
+                'letter' => mb_strtoupper(mb_substr($sTitle, 0, 1)),
                 'img_class' => $sAddClassPicture != '' ? 'bx-media-editable-src' : '',
                 'ava_url' => $sUrlAvatar,
                 'color' => implode(', ', BxDolTemplate::getColorCode($iProfile, 1.0)),
                 
                 'bx_if:show_ava_image' => array(
                     'condition' => $bUrlAvatar,
-                    'content' => array()
+                    'content' => []
                 ),
                 'bx_if:show_ava_letter' => array(
                     'condition' => !$bUrlAvatar,
-                    'content' => array()
+                    'content' => []
                 ),
                 'bx_if:show_online' => array(
                     'condition' => $oProfile->isOnline(),
-                    'content' => array()
+                    'content' => []
+                ),
+                'bx_if:is_avatar' => array(
+                    'condition' => $bUrlAvatar,
+                    'content' => [
+                        'picture_popup_id' => $sPicturePopupId,
+                        'picture_url' => $sUrlPicture,
+                    ]
                 ),
                 'picture_avatar_url' => $bUrlAvatar ? $sUrlAvatar : $this->getImageUrl('no-picture-preview.png'),
-                'picture_popup_id' => $sPicturePopupId,
                 'unique_id' => $sUniqIdPicture,
                 'picture_tweak' => $sPictureTweak, 
                 'cover_settins' => isset($CNF['FIELD_PICTURE_POSITION']) ? $this->_getImageSettings($aData[$CNF['FIELD_PICTURE_POSITION']]) : '',
-                'picture_url' => $sUrlPicture,
                 'picture_href' => !$aData[$CNF['FIELD_PICTURE']] && CHECK_ACTION_RESULT_ALLOWED === $oModule->checkAllowedEdit($aData) ? $sUrlPictureChange : 'javascript:void(0);',
             );
             

+ 1 - 1
modules/base/profile/template/cover.html

@@ -11,7 +11,7 @@
                 <div class="bx-base-pofile-ci-cnt bx-def-padding-leftright">
                     <bx_if:show_avatar>
                         <div class="bx-base-pofile-cover-thumb __add_class__">
-                            <a class="bx-base-pofile-cover-thumb" href="__picture_href__"  onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();">
+                            <a class="bx-base-pofile-cover-thumb" href="javascript:" <bx_if:is_avatar>onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();"</bx_if:is_avatar>>
                                 <img class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 __img_class__ bx-image-edit-source-__unique_id__" src="__ava_url__" <bx_if:show_ava_letter> style="display:none" </bx_if:show_ava_letter> />
                                 <p class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size flex items-center justify-center box-border m-0 rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 text-white font-bold text-5xl __img_class__-placeholder" style="background-color:rgba(__color__);<bx_if:show_ava_image>display:none</bx_if:show_ava_image>">__letter__</p>
                             </a>

+ 7 - 5
modules/base/profile/template/cover_block.html

@@ -1,11 +1,12 @@
 <div class="bx-base-profile-cover-block-wrapper">
     <div class="bx-base-pofile-cover-wrapper __class__ bx-def-centered bx-def-box-sizing">
-        <div class="bx-base-pofile-cover bx-def-cover-color-bg bx-def-box-sizing"<bx_if:show_clickable> onclick="bx_click_area('__content_url__', event)"</bx_if:show_clickable>>
+        <div class="bx-base-pofile-cover bx-def-cover-color-bg bx-def-box-sizing <bx_if:show_clickable>bx-lnk-cnt</bx_if:show_clickable>">
+            <a href="__content_url__" class="bx-lnk-src hidden"></a>
             <bx_if:show_cover>
                 <div class="bx-base-pofile-cover-image __add_class__">
-                    <a class="bx-base-pofile-cover-image bx-def-box-sizing flex justify-center items-center">
+                    <p class="bx-base-pofile-cover-image bx-def-box-sizing flex justify-center items-center">
                         <img class="bx-base-pofile-cover-image h-full object-cover bg-cover w-full __img_class__ bx-image-edit-source-__unique_id__" style="background-image:url(__cover_url__);__cover_settins__" src="<bx_icon_url:spacer.gif />"/>
-                    </a>
+                    </p>
                     
                 </div>
             </bx_if:show_cover>
@@ -13,13 +14,14 @@
                 <div class="bx-base-pofile-ci-cnt bx-def-padding-leftright">
                     <bx_if:show_avatar>
                         <div class="bx-base-pofile-cover-thumb __add_class__">
-                            <a class="bx-base-pofile-cover-thumb" href="__picture_href__" onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();">
-                                <img class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 __img_class__" src="__ava_url__" <bx_if:show_ava_letter> style="display:none" </bx_if:show_ava_letter> />
+                            <a class="bx-base-pofile-cover-thumb" href="javascript:" <bx_if:is_avatar>onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();"</bx_if:is_avatar>>
+                                <img class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 __img_class__ bx-image-edit-source-__unique_id__" src="__ava_url__" <bx_if:show_ava_letter> style="display:none" </bx_if:show_ava_letter> />
                                 <p class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size flex items-center justify-center box-border m-0 rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 text-white font-bold text-5xl __img_class__-placeholder" style="background-color:rgba(__color__);<bx_if:show_ava_image>display:none</bx_if:show_ava_image>" >__letter__</p>
                             </a>
                             <bx_if:show_online>
                                 <div class="bx-base-pofile-unit-online"></div>
                             </bx_if:show_online>
+                            __picture_tweak__
                         </div>
                     </bx_if:show_avatar>
                 </div>

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

@@ -0,0 +1,41 @@
+<div class="bx-base-profile-cover-block-wrapper">
+    <div class="bx-base-pofile-cover-wrapper __class__ relative bg-gradient-to-b from-gray-100 to-white dark:from-black dark:to-gray-900 rounded-md">
+        <div class="bx-base-pofile-cover relative <bx_if:show_clickable>bx-lnk-cnt</bx_if:show_clickable>">
+            <a href="__content_url__" class="bx-lnk-src hidden"></a>
+            <bx_if:show_cover>
+                <div class="bx-base-pofile-cover-image-wrp relative overflow-hidden">
+                    <div class="bx-base-pofile-cover-image relative h-64 lg:h-40 max-w-7xl mx-auto opacity-100 bg-gradient-to-b from-blue-400 to-blue-500 rounded-t-md __add_class__">
+                        <p class="bx-base-pofile-cover-image box-border absolute h-full w-full">
+                            <img class="bx-base-pofile-cover-image relative h-64 mx-auto w-full object-cover bg-cover lg:h-40 rounded-t-md z-10 __img_class__ bx-image-edit-source-__unique_id__" style="background-image:url(__cover_url__);__cover_settins__" src="<bx_icon_url:spacer.gif />" />
+                        </p>
+                    </div>
+                </div>
+            </bx_if:show_cover>
+            <div class="bx-base-pofile-cover-info relative mx-auto px-6">
+                <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>
+                        </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>
+                        </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>
+                        </div>
+                    </div>
+                    <div class="bx-base-pofile-cover-actions relative flex lg:flex-1 h-14 md:h-10 mb-4" onclick="event.stopPropagation();">__action_menu__</div>
+                    <bx_if:show_text>
+                        <div class="flex justify-between mb-4">
+                            <div class="font-normal text-sm lg:text-base text-gray-500 group-hover:text-gray-600 dark:text-gray-400 dark:group-hover:text-gray-300">__text__</div>
+                        </div>
+                    </bx_if:show_text>
+                </div>
+                __show_data__
+            </div>
+            __cover_tweak__
+        </div>
+    </div>
+    __picture_popup__
+</div>
+__additional_code__

+ 1 - 1
modules/boonex/artificer/data/template/mod_profile/cover.html

@@ -13,7 +13,7 @@
                 <div class="bx-base-pofile-ci-cnt relative flex flex-col -mt-24 lg:-mt-16 lg:flex-row lg:items-center">
                     <bx_if:show_avatar>
                         <div class="bx-base-pofile-cover-thumb bx-def-ava-big-size relative lg:absolute flex self-center lg:flex-none z-10 __add_class__">
-                            <a class="bx-base-pofile-cover-thumb hover:no-underline" href="__picture_href__" onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();">
+                            <a class="bx-base-pofile-cover-thumb hover:no-underline" href="javascript:" <bx_if:is_avatar>onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();"</bx_if:is_avatar>>
                                 <img class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 h-48 w-48 __img_class__ bx-image-edit-source-__unique_id__" src="__ava_url__"  <bx_if:show_ava_letter> style="display:none" </bx_if:show_ava_letter> />
                                 <p class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size flex items-center justify-center box-border m-0 rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 h-48 w-48 text-white font-bold text-5xl __img_class__-placeholder" style="background-color:rgba(__color__);<bx_if:show_ava_image>display:none</bx_if:show_ava_image>" >__letter__</p>
                             </a>

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

@@ -1,12 +1,13 @@
 <div class="bx-base-profile-cover-block-wrapper">
     <div class="bx-base-pofile-cover-wrapper __class__ relative bg-gradient-to-b from-gray-100 to-white dark:from-black dark:to-gray-900 rounded-md">
-        <div class="bx-base-pofile-cover relative"<bx_if:show_clickable> onclick="bx_click_area('__content_url__', event)"</bx_if:show_clickable>>
+        <div class="bx-base-pofile-cover relative <bx_if:show_clickable>bx-lnk-cnt</bx_if:show_clickable>">
+            <a href="__content_url__" class="bx-lnk-src hidden"></a>
             <bx_if:show_cover>
                 <div class="bx-base-pofile-cover-image-wrp relative overflow-hidden">
                     <div class="bx-base-pofile-cover-image relative h-64 lg:h-40 max-w-7xl mx-auto opacity-100 bg-gradient-to-b from-blue-400 to-blue-500 rounded-t-md __add_class__">
-                        <a class="bx-base-pofile-cover-image box-border absolute h-full w-full" href="__cover_href__" >
-                            <img class="bx-base-pofile-cover-image h-64 mx-auto w-full object-cover bg-cover lg:h-40 rounded-t-md z-10 __img_class__ bx-image-edit-source-__unique_id__" style="background-image:url(__cover_url__);__cover_settins__" src="<bx_icon_url:spacer.gif />" />
-                        </a>
+                        <p class="bx-base-pofile-cover-image box-border absolute h-full w-full">
+                            <img class="bx-base-pofile-cover-image relative h-64 mx-auto w-full object-cover bg-cover lg:h-40 rounded-t-md z-10 __img_class__ bx-image-edit-source-__unique_id__" style="background-image:url(__cover_url__);__cover_settins__" src="<bx_icon_url:spacer.gif />" />
+                        </p>
                     </div>
                 </div>
             </bx_if:show_cover>
@@ -14,13 +15,14 @@
                 <div class="bx-base-pofile-ci-cnt relative flex flex-col items-center -mt-24">
                     <bx_if:show_avatar>
                         <div class="bx-base-pofile-cover-thumb relative inline-flex justify-center __add_class__">
-                            <a class="bx-base-pofile-cover-thumb" href="__picture_href__" onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();">
-                                <img class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 h-48 w-48 lg:h-32 lg:w-32 __img_class__" src="__ava_url__"  <bx_if:show_ava_letter> style="display:none" </bx_if:show_ava_letter> />
+                            <a class="bx-base-pofile-cover-thumb" href="__picture_href__" href="javascript:" <bx_if:is_avatar>onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();"</bx_if:is_avatar>>
+                                <img class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 h-48 w-48 lg:h-32 lg:w-32 __img_class__ bx-image-edit-source-__unique_id__" src="__ava_url__"  <bx_if:show_ava_letter> style="display:none" </bx_if:show_ava_letter> />
                                 <p class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size flex items-center justify-center box-border m-0 rounded-full ring-4 mx-auto ring-white dark:ring-gray-900 h-48 w-48 lg:h-32 lg:w-32 text-white font-bold text-5xl __img_class__-placeholder" style="background-color:rgba(__color__);<bx_if:show_ava_image>display:none</bx_if:show_ava_image>" >__letter__</p>
                             </a>
                             <bx_if:show_online>
                                 <div class="bx-base-pofile-unit-online"></div>
                             </bx_if:show_online>
+                            __picture_tweak__
                         </div>
                     </bx_if:show_avatar>
                     <bx_if:show_avatar_placeholder>

+ 4 - 1
modules/boonex/artificer/data/template/system/css/cover.css

@@ -18,6 +18,7 @@ import url(../../../../../../../template/css/cover.css);
     position: absolute;
     left:1rem;
     top:1rem;
+    z-index: 100;
 }
 .bx-image-edit-buttons .bx-btn.bx-btn-small{
     padding: 0.375rem 0.5rem;
@@ -31,7 +32,9 @@ import url(../../../../../../../template/css/cover.css);
     top:auto;
 }
 .bx-image-edit-move{
-    cursor:move
+    cursor:move;
+    position: relative;
+    z-index: 99;
 }
 .bx-image-edit-move-info{
     display: flex;

+ 1 - 1
modules/boonex/decorous/data/template/bx_organizations/cover.html

@@ -10,7 +10,7 @@
             <div class="bx-base-pofile-cover-info">
                 <bx_if:show_avatar>
                     <div class="bx-base-pofile-cover-thumb bx-def-ava-big-size __add_class__">
-                        <a class="bx-base-pofile-cover-thumb" href="__picture_href__" onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();">
+                        <a class="bx-base-pofile-cover-thumb" href="javascript:" <bx_if:is_avatar>onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();"</bx_if:is_avatar>>
                             <img class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size __img_class__" src="__ava_url__" <bx_if:show_ava_letter> style="display:none" </bx_if:show_ava_letter> />
                             <p class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size bx-def-border __img_class__-placeholder" style="background-color:rgba(__color__);<bx_if:show_ava_image>display:none</bx_if:show_ava_image>">__letter__</p>
                         </a>

+ 1 - 1
modules/boonex/decorous/data/template/bx_persons/cover.html

@@ -12,7 +12,7 @@
             <div class="bx-base-pofile-cover-info">
                 <bx_if:show_avatar>
                     <div class="bx-base-pofile-cover-thumb bx-def-ava-big-size __add_class__">
-                        <a class="bx-base-pofile-cover-thumb" href="__picture_href__" onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();">
+                        <a class="bx-base-pofile-cover-thumb" href="javascript:" <bx_if:is_avatar>onclick="$('#__picture_popup_id__').dolPopupImage('__picture_url__', $(this).parent()); event.stopPropagation();"</bx_if:is_avatar>>
                             <img class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size __img_class__ bx-image-edit-source-__unique_id__" src="__ava_url__" <bx_if:show_ava_letter> style="display:none" </bx_if:show_ava_letter> />
                             <p class="bx-base-pofile-unit-thumb bx-def-ava-big bx-def-ava-big-size bx-def-border __img_class__-placeholder" style="background-color:rgba(__color__);<bx_if:show_ava_image>display:none</bx_if:show_ava_image>">__letter__</p>
                         </a>

+ 1 - 0
modules/boonex/files/template/form_ghost_template_upload.html

@@ -9,4 +9,5 @@
             <a class="bx-btn bx-btn-small mr-2" href="javascript:void(0);" title="<bx_text:_sys_txt_form_entry_input_picture_copy />" onclick="bx_copy_to_clipboard('{file_url}');"><i class="sys-icon copy"></i></a>
         </span>
     </div>
+    <input class="bx-def-font-inputs bx-form-input-text block w-full py-2 px-3 border border-gray-300 dark:border-gray-700 rounded-md shadow-sm bg-white dark:bg-gray-900 placeholder-gray-500 focus:outline-none focus:placeholder-gray-400 focus:ring-2 focus:text-gray-900 dark:focus:text-gray-100 focus:ring-blue-500 focus:border-opacity-70 focus:ring-opacity-20 focus:border-blue-500 text-sm text-gray-700 dark:text-gray-300 appearance-none" type="text" value="{file_title_attr}" name="title-{file_id}" />
 </div>

+ 2 - 0
modules/boonex/forum/template/css/carusel.css

@@ -72,6 +72,8 @@
     white-space: normal !important;
     width: 25% !important;
     scroll-snap-align: center;
+    padding-top: 1px !important;
+    padding-bottom: 1px !important;
 }
 .bx-layout-column-wide .unaca-t > div {
      width: 33.3% !important;

+ 2 - 2
modules/boonex/forum/template/entry-preview.html

@@ -1,11 +1,11 @@
-<div class="group block hover:bg-gray-50 dark:hover:bg-gray-700/20" onClick="bx_click_area('__url__', event)">
+<div class="group block hover:bg-gray-50 dark:hover:bg-gray-700/20 bx-lnk-cnt">
     <div class="p-4">
         <div class="min-w-0 flex sm:items-top justify-between align-top">
             <div class="pr-4 flex-1 grow">
                 <div class="flex flex-wrap space-y-2.5 px-0 items-start flex-col">                               
                     <div class=" flex text-lg flex-wrap  font-semibold text-gray-600 group-hover:text-gray-900 dark:text-gray-300 dark:group-hover:text-white">
                         <span class="leading-tight">                                    
-                            <a href="__url__">__title__</a>
+                            <a href="__url__" class="bx-lnk-src">__title__</a>
                                 <span class="mr-1 inline-flex align-middle items-center -space-x-1 overflow-hidden">__participants__</span>
                                 __badges__
                         </span>

+ 1 - 1
modules/boonex/groups/install/sql/enable.sql

@@ -554,7 +554,7 @@ INSERT INTO `sys_grid_actions` (`object`, `type`, `name`, `title`, `icon`, `conf
 
 -- GRID: invites
 INSERT INTO `sys_objects_grid` (`object`, `source_type`, `source`, `table`, `field_id`, `field_order`, `field_active`, `paginate_url`, `paginate_per_page`, `paginate_simple`, `paginate_get_start`, `paginate_get_per_page`, `filter_fields`, `filter_fields_translatable`, `filter_mode`, `sorting_fields`, `sorting_fields_translatable`, `visible_for_levels`, `responsive`, `override_class_name`, `override_class_file`) VALUES
-('bx_groups_invites', 'Sql', 'SELECT `bx_groups_invites`.`id`, `bx_groups_invites`.`invited_profile_id`, `bx_groups_invites`.`added`, `bx_groups_invites`.`author_profile_id` FROM `sys_profiles` AS `p` INNER JOIN `sys_accounts` AS `a` ON (`a`.`id` = `p`.`account_id`) INNER JOIN `bx_groups_invites` ON `bx_groups_invites`.`invited_profile_id` = `p`.`id` ', 'bx_groups_invites', 'id', 'bx_groups_invites`.`added', '', '', 10, NULL, 'start', '', 'name,email', '', 'auto', '', '', 2147483647, 0, 'BxGroupsGridInvites', 'modules/boonex/groups/classes/BxGroupsGridInvites.php');
+('bx_groups_invites', 'Sql', 'SELECT `bx_groups_invites`.`id`, `bx_groups_invites`.`invited_profile_id`, `bx_groups_invites`.`added`, `bx_groups_invites`.`author_profile_id` FROM `bx_groups_invites` INNER JOIN `sys_profiles` AS `p` ON `bx_groups_invites`.`invited_profile_id` = `p`.`id` INNER JOIN `sys_accounts` AS `a` ON (`a`.`id` = `p`.`account_id`) ', 'bx_groups_invites', 'id', 'bx_groups_invites`.`added', '', '', 10, NULL, 'start', '', 'name,email', '', 'auto', '', '', 2147483647, 0, 'BxGroupsGridInvites', 'modules/boonex/groups/classes/BxGroupsGridInvites.php');
 
 INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `params`, `order`) VALUES
 ('bx_groups_invites', 'name', '_sys_name', '33%', '', 10),

+ 1 - 1
modules/boonex/timeline/template/type_post.html

@@ -24,7 +24,7 @@
 </bx_if:show_files>
 <div class="__style_prefix__-item-text mt-3 md:mt-4 mx-3 md:mx-4">
     <bx_if:show_title>
-        <div class="__style_prefix__-title text-lg lg:text-xl font-semibold text-gray-700 dark:text-gray-300">__title__</div>
+        <div class="__style_prefix__-title mb-2 md:mb-4 text-lg lg:text-xl font-semibold text-gray-700 dark:text-gray-300">__title__</div>
     </bx_if:show_title>
     <bx_if:show_content>
         <div class="__style_prefix__-content bx-overflow-ready bx-def-vanilla-html bx-def-vh-sm relative max-w-none">__item_content__</div>

+ 11 - 0
plugins_public/tailwind/css/tailwind.css

@@ -32,9 +32,20 @@
         @apply prose dark:prose-invert;
         @apply prose-a:text-blue-500 prose-a:font-medium prose-a:no-underline hover:prose-a:underline visited:prose-a:text-purple-500;
     }
+    
     .bx-def-vanilla-html.bx-def-vh-sm {
         @apply prose-sm;
     }
+    
+    .bx-def-vanilla-html div > :where(:first-child):not(:where([class~="not-prose"] *)),
+    .bx-def-vanilla-html > :where(:first-child):not(:where([class~="not-prose"] *)){
+        margin-top: 0 !important;
+    }
+    
+    .bx-def-vanilla-html div > :where(:last-child):not(:where([class~="not-prose"] *)),
+    .bx-def-vanilla-html > :where(:last-child):not(:where([class~="not-prose"] *)) {
+        margin-bottom: 0 !important;
+    }
 
     .bx-artificer .bx-menthion-link {
         @apply font-normal text-blue-600 hover:text-blue-700 dark:text-blue-500 dark:hover:text-blue-600;

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
plugins_public/tailwind/css/tailwind.min.css


+ 4 - 1
template/css/cover.css

@@ -23,6 +23,7 @@
     position: absolute;
     left:1rem;
     top:1rem;
+    z-index: 100;
 }
 .bx-image-edit-buttons .bx-btn.bx-btn-small{
     padding: 0.375rem 0.5rem;
@@ -36,7 +37,9 @@
     top:auto;
 }
 .bx-image-edit-move{
-    cursor:move
+    cursor:move;
+    position: relative;
+    z-index: 99;
 }
 .bx-image-edit-move-info{
     display: flex;

+ 1 - 1
template/css/editor.quill.css

@@ -54,4 +54,4 @@
 .ql-editor ol li:not(.ql-direction-rtl), 
 .ql-editor ul li:not(.ql-direction-rtl){
     padding-left: 0.375em !important;
-}
+}

+ 1 - 1
template/layout_bar_content_bar.html

@@ -12,7 +12,7 @@
                     __cell_2__
                 </div>
             </main>
-            <aside class="bx-layout-col bx-layout-bcb-bar2 bx-layout-column-thin md:w-1/3" aria-label="Aside">
+            <aside class="bx-layout-col bx-layout-bcb-bar2 bx-layout-column-thin lg:w-1/3" aria-label="Aside">
                 <div class="bx-layout-cell" id="bx-layout-cell-3">
                     __cell_3__
                 </div>

+ 1 - 1
template/layout_top_area_bar_content_bar.html

@@ -13,7 +13,7 @@
                     __cell_3__
                 </div>
             </main>
-            <aside class="bx-layout-col bx-layout-bcb-bar2 bx-layout-column-thin md:w-1/3" aria-label="Aside">
+            <aside class="bx-layout-col bx-layout-bcb-bar2 bx-layout-column-thin lg:w-1/3" aria-label="Aside">
                 <div class="bx-layout-cell" id="bx-layout-cell-4">
                     __cell_4__
                 </div>

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff