tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-26 15:24:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Show a warning on the first page in case the user already configured web2

Browse Source 
refs #7163
This commit is contained in:
Johannes Meyer 2014-10-30 10:37:51 +01:00
parent 9365e3ca94
commit a7e942cdc9
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
application/views/scripts/form/setup-welcome.phtml
View File

@ -1,6 +1,7 @@
<?php <?php
use Icinga\Application\Icinga; use Icinga\Application\Icinga;
use Icinga\Application\Config;
use Icinga\Application\Platform; use Icinga\Application\Platform;
use Icinga\Web\Wizard; use Icinga\Web\Wizard;
@ -33,10 +34,17 @@ $setupTokenPath = rtrim(Icinga::app()->getConfigDir(), '/') . '/setup.token';
. t('insights', 'setup.welcome.screenshots.label') . '</a>' . t('insights', 'setup.welcome.screenshots.label') . '</a>'
); ?></p> ); ?></p>
</div> </div>
<?php if (false === file_exists($setupTokenPath) && file_exists(Config::resolvePath('config.ini'))): ?>
<p class="restart-warning"><?= t(
'You\'ve already completed the installation of Icinga Web 2. Note that most of your configuration'
. ' files will be overwritten in case you\'ll re-configure Icinga Web 2 using this wizard!'
); ?></p>
<?php else: ?>
<p><?= t( <p><?= t(
'This wizard will guide you through the installation of Icinga Web 2. Once completed and successfully' 'This wizard will guide you through the installation of Icinga Web 2. Once completed and successfully'
. ' finished you are able to log in and to explore all the new and stunning features!' . ' finished you are able to log in and to explore all the new and stunning features!'
); ?></p> ); ?></p>
<?php endif ?>
<form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>"> <form id="<?= $form->getName(); ?>" name="<?= $form->getName(); ?>" enctype="<?= $form->getEncType(); ?>" method="<?= $form->getMethod(); ?>" action="<?= $form->getAction(); ?>">
<?= $form->getElement('token'); ?> <?= $form->getElement('token'); ?>
<?= $form->getElement($form->getTokenElementName()); ?> <?= $form->getElement($form->getTokenElementName()); ?>

5
public/css/icinga/setup.less
View File

@ -306,6 +306,11 @@
border: 1px solid lightgrey; border: 1px solid lightgrey;
} }
p.restart-warning {
color: coral;
font-weight: bold;
}
div.note { div.note {
width: 40%; width: 40%;
padding: 1em 1em 0; padding: 1em 1em 0;