Author: Lars Michelsen <[email protected]>
Date: Thu Apr 14 22:21:32 2011 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Thu Apr 14 22:21:32 2011 +0200
Changed header menu handling a bit
---
.../nagvis-js/classes/NagVisHeaderMenu.php | 8 +++-----
share/userfiles/templates/default.header.html | 15 ++-------------
2 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php
b/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php
index a7518a6..b6908df 100644
--- a/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php
+++ b/share/frontend/nagvis-js/classes/NagVisHeaderMenu.php
@@ -279,10 +279,9 @@ class NagVisHeaderMenu {
'pathHeaderJs' =>
$this->CORE->getMainCfg()->getPath('html', 'global', 'templates',
$this->templateName.'.header.js'),
'pathTemplates' =>
$this->CORE->getMainCfg()->getPath('html', 'global', 'templates'),
'pathTemplateImages' =>
$this->CORE->getMainCfg()->getPath('html', 'global', 'templateimages'),
- 'langSearch' =>
$this->CORE->getLang()->getText('Search'),
- 'langUserMgmt' =>
$this->CORE->getLang()->getText('Manage Users'),
- 'langManageRoles' =>
$this->CORE->getLang()->getText('Manage Roles'),
- 'langWui' => $this->CORE->getLang()->getText('WUI'),
+ 'langSearch' =>
$this->CORE->getLang()->getText('Search'),
+ 'langUserMgmt' =>
$this->CORE->getLang()->getText('Manage Users'),
+ 'langManageRoles' =>
$this->CORE->getLang()->getText('Manage Roles'),
'currentLanguage' =>
$this->CORE->getLang()->getCurrentLanguage(),
'langChooseLanguage' =>
$this->CORE->getLang()->getText('Choose Language'),
'langUser' => $this->CORE->getLang()->getText('User
menu'),
@@ -308,7 +307,6 @@ class NagVisHeaderMenu {
'langShape' => $this->CORE->getLang()->getText('shape'),
'langStateless' =>
$this->CORE->getLang()->getText('Stateless'),
'langSpecial' =>
$this->CORE->getLang()->getText('special'),
- 'langEditMap' =>
$this->CORE->getLang()->getText('editMap'),
'langLockUnlockAll' =>
$this->CORE->getLang()->getText('Lock/Unlock all'),
'langViewMap' => $this->CORE->getLang()->getText('View
current map'),
'langOptions' =>
$this->CORE->getLang()->getText('Options'),
diff --git a/share/userfiles/templates/default.header.html
b/share/userfiles/templates/default.header.html
index 62d3101..255783f 100644
--- a/share/userfiles/templates/default.header.html
+++ b/share/userfiles/templates/default.header.html
@@ -35,12 +35,7 @@
{/if}</li>
{/foreach}
{/if}
- {if $permittedEditAnyMap ||
$permittedEditMainCfg || $permittedManageBackgrounds || $permittedManageMaps ||
$permittedManageShapes}
- <li class="spacer"><hr /></li>
- <li><a
href="{$pathBase}/frontend/wui/index.php" class="underline">{$langWui}</a></li>
- {else}
<li class="spacer underline"></li>
- {/if}
</ul>
</dd>
</dl>
@@ -64,14 +59,7 @@
{if $mod == 'AutoMap' && $permittedEdit
== true}
<li><a
href="javascript:showFrontendDialog(oGeneralProperties.path_server+'?mod=AutoMap&act=automapToMap&show=dialog',
'{$langAutomapToMap}')">{$langAutomapToMap}</a></li>
{/if}
- {if $mod == 'Map' && $permittedEdit ==
true && $act != 'edit'}
- <li><a
href="javascript:toggleAllMapObjectsLock();ddMenu('action',-1)">{$langLockUnlockAll}</a></li>
- <li><a
href="{$pathBase}/frontend/wui/index.php?mod=Map&act=edit&show={$currentMap}"
class="underline">{$langEditMap}</a></li>
- {elseif $mod == 'Map' && $permittedView
== true && $act != 'view'}
- <li><a
href="{$pathBase}/frontend/nagvis-js/index.php?mod=Map&act=view&show={$currentMap}"
class="underline">{$langViewMap}</a></li>
- {else}
<li class="spacer underline"></li>
- {/if}
</ul>
</dd>
</dl>
@@ -83,6 +71,8 @@
<dt id="map-ddheader" onmouseover="ddMenu('map',1)"
onmouseout="ddMenu('map',-1)">{$langMapEdit} <img
src="{$pathTemplateImages}default.header_down.png" alt="∇" /></dt>
<dd id="map-ddcontent" onmouseover="cancelHide('map')"
onmouseout="ddMenu('map',-1)">
<ul>
+ <li><a
href="javascript:toggleAllMapObjectsLock();ddMenu('action',-1)">{$langLockUnlockAll}</a></li>
+ <li class="spacer"><hr /></li>
<li><a
href="javascript:gridToggle()">{$langToggleGrid}</a></li>
<li class="spacer"><hr /></li>
<li><a class="submenu-link"
id="map-addicon-ddheader" href="#" onmouseover="ddMenu('map-addicon',1,1)"
onmouseout="ddMenu('map-addicon',-1)">{$langMapAddIcon}</a></li>
@@ -207,7 +197,6 @@
<li class="closed"><a class="title" href="#"
onclick="sidebarToggleSubtree(this)">{$langAutomaps}</a>
<ul style="display:none;">{sideMaps $automaps $pathBase
"AutoMap"}</ul>
</li>
- {if $permittedEditAnyMap}<li class="spacertop"><a
href="{$pathBase}/frontend/wui/index.php"
class="underline">{$langWui}</a></li>{/if}
</ul>
</div>
<div id="headerspacer"></div>
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
