From 8b5f50f883f48180ec33cf1f0ff3028827ea49e4 Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Fri, 22 Feb 2019 19:18:07 +0100 Subject: [PATCH] Discovery minor fixes Former-commit-id: 3914d7a99fb70d88c1a1f95d3c2aeb100f277266 --- .../godmode/wizards/HostDevices.class.php | 14 +++++- .../godmode/wizards/Wizard.main.php | 2 +- .../include/class/ConsoleSupervisor.php | 2 +- pandora_console/include/styles/discovery.css | 50 +++++++++++-------- 4 files changed, 44 insertions(+), 24 deletions(-) diff --git a/pandora_console/godmode/wizards/HostDevices.class.php b/pandora_console/godmode/wizards/HostDevices.class.php index ef98b09d3a..6e31299b9a 100755 --- a/pandora_console/godmode/wizards/HostDevices.class.php +++ b/pandora_console/godmode/wizards/HostDevices.class.php @@ -124,8 +124,20 @@ class HostDevices extends Wizard ]; } + $this->prepareBreadcrum( + [ + [ + 'link' => ui_get_full_url( + 'index.php?sec=gservers&sec2=godmode/servers/discovery' + ), + 'label' => __('Discovery'), + ], + ] + ); + + $this->printHeader(); + $this->printBigButtonsList($buttons); - $this->printGoBackButton(); return; } diff --git a/pandora_console/godmode/wizards/Wizard.main.php b/pandora_console/godmode/wizards/Wizard.main.php index ba057475e3..c584e6a9b7 100644 --- a/pandora_console/godmode/wizards/Wizard.main.php +++ b/pandora_console/godmode/wizards/Wizard.main.php @@ -228,7 +228,7 @@ class Wizard */ public function printBreadcrum() { - return '

'.implode('', $this->breadcrum).'

'; + return '

'.implode('', $this->breadcrum).'

'; } diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index ddce4b7e87..d0386a59c0 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -377,7 +377,7 @@ class ConsoleSupervisor $this->checkMinorRelease(); - if ($this->verbose === true) { + if (enterprise_installed()) { // Release the lock. enterprise_hook('cron_supervisor_release_lock'); } diff --git a/pandora_console/include/styles/discovery.css b/pandora_console/include/styles/discovery.css index 33b1d3c0a9..36711a8474 100644 --- a/pandora_console/include/styles/discovery.css +++ b/pandora_console/include/styles/discovery.css @@ -13,8 +13,8 @@ li.discovery { li.discovery > a { text-decoration: none; + color: #333; } - li.discovery > a:hover { color: #000; } @@ -46,27 +46,33 @@ div.data_container:hover { height: auto; text-align: center; } +h1.wizard { + padding: 0; + margin: 0; + margin-top: -1.25em; +} +h1.wizard a { + margin-left: -20px; +} +h1.wizard a:hover { + color: #fff; +} #text_wizard { font-weight: bolder; text-decoration: none; font-size: 24px; } -.text_color { - color: white; - margin-left: 25px; -} -.text_color:hover { - text-decoration: none; -} -.arrow_box { +div.arrow_box { display: inline-block; position: relative; background: #ccc; - padding: 14px; + color: #888; + padding: 1.3em; margin-left: 20px; margin-bottom: 10px; + padding-left: 3em; } -.arrow_box:after, + .arrow_box:before { top: 50%; border: solid transparent; @@ -75,9 +81,11 @@ div.data_container:hover { width: 0; position: absolute; pointer-events: none; + z-index: 1; } .arrow_box.selected { - background: #82b92e; + background: #424242; + color: #ccc; } .arrow_box:after { @@ -86,20 +94,20 @@ div.data_container:hover { border-width: 20px; margin-top: -20px; } -.arrow_box:before { + +div.arrow_box:before { left: 100%; border-left-color: #ccc; border-width: 20px; margin-top: -20px; } .arrow_box.selected:before { - border-left-color: #82b92e; + border-left-color: #424242; } -.arrow_box { - display: inline-block; - position: relative; - padding: 14px; - margin-left: 20px; - margin-bottom: 10px; - padding-left: 3em; + +.arrow_box.selected:hover { + color: #fff; +} +.arrow_box:hover { + color: #000; }