Ticket #4064 - Dashboard content/reports/audit issues.

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

@@ -56,7 +56,7 @@ li.bx-mi-hidden {
     justify-content: space-between;
 }
 .bx-popup .bx-menu-custom-ver li > span .bx-menu-addon {
-    padding-right: 0;
+    padding-right: 1.0rem;
 }
 
 /* --- Horizontal, Custom Horizontal Menus --- */

template/css/manage_tools.css

@@ -2,17 +2,7 @@
 div.bx-grid-header div.bx-form-element-wrapper {
     position: relative;
     float: left;
-    width: 165px;
-}
-div.bx-grid-header .bx-form-element-wrapper.bx-grid-controls-filter-datepicker{
-    width: auto;
-}
-div.bx-grid-header .bx-form-element-wrapper.bx-grid-controls-filter-label{
-    width: auto;
-}
-div.bx-grid-header .bx-form-element-wrapper.bx-grid-controls-filter-label .bx-form-input-wrapper{
-    height:2.5rem;
-    line-height:2.4rem;
+    width: 10rem;
 }
 
 /*--- Administration tools ---*/
@@ -22,11 +12,29 @@ div.bx-grid-header div.bx-form-element-wrapper {
 div.bx-grid-header div.bx-form-element-wrapper:last-child {
     margin-right: 0;
 }
-Div.bx-grid-header div#bx-form-element-search,
-div.bx-grid-header-controls-filter > .bx-form-element-wrapper {
+div.bx-grid-header div#bx-form-element-search {
     margin-top: 0px !important;
 }
 
-div.bx-grid-header .bx-form-element-wrapper.bx-grid-controls-filter-button{
-    margin-top:0.25rem !important;
+/*+++ Controls filter +++*/
+div.bx-grid-header div.bx-grid-header-controls-filter {
+    position: relative;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-align-items: center;
+    align-items: center;
+}
+div.bx-grid-header div.bx-grid-header-controls-filter > .bx-form-element-wrapper {
+    margin-top: 0px;
+    margin-bottom: 0px;
+}
+div.bx-grid-header .bx-form-element-wrapper.bx-grid-controls-filter-datepicker {
+    width: 11.375rem;
+}
+div.bx-grid-header .bx-form-element-wrapper.bx-grid-controls-filter-label {
+    width: auto;
+}
+div.bx-grid-header .bx-form-element-wrapper.bx-grid-controls-filter-label .bx-form-input-wrapper{
+    height:2.5rem;
+    line-height:2.4rem;
 }

template/menu_custom_item_addon.html

@@ -2,7 +2,7 @@
     <span class="flex justify-between items-center w-full">
         <a class="__class_link__ block p-2" href="__link__" onclick="__onclick__" title="__title_attr__"__attrs__><bx_include_auto:menu_icon.html /><bx_if:title><span class="bx-def-margin-sec-left-auto">__title__</span></bx_if:title></a>
         <bx_if:addon>
-            <div class="bx-menu-addon inline-block flex items-center pr-2">
+            <div class="bx-menu-addon inline-block flex items-center px-2">
                 <div class="bx-menu-addon-cnt h-5 px-2 bg-blue-200 text-blue-800 text-xs leading-5 rounded-full">__addon__</div>
             </div>                     
         </bx_if:addon>

template/scripts/BxBaseAuditGrid.php

@@ -18,6 +18,12 @@ class BxBaseAuditGrid extends BxDolAuditGrid
     
     public function getCode($isDisplayHeader = true)
     {
+        list($aCssCalendar, $aJsCalendar) = BxBaseFormView::getCssJsCalendar();
+
+        $this->_oTemplate->addCss(array_merge($aCssCalendar, ['manage_tools.css']));
+        $this->_oTemplate->addJs(array_merge($aJsCalendar, ['BxDolAuditManageTools.js', 'BxDolGrid.js']));
+        $this->_oTemplate->addJsTranslation(['_sys_grid_search']);
+
         return $this->getJsCode() . parent::getCode($isDisplayHeader);
     }
     

template/scripts/BxBaseAuditServices.php

@@ -23,13 +23,9 @@ class BxBaseAuditServices extends BxDol
         if(!$oGrid)
             return '';
 
-        $oTemplate = BxDolTemplate::getInstance();
-        $oTemplate->addJs(array('BxDolAuditManageTools.js', 'BxDolGrid.js'));
-        $oTemplate->addCss(array('manage_tools.css'));
-        $oTemplate->addJsTranslation(array('_sys_grid_search'));
-        return array(
+        return [
             'content' =>  $oGrid->getCode()
-        );
+        ];
     }
     
     public function serviceGetMemberships()

template/scripts/BxBaseDashboardServices.php

@@ -71,9 +71,13 @@ class BxBaseDashboardServices extends BxDol
     	$aModulesList = [];
         foreach($aModules as $aModule) {
             $oModule = BxDolModule::getInstance($aModule['name']);
-            if($oModule instanceof iBxDolContentInfoService && BxDolRequest::serviceExists($aModule['name'], 'manage_tools')) {
-                $aModulesList[$aModule['uri']] = $aModule;
-            }
+            if(!$oModule || !($oModule instanceof iBxDolContentInfoService))
+                continue;
+
+            if(empty($oModule->_oConfig->CNF['OBJECT_GRID_ADMINISTRATION']) || !bx_is_srv($aModule['name'], 'manage_tools'))
+                continue;
+
+            $aModulesList[$aModule['uri']] = $aModule;
         }
 
         $sSelected = bx_get('module');        

template/scripts/BxBaseFormView.php

@@ -2197,11 +2197,25 @@ BLAH;
         }
     }
 
