From bd7837b14c3be58d74dc3636562317d275a63b59 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Wed, 10 Mar 2021 17:57:25 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B03566=20Hub=20connector=20migrate=20to=20?= =?UTF-8?q?UiBlock=20:=20launch=20page=20Reset=20some=20iTop=20core=20styl?= =?UTF-8?q?es=20to=20get=20back=20the=20previous=20rendering=20Also=20use?= =?UTF-8?q?=20iTop=20classes=20for=20title=20and=20buttons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- datamodels/2.x/itop-hub-connector/css/hub.css | 8 +++++++- datamodels/2.x/itop-hub-connector/launch.php | 15 ++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/datamodels/2.x/itop-hub-connector/css/hub.css b/datamodels/2.x/itop-hub-connector/css/hub.css index 5660cacef0..4a2464e3e2 100644 --- a/datamodels/2.x/itop-hub-connector/css/hub.css +++ b/datamodels/2.x/itop-hub-connector/css/hub.css @@ -169,11 +169,12 @@ #hub_launch_content button { cursor: pointer; font-weight: bold; - box-shadow: 0px 0px 0px 1px transparent inset, 0px 0em 0px 0px rgba(34, 36, 38, 0.15) inset; + box-shadow: 0px 0px 0px 1px transparent inset, 0px 0em 0px 0px rgba(34, 36, 38, 0.15) inset; border: 0; background-color: #E0E1E2; height: 40px; vertical-align: middle; + margin: 1.2rem 0; padding: 0; } #hub_launch_content button.positive { @@ -197,6 +198,7 @@ background-color: rgb(221, 113, 27); } #hub_launch_content button > img { + box-sizing: revert; width: 16px; height: 16px; vertical-align: middle; @@ -207,3 +209,7 @@ display: inline-block; width: 1.5em; } + +#hub_launch_content label { + cursor: pointer; +} \ No newline at end of file diff --git a/datamodels/2.x/itop-hub-connector/launch.php b/datamodels/2.x/itop-hub-connector/launch.php index 2bca313f09..7e21e6877c 100644 --- a/datamodels/2.x/itop-hub-connector/launch.php +++ b/datamodels/2.x/itop-hub-connector/launch.php @@ -320,9 +320,18 @@ try { $oPage->add('
'); $oPage->add(file_get_contents(__DIR__.'/images/rocket.svg')); $oPage->add('
'); - $oPage->add('

'.$sTitle.'

'); + $oPage->add('

'.$sTitle.'

'); $oPage->add($sText); - $oPage->add('

'); + $sButtonLabelClose = Dict::S('iTopHub:CloseBtn'); + $sButtonLabelGo = Dict::S('iTopHub:GoBtn'); + $oPage->add(<< + + + +

+HTML + ); $sFormTarget = appUserPreferences::GetPref('itophub_open_in_new_window', 1) ? 'target="_blank"' : ''; $oPage->add('
'); $oPage->add(''); @@ -332,7 +341,7 @@ try { // Beware the combination auto-submit and open in new window (cf above) is blocked by (some) browsers (namely Chrome) $sAutoSubmitChecked = appUserPreferences::GetPref('itophub_auto_submit', 0) == 1 ? 'checked' : ''; - $oPage->add('

'); + $oPage->add('

'); $oPage->add('
'); $oPage->add('
'); $oPage->add('');