[TikiWiki-commits] [Git][tikiwiki/tiki][master] [REF] Control Panels: Move the Tiki version and Git information from General...

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


Commits:
d8577c09 by Sandeep D at 2025-12-09T13:17:27+00:00
[REF] Control Panels: Move the Tiki version and Git information from General Preferences to display it on Admin Dashboard instead
---
* [REF] Update Git information display in admin templates

See merge request tikiwiki/tiki!9203

- - - - -


3 changed files:

- templates/admin/include_general.tpl
- templates/tiki-admin.tpl
- tiki-admin.php


Changes:

=====================================
templates/admin/include_general.tpl
=====================================
@@ -13,16 +13,6 @@
             <fieldset>
                 <legend class="h3">{tr}Release check{/tr}</legend>
                 {include file='admin/version_check.tpl'}
-                {remarksbox type="info" title="{tr}Tiki version{/tr}"}
-                    <div class="adminoptionbox">
-                        <strong>{tr}Tiki version: {/tr}</strong> {$tiki_version}
-                    </div>
-                    {if ! empty($git_details)}
-                        <div class="adminoptionbox">
-                            <strong>{tr}Git Information:{/tr}</strong> {$git_details.branch}: <a target="_blank" class="wiki external" href="https://gitlab.com/tikiwiki/tiki/-/commit/{$git_details.commit.hash}"><cite>{$git_details.commit.hash|substring:0:8}</cite></a>{icon name='link-external'} {tr}from{/tr} {$git_details.committer.date|tiki_short_datetime}
-                        </div>
-                    {/if}
-                {/remarksbox}
             </fieldset>
             <fieldset>
                 <legend class="h3">{tr}Site identity{/tr}</legend>


=====================================
templates/tiki-admin.tpl
=====================================
@@ -52,6 +52,18 @@
                 {breadcrumbs type="pagetitle" loc="page" crumbs=$crumbs}
             {/if}
             *}
+            {if ! empty($tiki_version)}
+                {remarksbox type="info" title="{tr}Tiki version{/tr}"}
+                    <div class="adminoptionbox">
+                        <strong>{tr}Tiki version: {/tr}</strong> {$tiki_version}{if !empty($db_engine_type)} ({$db_engine_type}){/if}
+                    </div>
+                    {if ! empty($git_details)}
+                        <div class="adminoptionbox">
+                            <strong>{tr}Git Information:{/tr}</strong> {$git_details.branch}: <a target="_blank" class="wiki external" href="https://gitlab.com/tikiwiki/tiki/-/commit/{$git_details.commit.hash}"><cite>{$git_details.commit.hash|substring:0:8}</cite></a>{icon name='link-external'} {tr}from{/tr} {$git_details.committer.date|tiki_short_datetime}
+                        </div>
+                    {/if}
+                {/remarksbox}
+            {/if}
             {if $mailer_queue_requires_update}
                 {remarksbox type="error" title="{tr}Email Queue Problem{/tr}"}
                     <p>{tr}There are messages in the email queue that exceeded the number of retries and will not be retried anymore.{/tr}</p>


=====================================
tiki-admin.php
=====================================
@@ -372,10 +372,15 @@ if ($prefs['feature_version_checks'] == 'y' || $forcecheck) {
     $versionUtils = new Tiki_Version_Utils();
     $upgrades = $versionUtils->checkUpdatesForVersion($TWV->version);
 
+    $gitlib = TikiLib::lib('git');
+    $gitDetails = $gitlib->isGitInstall() ? $gitlib->getGitDetails()['content'] : [];
+
     $smarty->assign('upgrade_messages', $upgrades);
+    $smarty->assign('git_details', $gitDetails);
     $smarty->assign('is_stable', $is_stable);
 } else {
     $smarty->assign('upgrade_messages', []);
+    $smarty->assign('git_details', []);
     $smarty->assign('is_stable', $is_stable);
 }
 



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

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