Ticket #5184 - Add pissibility to use another iconset.

inc/js/functions.js

@@ -1379,7 +1379,7 @@ function bx_autocomplete_fields(iId, sUrl, sName, bShowImg, bOnlyOnce, onSelect)
 			else if(bShowImg && item.thumb != undefined)
 				sImage = '<img class="bx-def-thumb bx-def-icon-size bx-def-margin-sec-right" src="' + item.thumb + '">';
 
-			$(this).before('<b class="val bx-def-color-bg-hl bx-def-round-corners">' + sImage + item.label + '<input type="hidden" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" name="' + sName + (bOnlyOnce ? '' : '[]') + '" value="' + item.value + '" /></b>');
+			$(this).before('<b class="val bx-def-color-bg-hl bx-def-round-corners">' + sImage + item.label + '<i class="sys-icon times ltr:ml-1 rtl:mr-1"></i><input type="hidden" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" name="' + sName + (bOnlyOnce ? '' : '[]') + '" value="' + item.value + '" /></b>');
 		}
 
 		if (!bOnlyOnce)

modules/base/general/template/breadcrumb.html

@@ -1,4 +1,4 @@
-<div class="bx-base-general-breadcrumb">
+<div class="bx-base-general-breadcrumb flex items-center">
     <a class ="bx-base-general-breadcrumb-home" href="__url_home__"><i class="sys-icon __icon_home__"></i></a>
     <bx_repeat:items>
         <i class="sys-icon chevron-right bx-def-margin-sec-leftright"></i><a href="__url__">__title__</a>

modules/boonex/artificer/data/template/bx_timeline/item_outline.html

@@ -26,14 +26,14 @@
                             </span>
                         </bx_if:show_owner_actions>
                     </div>
-                    <div class="__style_prefix__-item-meta bx-def-font-meta flex flex-wrap">
+                    <div class="__style_prefix__-item-meta bx-def-font-meta flex items-center flex-wrap">
                         <bx_if:show_menu_item_meta>
                             <span class="__style_prefix__-meta mr-1">__meta__</span>
                         </bx_if:show_menu_item_meta>
                         <bx_if:show_item_action>
                             <span class="__style_prefix__-div mr-1">&#183;</span>
-                            <div class="__style_prefix__-item-action mr-1">
-                                <span class="mr-1 lowercase">__item_owner_action__</span>
+                            <div class="__style_prefix__-item-action mr-1 flex items-center">
+                                <span class="flex items-center mr-1 lowercase">__item_owner_action__</span>
                                 <bx_if:show_timeline_owner>
                                     <span class="mr-1"><bx_text:_bx_timeline_txt_to /></span> 
                                     <span class="__style_prefix__-timeline-owner-name mr-1">

modules/boonex/artificer/data/template/bx_timeline/item_timeline.html

@@ -25,14 +25,14 @@
                         </span>
                     </bx_if:show_owner_actions>
                 </div>
-                <div class="__style_prefix__-item-meta bx-def-font-meta flex flex-wrap">
+                <div class="__style_prefix__-item-meta bx-def-font-meta flex items-center flex-wrap">
                     <bx_if:show_menu_item_meta>
                         <span class="__style_prefix__-meta mr-1">__meta__</span>
                     </bx_if:show_menu_item_meta>
                     <bx_if:show_item_action>
                         <span class="__style_prefix__-div mr-1">&#183;</span>
-                        <div class="__style_prefix__-item-action mr-1">
-                            <span class="mr-1 lowercase">__item_owner_action__<i class="sys-icon __item_icon__ ml-2"></i></span>
+                        <div class="__style_prefix__-item-action flex items-center mr-1">
+                            <span class="flex items-center mr-1 lowercase">__item_owner_action__<i class="sys-icon __item_icon__ ml-1"></i></span>
                             <bx_if:show_timeline_owner>
                                 <span class="mr-1"><bx_text:_bx_timeline_txt_to /></span> 
                                 <span class="__style_prefix__-timeline-owner-name mr-1">

modules/boonex/artificer/data/template/system/css/forms.css

