[Hyperic-hq-discuss] hq r8801 - trunk/src/org/hyperic/ui/tapestry/components/navigation

[<rp...@hy...>]

Author: rpack
Date: 2008-04-10 11:26:39 -0700 (Thu, 10 Apr 2008)
New Revision: 8801
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=8801

Modified:
   trunk/src/org/hyperic/ui/tapestry/components/navigation/Header.html
   trunk/src/org/hyperic/ui/tapestry/components/navigation/Header.java
Log:
Added menu item param

Modified: trunk/src/org/hyperic/ui/tapestry/components/navigation/Header.html
===================================================================
--- trunk/src/org/hyperic/ui/tapestry/components/navigation/Header.html	2008-04-10 18:26:19 UTC (rev 8800)
+++ trunk/src/org/hyperic/ui/tapestry/components/navigation/Header.html	2008-04-10 18:26:39 UTC (rev 8801)
@@ -1,12 +1,13 @@
 <div id="header">
     <div id="headerLogo" title="Home" onclick="/Dashboard.do">&nbsp;</div>
     <if jwcid="@If" condition="ognl:isLoggedIn" renderTag="false">
-    <div jwcid="@NavigationTabs"/>
+    <div jwcid="@NavigationTabs" navigationMenu="ognl:navigationMenu"/>
     </if>
     <div jwcid="@Any" id="headerLinks" style="ognl:isLoggedIn?'':'right:0px'">
     <if jwcid="@If" condition="ognl:!isLoggedIn" renderTag="false"><span key="notSignedIn"></span></if>
     <else jwcid="@Else" renderTag="false"><span key="welcome"></span> <span jwcid="@Insert" value="ognl:getUserName()"></span><span><a href="/Logout.do"><span key="logout"></span></a></span></else>
-    <span><a href="#"><span key="help"/></a></span>
+    <span><a href="javascript:void(0)" onclick="tutorialWin=window.open('http://www.hyperic.com/demo/screencasts.html','tutorials','width=800,height=650,scrollbars=yes,toolbar=yes,left=80,top=80,resizable=yes');tutorialWin.focus();return false;"><span key="screencast"/></a></span>
+    <span><a href="javascript:void(0)" onclick="helpWin=window.open('','help','width=800,height=650,scrollbars=yes,toolbar=yes,left=80,top=80,resizable=yes');helpWin.focus();return false;"><span key="help"/></a></span>
     </div>
     <if jwcid="@If" condition="ognl:isLoggedIn" renderTag="false">
     <span jwcid="@SearchPanel"/>

Modified: trunk/src/org/hyperic/ui/tapestry/components/navigation/Header.java
===================================================================
--- trunk/src/org/hyperic/ui/tapestry/components/navigation/Header.java	2008-04-10 18:26:19 UTC (rev 8800)
+++ trunk/src/org/hyperic/ui/tapestry/components/navigation/Header.java	2008-04-10 18:26:39 UTC (rev 8801)
@@ -39,4 +39,8 @@
     public abstract boolean getIsSignedIn();
     public abstract void setIsSignedIn(boolean signedIn);
     
+    @Parameter(name = "navigationMenu")
+    public abstract void setNavigationMenu(NavigationMenu menu);
+    public abstract NavigationMenu getNavigationMenu();
+
 }