-    static function getJsCalendarLangs ()
+    public static function getJsCalendarLangs ()
     {
         return array ('ar-dz' => 1, 'ar' => 1, 'at' => 1, 'az' => 1, 'be' => 1, 'bg' => 1, 'bn' => 1, 'bs' => 1, 'cat' => 1, 'ckb' => 1, 'cs' => 1, 'cy' => 1, 'da' => 1, 'de' => 1, 'default' => 1, 'eo' => 1, 'es' => 1, 'et' => 1, 'fa' => 1, 'fi' => 1, 'fo' => 1, 'fr' => 1, 'ga' => 1, 'gr' => 1, 'he' => 1, 'hi' => 1, 'hr' => 1, 'hu' => 1, 'hy' => 1, 'id' => 1, 'index' => 1, 'is' => 1, 'it' => 1, 'ja' => 1, 'ka' => 1, 'km' => 1, 'ko' => 1, 'kz' => 1, 'lt' => 1, 'lv' => 1, 'mk' => 1, 'mn' => 1, 'ms' => 1, 'my' => 1, 'nl' => 1, 'nn' => 1, 'no' => 1, 'pa' => 1, 'pl' => 1, 'pt' => 1, 'ro' => 1, 'ru' => 1, 'si' => 1, 'sk' => 1, 'sl' => 1, 'sq' => 1, 'sr-cyr' => 1, 'sr' => 1, 'sv' => 1, 'th' => 1, 'tr' => 1, 'uk' => 1, 'uz' => 1, 'uz_latn' => 1, 'vn' => 1, 'zh-tw' => 1, 'zh' => 1);
     }
     
+    public static function getCssJsCalendar()
+    {
+        $aLangs = self::getJsCalendarLangs();
+        $sLang = BxDolLanguages::getInstance()->detectLanguageFromArray($aLangs);
+
+        return [[
+                BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'flatpickr/dist/|flatpickr.min.css'
+            ], [
+                'flatpickr/dist/flatpickr.min.js',
+                'flatpickr/dist/l10n/' . $sLang . '.js',
+            ]
+        ];
+    }
+    
     function addCssJsUi ()
     {
         if (self::$_isCssJsUiAdded)
@@ -2233,15 +2247,10 @@ BLAH;
         if (self::$_isCssJsTimepickerAdded)
             return; 
 
-        $aLangs = $this->getJsCalendarLangs ();
-        $sLang = BxDolLanguages::getInstance()->detectLanguageFromArray ($aLangs);
+        list($aCss, $aJs) = self::getCssJsCalendar();
 
-        $this->_addJs(array(
-            'flatpickr/dist/flatpickr.min.js',
-            'flatpickr/dist/l10n/' . $sLang . '.js',
-        ), "'undefined' === typeof(flatpickr)");
-        
-        $this->_addCss(BX_DIRECTORY_PATH_PLUGINS_PUBLIC . 'flatpickr/dist/|flatpickr.min.css');
+        $this->_addCss($aCss);
+        $this->_addJs($aJs, "'undefined' === typeof(flatpickr)");        
 
         self::$_isCssJsTimepickerAdded = true;
     }