[TikiWiki-commits] [Git][tikiwiki/tiki][29.x] [FIX][UX][UI] Unified Admin Backend (UAB): display only the admin specific...
"luci \(@luciash\) via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <6917a306237e3_2a3df7fc43962@gitlab-sidekiq-low-urgency-cpu-bound-v2-867694976-mf6r7.mail> |
luci pushed to branch 29.x at Tiki Wiki CMS Groupware / Tiki Commits: 745f0d3e by luci at 2025-11-14T21:37:59+00:00 [FIX][UX][UI] Unified Admin Backend (UAB): display only the admin specific... --- * [FIX][UX][UI] Unified Admin Backend (UAB): display only the admin specific modules and make them behave the same way on all admin panels and management pages --- * [FIX][UX][UI] Unified Admin Backend (UAB): simplify and fix the top bar modules alignment * oops, missing semicolon * [FIX][UX][UI] Unified Admin Backend (UAB): display only the admin specific modules and make them behave the same way on all admin panels and management pages See merge request tikiwiki/tiki!9029 (cherry picked from commit eb5b02caf15ad5564a8aa87dfef731e21d54609c) 86bd7e6f [FIX][UX][UI] Unified Admin Backend (UAB): display only the admin specific... c1d4c8b7 oops, missing semicolon 52237be7 [FIX][UX][UI] Unified Admin Backend (UAB): simplify and fix the top bar modules alignment Co-authored-by: luci <gitlab-TfYQc8/[email protected]> See merge request tikiwiki/tiki!9033 - - - - - 3 changed files: - lib/modules/modlib.php - lib/setup/theme.php - themes/base_files/css/feature/adminui.scss Changes: ===================================== lib/modules/modlib.php ===================================== @@ -528,11 +528,11 @@ class ModLib extends TikiLib return true; } } - // TODO: Check this if it behaves well on other "Admin" pages when UAB is enabled + // Load only the Unified Admin Interface (UAB) specific modules for Admins on admin panels/management pages $topLogin = $module['name'] === 'login_box' && $module['position'] === 'top'; $topQA = $module['name'] === 'quickadmin' && $module['position'] === 'top'; $footer = $module['position'] === 'bottom'; - $isControlPanel = $section === 'admin' && strpos($_SERVER['PHP_SELF'], 'tiki-admin.php') !== false; + $isControlPanel = $section === 'admin'; if ($prefs['theme_unified_admin_backend'] === 'y' && $isControlPanel && $module['position'] !== 'admin' && ! $topLogin && ! $footer && ! $topQA) { return false; ===================================== lib/setup/theme.php ===================================== @@ -131,6 +131,9 @@ if ( $prefs['site_layout_admin'] = 'admin'; /* Force the admin layout on setup/management pages too */ $prefs['site_layout'] = 'admin'; + /* Set the section to "admin" to display only the UAB specific modules (defined in lib/modules/modlib.php) */ + $section = 'admin'; + include_once 'admin/define_admin_icons.php'; foreach ($admin_icons as & $admin_icon) { foreach ($admin_icon['children'] as & $child) { ===================================== themes/base_files/css/feature/adminui.scss ===================================== @@ -56,7 +56,7 @@ body.tiki-admin { padding-left: 0; } -.tiki-admin .top_modules .box-login_box { margin-left: auto; justify-content: start; padding-top: 8px; } +.tiki-admin .top_modules .box-login_box { padding: 0; } @media (min-width: 992px) { .tiki-admin.uab aside.admin-nav .navbar-expand-lg .offcanvas .offcanvas-body { @@ -193,7 +193,6 @@ body.tiki-admin { } .tiki-admin .top_modules .box-quickadmin { - margin-left: auto !important; padding: 0 1.4rem; background-color: transparent !important; } @@ -585,18 +584,6 @@ body.tiki-admin { font-size: .875rem; } -.tiki-admin .top_modules .nav-link { - margin-top: .9rem; -} - -.tiki-admin .top_modules .btn.login_link { - margin-top: .8rem; -} - -.tiki-admin .top_modules .nav-link, .tiki-admin .top_modules .btn.login_link { - padding: 0 .6rem; -} - .tiki-admin .top_modules .login-box .dropdown-menu { min-width: unset; right: 0; @@ -646,7 +633,6 @@ body.tiki-admin { } .tiki-admin .siteloginbar_popup img { - vertical-align: baseline; max-width: 38px; max-height: 38px; } @@ -763,11 +749,6 @@ body.tiki-admin { width: 2rem; } -.tiki-admin .siteloginbar_popup.dropdown { - right: 0; - position: fixed; -} - // Preference bar .tiki-admin .admin-content nav.admin-navbar { background-color: transparent !important; View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/745f0d3e3c33b0d6e992a77977e39a8b831bf031 -- View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/745f0d3e3c33b0d6e992a77977e39a8b831bf031 You're receiving this email because of your account on gitlab.com. _______________________________________________ TikiWiki-cvs mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs