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

inc/js/classes/BxDolUploader.js

@@ -244,7 +244,6 @@ BxDolUploaderBase.prototype._clearErrors = function () {
 }
 
 BxDolUploaderBase.prototype._showError = function (s, bAppend) {
-    console.log('#' + this._sPopupContainerId + ' #' + this._sErrorsContainerId);
     if (s == undefined || !s.length)
         return;
     if (!bAppend)
@@ -506,7 +505,7 @@ function BxDolUploaderHTML5 (sUploaderObject, sStorageObject, sUniqId, options)
                 oProgress =  $('#' + $this._sProgressContainerId);
                 
                 if (oProgress.parents('form').find('.uploader_progress').length > 0){
-                    oProgress = oProgress.parents('form').find('.uploader_progress');
+                    oProgress = oProgress.parents('.bx-db-container').find('.uploader_progress');
                 }
                 if (iProgress == 100){
                     oProgress.hide();
@@ -1022,7 +1021,7 @@ function BxDolImageTweak (unique_id, action_url, content_id, field, js_object, a
     this._sJsObject = js_object;
     this._bAllowTweak = allow_tweak;
     this._oContainerButtons = $('.bx-image-edit-buttons-' + unique_id);
-    
+    this._oContainerButtons.removeClass('hidden');
     $("#bx-form-input-files-" + this._sUniqueId + "-upload-result").bind( "contentchange", function(){ 
         $this.uploadComplete($(this));
     });

modules/base/general/classes/BxBaseModGeneralTemplate.php

@@ -699,7 +699,6 @@ class BxBaseModGeneralTemplate extends BxDolModuleTemplate
         $sJsName = '';
         foreach ($aUploaders as $sUploaderObject) {
             $oUploader = BxDolUploader::getObjectInstance($sUploaderObject, $sStorage, $sUniqId, $this);
-
             $sGhostTemplate = '{file_id}';
 
             $aParamsJs = array_merge($oUploader->getUploaderJsParams(), 
@@ -710,7 +709,7 @@ class BxBaseModGeneralTemplate extends BxDolModuleTemplate
                     'is_init_reordering' => 0
                 ]
             );
-            $sUploadersJs .= $oUploader->getUploaderJs($sGhostTemplate, false, $aParamsJs, true);
+            $sUploadersJs .= $oUploader->getUploaderJs($sGhostTemplate, false, $aParamsJs);
             $sJsName = $oUploader->getNameJsInstanceUploader();
         }
 
@@ -721,6 +720,8 @@ class BxBaseModGeneralTemplate extends BxDolModuleTemplate
             'button_title' => '',
             'attrs' => "class='hidden'"
         ];
+        
+        $this->addJs(['BxDolUploader.js']);
 
         $sAddCode = $this->parseHtmlByName('image_tweak.html', [
             'id' => $aData['id'],

modules/base/general/template/image_tweak.html

@@ -1,4 +1,4 @@
-<div class="bx-image-edit-buttons __image_exists__ bx-image-edit-buttons-__unique_id__">
+<div class="bx-image-edit-buttons __image_exists__ bx-image-edit-buttons-__unique_id__ hidden">
     <a href="javascript:" class="bx-btn bx-btn-small bx-image-edit-buttons-edit hidden" title="<bx_text:_sys_uploader_image_reposition />" onclick="oBxDolImageTweak__unique_id__.changePosition()"><i class="sys-icon arrows-alt"></i></a>
     <a href="javascript:" class="bx-btn bx-btn-small bx-image-edit-buttons-save hidden" title="<bx_text:_sys_uploader_image_reposition_save />" onclick="oBxDolImageTweak__unique_id__.savePosition()"><i class="sys-icon check"></i></a>
     <a href="javascript:" class="bx-btn bx-btn-small bx-image-edit-buttons-cancel hidden" title="<bx_text:_sys_uploader_image_reposition_cancel />" onclick="oBxDolImageTweak__unique_id__.cancelPosition()"><i class="sys-icon times"></i></a>
@@ -8,10 +8,7 @@
 <div class="hidden">
     <div id="bx-form-input-files-__unique_id__-upload-result"></div>
 </div>
-
 __uploader_js__
 <script> 
-    $( document).ready(function() {
-        oBxDolImageTweak__unique_id__ = new BxDolImageTweak('__unique_id__', '__action_url__', '__id__', '__field__', '__js_object__', __allow_tweak__);
-    });
+    oBxDolImageTweak__unique_id__ = new BxDolImageTweak('__unique_id__', '__action_url__', '__id__', '__field__', '__js_object__', __allow_tweak__);
 </script>

modules/base/groups/template/cover_block.html

@@ -38,7 +38,5 @@
             </div>
         </div>
     </div>
-    __cover_popup__
-    __picture_popup__
 </div>
 __additional_code__

modules/base/profile/template/cover_block.html

@@ -42,7 +42,5 @@
             </div>
         </div>
     </div>
-    __cover_popup__
-    __picture_popup__
 </div>
 __additional_code__

modules/base/text/classes/BxBaseModTextTemplate.php

@@ -645,7 +645,7 @@ class BxBaseModTextTemplate extends BxBaseModGeneralTemplate
 
         $sImageTweak = '';
         $sUniqIdImage = genRndPwd (8, false);
-        if ($bIsAllowEditPicture && empty($sAddCode)){
+        if ($bIsAllowEditPicture && empty($sAddCode) && isset($CNF['FIELD_THUMB_POSITION'])){
             $sImageTweak = $this->_prepareImage($aData, $sUniqIdImage, $CNF['OBJECT_UPLOADERS'], $CNF['OBJECT_STORAGE'], $CNF['FIELD_THUMB'], true);
         }
 

modules/boonex/artificer/data/template/mod_profile/cover_block.html

@@ -50,7 +50,5 @@
             </div>
         </div>
     </div>
-    __cover_popup__
-    __picture_popup__
 </div>
 __additional_code__

modules/boonex/files/classes/BxFilesSearchResult.php

@@ -414,15 +414,27 @@ class BxFilesSearchResult extends BxBaseModTextSearchResult
         if ($bUploadAllowed) {
             $sUniqId = genRndPwd (8, false);
             $oUploader = BxDolUploader::getObjectInstance('bx_files_html5', $this->oModule->_oConfig->CNF['OBJECT_STORAGE'], $sUniqId, $this->oModule->_oTemplate);
-
             $iMaxNestingLevel = intval(getParam($this->oModule->_oConfig->CNF['PARAM_MAX_NESTING_LEVEL']));
-            $aUploadButtonParams = [
-                'js_object' => $sJsObject,
-                'uploader_code' => $oUploader->getUploaderJs('', true, [
+            
+            $aParamsJs = array_merge($oUploader->getUploaderJsParams(), 
+                [
+                    'content_id' => 0,
                     'storage_private' => '0',
+                    'acceptedFiles' => '',
+                    'multiple' => 1,
                     'images_transcoder' => 'bx_files_preview',
+                ]
+            );
+            
+            $aParamsBtn = [
                     'content_id' => 0,
-                ], true),
+                    'storage_private' => '0',
+                    'button_template' => 'uploader_button_html5_attach.html'
+            ];
+            
+            $aUploadButtonParams = [
+                'js_object' => $sJsObject,
+                'uploader_code' => $oUploader->getUploaderButton($aParamsBtn) . $oUploader->getUploaderJs('', true, $aParamsJs, true),
                 'uploader_js_object' => $oUploader->getNameJsInstanceUploader(),
                 'uploader_click_handler' => $oUploader->getNameJsInstanceUploader() . '.showUploaderForm();',
                 'bx_if:create_folder_allowed' => [

modules/boonex/files/template/files_browser_toolbar.html

@@ -58,6 +58,11 @@
         </bx_repeat:bulk_actions>
     </div>
 </div>
+<div class="hidden uploader_progress bx-def-padding-top">
+    <div class="w-full bg-gray-200 rounded-full h-1 dark:bg-gray-700">
+        <div class="bg-blue-600 h-1 rounded-full progress_line" style="width: 0%"></div>
+    </div>
+</div>
 
 <div class="bx-files-toolbar-spacer"></div>
 
@@ -70,4 +75,4 @@
 </div>
 </bx_if:select_all_checkbox>
 
-__js_code__
+__js_code__

modules/boonex/forum/classes/BxForumConfig.php

@@ -62,6 +62,7 @@ class BxForumConfig extends BxBaseModTextConfig
             'FIELD_FILE' => 'files',
             'FIELD_POLL' => 'polls',
             'FIELD_THUMB' => 'thumb',
+            'FIELD_THUMB_POSITION' => 'thumb_data',
             'FIELD_ATTACHMENTS' => 'attachments',
             'FIELD_LINK' => 'link',
             'FIELD_VIEWS' => 'views',

modules/boonex/forum/install/sql/install.sql

@@ -7,6 +7,7 @@ CREATE TABLE IF NOT EXISTS `bx_forum_discussions` (
   `added` int(11) NOT NULL,
   `changed` int(11) NOT NULL,
   `thumb` int(11) NOT NULL,
+  `thumb_data` varchar(50) NOT NULL,  
   `title` varchar(255) NOT NULL,
   `cat` int(11) NOT NULL,
   `multicat` text NOT NULL,

modules/boonex/videos/classes/BxVideosFormEntry.php

@@ -287,7 +287,7 @@ class BxVideosFormEntry extends BxBaseModTextFormEntry
         if ($aInput['name'] == 'video_source' && $aInput['type'] == 'radio_set') {
             if (!is_array($aInput['attrs']))
                 $aInput['attrs'] = [];
-            $aInput['attrs']['onchange'] = $this->_oModule->_oConfig->getJsObject('embeds').'.changeVideoSource(this.value);';
+            $aInput['attrs']['onchange'] = $this->_oModule->_oConfig->getJsObject('embeds').'.changeVideoSource(this);';
             $sJsCode = '';
             if ($this->_bDynamicMode) {
                 $sJsCode .= $this->_oModule->_oTemplate->addJs('embeds.js', true);

modules/boonex/videos/js/embeds.js

@@ -22,13 +22,14 @@ function BxVideosEmbeds(oOptions) {
     this._sLastCodeChecked = '';
 }
 
-BxVideosEmbeds.prototype.changeVideoSource = function(sSource) {
+BxVideosEmbeds.prototype.changeVideoSource = function(oObj) {
+    sSource = $(oObj).val();
 	if (sSource == 'upload') {
-        $('#bx-form-element-videos').show();
-        $('#bx-form-element-video_embed').hide();
+        $(oObj).parents('form').find('#bx-form-element-videos').show();
+        $(oObj).parents('form').find('#bx-form-element-video_embed').hide();
     } else {
-	    $('#bx-form-element-videos').hide();
-        $('#bx-form-element-video_embed').show();
+	    $(oObj).parents('form').find('#bx-form-element-videos').hide();
+        $(oObj).parents('form').find('#bx-form-element-video_embed').show();
     }
 };
 

template/css/uploaders.css

@@ -18,6 +18,7 @@
     flex-direction: column;
     position: relative;
     min-width: 150px;
+    min-height: 40px;
 }
 
 .bx-form-input-files-result{

template/scripts/BxBaseUploaderHTML5.php

@@ -91,7 +91,7 @@ class BxBaseUploaderHTML5 extends BxDolUploader
                 'resize_method' => $iResizeWidth && $iResizeHeight ? "'contain'" : 'null',
             ]
         );
-        return $this->_oTemplate->parseHtmlByName($this->_sButtonTemplate, $aParams);
+        return $this->_oTemplate->parseHtmlByName(isset($aParams['button_template']) ? $aParams['button_template'] : $this->_sButtonTemplate, $aParams);
     }
 
     public function getUploaderJsParams(){