[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] Activity Rules page to use admin layout and add documentation links

luci pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
799e5bb8 by Espoir Baraka at 2026-04-28T13:25:34+00:00
[FIX] Activity Rules page to use admin layout and add documentation links
---
* [UPD] Fix Activity Rules page to use admin layout and add documentation links

See merge request tikiwiki/tiki!9390

- - - - -


2 changed files:

- lib/core/Services/ActivityStream/ManageController.php
- templates/managestream/list.tpl


Changes:

=====================================
lib/core/Services/ActivityStream/ManageController.php
=====================================
@@ -21,6 +21,30 @@ class Services_ActivityStream_ManageController
         }
 
         $this->lib = TikiLib::lib('activity');
+
+        global $prefs, $smarty, $headerlib;
+        // This controller is served via tiki-ajax_services.php, so it is not detected by
+        // the usual UAB trigger conditions based on PHP_SELF (lib/setup/theme.php).
+        // Activity Rules is admin-only, so we explicitly force admin section/layout here
+        // to render it consistently with other admin management pages.
+        \Tiki\Sections::setCurrentSection(\Tiki\Sections::SECTION_ADMIN_LAYOUT);
+        $prefs['site_layout_admin'] = 'admin';
+        $prefs['site_layout'] = 'admin';
+
+        // Load admin UI CSS and navigation icons
+        $headerlib->add_cssfile('themes/base_files/css/feature/adminui.css');
+        $smarty->assign('navbar_color_variant', $prefs['theme_navbar_color_variant_admin'] ?? $prefs['theme_navbar_color_variant']);
+
+        include_once 'admin/define_admin_icons.php';
+        global $admin_icons;
+        if (isset($admin_icons)) {
+            foreach ($admin_icons as & $admin_icon) {
+                foreach ($admin_icon['children'] as & $child) {
+                    $child = array_merge(['disabled' => false, 'description' => ''], $child);
+                }
+            }
+            $smarty->assign('admin_icons', $admin_icons);
+        }
     }
 
     /**


=====================================
templates/managestream/list.tpl
=====================================
@@ -1,5 +1,8 @@
-{extends $global_extend_layout|default:'layout_view.tpl'}
-{block name="navigation"}
+{extends $global_extend_layout|default:'layouts/admin/layout_view.tpl'}
+{block name="navigation"}{/block}
+{block name="title"}{/block}
+{block name="content"}
+    {title help="ActivityRules"}{tr}Activity Rules{/tr}{/title}
     {if $tiki_p_admin eq 'y'}
         <div class="t_navbar mb-4">
             <div class="btn-group">
@@ -22,10 +25,10 @@
                 </div>
             </div>
             {button href="tiki-admin.php?page=community" _icon_name="settings" _text="{tr}Community{/tr}" _class="tips" _title=":{tr}Community Control Panel{/tr}"}
-            
+
             {$headerlib->add_js_module("import handleMermaid from '@mermaidPack'; handleMermaid();")}
             <button class="btn btn-primary" data-bs-toggle="offcanvas" data-bs-target="#mermaidOffcanvas" aria-controls="mermaidOffcanvas">{icon name="diagram"} {tr}Event Chain Diagram{/tr}</button>
-            
+
             <div class="offcanvas offcanvas-start" style="width: 100vw !important;" tabindex="-1" id="mermaidOffcanvas" aria-labelledby="mermaidOffcanvasLabel">
                 <div class="offcanvas-header">
                     <h5 class="offcanvas-title" id="mermaidOffcanvasLabel">{tr}Event Chain Diagram{/tr}</h5>
@@ -40,11 +43,11 @@
             </div>
         </div>
     {/if}
-{/block}
-{block name="title"}
-    {title}{tr}Activity Rules{/tr}{/title}
-{/block}
-{block name="content"}
+    {remarksbox type="info" title="{tr}About Activity Rules{/tr}"}
+        {tr}Activity Rules allow you to configure how events in Tiki are processed and recorded in the Activity Stream. You can create rules to record events, trigger notifications, or perform custom actions based on specific events.{/tr}
+        <br><br>
+        {tr _0='<a class="alert-link" href="https://doc.tiki.org/PluginActivityStream" target="_blank" title="Activity Stream Documentation"><strong>' _1='</strong></a>'}For detailed information about Activity Stream and how to configure Activity Rules, please see %0Activity Stream Documentation%1 on Tiki's documentation site.{/tr}
+    {/remarksbox}
     <div class="styling-element">
     <div class="{if $js}table-responsive{/if}"> {* table-responsive class cuts off css drop-down menus *}
         <table class="table table-hover">



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

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