Skip to content

Commit 69422cc

Browse files
ggoffymambax7Copilot
authored
update modern theme (#14)
* updated KPI for active modules * show dashboard only for htdocs/admin.php * Update module definitions for clarity * Improve comments for active modules assignment Add comments to clarify admin-only module logic. * Update htdocs/modules/system/themes/modern/modern.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Michael Beck <mambax7@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent 631b31b commit 69422cc

3 files changed

Lines changed: 16 additions & 11 deletions

File tree

htdocs/modules/system/themes/modern/language/english/main.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@
2020

2121
// -- Dashboard: KPI Cards --
2222
define('_MODERN_TOTAL_USERS', 'Total Users');
23-
define('_MODERN_NEW_THIS_MONTH', 'new this month');
23+
define('_MODERN_NEW_THIS_MONTH', 'New this month');
2424
define('_MODERN_ACTIVE_MODULES', 'Active Modules');
25-
define('_MODERN_INACTIVE', 'inactive');
25+
define('_MODERN_ACTIVE_MODULES_USERS', 'User-Facing Modules');
26+
define('_MODERN_ACTIVE_MODULES_ADMINS', 'Admin-Only Modules');
2627
define('_MODERN_ACTIVE_USERS', 'Active Users');
2728
define('_MODERN_LAST_30_DAYS', 'Last 30 days');
2829
define('_MODERN_SERVER_LOAD', 'Server Load');

htdocs/modules/system/themes/modern/modern.php

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -243,18 +243,21 @@ private function getModuleStats(&$tpl)
243243
{
244244
/** @var XoopsModuleHandler $module_handler */
245245
$module_handler = xoops_getHandler('module');
246+
246247
$criteria = new CriteriaCompo();
247-
$criteria->add(new Criteria('hasmain', 1));
248+
// active modules
248249
$criteria->add(new Criteria('isactive', 1));
249-
250250
$active_modules = $module_handler->getCount($criteria);
251-
252-
$criteria_all = new Criteria('dirname', '', '!=');
253-
$total_modules = $module_handler->getCount($criteria_all);
251+
// active modules for user side
252+
$criteria->add(new Criteria('hasmain', 1));
253+
$active_modules_user = $module_handler->getCount($criteria);
254254

255255
$tpl->assign('active_modules', $active_modules);
256-
$tpl->assign('total_modules', $total_modules);
257-
$tpl->assign('inactive_modules', $total_modules - $active_modules);
256+
$tpl->assign('active_modules_user', $active_modules_user);
257+
// Modules without a frontend entry (hasmain=0) are admin-only by XOOPS design.
258+
// Every active module has at least hasmain=1 or hasadmin=1, so this subtraction
259+
// equals querying isactive=1 AND hasmain=0 without an extra DB round-trip.
260+
$tpl->assign('active_modules_admin', $active_modules - $active_modules_user);
258261
}
259262

260263
/**

htdocs/modules/system/themes/modern/xotpl/xo_dashboard.tpl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<{* Dashboard shown only on admin.php homepage *}>
2-
<{if $xoops_dirname == 'system' && !isset($smarty.get.fct)}>
2+
<{if $xoops_page == 'admin'}>
33
<section class="dashboard-section">
44
<!-- KPI Cards -->
55
<div class="kpis">
@@ -16,7 +16,8 @@
1616
<div class="kpi-label"><{$smarty.const._MODERN_ACTIVE_MODULES}></div>
1717
<div class="kpi-value"><{$active_modules}></div>
1818
<div class="kpi-change">
19-
<span><{$inactive_modules}> <{$smarty.const._MODERN_INACTIVE}></span>
19+
<span><{$smarty.const._MODERN_ACTIVE_MODULES_USERS}>: <{$active_modules_user}><br>
20+
<{$smarty.const._MODERN_ACTIVE_MODULES_ADMINS}>: <{$active_modules_admin}></span>
2021
</div>
2122
</div>
2223

0 commit comments

Comments
 (0)