Module: nagvis Branch: master Commit: 26731a2fbf980de75b364b509ba9f0c08fbd27df URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/nagvis;a=commit;h=26731a2fbf980de75b364b509ba9f0c08fbd27df
Author: Lars Michelsen <[email protected]> Date: Tue Sep 8 20:33:17 2009 +0200 #8 Added new macro [html_images] to header templates; Made header template ready to work with the new paths --- .../nagvis-js/classes/GlobalHeaderMenu.php | 2 ++ share/userfiles/templates/header/tmpl.default.html | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/share/frontend/nagvis-js/classes/GlobalHeaderMenu.php b/share/frontend/nagvis-js/classes/GlobalHeaderMenu.php index 7e71e7e..c64fbcc 100644 --- a/share/frontend/nagvis-js/classes/GlobalHeaderMenu.php +++ b/share/frontend/nagvis-js/classes/GlobalHeaderMenu.php @@ -176,6 +176,7 @@ class GlobalHeaderMenu { public function replaceStaticMacros() { // Replace paths and language macros $arrKeys = Array('[html_base]', + '[html_images]', '[html_templates]', '[html_template_images]', '[current_language]', @@ -193,6 +194,7 @@ class GlobalHeaderMenu { '[lang_refresh_stop]'); $arrVals = Array($this->pathHtmlBase, + $this->CORE->MAINCFG->getValue('paths','htmlimages'), $this->CORE->MAINCFG->getValue('paths','htmlheadertemplates'), $this->CORE->MAINCFG->getValue('paths','htmlheadertemplateimages'), $this->CORE->LANG->getCurrentLanguage(), diff --git a/share/userfiles/templates/header/tmpl.default.html b/share/userfiles/templates/header/tmpl.default.html index fbcc159..0e2f146 100644 --- a/share/userfiles/templates/header/tmpl.default.html +++ b/share/userfiles/templates/header/tmpl.default.html @@ -1,7 +1,7 @@ <link rel="stylesheet" type="text/css" href="[html_templates]tmpl.default.css" /> <table class="header_table"> <tr> - <th class="logo"><a href="[html_base]/index.php"><img src="[html_base]/nagvis/images/internal/logo_119x31.png" alt="NagVis"></a></th> + <th class="logo"><a href="[html_base]/frontend/nagvis-js/index.php"><img src="[html_images]internal/logo_119x31.png" alt="NagVis"></a></th> <td style="width:150px;padding-left:10px;">[lang_select_map]: </td> <td style="width:150px;"> <select style="width:100%;" name="chooseMap" onChange="changeMap('[html_base]',this.options[this.selectedIndex].value)"> @@ -9,7 +9,7 @@ <!-- BEGIN maplist --><option value="[map_name][url_params]" [selected]>[map_alias]</option><!-- END maplist --> </select> </td> - <th style="width:150px;"><a href="[html_base]/wui/index.php?map=[current_map]">[lang_edit_map]</a></th> + <th style="width:150px;"><a href="[html_base]/frontend/wui/index.php?map=[current_map]">[lang_edit_map]</a></th> <td></td> <td style="width:20px;text-align:center;" id="refreshCounterHead"></td> <th style="width:150px;"> ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
