Просмотр исходного кода

Ticket #3901 - Menus: Improvements in menu item title usage. Protean (Core).

AntonLV 1 год назад
Родитель
Сommit
e9275fc929

+ 3 - 1
template/menu_apps.html

@@ -6,7 +6,9 @@
                 <div class="w-8 h-8 mx-auto mb-1 text-gray-500 dark:text-gray-400 text-2xl">
                     <bx_include_auto:menu_icon.html />
                 </div>
-                <div class="text-sm font-medium text-gray-900 dark:text-white">__title__</div>
+                <bx_if:title>
+                    <div class="text-sm font-medium text-gray-900 dark:text-white">__title__</div>
+                </bx_if:title>
             </a>
         </bx_repeat:menu_items>
     </div>

+ 1 - 1
template/menu_buttons_icon_hor.html

@@ -1,5 +1,5 @@
 <ul class="bx-menu-btns-icon-hor bx-menu-object-__object__ flex flex-row flex-wrap">
-    <bx_repeat:menu_items><li class="bx-menu-item __name__ my-1 __class_add__"><a class="bx-btn __name__ mr-4 __class_link__" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> title="__title_attr__"__attrs__>
+    <bx_repeat:menu_items><li class="bx-menu-item __name__ my-1 __class_add__"><a class="bx-btn __name__ mr-4 __class_link__" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
         <bx_include_auto:menu_icon.html />
     </a></li></bx_repeat:menu_items>
 </ul>

+ 1 - 1
template/menu_buttons_icon_hor_item.html

@@ -1,4 +1,4 @@
-<a class="bx-btn bx-def-margin-right" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> title="__title_attr__"__attrs__>
+<a class="bx-btn bx-def-margin-right" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
     <bx_include_auto:menu_icon.html />
     <bx_if:title><u>__title__</u></bx_if:title>
 </a>

+ 3 - 1
template/menu_buttons_ver.html

@@ -3,7 +3,9 @@
         <li class="bx-def-margin-thd-topbottom __class_add__">
             <a class="bx-btn bx-def-margin-right" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
                 <bx_include_auto:menu_icon.html />
-                <u>__title__</u>
+                <bx_if:title>
+                    <u>__title__</u>
+                </bx_if:title>
             </a>
         </li>
     </bx_repeat:menu_items>

+ 3 - 1
template/menu_floating_blocks_big.html

@@ -5,7 +5,9 @@
             <div class="bx-menu-floating-blocks-icon">
                 <bx_include_auto:menu_icon.html />
             </div>
-            <div class="bx-menu-floating-blocks-title">__title__</div>
+            <bx_if:title>
+                <div class="bx-menu-floating-blocks-title">__title__</div>
+            </bx_if:title>
         </a>                
     </li></bx_repeat:menu_items>
 </ul>

+ 3 - 1
template/menu_floating_blocks_dash.html

@@ -7,7 +7,9 @@
                         <bx_include_auto:menu_icon.html />
                     </div>
                     <div class="bx-menu-floating-blocks-dash-title">
-                        <div class="bx-menu-floating-blocks-title">__title__</div>
+                        <bx_if:title>
+                            <div class="bx-menu-floating-blocks-title">__title__</div>
+                        </bx_if:title>
                         <bx_if:addon>__addonf__</bx_if:addon>
                     </div>
                 </a>

+ 3 - 1
template/menu_floating_blocks_wide.html

@@ -5,7 +5,9 @@
             <div class="bx-menu-floating-blocks-icon">
                 <bx_include_auto:menu_icon.html />
             </div>
-            <div class="bx-menu-floating-blocks-title bx-def-font-middle">__title__</div>
+            <bx_if:title>
+                <div class="bx-menu-floating-blocks-title bx-def-font-middle">__title__</div>
+            </bx_if:title>
         </a>
         <bx_if:addon>__addonf__</bx_if:addon>
     </li></bx_repeat:menu_items>

+ 1 - 1
template/menu_interactive.html

@@ -7,7 +7,7 @@
             <div class="bx-def-padding-right bx-def-padding-sec-left bx-def-padding-sec-topbottom __class__" title="__title_attr__">__title__</div>
         </li>
         <li id="__id__-pas" class="bx-menu-inter-pas bx-def-round-corners bx-def-color-bg-hl-hover __class_wrp_pas__">
-            <a id="__id__" class="__class__" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> title="__title_attr__"__attrs__>
+            <a id="__id__" class="__class__" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
                 <div class="bx-def-padding-right bx-def-padding-sec-left bx-def-padding-sec-topbottom">__title__</div>
             </a>
         </li>

+ 1 - 1
template/menu_interactive_vertical.html

@@ -7,7 +7,7 @@
         </li>
         <li id="__name__-pas" class="bx-menu-inter-pas __class_wrp_pas__">
             <div class="bx-menu-item-cnt bx-stl-mil-wo-gaps">
