[TikiWiki-commits] [Git][tikiwiki/tiki][27.x] [ENH][FIX] theme: Make the header optionally fixed width

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


Commits:
e26ab5bf by Jonny Bradley at 2026-04-10T11:15:59+01:00
[ENH][FIX] theme: Make the header optionally fixed width
---
* [ENH][FIX] theme: Make the header optionally fixed width
---
* [FIX] theme: Better wording

* [ENH][FIX] theme: Make the header (in social layout) optionally have the same fixed width as the rest of the content (restores the fix from !9743 which redressed a regresion from 24.x, since partially reverted in !9808)

See merge request tikiwiki/tiki!9853

(cherry picked from commit 26c0dd3e2f17a651518a0f6a9bf19b265c0aeec4)

b2e07d5e [ENH][FIX] theme: Make the header (in social layout) optionally have the same...
86a39293 [FIX] theme: Better wording

Co-authored-by: Jonny Bradley <[email protected]>

See merge request tikiwiki/tiki!9964

# Conflicts fixed manually:
#	templates/layouts/social/layout_view.tpl

- - - - -


3 changed files:

- lib/prefs/layout.php
- templates/admin/include_look.tpl
- templates/layouts/social/layout_view.tpl


Changes:

=====================================
lib/prefs/layout.php
=====================================
@@ -18,6 +18,17 @@ function prefs_layout_list()
             'tags' => ['basic'],
             'default' => '',
         ],
+        'layout_fixed_width_header' => [
+            'name' => tra('Layout fixed width header'),
+            'description' => tra('The width of the site\'s header will match the content area width.'),
+            'type' => 'flag',
+            'hint' => tra('The default is to use a full width header.'),
+            'dependencies' => [
+                'feature_fixed_width',
+            ],
+            'tags' => ['basic'],
+            'default' => 'n',
+        ],
         'layout_tabs_optional' => [
             'name' => tra('Tabs optional'),
             'description' => tra('Users can choose not to have tabs. A <b>no tabs</b> button will be displayed.'),


=====================================
templates/admin/include_look.tpl
=====================================
@@ -129,6 +129,7 @@
             {preference name=feature_fixed_width}
             <div class="adminoptionboxchild" id="feature_fixed_width_childcontainer">
                 {preference name=layout_fixed_width}
+                {preference name=layout_fixed_width_header}
             </div>
             {preference name=site_layout}
             {preference name=site_layout_per_object}


=====================================
templates/layouts/social/layout_view.tpl
=====================================
@@ -187,7 +187,7 @@
         </footer>
         {if $prefs.theme_unified_admin_backend neq 'y' or $smarty.server.SCRIPT_NAME|strpos:'tiki-admin.php' === false}
             <header class="navbar navbar-expand-md  tiki-top-nav-{$navbar_color_variant} navbar-{$navbar_color_variant} bg-{$navbar_color_variant} fixed-top">
-                <div class="container-fluid">
+                <div class="container{if $prefs.feature_fixed_width eq 'y' and $prefs.layout_fixed_width_header neq 'y'}-fluid{/if}">
                     {modulelist zone=top class="top_modules w-100 tiki-top-nav-{$navbar_color_variant} navbar-{$navbar_color_variant}-parent bg-{$navbar_color_variant}-parent" heading_text='{tr}Site identity, navigation, etc.{/tr}' role=banner}
                 </div>
             </header>



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

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