Property changes on: trunk
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/nagvis-iframe:33
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-08-08 15:52:31 UTC (rev 33)
+++ trunk/Makefile 2012-08-09 16:56:45 UTC (rev 34)
@@ -782,18 +782,13 @@
cd ${NAGVIS} && patch -p1 < ../patches/nagvis_use_opsview_links.patch
cd ${NAGVIS} && patch -p1 < ../patches/nagvis_use_opsview_tables.patch
cd ${NAGVIS} && patch -p1 < ../patches/nagvis_remove_display_errors.patch
- cd ${NAGVIS} && patch -p1 < ../patches/nagvis_opsview_navigation.patch
cd ${NAGVIS} && patch -p1 < ../patches/nagvis_no_logo.patch
cd ${NAGVIS} && patch -p1 < ../patches/nagvis_opsview_style.patch
cd ${NAGVIS} && patch -p1 < ../patches/nagvis_remove_favicon.patch
- cd ${NAGVIS} && patch -p1 < ../patches/nagvis_opsview_navigation_header.patch
cd ${NAGVIS} && patch -p1 < ../patches/nagvis_automap_iconset.patch
cd ${NAGVIS} && patch -p1 < ../patches/nagvis_opsview_iconset.patch
cd ${NAGVIS} && patch -p1 < ../patches/nagvis_default_timezone.patch
cd ${NAGVIS} && patch -p1 < ../patches/nagvis_custom_css.patch
- cd ${NAGVIS} && patch -p1 < ../patches/nagvis_rightclickmenu_respects_navbar.patch
- cd ${NAGVIS} && patch -p1 < ../patches/nagvis_icon_save_respects_navbar.patch
- cd ${NAGVIS} && patch -p1 < ../patches/nagvis_line_drawing_respects_navbar.patch
# TODO update patches that work but with some fuzz
find ${NAGVIS} -name "*.orig" -exec rm {} \;
cp patches/nagvis/opsview.cfg ${NAGVIS}/etc/maps/
Modified: trunk/patches/nagvis_custom_css.patch
===================================================================
--- trunk/patches/nagvis_custom_css.patch 2012-08-08 15:52:31 UTC (rev 33)
+++ trunk/patches/nagvis_custom_css.patch 2012-08-09 16:56:45 UTC (rev 34)
@@ -1,11 +1,17 @@
diff -urb nagvis-1.4.4.orig/nagvis/includes/classes/GlobalPage.php nagvis-1.4.4/nagvis/includes/classes/GlobalPage.php
--- nagvis-1.4.4.orig/nagvis/includes/classes/GlobalPage.php 2012-06-15 15:19:37.000000000 +0000
+++ nagvis-1.4.4/nagvis/includes/classes/GlobalPage.php 2012-06-15 15:20:12.000000000 +0000
-@@ -259,6 +259,7 @@
- $opsview_header[] = ' @import url("' . $opsviewbase . '/stylesheets/navmenu/ie/ie.css");';
- $opsview_header[] = '</style>';
- $opsview_header[] = '<![endif]-->';
-+ $opsview_header[] = '<link rel="stylesheet" type="text/css" href="" . $opsviewbase . '/stylesheets/custom.css" />';
-
- $opsview_header[] = '<script type="text/_javascript_">';
- $opsview_header[] = ' jQuery(document).ready(function($){';
+@@ -246,10 +246,13 @@
+ */
+ private function buildPage() {
+ $ret = '';
++
++ $opsviewbase = $this->CORE->MAINCFG->getValue('paths','opsviewbase');
+
+ $ret .= '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'."\n";
+ $ret .= '<html><head>'."\n";
+ $ret .= $this->getHeader();
++ $ret .= '<link rel="stylesheet" type="text/css" href="" . $opsviewbase . '/stylesheets/custom.css" />'. "\n";
+ $ret .= '</head><body class="main">'."\n";
+ $ret .= $this->getBody();
+ $ret .= '</body></html>';
Deleted: trunk/patches/nagvis_icon_save_respects_navbar.patch
===================================================================
--- trunk/patches/nagvis_icon_save_respects_navbar.patch 2012-08-08 15:52:31 UTC (rev 33)
+++ trunk/patches/nagvis_icon_save_respects_navbar.patch 2012-08-09 16:56:45 UTC (rev 34)
@@ -1,16 +0,0 @@
-diff -ur nagvis.original/wui/includes/classes/WuiMapCfg.php nagvis/wui/includes/classes/WuiMapCfg.php
---- nagvis.original/wui/includes/classes/WuiMapCfg.php 2009-10-15 16:41:24.000000000 +0000
-+++ nagvis/wui/includes/classes/WuiMapCfg.php 2012-07-30 16:35:16.150461062 +0000
-@@ -187,6 +187,12 @@
- $cfgLines = 0;
- $cfgLine = '';
- $cfgLineNr = 0;
-+
-+ // Opsview hackity hack!!
-+ // We subtract the y coordinate at save time, to cater for Opsview banner
-+ if ($key == "y") {
-+ $val = $val-80;
-+ }
-
- // Loop parameters from file (Find line for this option)
- while(isset($file[($l+$cfgLines)]) && trim($file[($l+$cfgLines)]) != '}') {
Deleted: trunk/patches/nagvis_line_drawing_respects_navbar.patch
===================================================================
--- trunk/patches/nagvis_line_drawing_respects_navbar.patch 2012-08-08 15:52:31 UTC (rev 33)
+++ trunk/patches/nagvis_line_drawing_respects_navbar.patch 2012-08-09 16:56:45 UTC (rev 34)
@@ -1,23 +0,0 @@
-diff -ur nagvis.original/wui/includes/js/wui.js nagvis/wui/includes/js/wui.js
---- nagvis.original/wui/includes/js/wui.js 2009-10-15 16:41:24.000000000 +0000
-+++ nagvis/wui/includes/js/wui.js 2012-07-30 18:01:10.660474073 +0000
-@@ -145,6 +145,9 @@
-
- myshape.clear();
-
-+ // Opsview Hackity Hack! Consider the Opsview banner
-+ posy = posy - 80;
-+
- if(objtype != 'textbox') {
- myshape.drawLine(myshapex, myshapey, posx, posy);
- } else {
-@@ -178,6 +181,9 @@
- posy = event.clientY;
- }
-
-+ // Opsview Hackity Hack! Consider the Opsview banner
-+ posy = posy - 80;
-+
- // Start drawing a line
- if(cpt_clicks == 2) {
- myshape = new jsGraphics("mymap");
Deleted: trunk/patches/nagvis_opsview_navigation.patch
===================================================================
--- trunk/patches/nagvis_opsview_navigation.patch 2012-08-08 15:52:31 UTC (rev 33)
+++ trunk/patches/nagvis_opsview_navigation.patch 2012-08-09 16:56:45 UTC (rev 34)
@@ -1,113 +0,0 @@
-diff --exclude='.*.sw?' -urN nagvis-1.4.4/nagvis/includes/classes/GlobalHeaderMenu.php nagvis-1.4.4-patched/nagvis/includes/classes/GlobalHeaderMenu.php
---- nagvis-1.4.4/nagvis/includes/classes/GlobalHeaderMenu.php 2012-03-19 21:28:27.000000000 +0000
-+++ nagvis-1.4.4-patched/nagvis/includes/classes/GlobalHeaderMenu.php 2012-03-19 22:19:43.000000000 +0000
-@@ -192,7 +192,18 @@
-
- $this->code = str_replace($arrKeys, $arrVals, $this->code);
-
-- $this->code = '<div class="header">'.$this->code.'</div>';
-+ $opsview_header = array();
-+ $opsview_header[] = '<script type="text/_javascript_" src=""
-+ $opsview_header[] = '<script type="text/_javascript_" src=""
-+ $opsview_header[] = '<script type="text/_javascript_" src=""
-+ $opsview_header[] = '<link rel="stylesheet" type="text/css" href="" />';
-+ $opsview_header[] = '<div id="opsview_menu" style="height:80px"></div>';
-+ $opsview_header[] = '<script type="text/_javascript_">';
-+ $opsview_header[] = ' jQuery(document).ready(function($){';
-+ $opsview_header[] = ' jQuery("#opsview_menu").load("/navmenu/menu_standalone");';
-+ $opsview_header[] = ' });';
-+ $opsview_header[] = '</script>';
-+ $this->code = join("\n", $opsview_header) .'<div class="header">'.$this->code.'</div>';
- }
-
- /**
-diff --exclude='.*.sw?' -urN nagvis-1.4.4/nagvis/includes/css/style.css nagvis-1.4.4-patched/nagvis/includes/css/style.css
---- nagvis-1.4.4/nagvis/includes/css/style.css 2009-10-15 17:41:24.000000000 +0100
-+++ nagvis-1.4.4-patched/nagvis/includes/css/style.css 2012-03-19 22:38:01.000000000 +0000
-@@ -53,8 +53,6 @@
- }
-
- .header {
-- top: 0;
-- left: 0;
- padding: 0;
- position: relative;
- }
-diff --exclude='.*.sw?' -urN nagvis-1.4.4/nagvis/includes/classes/GlobalHeaderMenu.php nagvis-1.4.4-patched/nagvis/includes/classes/GlobalHeaderMenu.php
---- nagvis-1.4.4/nagvis/includes/classes/GlobalHeaderMenu.php 2012-03-19 22:43:14.000000000 +0000
-+++ nagvis-1.4.4-patched/nagvis/includes/classes/GlobalHeaderMenu.php 2012-03-19 22:45:28.000000000 +0000
-@@ -191,7 +191,7 @@
- );
-
- $this->code = str_replace($arrKeys, $arrVals, $this->code);
--
-+
- $opsview_header = array();
- $opsview_header[] = '<script type="text/_javascript_" src=""
- $opsview_header[] = '<script type="text/_javascript_" src=""
-diff --exclude='.*.sw?' -urN nagvis-1.4.4/wui/includes/classes/WuiFrontend.php nagvis-1.4.4-patched/wui/includes/classes/WuiFrontend.php
---- nagvis-1.4.4/wui/includes/classes/WuiFrontend.php 2009-10-15 17:41:24.000000000 +0100
-+++ nagvis-1.4.4-patched/wui/includes/classes/WuiFrontend.php 2012-03-19 22:45:47.000000000 +0000
-@@ -89,7 +89,19 @@
- * @author Lars Michelsen <[email protected]>
- */
- function getMap() {
-- $this->addBodyLines('<div id="mymap" class="map">');
-+ $opsview_header = array();
-+ $opsview_header[] = '<script type="text/_javascript_" src=""
-+ $opsview_header[] = '<script type="text/_javascript_" src=""
-+ $opsview_header[] = '<script type="text/_javascript_" src=""
-+ $opsview_header[] = '<link rel="stylesheet" type="text/css" href="" />';
-+ $opsview_header[] = '<div id="opsview_menu" style="height:80px"></div>';
-+ $opsview_header[] = '<script type="text/_javascript_">';
-+ $opsview_header[] = ' jQuery(document).ready(function($){';
-+ $opsview_header[] = ' jQuery("#opsview_menu").load("/navmenu/menu_standalone");';
-+ $opsview_header[] = ' });';
-+ $opsview_header[] = '</script>';
-+
-+ $this->addBodyLines(join("\n", $opsview_header) .'<div id="mymap" class="map">');
- $this->MAP = new WuiMap($this->CORE, $this->MAPCFG);
- $this->addBodyLines($this->MAP->parseMap());
- $this->addBodyLines('</div>');
-diff --exclude='.*.sw?' -urN nagvis-1.4.4/wui/includes/js/popupWindow.js nagvis-1.4.4-patched/wui/includes/js/popupWindow.js
---- nagvis-1.4.4/wui/includes/js/popupWindow.js 2009-10-15 17:41:24.000000000 +0100
-+++ nagvis-1.4.4-patched/wui/includes/js/popupWindow.js 2012-03-19 22:51:22.000000000 +0000
-@@ -106,7 +106,7 @@
- oContainerDiv.style.position = 'absolute';
- oContainerDiv.style.width = '400px';
- oContainerDiv.style.left = '100px';
-- oContainerDiv.style.top = '20px';
-+ oContainerDiv.style.top = '100px';
-
- var oTable = document.createElement('table');
- var oTbody = document.createElement('tbody');
-diff --exclude='.*.sw?' -urN nagvis-1.4.4/nagvis/includes/classes/NagVisFrontend.php nagvis-1.4.4-patched/nagvis/includes/classes/NagVisFrontend.php
---- nagvis-1.4.4/nagvis/includes/classes/NagVisFrontend.php 2009-10-15 17:41:24.000000000 +0100
-+++ nagvis-1.4.4-patched/nagvis/includes/classes/NagVisFrontend.php 2012-03-19 23:28:36.000000000 +0000
-@@ -114,7 +114,7 @@
- * @author Lars Michelsen <[email protected]>
- */
- public function getIndexPage() {
-- $this->addBodyLines('<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>');
-+ $this->addBodyLines('<div id="overDiv" style="position:absolute; visibility:hidden; z-index:10000;"></div>');
- $this->addBodyLines('<div id="overview" class="infopage"></div>');
- $this->INDEX = new GlobalIndexPage($this->CORE, $this->BACKEND);
- $this->addBodyLines($this->parseJs($this->INDEX->parseJson()));
-@@ -126,7 +126,7 @@
- * @author Lars Michelsen <[email protected]>
- */
- public function getMap() {
-- $this->addBodyLines('<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>');
-+ $this->addBodyLines('<div id="overDiv" style="position:absolute; visibility:hidden; z-index:10000;"></div>');
- $this->addBodyLines('<div id="map" class="map"></div>');
- $this->MAP = new NagVisMap($this->CORE, $this->MAPCFG, $this->BACKEND);
- $this->MAP->MAPOBJ->checkMaintenance(1);
-@@ -139,7 +139,7 @@
- * @author Lars Michelsen <[email protected]>
- */
- public function getAutoMap($arrOptions) {
-- $this->addBodyLines('<div id="overDiv" style="position:absolute; visibility:hidden; z-index:1000;"></div>');
-+ $this->addBodyLines('<div id="overDiv" style="position:absolute; visibility:hidden; z-index:10000;"></div>');
- $this->addBodyLines('<div id="map" class="map">');
- $this->MAP = new NagVisAutoMap($this->CORE, $this->BACKEND, $arrOptions);
- $this->addBodyLines($this->MAP->parseMap());
===================================================================
--- trunk/patches/nagvis_opsview_navigation_header.patch 2012-08-08 15:52:31 UTC (rev 33)
+++ trunk/patches/nagvis_opsview_navigation_header.patch 2012-08-09 16:56:45 UTC (rev 34)
@@ -1,82 +0,0 @@
-diff '--exclude=.*.sw?' -urN nagvis-1.4.4/nagvis/includes/classes/GlobalHeaderMenu.php nagvis-1.4.4-patched/nagvis/includes/classes/GlobalHeaderMenu.php
---- nagvis-1.4.4/nagvis/includes/classes/GlobalHeaderMenu.php 2012-03-27 22:09:08.000000000 +0100
-+++ nagvis-1.4.4-patched/nagvis/includes/classes/GlobalHeaderMenu.php 2012-03-27 21:54:10.000000000 +0100
-@@ -192,18 +192,7 @@
-
- $this->code = str_replace($arrKeys, $arrVals, $this->code);
-
-- $opsview_header = array();
-- $opsview_header[] = '<script type="text/_javascript_" src=""
-- $opsview_header[] = '<script type="text/_javascript_" src=""
-- $opsview_header[] = '<script type="text/_javascript_" src=""
-- $opsview_header[] = '<link rel="stylesheet" type="text/css" href="" />';
-- $opsview_header[] = '<div id="opsview_menu" style="height:80px"></div>';
-- $opsview_header[] = '<script type="text/_javascript_">';
-- $opsview_header[] = ' jQuery(document).ready(function($){';
-- $opsview_header[] = ' jQuery("#opsview_menu").load("/navmenu/menu_standalone");';
-- $opsview_header[] = ' });';
-- $opsview_header[] = '</script>';
-- $this->code = join("\n", $opsview_header) .'<div class="header">'.$this->code.'</div>';
-+ $this->code = '<div id="opsview_menu" style="height:80px"></div><div class="header">'.$this->code.'</div>';
- }
-
- /**
-diff '--exclude=.*.sw?' -urN nagvis-1.4.4/nagvis/includes/classes/GlobalPage.php nagvis-1.4.4-patched/nagvis/includes/classes/GlobalPage.php
---- nagvis-1.4.4/nagvis/includes/classes/GlobalPage.php 2009-10-15 17:41:24.000000000 +0100
-+++ nagvis-1.4.4-patched/nagvis/includes/classes/GlobalPage.php 2012-03-27 22:10:18.000000000 +0100
-@@ -246,10 +246,30 @@
- */
- private function buildPage() {
- $ret = '';
--
-+
-+ $opsviewbase = $this->CORE->MAINCFG->getValue('paths','opsviewbase');
-+ $opsview_header = array();
-+ $opsview_header[] = '<script type="text/_javascript_" src="" . $opsviewbase . '/_javascript_/jquery-1.7.1.min.js"></script>';
-+ $opsview_header[] = '<script type="text/_javascript_" src="" . $opsviewbase . '/_javascript_/jquery-ui-1.8.18.custom.min.js"></script>';
-+ $opsview_header[] = '<script type="text/_javascript_" src="" . $opsviewbase . '/_javascript_/jquery.placeholder.min.js"></script>';
-+ $opsview_header[] = '<link rel="stylesheet" type="text/css" href="" . $opsviewbase . '/stylesheets/ui-opsview/jquery-ui-1.8.18.custom.css" />';
-+ $opsview_header[] = '<link rel="stylesheet" type="text/css" href="" . $opsviewbase . '/stylesheets/navmenu/navigation.css" />';
-+ $opsview_header[] = '<!--[if lt IE 9]>';
-+ $opsview_header[] = '<style type="text/css" media="screen">';
-+ $opsview_header[] = ' @import url("' . $opsviewbase . '/stylesheets/navmenu/ie/ie.css");';
-+ $opsview_header[] = '</style>';
-+ $opsview_header[] = '<![endif]-->';
-+
-+ $opsview_header[] = '<script type="text/_javascript_">';
-+ $opsview_header[] = ' jQuery(document).ready(function($){';
-+ $opsview_header[] = ' jQuery("#opsview_menu").load("' . $opsviewbase . '/navmenu/menu_standalone");';
-+ $opsview_header[] = ' });';
-+ $opsview_header[] = '</script>';
-+
- $ret .= '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'."\n";
- $ret .= '<html><head>'."\n";
- $ret .= $this->getHeader();
-+ $ret .= join("\n", $opsview_header)."\n";
- $ret .= '</head><body class="main">'."\n";
- $ret .= $this->getBody();
- $ret .= '</body></html>';
-diff '--exclude=.*.sw?' -urN nagvis-1.4.4/wui/includes/classes/WuiFrontend.php nagvis-1.4.4-patched/wui/includes/classes/WuiFrontend.php
---- nagvis-1.4.4/wui/includes/classes/WuiFrontend.php 2012-03-27 22:09:08.000000000 +0100
-+++ nagvis-1.4.4-patched/wui/includes/classes/WuiFrontend.php 2012-03-27 21:55:06.000000000 +0100
-@@ -89,19 +89,7 @@
- * @author Lars Michelsen <[email protected]>
- */
- function getMap() {
-- $opsview_header = array();
-- $opsview_header[] = '<script type="text/_javascript_" src=""
-- $opsview_header[] = '<script type="text/_javascript_" src=""
-- $opsview_header[] = '<script type="text/_javascript_" src=""
-- $opsview_header[] = '<link rel="stylesheet" type="text/css" href="" />';
-- $opsview_header[] = '<div id="opsview_menu" style="height:80px"></div>';
-- $opsview_header[] = '<script type="text/_javascript_">';
-- $opsview_header[] = ' jQuery(document).ready(function($){';
-- $opsview_header[] = ' jQuery("#opsview_menu").load("/navmenu/menu_standalone");';
-- $opsview_header[] = ' });';
-- $opsview_header[] = '</script>';
--
-- $this->addBodyLines(join("\n", $opsview_header) .'<div id="mymap" class="map">');
-+ $this->addBodyLines('<div id="opsview_menu" style="height:80px"></div><div id="mymap" class="map">');
- $this->MAP = new WuiMap($this->CORE, $this->MAPCFG);
- $this->addBodyLines($this->MAP->parseMap());
- $this->addBodyLines('</div>');
===================================================================
--- trunk/patches/nagvis_rightclickmenu_respects_navbar.patch 2012-08-08 15:52:31 UTC (rev 33)
+++ trunk/patches/nagvis_rightclickmenu_respects_navbar.patch 2012-08-09 16:56:45 UTC (rev 34)
@@ -1,28 +0,0 @@
-diff -ur nagvis-1.4.4.original/wui/includes/js/jsdomenu.js nagvis-1.4.4/wui/includes/js/jsdomenu.js
---- nagvis-1.4.4.original/wui/includes/js/jsdomenu.js 2009-10-15 16:41:24.000000000 +0000
-+++ nagvis-1.4.4/wui/includes/js/jsdomenu.js 2012-07-27 16:18:52.000000000 +0000
-@@ -121,12 +121,22 @@
- if (!e) {
- var e = window.event;
- }
-+ var h;
- if (safari) {
-- return e.clientY - getScrollTop();
-+ h= e.clientY - getScrollTop();
- }
- else {
-- return e.clientY;
-+ h= e.clientY;
- }
-+ /* Opsview patch: Need to cater for the Opsview banner */
-+ var opsviewMenu = getElmId('opsview_menu');
-+ if (opsviewMenu) {
-+ h = h - opsviewMenu.clientHeight;
-+ if (h < 0) {
-+ h = 100000000000; // Move it off screen if within the top menu
-+ }
-+ }
-+ return h;
- }
-
- /*
