From f2b46efa004e67d0bdaae85b4297f8369b233c4f Mon Sep 17 00:00:00 2001 From: JT Smith Date: Sun, 1 Dec 2002 18:42:27 +0000 Subject: [PATCH] Fixed template inconsistencies. --- docs/upgrades/upgrade_4.8.0-4.9.0.sql | 7 ++- lib/WebGUI/Wobject/Product.pm | 83 ++++++++++----------------- 2 files changed, 36 insertions(+), 54 deletions(-) diff --git a/docs/upgrades/upgrade_4.8.0-4.9.0.sql b/docs/upgrades/upgrade_4.8.0-4.9.0.sql index 64b2cd6e0..f69b58a02 100644 --- a/docs/upgrades/upgrade_4.8.0-4.9.0.sql +++ b/docs/upgrades/upgrade_4.8.0-4.9.0.sql @@ -984,8 +984,13 @@ INSERT INTO template VALUES (1,'Default USS','\r\n

INSERT INTO template VALUES (2,'Traditional with Thumbnails','\r\n

\r\n\r\n\r\n\r\n

\r\n\r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n\r\n
\r\n\r\n\r\n \"> ·\r\n\r\n\r\n\">\r\n\r\n
\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n
\r\n \"> \r\n \r\n ()\r\n \r\n\r\n \r\n \">\" border=\"0\">\r\n \r\n \">
\r\n\r\n\r\n

\r\n · · \r\n
\r\n\r\n\r\n','USS'); INSERT INTO template VALUES (3,'Weblog','\r\n

\r\n\r\n\r\n\r\n

\r\n\r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n

\r\n\r\n\r\n\r\n \"> ·\r\n\r\n\r\n\r\n\">\r\n

\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n
\r\n \r\n ()\r\n \r\n
\r\n \r\n \">\" border=\"0\" align=\"right\"/>\r\n \r\n \"> -
\r\n\r\n

( \">\r\n \r\n | \r\n \r\n )

\r\n

\r\n\r\n\r\n

\r\n · \r\n
\r\n\r\n','USS'); INSERT INTO template VALUES (4,'Photo Gallery','\r\n

\r\n\r\n\r\n\r\n

\r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n \"> ·\r\n\r\n\r\n\r\n\">

\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n\r\n
\r\n \r\n \r\n \">\" border=\"0\"/>
\r\n \r\n \">\r\n \r\n ()\r\n \r\n
\r\n\r\n\r\n

\r\n · · \r\n
\r\n\r\n','USS'); -INSERT INTO template VALUES (5,'Classifieds','\r\n

\r\n\r\n\r\n\r\n

\r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n \"> ·\r\n\r\n\r\n\">

\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n\r\n
\r\n

\">

\r\n \r\n ()\r\n \r\n
\r\n \r\n \">\" border=\"0\"/ align=\"right\">
\r\n \r\n\r\n
\r\n\r\n\r\n

\r\n · · \r\n
\r\n\r\n','USS'); +INSERT INTO template VALUES (5,'Classifieds','\r\n

\r\n\r\n\r\n\r\n

\r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n \"> ·\r\n\r\n\r\n\">

\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n\r\n
\r\n

\">

\r\n \r\n ()\r\n \r\n
\r\n \r\n \">\" border=\"0\"/ align=\"right\">
\r\n \r\n\r\n
\r\n\r\n\r\n

\r\n · · \r\n
\r\n\r\n','USS'); INSERT INTO template VALUES (6,'Guest Book','\r\n

\r\n\r\n\r\n\r\n

\r\n\r\n\r\n\r\n \">

\r\n\r\n\r\n\r\n\r\n\r\n\r\n

\r\n\r\n\r\nOn \"> from \">the department wrote, \r\n\r\n\r\n
\r\n\r\n\r\n

\r\n\r\n\r\n\r\n\r\n

\r\n · \r\n
\r\n\r\n','USS'); +delete from template where namespace='Product' and templateId<1000; +INSERT INTO template VALUES (1,'Default Product','\r\n\r\n\r\n

\r\n\r\n\r\n\r\n\r\n \r\n\r\n\r\n\r\n
\r\n\r\n\r\n

\r\n\r\n\r\n\r\n Price:
\r\n\r\n\r\n\r\n Product Number:
\r\n\r\n\r\n
\r\n\r\n\r\n \">\" border=0 align=\"absmiddle\">
\r\n\r\n\r\n\r\n \">\" border=0 align=\"absmiddle\">
\r\n\r\n\r\n\r\n \">\" border=0 align=\"absmiddle\">
\r\n\r\n\r\n

\r\n\r\n \">\" border=\"0\" />

\r\n\r\n\r\n \">\" border=\"0\" />

\r\n\r\n\r\n \">\" border=\"0\" />

\r\n\r\n

\r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n \r\n\r\n\r\n
Features
\r\n\r\n\r\n \">

\r\n\r\n\r\n\r\n ·
\r\n\r\n

\r\n

Benefits
\r\n\r\n \">

\r\n\r\n\r\n ·
\r\n\r\n

Specifications
\r\n\r\n \">

\r\n\r\n\r\n ·:
\r\n\r\n

Accessories
\r\n\r\n \">

\r\n\r\n\r\n\r\n ·\">
\r\n\r\n

Related Products
\r\n\r\n \">

\r\n\r\n\r\n\r\n ·\">
\r\n\r\n

\r\n\r\n','Product'); +INSERT INTO template VALUES (2,'Benefits Showcase','\r\n\r\n\r\n

\r\n\r\n\r\n\r\n\r\n \" border=\"0\" />

\r\n\r\n\r\n\r\n \r\n \r\n\r\n
\r\n

\r\n\r\n\r\n Benefits
\r\n\r\n \">

\r\n\r\n\r\n\r\n ·
\r\n\r\n\r\n

\r\n\r\n\r\n \">\" border=\"0\" />

\r\n\r\n\r\nSpecifications
\r\n\r\n \">

\r\n\r\n\r\n ·:
\r\n\r\n\r\nOptions
\r\n\r\n \">

\r\n\r\n\r\n\r\n ·\">
\r\n\r\n\r\nOther Products
\r\n\r\n \">

\r\n\r\n\r\n ·\">
\r\n\r\n\r\n

\r\n\r\n','Product'); +INSERT INTO template VALUES (3,'Three Columns','\r\n\r\n\r\n\r\n

\r\n\r\n\r\n\r\n

\r\n\r\n\r\n\r\n\r\n \r\n \r\n \r\n\r\n
\r\n\r\n \">\" border=\"0\" />\r\n\r\n\r\n\r\n \">\" border=\"0\" />\r\n\r\n\r\n\r\n \">\" border=\"0\" />\r\n\r\n
\r\n\r\n\r\n \r\n \r\n \r\n\r\n
\r\n\r\nFeatures
\r\n\r\n \">

\r\n\r\n\r\n ·
\r\n\r\n

\r\n\r\nBenefits
\r\n\r\n \">

\r\n\r\n\r\n\r\n ·
\r\n\r\n

\r\n\r\n

\r\n\r\nSpecifications
\r\n\r\n \">

\r\n\r\n\r\n ·:
\r\n\r\n

\r\n\r\nAccessories
\r\n\r\n \">

\r\n\r\n\r\n\r\n ·\">
\r\n\r\n

\r\n\r\nRelated Products
\r\n\r\n \">

\r\n\r\n\r\n ·\">
\r\n\r\n

\r\n

\r\n \r\n Price:
\r\n\r\n\r\n\r\n Product Number:
\r\n\r\n
\r\n\r\n \">\" border=0 align=\"absmiddle\">
\r\n\r\n\r\n \">\" border=0 align=\"absmiddle\">
\r\n\r\n\r\n \">\" border=0 align=\"absmiddle\">
\r\n\r\n
\r\n\r\n\r\n','Product'); +INSERT INTO template VALUES (4,'Left Column Collateral','\r\n\r\n\r\n\r\n

\r\n\r\n\r\n\r\n\r\n\r\n
\r\n
\r\n\r\n \">\" border=0 align=\"absmiddle\">
\r\n\r\n\r\n \">\" border=0 align=\"absmiddle\">
\r\n\r\n\r\n \">\" border=0 align=\"absmiddle\">
\r\n\r\n
\r\n
\r\n\r\n \">\" border=\"0\" />

\r\n\r\n\r\n \">\" border=\"0\" />

\r\n\r\n\r\n \">\" border=\"0\" />

\r\n\r\n

\r\n		\r\n\r\n

\r\n\r\n\r\nSpecs:
\r\n\r\n \">

\r\n\r\n\r\n ·:
\r\n\r\n

\r\n\r\nFeatures:
\r\n\r\n \">

\r\n\r\n\r\n ·
\r\n\r\n

\r\n\r\nOptions:
\r\n\r\n \">

\r\n\r\n\r\n ·\">
\r\n\r\n\r\n

\r\n','Product'); diff --git a/lib/WebGUI/Wobject/Product.pm b/lib/WebGUI/Wobject/Product.pm index 3a52567b5..16772a2fe 100644 --- a/lib/WebGUI/Wobject/Product.pm +++ b/lib/WebGUI/Wobject/Product.pm @@ -503,10 +503,8 @@ sub www_moveSpecificationUp { #------------------------------------------------------------------- sub www_view { - my ($output, %data, $sth, $file, $segment, $template, %var, @featureloop, @benefitloop, @specificationloop, - @accessoryloop, @relatedloop); + my (%data, $sth, $file, $segment, %var, @featureloop, @benefitloop, @specificationloop, @accessoryloop, @relatedloop); tie %data, 'Tie::CPHash'; - $output = $_[0]->displayTitle; #---brochure if ($_[0]->get("brochure")) { $file = WebGUI::Attachment->new($_[0]->get("brochure"),$_[0]->get("wobjectId")); @@ -548,19 +546,15 @@ sub www_view { } #---features - if ($session{var}{adminOn}) { - $var{addFeature} = ''.WebGUI::International::get(34,$namespace).''; - } + $var{"addFeature.url"} = WebGUI::URL::page('func=editFeature&fid=new&wid='.$_[0]->get("wobjectId")); + $var{"addFeature.label"} = WebGUI::International::get(34,$namespace); $sth = WebGUI::SQL->read("select feature,Product_featureId from Product_feature where wobjectId=" .$_[0]->get("wobjectId")." order by sequenceNumber"); while (%data = $sth->hash) { - if ($session{var}{adminOn}) { - $segment = deleteIcon('func=deleteFeature&wid='.$_[0]->get("wobjectId").'&fid='.$data{Product_featureId}) - .editIcon('func=editFeature&wid='.$_[0]->get("wobjectId").'&fid='.$data{Product_featureId}) - .moveUpIcon('func=moveFeatureUp&wid='.$_[0]->get("wobjectId").'&fid='.$data{Product_featureId}) - .moveDownIcon('func=moveFeatureDown&wid='.$_[0]->get("wobjectId").'&fid='.$data{Product_featureId}); - } + $segment = deleteIcon('func=deleteFeature&wid='.$_[0]->get("wobjectId").'&fid='.$data{Product_featureId}) + .editIcon('func=editFeature&wid='.$_[0]->get("wobjectId").'&fid='.$data{Product_featureId}) + .moveUpIcon('func=moveFeatureUp&wid='.$_[0]->get("wobjectId").'&fid='.$data{Product_featureId}) + .moveDownIcon('func=moveFeatureDown&wid='.$_[0]->get("wobjectId").'&fid='.$data{Product_featureId}); push(@featureloop,{ "feature.feature"=>$data{feature}, "feature.controls"=>$segment @@ -570,19 +564,15 @@ sub www_view { $var{feature_loop} = \@featureloop; #---benefits - if ($session{var}{adminOn}) { - $var{addBenefit} = ''.WebGUI::International::get(55,$namespace).'

'; - } + $var{"addBenefit.url"} = WebGUI::URL::page('func=editBenefit&fid=new&wid='.$_[0]->get("wobjectId")); + $var{"addBenefit.label"} = WebGUI::International::get(55,$namespace); $sth = WebGUI::SQL->read("select benefit,Product_benefitId from Product_benefit where wobjectId=" .$_[0]->get("wobjectId")." order by sequenceNumber"); while (%data = $sth->hash) { - if ($session{var}{adminOn}) { - $segment = deleteIcon('func=deleteBenefit&wid='.$_[0]->get("wobjectId").'&bid='.$data{Product_benefitId}) - .editIcon('func=editBenefit&wid='.$_[0]->get("wobjectId").'&bid='.$data{Product_benefitId}) - .moveUpIcon('func=moveBenefitUp&wid='.$_[0]->get("wobjectId").'&bid='.$data{Product_benefitId}) - .moveDownIcon('func=moveBenefitDown&wid='.$_[0]->get("wobjectId").'&bid='.$data{Product_benefitId}); - } + $segment = deleteIcon('func=deleteBenefit&wid='.$_[0]->get("wobjectId").'&bid='.$data{Product_benefitId}) + .editIcon('func=editBenefit&wid='.$_[0]->get("wobjectId").'&bid='.$data{Product_benefitId}) + .moveUpIcon('func=moveBenefitUp&wid='.$_[0]->get("wobjectId").'&bid='.$data{Product_benefitId}) + .moveDownIcon('func=moveBenefitDown&wid='.$_[0]->get("wobjectId").'&bid='.$data{Product_benefitId}); push(@benefitloop,{ "benefit.benefit"=>$data{benefit}, "benefit.controls"=>$segment @@ -592,19 +582,15 @@ sub www_view { $var{benefit_loop} = \@benefitloop; #---specifications - if ($session{var}{adminOn}) { - $var{addSpecification} = ''.WebGUI::International::get(35,$namespace).'

'; - } + $var{"addSpecification.url"} = WebGUI::URL::page('func=editSpecification&sid=new&wid='.$_[0]->get("wobjectId")); + $var{"addSpecification.label"} = WebGUI::International::get(35,$namespace); $sth = WebGUI::SQL->read("select name,value,units,Product_specificationId from Product_specification where wobjectId=".$_[0]->get("wobjectId")." order by sequenceNumber"); while (%data = $sth->hash) { - if ($session{var}{adminOn}) { - $segment = deleteIcon('func=deleteSpecification&wid='.$_[0]->get("wobjectId").'&sid='.$data{Product_specificationId}) - .editIcon('func=editSpecification&wid='.$_[0]->get("wobjectId").'&sid='.$data{Product_specificationId}) - .moveUpIcon('func=moveSpecificationUp&wid='.$_[0]->get("wobjectId").'&sid='.$data{Product_specificationId}) - .moveDownIcon('func=moveSpecificationDown&wid='.$_[0]->get("wobjectId").'&sid='.$data{Product_specificationId}); - } + $segment = deleteIcon('func=deleteSpecification&wid='.$_[0]->get("wobjectId").'&sid='.$data{Product_specificationId}) + .editIcon('func=editSpecification&wid='.$_[0]->get("wobjectId").'&sid='.$data{Product_specificationId}) + .moveUpIcon('func=moveSpecificationUp&wid='.$_[0]->get("wobjectId").'&sid='.$data{Product_specificationId}) + .moveDownIcon('func=moveSpecificationDown&wid='.$_[0]->get("wobjectId").'&sid='.$data{Product_specificationId}); push(@specificationloop,{ "specification.controls"=>$segment, "specification.specification"=>$data{value}, @@ -616,21 +602,17 @@ sub www_view { $var{specification_loop} = \@specificationloop; #---accessories - if ($session{var}{adminOn}) { - $var{addaccessory} = ''.WebGUI::International::get(36,$namespace).'

'; - } + $var{"addaccessory.url"} = WebGUI::URL::page('func=addAccessory&wid='.$_[0]->get("wobjectId")); + $var{"addaccessory.label"} = WebGUI::International::get(36,$namespace); $sth = WebGUI::SQL->read("select wobject.title,page.urlizedTitle,Product_accessory.accessoryWobjectId from Product_accessory,wobject,page where Product_accessory.wobjectId=".$_[0]->get("wobjectId")." and Product_accessory.accessoryWobjectId=wobject.wobjectId and wobject.pageId=page.pageId order by Product_accessory.sequenceNumber"); while (%data = $sth->hash) { - if ($session{var}{adminOn}) { - $segment = deleteIcon('func=deleteAccessory&wid='.$_[0]->get("wobjectId").'&aid='.$data{accessoryWobjectId}) - .moveUpIcon('func=moveAccessoryUp&wid='.$_[0]->get("wobjectId").'&aid='.$data{accessoryWobjectId}) - .moveDownIcon('func=moveAccessoryDown&wid='.$_[0]->get("wobjectId").'&aid='.$data{accessoryWobjectId}); - } + $segment = deleteIcon('func=deleteAccessory&wid='.$_[0]->get("wobjectId").'&aid='.$data{accessoryWobjectId}) + .moveUpIcon('func=moveAccessoryUp&wid='.$_[0]->get("wobjectId").'&aid='.$data{accessoryWobjectId}) + .moveDownIcon('func=moveAccessoryDown&wid='.$_[0]->get("wobjectId").'&aid='.$data{accessoryWobjectId}); push(@accessoryloop,{ "accessory.URL"=>WebGUI::URL::gateway($data{urlizedTitle}), "accessory.title"=>$data{title}, @@ -641,22 +623,17 @@ sub www_view { $var{accessory_loop} = \@accessoryloop; #---related - if ($session{var}{adminOn}) { - $var{addrelatedproduct} = ''.WebGUI::International::get(37,$namespace).'

'; - } + $var{"addrelatedproduct.url"} = WebGUI::URL::page('func=addRelated&wid='.$_[0]->get("wobjectId")); + $var{"addrelatedproduct.label"} = WebGUI::International::get(37,$namespace); $sth = WebGUI::SQL->read("select wobject.title,page.urlizedTitle,Product_related.relatedWobjectId from Product_related,wobject,page where Product_related.wobjectId=".$_[0]->get("wobjectId")." and Product_related.relatedWobjectId=wobject.wobjectId and wobject.pageId=page.pageId order by Product_related.sequenceNumber"); while (%data = $sth->hash) { - if ($session{var}{adminOn}) { - $segment = deleteIcon('func=deleteRelated&wid='.$_[0]->get("wobjectId").'&rid='.$data{relatedWobjectId}) - .moveUpIcon('func=moveRelatedUp&wid='.$_[0]->get("wobjectId").'&rid='.$data{relatedWobjectId}) - .moveDownIcon('func=moveRelatedDown&wid='.$_[0]->get("wobjectId").'&rid='.$data{relatedWobjectId}); - } - $segment .= '·'.$data{title}.'
'; + $segment = deleteIcon('func=deleteRelated&wid='.$_[0]->get("wobjectId").'&rid='.$data{relatedWobjectId}) + .moveUpIcon('func=moveRelatedUp&wid='.$_[0]->get("wobjectId").'&rid='.$data{relatedWobjectId}) + .moveDownIcon('func=moveRelatedDown&wid='.$_[0]->get("wobjectId").'&rid='.$data{relatedWobjectId}); push(@relatedloop,{ "relatedproduct.URL"=>WebGUI::URL::gateway($data{urlizedTitle}), "relatedproduct.title"=>$data{title}, @@ -665,7 +642,7 @@ sub www_view { } $sth->finish; $var{relatedproduct_loop} = \@relatedloop; - return $_[0]->processMacros($output.$_[0]->processTemplate($_[0]->get("templateId"),\%var)); + return $_[0]->processMacros($_[0]->processTemplate($_[0]->get("templateId"),\%var)); }