roller/web/WEB-INF/classes navbar.vm,1.6,1.7

Update of /cvsroot/roller/roller/web/WEB-INF/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv6121/web/WEB-INF/classes

Modified Files:
        navbar.vm 
Log Message:
Changed NavigationBarTag to use #showNavBar() from navbar.vm.
Changed #showNavBar() to link to "main" page - link named "Main" if admin has 
not changed siteName value in RollerConfig, else shows siteName.

Index: navbar.vm
===================================================================
RCS file: /cvsroot/roller/roller/web/WEB-INF/classes/navbar.vm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** navbar.vm   31 Aug 2003 00:36:48 -0000      1.6
--- navbar.vm   27 Oct 2003 04:09:11 -0000      1.7
***************
*** 30,34 ****
      #set( $rawUrl = "$ctxPath/page/$userName" )
      <div class="rNavigationBar">
!     <a href="$rawUrl">Home</a>
      #if( $website )
          #foreach( $iPage in $pages )
--- 30,34 ----
      #set( $rawUrl = "$ctxPath/page/$userName" )
      <div class="rNavigationBar">
!     <a href="$ctxPath/">$siteName</a>
      #if( $website )
          #foreach( $iPage in $pages )
***************
*** 69,73 ****
          #end
          #set( $editUrl = $rawUrl )
!         #set( $editUrl = $pageHelper.strutsUrlHelper(false, true, 
"logout-redirect", "null", "null") )
          <a href="$editUrl">Logout</a>
      #else
--- 69,73 ----
          #end
          #set( $editUrl = $rawUrl )
!         #set( $editUrl = $pageHelper.strutsUrlHelper(false, true, 
"logout-redirect", "", "") )
          <a href="$editUrl">Logout</a>
      #else
***************
*** 75,79 ****
          #else $delimiter
          #end
!         #set( $editUrl = $pageHelper.strutsUrlHelper(false, true, 
"login-redirect", "null", "null") )
          <a href="$editUrl">Login</a>
      #end
--- 75,79 ----
          #else $delimiter
          #end
!         #set( $editUrl = $pageHelper.strutsUrlHelper(false, true, 
"login-redirect", "", "") )
          <a href="$editUrl">Login</a>
      #end




-------------------------------------------------------
This SF.net email is sponsored by: The SF.net Donation Program.
Do you like what SourceForge.net is doing for the Open
Source Community?  Make a contribution, and help us add new
features and functionality. Click here: http://sourceforge.net/donate/