*** empty log message ***

docs/upgrades/upgrade_5.0.3-5.1.0.sql

@@ -707,7 +707,11 @@ delete from international where languageId=11 and namespace='UserSubmission' and
 delete from international where languageId=11 and namespace='UserSubmission' and internationalId=59;
 delete from international where languageId=11 and namespace='UserSubmission' and internationalId=6;
 delete from international where languageId=11 and namespace='UserSubmission' and internationalId=61;
-
+alter table page add column hideFromNavigation int not null default 0;
+update page set hideFromNavigation=1 where pageId=4;
+update page set hideFromNavigation=1 where pageId=3;
+update page set hideFromNavigation=1 where pageId=2;
+update page set hideFromNavigation=1 where pageId=5;
 
 
 

lib/WebGUI/Macro/FlexMenu.pm

@@ -30,9 +30,9 @@ sub _replacement {
 sub _reversePageTree {
         my ($sth, @data, $output, $parentId);
 	($parentId) = WebGUI::SQL->quickArray("select parentId from page where pageId='$_[0]'");
-        $sth = WebGUI::SQL->read("select pageId,parentId,menuTitle,urlizedTitle from page where parentId=$_[0] order by sequenceNumber");
+        $sth = WebGUI::SQL->read("select pageId,parentId,menuTitle,urlizedTitle,hideFromNavigation from page where parentId=$_[0] order by sequenceNumber");
         while (@data = $sth->array) {
-		if (WebGUI::Privilege::canViewPage($data[0])) {
+		if (!($data[4]) && WebGUI::Privilege::canViewPage($data[0])) {
                 	$output .= '<a class="verticalMenu" href="'.WebGUI::URL::gateway($data[3]).'">';
 			if ($session{page}{pageId} == $data[0]) {
 				$output .= '<span class="selectedMenuItem">'.$data[2].'</span>';

lib/WebGUI/Macro/rootmenuHorizontal.pm

@@ -12,41 +12,15 @@ package WebGUI::Macro::rootmenuHorizontal;
 
 use strict;
 use WebGUI::Macro;
-use WebGUI::Privilege;
+use WebGUI::Navigation;
 use WebGUI::Session;
-use WebGUI::SQL;
-use WebGUI::URL;
 
 #-------------------------------------------------------------------
 sub _replacement {
-        my ($temp, @data, $pageTitle, $parentId, $sth, $first, @param, $delimeter);
+	my @param = WebGUI::Macro::getParams($_[0]);
-	@param = WebGUI::Macro::getParams($_[0]);
+	my $tree = WebGUI::Navigation::tree(0,1);
-	if ($param[0] eq "") {
+        my $temp = '<span class="horizontalMenu">';
-                $delimeter = " &middot; ";
+	$temp .= WebGUI::Navigation::drawHorizontal($tree,$param[0]);
-        } else {
-                $delimeter = " ".$param[0]." ";
-        }
-        $temp = '<span class="horizontalMenu">';
-        $first = 1;
-        $sth = WebGUI::SQL->read("select menuTitle,urlizedTitle,pageId from page where parentId=0 
-		and (pageId=1 or pageId>999) order by sequenceNumber");
-        while (@data = $sth->array) {
-        	if (WebGUI::Privilege::canViewPage($data[2])) {
-                	if ($first) {
-                        	$first = 0;
-                        } else {
-                                $temp .= $delimeter;
-                        }
-                        $temp .= '<a class="horizontalMenu" href="'.WebGUI::URL::gateway($data[1]).'">';
-                        if ($session{page}{pageId} == $data[2]) {
-                                $temp .= '<span class="selectedMenuItem">'.$data[0].'</span>';
-                        } else {
-                                $temp .= $data[0];
-                        }
-                        $temp .= '</a>';
-                }
-        }
-        $sth->finish;
         $temp .= '</span>';
 	return $temp;
 }

lib/WebGUI/Navigation.pm

@@ -189,10 +189,10 @@ sub tree {
 	tie %tree, 'Tie::IxHash';
 	tie %data, 'Tie::CPHash';
        	if ($depth < $toLevel) {
-               	$sth = WebGUI::SQL->read("select urlizedTitle, menuTitle, pageId, synopsis from page 
+               	$sth = WebGUI::SQL->read("select urlizedTitle, menuTitle, pageId, synopsis, hideFromNavigation from page 
 			where parentId='$parentId' order by sequenceNumber");
                	while (%data = $sth->hash) {
-                       	if (WebGUI::Privilege::canViewPage($data{pageId})) {
+                       	if (!($data{hideFromNavigation}) && WebGUI::Privilege::canViewPage($data{pageId})) {
 				$tree{$data{pageId}}{url} = WebGUI::URL::gateway($data{urlizedTitle}); 
 				$tree{$data{pageId}}{title} = $data{menuTitle}; 
 				$tree{$data{pageId}}{synopsis} = $data{synopsis}; 

lib/WebGUI/Operation/Package.pm

@@ -73,7 +73,8 @@ sub _recursePageTree {
 			userDefined2,
 			userDefined3,
 			userDefined4,
-			userDefined5
+			userDefined5,
+			hideFromNavigation
 			) values (
 			$newPageId,
 			$_[1],
@@ -96,7 +97,8 @@ sub _recursePageTree {
 			".quote($newParent{userDefined2}).",
 			".quote($newParent{userDefined3}).",
 			".quote($newParent{userDefined4}).",
-			".quote($newParent{userDefined5})."
+			".quote($newParent{userDefined5}).",
+			$package{hideFromNavigation}
 			)");
 		_recursePageTree($package{pageId},$newPageId);
 	}

lib/WebGUI/Operation/Page.pm

@@ -132,7 +132,7 @@ sub _traversePageTree {
         for ($i=1;$i<=$_[1];$i++) {
                 $depth .= $spacer;
         }
-        $a = WebGUI::SQL->read("select * from page where (pageId=1 or pageId>999) and parentId='$_[0]' order by sequenceNumber");
+        $a = WebGUI::SQL->read("select pageId,urlizedTitle,title from page where (pageId<2 or pageId>999) and parentId='$_[0]' order by sequenceNumber");
         while (%page = $a->hash) {
 		if (WebGUI::Privilege::canEditPage($page{pageId})) {
                 	$output .= $depth
@@ -248,6 +248,12 @@ sub www_editPage {
 			-value=>$page{menuTitle},
 			-uiLevel=>1
 			);
+		$f->yesNo(
+			-name=>"hideFromNavigation",
+			-value=>$page{hideFromNavigation},
+			-label=>WebGUI::International::get(886),
+			-uiLevel=>6
+			);
                 $f->text(
 			-name=>"urlizedTitle",
 			-label=>WebGUI::International::get(104),
@@ -432,6 +438,7 @@ sub www_editPageSave {
 		ownerId=$session{form}{ownerId}, 
 		groupIdView=$session{form}{groupIdView}, 
 		groupIdEdit=$session{form}{groupIdEdit}, 
+		hideFromNavigation=$session{form}{hideFromNavigation},
 		startDate=$session{form}{startDate},
 		endDate=$session{form}{endDate},
 		metaTags=".quote($session{form}{metaTags}).",