#3998 - Minor fixes

inc/js/editor.quill.js

@@ -20,7 +20,6 @@ function bx_editor_init(oEditor, oParams){
             handlers: {
             'show-html': function() {
                  bx_alert('<textarea class="bx-def-font-inputs bx-form-input-textarea bx-form-input-html-quill-code" id="' + oParams.name + '_code">' + oEditor.container.firstChild.innerHTML + '</textarea>',function() {
-                     //console.log($('#'+oParams.name+'_code').val());
                      oEditor.container.firstChild.innerHTML = $('#'+oParams.name+'_code').val();
                  });
             },  
@@ -334,14 +333,6 @@ function bx_editor_init(oEditor, oParams){
     if (bEmptyToolbar)
         $(oParams.selector).next().hide();
 
-    oEditor.keyboard.addBinding({
-        key: ' ',
-        handler: function(range, context) {
-            bx_editor_on_space_enter (oEditor.container.firstChild.innerHTML, oParams.selector);
-            return true;
-        }
-    });
-    
     oEditor.clipboard.addMatcher (Node.TEXT_NODE, function (node, delta) {
         const Delta = Quill.import('delta')
         bx_editor_on_space_enter(node.data, oParams.selector, false);
@@ -363,14 +354,6 @@ function bx_editor_init(oEditor, oParams){
         });
     }
     
-    oEditor.keyboard.bindings[13].unshift({
-        key: 13,
-        handler: (range, context) => {
-            bx_editor_on_space_enter (oEditor.container.firstChild.innerHTML, oParams.selector)
-            return true;
-        }
-    });
-    
     oEditor.on('text-change', function(delta, oldDelta, source) {
         sVal = oEditor.container.firstChild.innerHTML;
         if(!oParams.empty_tags){
@@ -408,6 +391,7 @@ function bx_editor_insert_img (sEditorId, sImgId, sImgUrl, sClasses) {
 
 function bx_editor_on_space_enter (sCode, sEditorId, bSpace = true)
 {
+    console.log(10);
     if (typeof glBxEditorOnSpaceEnterTimer !== 'undefined')
         clearTimeout(glBxEditorOnSpaceEnterTimer);
     
@@ -418,11 +402,13 @@ function bx_editor_on_space_enter (sCode, sEditorId, bSpace = true)
 }
 
 function bx_editor_on_space_enter_in(sCode, sEditorId) {
+     console.log(11);
     glBxEditorOnSpaceEnterTimer = undefined;
     if (typeof glOnSpaceEnterInEditor !== 'undefined' && glOnSpaceEnterInEditor instanceof Array) {
         for (var i = 0; i < glOnSpaceEnterInEditor.length; i++) {
             if (typeof glOnSpaceEnterInEditor[i] === "function") {;                                             
                 glOnSpaceEnterInEditor[i](sCode, sEditorId);
+                    console.log(12);                                               
             }
         }
     }

modules/base/general/classes/BxBaseModGeneralModule.php

@@ -66,7 +66,7 @@ class BxBaseModGeneralModule extends BxDolModule
         if(isset($CNF['FIELD_STATUS']) && $aContentInfo[$CNF['FIELD_STATUS']] != 'active')
             return false;
 
-        if(isset($CNF['FIELD_STATUS_ADMIN']) && $aContentInfo[$CNF['FIELD_STATUS_ADMIN']] != 'active')
+        if(isset($CNF['FIELD_STATUS_ADMIN']) && isset($aContentInfo[$CNF['FIELD_STATUS_ADMIN']]) && $aContentInfo[$CNF['FIELD_STATUS_ADMIN']] != 'active')
             return false;
 
         return true;        

modules/boonex/forum/classes/BxForumSearchResult.php

@@ -209,8 +209,8 @@ class BxForumSearchResult extends BxBaseModTextSearchResult
     function displayResultBlock()
     {
         if ($this->bShowcaseView) {
-            $this->oModule->_oTemplate->addCss(array('unaca.css'));
-            $this->oModule->_oTemplate->addJs(array('unaca.js'));
+            $this->oModule->_oTemplate->addCss(array('carusel.css'));
+            $this->oModule->_oTemplate->addJs(array('carusel.js'));
             
             return $this->oModule->_oTemplate->parseHtmlByName('unaca.html', ['content' => str_replace(['bx-forum-wrapper', 'bx-base-unit-showcase-wrapper'], '' ,str_replace('bx-search-result-block', 'bx-search-result-block unaca-t', parent::displayResultBlock()))]);
             

studio/template/css/launcher.css

@@ -403,4 +403,9 @@ div.bx-std-widget-caption a {
 }
 #bx-informer .bx-informer-msg{
     background-color: rgba(255, 234, 193, 1);
+    display: none;
+    z-index: 10;
+}
+#bx-informer #sys-account-need-to-change-password.bx-informer-msg{
+    display: block;
 }