[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX][ENH] Fix forum thread breadcrumbs spacing and improve consistency

Benoit Grégoire pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
a700392c by UshindiG at 2026-01-30T20:30:51+00:00
[FIX][ENH] Fix forum thread breadcrumbs spacing and improve consistency
---
* [FIX][ENH] Fix forum thread breadcrumbs spacing and improve consistency

See merge request tikiwiki/tiki!9455

- - - - -


4 changed files:

- lib/breadcrumblib.php
- templates/modules/mod-breadcrumbs.tpl
- templates/tiki-view_forum.tpl
- templates/tiki-view_forum_thread.tpl


Changes:

=====================================
lib/breadcrumblib.php
=====================================
@@ -159,12 +159,12 @@ function _breadcrumb_buildTrail($crumbs, $len = -1, $cnt = -1, $showLinks = true
         }
         $ret = array_filter($ret);
         $wrapped = array_map(function ($crumb) {
-            return '<li class="breadcrumb-item pe-2">' . $crumb . '</li>';
+            return '<li class="breadcrumb-item">' . $crumb . '</li>';
         }, $ret);
         return implode('', $wrapped);
     } else {
         $crumb = _breadcrumb_buildCrumb($crumbs, $cnt, $loclass, $showLinks);
-        return $crumb ? '<li class="breadcrumb-item pe-2">' . $crumb . '</li>' : '';
+        return $crumb ? '<li class="breadcrumb-item">' . $crumb . '</li>' : '';
     }
 }
 


=====================================
templates/modules/mod-breadcrumbs.tpl
=====================================
@@ -4,51 +4,50 @@
         <nav id="sitelocbar" aria-label="breadcrumb">
             {if !empty($module_params.label) and not $crumbs_all_hidden}{tr}{$module_params.label|escape:"html"}{/tr} {/if}
             <ol class="breadcrumb"{if $prefs.site_crumb_seper} style="--bs-breadcrumb-divider: '{$prefs.site_crumb_seper|escape:'quotes'}'"{/if}>
-            {if $trail}
-                {breadcrumbs type="trail" loc="site" crumbs=$trail showLinks=$module_params.showLinks|default:null}
-            {else}
-                <li class="breadcrumb-item pe-2">
-                    <a title="{tr}{$crumbs[0]->description}{/tr}" href="{$crumbs[0]->url}" accesskey="1">{tr}{$crumbs[0]->title}{/tr}</a>
-                </li>
-                {if $structure eq 'y'}
-                    {section loop=$structure_path name=ix}
-                        <li class="breadcrumb-item pe-2">
-                            {if $structure_path[ix].pageName ne $page or $structure_path[ix].page_alias ne $page_info.page_alias}
-                                <a href="tiki-index.php?page_ref_id={$structure_path[ix].page_ref_id}">
+                {if $trail}
+                    {breadcrumbs type="trail" loc="site" crumbs=$trail showLinks=$module_params.showLinks|default:null}
+                {else}
+                    {if !empty($crumbs[0])}
+                        <li class="breadcrumb-item">
+                            <a title="{tr}{$crumbs[0]->description}{/tr}" href="{$crumbs[0]->url}" accesskey="1">{tr}{$crumbs[0]->title}{/tr}</a>
+                        </li>
+                    {/if}
+                    {if $structure eq 'y'}
+                        {section name=ix loop=$structure_path}
+                            {if $smarty.section.ix.last}
+                                <li class="breadcrumb-item active" aria-current="page">
                                     {if $structure_path[ix].page_alias}
                                         {$structure_path[ix].page_alias}
                                     {else}
                                         {$structure_path[ix].pageName}
                                     {/if}
-                                </a>
+                                </li>
                             {else}
-                                {if $structure_path[ix].page_alias}
-                                    {$structure_path[ix].page_alias}
-                                {else}
-                                    {$structure_path[ix].pageName}
-                                {/if}
+                                <li class="breadcrumb-item">
+                                    <a href="tiki-index.php?page_ref_id={$structure_path[ix].page_ref_id}">
+                                        {if $structure_path[ix].page_alias}
+                                            {$structure_path[ix].page_alias}
+                                        {else}
+                                            {$structure_path[ix].pageName}
+                                        {/if}
+                                    </a>
+                                </li>
                             {/if}
-                        </li>
-                    {/section}
-                {elseif $module_params.showLast eq 'y'}
-                    {if $page ne ''}
-                        <li class="breadcrumb-item pe-2">{$page|escape}</li>
-                    {elseif $title ne ''}
-                        <li class="breadcrumb-item pe-2">{$title}</li>
-                    {elseif $thread_info.title ne ''}
-                        <li class="breadcrumb-item pe-2">{$thread_info.title}</li>
-                    {elseif $forum_info.name ne ''}
-                        <li class="breadcrumb-item pe-2">{$forum_info.name}</li>
+                        {/section}
+                    {elseif $module_params.showLast eq 'y'}
+                        {if $page ne ''}
+                            <li class="breadcrumb-item active" aria-current="page">{$page|escape}</li>
+                        {elseif $title ne ''}
+                            <li class="breadcrumb-item active" aria-current="page">{$title}</li>
+                        {elseif $thread_info.title ne ''}
+                            <li class="breadcrumb-item active" aria-current="page">{$thread_info.title}</li>
+                        {elseif $forum_info.name ne ''}
+                            <li class="breadcrumb-item active" aria-current="page">{$forum_info.name}</li>
+                        {/if}
                     {/if}
                 {/if}
