Author: Lars Michelsen <[email protected]>
Date: Sun Jul 31 02:34:25 2011 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Sun Jul 31 02:34:25 2011 +0200
Bugfix: A lot of links were not working in IE caused by a broken event handler
---
ChangeLog | 1 +
TODO | 1 -
share/frontend/nagvis-js/js/ExtGenericResize.js | 2 +-
share/frontend/nagvis-js/js/edit.js | 3 +-
share/userfiles/templates/default.header.html | 28 +++++++++++-----------
5 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 64e7fbb..387fe63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ Frontend
* Bugfix: Preventing text selections while dragging objects in IE
* Bugfix: Fixed undefied var error when having no maps and displaying the
overview page
* Bugfix: Fixed problem with rotation links in header menu with IE8
+ * Bugfix: A lot of links were not working in IE caused by a broken event
handler
Core
* omd_install: Installing missing doc/ dir now; Cleaning cache files on
install
diff --git a/TODO b/TODO
index a68210c..3d81e27 100644
--- a/TODO
+++ b/TODO
@@ -2,7 +2,6 @@ This is a small file for storing quick thoughts about new
features and needed ch
===============================================================================
Probleme:
- - Im IE8 sind die Links nicht klickbar
- Backends:
- Zusätzlich beliebige Variablen vom Backend holen lassen
diff --git a/share/frontend/nagvis-js/js/ExtGenericResize.js
b/share/frontend/nagvis-js/js/ExtGenericResize.js
index 4b31a46..ab2acdf 100644
--- a/share/frontend/nagvis-js/js/ExtGenericResize.js
+++ b/share/frontend/nagvis-js/js/ExtGenericResize.js
@@ -215,4 +215,4 @@ function getReal(el, type, value) {
addEvent(document, "mousedown", doDown);
addEvent(document, "mouseup", doUp);
-addEvent(document, "mousemove", doMove);
\ No newline at end of file
+addEvent(document, "mousemove", doMove);
diff --git a/share/frontend/nagvis-js/js/edit.js
b/share/frontend/nagvis-js/js/edit.js
index 9cd35a8..f63c800 100644
--- a/share/frontend/nagvis-js/js/edit.js
+++ b/share/frontend/nagvis-js/js/edit.js
@@ -487,7 +487,8 @@ if (window.addEventListener) {
document.documentElement.onclick = function(e) {
addClick(e);
- return false;
+ // Never return false here! This would prevent open links in IE
+ return true;
};
}
diff --git a/share/userfiles/templates/default.header.html
b/share/userfiles/templates/default.header.html
index 7f87b0d..9b97030 100644
--- a/share/userfiles/templates/default.header.html
+++ b/share/userfiles/templates/default.header.html
@@ -35,17 +35,17 @@
<span id="action-ddheader">{$langActions} <img
src="{$pathTemplateImages}default.header_down.png" alt="∇" /></span>
<ul id="action-ddcontent">
{if ($mod == 'Map' || $mod == 'AutoMap') && $permittedSearch}
- <li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=Search&act=view',
'{$langSearch}')">{$langSearch}</a></li>
+ <li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=Search&act=view',
'{$langSearch}')">{$langSearch}</a></li>
{/if}
{if $mod == 'AutoMap' && $permittedEdit == true}
- <li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=AutoMap&act=modifyParams&show={$currentMap}'+getAutomapParams(),
'{$langModifyAutomapParams}')">{$langModifyAutomapParams}</a></li>
+ <li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=AutoMap&act=modifyParams&show={$currentMap}'+getAutomapParams(),
'{$langModifyAutomapParams}')">{$langModifyAutomapParams}</a></li>
{/if}
{if $bRotation == true}
<li id="rotationStart" style="display:none"><a href="#"
onclick="switchRotation()">{$langRotationStart}</a></li>
<li id="rotationStop" style="display:inline"><a href="#"
onclick="switchRotation()">{$langRotationStop}</a></li>
{/if}
{if $mod == 'AutoMap' && $permittedEdit == true}
- <li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=AutoMap&act=automapToMap&show=dialog',
'{$langAutomapToMap}')">{$langAutomapToMap}</a></li>
+ <li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=AutoMap&act=automapToMap&show=dialog',
'{$langAutomapToMap}')">{$langAutomapToMap}</a></li>
{/if}
<li class="spacer underline"></li>
</ul>
@@ -88,8 +88,8 @@
</ul>
</li>
<li class="spacer"><hr /></li>
- <li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=Map&act=manageTmpl&show={$currentMap}',
'{$langMapManageTmpl}', 300)">{$langMapManageTmpl}</a></li>
- <li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=Map&act=addModify&do=modify&show={$currentMap}&type=global&id=0',
'{$langMapOptions}');" class="underline">{$langMapOptions}</a></li>
+ <li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=Map&act=manageTmpl&show={$currentMap}',
'{$langMapManageTmpl}', 300)">{$langMapManageTmpl}</a></li>
+ <li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=Map&act=addModify&do=modify&show={$currentMap}&type=global&id=0',
'{$langMapOptions}');" class="underline">{$langMapOptions}</a></li>
</ul>
</li>
{/if}
@@ -97,12 +97,12 @@
<li onmouseover="ddMenu('wui',1)" onmouseout="ddMenuHide(['wui'])"
class="dropdown">
<span id="wui-ddheader">{$langOptions} <img
src="{$pathTemplateImages}default.header_down.png" alt="∇" /></span>
<ul id="wui-ddcontent">
- {if $permittedEditMainCfg}<li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=MainCfg&act=edit',
'{$langWuiConfiguration}', 970)">{$langWuiConfiguration}</a></li>
+ {if $permittedEditMainCfg}<li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=MainCfg&act=edit',
'{$langWuiConfiguration}', 970)">{$langWuiConfiguration}</a></li>
<li class="spacer"><hr /></li>
- <li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=MainCfg&act=manageBackends',
'{$langMgmtBackends}');">{$langMgmtBackends}</a></li>{/if}
- {if $permittedManageBackgrounds}<li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=ManageBackgrounds&act=view',
'{$langMgmtBackgrounds}');">{$langMgmtBackgrounds}</a></li>{/if}
- {if $permittedManageMaps}<li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=Map&act=manage',
'{$langMgmtMaps}');">{$langMgmtMaps}</a></li>{/if}
- {if $permittedManageShapes}<li><a class="underline" href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=ManageShapes&act=view',
'{$langMgmtShapes}');">{$langMgmtShapes}</a></li>{/if}
+ <li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=MainCfg&act=manageBackends',
'{$langMgmtBackends}');">{$langMgmtBackends}</a></li>{/if}
+ {if $permittedManageBackgrounds}<li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=ManageBackgrounds&act=view',
'{$langMgmtBackgrounds}');">{$langMgmtBackgrounds}</a></li>{/if}
+ {if $permittedManageMaps}<li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=Map&act=manage',
'{$langMgmtMaps}');">{$langMgmtMaps}</a></li>{/if}
+ {if $permittedManageShapes}<li><a class="underline" href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=ManageShapes&act=view',
'{$langMgmtShapes}');">{$langMgmtShapes}</a></li>{/if}
</ul>
</li>
{/if}
@@ -116,9 +116,9 @@
<span id="user-ddheader">{$langUser}<img
src="{$pathTemplateImages}default.header_down.png" alt="∇" /></span>
<ul id="user-ddcontent">
<li><a href="#">{$langLoggedIn}: {$currentUser}</a></li>
- {if $supportedChangePassword && $permittedChangePassword}<li><a
href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=ChangePassword&act=view',
'{$langChangePassword}');">{$langChangePassword}</a></li>{/if}
- {if $permittedUserMgmt}<li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=UserMgmt&act=view',
'{$langUserMgmt}');">{$langUserMgmt}</a></li>{/if}
- {if $permittedRoleMgmt}<li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=RoleMgmt&act=view',
'{$langManageRoles}', 500);">{$langManageRoles}</a></li>{/if}
+ {if $supportedChangePassword && $permittedChangePassword}<li><a
href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=ChangePassword&act=view',
'{$langChangePassword}');">{$langChangePassword}</a></li>{/if}
+ {if $permittedUserMgmt}<li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=UserMgmt&act=view',
'{$langUserMgmt}');">{$langUserMgmt}</a></li>{/if}
+ {if $permittedRoleMgmt}<li><a href="#"
onclick="showFrontendDialog(oGeneralProperties.path_server+'?mod=RoleMgmt&act=view',
'{$langManageRoles}', 500);">{$langManageRoles}</a></li>{/if}
{if $permittedLogout}<li><a href="#"
onclick="getSyncRequest('{$pathBase}/server/core/ajax_handler.php?mod=Auth&act=logout');return
false;">{$langLogout}</a></li>{/if}
<li class="spacer underline"></li>
</ul>
@@ -126,7 +126,7 @@
<li onmouseover="ddMenu('language',1)"
onmouseout="ddMenuHide(['language'])" class="dropdown">
<span id="language-ddheader">{$langChooseLanguage} <img
src="{$pathTemplateImages}default.header_down.png" alt="∇" /></span>
<ul id="language-ddcontent">
- {foreach $langs lang}<li><a href="{$currentUri}{if
strpos($currentUri,'?') !==
false}&{else}?{/if}lang={$lang.language}">{$lang.langLanguageLocated}</a></li>{/foreach}
+ {foreach $langs lang}<li><a href="{str_replace('&', '&',
$currentUri)}{if strpos($currentUri,'?') !==
false}&{else}?{/if}lang={$lang.language}">{$lang.langLanguageLocated}</a></li>{/foreach}
<li class="spacer underline"></li>
</ul>
</li>
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
