Quellcode durchsuchen

Ticket #3766 - Artificer template: Forms, Menus, Action menus in Timeline and comments.

AntonLV vor 4 Jahren
Ursprung
Commit
725f48ebfd

+ 1 - 1
modules/boonex/artificer/data/template/bx_timeline/item_outline.html

@@ -77,7 +77,7 @@
                 </bx_if:show_menu_item_actions>
                <bx_if:show_manage>
                 <div class="__style_prefix__-item-manage">
-                    <a class="group flex items-center p-1 px-2 border border-transparent rounded-md space-x-1 text-gray-500 hover:text-gray-700 dark:text-gray-500 dark:hover:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700" href="javascript:void(0)" onclick="__onclick__">
+                    <a class="group bx-stl-mil-sm" href="javascript:void(0)" onclick="__onclick__">
                         <span class="bx-menu-item-icon bx-def-align-center leading-5"><i class="sys-icon ellipsis-h"></i></span>
                     </a>
                 </div>

+ 1 - 1
modules/boonex/artificer/data/template/bx_timeline/item_timeline.html

@@ -80,7 +80,7 @@
             </bx_if:show_menu_item_actions>
             <bx_if:show_manage>
                 <div class="__style_prefix__-item-manage">
-                    <a class="group bx-stl-mil" href="javascript:void(0)" onclick="__onclick__">
+                    <a class="group bx-stl-mil-sm" href="javascript:void(0)" onclick="__onclick__">
                         <span class="bx-menu-item-icon bx-def-align-center leading-5"><i class="sys-icon ellipsis-h"></i></span>
                     </a>
                 </div>

+ 1 - 1
modules/boonex/artificer/data/template/bx_timeline/menu_custom_hor_bx_timeline_menu_item_actions.html

@@ -1,5 +1,5 @@
 <ul id="__html_id__" class="bx-menu-custom bx-menu-custom-hor bx-menu-hor-inline<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex justify-start items-start space-x-2">
     <bx_repeat:menu_items>
-        <li class="bx-menu-item bx-menu-item-__name____class__ bx-stl-mil group">__item__</li>
+        <li class="bx-menu-item bx-menu-item-__name____class__ bx-stl-mil-sm group">__item__</li>
     </bx_repeat:menu_items>
 </ul>__js_code__

+ 1 - 1
modules/boonex/artificer/data/template/bx_timeline/menu_custom_item_hor.html

@@ -1,7 +1,7 @@
 <span class="__class_wrp__ menu-custom-item-hor mci-action">
     <a class="__class_link__ flex items-center" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
         <span class="flex items-center">
-            <span class="bx-menu-item-icon bx-stl-mii group-hover:text-gray-700 dark:group-hover:text-gray-300">
+            <span class="bx-menu-item-icon bx-stl-mii-sm group-hover:text-gray-700 dark:group-hover:text-gray-300">
                 <bx_include_auto:menu_icon.html />
             </span>
             <bx_if:title>

+ 1 - 1
modules/boonex/artificer/data/template/bx_timeline/menu_custom_item_ver.html

@@ -1,7 +1,7 @@
 <span class="__class_wrp__ menu-custom-item-ver mci-manage">
     <a class="__class_link__ flex items-center space-x-1" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
         <span class="flex items-center">
-            <span class="bx-menu-item-icon bx-stl-mii group-hover:text-gray-700 dark:group-hover:text-gray-300">
+            <span class="bx-menu-item-icon bx-stl-mii-sm group-hover:text-gray-700 dark:group-hover:text-gray-300">
                 <bx_include_auto:menu_icon.html />
             </span>
             <bx_if:title><span class="bx-menu-item-title bx-stl-mit">__title__</span></bx_if:title>

+ 1 - 1
modules/boonex/artificer/data/template/bx_timeline/menu_custom_ver_bx_timeline_menu_item_manage.html

@@ -1,7 +1,7 @@
 <div class="w-full md:w-56 box-border">
     <ul class="bx-menu-custom bx-menu-custom-ver bx-menu-object-__object__ bx-clearfix">
         <bx_repeat:menu_items>
-            <li class="bx-menu-item bx-menu-item-__name____class__ bx-stl-mil group">__item__</li>
+            <li class="bx-menu-item bx-menu-item-__name____class__ bx-stl-mil-sm group">__item__</li>
         </bx_repeat:menu_items>
     </ul>
 </div>

+ 18 - 0
modules/boonex/artificer/data/template/bx_timeline/menu_vertical_bx_timeline_menu_item_share.html

@@ -0,0 +1,18 @@
+<ul class="bx-menu-ver bx-menu-object-__object__ bx-clearfix">
+    <bx_repeat:menu_items>
+        <li class="bx-menu-item __name__ __class_add__ bx-stl-mil-sm group">
+            <a class="__name__ flex flex-2 items-center truncate" href="__link__" onclick="__onclick__" __attrs__>
+                <span class="bx-menu-item-icon bx-stl-mii-sm 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">__title__</span>
+            </a>
+        </li>
+    </bx_repeat:menu_items>
+</ul>
+<script language="javascript">
+    $(document).ready(function () {
+        // add default class to active menu items
+        $('.bx-menu-ver > li.bx-menu-tab-active').not('.bx-def-color-bg-active').addClass('bx-def-color-bg-active');
+    });
+</script>