-                <a id="__name__" class="__class__ bx-stl-mil-gaps group flex flex-auto items-center truncate" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> title="__title_attr__"__attrs__>
+                <a id="__name__" class="__class__ bx-stl-mil-gaps group flex flex-auto items-center truncate" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
                     <span class="bx-menu-item-title bx-stl-mit">__title__</span>
                 </a>
             </div>

+ 3 - 1
template/menu_main_in_panel.html

@@ -6,7 +6,9 @@
                     <span class="bx-menu-item-icon bx-stl-mii">
                         <bx_include_auto:menu_icon.html />
                     </span>
-                    <span class="bx-menu-item-title bx-stl-mit" sidebar-toggle-item>__title__</span>
+                    <bx_if:title>
+                        <span class="bx-menu-item-title bx-stl-mit" sidebar-toggle-item>__title__</span>
+                    </bx_if:title>
                 </a>
             </div>
         </li>

+ 3 - 1
template/menu_main_submenu.html

@@ -2,7 +2,9 @@
     <bx_repeat:menu_items>
         <li class="bx-def-padding-sec-right bx-def-padding-sec-left bx-def-color-bg-hl-hover __class_add__" __attrs_wrp__>
             <a href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
-                <span class="bx-menu-item-title">__title__</span>
+                <bx_if:title>
+                    <span class="bx-menu-item-title">__title__</span>
+                </bx_if:title>
                 <bx_if:addon>
                     <span class="bx-menu-addon">
                         <span class="bx-menu-addon-cnt bx-def-label menu py-1">__addon__</span>

+ 1 - 1
template/menu_main_submenu_more_auto.html

@@ -1,6 +1,6 @@
 <ul id="__html_id__" class="bx-menu-main-submenu<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ bx-clearfix">
     <bx_repeat:menu_items>
-        <li class="bx-menu-item bx-menu-item-__name__ bx-def-padding-sec-right bx-def-padding-sec-left bx-def-color-bg-hl-hover __class_add__"><a href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>__title__</a>__popup__</li>
+        <li class="bx-menu-item bx-menu-item-__name__ bx-def-padding-sec-right bx-def-padding-sec-left bx-def-color-bg-hl-hover __class_add__"><a href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__><bx_if:title>__title__</bx_if:title></a>__popup__</li>
     </bx_repeat:menu_items>
 </ul>
 __js_code__

+ 3 - 1
template/menu_multilevel.html

@@ -18,7 +18,9 @@
                                 <span class="bx-menu-item-icon bx-stl-mii flex-none group-hover:text-gray-700 dark:group-hover:text-gray-300">
                                     <bx_include_auto:menu_icon.html />
                                 </span>
-                                <span class="bx-menu-item-title bx-stl-mit flex-1 uppercase" sidebar-toggle-item>__title__</span>
+                                <bx_if:title>
+                                    <span class="bx-menu-item-title bx-stl-mit flex-1 uppercase" sidebar-toggle-item>__title__</span>
+                                </bx_if:title>
                                 <bx_if:show_toggler>
                                     <span class="bx-menu-collapse flex-none pl-2" sidebar-toggle-item>
                                         <i class="sys-icon chevron-up bx-menu-hide"></i>

+ 3 - 1
template/menu_multilevel_subitems.html

@@ -5,7 +5,9 @@
                 <span class="bx-menu-item-icon bx-stl-mii flex-none group-hover:text-gray-700 dark:group-hover:text-gray-300">
                     <bx_include_auto:menu_icon.html />
                 </span>
-                <span class="bx-menu-item-title bx-stl-mit flex-1" sidebar-toggle-item>__title__</span>
+                <bx_if:title>
+                    <span class="bx-menu-item-title bx-stl-mit flex-1" sidebar-toggle-item>__title__</span>
+                </bx_if:title>
                 <bx_if:addon>
                     <div class="bx-menu-addon bx-stl-mia flex-none group-hover:text-gray-800 dark:group-hover:text-gray-100">
                         <div class="bx-menu-addon-cnt bx-def-label menu">__addon__</div>

+ 3 - 1
template/menu_profile_followings.html

@@ -5,7 +5,9 @@
                 <div class="bx-menu-item-link bx-def-color-bg-hl-hover">
                     <a class="bx-stl-mil-gaps flex flex-auto items-center" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
                         <bx_include_auto:menu_icon.html />
-                        <span class="bx-menu-item-title bx-stl-mit flex-1 uppercase" sidebar-toggle-item>__title__</span>
+                        <bx_if:title>
+                            <span class="bx-menu-item-title bx-stl-mit flex-1 uppercase" sidebar-toggle-item>__title__</span>
+                        </bx_if:title>
                         <span class="bx-menu-collapse bx-def-padding-sec-left" sidebar-toggle-item>
                             <i class="sys-icon chevron-up bx-menu-hide"></i>
                             <i class="sys-icon chevron-down bx-menu-show"></i>

