[TikiWiki-commits] [Git][tikiwiki/tiki][master] [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 | <69177ed4bb9c6_2aae85bc65657@gitlab-sidekiq-low-urgency-cpu-bound-v2-59ccd46784-jskt9.mail> |
luci pushed to branch master at Tiki Wiki CMS Groupware / Tiki
Commits:
eb5b02ca by luci at 2025-11-14T19:03:27+00:00
[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
- - - - -
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 {
@@ -154,7 +154,6 @@ body.tiki-admin {
}
.tiki-admin .top_modules .box-quickadmin {
- margin-left: auto !important;
padding: 0 1.4rem;
background-color: transparent !important;
}
@@ -532,18 +531,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;
@@ -593,7 +580,6 @@ body.tiki-admin {
}
.tiki-admin .siteloginbar_popup img {
- vertical-align: baseline;
max-width: 38px;
max-height: 38px;
}
@@ -694,11 +680,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/eb5b02caf15ad5564a8aa87dfef731e21d54609c
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/eb5b02caf15ad5564a8aa87dfef731e21d54609c
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