[TikiWiki-commits] [Git][tikiwiki/tiki][30.x] [FIX] Fix module admin top spacing in social/classic layouts

Jonny Bradley pushed to branch 30.x at Tiki Wiki CMS Groupware / Tiki


Commits:
7e10e3fc by Jonny Bradley at 2026-04-07T13:21:27+00:00
[FIX] Fix module admin top spacing in social/classic layouts
---
* [FIX] Fix module admin top spacing in social/classic layouts
---
* [FIX] Fix module admin top spacing in social/classic layouts

See merge request tikiwiki/tiki!9899


(cherry picked from commit 522411b67cebcb964a80d2064e58f36945be27a3)

597eb1eb [FIX] Fix module admin top spacing in social/classic layouts

Co-authored-by: Espoir Baraka <[email protected]>

See merge request tikiwiki/tiki!9966

- - - - -


2 changed files:

- templates/layouts/classic/layout_view.tpl
- templates/layouts/social/layout_view.tpl


Changes:

=====================================
templates/layouts/classic/layout_view.tpl
=====================================
@@ -31,6 +31,7 @@
 {/if}
 
     <div class="middle_outer" id="middle_outer" >
+        {block name=module_header}{/block}
         <div class="topbar-wrapper navbar-{$navbar_color_variant}-parent bg-{$navbar_color_variant}-parent tiki-topbar-nav-{$navbar_color_variant}">
             <div class="topbar container{if $smarty.session.fullscreen eq 'y'}-fluid{/if} container-std navbar-{$navbar_color_variant}-parent bg-{$navbar_color_variant}-parent tiki-topbar-nav-{$navbar_color_variant}" id="topbar">
                 {modulelist zone=topbar class="topbar_modules w-100 navbar-{$navbar_color_variant} bg-{$navbar_color_variant} tiki-topbar-nav-{$navbar_color_variant}" heading_text='{tr}Navigation and related functionality and content{/tr}'}


=====================================
templates/layouts/social/layout_view.tpl
=====================================
@@ -32,7 +32,6 @@
         {include file='tiki-ajax_header.tpl'}
     {/if}
     <a class="btn btn-info btn-lg skipnav" href="#col1" role="button">{tr}Skip to main content{/tr}</a>
-    {block name=module_header}{/block}
     {if !isset($smarty.session.fullscreen) || isset($smarty.session.fullscreen) && $smarty.session.fullscreen ne 'y'}
         {if $prefs.theme_unified_admin_backend neq 'y' or $smarty.server.SCRIPT_NAME|strpos:'tiki-admin.php' === false}            
             <header
@@ -44,6 +43,7 @@
         {/if}
     {/if}
     <div class="middle_outer" id="middle_outer">
+        {block name=module_header}{/block}
         {if !isset($smarty.session.fullscreen) && $smarty.session.fullscreen ne 'y'}
             {if $prefs.theme_unified_admin_backend eq 'y' && $smarty.server.SCRIPT_NAME eq $url_path|cat:'tiki-admin.php'}
                 {modulelist zone=top class="top_modules uab top navbar-{$navbar_color_variant}-parent bg-{$navbar_color_variant}-parent tiki-top-nav-{$navbar_color_variant} w-100 mb-sm" heading_text='{tr}Site identity, navigation, etc.{/tr}' role=banner}



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

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