bugfix [ 912217 ] top level nav macro problems

docs/changelog/6.x.x.txt

@@ -8,6 +8,8 @@ Andreas Graf).
  - Apache 2.0 is now the default web server for WebGUI. See gotcha.txt for
    details.
  - Bugfix [ 904313 ] Problem with page-template preview in 6.0.0
+ - Bugfix [ 912017 ] viewSubmission function error in 6.0.0
+ - Bugfix [ 912217 ] top level nav macro problems
 
 
 

docs/upgrades/upgrade_6.0.0-6.0.1.sql

@@ -78,4 +78,5 @@ INSERT INTO international VALUES (1094,'WebGUI',1,'Navigation, Manage',107820804
 INSERT INTO international VALUES (1095,'WebGUI',1,'<P>The general idea behind the&nbsp;navigation system is that instead of<BR>hardwiring all the various choices you might make into the code, the<BR>system manages a \'library\' of these styles, just the way it does with<BR>Snippets, Images, Templates, Page Styles, and other types of reusable<BR>information.&nbsp; You can create a new \'nav menu style\', give it a name,<BR>and then use it anywhere on your site that you like.</P>\r\n<P>The navigation system consists of two parts:</P>\r\n<OL>\r\n<LI>The navigation editor</LI>\r\n<LI>The <STRONG>^Navigation();</STRONG> macro</LI></OL>\r\n<P>The easiest way to add a completely new menu to your site is to put a <STRONG>^Navigation(myMenu);</STRONG> macro into your style. <BR>A \"edit myMenu\" link will be displayed if \"myMenu\" is not defined. </P>\r\n<P>Note: In this example \"myMenu\" is used, but you can pick any name, as long as it is unique.</P>',1078462928,NULL);
 INSERT INTO international VALUES (1096,'WebGUI',1,'Navigation Template',1078207966,NULL);
 INSERT INTO international VALUES (1097,'WebGUI',1,'<STRONG>config.button</STRONG>&nbsp;<BR>A \"Edit / Manage\" button for this navigation item.<BR>\r\n<P><STRONG>page_loop</STRONG><BR>A loop containing page information.</P>\r\n<BLOCKQUOTE dir=ltr style=\"MARGIN-RIGHT: 0px\">\r\n<P dir=ltr><STRONG>page.menuTitle<BR></STRONG>The menu title of this page.</P>\r\n<P dir=ltr><STRONG>page.title<BR></STRONG>The title of this page.</P>\r\n<P><STRONG>page.urlizedTitle<BR></STRONG>The urlized title of this pagepage.url.</P>\r\n<P><STRONG>page.url<BR></STRONG>The url of this page.</P>\r\n<P dir=ltr><STRONG>page.pageId</STRONG><BR>The pageId of this page.</P>\r\n<P dir=ltr><STRONG>page.parentId</STRONG><BR>The ParentId&nbsp;of this page.</P>\r\n<P dir=ltr><STRONG>page.ownerId<BR></STRONG>The ownerId of this page.</P>\r\n<P dir=ltr><STRONG>page.synopsis<BR></STRONG>The synopsis of this page.</P>\r\n<P dir=ltr><STRONG>page.newWindow</STRONG><BR>A condition indicating whether this page should be opened in a new window.</P>\r\n<P dir=ltr><STRONG>page.absDepth</STRONG><BR>The absolute depth of this page&nbsp;(relative to nameless root).</P>\r\n<P><STRONG>page.relDepth</STRONG><BR>The relative depth of this page (relative to starting point).</P>\r\n<P><STRONG>page.isCurrent</STRONG><BR>A condition indicating whether this page is current page.</P>\r\n<P><STRONG>page.isHidden</STRONG><BR>A condition indicating whether this page is a hidden page.<BR><EM>(Note: This variable is only visible if \"Show hidden pages\" is switched on.)</EM></P>\r\n<P><STRONG>page.isSystem</STRONG><BR>A condition indicating whether this page is a system page (Trash, Clipboard, etc).<BR><EM>(Note: This variable is only visible if \"Show system pages\" is switched on.)</EM></P>\r\n<P><STRONG>page.isViewable<BR></STRONG>A condition indicating whether the user has permission to view it.<BR><EM>(Note: This variable is only visible if \"Show unprivileged pages\" is switched on.)</EM></P>\r\n<P><STRONG>page.indent<BR></STRONG>A variable containing the indent for current page. The default indent is three spaces. Use the <STRONG>page.indent_loop </STRONG>if you need a more flexible indent.</P>\r\n<P><STRONG>page.indent_loop<BR></STRONG>A loop that runs <STRONG>page.relDepth </STRONG>times.</P>\r\n<BLOCKQUOTE dir=ltr style=\"MARGIN-RIGHT: 0px\">\r\n<P><STRONG>indent</STRONG><BR>A number representing the loop count. </P></BLOCKQUOTE>\r\n<P dir=ltr><STRONG>page.isRoot</STRONG><BR>A condition indication whether this page is a root page.</P>\r\n<P dir=ltr><STRONG>page.isTop</STRONG><BR>A condition indication whether this page is a top page (daughter of root).</P>\r\n<P dir=ltr><STRONG>page.hasDaughter</STRONG><BR>A condition indication whether this page has a daughter. In other words: It evaluates to true if this page is a mother.</P>\r\n<P dir=ltr><STRONG>page.isMyDaughter</STRONG><BR>A condition indication whether this page is a daughter of current page.</P>\r\n<P dir=ltr><STRONG>page.isMyMother<BR></STRONG>A condition indication whether this page is the mother of current page.</P>\r\n<P dir=ltr><STRONG>page.mother.title<BR></STRONG>The title of the mother of this&nbsp;page.</P>\r\n<P dir=ltr><STRONG>page.mother.urlizedTitle<BR></STRONG>The urlized title of the mother of this page.</P>\r\n<P dir=ltr><STRONG>page.mother.pageId</STRONG><BR>The pageId of the mother of this page.</P>\r\n<P dir=ltr><STRONG>page.mother.parentId</STRONG><BR>The parentId of the mother of this page.</P>\r\n<P dir=ltr><STRONG>page.depthIs1 , page.depthIs2 , page.depthIs3 , page.depthIs4 , page.depthIsN<BR></STRONG>A condition indicating whether the depth of this page is N. This variable is useful if you want to style a certain level.</P>\r\n<P dir=ltr>&lt;tmpl_if page.depthIs1&gt;<BR>&nbsp;&nbsp; &lt;img src=\"level1.gif\"&gt;<BR>&lt;tmpl_else&gt;<BR>&nbsp;&nbsp; &lt;img src=\"defaultBullet.gif\"&gt;<BR>&lt;/tmpl_if&gt;</P>\r\n<P dir=ltr><STRONG>page.relativeDepthIs1 , page.relativeDepthIs2 , page.relativeDepthIs3 , page.relativeDepthIsN</STRONG><BR>A condition indicating whether the relative depth of this page is N.</P></BLOCKQUOTE>\r\n<P dir=ltr>&nbsp;</P>',1078207966,NULL);
+update Navigation set depth=99 where depth=0;
 

lib/WebGUI/Operation/Navigation.pm

@@ -174,8 +174,7 @@ sub www_editNavigation {
                 -value=>[$session{form}{stopAtLevel} || $config->{stopAtLevel}]
                 );
 	tie my %depths, 'Tie::IxHash';
-	%depths = (		'0'	=> '0 levels',
-				'1'	=> '1 level',
+	%depths = (		'1'	=> '1 level',
 				'2'	=> '2 levels',
 				'3'	=> '3 levels',
 				'4'	=> '4 levels',