From e0c560312722c870f2e285bf1c74674e8e7eee39 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Wed, 24 Apr 2013 13:16:28 +0000
Subject: [PATCH] 2013-04-24 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/networkmap.php,
include/functions_networkmap.php: set the background transparent.
Fixes: #3611686
* include/styles/pandora.css, include/functions_ui.php: fixed the
tabs in the header when the tab is bigger that standar tab, and
the separator doesn't print.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8045 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 11 +++++++++++
pandora_console/include/functions_networkmap.php | 2 +-
pandora_console/include/functions_ui.php | 4 ++--
pandora_console/include/styles/pandora.css | 4 ++--
pandora_console/operation/agentes/networkmap.php | 2 --
5 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 40ced6ab0d..503e3d6267 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,14 @@
+2013-04-24 Miguel de Dios <miguel.dedios@artica.es>
+
+ * operation/agentes/networkmap.php,
+ include/functions_networkmap.php: set the background transparent.
+
+ Fixes: #3611686
+
+ * include/styles/pandora.css, include/functions_ui.php: fixed the
+ tabs in the header when the tab is bigger that standar tab, and
+ the separator doesn't print.
+
2013-04-24 Miguel de Dios <miguel.dedios@artica.es>
* godmode/agentes/planned_downtime.editor.php: fixed the header.
diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php
index e422e6f9b5..fd5d72a148 100644
--- a/pandora_console/include/functions_networkmap.php
+++ b/pandora_console/include/functions_networkmap.php
@@ -804,7 +804,7 @@ function networkmap_open_graph ($layout, $nooverlap, $pure, $zoom, $ranksep, $fo
$size = $size_x . ',' . $size_y;
// BEWARE: graphwiz DONT use single ('), you need double (")
- $head = "graph networkmap { labeljust=l; margin=0; ";
+ $head = "graph networkmap { bgcolor=\"transparent\", labeljust=l; margin=0; ";
if ($nooverlap != '') {
$head .= "overlap=\"$overlap\";";
$head .= "ranksep=\"$ranksep\";";
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index aa1c954a31..6001d2c2b8 100644
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -2123,8 +2123,8 @@ function ui_print_page_header ($title, $icon = "", $return = false, $help = "",
$buffer .= '<div id="menu_tab"><ul class="mn">';
foreach ($options as $key => $option) {
if ($key === 'separator') {
- $buffer .= '<li class='.$separator_class.'>';
- $buffer .= '</li>';
+ //$buffer .= '<li class='.$separator_class.'>';
+ //$buffer .= '</li>';
}
else {
if (is_array($option)) {
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index e9857df784..f32e8e93e2 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -1261,7 +1261,7 @@ div.title_line {
line-height: 18px;
margin-left: 3px;
margin-right: 0px;
-
+
-moz-border-top-right-radius: 5px;
-webkit-border-top-right-radius: 5px;
border-top-right-radius: 5px;
@@ -1333,7 +1333,7 @@ div.title_line {
}
#menu_tab li.nomn, #menu_tab li {
- width: 30px;
+ min-width: 30px;
height: 28px;
}
diff --git a/pandora_console/operation/agentes/networkmap.php b/pandora_console/operation/agentes/networkmap.php
index e9fedd28c7..abfc7b4d31 100644
--- a/pandora_console/operation/agentes/networkmap.php
+++ b/pandora_console/operation/agentes/networkmap.php
@@ -215,8 +215,6 @@ $buttons['topology'] = array('active' => $activeTab == 'topology',
'text' => '<a href="index.php?sec=network&sec2=operation/agentes/networkmap&tab=topology&pure='.$pure.'">' .
html_print_image("images/op_network.png", true, array ("title" => __('Topology view'))) .'</a>');
-$buttons['separator'] = array('separator' => '');
-
$combolist = '<form name="query_sel" method="post" action="index.php?sec=network&sec2=operation/agentes/networkmap">';
$combolist .= html_print_select($networkmaps, 'id_networkmap', $id_networkmap, 'onchange:this.form.submit()', __('No selected'), 0, true, false, false, '', false, 'margin-top:4px; margin-left:3px; width:150px;');