AntonLV 6 лет назад
Родитель
Сommit
95b2e0a1ab

+ 15 - 10
template/css/label.css

@@ -1,4 +1,4 @@
-/*-- Labels Field --*/
+/*-- Labels Form Field --*/
 .sys-labels .bx-form-input-text.bx-form-input-autotoken b {
     padding-left: 0.5rem;
 }
@@ -8,13 +8,13 @@
 }
 
 
-/*-- Labels Search --*/
+/*-- Labels Popup Search --*/
 .sys-labels-select .bx-form-input-text.bx-form-input-autotoken b {
     padding-left: 0.5rem;
 }
 
 
-/*-- Labels List --*/
+/*-- Labels Popup List and Labels Browse  --*/
 .sys-labels-level {
     position: relative;
     
@@ -38,14 +38,20 @@
     padding-right: 0.25rem;
 }
 .sys-labels-list .sys-labels-level.sys-ll-0 > .sys-labels-list-item {
-    -webkit-flex-basis: 50%;
-    flex-basis: 50%;
-
     width: 50%;
 }
 .bx-media-phone .sys-labels-browse .sys-labels-level.sys-ll-0 > .sys-labels-list-item,
 .bx-layout-column-thin .sys-labels-browse .sys-labels-level.sys-ll-0 > .sys-labels-list-item {
-    min-width: 50%;
+    width: 50%;
+}
+.bx-layout-column-half .sys-labels-browse .sys-labels-level.sys-ll-0 > .sys-labels-list-item {
+    width: 33.3%;
+}
+.bx-layout-column-wide .sys-labels-browse .sys-labels-level.sys-ll-0 > .sys-labels-list-item {
+    width: 25%;
+}
+.bx-layout-column-fullwidth .sys-labels-browse .sys-labels-level.sys-ll-0 > .sys-labels-list-item {
+    width: 16.6%;
 }
 .sys-labels-li-sublist {
     display: none;
@@ -67,9 +73,8 @@
     flex-wrap: nowrap;
 }
 .sys-labels-list-item-box > * {
-    -webkit-flex: 0 0 auto;
-    -ms-flex: 0 0 auto;
-    flex: 0 0 auto;
+    -webkit-flex-grow: 0;
+    flex-grow: 0;
 }
 .sys-labels-li-checbox input {
     margin: 0;

+ 1 - 1
template/label_browse_level.html

@@ -2,7 +2,7 @@
     <bx_repeat:labels>
         <div class="sys-labels-list-item bx-def-padding-thd-topbottom bx-def-box-sizing">
             <div class="sys-labels-list-item-box bx-def-padding-sec bx-def-border bx-def-round-corners bx-def-shadow">
-                <div class="sys-labels-li-title bx-def-margin-sec-leftright"><a href="__href__">__title__</a></div>
+                <div class="sys-labels-li-title bx-def-margin-sec-leftright"><a href="__href__" title="__title_attr__">__title__</a></div>
                 <bx_if:show_sublist_link>
                     <div class="sys-labels-li-chevron bx-def-margin-sec-leftright">
                         <a href="javascript:void(0)" onclick="javascript:__js_object__.showSublist(this)">

+ 2 - 2
template/label_select_list_level.html

@@ -3,9 +3,9 @@
         <div class="sys-labels-list-item bx-def-padding-thd-topbottom bx-def-box-sizing">
             <div class="sys-labels-list-item-box bx-def-padding-sec bx-def-border bx-def-round-corners bx-def-shadow">
                 <div class="sys-labels-li-checbox">__checkbox__</div>
-                <div class="sys-labels-li-title bx-def-margin-sec-leftright"><label for="__html_id_label__">__title__</label></div>
+                <div class="sys-labels-li-title bx-def-margin-sec-leftright"><label for="__html_id_label__" title="__title_attr__">__title__</label></div>
                 <bx_if:show_sublist_link>
-                    <div class="sys-labels-li-chevron bx-def-margin-sec-leftright">
+                    <div class="sys-labels-li-chevron">
                         <a href="javascript:void(0)" onclick="javascript:__js_object__.showSublist(this)">
                             <i class="sys-icon <bx_if:show_class_opened>chevron-up</bx_if:show_class_opened><bx_if:show_class_closed>chevron-down</bx_if:show_class_closed>"></i>
                         </a>

+ 2 - 0
template/scripts/BxBaseLabel.php

@@ -164,6 +164,7 @@ class BxBaseLabel extends BxDolLabel
             $aTmplVarsLabels[] = array(
                 'href' => $this->getLabelUrl($aLabel['value']),
                 'title' => $aLabel['value'],
+                'title_attr' => bx_html_attribute($aLabel['value']),
                 'bx_if:show_sublist_link' => array(
                     'condition' => $bSublist,
                     'content' => array(
@@ -239,6 +240,7 @@ class BxBaseLabel extends BxDolLabel
                 'checkbox' => $oForm->genInput($aCheckbox),
                 'html_id_label' => $sHtmlId,
                 'title' => $aLabel['value'],
+                'title_attr' => bx_html_attribute($aLabel['value']),
                 'bx_if:show_sublist_link' => array(
                     'condition' => $bSublist,
                     'content' => array(