Browse Source

Ticket #3399 - Fixes.

AntonLV 5 years ago
parent
commit
c7e6e8c97e

+ 5 - 2
modules/base/general/js/showcase.js

@@ -12,12 +12,13 @@ function bx_showcase_view_init() {
 
     $('.bx-base-unit-showcase-wrapper').each(function() {
         var sClassCell = 'bx-base-unit-showcase';
+        var sClassEnabled = 'bx-sc-enabled';
         var oShowcase = $(this);
         var oCells = oShowcase.find('.' + sClassCell);
 
         if(oCells.width() * oCells.length <= oShowcase.parent().width()) {
             if(oShowcase.hasClass('flickity-enabled'))
-                oShowcase.flickity('destroy');
+                oShowcase.flickity('destroy').removeClass(sClassEnabled);
 
             return;
         }
@@ -34,6 +35,8 @@ function bx_showcase_view_init() {
         if(iGroupCells != undefined)
             oShowcaseOptions.groupCells = parseInt(iGroupCells);
 
-        oShowcase.flickity(oShowcaseOptions);
+        oShowcase.on('ready.flickity', function() {
+            $(this).addClass(sClassEnabled);
+        }).flickity(oShowcaseOptions);
     });
 }

+ 26 - 0
modules/boonex/artificer/data/template/bx_posts/form_ghost_template.html

@@ -0,0 +1,26 @@
+<div id="bx-uploader-file-{storage_object}-{file_id}" class="bx-uploader-ghost mt-2 flex items-start">
+    <input type="hidden" name="__name__[]" value="{file_id}" />
+    <div class="bx-base-general-icon-wrapper mr-2">
+        <img src="{file_icon}" class="bx-base-general-icon rounded bx-base-general-icon-{file_id}" />
+    </div>
+    <span class="bx-base-general-uploader-ghost">
+        <div class="font-bold"><bx_text:_sys_txt_form_entry_input_picture_pic_url /></div>
+        <div class="bx-form-input-wrapper bx-form-input-wrapper-text mt-1">
+            <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_url}" readonly="1" />
+        </div>
+        <div class="mt-2">
+            <span id="bx-base-general-intert-to-post-link-{file_id}" class="inline-block" style="display:none;">
+                <a class="bx-btn bx-btn-small mr-2" href="javascript:void(0);" onclick="bx_base_general_insert_to_post('{file_id}', '{file_url}', '__editor_id__');"><bx_text:_sys_txt_form_entry_input_picture_insert /></a>
+            </span>
+            <a class="bx-btn bx-btn-small mr-2" href="javascript:void(0);" onclick="bx_base_general_delete_ghost('{file_id}', '{file_url}', '{file_icon}', ['__editor_id__'], {js_instance_name});"><bx_text:_sys_txt_form_entry_input_picture_delete /></a>
+        </div>
+    </span>
+</div>
+<script>
+    $('#bx-base-general-intert-to-post-link-{file_id}').show();
+
+    // disable images drag&drop, because resized images address can be reset after some time
+    $(".bx-base-general-icon-{file_id}").bind('dragstart', function(){
+        return false; 
+    });
+</script>

+ 16 - 0
modules/boonex/artificer/data/template/bx_timeline/css/view.css