-            {/if}
             </ol>
-        </nav>{* bar with location indicator *}
-        {if $trail}
-            {breadcrumbs type="desc" loc="site" crumbs=$trail}
-        {else}
-            {breadcrumbs type="desc" loc="site" crumbs=$crumbs}
-        {/if}
+        </nav>
     {/if}
     {/strip}
 {/tikimodule}


=====================================
templates/tiki-view_forum.tpl
=====================================
@@ -133,17 +133,23 @@
             </div>
         {/if}
     </div>
-    <div class="breadcrumb">
-        <a class="link" href="{if $prefs.feature_sefurl eq 'y'}forums{else}tiki-forums.php{/if}">{tr}Forums{/tr}</a>
-        {$prefs.site_crumb_seper}
-        {foreach from=$parents item=parent}
-            {if isset($parent.name)}
-                <a class="link" href="{$parent.forumId|sefurl:'forum'}">{$parent.name|escape}</a>
-                {$prefs.site_crumb_seper}
-            {/if}
-        {/foreach}
-        <a class="link" href="{$forumId|sefurl:'forum'}">{$forum_info.name|escape}</a>
-    </div>
+    <nav aria-label="breadcrumb">
+        <ol class="breadcrumb"{if $prefs.site_crumb_seper} style="--bs-breadcrumb-divider: '{$prefs.site_crumb_seper|escape:'quotes'}'"{/if}>
+            <li class="breadcrumb-item">
+                <a class="link" href="{if $prefs.feature_sefurl eq 'y'}forums{else}tiki-forums.php{/if}">{tr}Forums{/tr}</a>
+            </li>
+            {foreach from=$parents item=parent}
+                {if isset($parent.name)}
+                    <li class="breadcrumb-item">
+                        <a class="link" href="{$parent.forumId|sefurl:'forum'}">{$parent.name|escape}</a>
+                    </li>
+                {/if}
+            {/foreach}
+            <li class="breadcrumb-item active" aria-current="page">
+                {$forum_info.name|escape}
+            </li>
+        </ol>
+    </nav>
 
     {if $tiki_p_forum_post_topic eq 'y'}
         {if $comment_preview eq 'y'}


=====================================
templates/tiki-view_forum_thread.tpl
=====================================
@@ -20,22 +20,28 @@
     {remarksbox type=warning title="{tr}The post has been reported and will be reviewed by a moderator.{/tr}"}{/remarksbox}
 {/if}
 <br>
-<div id="thread-breadcrumb" class="breadcrumb d-flex justify-content-between mb-4">
-    <div>
-    <a class="link" href="{if $prefs.feature_sefurl eq 'y'}forums{else}tiki-forums.php{/if}">
-        {tr}Forums{/tr}
-    </a>
-    {$prefs.site_crumb_seper}
-    <a class="link" href="{$forumId|sefurl:'forum'}">
-        {$forum_info.name|escape}
-    </a>{if isset($thread_info.topic.threadId) and $thread_info.topic.threadId}
-        {$prefs.site_crumb_seper}
-        <a class="link" href="{$thread_info.topic.threadId|sefurl:'forumthread'}{if !empty($smarty.request.topics_offset)}&amp;topics_offset={$smarty.request.topics_offset}{/if}{$topics_sort_mode_param}{$topics_threshold_param}{$topics_find_param}">
-            {$thread_info.topic.title|forummaskemail|escape}
-        </a>
-    {/if}
-    {$prefs.site_crumb_seper}
-    {$thread_info.title|forummaskemail|escape}
+<div id="thread-breadcrumb" class="mb-4">
+    <nav aria-label="breadcrumb">
+        <ol class="breadcrumb"{if $prefs.site_crumb_seper} style="--bs-breadcrumb-divider: '{$prefs.site_crumb_seper|escape:'quotes'}'"{/if}>
+            <li class="breadcrumb-item">
+                <a href="{if $prefs.feature_sefurl eq 'y'}forums{else}tiki-forums.php{/if}">{tr}Forums{/tr}</a>
+            </li>
+            <li class="breadcrumb-item">
+                <a href="{$forumId|sefurl:'forum'}">{$forum_info.name|escape}</a>
+            </li>
+            {if isset($thread_info.topic.threadId) and $thread_info.topic.threadId}
+                <li class="breadcrumb-item">
+                    <a href="{$thread_info.topic.threadId|sefurl:'forumthread'}{if !empty($smarty.request.topics_offset)}&amp;topics_offset={$smarty.request.topics_offset}{/if}{$topics_sort_mode_param}{$topics_threshold_param}{$topics_find_param}">
+                        {$thread_info.topic.title|forummaskemail|escape}
+                    </a>
+                </li>
+            {/if}
+            <li class="breadcrumb-item active" aria-current="page">
+                {$thread_info.title|forummaskemail|escape}
+            </li>
+        </ol>
+    </nav>
+</div>
     <div>
         {if empty($thread_info.topic.threadId)}
             <span>



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

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