[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX][UI] Made the module zone classes, headings, and roles consistent in the...
"Gary Cunningham-Lee \(--- via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <690a096f9c979_2ce24646555f@gitlab-sidekiq-low-urgency-cpu-bound-v2-7885c8fb68-vmnnb.mail> |
Gary Cunningham-Lee pushed to branch master at Tiki Wiki CMS Groupware / Tiki
Commits:
d54ecdab by Gary Cunningham-Lee at 2025-11-04T23:01:53+09:00
[FIX][UI] Made the module zone classes, headings, and roles consistent in the...
---
* [FIX][UI] Made the module zone classes, headings, and roles consistent in the three layout templates (except for some spacing classes, that need to be checked).
See merge request tikiwiki/tiki!8955
- - - - -
3 changed files:
- templates/layouts/basic/layout_view.tpl
- templates/layouts/classic/layout_view.tpl
- templates/layouts/social/layout_view.tpl
Changes:
=====================================
templates/layouts/basic/layout_view.tpl
=====================================
@@ -1,5 +1,5 @@
{capture assign=modzonetop}
- {modulelist zone=top class="top_modules navbar-{$navbar_color_variant}-parent bg-{$navbar_color_variant}-parent tiki-top-nav-{$navbar_color_variant}" heading_text='{tr}Site identity, navigation, etc.{/tr}'}
+ {modulelist zone=top class="top_modules navbar-{$navbar_color_variant}-parent bg-{$navbar_color_variant}-parent tiki-top-nav-{$navbar_color_variant}" heading_text='{tr}Site identity, navigation, etc.{/tr}' role=banner}
{/capture}
{capture assign=modzonetopbar}
{modulelist zone=topbar class="topbar_modules topbar navbar-{$navbar_color_variant} bg-{$navbar_color_variant} tiki-topbar-nav-{$navbar_color_variant} w-100 mb-sm" heading_text='{tr}Navigation and related functionality and content{/tr}'}
=====================================
templates/layouts/classic/layout_view.tpl
=====================================
@@ -1,8 +1,8 @@
{capture assign=modzonetop}
- {modulelist zone=top class="top_modules w-100 navbar-{$navbar_color_variant}-parent bg-{$navbar_color_variant}-parent tiki-top-nav-{$navbar_color_variant}" heading_text='{tr}Site identity, navigation, etc.{/tr}'}
+ {modulelist zone=top class="top_modules w-100 navbar-{$navbar_color_variant}-parent bg-{$navbar_color_variant}-parent tiki-top-nav-{$navbar_color_variant}" heading_text='{tr}Site identity, navigation, etc.{/tr}' role=banner}
{/capture}
{capture assign=modzonetopbar}
- {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}'}
+ {modulelist zone=topbar class="topbar_modules topbar 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}'}
{/capture}
{capture assign=modzonepagetop}
{modulelist zone=pagetop heading_text='{tr}Related content{/tr}' role=complementary}
@@ -17,7 +17,7 @@
{modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}' role=complementary}
{/capture}
{capture assign=modzonebottom}
- {modulelist zone=bottom class='mt-3' heading_text='{tr}Related content{/tr}' role=complementary}
+ {modulelist zone=bottom class='bottom_modules p-3 mt-3' heading_text='{tr}Site information, links, etc.{/tr}' role=contentinfo}
{/capture}
<!DOCTYPE html>
<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if Language::isRTL()} dir="rtl"{/if}{if !empty($page_id)} id="page_{$page_id}"{/if}>
=====================================
templates/layouts/social/layout_view.tpl
=====================================
@@ -5,13 +5,13 @@
{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}
{/capture}
{capture assign=modzonetopbar}
- {modulelist zone=topbar class='topbar_modules w-100' heading_text='{tr}Navigation and related functionality and content{/tr}'}
+ {modulelist zone=topbar class="topbar_modules topbar w-100" heading_text='{tr}Navigation and related functionality and content{/tr}'}
{/capture}
{capture assign=modzonepagetop}
{modulelist zone=pagetop heading_text='{tr}Related content{/tr}' role=complementary}
{/capture}
{capture assign=modzonepagebottom}
- {modulelist zone=pagebottom class='mt-3' heading_text='{tr}Pagebottom heading{/tr}' role=complementary}
+ {modulelist zone=pagebottom class='mt-3' heading_text='{tr}Related content{/tr}' role=complementary}
{/capture}
{capture assign=modzoneright}
{modulelist zone=right class="right-aside" heading_text='{tr}More content and functionality (right side){/tr}' role=complementary}
@@ -20,7 +20,7 @@
{modulelist zone=left class="left-aside" heading_text='{tr}More content and functionality (left side){/tr}' role=complementary}
{/capture}
{capture assign=modzonebottom}
- {modulelist zone=bottom class='bottom_modules p-3 mx-n2point5' heading_text='{tr}Site information, links, etc.{/tr}' role=contentinfo} {* div.modules *}
+ {modulelist zone=bottom class='bottom_modules p-3 mx-n2point5' heading_text='{tr}Site information, links, etc.{/tr}' role=contentinfo}
{/capture}
<!DOCTYPE html>
<html lang="{if !empty($pageLang)}{$pageLang}{else}{$prefs.language}{/if}"{if Language::isRTL()} dir="rtl"{/if}{if !empty($page_id)} id="page_{$page_id}"{/if}>
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/d54ecdab62e084a800de88cca3b4c11f22fefd25
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/d54ecdab62e084a800de88cca3b4c11f22fefd25
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