[TikiWiki-commits] [Git][tikiwiki/tiki][30.x] [BP][FIX][UI] UAB: avoid duplicate admin dashboard layout

MAGENE Sem Joel pushed to branch 30.x at Tiki Wiki CMS Groupware / Tiki


Commits:
f9b6cfab by MAGENE Sem Joel at 2026-06-16T16:28:54+00:00
[BP][FIX][UI] UAB: avoid duplicate admin dashboard layout
---
* [FIX][UI] UAB: avoid duplicate admin dashboard layout
---
* [FIX][UI] UAB: avoid duplicate admin dashboard layout

See merge request tikiwiki/tiki!10538

(cherry picked from commit 4496f331ed6d38a6f3e8568c1c3f3d1177ca69a3)

See merge request tikiwiki/tiki!10539

- - - - -


1 changed file:

- templates/tiki-admin.tpl


Changes:

=====================================
templates/tiki-admin.tpl
=====================================
@@ -1,3 +1,5 @@
+{assign var=adminLayoutChrome value=($prefs.theme_unified_admin_backend eq 'y' && $prefs.site_layout eq 'admin')}
+{if !$adminLayoutChrome}
 <div class="admin-wrapper highlightable{* {if $prefs.theme_unified_admin_backend eq 'y'} overflow-auto{/if} *}">
     {if $prefs.theme_unified_admin_backend eq 'y'}
         <aside class="admin-nav">
@@ -34,6 +36,7 @@
             </form>
         {/if} *}
         {include file="admin/admin_navbar.tpl"}
+{/if}
         {if $prefs.sender_email eq ''}
             {remarksbox type=warning title="{tr}Warning{/tr}" close="y"}
                 {tr _0='<a href="tiki-admin.php?page=general&highlight=sender_email" class="alert-link">' _1="</a>"}Your sender email is not set. You can set it %0in the general admin panel%1.{/tr}
@@ -334,5 +337,7 @@
             {/if}
             {include file="admin/include_$include.tpl"}
         {/if}
+{if !$adminLayoutChrome}
+        </div>
     </div>
-</div>
+{/if}



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

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/f9b6cfab0c526a201dc47ffe8907779a5a07cdaa
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