+ 4 - 0
modules/boonex/artificer/data/template/system/css/menu.css

@@ -108,6 +108,10 @@ li.bx-mi-hidden {
     right: -0.375rem;
     padding: 0 0.25rem;
 }
+.bx-menu-toolbar .bx-menu-toolbar-item .bx-menu-toolbar-item-unit .bx-def-icon-size {
+    width: 2.5rem;
+    height: 2.5rem;
+}
 .bx-menu-toolbar .bx-menu-toolbar-item .bx-menu-toolbar-item-unit .bx-base-pofile-unit-online {
     display: none;
 }

+ 1 - 1
modules/boonex/artificer/data/template/system/menu_custom_hor_sys_cmts_item_actions.html

@@ -1,6 +1,6 @@
 <ul id="__html_id__" class="bx-menu-custom bx-menu-custom-hor bx-menu-hor-inline<bx_if:show_more_auto_class> bx-menu-more-auto</bx_if:show_more_auto_class> bx-menu-object-__object__ flex justify-start space-x-2 pb-3 md:pb-4">
     <bx_repeat:menu_items>
-        <li class="bx-menu-item bx-menu-item-__name____class__ bx-stl-mil group">__item__</li>
+        <li class="bx-menu-item bx-menu-item-__name____class__ bx-stl-mil-sm group">__item__</li>
     </bx_repeat:menu_items>
 </ul>
 __js_code__

+ 1 - 1
modules/boonex/artificer/data/template/system/menu_custom_item_sys_cmts_item_actions.html

@@ -1,6 +1,6 @@
 <span class="__class_wrp__">
     <a class="__class_link__ flex items-center" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
-        <span class="bx-menu-item-icon bx-stl-mii group-hover:text-gray-700 dark:group-hover:text-gray-300">
+        <span class="bx-menu-item-icon bx-stl-mii-sm group-hover:text-gray-700 dark:group-hover:text-gray-300">
             <bx_include_auto:menu_icon.html />
         </span>
         <bx_if:title>

+ 1 - 1
modules/boonex/artificer/data/template/system/menu_custom_item_sys_cmts_item_manage.html

@@ -1,6 +1,6 @@
 <span class="__class_wrp__">
     <a class="__class_link__ flex items-center" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__>
-        <span class="bx-menu-item-icon bx-stl-mii group-hover:text-gray-700 dark:group-hover:text-gray-300">
+        <span class="bx-menu-item-icon bx-stl-mii-sm group-hover:text-gray-700 dark:group-hover:text-gray-300">
             <bx_include_auto:menu_icon.html />
         </span>
         <bx_if:title>

+ 1 - 1
modules/boonex/artificer/data/template/system/menu_custom_ver_sys_cmts_item_manage.html

@@ -1,7 +1,7 @@
 <div class="w-full md:w-56 box-border">
     <ul class="bx-menu-custom bx-menu-custom-ver bx-menu-object-__object__">
         <bx_repeat:menu_items>
-            <li class="bx-menu-item bx-menu-item-__name____class__ bx-stl-mil group">__item__</li>
+            <li class="bx-menu-item bx-menu-item-__name____class__ bx-stl-mil-sm group">__item__</li>
         </bx_repeat:menu_items>
     </ul>
 </div>

+ 7 - 6
modules/boonex/artificer/data/template/system/menu_toolbar.html

@@ -1,12 +1,13 @@
 <ul class="bx-menu-toolbar bx-menu-object-__object__ flex items-center pr-0 md:pr-2">
     <bx_repeat:menu_items>
-        <li id="bx-menu-toolbar-item-__name__" class="bx-menu-toolbar-item bx-menu-item-__name__ group relative inline-flex items-center ml-3 first:ml-0 text-gray-500 dark:text-gray-300 hover:text-gray-800 dark:hover:text-gray-100 border border-transparent rounded-full bg-gray-100 dark:bg-gray-700 hover:bg-gray-200 dark:hover:bg-gray-600 __class_add__">
+        <li id="bx-menu-toolbar-item-__name__" class="bx-menu-toolbar-item bx-menu-item-__name__ group relative inline-flex items-center ml-3 first:ml-0 text-gray-600 dark:text-gray-400 hover:text-gray-800 dark:hover:text-gray-200 text-base font-medium leading-6 border border-transparent hover:border-gray-200/50 active:border-gray-300 dark:hover:border-gray-700/50 dark:active:border-gray-700 bg-gray-100 dark:bg-gray-700/50 active:bg-gray-300 dark:active:bg-black/50 hover:bg-gray-200/50 dark:hover:bg-gray-700/50 rounded-full __class_add__">
             <a href="__link__" onclick="__onclick__" class="inline-block rounded-full __class_add_a__"__attrs__>