@@ -341,10 +341,11 @@ import url(../../../../../../../template/css/forms.css);
     min-height: 2.375rem;
 }
 .bx-form-value .bx-form-input-autotoken:not(.bx-form-input-labels) b {
-    display: block;
+    display: flex;
+    align-items: center;
     float: left;
     margin: 0.125rem;
-    padding-right: 1.5rem;
+    padding-right: 0.5rem;
     border-radius: 1.25rem;
 
     line-height: 2rem;
@@ -362,23 +363,20 @@ import url(../../../../../../../template/css/forms.css);
 .bx-form-value .bx-form-input-autotoken:not(.bx-form-input-labels) b:hover {
     opacity: 0.7;
 }
-.bx-form-value .bx-form-input-autotoken:not(.bx-form-input-labels) b:after {
-    font-family: 'sys-user', 'sys-user-fal';
-    content: "\f00d";    
-    position:absolute;    
-    padding:0 0.5em;
-    margin-left: 0.125em;
-    font-size:0.7em;
-    font-weight:bold;
-}
-.bx-dir-rtl .bx-form-value .bx-form-input-autotoken:not(.bx-form-input-labels) b:after {
-    margin-left: 0;
-    margin-right: 0.125em;
+.bx-form-value .bx-form-input-autotoken:not(.bx-form-input-labels) b .sys-icon {
+    display: inline-block;
+    width: 1.0rem;
+    height: 1.0rem;
+    line-height: 1.0rem;
+    text-align: center;
+    font-size: 0.7em;
+    font-weight: bold;
+    vertical-align: middle;
 }
 .bx-form-value .bx-form-input-autotoken:not(.bx-form-input-labels).bx-form-input-disabled b {
     cursor: default;
 }
-.bx-form-value .bx-form-input-autotoken:not(.bx-form-input-labels).bx-form-input-disabled b:after{
+.bx-form-value .bx-form-input-autotoken:not(.bx-form-input-labels).bx-form-input-disabled b .sys-icon {
     display: none;
 }
 .bx-form-value .bx-form-input-autotoken:not(.bx-form-input-labels) input {

modules/boonex/artificer/data/template/system/css/general.css

@@ -227,6 +227,10 @@ import url(../../../../../../../template/css/general.css);
 }
 
 /* --------------- System objects like Views, Votes, Comments, etc, */
+.sys-action .sys-action-element-holder .sys-action-do-icon svg {
+    width: 1.25rem;
+    height: 1.25rem;
+}
 .sys-action-counter.sys-ac-hidden {
     display: none;
 }

modules/boonex/credits/template/bundles.html

@@ -8,7 +8,7 @@
                         <div class="__sp__-b-amount flex-grow mt-4">
                             <div class="__sp__-ba-value text-3xl font-semibold"><b>__amount__</b></div>
                             <bx_if:show_bonus>
-                                <div class="__sp__-ba-bonus"><i class="sys-icon plus"></i> <b>__bonus__</b> <bx_text:_bx_credits_txt_for_free /></div>
+                                <div class="__sp__-ba-bonus flex justify-center items-center"><i class="sys-icon plus"></i><b class="mr-2">__bonus__</b><bx_text:_bx_credits_txt_for_free /></div>
                             </bx_if:show_bonus>
                         </div>
                         <div class="__sp__-b-price flex justify-center mt-4">

modules/boonex/files/template/css/main.css

@@ -124,8 +124,7 @@
 }
 .bx-files-browser-toolbar .bx-btn {
     float: none;
-    display: inline-block;
-    vertical-align: top;
+    display: inline-flex;
 }
 .bx-files-toolbar-controls-group {
     display: inline-block;

modules/boonex/forum/template/status.html

@@ -1,4 +1,4 @@
-<div class="bx-forum-status-__status_class__ rounded-md px-2 py-1 text-xs">
+<div class="bx-forum-status-__status_class__ flex items-center rounded-md px-2 py-1 text-xs">
     <span class="bx-menu-meta-icon"><i class="sys-icon circle sys-colored"></i></span>
     <span>__status__</span>
-</div>
+</div>

modules/boonex/market/classes/BxMarketFormEntry.php

@@ -351,7 +351,7 @@ class BxMarketFormEntry extends BxBaseModTextFormEntry
                 if(empty($aContentInfo) || !is_array($aContentInfo))
                     continue;
                 
-               $sVals .= '<b class="val bx-def-color-bg-hl bx-def-round-corners">' . $aContentInfo[$CNF['FIELD_TITLE']] . '<input type="hidden" name="' . $aInput['name'] . '[]" value="' . $iValue . '" /></b>';
+               $sVals .= '<b class="val bx-def-color-bg-hl bx-def-round-corners">' . $aContentInfo[$CNF['FIELD_TITLE']] . '<i class="sys-icon times ltr:ml-1 rtl:mr-1"></i><input type="hidden" name="' . $aInput['name'] . '[]" value="' . $iValue . '" /></b>';
             }
             $sVals = trim($sVals, ',');
         }

modules/boonex/timeline/template/item_timeline.html

@@ -55,8 +55,8 @@
             </div>
         </div>
         <bx_if:show_item_action>
-            <div class="__style_prefix__-item-action bx-def-margin-lefttopright bx-def-font-middle bx-def-font-grayed">
-                <span>__item_owner_action__&nbsp;<i class="sys-icon __item_icon__"></i>&nbsp;</span>
+            <div class="__style_prefix__-item-action bx-def-margin-lefttopright bx-def-font-middle bx-def-font-grayed flex items-center flex items-center">
+                <span class="flex items-center">__item_owner_action__<i class="sys-icon __item_icon__"></i></span>
                 <bx_if:show_timeline_owner>
                     <span><bx_text:_bx_timeline_txt_to />&nbsp;</span> 
                     <span class="__style_prefix__-timeline-owner-name">

template/css/forms.css

@@ -565,7 +565,8 @@
 }
 .bx-form-value .bx-form-input-autotoken b {
     cursor:pointer;
-    display:block;
+    display:flex;
+    align-items: center;
     float:left;
     padding-right: 1.5em; 
     margin:0.1em;
@@ -578,19 +579,20 @@
 .bx-form-value .bx-form-input-autotoken b:hover {
     opacity:0.7;
 }
-.bx-form-value .bx-form-input-autotoken b:after {
-    font-family: 'sys-user', 'sys-user-fal';
-    content: "\f00d";    
-    position:absolute;    
-    padding:0 0.5em;
-    margin-left: 0.25em;
-    font-size:0.7em;
-    font-weight:bold;
+.bx-form-value .bx-form-input-autotoken b .sys-icon {
+    display: inline-block;
+    width: 1.0rem;
+    height: 1.0rem;
+    line-height: 1.0rem;
+    text-align: center;
+    font-size: 0.7em;
+    font-weight: bold;
+    vertical-align: middle;
 }
 .bx-form-value .bx-form-input-autotoken.bx-form-input-disabled b {
     cursor: default;
 }
-.bx-form-value .bx-form-input-autotoken.bx-form-input-disabled b:after{
+.bx-form-value .bx-form-input-autotoken.bx-form-input-disabled b .sys-icon {
     display: none;
 }
 .bx-form-value .bx-form-input-autotoken input {

template/css/general.css

@@ -218,6 +218,11 @@
 }
 
 /* --------------- System objects like Views, Votes, Comments, etc, */
+.sys-action .sys-action-element-holder .sys-action-do-icon svg {
+    width: 1.25rem;
+    height: 1.25rem;
+}
+
 .sys-action-counter.sys-ac-hidden {
     display: none;
 }

template/css/label.css

@@ -12,7 +12,8 @@
 .sys-labels .bx-form-input-text.bx-form-input-autotoken b,
 .sys-labels .bx-form-input-text.bx-form-input-autotoken input:not([type = 'hidden']) {
     position: relative;
-    display: block;
+    display: flex;
+    align-items: center;
     float: none;
 
     height: 1.625rem;
@@ -33,33 +34,21 @@
     margin: 0 0.125rem 0 0;
 }
 
-.sys-labels .bx-form-input-text.bx-form-input-autotoken b:after {
-    top: -1px;
-
-    margin: 0;
-    padding: 0 0.5rem;
-}
 .sys-labels .bx-form-input-text.bx-form-input-autotoken b.val-placeholder {
-    padding-left: 1.5rem;
+    padding-left: 0.5rem;
     padding-right: 0.5rem;
     height: 2rem;
     line-height: 2rem;    
 }
-.bx-dir-rtl .sys-labels .bx-form-input-text.bx-form-input-autotoken b.val-placeholder {
-    padding-left: 0.5rem;
-    padding-right: 1.5rem;
-}
-.sys-labels .bx-form-input-text.bx-form-input-autotoken b.val-placeholder::before {
-    font-family: 'sys-user', 'sys-user-fal';
-    content: "\f067";
-    position: absolute;
-    margin-left: -1.5em;
+.sys-labels .bx-form-input-text.bx-form-input-autotoken b.val-placeholder .sys-icon {
+    display: inline-block;
+    width: 1.0rem;
+    height: 1.0rem;
+    line-height: 1.0rem;
+    text-align: center;
     font-size: 0.7em;
     font-weight: bold;
-}
-.bx-dir-rtl .sys-labels .bx-form-input-text.bx-form-input-autotoken b.val-placeholder::before {
-    margin-left: 0;
-    margin-right: -1.5em;
+    vertical-align: middle;
 }
 
 .sys-labels .bx-form-input-text.bx-form-input-autotoken input:not([type = 'hidden']) {

template/css/tailwind.css

@@ -734,6 +734,10 @@
     .bx-btn img {
         @apply bg-contain bg-no-repeat bg-center;
     }
+    
+    .bx-btn svg {
+        @apply inline align-middle;
+    }
 
     .bx-btn u {
         @apply ml-2 first:ml-0 no-underline;
@@ -1562,7 +1566,8 @@
         @apply text-white text-xs font-medium whitespace-nowrap;
         @apply opacity-90 hover:opacity-100 active:translate-y-0.5
     }
-    .bx-badge img{
+    .bx-badge img,
+    .bx-badge svg {
         @apply max-h-4 m-0 p-0;
     }
     .sys-icon-image.bx-badge-icon,

template/css/vote.css

@@ -128,8 +128,8 @@
     position: relative;
     display: inline-block;
     vertical-align: top;
-    height: 1rem;
-    width: 1rem;
+    height: 1.5rem;
+    width: 1.5rem;
     margin: 0;
     padding: 0;
     text-align: center;

template/form_field_custom_suggestions.html

@@ -1,6 +1,6 @@
 <div __attrs__>
     <bx_repeat:vals>
-        <b class="val bx-def-color-bg-hl bx-def-round-corners">__item_unit____item_name__<input type="hidden" name="__name__" value="__value__" /></b>
+        <b class="val bx-def-color-bg-hl bx-def-round-corners">__item_unit____item_name__<i class="sys-icon times ltr:ml-1 rtl:mr-1"></i><input type="hidden" name="__name__" value="__value__" /></b>
     </bx_repeat:vals>
     __value__
     <bx_if:input>__input__</bx_if:input>

template/form_view_row.html

@@ -1,5 +1,5 @@
 <div class="bx-form-row-view-wrapper bx-form-row-view-wrapper-__type__ __class__ bx-def-padding-sec-top">
-    <div class="bx-form-row-view-caption">
+    <div class="bx-form-row-view-caption flex items-center space-x-2">
         <bx_if:show_icon>
             <span class="bx-form-row-vc-icon">__icon__</span>
         </bx_if:show_icon>

template/label_select_field_item.html

@@ -1 +1 @@
-<b class="val bx-def-color-bg-hl bx-def-border bx-def-round-corners bx-def-box-sizing __class__">__label__<bx_if:show_input><input type="hidden" name="__field__[]" value="__label__" /></bx_if:show_input></b>
+<b class="val bx-def-color-bg-hl bx-def-border bx-def-round-corners bx-def-box-sizing __class__"><bx_if:show_icon><i class="sys-icon plus ltr:mr-1 rtl:ml-1"></i></bx_if:show_icon>__label__<bx_if:show_input><input type="hidden" name="__field__[]" value="__label__" /></bx_if:show_input></b>

template/scripts/BxBaseIconsetLucide.php

@@ -22,7 +22,11 @@ class BxBaseIconsetLucide extends BxBaseIconset
         $this->_aMap = [
             'ad' => 'circle-star',
             'address-card' => 'id-card',
+            'angle-double-left' => 'chevrons-left',
+            'angle-double-right' => 'chevrons-right',
+            'arrows-alt' => 'move',
             'book-reader' => 'book-open-text',
+            'buffer' => 'layers',
             'building' => 'building',
             'bullhorn' => 'megaphone',
             'calendar-day' => 'calendar-days',
@@ -50,6 +54,7 @@ class BxBaseIconsetLucide extends BxBaseIconset
             'exclamation-circle' => 'alert-circle',
             'exclamation-triangle' => 'alert-triangle',
             'fa-book' => 'book-text',
+            'fa-bookmark' => 'bookmark',
             'fa-smile' => 'smile',
             'fa-thumbs-up' => 'thumbs-up',
             'file-alt' => 'file',
@@ -62,6 +67,7 @@ class BxBaseIconsetLucide extends BxBaseIconset
             'hashtag' => 'hash',
             'helpcircle' => 'help-circle',
             'house' => 'home',
+            'industry' => 'factory',
             'info-circle' => 'info',
             'keyround' => 'key-round',
             'language' => 'languages',
@@ -76,15 +82,19 @@ class BxBaseIconsetLucide extends BxBaseIconset
             'plus-circle' => 'plus-circle',
             'qrcode' => 'qr-code',
             'quote-right' => 'quote',
+            'remove' => 'x',
             'reply-all' => 'reply-all',
+            'search-location' => 'search-check',
             'share-alt' => 'share-2',
             'shield-alt' => 'shield',
             'sign-in-alt' => 'log-in',
             'sign-out-alt' => 'log-out',
             'star-half-o' => 'star-half',
+            'swatchbook' => 'swatch-book',
             'sync' => 'refresh-ccw',
             'tachometer-alt' => 'gauge',
             'tasks' => 'check-square',
+            'th-large' => 'grid-2x2',
             'thumbtack' => 'pin',
             'times' => 'x',
             'times-circle' => 'x-circle',
@@ -128,7 +138,7 @@ class BxBaseIconsetLucide extends BxBaseIconset
                 if(el.hasAttribute('data-lucide'))
                     return;
 
-                const sName = el.getAttribute('class').replace(/(sys-icon|far|col-\w+)/gi, '').trim().split(' ').shift();
+                const sName = el.getAttribute('class').replace(/(sys-icon-bigger|sys-icon|fab|far|fas|col-\w+)/gi, '').trim().split(' ').shift();
                 if(sName)
                   el.setAttribute('data-lucide', aMap[sName] != undefined ? aMap[sName] : sName);
                 else

template/scripts/BxBaseLabel.php

@@ -123,29 +123,37 @@ class BxBaseLabel extends BxDolLabel
 
     public function getLabel($sField, $sLabel)
     {
-        return $this->_oTemplate->parseHtmlByName('label_select_field_item.html', array(
+        return $this->_oTemplate->parseHtmlByName('label_select_field_item.html', [
             'class' => '',
+            'bx_if:show_icon' => [
+                'condition' => false,
+                'content' => []
+            ],
             'label' => $sLabel,
-            'bx_if:show_input' => array(
+            'bx_if:show_input' => [
                 'condition' => true,
-                'content' => array(
+                'content' => [
                     'label' => $sLabel,
                     'field' => $sField,
-                )
-            )
-        ));
+                ]
+            ]
+        ]);
     }
 
     public function getLabelPlaceholder($sPlaceholder)
     {
-        return $this->_oTemplate->parseHtmlByName('label_select_field_item.html', array(
+        return $this->_oTemplate->parseHtmlByName('label_select_field_item.html', [
             'class' => 'val-placeholder',
+            'bx_if:show_icon' => [
+                'condition' => true,
+                'content' => []
+            ],
             'label' => _t($sPlaceholder),
-            'bx_if:show_input' => array(
+            'bx_if:show_input' => [
                 'condition' => false,
-                'content' => array()
-            )
-        ));
+                'content' => []
+            ]
+        ]);
     }
 
     /**

template/vote_do_vote_stars.html

@@ -1,5 +1,5 @@
 <div class="__style_prefix__-element relative inline-block">
-    <div class="__style_prefix__-underlay">
+    <div class="__style_prefix__-underlay flex items-center">
         <bx_repeat:stars><bx_image_auto:far,star|__style_prefix__-star,text-yellow-500 /></bx_repeat:stars>
     </div>
     <bx_if:show_legend>
@@ -7,10 +7,10 @@
             <bx_repeat:legend><span class="bx-vote-star text-yellow-500">__value__</span></bx_repeat:legend>
         </div>
     </bx_if:show_legend>
-    <div class="__style_prefix__-slider absolute z-1 top-0 left-0 whitespace-nowrap overflow-hidden">
-        <bx_repeat:slider><bx_image_auto:star|__style_prefix__-star,text-yellow-500 /></bx_repeat:slider>
+    <div class="__style_prefix__-slider absolute z-1 top-0 left-0 flex items-center flex-nowrap overflow-hidden">
+        <bx_repeat:slider><bx_image_auto:star|__style_prefix__-star,flex-none,text-yellow-600 /></bx_repeat:slider>
     </div>
-    <div class="__style_prefix__-buttons absolute z-2 top-0 left-0">
+    <div class="__style_prefix__-buttons absolute z-2 top-0 left-0 flex items-center">
         <bx_repeat:buttons><a class="__style_prefix__-button hover:no-underline" href="javascript:void(0);" onmouseover="__js_object__.over(this);" onmouseout="__js_object__.out(this);" onclick="__js_object__.vote(this, __value__)"><bx_image_auto:star|__style_prefix__-star,text-transparent,hover:text-yellow-600 /></a></bx_repeat:buttons>
     </div>
 </div>

template/vote_legend.html

@@ -2,11 +2,11 @@
     <bx_repeat:items>
         <div class="__style_prefix__-legend-item flex items-center my-1" bx_vote_item_value="__value__">
             <div class="bx-vote-element-holder relative inline-block">
-                <div class="__style_prefix__-underlay">
-                    <bx_repeat:stars><i class="__style_prefix__-star sys-icon far star text-yellow-500"></i></bx_repeat:stars>
+                <div class="__style_prefix__-underlay flex items-center">
+                    <bx_repeat:stars><i class="sys-icon far star __style_prefix__-star text-yellow-500"></i></bx_repeat:stars>
                 </div>
-                <div class="__style_prefix__-slider absolute z-1 top-0 left-0 whitespace-nowrap overflow-hidden">
-                    <bx_repeat:slider><i class="__style_prefix__-star sys-icon star text-yellow-500"></i></bx_repeat:slider>
+                <div class="__style_prefix__-slider absolute z-1 top-0 left-0 flex items-center flex-nowrap overflow-hidden">
+                    <bx_repeat:slider><i class="sys-icon star __style_prefix__-star flex-none text-yellow-600"></i></bx_repeat:slider>
                 </div>
             </div>
             <div class="bx-vote-counter-holder ml-2 bx-def-font-grayed">__label__</div>

template/wiki_add_block.html

@@ -1,3 +1,3 @@
 <div class="bx-wiki-add-block bx-def-margin-top bx-def-padding">
-    <a href="javascript:void(0);" onclick="bx_wiki_add_block(this, '__page__', '__cell_id__', '__action_uri__')"><i class="sys-icon plus"></i> __add_block__</a>
-</div>
+    <a class="inline-flex items-center" href="javascript:void(0);" onclick="bx_wiki_add_block(this, '__page__', '__cell_id__', '__action_uri__')"><i class="sys-icon plus mr-1"></i> __add_block__</a>
+</div>

template/wiki_controls.html

@@ -1,7 +1,7 @@
 <div class="bx-wiki-controls bx-clearfix">
     <div class="bx-wiki-controls-menu">
         <bx_if:menu>
-            <a bx-popup-id="bx-wiki-menu-__block_id__" href="javascript:void(0);" onclick="bx_menu_popup('sys_wiki', this, {}, {block_id:'__block_id__', wiki_obj:'__obj__'})"><i class="bx-def-label sys-icon sys-colored ellipsis-v"></i></a>
+            <a class="bx-btn bx-btn-small" bx-popup-id="bx-wiki-menu-__block_id__" href="javascript:void(0);" onclick="bx_menu_popup('sys_wiki', this, {}, {block_id:'__block_id__', wiki_obj:'__obj__'})"><i class="sys-icon ellipsis-v sys-colored"></i></a>
         </bx_if:menu>
     </div>
     <div class="bx-wiki-controls-info bx-def-font-grayed bx-def-font-small">__info__</div>