diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 6f19eb99b8..829e3c9b72 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,16 @@ +2012-05-03 Juan Manuel Ramon + + * include/styles/pandora_legacy.css + include/styles/pandora.css + images/skin/skin_default/include/styles/pandora.css: Fixed + information messages in other css files different than the default + css file. Also resized header image to 100% width. + + * operation/agentes/tactical.php: Fixed print_cells_temp function + when it has not color like argument. + + Merged from branches. + 2012-05-03 Miguel de Dios * godmode/reporting/visual_console_builder.php: refixed the add the diff --git a/pandora_console/images/skin/skin_default/include/styles/pandora.css b/pandora_console/images/skin/skin_default/include/styles/pandora.css index 8c88f7e125..219b893edb 100644 --- a/pandora_console/images/skin/skin_default/include/styles/pandora.css +++ b/pandora_console/images/skin/skin_default/include/styles/pandora.css @@ -2049,3 +2049,24 @@ td.scwFootDisabled { tfoot.scwFoot { color: #FFFFFF; } + +.info_box { + background: #EBEBEB; + margin: 10px auto; + padding: 5px; + border: 1px solid #A8A8A8; + width: 85% !important; + -moz-box-shadow: 0px 2px 2px #010E1B !important; + -webkit-box-shadow: 0px 2px 2px #010E1B !important; + box-shadow: 0px 2px 2px #010E1B !important; +} + +.info_box .title * { + font-size: 10pt !important; + font-weight: bolder; +} + +.info_box .icon { + width: 30px !important; + text-align: center; +} diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 1d1ce658f6..1c2d702e65 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -1358,7 +1358,7 @@ div#head { width: auto; background-color: #000; background-image: url(../../images/header_f2.png); - + background-size: 100% !important; } div#foot { diff --git a/pandora_console/include/styles/pandora_legacy.css b/pandora_console/include/styles/pandora_legacy.css index 6b533306b3..7f784fef26 100644 --- a/pandora_console/include/styles/pandora_legacy.css +++ b/pandora_console/include/styles/pandora_legacy.css @@ -270,6 +270,7 @@ div#head { height: 62px; padding-top: 1px; background: url(../../images/header.jpg); + background-size: 100% !important; } div#foot { diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php index 48dcbce54c..a42da3bb38 100644 --- a/pandora_console/operation/agentes/tactical.php +++ b/pandora_console/operation/agentes/tactical.php @@ -49,10 +49,15 @@ function print_cells_temp ($cells) { $row[1] = "-"; } + // Prevents error for empty color + $color = ''; + if (isset($row["color"])) + $color = 'style="color: ' . $row["color"] . ';"'; + if (isset($row["href"])) - echo ''.$row[1].''; + echo ''.$row[1].''; else - echo ''.$row[1].''; + echo ''.$row[1].''; } }