@@ -270,4 +270,20 @@ div.bx-tl-view-outline div.bx-tl-il-thumbnail img {
 div.bx-tl-view-outline div.bx-tl-il-embed iframe,
 div.bx-tl-view-timeline div.bx-tl-il-embed iframe {
     width: 100%;
+}
+
+/*--- Item Brief Style ---*/
+div.bx-tl-bview-images {
+    position: relative;
+}
+div.bx-tl-bview-image.bx-tl-bvi-single {
+    display: -webkit-flex;
+    display: flex;
+    -webkit-align-items: center;
+    align-items: center;
+    -webkit-justify-content: center;
+    justify-content: center;
+}
+div.bx-tl-bview-image.bx-tl-bvi-single img {
+    max-width: 100%;
 }

+ 3 - 0
modules/boonex/artificer/data/template/mod_general/css/forms.css

@@ -0,0 +1,3 @@
+.bx-uploader-ghost .bx-base-general-icon-wrapper img {
+    max-height: 12.5rem;
+}

+ 1 - 1
modules/boonex/artificer/data/template/mod_groups/unit_with_cover_showcase.html

@@ -1 +1 @@
-<bx_include_auto_mod_groups:unit.html />
+<bx_include_auto:unit.html />

+ 4 - 1
modules/boonex/artificer/data/template/mod_profile/css/main.css

@@ -1,5 +1,5 @@
 /*--- Units ---*/
-.bx-base-pofile-units-wrapper {
+.bx-base-pofile-units-wrapper:not(.bx-base-unit-showcase-wrapper) {
     display: -webkit-flex;
     display: flex;
 
@@ -19,6 +19,9 @@
 
     overflow: hidden;
 }
+.bx-base-unit-showcase-wrapper.bx-sc-enabled .bx-base-pofile-unit-with-cover {
+    height: 100%;
+}
 
 /*+++ MEDIA: tablet2 +++*/
 .bx-media-tablet2 .bx-layout-column-wide .bx-base-pofile-units-wrapper .bx-base-pofile-unit-with-cover,

+ 18 - 16
modules/boonex/artificer/data/template/mod_text/form_ghost_template.html

@@ -1,23 +1,25 @@
-<div id="bx-uploader-file-{storage_object}-{file_id}" class="bx-uploader-ghost mt-2 bx-clearfix">
+<div id="bx-uploader-file-{storage_object}-{file_id}" class="bx-uploader-ghost mt-2 flex items-start">
     <input type="hidden" name="__name__[]" value="{file_id}" />
     <div class="bx-base-general-icon-wrapper mr-2">
-        <img src="{file_icon}" class="bx-def-round-corners bx-base-general-icon bx-base-general-icon-{file_id}" />
+        <img src="{file_icon}" class="bx-base-general-icon rounded bx-base-general-icon-{file_id}" />
     </div>
     <span class="bx-base-general-uploader-ghost">
-        <b><bx_text:_sys_txt_form_entry_input_picture_pic_url /></b><br />
-        <input class="bx-def-font-inputs bx-form-input-text mb-2" type="text" value="{file_url}" readonly="1" /> <br />
-
-        <span id="bx-base-general-intert-to-post-link-{file_id}" style="display:none;">
-            <a class="bx-btn bx-btn-small mr-2" href="javascript:void(0);" onclick="bx_base_general_insert_to_post('{file_id}', '{file_url}', '__editor_id__');"><bx_text:_sys_txt_form_entry_input_picture_insert /></a>
-        </span>
-        <a class="bx-btn bx-btn-small mr-2" href="javascript:void(0);" onclick="bx_base_general_delete_ghost('{file_id}', '{file_url}', '{file_icon}', ['__editor_id__'], {js_instance_name});"><bx_text:_sys_txt_form_entry_input_picture_delete /></a>
-
-        <bx_if:set_thumb>
-            <span class="bx-base-general-use-as-thumb">
-                <input type="checkbox" name="__name_thumb__[]" value="{file_id}" onclick="bx_base_general_select_thumb(this)" id="__name_thumb__-{file_id}" /> 
-                <label for="__name_thumb__-{file_id}">__txt_pict_use_as_thumb__</label>
+        <div class="font-bold"><bx_text:_sys_txt_form_entry_input_picture_pic_url /></div>
+        <div class="bx-form-input-wrapper bx-form-input-wrapper-text mt-1">
+            <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_url}" readonly="1" />
+        </div>
+        <div class="mt-2">
+            <span id="bx-base-general-intert-to-post-link-{file_id}" class="inline-block" style="display:none;">
+                <a class="bx-btn bx-btn-small mr-2" href="javascript:void(0);" onclick="bx_base_general_insert_to_post('{file_id}', '{file_url}', '__editor_id__');"><bx_text:_sys_txt_form_entry_input_picture_insert /></a>
             </span>
-        </bx_if:set_thumb>
+            <a class="bx-btn bx-btn-small mr-2" href="javascript:void(0);" onclick="bx_base_general_delete_ghost('{file_id}', '{file_url}', '{file_icon}', ['__editor_id__'], {js_instance_name});"><bx_text:_sys_txt_form_entry_input_picture_delete /></a>
+            <bx_if:set_thumb>
+                <span class="bx-base-general-use-as-thumb inline-block">
+                    <input type="checkbox" name="__name_thumb__[]" value="{file_id}" onclick="bx_base_general_select_thumb(this)" id="__name_thumb__-{file_id}" /> 
+                    <label for="__name_thumb__-{file_id}">__txt_pict_use_as_thumb__</label>
+                </span>
+            </bx_if:set_thumb>
+        </div>
     </span>
 </div>
 <script>
@@ -33,4 +35,4 @@
     // select first image as a thumb by default
     if (!__content_id__ && 1 == $('input[name="__name_thumb__[]"]').length)
         $('input[name="__name_thumb__[]"]').attr('checked', true);
-</script>
+</script>

+ 1 - 1
modules/boonex/english/data/langs/system/en.xml

@@ -1884,7 +1884,7 @@
 	<string name="_sys_acc_confirmation_type_phone"><![CDATA[phone is confirmed]]></string>
 	<string name="_sys_acc_confirmation_type_email_and_phone"><![CDATA[email and phone are confirmed]]></string>
   <string name="_sys_acc_confirmation_type_email_or_phone"><![CDATA[email or phone is confirmed]]></string>
-	<string name="_sys_acl_action_account"><![CDATA[You didn't created any profiles, so you can't '{1}'.]]></string>
+	<string name="_sys_acl_action_account"><![CDATA[You haven't created any profiles, so you can't '{1}'.]]></string>
 	<string name="_sys_acl_action_chart_view"><![CDATA[View charts]]></string>
 	<string name="_sys_acl_action_chart_view_desc"><![CDATA[View statistical charts]]></string>
 	<string name="_sys_acl_action_comments_edit_all"><![CDATA[Comments Edit All]]></string>

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

@@ -393,6 +393,10 @@
         @apply bg-white dark:bg-gray-500 translate-x-0;
     }
 
