added folder

lib/WebGUI/Asset.pm

@@ -666,7 +666,7 @@ sub getAssetAdderLinks {
 				WebGUI::ErrorHandler::warn("Couldn't get the name of ".$class." because ".$@);
 			} else {
 				my $url = $self->getUrl("func=add&class=".$class);
-				$url .= "&".$addToUrl if ($addToUrl);
+				$url = WebGUI::URL::append($url,$addToUrl) if ($addToUrl);
 				push(@links, {
 					label=>$label,
 					url=>$url
@@ -2245,7 +2245,6 @@ Saves and updates history. If canEdit, returns www_manageAssets() if a new Asset
 
 sub www_editSave {
 	my $self = shift;
-WebGUI::ErrorHandler::warn("got here");
 	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
 	my $object;
 	if ($session{form}{assetId} eq "new") {

lib/WebGUI/Asset/Template.pm

@@ -116,7 +116,7 @@ sub definition {
 				},
 				namespace=>{
 					fieldType=>'combo',
-					defaultValue=>'style'
+					defaultValue=>undef
 					}
                         }
                 });
@@ -192,7 +192,7 @@ Specify the namespace to build the list for.
 sub getList {
 	my $class = shift;
 	my $namespace = shift;
-	return WebGUI::SQL->buildHashRef("select asset.assetId,asset.title from template left join asset on asset.assetId=template.assetId where template.namespace=".quote($namespace)." and template.showInForms=1 order by asset.title",WebGUI::SQL->getSlave);
+	return WebGUI::SQL->buildHashRef("select asset.assetId,asset.title from template left join asset on asset.assetId=template.assetId where template.namespace=".quote($namespace)." and template.showInForms=1 and state='published' order by asset.title",WebGUI::SQL->getSlave);
 }
 
 

lib/WebGUI/Asset/Wobject/Folder.pm

@@ -0,0 +1,183 @@
+package WebGUI::Asset::Wobject::Folder;
+
+=head1 LEGAL
+
+ -------------------------------------------------------------------
+  WebGUI is Copyright 2001-2004 Plain Black Corporation.
+ -------------------------------------------------------------------
+  Please read the legal notices (docs/legal.txt) and the license
+  (docs/license.txt) that came with this distribution before using
+  this software.
+ -------------------------------------------------------------------
+  http://www.plainblack.com                     info@plainblack.com
+ -------------------------------------------------------------------
+
+=cut
+
+use strict;
+use WebGUI::Asset::Wobject;
+use WebGUI::Icon;
+use WebGUI::Session;
+use WebGUI::Utility;
+
+our @ISA = qw(WebGUI::Asset::Wobject);
+
+=head1 NAME
+
+Package WebGUI::Asset::Wobject::Folder
+
+=head1 DESCRIPTION
+
+Display a list of assets and sub folders just like in an operating system filesystem.
+
+=head1 SYNOPSIS
+
+use WebGUI::Asset::Wobject::Folder;
+
+
+=head1 METHODS
+
+These methods are available from this class:
+
+=cut
+
+
+
+#-------------------------------------------------------------------
+
+=head2 definition ( definition )
+
+Defines the properties of this asset.
+
+=head3 definition
+
+A hash reference passed in from a subclass definition.
+
+=cut
+
+sub definition {
+        my $class = shift;
+        my $definition = shift;
+        push(@{$definition}, {
+                tableName=>'Folder',
+                className=>'WebGUI::Asset::Wobject::Folder',
+                properties=>{
+			templateId =>{
+				fieldType=>"template",
+				defaultValue=>'PBtmpl0000000000000054'
+				}
+                        }
+                });
+        return $class->SUPER::definition($definition);
+}
+
+
+
+#-------------------------------------------------------------------
+
+=head2 getEditForm ()
+
+Returns the TabForm object that will be used in generating the edit page for this asset.
+
+=cut
+
+sub getEditForm {
+	my $self = shift;
+	my $tabform = $self->SUPER::getEditForm();
+   	$tabform->getTab("display")->template(
+      		-value=>$self->getValue('templateId'),
+      		-namespace=>"Folder"
+   		);
+	#if ($self->get("assetId") eq "new") {
+        #       	$tabform->getTab("properties")->whatNext(
+        #               	-options=>{
+        #                       	gotoNewPage=>WebGUI::International::get(823),
+        #              	 	backToPage=>WebGUI::International::get(847)
+        #                      	},
+#			);
+#	}
+	return $tabform;
+}
+
+
+#-------------------------------------------------------------------
+sub getIcon {
+	my $self = shift;
+	my $small = shift;
+	return $session{config}{extrasURL}.'/assets/small/folder.gif' if ($small);
+	return $session{config}{extrasURL}.'/assets/folder.gif';
+}
+
+#-------------------------------------------------------------------
+
+=head2 getName ()
+
+Returns the displayable name of this asset.
+
+=cut
+
+sub getName {
+	return "Folder";
+} 
+
+
+#-------------------------------------------------------------------
+
+=head2 getUiLevel ()
+
+Returns the UI level of this asset.
+
+=cut
+
+sub getUiLevel {
+	return 5;
+}
+
+
+#-------------------------------------------------------------------
+sub view {
+	my $self = shift;
+	my $children = $self->getLineage( ["children"], { returnObjects=>1 });
+	my %vars;
+	foreach my $child (@{$children}) {
+		if (ref $child eq "WebGUI::Asset::Wobject::Folder") {
+			push(@{$vars{"subfolder_loop"}}, {
+				id => $child->getId,
+				url => $child->getUrl,
+				title => $child->get("title")
+				});
+		} else {
+			my $isImage = (ref $child =~ /^WebGUI::Asset::File::Image/);
+			my $thumbnail = $child->getThumbnailUrl if ($isImage);
+			my $isFile = (ref $child =~ /^WebGUI::Asset::File/);
+			my $file = $child->getFileUrl if ($isFile);
+			push(@{$vars{"file_loop"}},{
+				id=>$child->getId,
+				title=>$child->get("title"),
+				size=>WebGUI::Utility::formatBytes($child->get("assetSize")),
+				"date.epoch"=>$child->get("dateStamp"),
+				"icon.small"=>$child->getIcon(1),
+				"icon.big"=>$child->getIcon,
+				type=>$child->getName,
+				url=>$child->getUrl,
+				isImage=>$isImage,
+				isImage=>$isFile,
+				"thumbnail.url"=>$thumbnail,
+				"file.url"=>$file
+				});
+		}
+	}
+	return $self->processTemplate(\%vars,$self->get("templateId"));
+}
+
+
+sub www_edit {
+        my $self = shift;
+	return $self->getAdminConsole->render(WebGUI::Privilege::insufficient()) unless $self->canEdit;
+        return $self->getAdminConsole->render($self->getEditForm->print,"Edit Folder");
+}
+
+
+
+1;
+

lib/WebGUI/i18n/English/Asset.pm

@@ -20,6 +20,11 @@ our $I18N = {
 		context => q|The name of the properties tab on the edit page.|
 	},
 	
+	'make package' => {
+		message => q|Make package?|,
+		lastUpdated => 1099344172,
+	},
+
 	'asset id' => {
 		message => q|Asset ID|,
 		lastUpdated => 1099344172,