From acfd2146dc12d58fbc701466b3a2044f988f7b71 Mon Sep 17 00:00:00 2001
From: m-lopez-f <miguel.lopez@artica.es>
Date: Wed, 1 Apr 2015 12:09:23 +0200
Subject: [PATCH] Change views and styles in Console

---
 extras/anytermd/browser/anyterm.css        |  2 +-
 pandora_console/extensions/net_tools.php   |  6 ++--
 pandora_console/extensions/ssh_gateway.php | 11 ++++----
 pandora_console/extensions/vnc_view.php    |  2 +-
 pandora_console/general/main_menu.php      | 22 +++++++--------
 pandora_console/godmode/menu.php           | 32 ++++++++++++++++++++++
 pandora_console/include/ajax/module.php    |  6 ++--
 pandora_console/include/styles/menu.css    |  3 +-
 pandora_console/include/styles/pandora.css | 12 ++++----
 pandora_console/index.php                  |  4 ++-
 10 files changed, 68 insertions(+), 32 deletions(-)

diff --git a/extras/anytermd/browser/anyterm.css b/extras/anytermd/browser/anyterm.css
index 4e6df19796..46c1f0366d 100644
--- a/extras/anytermd/browser/anyterm.css
+++ b/extras/anytermd/browser/anyterm.css
@@ -102,7 +102,7 @@ noscript {
 .termframe {
   float: left;
   padding: 0.2ex;
-  background-color: none repeat scroll 0% 0% #82B92E;
+  background-color: none repeat scroll 0% 0% #80BA27;
 	border-top-right-radius: 5px;
 	border-top-left-radius: 5px;
 }
diff --git a/pandora_console/extensions/net_tools.php b/pandora_console/extensions/net_tools.php
index 4da4d88fad..15739df521 100644
--- a/pandora_console/extensions/net_tools.php
+++ b/pandora_console/extensions/net_tools.php
@@ -101,11 +101,11 @@ function main_net_tools () {
 			function mostrarColumns(ValueSelect){
 				value = ValueSelect.value;
 				if ( value==3 ) {
-					document.getElementById('netToolTable').width=800;
+					document.getElementById('netToolTable').width='100%';
 					document.getElementById('snmpcolumn').style.display='block';
 				}
 				else{
-					document.getElementById('netToolTable').width=650;
+					document.getElementById('netToolTable').width='100%';
 					document.getElementById('snmpcolumn').style.display='none';
 				}
 			}
@@ -113,7 +113,7 @@ function main_net_tools () {
 		
 	echo "<div>";
 	echo "<form name='actionbox' method='post'>";
-	echo "<table class=databox width=650 id=netToolTable>";
+	echo "<table class='databox filters' width=100% id=netToolTable>";
 	echo "<tr><td>";
 	echo __("Operation");
 	ui_print_help_tip(__('You can set the command path in the menu Administration -&gt; Extensions -&gt; Config Network Tools'));
diff --git a/pandora_console/extensions/ssh_gateway.php b/pandora_console/extensions/ssh_gateway.php
index 5377e27456..1d2ddcab75 100644
--- a/pandora_console/extensions/ssh_gateway.php
+++ b/pandora_console/extensions/ssh_gateway.php
@@ -53,13 +53,15 @@ function ssh_gateway () {
 		}
 		
 		echo "<form method=post>";
-		echo "<table class=databox cellspacing=4 cellpadding=4>";
+		echo "<table class='databox filters' cellspacing=4 cellpadding=4 width=100%>";
 		echo "<td>".__("Host address")."<td><input type=text size=25 value='$HOST' name=host>";
-		echo "<tr>";
+		//echo "<tr>";
 		echo "<td>".__("User")."<td><input type=text size=25 value='$USER' name=user>" . ui_print_help_tip(__('For security reasons the following characters are not allowed: %s', '< > | ` $ ; &'), true);
+		echo "<td rowspan=2 vertical_aling='middle'>&nbsp;&nbsp;&nbsp;<input type=submit name=connect class='sub upd' value=".__("Connect").">";
+		echo "<input type=hidden name=commit value=1></td>";
 		echo "<tr>";
 		echo "<td>".__("Port (use 0 for default)")."<td><input type=text size=5 value='$PORT' name=port>";	
-		echo "<tr><td>";
+		echo "<td>";
 		echo __("Connect mode")."<td><select name=mode>";
 		if ($MODE == "telnet") {
 			echo "<option>telnet";
@@ -71,8 +73,7 @@ function ssh_gateway () {
 		}
 		echo "</select>";
 		
-		echo "&nbsp;&nbsp;&nbsp;<input type=submit name=connect class='sub upd' value=".__("Connect").">";
-		echo "<td><input type=hidden name=commit value=1>";
+		
 		echo "</form></table>";
 	}
 	
diff --git a/pandora_console/extensions/vnc_view.php b/pandora_console/extensions/vnc_view.php
index 36c027583e..655fe5071c 100644
--- a/pandora_console/extensions/vnc_view.php
+++ b/pandora_console/extensions/vnc_view.php
@@ -20,7 +20,7 @@ function vnc_view() {
 
 	$display = get_parameter("display", 0);
 	echo "<form method=post>";
-	echo "<table class=databox width=500>";
+	echo "<table class='databox filters' width=100%>";
 	echo "<tr><td>";
 	echo __("VNC Display (:0 by default)") . "&nbsp;";
 	echo "<input type=text name=display value=$display>";
diff --git a/pandora_console/general/main_menu.php b/pandora_console/general/main_menu.php
index f667e246f2..9ef84f4da7 100644
--- a/pandora_console/general/main_menu.php
+++ b/pandora_console/general/main_menu.php
@@ -243,10 +243,10 @@ $(document).ready( function() {
 		table_hover = $(this);
 		handsIn = 1;
 		openTime = new Date().getTime();
-		$("ul#sub"+table_hover[0].id).show().animate({opacity: "1"}, 1000);
+		$("ul#sub"+table_hover[0].id).show(1000);
 		if( typeof(table_noHover) != 'undefined')
 			if ( "ul#sub"+table_hover[0].id != "ul#sub"+table_noHover[0].id )
-				$("ul#sub"+table_noHover[0].id).animate({opacity: "0.5"}, 1000,function(){$("ul#sub"+table_noHover[0].id).hide();});
+				$("ul#sub"+table_noHover[0].id).hide(500);
 	}).mouseleave(function(){
 		table_noHover = $(this);
 		handsIn = 0;
@@ -254,28 +254,28 @@ $(document).ready( function() {
 			opened = new Date().getTime() - openTime;
 			if(opened > 3000 && handsIn == 0) {
 				openTime = 4000;
-				$("ul#sub"+table_hover[0].id).animate({opacity: "0.5"}, 1000,function(){$("ul#sub"+table_hover[0].id).hide();});
+				$("ul#sub"+table_hover[0].id).hide(500);
 			}
 		}, 3500);
 	});
 	
 	
--	$('.has_submenu.submenu_not_selected').hover(function(){
+-	$('.has_submenu').hover(function(){
 		table_hover2 = $(this);
 		handsIn2 = 1;
 		openTime2 = new Date().getTime();
+		$("#sub"+table_hover2[0].id).show();
 		if( typeof(table_noHover2) != 'undefined')
 			if ( "ul#sub"+table_hover2[0].id != "ul#sub"+table_noHover2[0].id )
-				$("ul#sub"+table_noHover2[0].id).animate({opacity: "0.5"}, 1000,function(){$("ul#sub"+table_noHover2[0].id).hide();});
-		$("#sub"+table_hover2[0].id).show();
-	}).mouseleave(function(){
-		table_noHover2 = $(this);
+				$("ul#sub"+table_noHover2[0].id).hide(500);
+	}).mouseout(function(){
+		table_noHover2 = table_hover2;
 		handsIn2 = 0;
 		setTimeout(function() {
 		opened = new Date().getTime() - openTime2;
 			if(opened >= 3000 && handsIn2 == 0) {
 				openTime2 = 4000;
-				$("#sub"+table_hover2[0].id).animate({opacity: "0.5"}, 1000,function(){$("ul#sub"+table_noHover2[0].id).hide();});
+				$("ul#sub"+table_hover2[0].id).hide(500);
 			}
 		}, 3500);
 	});
@@ -284,9 +284,9 @@ $(document).ready( function() {
 		$('#page').click(function(){
 			openTime = 4000;
 			if( typeof(table_hover) != 'undefined')
-				$("ul#sub"+table_hover[0].id).animate({opacity: "0.5"}, 500,function(){$("ul#sub"+table_hover[0].id).hide();});
+				$("ul#sub"+table_hover[0].id).hide(500);
 			if( typeof(table_hover2) != 'undefined')
-				$("ul#sub"+table_hover2[0].id).animate({opacity: "0.5"}, 500,function(){$("ul#sub"+table_hover2[0].id).hide();});
+				$("ul#sub"+table_hover2[0].id).hide(500);
 		});
 	});
 	
diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php
index b93a0e42e2..78452f2d85 100644
--- a/pandora_console/godmode/menu.php
+++ b/pandora_console/godmode/menu.php
@@ -209,8 +209,40 @@ if (check_acl ($config['id_user'], 0, "PM")) {
 	
 	$sub = array ();
 	
+	$sub["godmode/setup/setup&section=general"]["text"] = __('Setup');
+	$sub["godmode/setup/setup&section=general"]["refr"] = 0;
+	
+	$sub2 = array();
+	// Options Setup
+	$sub2["godmode/setup/setup&amp;section=general"]["text"] = __('General');
+	$sub2["godmode/setup/setup&amp;section=general"]["refr"] = 0;
+	/*
+	if (enterprise_installed()) {
+		$buttons = setup_enterprise_add_Tabs($buttons);
+	}
+	*/
+	$sub2["godmode/setup/setup&amp;section=auth"]["text"] =  __('Authentication');
+	$sub2["godmode/setup/setup&amp;section=auth"]["refr"] = 0;
+	
+	$sub2["godmode/setup/setup&amp;section=perf"]["text"] = __('Performance');
+	$sub2["godmode/setup/setup&amp;section=perf"]["refr"] = 0;
+	
+	$sub2["godmode/setup/setup&amp;section=vis"]["text"] = __('Visual styles');
+	$sub2["godmode/setup/setup&amp;section=vis"]["refr"] = 0;
+	
+	
 	$sub["godmode/setup/file_manager"]["text"] = __('File manager');
 	
+	
+	if (check_acl ($config['id_user'], 0, "AW")) {
+		if ($config['activate_netflow']) {
+			$sub2["godmode/setup/setup&amp;section=net"]["text"] = __('Netflow');
+			$sub2["godmode/setup/setup&amp;section=net"]["refr"] = 0;
+		}
+	}
+	$sub["godmode/setup/setup&section=general"]["sub2"] = $sub2;
+	
+	
 	if ($config['activate_gis'])
 		$sub["godmode/setup/gis"]["text"] = __('Map conections GIS');
 	$sub["godmode/setup/links"]["text"] = __('Links');
diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 7fdfc439aa..eb29a0d744 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -673,10 +673,10 @@ if ($list_modules) {
 	if (empty ($modules)) {
 		$modules = array ();
 	}
-	$table->width = "98%";
+	$table->width = "100%";
 	$table->cellpadding = 4;
 	$table->cellspacing = 4;
-	$table->class = "databox";
+	$table->class = "databox data";
 	$table->head = array ();
 	$table->data = array ();
 	
@@ -708,7 +708,7 @@ if ($list_modules) {
 		'<a href="' . $url . '&sort_field=last_contact&amp;sort=down&refr=&filter_monitors=1&status_filter_monitor=' .$status_filter_monitor.' &status_text_monitor='. $status_text_monitor.'&status_module_group= '.$status_module_group.'">' . html_print_image("images/sort_down.png", true, array("style" => $selectLastContactDown, "alt" => "down")) . '</a>';
 
 	
-	$table->align = array("left", "left", "center", "left", "left", "center");
+	$table->align = array("center", "left", "center", "left", "left", "center","left","left","center");
 	
 	$last_modulegroup = 0;
 	$rowIndex = 0;
diff --git a/pandora_console/include/styles/menu.css b/pandora_console/include/styles/menu.css
index e5e092b41c..0776c601f8 100644
--- a/pandora_console/include/styles/menu.css
+++ b/pandora_console/include/styles/menu.css
@@ -70,11 +70,10 @@ li:hover ul { display: block; }
 	margin: 0px 0px 0px 0px;
 	position: absolute;
 	z-index: 999;
-	left: 44px;
+	left: 39px;
 	min-height: 30px;
 	height: 30px;
 	width: 160px;
-	opacity: 0.5;
 }
 
 .submenu2{
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 0d74c45ac4..3998e33ff2 100755
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -226,7 +226,7 @@ div#container {
 	#border-right: solid 2px #000;
 	#border-top: solid 2px #000;
 	#margin-top: 5px;
-	height: auto;
+	height: 100%;
 	background: #FFF;
 }
 div#page {
@@ -309,7 +309,7 @@ div#menu_container {
 }
 
 div#menu {
-	width: 45px;
+	width: 40px;
 	float: left;
 	margin-top: 10px;
 }
@@ -341,7 +341,7 @@ div#foot {
 	padding-bottom: 5px;
 	text-align: center;
 	background: #333333;
-	height: 38px;
+	height: 30px;
 	clear: both;
 	width: auto;
 }
@@ -844,6 +844,9 @@ div#cont {
 	overflow-x: hidden;
 }
 
+.termframe{
+	background-color: #80BA27 !important;
+}
 
 table, img {
 	border: 0px;
@@ -856,7 +859,6 @@ tr:first-child>th {
 th {
 	color: #fff;
 	background-color: #666;
-	text-align:center;
 	font-size: 7.5pt;
 	letter-spacing: 0.3pt;
 }
@@ -1378,7 +1380,7 @@ table.databox {
 }
 
 .databox th {
-	padding: 8px 7px;
+	padding: 10px 8px;
 	color: #fff;
 }
 
diff --git a/pandora_console/index.php b/pandora_console/index.php
index 62be07c6fd..196ef0f5f3 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -778,6 +778,7 @@ require('include/php_to_js_values.php');
 	
 	//Dynamically assign footer position and width.
 	function adjustFooter() {
+		/*
 		if (document.readyState !== 'complete' || $('#container').position() == undefined) {
 			return;
 		}
@@ -789,7 +790,7 @@ require('include/php_to_js_values.php');
 		var h = $('#foot').height();
 		// new top value for div#foot
 		var t = (ulim + $('#foot').outerHeight() > wh) ? ulim : wh - $('#foot').outerHeight();
-		
+		/*
 		if ($('#foot').position().top != t) {
 			$('#foot').css({ position: "absolute", top: t, left: $('#foot').offset().left});
 			$('#foot').height(h);
@@ -797,5 +798,6 @@ require('include/php_to_js_values.php');
 		if ($('#foot').width() !=  $(window).width()) {
 			$('#foot').width($(window).width());
 		}
+		*/
 	}
 </script>