[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX][UI] UAB: correct layout on tiki-admin.php and fix admin modules transparent navbars

luci pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
46a23b79 by luci at 2026-06-13T21:57:52+00:00
[FIX][UI] UAB: correct layout on tiki-admin.php and fix admin modules transparent navbars
---
* [FIX][UI] UAB: correct layout on tiki-admin.php and fix admin modules transparent navbars

See merge request tikiwiki/tiki!10518

- - - - -


1 changed file:

- lib/setup/theme.php


Changes:

=====================================
lib/setup/theme.php
=====================================
@@ -125,7 +125,7 @@ if (
     || strpos($_SERVER['PHP_SELF'], 'tiki-sys'))
 ) { // TODO: refactor this check into an array of all admin and management pages we want to include and the related perms to access in UAB layout
     $headerlib->add_cssfile('themes/base_files/css/feature/adminui.css');
-    if (! str_contains($_SERVER['PHP_SELF'], 'tiki-admin.php') && ! str_contains($_SERVER['PHP_SELF'], 'tiki-admin_modules.php') && strpos($_SERVER['PHP_SELF'], 'tiki-admin_tracker_fields.php') === false) { // Exclude tiki-admin.php, tiki-admin_tracker_fields.php, and the modules admin here
+    if (! str_contains($_SERVER['PHP_SELF'], 'tiki-admin_modules.php') && strpos($_SERVER['PHP_SELF'], 'tiki-admin_tracker_fields.php') === false) { // Exclude tiki-admin_tracker_fields.php, and the modules admin here
         /* Force the admin layout on admin pages */
         $prefs['site_layout_admin'] = 'admin';
         /* Force the admin layout on setup/management pages too */
@@ -141,8 +141,10 @@ if (
         }
         $smarty->assign('admin_icons', $admin_icons);
     }
-    if (! str_contains($_SERVER['PHP_SELF'], 'tiki-admin_modules.php')) { // Exclude the modules admin here
+    if (! str_contains($_SERVER['PHP_SELF'], 'tiki-admin_modules.php') && ! str_contains($_SERVER['PHP_SELF'], 'tiki-admin_tracker_fields.php')) { // Exclude the modules admin and tracker fields admin here
         $smarty->assign('navbar_color_variant', $prefs['theme_navbar_color_variant_admin']);
+    } else {
+        $smarty->assign('navbar_color_variant', $prefs['theme_navbar_color_variant']);
     }
 } else {
     $smarty->assign('navbar_color_variant', $prefs['theme_navbar_color_variant']);



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/46a23b795b48cfb125e06ea406794dd590916032

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/46a23b795b48cfb125e06ea406794dd590916032
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs