From 2dbe9c1697bcd8def6fc640c03f9215556138155 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 3 Jul 2013 12:09:23 +0000 Subject: [PATCH] 2013-07-03 Miguel de Dios * mobile/include/style/main.css: some fix for the module list when it is embedded in agent view, now it is show in Android but I need work more for to show in the jobs fashion gadget. * mobile/operation/networkmaps.php: fixed to avoid unused the javascript for mobile. MERGED FROM THE BRANCH 4.0 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8466 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 11 +++++++++++ pandora_console/mobile/include/style/main.css | 2 +- pandora_console/mobile/operation/networkmaps.php | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 6b2be9e772..0f25895f21 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,14 @@ +2013-07-03 Miguel de Dios + + * mobile/include/style/main.css: some fix for the module list + when it is embedded in agent view, now it is show in Android but + I need work more for to show in the jobs fashion gadget. + + * mobile/operation/networkmaps.php: fixed to avoid + unused the javascript for mobile. + + MERGED FROM THE BRANCH 4.0 + 2013-07-03 Miguel de Dios * include/graphs/fgraph.php: change the source code style to make diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css index 56bb1afec5..92e6fd6af6 100644 --- a/pandora_console/mobile/include/style/main.css +++ b/pandora_console/mobile/include/style/main.css @@ -538,7 +538,7 @@ table#list_events th { color: #000000 !important; } -@media screen and (max-width: 35em) { +@media screen and (max-width: 320px) { #list_Modules_Embedded .cell_1 .ui-table-cell-label, #list_Modules_Embedded .cell_6 .ui-table-cell-label { min-width: auto !important; diff --git a/pandora_console/mobile/operation/networkmaps.php b/pandora_console/mobile/operation/networkmaps.php index 4d7b54f779..5b11b814e4 100755 --- a/pandora_console/mobile/operation/networkmaps.php +++ b/pandora_console/mobile/operation/networkmaps.php @@ -12,7 +12,9 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. +ob_start(); require_once ('../include/functions_networkmap.php'); +ob_get_clean(); //Fixed unused javascript code. class Networkmaps { private $correct_acl = false;