removed old template system and replaced with template asset

lib/WebGUI/Asset/Wobject/Article.pm

@@ -31,6 +31,10 @@ sub definition {
 		tableName=>'Article',
 		className=>'WebGUI::Asset::Wobject::Article',
 		properties=>{
+			templateId =>{
+				fieldType=>"template",
+				defaultValue=>'PBtmpl0000000000000002'
+				},
 			linkURL=>{
 				fieldType=>'url',
 				defaultValue=>undef
@@ -54,6 +58,10 @@ sub definition {
 sub getEditForm {
 	my $self = shift;
 	my $tabform = $self->SUPER::getEditForm();
+   	$tabform->getTab("display")->template(
+      		-value=>$self->getValue('templateId'),
+      		-namespace=>"Article"
+   		);
 	$tabform->getTab("properties")->text(
 		-name=>"linkTitle",
 		-label=>WebGUI::International::get(7,"Article"),
@@ -169,7 +177,7 @@ sub view {
 			forumId=>$self->get("forumId")
 			});
 	} else {
-		return $self->processTemplate(\%var, "Article", $templateId);
+		return $self->processTemplate(\%var, $templateId);
 	}
 }
 

lib/WebGUI/Asset/Wobject/DataForm.pm

@@ -131,6 +131,10 @@ sub definition {
                 tableName=>'DataForm',
                 className=>'WebGUI::Asset::Wobject::DataForm',
                 properties=>{
+			templateId =>{
+				fieldType=>"template",
+				defaultValue=>'PBtmpl0000000000000020'
+				},
 			acknowledgement=>{
 				fieldType=>"textarea",
 				defaultValue=>undef
@@ -188,6 +192,10 @@ sub duplicate {
 sub getEditForm {
 	my $self = shift;
 	my $tabform = $self->SUPER::getEditForm;
+   	$tabform->getTab("display")->template(
+      		-value=>$self->getValue('templateId'),
+      		-namespace=>"DataForm"
+   		);
         $tabform->getTab("display")->template(
                 -name=>"emailTemplateId",
                 -value=>$self->getValue("emailTemplateId"),
@@ -563,7 +571,7 @@ sub purge {
 sub sendEmail {
 	my $self = shift;
 	my $var = shift;
-	my $message = WebGUI::Macro::process($self->processTemplate($var,"DataForm",$self->get("emailTemplateId")));
+	my $message = WebGUI::Macro::process($self->processTemplate($var,$self->get("emailTemplateId")));
 	my ($to, $subject, $from, $bcc, $cc);
 	foreach my $row (@{$var->{field_loop}}) {
 		if ($row->{"field.name"} eq "to") {

lib/WebGUI/Asset/Wobject/HttpProxy.pm

@@ -36,6 +36,10 @@ sub definition {
 		tableName=>'HttpProxy',
 		className=>'WebGUI::Asset::Wobject::HttpProxy',
 		properties=>{
+			templateId =>{
+				fieldType=>"template",
+				defaultValue=>'PBtmpl0000000000000033'
+				},
 			proxiedUrl=>{
 				fieldType=>"url",
 				defaultValue=>'http://'
@@ -94,6 +98,10 @@ sub getCookieJar {
 sub getEditForm {
 	my $self = shift;
 	my $tabform = $self->SUPER::getEditForm();
+   	$tabform->getTab("display")->template(
+      		-value=>$self->getValue('templateId'),
+      		-namespace=>"HttpProxy"
+   		);
 	my %hash;
 	tie %hash, 'Tie::IxHash';
 	%hash=(5=>5,10=>10,20=>20,30=>30,60=>60);
@@ -191,7 +199,7 @@ sub view {
 
    $redirect=0; 
 
-   return $self->processTemplate({},"HttpProxy",$self->get("templateId")) unless ($proxiedUrl ne "");
+   return $self->processTemplate({},$self->get("templateId")) unless ($proxiedUrl ne "");
    
    my $cachedContent = WebGUI::Cache->new($proxiedUrl,"URL");
    my $cachedHeader = WebGUI::Cache->new($proxiedUrl,"HEADER");
@@ -328,7 +336,7 @@ sub view {
 	WebGUI::HTTP::setMimeType($var{header});
 	return $var{content};
    } else {
-   	return $self->processTemplate(\%var,"HttpProxy",$self->get("templateId")); 
+   	return $self->processTemplate(\%var,$self->get("templateId")); 
    }
 }
 

lib/WebGUI/Asset/Wobject/Layout.pm

@@ -59,9 +59,13 @@ sub definition {
         my $class = shift;
         my $definition = shift;
         push(@{$definition}, {
-                tableName=>'layout',
+                tableName=>'Layout',
                 className=>'WebGUI::Asset::Wobject::Layout',
                 properties=>{
+			templateId =>{
+				fieldType=>"template",
+				defaultValue=>'PBtmpl0000000000000054'
+				},
 			contentPositions => {
 				defaultValue=>undef,
 				fieldType=>"hidden"
@@ -84,6 +88,10 @@ Returns the TabForm object that will be used in generating the edit page for thi
 sub getEditForm {
 	my $self = shift;
 	my $tabform = $self->SUPER::getEditForm();
+   	$tabform->getTab("display")->template(
+      		-value=>$self->getValue('templateId'),
+      		-namespace=>"Layout"
+   		);
 	if ($self->get("assetId") eq "new") {
                	$tabform->getTab("properties")->whatNext(
                        	-options=>{
@@ -191,7 +199,7 @@ sub view {
 			';
 	}
 
-	return $self->processTemplate(\%vars, "page");
+	return $self->processTemplate(\%vars,$self->get("templateId"));
 }
 
 

lib/WebGUI/Asset/Wobject/Navigation.pm

@@ -34,6 +34,10 @@ sub definition {
 		tableName=>'Navigation',
 		className=>'WebGUI::Asset::Wobject::Navigation',
 		properties=>{
+			templateId =>{
+				fieldType=>"template",
+				defaultValue=>'PBtmpl0000000000000048'
+				},
 			assetsToInclude=>{
 				fieldType=>'checkList',
 				defaultValue=>"descendants"
@@ -70,6 +74,10 @@ sub definition {
 sub getEditForm {
 	my $self = shift;
 	my $tabform = $self->SUPER::getEditForm;
+   	$tabform->getTab("display")->template(
+      		-value=>$self->getValue('templateId'),
+      		-namespace=>"Navigation"
+   		);
 	my ($descendantsChecked, $selfChecked, $pedigreeChecked, $siblingsChecked);
 	my @assetsToInclude = split("\n",$self->getValue("assetsToInclude"));
 	my $afterScript;
@@ -337,7 +345,7 @@ sub view {
 		}
 		push(@{$var->{page_loop}}, $pageData);	
 	}
-	return $self->processTemplate($var,"Navigation",$self->get("templateId"));
+	return $self->processTemplate($var,$self->get("templateId"));
 }
 
 

lib/WebGUI/Asset/Wobject/Poll.pm

@@ -41,6 +41,10 @@ sub definition {
 		tableName=>'Poll',
 		className=>'WebGUI::Asset::Wobject::Poll',
 		properties=>{
+			templateId =>{
+				fieldType=>"template",
+				defaultValue=>'PBtmpl0000000000000055'
+				},
 			active=>{
 				fieldType=>"yesNo",
 				defaultValue=>1
@@ -165,6 +169,10 @@ sub duplcate {
 sub getEditForm {
 	my $self = shift;
 	my $tabform = $self->SUPER::getEditForm; 
+   	$tabform->getTab("display")->template(
+      		-value=>$self->getValue('templateId'),
+      		-namespace=>"Poll"
+   		);
         my ($i, $answers);
 	for ($i=1; $i<=20; $i++) {
                 if ($self->get('a'.$i) =~ /\C/) {
@@ -346,7 +354,7 @@ sub view {
 	}
 	randomizeArray(\@answers) if ($self->get("randomizeAnswers"));
 	$var{answer_loop} = \@answers;
-	return $self->processTemplate(\%var,"Poll",$self->get("templateId"));
+	return $self->processTemplate(\%var,$self->get("templateId"));
 }
 
 #-------------------------------------------------------------------

lib/WebGUI/Asset/Wobject/SQLReport.pm

@@ -35,6 +35,10 @@ sub definition {
 		tableName=>'SQLReport',
 		className=>'WebGUI::Asset::Wobject::SQLReport',
 		properties=>{
+			templateId =>{
+				fieldType=>"template",
+				defaultValue=>'PBtmpl0000000000000059'
+				},
 			paginateAfter=>{
 				fieldType=>"integer",
 				defaultValue=>50
@@ -132,6 +136,10 @@ sub definition {
 sub getEditForm {
 	my $self = shift;
 	my $tabform = $self->SUPER::getEditForm();
+   	$tabform->getTab("display")->template(
+      		-value=>$self->getValue('templateId'),
+      		-namespace=>"SQLReport"
+   		);
         $tabform->getTab("properties")->yesNo(
                 -name=>"debugMode",
                 -label=>WebGUI::International::get(16,"SQLReport"),
@@ -253,7 +261,7 @@ sub www_view {
 	# Add debug loop to template vars
 	$var->{'debug_loop'} = $self->{_debug_loop};
 	#use Data::Dumper; return '<pre>'.Dumper($var).'</pre>';
-	return $self->processTemplate($self->get("templateId"),$var);
+	return $self->processTemplate($var, $self->get("templateId"));
 }
 
 #-------------------------------------------------------------------

lib/WebGUI/Asset/Wobject/SyndicatedContent.pm

@@ -40,6 +40,10 @@ sub definition {
                 tableName=>'SyndicatedContent',
                 className=>'WebGUI::Asset::Wobject::SyndicatedContent',
                 properties=>{
+			templateId =>{
+				fieldType=>"template",
+				defaultValue=>'PBtmpl0000000000000065'
+				},
 			rssUrl=>{
 				defaultValue=>undef,
 				fieldType=>"url"
@@ -77,6 +81,10 @@ sub getUiLevel {
 sub getEditForm {
 	my $self = shift;
 	my $tabform = $self->SUPER::getEditForm();
+   	$tabform->getTab("display")->template(
+      		-value=>$self->getValue('templateId'),
+      		-namespace=>"SyndicatedContent"
+   		);
 	$tabform->getTab("properties")->url(
 		-name=>"rssUrl",
 		-label=>WebGUI::International::get(1,"SyndicatedContent"),

lib/WebGUI/Asset/Wobject/USS.pm

@@ -66,6 +66,10 @@ sub definition {
                 tableName=>'USS',
                 className=>'WebGUI::Asset::Wobject::USS',
                 properties=>{
+			templateId =>{
+				fieldType=>"template",
+				defaultValue=>'PBtmpl0000000000000066'
+				},
 			submissionsPerPage=>{
 				fieldType=>"integer",
 				defaultValue=>50
@@ -160,6 +164,10 @@ sub duplicate {
 sub getEditForm {
 	my $self = shift;
 	my $tabform = $self->getEditForm;
+   	$tabform->getTab("display")->template(
+      		-value=>$self->getValue('templateId'),
+      		-namespace=>"USS"
+   		);
         $tabform->getTab("display")->template(
                 -name=>"submissionTemplateId",
                 -value=>$self->getValue("submissionTemplateId"),
@@ -460,7 +468,7 @@ sub view {
 	}
 	$var{submissions_loop} = \@submission;
 	$p->appendTemplateVars(\%var);
-	return $_[0]->processTemplate(\%var,"USS",$_[0]->get("templateId"));
+	return $_[0]->processTemplate(\%var,$_[0]->get("templateId"));
 }
 
 #-------------------------------------------------------------------

lib/WebGUI/Asset/Wobject/USS_submission.pm

@@ -46,6 +46,10 @@ sub definition {
                 tableName=>'USS_submission',
                 className=>'WebGUI::Asset::Wobject::USS_submission',
                 properties=>{
+			templateId =>{
+				fieldType=>"template",
+				defaultValue=>'PBtmpl0000000000000067'
+				},
 			submissionsPerPage=>{
 				fieldType=>"integer",
 				defaultValue=>50

lib/WebGUI/Asset/Wobject/WSClient.pm

@@ -55,6 +55,10 @@ sub definition {
 		tableName=>'WSClient',
 		className=>'WebGUI::Asset::Wobject::WSClient',
 		properties=>{
+			templateId =>{
+				fieldType=>"template",
+				defaultValue=>'PBtmpl0000000000000069'
+				},
          callMethod             => {
             fieldType     => 'textarea',
 		defaultValue=>undef
@@ -138,7 +142,7 @@ sub getEditForm {
    $tabform->getTab("display")->template(
       -name      => 'templateId',
       -value     => $self->getValue('templateId'),
-      -namespace => "WSClient",
+      -namespace => "WSClient"
    );
    $tabform->getTab("display")->yesNo (
       -name  => 'preprocessMacros',
@@ -275,7 +279,7 @@ sub view {
                                                                                 
       WebGUI::ErrorHandler::warn("disabling soap call $call");
       $var{'disableWobject'} = 1;
-      return $self->processTemplate(\%var,"WSClient",$self->get("templateId"));
+      return $self->processTemplate(\%var,$self->get("templateId"));
    }
 
    # advanced use, if you want to pass SOAP results to a single, particular
@@ -484,7 +488,7 @@ sub view {
    }
 
    $var{'results'} = \@result;
-   return $self->processTemplate(\%var, "WSClient",$self->get("templateId"));
+   return $self->processTemplate(\%var, $self->get("templateId"));
 }