-				<bx_if:icon><span class="relative block h-8 w-8 flex items-center justify-center"><i class="sys-icon __icon__"></i></bx_if:icon>
-					<bx_if:icon-a><i class="sys-icon-a" data-rotate="down" data-icon="__icon-a__" data-color="#fff"></i></bx_if:icon-a>
-					<bx_if:image><img class="" src="__icon_url__" /></bx_if:image>
-					<bx_if:icon-html>__icon__</bx_if:icon-html>
-					<bx_if:unit><div class="bx-menu-toolbar-item-unit">__unit__</div></bx_if:unit><bx_if:addon>__addonf__</bx_if:addon><bx_if:title><span class="bx-menu-toolbar-item-title sr-only">__title__</span></bx_if:title></a>
+                <bx_if:icon><span class="relative block h-10 w-10 flex items-center justify-center"><i class="sys-icon __icon__"></i></bx_if:icon>
+                <bx_if:icon-a><i class="sys-icon-a" data-rotate="down" data-icon="__icon-a__" data-color="#fff"></i></bx_if:icon-a>
+                <bx_if:image><img class="" src="__icon_url__" /></bx_if:image>
+                <bx_if:icon-html>__icon__</bx_if:icon-html>
+                <bx_if:unit><div class="bx-menu-toolbar-item-unit">__unit__</div></bx_if:unit><bx_if:addon>__addonf__</bx_if:addon><bx_if:title><span class="bx-menu-toolbar-item-title sr-only">__title__</span></bx_if:title>
+            </a>
         </li>
     </bx_repeat:menu_items>
 </ul>

+ 4 - 2
modules/boonex/timeline/classes/BxTimelineMenuItemShare.php

@@ -14,6 +14,7 @@
  */
 class BxTimelineMenuItemShare extends BxTemplMenu
 {
+    protected $_sModule;
     protected $_oModule;
 
     protected $_iEvent;
@@ -21,9 +22,10 @@ class BxTimelineMenuItemShare extends BxTemplMenu
 
     public function __construct($aObject, $oTemplate = false)
     {
-        parent::__construct($aObject, $oTemplate);
+        $this->_sModule = 'bx_timeline';
+        $this->_oModule = BxDolModule::getInstance($this->_sModule);
 
-        $this->_oModule = BxDolModule::getInstance('bx_timeline');
+        parent::__construct($aObject, $this->_oModule->_oTemplate);
 
         $iContentId = 0;
         if(bx_get('content_id') !== false)

+ 11 - 6
plugins_public/tailwind/css/tailwind.css

@@ -664,7 +664,7 @@
     .bx-artificer .bx-form-input-text,
     .bx-artificer .bx-form-input-price,
     .bx-artificer .bx-form-input-wrapper-price span {
-        @apply block w-full px-3 py-1.5;
+        @apply block w-full px-3 py-2;
         @apply bg-gray-50 dark:bg-gray-900/50 focus:bg-white dark:focus:bg-gray-900;
         @apply border border-gray-300 dark:border-gray-700 focus:border-blue-500 dark:focus:border-blue-500 focus:border-opacity-70 focus:ring-2 focus:ring-blue-500 focus:ring-opacity-20 focus:outline-none;
         @apply leading-6 text-base font-medium text-gray-700 dark:text-gray-300 focus:text-gray-900 dark:focus:text-gray-100;
@@ -852,24 +852,29 @@
     }
     .bx-stl-mii,
     .bx-stl-mii-sm,
-    .bx-stl-mil .sys-action-do-icon {
+    .bx-stl-mil .sys-action-do-icon,
+    .bx-stl-mil-sm .sys-action-do-icon {
         @apply flex items-center justify-center text-gray-500 text-lg;
     }
     
     .bx-stl-mii > *,
     .bx-stl-mii-sm > *,
-    .bx-stl-mil .sys-action-do-icon > * {
+    .bx-stl-mil .sys-action-do-icon > *,
+    .bx-stl-mil-sm .sys-action-do-icon > * {
         @apply flex items-center justify-center h-6 w-6 mr-3;
     }
     .bx-stl-mii:last-child > *,
     .bx-stl-mii-sm:last-child > *,
-    .bx-stl-mil .sys-action-do-icon:last-child > * {
+    .bx-stl-mil .sys-action-do-icon:last-child > *,
+    .bx-stl-mil-sm .sys-action-do-icon:last-child > * {
         @apply mr-0;
     }
-    .bx-stl-mil .sys-action-do-icon ~ .sys-action-do-text {
+    .bx-stl-mil .sys-action-do-icon ~ .sys-action-do-text,
+    .bx-stl-mil-sm .sys-action-do-icon ~ .sys-action-do-text {
         @apply ml-0; 
     }
-    .bx-stl-mii-sm > * {
+    .bx-stl-mii-sm > *,
+    .bx-stl-mil-sm .sys-action-do-icon > * {
         @apply h-5 w-5 mr-1.5 text-sm;
     }
     .bx-stl-mit {

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
plugins_public/tailwind/css/tailwind.min.css


Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.