+    .bx-artificer .bx-form-input-autotoken b.val {
+        @apply bg-gray-200 dark:bg-gray-700 hover:bg-gray-300 dark:hover:bg-gray-600;
+    }
+
 
     /* Common elements: Popups */
     .bx-artificer .bx-popup-wrapper {

File diff suppressed because it is too large
+ 0 - 0
plugins_public/tailwind/css/tailwind.min.css


+ 3 - 0
plugins_public/tailwind/js/tailwind.config.js

@@ -63,6 +63,7 @@ module.exports = {
     extend: {
         width: {
             46: '11.5rem',
+            50: '12.5rem',
             112: '28rem',
             128: '32rem',
             144: '36rem'
@@ -76,6 +77,8 @@ module.exports = {
             32: '8rem',
         },
         height: {
+            46: '11.5rem',
+            50: '12.5rem',
             112: '28rem',
             128: '32rem',
             144: '36rem'

+ 5 - 4
template/css/common.css

@@ -621,12 +621,13 @@ div.bx-popup-chain-item .bx-loading-ajax {
     color:#CCCCCC;
 }
 .bx-loading-ajax.static {
-	position: static;
+    position: static;
 }
 .bx-loading-ajax svg {
-	width: 50px;
-	height: 50px;
-	padding: 25px;  
+    box-sizing: content-box;
+    width: 50px;
+    height: 50px;
+    padding: 25px;  
 }
 
 .bx-loading-ajax-btn {

Some files were not shown because too many files changed in this diff