Module: nagvis Branch: master Commit: 4a575a96dae83f9cd41f1759b95439bf93c19ecb URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=4a575a96dae83f9cd41f1759b95439bf93c19ecb
Author: Lars Michelsen <[email protected]> Date: Sun Aug 15 23:28:44 2010 +0200 Language changes happen on the same site now without redirect to the index page --- .../nagvis-js/classes/NagVisHeaderMenu.php | 1 + share/userfiles/templates/default.header.html | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php b/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php index 7bfb64f..079bc94 100644 --- a/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php +++ b/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php @@ -290,6 +290,7 @@ class NagVisHeaderMenu { // Replace paths and language macros $aReturn = Array('pathBase' => $this->pathHtmlBase, + 'currentUri' => $this->UHANDLER->getRequestUri(), 'pathImages' => $this->CORE->getMainCfg()->getValue('paths','htmlimages'), 'pathTemplates' => $this->CORE->getMainCfg()->getValue('paths','htmltemplates'), 'pathTemplateImages' => $this->CORE->getMainCfg()->getValue('paths','htmltemplateimages'), diff --git a/share/userfiles/templates/default.header.html b/share/userfiles/templates/default.header.html index d22c2d4..65e62d5 100644 --- a/share/userfiles/templates/default.header.html +++ b/share/userfiles/templates/default.header.html @@ -166,7 +166,7 @@ <dt id="language-ddheader" onmouseover="ddMenu('language',1)" onmouseout="ddMenu('language',-1)">{$langChooseLanguage} <img src="{$pathTemplateImages}default.header_down.png" alt="∇" /></dt> <dd id="language-ddcontent" onmouseover="cancelHide('language')" onmouseout="ddMenu('language',-1)"> <ul> - {foreach $langs lang}<li><a href="{$pathBase}/frontend/nagvis-js/index.php?lang={$lang.language}" {if $lang.classUnderline}class="underline"{/if}>{$lang.langLanguageLocated}</a></li>{/foreach} + {foreach $langs lang}<li><a href="{$currentUri}{if strpos($currentUri,'?') !== false}&{else}?{/if}lang={$lang.language}" {if $lang.classUnderline}class="underline"{/if}>{$lang.langLanguageLocated}</a></li>{/foreach} </ul> </dd> </dl> ------------------------------------------------------------------------------ This SF.net email is sponsored by Make an app they can't live without Enter the BlackBerry Developer Challenge http://p.sf.net/sfu/RIM-dev2dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
