Commit 1f3458ec authored by Franco Fichtner's avatar Franco Fichtner

wizard: tweak previous

parent 7b6ab769
<menu>
<Lobby order="10" cssClass="fa fa-laptop">
<Dashboard order="0" url="/index.php" cssClass="fa fa-dashboard fa-fw">
<Args url="/index.php*" visibility="hidden"/>
<Root url="/" visibility="hidden"/>
</Dashboard>
<License order="1" url="/license.php" cssClass="fa fa-balance-scale fa-fw"/>
......
......@@ -636,8 +636,8 @@
</field>
<field>
<type>refresh</type>
<!-- XXX use $myurl -->
<content>5;/index.php?wizard_done</content>
<time>5</time>
<page>index.php?wizard_done</page>
</field>
</fields>
<stepafterformdisplay>
......
......@@ -110,7 +110,14 @@ include("fbegin.inc");?>
</script>
<header class="page-content-head">
<div class="container-fluid">
<?php
if (isset($config['trigger_initial_wizard'])): ?>
<h1><?= gettext("Starting initial configuration!") ?></h1>
<?php
else: ?>
<h1><?= gettext("Finished initial configuration!") ?></h1>
<?php
endif ?>
</div>
</header>
<section class="page-content-main">
......
......@@ -350,16 +350,6 @@ function showchange() {
</script>
<?php } ?>
<?php
if($extraBreadcrumbs == "Reload in progress") {
$ip = fixup_string("\$myurl");
} else {
$ip = "/";
}
?>
<section class="page-content-main">
<div class="container-fluid">
......@@ -438,12 +428,6 @@ function showchange() {
echo "<br /> " . gettext($field['description']);
}
break;
case "refresh":
echo "<td colspan=\"2\" align=\"center\" class=\"vncell\">\n";
if($field['content'] <> "") {
echo '<meta http-equiv="refresh" content="' . $field['content'] . '">';
}
break;
case "text":
echo "<td colspan=\"2\" align=\"center\" class=\"vncell\">\n";
if($field['description'] <> "") {
......@@ -843,6 +827,19 @@ function showchange() {
?>
</table>
<?php
if($pkg['step'][$stepid]['fields']['field'] <> "") {
foreach ($pkg['step'][$stepid]['fields']['field'] as $field) {
switch ($field['type']) {
case "refresh":
if($field['url'] <> "" && $field['time'] <> "") {
echo '<meta http-equiv="refresh" content="' . $field['time'] . ';url=' . fixup_string('$myurl') . $field['url'] . '">';
}
break 2;
}
}
}
?>
</div>
</form>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment