Module: nagvis Branch: master Commit: 0ff5a42edf22b903b7745fed5841fa223378cb9c URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=0ff5a42edf22b903b7745fed5841fa223378cb9c
Author: LaMi <[email protected]> Date: Fri Jan 15 12:24:27 2010 +0100 Changed WUI welcome page to clear html; removed background image --- share/frontend/wui/classes/WuiModWelcome.php | 7 ++++++- share/frontend/wui/classes/WuiViewWelcome.php | 1 - share/frontend/wui/images/internal/wuilogo.png | Bin 9913 -> 0 bytes share/userfiles/templates/default.css | 9 +++++++++ share/userfiles/templates/default.header.html | 5 ++++- share/userfiles/templates/default.wuiWelcome.html | 16 ++++++---------- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/share/frontend/wui/classes/WuiModWelcome.php b/share/frontend/wui/classes/WuiModWelcome.php index f087111..85504df 100644 --- a/share/frontend/wui/classes/WuiModWelcome.php +++ b/share/frontend/wui/classes/WuiModWelcome.php @@ -40,7 +40,12 @@ class WuiModWelcome extends WuiModule { exit; } - // FIXME: Header menu? + // Need to parse the header menu by config or url value? + if($this->CORE->getMainCfg()->getValue('wui','headermenu')) { + // Parse the header menu + $HEADER = new WuiHeaderMenu($this->CORE, $this->AUTHORISATION, $this->CORE->getMainCfg()->getValue('wui','headertemplate'), $MAPCFG); + $INDEX->setHeaderMenu($HEADER->__toString()); + } // Print welcome page $this->VIEW = new WuiViewWelcome($this->CORE, $MAPCFG); diff --git a/share/frontend/wui/classes/WuiViewWelcome.php b/share/frontend/wui/classes/WuiViewWelcome.php index 735b611..ec9297e 100644 --- a/share/frontend/wui/classes/WuiViewWelcome.php +++ b/share/frontend/wui/classes/WuiViewWelcome.php @@ -51,7 +51,6 @@ class WuiViewWelcome { $TMPLSYS = $TMPL->getTmplSys(); $aData = Array( - 'backgroundImg' => $this->CORE->getMainCfg()->getValue('paths', 'htmlbase').'/frontend/wui/images/internal/wuilogo.png', 'base' => $this->CORE->getMainCfg()->getValue('paths', 'htmlbase'), 'generalProperties' => $this->CORE->getMainCfg()->parseGeneralProperties(), 'userName' => $this->CORE->getAuthentication()->getUser(), diff --git a/share/frontend/wui/images/internal/wuilogo.png b/share/frontend/wui/images/internal/wuilogo.png deleted file mode 100644 index 26caec6..0000000 Binary files a/share/frontend/wui/images/internal/wuilogo.png and /dev/null differ diff --git a/share/userfiles/templates/default.css b/share/userfiles/templates/default.css index 34f8d48..3d2b7a0 100644 --- a/share/userfiles/templates/default.css +++ b/share/userfiles/templates/default.css @@ -67,6 +67,13 @@ img { left: 0; } +/* Welcome page */ +div.welcome {padding:20px;width:600px} +div.welcome h1 {color:#43B3CF;background:#eee;padding:3px 10px 2px 20px;font-size:24px;line-height:30px;font-weight:normal;-moz-border-radius:8px;-webkit-border-radius:8px;margin-bottom:5px} +div.welcome p {padding:5px;font-size:12px} +div.welcome a,div.welcome a:active,div.welcome a:visited {color:#43B3CF} +div.welcome a:hover {color:#779D2A} + /* Automap */ #automap { z-index: 100; @@ -589,6 +596,8 @@ td#popupWindowContent fieldset.form label { .dropdown ul {margin:0;padding:0;list-style:none} .dropdown li {margin:0;padding:0} .dropdown a, .dropdown a:active, .dropdown a:visited, .dropdown li.spacer, .dropdown dl.subdropdown dt {display:block;width:193px;background:#eaf0f2;margin:0;color:#43B3CF;text-decoration:none;border-left:1px solid #a4a4a4;border-right:1px solid #a4a4a4;padding:5px;} +.dropdown a.left, .dropdown a.left:active, .dropdown a.left:visited {float:left;width:152px;border-right:0} +.dropdown a.right, .dropdown a.right:active, .dropdown a.right:visited {float:right;width:30px;border-left:1px solid #43B3CF} .dropdown a:hover {background:#d9e1e4;color:#779D2A} .dropdown a.submenu-link:after {float:right;content:">"} .dropdown li.spacer {width:203px} diff --git a/share/userfiles/templates/default.header.html b/share/userfiles/templates/default.header.html index 4ef0612..af88e5a 100644 --- a/share/userfiles/templates/default.header.html +++ b/share/userfiles/templates/default.header.html @@ -9,7 +9,10 @@ <ul> <li><a href="{$pathBase}/frontend/nagvis-js/index.php">{$langOverview}</a></li> <li class="spacer"><hr /></li> - {foreach $maps map}<li><a href="{$pathBase}/frontend/nagvis-js/index.php?mod=Map&act=view&show={$map.mapName}{$map.urlParams}">{$map.mapAlias}</a></li>{/foreach} + {foreach $maps map}<li> + <a class="left" href="{$pathBase}/frontend/nagvis-js/index.php?mod=Map&act=view&show={$map.mapName}{$map.urlParams}">{$map.mapAlias}</a> + <a class="right" href="{$pathBase}/frontend/wui/index.php?mod=Map&act=edit&show={$map.mapName}{$map.urlParams}">Edit</a> + </li>{/foreach} <li class="spacer"><hr /></li> {foreach $automaps map}<li><a href="{$pathBase}/frontend/nagvis-js/index.php?mod=AutoMap&act=view&show={$map.mapName}{$map.urlParams}">{$map.mapAlias}</a></li>{/foreach} <li><a href="{$pathBase}/frontend/wui/index.php" class="underline">{$langWui}</a></li> diff --git a/share/userfiles/templates/default.wuiWelcome.html b/share/userfiles/templates/default.wuiWelcome.html index 64f80e4..9924460 100644 --- a/share/userfiles/templates/default.wuiWelcome.html +++ b/share/userfiles/templates/default.wuiWelcome.html @@ -13,17 +13,13 @@ var validMainConfig = {$validMainCfg}; var mapOptions = {$mapOptions}; </script> -<div id="mymap" class="map"> - <!-- background --> - {if $backgroundImg != ''} - <img id="background" src="{$backgroundImg}" style="z-index:0;" alt=""> - {/if} +<div id="mymap" class="map welcome"> + <h1>Welcome to the NagVis WUI!</h1> + <p>This is the NagVis web configuration interface. You can use it to configure NagVis and/or build your own NagVis maps using your browser.</p> + <p>Unlike previous NagVis versions the navigation in the WUI uses the header menu. The context menu has been removed.</p> + <p>Have fun using NagVis! And please report problems or bugs.</p> + <p>And if you really like NagVis you are welcome to <a href="http://www.nagvis.org/become-sponsor"; target="_blank">support NagVis</a>.</p> </div> -<script type="text/javascript"> -// build the right-click menu -initjsDOMenu(); -</script> - <!-- Important to have this in body --> <script type="text/javascript" src="{$base}/frontend/wui/js/wz_tooltip.js"></script> ------------------------------------------------------------------------------ Throughout its 18-year history, RSA Conference consistently attracts the world's best and brightest in the field, creating opportunities for Conference attendees to learn about information security's most important issues through interactions with peers, luminaries and emerging and established companies. http://p.sf.net/sfu/rsaconf-dev2dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
