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

install/sql/system.sql

@@ -316,7 +316,6 @@ INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `ex
 (@iCategoryId, 'sys_redirect_after_email_confirmation', '_adm_stg_cpt_option_sys_redirect_after_email_confirmation', '', 'digit', '', '', '', '', 41),
 
 (@iCategoryId, 'sys_editor_default', '_adm_stg_cpt_option_sys_editor_default', 'sys_quill', 'digit', '', '', '', '', 50),
-(@iCategoryId, 'sys_captcha_default', '_adm_stg_cpt_option_sys_captcha_default', 'sys_recaptcha_new', 'select', 'sys_recaptcha_new,sys_recaptcha_invisible,sys_hcaptcha', '', '', '', 51),
 (@iCategoryId, 'sys_player_default', '_adm_stg_cpt_option_sys_player_default', 'sys_html5', 'digit', '', '', '', '', 55),
 (@iCategoryId, 'sys_player_default_format', '_adm_stg_cpt_option_sys_player_default_quality', 'sd', 'select', 'sd,hd', '', '', '', 56),
 
@@ -325,7 +324,7 @@ INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `ex
 (@iCategoryId, 'sys_quill_insert_as_plain_text', '_adm_stg_cpt_option_sys_quill_insert_as_plain_text', '', 'checkbox', '', '', '', '', 65),
 (@iCategoryId, 'sys_quill_allow_empty_tags', '_adm_stg_cpt_option_sys_quill_allow_empty_tags', 'on', 'checkbox', '', '', '', '', 66),
 
-(@iCategoryId, 'sys_quill_allowed_tags_mini', '_adm_stg_cpt_option_sys_quill_allowed_tags_mini', '[\'link\', \'size\', \'image\', \'menthion-link\', \'embed-link\']', 'digit', '', '', '', '', 67),
+(@iCategoryId, 'sys_quill_allowed_tags_mini', '_adm_stg_cpt_option_sys_quill_allowed_tags_mini', '', 'digit', '', '', '', '', 67),
 (@iCategoryId, 'sys_quill_allowed_tags_standard', '_adm_stg_cpt_option_sys_quill_allowed_tags_standard', '', 'digit', '', '', '', '', 68),
 (@iCategoryId, 'sys_quill_allowed_tags_full', '_adm_stg_cpt_option_sys_quill_allowed_tags_full', '', 'digit', '', '', '', '', 69),
 
@@ -492,6 +491,7 @@ SET @iCategoryId = LAST_INSERT_ID();
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
 (@iCategoryId, 'sys_security_form_token_enable', '_adm_stg_cpt_option_sys_security_form_token_enable', 'on', 'checkbox', '', '', '', 10),
 (@iCategoryId, 'sys_security_form_token_lifetime', '_adm_stg_cpt_option_sys_security_form_token_lifetime', '86400', 'digit', '', '', '', 11),
+(@iCategoryId, 'sys_captcha_default', '_adm_stg_cpt_option_sys_captcha_default', 'sys_recaptcha_new', 'select', 'sys_recaptcha_new,sys_recaptcha_invisible,sys_hcaptcha', '', '', '', 19),
 (@iCategoryId, 'sys_recaptcha_key_public', '_adm_stg_cpt_option_sys_recaptcha_key_public', '', 'digit', '', '', '', 20),
 (@iCategoryId, 'sys_recaptcha_key_private', '_adm_stg_cpt_option_sys_recaptcha_key_private', '', 'digit', '', '', '', 21),
 (@iCategoryId, 'sys_add_nofollow', '_adm_stg_cpt_option_sys_add_nofollow', 'on', 'checkbox', '', '', '', 30),

modules/boonex/forum/js/unaca.js

@@ -4,8 +4,25 @@ function initUnaca(){
             return $(this).height();
         }).get());
         $(this).find(".unaca-t > div").height(maxHeight);
+         
+        checkUnaca($(this));
+         
     });
 }
+function checkUnaca(unaca){
+    if (unaca.find('.unaca-t > div').last().offset().left < unaca.find('.unaca-t').parent().offset().left + unaca.find('.unaca-t').parent().width())
+        unaca.find('.unaca-c-f').hide();
+    else
+        unaca.find('.unaca-c-f').show();
+
+    if (unaca.find('.unaca-t > div').first().offset().left > 0 )
+
+        unaca.find('.unaca-c-b').hide();
+    else
+        unaca.find('.unaca-c-b').show();
+    
+}
+
 $( window ).resize(function() {
     initUnaca();
 })    
@@ -17,9 +34,6 @@ $(document).ready(function () {
         var unaca = $(evt.target).parents('.unaca');
         
         var i = new Number(unaca.attr('data-slide')); 
-          
-        console.log(($(evt.target)));
-        
         if ($(evt.target).hasClass('unaca-c-f'))
             i =  i + 1;
         else
@@ -28,16 +42,8 @@ $(document).ready(function () {
         unaca.find('.unaca-t').css('transform', 'translateX(-' + (i-1)*100 + '%)'); 
         
         setTimeout(function() { 
-            if (unaca.find('.unaca-t > div').last().offset().left < unaca.find('.unaca-t').parent().offset().left + unaca.find('.unaca-t').parent().width())
-                unaca.find('.unaca-c-f').hide();
-            else
-                unaca.find('.unaca-c-f').show();
-
-            if (unaca.find('.unaca-t > div').first().offset().left > 0 )
-
-                unaca.find('.unaca-c-b').hide();
-            else
-                unaca.find('.unaca-c-b').show();
+            
+            checkUnaca(unaca);
 
             unaca.find(".unaca-c-f" ).attr('for', 'unaca-a-'+ (i+1));
             unaca.find(".unaca-c-b" ).attr('for', 'unaca-a-'+ (i-1))

modules/boonex/forum/template/css/unaca.css

@@ -56,12 +56,14 @@
 
 .unaca-t {
     font-size: 0;
+     margin-bottom: 0px !important;
     transition: all 0.3s ease 0s;
     white-space: nowrap;
     -webkit-overflow-scrolling: touch;
     overflow: visible !important;
     scroll-behavior: smooth;
     scroll-snap-type: x var(--tw-scroll-snap-strictness);
+    text-align: left !important;
 }
 
 .unaca-t > div {