Skip to content

Commit

Permalink
fix typo, improve html for module view
Browse files Browse the repository at this point in the history
  • Loading branch information
nworr committed Sep 30, 2024
1 parent b1b811b commit 3ef5a19
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
6 changes: 2 additions & 4 deletions lizmap/modules/admin/lib/ModulesInfo/ModulesChecker.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ class ModulesChecker
public function getList($withCore = false)
{
$moduleConfig = \jApp::config()->modules;

// file_get_contents(\jApp::varConfigPath('installer.ini.php'));
$installreRadr = new IniReader(\jApp::varConfigPath('installer.ini.php'));
$installReader = new IniReader(\jApp::varConfigPath('installer.ini.php'));

$enabledModuleName = array();
foreach ($moduleConfig as $paramName => $value) {
Expand All @@ -38,7 +36,7 @@ public function getList($withCore = false)
if ($coreModule && !$withCore) {
continue;
}
$version = $installreRadr->getValue($moduleSlug.'.version', 'modules');
$version = $installReader->getValue($moduleSlug.'.version', 'modules');
$enabledModuleName[] = new ModuleMetaData($moduleSlug, $version, $coreModule);
}
}
Expand Down
12 changes: 8 additions & 4 deletions lizmap/modules/admin/templates/server_information.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,21 @@
{if empty($modules)}
<p>{@admin.server.information.no.module@}</p>
{else}
<table class="table table-condensed table-striped table-bordered table-lizmap-modules">
<table class="table table-condensed table-striped table-bordered table-server-info table-lizmap-modules">
<thead>
<tr>
<th>{@admin.server.information.module@}</th>
<th>{@admin.server.information.module.version@}</th>
</tr>
</thead>
<tbody>
{foreach $modules as $module}
<tr>
<th style='width:20%;'> {$module->slug}</th>
<td style='width:20%;'>{$module->version}</td>
<th>{$module->slug}</th>
<td>{$module->version}</td>
</tr>
{/foreach}
</tbody>
{/if}
</table>

Expand Down Expand Up @@ -167,7 +171,7 @@
{* Fixed in lizmap_server plugin 1.3.2 https://github.com/3liz/qgis-lizmap-server-plugin/commit/eb6a773ba035f877e9fa91db5ef87911a2648ee1 *}
<th style="width:20%;">
{$version['name']}
{if $version['homepage']}
{if array_key_exists('homepage', $version)}
<a href="{$version['homepage']}" target="_blank"><span class='badge rounded-pill bg-secondary'>{@admin.server.information.qgis.plugin.help@}</span></a>
{/if}
</th>
Expand Down

0 comments on commit 3ef5a19

Please sign in to comment.