+ 3 - 1
template/menu_profile_followings_subitems.html

@@ -3,7 +3,9 @@
         <div class="bx-menu-item-cnt">
             <a class="bx-stl-mil-gaps flex flex-auto items-center" href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
                 <bx_include_auto:menu_icon.html />
-                <span class="bx-def-margin-sec-left-auto" sidebar-toggle-item>__title__</span>
+                <bx_if:title>
+                    <span class="bx-def-margin-sec-left-auto" sidebar-toggle-item>__title__</span>
+                </bx_if:title>
             </a>
             <bx_if:addon>
                 <div class="bx-menu-addon bx-def-padding-sec-left">

+ 7 - 4
template/menu_toolbar.html

@@ -1,10 +1,13 @@
 <ul class="bx-menu-toolbar bx-menu-object-__object__">
     <bx_repeat:menu_items>
         <li id="bx-menu-toolbar-item-__name__" class="bx-menu-toolbar-item bx-menu-item-__name__ bx-def-padding-thd-leftright bx-def-color-bg-hl-hover __class_add__">
-            <a href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__><bx_if:title><span class="bx-menu-toolbar-item-title bx-def-margin-thd-leftright bx-def-font-contrasted">__title__</span></bx_if:title><bx_if:icon><i class="sys-icon __icon__ bx-def-margin-thd-leftright"></i></bx_if:icon>
-			<bx_if:icon-a><i class="sys-icon-a bx-def-margin-thd-leftright" data-rotate="down" data-icon="__icon-a__" data-color="#fff"></i></bx_if:icon-a>
-			<bx_if:image><img class="bx-def-margin-thd-leftright" src="__icon_url__" /></bx_if:image>
-			<bx_if:unit><div class="bx-menu-toolbar-item-unit bx-def-margin-thd-leftright">__unit__</div></bx_if:unit><bx_if:addon>__addonf__</bx_if:addon></a>
+            <a href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
+                <bx_if:title><span class="bx-menu-toolbar-item-title bx-def-margin-thd-leftright bx-def-font-contrasted">__title__</span></bx_if:title>
+                <bx_if:icon><i class="sys-icon __icon__ bx-def-margin-thd-leftright"></i></bx_if:icon>
+                <bx_if:icon-a><i class="sys-icon-a bx-def-margin-thd-leftright" data-rotate="down" data-icon="__icon-a__" data-color="#fff"></i></bx_if:icon-a>
+                <bx_if:image><img class="bx-def-margin-thd-leftright" src="__icon_url__" /></bx_if:image>
+                <bx_if:unit><div class="bx-menu-toolbar-item-unit bx-def-margin-thd-leftright">__unit__</div></bx_if:unit><bx_if:addon>__addonf__</bx_if:addon>
+            </a>
         </li>
     </bx_repeat:menu_items>
 </ul>

+ 3 - 1
template/menu_vertical.html

@@ -6,7 +6,9 @@
                     <span class="bx-menu-item-icon bx-stl-mii">
                         <bx_include_auto:menu_icon.html />
                     </span>
-                    <span class="bx-menu-item-title bx-stl-mit" sidebar-toggle-item>__title__</span>
+                    <bx_if:title>
+                        <span class="bx-menu-item-title bx-stl-mit" sidebar-toggle-item>__title__</span>
+                    </bx_if:title>
                 </div>
             </a>
         </li>

+ 3 - 1
template/menu_vertical_lite.html

@@ -4,7 +4,9 @@
             <a href="__link__" <bx_if:onclick>onclick="__onclick__"</bx_if:onclick> __attrs__>
                 <bx_include_auto:menu_icon.html />
                 <bx_if:image_inline>__image__</bx_if:image_inline>
-                <span sidebar-toggle-item>__title__</span>
+                <bx_if:title>
+                    <span sidebar-toggle-item>__title__</span>
+                </bx_if:title>
             </a>
         </li>
     </bx_repeat:menu_items>

+ 3 - 1
template/menu_vertical_more_less.html

@@ -6,7 +6,9 @@
                     <span class="bx-menu-item-icon">
                         <bx_include_auto:menu_icon.html />
                     </span>
-                    <span class="bx-menu-item-title bx-def-margin-sec-left-auto" sidebar-toggle-item>__title__</span>
+                    <bx_if:title>
+                        <span class="bx-menu-item-title bx-def-margin-sec-left-auto" sidebar-toggle-item>__title__</span>
+                    </bx_if:title>
                 </a>
                 <bx_if:addon>
                     <div class="bx-menu-addon bx-def-padding-sec-left" sidebar-toggle-item>