oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*** empty log message ***

Browse source
This commit is contained in:
JT Smith 2003-02-09 03:34:33 +00:00
parent 6e70501c8c
commit 9c63be7e9d
6 changed files with 26 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Macro/FlexMenu.pm
View file

@ -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>';

36
lib/WebGUI/Macro/rootmenuHorizontal.pm
View file

@ -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);
@param = WebGUI::Macro::getParams($_[0]);
if ($param[0] eq "") {
$delimeter = " &middot; ";
} 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;
my @param = WebGUI::Macro::getParams($_[0]);
my $tree = WebGUI::Navigation::tree(0,1);
my $temp = '<span class="horizontalMenu">';
$temp .= WebGUI::Navigation::drawHorizontal($tree,$param[0]);
$temp .= '</span>';
return $temp;
}

4
lib/WebGUI/Navigation.pm
View file

@ -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};

6
lib/WebGUI/Operation/Package.pm
View file

@ -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);
}

9
lib/WebGUI/Operation/Page.pm
View file

@ -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}).",