[TikiWiki-commits] [Git][tikiwiki/tiki][master] [ENH] Trackers: Grouping of the properties, fields and items buttons and...

Jonny Bradley pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
38e61988 by NasserNgandu at 2026-05-19T12:36:31+00:00
[ENH] Trackers: Grouping of the properties, fields and items buttons and highlighting the active one
---
* [FIX] Title Correct

* [FIX] Code Correct

* [FIX] Code Correct

* [ENH] Tracker: Grouping of the properties, fields and items buttons and disabling the fields button if you are not on the fields page

See merge request tikiwiki/tiki!10134

- - - - -


2 changed files:

- templates/tiki-view_tracker.tpl
- templates/tracker_actions.tpl


Changes:

=====================================
templates/tiki-view_tracker.tpl
=====================================
@@ -20,7 +20,7 @@
         {/if}
         
     {/if}
-    {include file="tracker_actions.tpl" showitems="n"}
+    {include file="tracker_actions.tpl"}
     <div class="btn-group float-sm-end">
         {if ! $js}<ul><li>{/if}
                 {if $prefs.feature_group_watches eq 'y' or $prefs.feature_user_watches eq 'y' or $prefs.feed_tracker eq 'y' or $tiki_p_admin_trackers eq 'y' or $tiki_p_export_tracker eq 'y' or $prefs.sefurl_short_url eq 'y'}


=====================================
templates/tracker_actions.tpl
=====================================
@@ -1,25 +1,22 @@
 {* navbar buttons at the top of the tracker pages *}
 <div class="btn-group">
-
+{if $tiki_p_list_trackers eq 'y'}
+    <a class="btn btn-info tips" title=":{tr}List all trackers (you have the permission to see){/tr}" href="{if $prefs.feature_sefurl eq 'y'}trackers{else}tiki-list_trackers.php{/if}">
+        {icon name="trackers"} {tr}Trackers{/tr}
+    </a>
+{/if}
+</div>
+<div class="btn-group">
 {if $tiki_p_admin_trackers eq 'y' and !empty($trackerId)}
     <a class="btn btn-info tracker-properties tips" title=":{tr _0="{$tracker_info.name|escape}"}Edit the configuration properties of tracker “%0”{/tr}" href="{bootstrap_modal controller=tracker action=replace trackerId=$trackerId}">
         {icon name="settings"} {tr}Properties{/tr}
     </a>
-    <a class="btn btn-info tips" title=":{tr _0="{$tracker_info.name|escape}"}Configure the data fields for tracker “%0”{/tr}" href="{$trackerId|sefurl:'trackerfields'}">
+    <a class="btn btn-info tips{if $smarty.server.SCRIPT_NAME|strpos:'tiki-admin_tracker_fields.php' !== false} active{/if}" title=":{tr _0="{$tracker_info.name|escape}"}Configure the data fields for tracker “%0”{/tr}" href="{$trackerId|sefurl:'trackerfields'}">
         {icon name="th-list"} {tr}Fields{/tr}
     </a>
 {/if}
-
-</div>
-<div class="btn-group">
-{if $tiki_p_list_trackers eq 'y'}
-    <a class="btn btn-info tips" title=":{tr}List all trackers (you have the permission to see){/tr}" href="{if $prefs.feature_sefurl eq 'y'}trackers{else}tiki-list_trackers.php{/if}">
-        {icon name="trackers"} {tr}Trackers{/tr}
-    </a>
-{/if}
-
-{if !empty($trackerId) and $tiki_p_view_trackers eq 'y' && (empty($showitems) || $showitems !== 'n')}
-    <a class="btn btn-info tips" title=":{tr _0="{$tracker_info.name|escape}"}Go back to the list of items for “%0”{/tr}" href="{$trackerId|sefurl:"tracker"}">
+{if !empty($trackerId) and $tiki_p_view_trackers eq 'y'}
+    <a class="btn btn-info tips{if $smarty.server.SCRIPT_NAME|strpos:'tiki-view_tracker.php' !== false} active{/if}" title=":{tr _0="{$tracker_info.name|escape}"}List of items for “%0”{/tr}" href="{$trackerId|sefurl:"tracker"}">
         {icon name="list"} {tr}Items{/tr}
     </a>
 {/if}



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

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