aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2024-05-22 19:20:57 +0200
committerHarald Eilertsen <haraldei@anduin.net>2024-06-12 15:11:27 +0200
commit13c074f8b8f8340efc7c5912c615b6cfa693409d (patch)
treeba25af8cb3fac211545ced2a0c8d0a06875889d4
parent9d56bb952e162dddd24d3bcdc50b2957ef0e0b97 (diff)
downloadvolse-hubzilla-13c074f8b8f8340efc7c5912c615b6cfa693409d.tar.gz
volse-hubzilla-13c074f8b8f8340efc7c5912c615b6cfa693409d.tar.bz2
volse-hubzilla-13c074f8b8f8340efc7c5912c615b6cfa693409d.zip
Module\Setup: Pass all required params for the template.
Non-existing keys in the array passed to the template causes a warning. Also make optional parts of the template actually optional by skipping them if the value is empty.
-rw-r--r--Zotlabs/Module/Setup.php2
-rw-r--r--view/tpl/install.tpl4
2 files changed, 5 insertions, 1 deletions
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index 647415385..a4204afd7 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -215,9 +215,11 @@ class Setup extends \Zotlabs\Web\Controller {
$tpl = get_markup_template('install.tpl');
return replace_macros($tpl, array(
'$title' => $install_title,
+ '$icon' => null,
'$pass' => '',
'$status' => t('Permission denied.'),
'$text' => '',
+ '$what_next' => null,
));
}
}
diff --git a/view/tpl/install.tpl b/view/tpl/install.tpl
index 5ab722b12..56faa0527 100644
--- a/view/tpl/install.tpl
+++ b/view/tpl/install.tpl
@@ -2,7 +2,9 @@
<div class="jumbotron">
<h1>{{$title}}</h1>
<hr class="my-4">
+ {{if $icon}}
<h2><i class="fa fa-{{$icon}}"></i>&nbsp; {{$pass}}</h2>
+ {{/if}}
</div>
{{if $status}}
@@ -11,5 +13,5 @@
<div class="alert alert-info">{{$text}}</div>
<br>
- {{$what_next}}
+ {{if $what_next}}{{$what_next}}{{/if}}
</div>