From a7e942cdc970284ab2977afa806be9dfba8e30b9 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 30 Oct 2014 10:37:51 +0100 Subject: [PATCH] Show a warning on the first page in case the user already configured web2 refs #7163 --- application/views/scripts/form/setup-welcome.phtml | 8 ++++++++ public/css/icinga/setup.less | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/application/views/scripts/form/setup-welcome.phtml b/application/views/scripts/form/setup-welcome.phtml index a270cc7ad..76947fbe6 100644 --- a/application/views/scripts/form/setup-welcome.phtml +++ b/application/views/scripts/form/setup-welcome.phtml @@ -1,6 +1,7 @@ getConfigDir(), '/') . '/setup.token'; . t('insights', 'setup.welcome.screenshots.label') . '' ); ?>

+ +

+

+
getElement('token'); ?> getElement($form->getTokenElementName()); ?> diff --git a/public/css/icinga/setup.less b/public/css/icinga/setup.less index 96f9d753c..ba33620cd 100644 --- a/public/css/icinga/setup.less +++ b/public/css/icinga/setup.less @@ -306,6 +306,11 @@ border: 1px solid lightgrey; } + p.restart-warning { + color: coral; + font-weight: bold; + } + div.note { width: 40%; padding: 1em 1em 0;