\r\n \r\n \" target=\"_blank\">![\"?\"](\"^Extras;/adminConsole/help-small.gif\")
\r\n \r\n
\r\n\r\n \r\n ![](\"<tmpl_var)
\" border=\"0\" title=\"\" alt=\"\" />\r\n
\r\n\r\n \" border=\"0\" title=\"\" alt=\"\" />\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','AdminConsole',1,1);
delete from settings where name='adminStyleId';
delete from settings where name='useAdminStyle';
@@ -63,6 +62,8 @@ create table asset (
isHidden int not null default 0,
isSystem int not null default 0,
encryptPage int not null default 0,
+ lastUpdated bigint not null default 0,
+ assetSize int not null default 0,
unique index (lineage asc),
unique index (url),
index (parentId)
@@ -83,14 +84,14 @@ create table redirect (
);
create table layout (
- assetId varchar(22) not null primary key
+ assetId varchar(22) not null primary key,
+ contentPositions text
);
create table FileAsset (
assetId varchar(22) not null primary key,
storageId varchar(22) not null,
filename varchar(255) not null,
- fileSize int not null,
olderVersions text
);
@@ -181,3 +182,19 @@ create table ImageAsset (
thumbnailSize int not null default 50
);
+INSERT INTO template VALUES ('1','Admin Console','^StyleSheet(^Extras;/adminConsole/adminConsole.css);\r\n^JavaScript(^Extras;/adminConsole/adminConsole.js);\r\n\r\n\r\n \r\n \" target=\"_blank\">![\"?\"](\"^Extras;/adminConsole/small/help.gif\")
\r\n \r\n
\r\n\r\n \r\n \" border=\"0\" title=\"\" alt=\"\" />\r\n
\r\n\r\n![\"*\"](\"^Extras;/adminConsole/medalian.gif\")
\r\n
\r\n\r\n\r\n \" border=\"0\" title=\"\" alt=\"\" />\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','AdminConsole',1,1);
+insert into settings (name,value) values ('AdminConsoleTemplate',1);
+delete from template where namespace='Macro/AdminBar' and templateId in ('1','2');
+INSERT INTO template VALUES ('1','Default Admin Bar','\r\n \r\n\r\n\r\n
\r\n
\r\n','Macro/AdminBar',1,1);
+INSERT INTO template VALUES ('2','DHTML Admin Bar','^JavaScript(\"\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_div\" class=\"dragable\"> \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_div\" class=\"dragable\"> \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_div\" class=\"dragable\"> \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_div\" class=\"dragable\"> \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_div\" class=\"dragable\"> \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_div\" class=\"dragable\"> \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_div\" class=\"dragable\"> \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_div\" class=\"dragable\"> \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_div\" class=\"dragable\"> \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_div\" class=\"dragable\"> \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_div\" class=\"dragable\"> \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_div\" class=\"dragable\"> \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_div\" class=\"dragable\"> \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_div\" class=\"dragable\"> \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_div\" class=\"dragable\"> \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_div\" class=\"dragable\"> \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_div\" class=\"dragable\"> \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_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
_div\" class=\"dragable\"> \r\n \r\n\r\n | \r\n
Retrieving Assets...
+ hello
+ ';
+ $output .= "\n";
+ $output .= ''.WebGUI::International::get(1).'
+
+ ';
+ return $self->getAdminConsole->render($output);
+}
+
+
sub www_paste {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
- $self->paste($session{form}{newParentId});
+ $self->paste($session{form}{assetId});
return "";
}
+sub www_pasteList {
+ my $self = shift;
+ return WebGUI::Privilege::insufficient() unless $self->canEdit;
+ foreach my $clipId ($session{cgi}->param("assetId")) {
+ $self->paste($clipId);
+ }
+ return $self->manageAssets();
+}
+
sub www_promote {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
@@ -653,10 +957,29 @@ sub www_promote {
return "";
}
-sub www_view {
+sub www_setParent {
my $self = shift;
return WebGUI::Privilege::insufficient() unless $self->canEdit;
- return "No view has been defined for this asset.";
+ my $newParent = shift;
+ $self->setParent($newParent) if (defined $newParent);
+ return $self->www_manageAssets();
+
}
+sub www_setRank {
+ my $self = shift;
+ return WebGUI::Privilege::insufficient() unless $self->canEdit;
+ my $newRank = $session{form}{rank};
+ $self->setRank($newRank) if (defined $newRank);
+ return $self->www_manageAssets();
+}
+
+sub www_view {
+ my $self = shift;
+ return WebGUI::Privilege::noAccess() unless $self->canView;
+ return "No view has been implemented for this asset.";
+}
+
+
1;
+
diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm
index b9bf397cd..519177ac7 100644
--- a/lib/WebGUI/Asset/File.pm
+++ b/lib/WebGUI/Asset/File.pm
@@ -108,6 +108,18 @@ sub getEditForm {
}
+#-------------------------------------------------------------------
+sub getIcon {
+ my $self = shift;
+ my $small = shift;
+ if ($small) {
+ my $storage = WebGUI::Storage->new($self->get("storageId"));
+ return $storage->getFileIconUrl($self->get("filename"));
+ }
+ return $session{config}{extrasURL}.'/assets/file.gif';
+}
+
+
#-------------------------------------------------------------------
=head2 getName
@@ -151,26 +163,26 @@ Gathers data from www_edit and persists it.
sub www_editSave {
my $self = shift;
- $self->SUPER::www_editSave();
+ my $output = $self->SUPER::www_editSave();
my $storage = WebGUI::Storage->create;
my $filename = $storage->addFileFromFormPost("file");
if (defined $filename) {
my $oldVersions;
if ($self->get($filename)) { # do file versioning
my @old = split("\n",$self->get("olderVersions"));
- push(@old,$self->get{"storageId")."|".$self->get("filename"));
+ push(@old,$self->get("storageId")."|".$self->get("filename"));
$oldVersions = join("\n",@old);
}
$self->update({
filename=>$filename,
storageId=>$storage->getId,
- fileSize=>$storage->getFileSize,
olderVersions=>$oldVersions
});
+ $self->setSize($storage->getFileSize($filename));
} else {
$storage->delete;
}
- return "";
+ return $output;
}
diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm
index 90a986752..94e27facd 100644
--- a/lib/WebGUI/Asset/File/Image.pm
+++ b/lib/WebGUI/Asset/File/Image.pm
@@ -98,16 +98,16 @@ sub generateThumbnail {
}
if ($self->getValue("filename") && $hasImageMagick) {
my $storage = WebGUI::Storage->new($self->get("storageId"));
- $image = Image::Magick->new;
- $error = $image->Read($storage->getPath($storage->get("filename")));
+ my $image = Image::Magick->new;
+ my $error = $image->Read($storage->getPath($storage->get("filename")));
if ($error) {
$self->_addError("Couldn't read image for thumnail creation: ".$error);
return 0;
}
- ($x, $y) = $image->Get('width','height');
- $n = $self->get("thumbnailSize");
+ my ($x, $y) = $image->Get('width','height');
+ my $n = $self->get("thumbnailSize");
if ($x > $n || $y > $n) {
- $r = $x>$y ? $x / $n : $y / $n;
+ my $r = $x>$y ? $x / $n : $y / $n;
$image->Scale(width=>($x/$r),height=>($y/$r));
}
if (isIn($storage->getFileExtension($self->get("filename")), qw(tif tiff bmp))) {
@@ -152,6 +152,15 @@ sub getEditForm {
}
+#-------------------------------------------------------------------
+sub getIcon {
+ my $self = shift;
+ my $small = shift;
+ return $session{config}{extrasURL}.'/assets/image.gif' unless ($small);
+ $self->SUPER::getIcon(1);
+}
+
+
#-------------------------------------------------------------------
=head2 getName
diff --git a/lib/WebGUI/Asset/Redirect.pm b/lib/WebGUI/Asset/Redirect.pm
index ee3e9f193..2025302bd 100644
--- a/lib/WebGUI/Asset/Redirect.pm
+++ b/lib/WebGUI/Asset/Redirect.pm
@@ -92,6 +92,15 @@ sub getEditForm {
}
+#-------------------------------------------------------------------
+sub getIcon {
+ my $self = shift;
+ my $small = shift;
+ return $session{config}{extrasURL}.'/assets/small/redirect.gif' if ($small);
+ return $session{config}{extrasURL}.'/assets/redirect.gif';
+}
+
+
#-------------------------------------------------------------------
=head2 getUiLevel ()
diff --git a/lib/WebGUI/Asset/Wobject.pm b/lib/WebGUI/Asset/Wobject.pm
index 3e1a4f218..3098d1188 100644
--- a/lib/WebGUI/Asset/Wobject.pm
+++ b/lib/WebGUI/Asset/Wobject.pm
@@ -18,6 +18,7 @@ use CGI::Util qw(rearrange);
use DBI;
use strict qw(subs vars);
use Tie::IxHash;
+use WebGUI::Asset;
use WebGUI::AdminConsole;
use WebGUI::DateTime;
use WebGUI::FormProcessor;
@@ -32,6 +33,7 @@ use WebGUI::Node;
use WebGUI::Page;
use WebGUI::Privilege;
use WebGUI::Session;
+use WebGUI::Style;
use WebGUI::SQL;
use WebGUI::TabForm;
use WebGUI::Template;
@@ -40,9 +42,11 @@ use WebGUI::Utility;
use WebGUI::MetaData;
use WebGUI::Wobject::WobjectProxy;
+our @ISA = qw(WebGUI::Asset);
+
=head1 NAME
-Package WebGUI::Wobject
+Package WebGUI::Asset::Wobject
=head1 DESCRIPTION
@@ -83,7 +87,19 @@ sub definition {
cacheTimeoutVisitor=>{
fieldType=>'interval',
defaultValue=>600
- }
+ },
+ templateId=>{
+ fieldType=>'template',
+ defaultValue=>undef
+ },
+ styleTemplateId=>{
+ fieldType=>'template',
+ defaultValue=>undef
+ },
+ printableStyleTemplateId=>{
+ fieldType=>'template',
+ defaultValue=>undef
+ }
}
});
return $class->SUPER::definition($definition);
@@ -115,7 +131,7 @@ A comparison expression to be used when checking whether the action should be al
sub confirm {
return WebGUI::Privilege::vitalComponent() if ($_[4]);
- my $noURL = $_[3] || WebGUI::URL::page();
+ my $noURL = $_[3] || $_[0]->getUrl;
my $output = '
+
+
+ '.WebGUI::International::get(1083).'
'; + foreach my $link (@{$self->getAssetAdderLinks}) { + $output .= ''.$link->{label}.'
'; + } + $output .= '
';
+ my $clipboard = WebGUI::Clipboard::getAssetsInClipboard();
+ my %options;
+ tie %options, 'Tie::IxHash';
+ my $hasClips = 0;
+ foreach my $item (@{$clipboard}) {
+ $options{$item->{assetId}} = $item->{title};
+ $hasClips = 1;
+ }
+ if ($hasClips) {
+ $output .= ''; + foreach my $link (@{$self->getAssetAdderLinks}) { + $output .= ''.$link->{label}.'
'; + } + $output .= '
'.WebGUI::International::get(1082).'
' + .WebGUI::Form::formHeader() + .WebGUI::Form::hidden({name=>"func",value=>"pasteList"}) + .WebGUI::Form::checkList({name=>"assetId",options=>\%options}) + .'
' + .WebGUI::Form::submit({value=>"Paste"}) + .WebGUI::Form::formFooter() + .'
';
+ }
+ $output .= '
+ ' + .WebGUI::Form::formHeader() + .WebGUI::Form::hidden({name=>"func",value=>"pasteList"}) + .WebGUI::Form::checkList({name=>"assetId",options=>\%options}) + .'
' + .WebGUI::Form::submit({value=>"Paste"}) + .WebGUI::Form::formFooter() + .'
+
+
+ '.WebGUI::International::get(42).'
'; $output .= $_[1].''; $output .= '
'.WebGUI::International::get(44).'';
@@ -174,24 +190,24 @@ sub getEditForm {
$tabform->getTab("layout")->template(
-name=>"styleTemplateId",
-label=>WebGUI::International::get(1073),
- -value=>($page{styleId} || 2),
+ -value=>$self->getValue("styleTemplateId"),
-namespace=>'style',
-afterEdit=>'op=editPage&npp='.$session{form}{npp}
);
$tabform->getTab("layout")->template(
-name=>"printableStyleTemplateId",
-label=>WebGUI::International::get(1079),
- -value=>($page{printableStyleId} || 3),
+ -value=>$self->getValue("printableStyleTemplateId"),
-namespace=>'style',
-afterEdit=>'op=editPage&npp='.$session{form}{npp}
);
- if ($childCount) {
+# if ($childCount) {
$tabform->getTab("layout")->yesNo(
-name=>"recurseStyle",
-subtext=>' '.WebGUI::International::get(106),
-uiLevel=>9
);
- }
+# }
$tabform->getTab("properties")->HTMLArea(
-name=>"description",
-label=>WebGUI::International::get(85),
@@ -209,6 +225,7 @@ sub getEditForm {
-value=>$self->getValue("cacheTimeoutVisitor"),
-uiLevel=>8
);
+ return $tabform;
}
@@ -237,7 +254,20 @@ Logs the view of the wobject to the passive profiling mechanism.
sub logView {
my $self = shift;
- WebGUI::PassiveProfiling::add($self->get("assetId"));
+ if ($session{setting}{passiveProfilingEnabled}) {
+ WebGUI::PassiveProfiling::add($self->get("assetId"));
+# not sure what this will do in the new model
+# WebGUI::PassiveProfiling::addPage(); # add wobjects on asset to passive profile log
+ }
+ # disabled for the time being because it's dangerous
+ # if ($session{form}{op} eq "" && $session{setting}{trackPageStatistics} && $session{form}{wid} ne "new") {
+ # WebGUI::SQL->write("insert into pageStatistics (dateStamp, userId, username, ipAddress, userAgent, referer,
+ # assetId, assetTitle, wobjectId, wobjectFunction) values (".time().",".quote($session{user}{userId})
+ # .",".quote($session{user}{username}).",
+ # ".quote($session{env}{REMOTE_ADDR}).", ".quote($session{env}{HTTP_USER_AGENT}).",
+ # ".quote($session{env}{HTTP_REFERER}).", ".quote($session{asset}{assetId}).",
+ # ".quote($session{asset}{title}).", ".quote($session{form}{wid}).", ".quote($session{form}{func}).")");
+ # }
return;
}
@@ -261,16 +291,10 @@ sub processMacros {
#-------------------------------------------------------------------
-=head2 processTemplate ( templateId, vars [ , namespace ] )
+=head2 processTemplate ( vars, namespace [ , templateId ] )
Returns the content generated from this template.
-B Only for use in wobjects that support templates.
-
-=head3 templateId
-
-An id referring to a particular template in the templates table.
-
=head3 hashRef
A hash reference containing variables and loops to pass to the template engine.
@@ -279,27 +303,41 @@ A hash reference containing variables and loops to pass to the template engine.
A namespace to use for the template. Defaults to the wobject's namespace.
+=head3 templateId
+
+An id referring to a particular template in the templates table. Defaults to $self->get("templateId").
+
=cut
sub processTemplate {
my $self = shift;
- my $templateId = shift;
my $var = shift;
- my $namespace = shift || $self->get("namespace");
- if ($self->{_useMetaData}) {
- my $meta = WebGUI::MetaData::getMetaDataFields($self->get("wobjectId"));
- foreach my $field (keys %$meta) {
- $var->{$meta->{$field}{fieldName}} = $meta->{$field}{value};
- }
+ my $namespace = shift;
+ my $templateId = shift || $self->get("templateId");
+ my $meta = WebGUI::MetaData::getMetaDataFields($self->get("wobjectId"));
+ foreach my $field (keys %$meta) {
+ $var->{$meta->{$field}{fieldName}} = $meta->{$field}{value};
}
+ my $wobjectToolbar = deleteIcon('func=delete',$self->get("url"),WebGUI::International::get(43))
+ .editIcon('func=edit',$self->get("url"))
+ .moveUpIcon('func=promote',$self->get("url"))
+ .moveDownIcon('func=demote',$self->get("url"))
+ # .moveTopIcon('func=moveTop&wid='.${$wobject}{wobjectId})
+ # .moveBottomIcon('func=moveBottom&wid='.${$wobject}{wobjectId})
+ .cutIcon('func=cut',$self->get("url"))
+ .copyIcon('func=copy',$self->get("url"));
+ # if (${$wobject}{namespace} ne "WobjectProxy" && isIn("WobjectProxy",@{$session{config}{wobjects}})) {
+ # $wobjectToolbar .= shortcutIcon('func=createShortcut');
+ #}
+ $var->{'controls'} = $wobjectToolbar;
my %vars = (
- %{$self->{_property}},
+ %{$self->{_properties}},
%{$var}
);
if (defined $self->get("_WobjectProxy")) {
$vars{isShortcut} = 1;
- my ($originalPageURL) = WebGUI::SQL->quickArray("select urlizedTitle from page where pageId=".quote($self->get("pageId")),WebGUI::SQL->getSlave);
- $vars{originalURL} = WebGUI::URL::gateway($originalPageURL."#".$self->get("wobjectId"));
+ my ($originalPageURL) = WebGUI::SQL->quickArray("select url from asset where assetId=".quote($self->getId),WebGUI::SQL->getSlave);
+ $vars{originalURL} = WebGUI::URL::gateway($originalPageURL."#".$self->getId);
}
return WebGUI::Template::process($templateId,$namespace, \%vars);
}
@@ -320,6 +358,14 @@ sub purge {
+#-------------------------------------------------------------------
+
+sub view {
+ my $self = shift;
+ return "No view has been created for this wobject.";
+}
+
+
#-------------------------------------------------------------------
=head2 www_createShortcut ( )
@@ -360,12 +406,47 @@ B This method should only need to be extended if you need to do some spec
sub www_editSave {
my $self = shift;
- $self->SUPER::www_editSave();
+ my $output = $self->SUPER::www_editSave();
WebGUI::MetaData::metaDataSave($self->getId);
- return "";
+ return $output;
}
+
+
+#-------------------------------------------------------------------
+
+sub www_view {
+ my $self = shift;
+ $self->logView();
+ return WebGUI::Privilege::noAccess() unless $self->canView;
+ my $cache;
+ my $output;
+ my $useCache = (
+ $session{form}{op} eq "" &&
+ (
+ ( $self->get("cacheTimeout") > 10 && $session{user}{userId} !=1) ||
+ ( $self->get("cacheTimeoutVisitor") > 10 && $session{user}{userId} == 1)
+ ) &&
+ not $session{var}{adminOn}
+ );
+# if ($useCache) {
+ # $cache = WebGUI::Cache->new("asset_".$self->getId."_".$session{user}{userId});
+ # $output = $cache->get;
+# }
+ unless ($output) {
+ $output = $self->view;
+ my $ttl;
+ if ($session{user}{userId} == 1) {
+ $ttl = $self->get("cacheTimeoutVisitor");
+ } else {
+ $ttl = $self->get("cacheTimeout");
+ }
+# $cache->set($output, $ttl) if ($useCache && !WebGUI::HTTP::isRedirect());
+ }
+ return WebGUI::Style::process($output,$self->get("styleTemplateId"));
+}
+
1;
diff --git a/lib/WebGUI/Asset/Wobject/Article.pm b/lib/WebGUI/Asset/Wobject/Article.pm
index e27f2076b..ae964b656 100644
--- a/lib/WebGUI/Asset/Wobject/Article.pm
+++ b/lib/WebGUI/Asset/Wobject/Article.pm
@@ -22,8 +22,7 @@ use WebGUI::International;
use WebGUI::Paginator;
use WebGUI::Privilege;
use WebGUI::Session;
-use WebGUI::URL;
-use WebGUI::Wobject;
+use WebGUI::Asset::Wobject;
our @ISA = qw(WebGUI::Asset::Wobject);
@@ -61,21 +60,21 @@ sub getEditForm {
my $tabform = $self->SUPER::getEditForm();
$tabform->getTab("properties")->text(
-name=>"linkTitle",
- -label=>WebGUI::International::get(7,$self->get("namespace")),
+ -label=>WebGUI::International::get(7,"Article"),
-value=>$self->getValue("linkTitle"),
-uiLevel=>3
);
$tabform->getTab("properties")->url(
-name=>"linkURL",
- -label=>WebGUI::International::get(8,$self->get("namespace")),
+ -label=>WebGUI::International::get(8,"Article"),
-value=>$self->getValue("linkURL"),
-uiLevel=>3
);
$tabform->getTab("layout")->yesNo(
-name=>"convertCarriageReturns",
- -label=>WebGUI::International::get(10,$_[0]->get("namespace")),
- -value=>$_[0]->getValue("convertCarriageReturns"),
- -subtext=>' '.WebGUI::International::get(11,$_[0]->get("namespace")).'',
+ -label=>WebGUI::International::get(10,"Article"),
+ -value=>$self->getValue("convertCarriageReturns"),
+ -subtext=>' '.WebGUI::International::get(11,"Article").'',
-uiLevel=>5,
-defaultValue=>0
);
@@ -83,6 +82,15 @@ sub getEditForm {
}
+#-------------------------------------------------------------------
+sub getIcon {
+ my $self = shift;
+ my $small = shift;
+ return $session{config}{extrasURL}.'/assets/small/article.gif' if ($small);
+ return $session{config}{extrasURL}.'/assets/article.gif';
+}
+
+
#-------------------------------------------------------------------
sub getName {
return WebGUI::International::get(1,"Article");
@@ -90,31 +98,8 @@ sub getName {
#-------------------------------------------------------------------
-sub www_edit {
- my $self = shift;
- return WebGUI::Privilege::insufficient() unless $self->canEdit;
- $self->getAdminConsole->setHelp("article add/edit");
- return $self->getAdminConsole->render($self->getEditForm,WebGUI::International::get("12","Article"));
-}
-
-
-#-------------------------------------------------------------------
-sub www_editSave {
- my ($image, $attachment, %property);
- $_[0]->SUPER::www_editSave() if ($_[0]->get("wobjectId") eq "new");
- $image = WebGUI::Attachment->new("",$_[0]->get("wobjectId"));
- $image->save("image");
- $attachment = WebGUI::Attachment->new("",$_[0]->get("wobjectId"));
- $attachment->save("attachment");
- $property{image} = $image->getFilename if ($image->getFilename ne "");
- $property{attachment} = $attachment->getFilename if ($attachment->getFilename ne "");
- return $_[0]->SUPER::www_editSave(\%property);
-}
-
-#-------------------------------------------------------------------
-sub www_view {
+sub view {
my $self = shift;
- $self->logView() if ($session{setting}{passiveProfilingEnabled});
my ($file, %var);
if ($self->get("image") ne "") {
$file = WebGUI::Attachment->new($self->get("image"),$self->get("wobjectId"));
@@ -125,7 +110,7 @@ sub www_view {
if ($self->get("convertCarriageReturns")) {
$var{description} =~ s/\n/\\n/g;
}
- $var{"new.template"} = WebGUI::URL::page("wid=".$self->get("wobjectId")."&func=view")."&overrideTemplateId=";
+ $var{"new.template"} = $self->getUrl("wid=".$self->get("wobjectId")."&func=view")."&overrideTemplateId=";
$var{"description.full"} = $var{description};
$var{"description.full"} =~ s/\^\-\;//g;
$var{"description.first.100words"} = $var{"description.full"};
@@ -150,7 +135,7 @@ sub www_view {
$var{"description.first.2sentences"} =~ s/^((.*?\.){2}).*/$1/s;
$var{"description.first.sentence"} = $var{"description.first.2sentences"};
$var{"description.first.sentence"} =~ s/^(.*?\.).*/$1/s;
- my $p = WebGUI::Paginator->new(WebGUI::URL::page("wid=".$self->get("wobjectId")."&func=view"),1);
+ my $p = WebGUI::Paginator->new($self->getUrl("wid=".$self->get("wobjectId")."&func=view"),1);
if ($session{form}{makePrintable} || $var{description} eq "") {
$var{description} =~ s/\^\-\;//g;
$p->setDataByArrayRef([$var{description}]);
@@ -167,7 +152,7 @@ sub www_view {
$var{"attachment.url"} = $file->getURL;
$var{"attachment.name"} = $file->getFilename;
}
- my $callback = WebGUI::URL::page("func=view&wid=".$self->get("wobjectId"));
+ my $callback = $self->getUrl("func=view&wid=".$self->get("wobjectId"));
if ($self->get("allowDiscussion")) {
my $forum = WebGUI::Forum->new($self->get("forumId"));
$var{"replies.count"} = ($forum->get("replies") + $forum->get("threads"));
@@ -188,10 +173,20 @@ sub www_view {
forumId=>$self->get("forumId")
});
} else {
- return $self->processTemplate($templateId,\%var);
+ return $self->processTemplate(\%var, "Article", $templateId);
}
}
+#-------------------------------------------------------------------
+sub www_edit {
+ my $self = shift;
+ return WebGUI::Privilege::insufficient() unless $self->canEdit;
+ $self->getAdminConsole->setHelp("article add/edit");
+ return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("12","Article"));
+}
+
+
+
1;
diff --git a/lib/WebGUI/Icon.pm b/lib/WebGUI/Icon.pm
index 25568d432..2150061c9 100644
--- a/lib/WebGUI/Icon.pm
+++ b/lib/WebGUI/Icon.pm
@@ -101,7 +101,7 @@ The URL to any page. Defaults to the current page.
sub copyIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '.'copy.gif "Copy")
';
return $output;
@@ -125,7 +125,7 @@ The URL to any page. Defaults to the current page.
sub cutIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '.'cut.gif "Cut")
';
return $output;
@@ -158,7 +158,7 @@ sub deleteIcon {
$confirmText = qq| onclick="return confirm('$confirmText')" |;
}
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '.'delete.gif "Delete")
';
@@ -195,7 +195,7 @@ The URL to any page. Defaults to the current page.
sub editIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '.'edit.gif "Edit")
';
return $output;
@@ -219,7 +219,7 @@ The URL to any page. Defaults to the current page.
sub exportIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
# TODO Change icon to Jeffs export icon
$output .= '.'export.gif "Export")
';
@@ -292,7 +292,7 @@ The URL to any page. Defaults to the current page.
sub manageIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '.'manage.gif "Manage")
';
return $output;
@@ -316,7 +316,7 @@ The URL to any page. Defaults to the current page.
sub moveBottomIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '.'moveBottom.gif "Move To Bottom")
';
return $output;
@@ -340,7 +340,7 @@ The URL to any page. Defaults to the current page.
sub moveDownIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '.'moveDown.gif "Move Down")
';
return $output;
@@ -364,7 +364,7 @@ The URL to any page. Defaults to the current page.
sub moveLeftIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '.'moveLeft.gif "Move Left")
';
return $output;
@@ -388,7 +388,7 @@ The URL to any page. Defaults to the current page.
sub moveRightIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '.'moveRight.gif "Move Right")
';
return $output;
@@ -412,7 +412,7 @@ The URL to any page. Defaults to the current page.
sub moveTopIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '.'moveTop.gif "Move To Top")
';
return $output;
@@ -436,7 +436,7 @@ The URL to any page. Defaults to the current page.
sub moveUpIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '.'moveUp.gif "Move Up")
';
return $output;
@@ -472,7 +472,7 @@ The URL to any page. Defaults to the current page.
sub pasteIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '.'paste.gif "Paste")
';
return $output;
@@ -496,7 +496,7 @@ The URL to any page. Defaults to the current page.
sub shortcutIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '.'shortcut.gif "Create Shortcut")
';
return $output;
@@ -520,7 +520,7 @@ The URL to any page. Defaults to the current page.
sub viewIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '.'view.gif "View")
';
return $output;
diff --git a/lib/WebGUI/Macro/AdminBar.pm b/lib/WebGUI/Macro/AdminBar.pm
index 6a594c98a..fe7a758e4 100644
--- a/lib/WebGUI/Macro/AdminBar.pm
+++ b/lib/WebGUI/Macro/AdminBar.pm
@@ -14,6 +14,7 @@ use strict qw(refs vars);
use Tie::CPHash;
use Tie::IxHash;
use WebGUI::AdminConsole;
+use WebGUI::Clipboard;
use WebGUI::Grouping;
use WebGUI::International;
use WebGUI::Macro;
@@ -37,18 +38,18 @@ sub process {
$var{'packages.label'} = WebGUI::International::get(376);
my @packages;
my $i;
- my $sth = WebGUI::SQL->read("select pageId,title from page where parentId='5'");
- while (my %data = $sth->hash) {
- $data{title} =~ s/'//g;
- push(@packages, {
- 'package.url'=>WebGUI::URL::page('op=deployPackage&pid='.$data{pageId}),
- 'package.label'=>$data{title},
- 'package.count'=>$i
- });
- $i++;
- }
- $sth->finish;
- $var{package_loop} = \@packages;
+# my $sth = WebGUI::SQL->read("select pageId,title from page where parentId='5'");
+ # while (my %data = $sth->hash) {
+# $data{title} =~ s/'//g;
+# push(@packages, {
+ # 'package.url'=>WebGUI::URL::page('op=deployPackage&pid='.$data{pageId}),
+ # 'package.label'=>$data{title},
+# 'package.count'=>$i
+# });
+# $i++;
+ # }
+ # $sth->finish;
+# $var{package_loop} = \@packages;
#--contenttypes adder
$var{'contentTypes.label'} = WebGUI::International::get(1083);
foreach my $namespace (@{$session{config}{wobjects}}) {
@@ -81,64 +82,18 @@ sub process {
$var{'addpage.label'} = WebGUI::International::get(2);
#--clipboard paster
$var{'clipboard.label'} = WebGUI::International::get(1082);
- %hash2 = ();
-
- # get pages and store in array of arrays in order to integrate with wobjects and sort by buffer date
- if ($session{setting}{sharedClipboard} eq "1") {
- $query = "select bufferDate,pageId,title from page where parentId='2' order by bufferDate";
- } else {
- $query = "select bufferDate,pageId,title from page where parentId='2' "
- ." and bufferUserId=".quote($session{user}{userId})
- ." order by bufferDate";
- }
- $r = WebGUI::SQL->read($query);
- while (%cphash = $r->hash) {
- $cphash{title} =~ s/'//g;
- push @item, [ $cphash{bufferDate},
- WebGUI::URL::page('op=pastePage&pageId='.$cphash{pageId}),
- $cphash{title} . ' ('. WebGUI::International::get(2) .')' ];
- }
- $r->finish;
-
- # get wobjects and store in array of arrays in order to integrate with pages and sort by buffer date
- if ($session{setting}{sharedClipboard} eq "1") {
- $query = "select bufferDate,wobjectId,title,namespace from wobject where pageId='2' "
- ." order by bufferDate";
- } else {
- $query = "select bufferDate,wobjectId,title,namespace from wobject where pageId='2' "
- ." and bufferUserId=".quote($session{user}{userId})
- ." order by bufferDate";
- }
- $r = WebGUI::SQL->read($query);
- while (%cphash = $r->hash) {
- $cphash{title} =~ s/'//g;
- push @item, [ $cphash{bufferDate},
- WebGUI::URL::page('func=paste&wid='.$cphash{wobjectId}),
- $cphash{title} . ' ('. $cphash{namespace} .')' ];
- }
- $r->finish;
-
- # Reverse sort by bufferDate and and create hash from list values
- my @sorted_item = sort {$b->[0] <=> $a->[0]} @item;
- @item = ();
- for $i ( 0 .. $#sorted_item ) {
- $hash2{ $sorted_item[$i][1] } = $sorted_item[$i][2];
- }
- @sorted_item = ();
- my @clipboard;
- $i = 0;
- foreach my $key (keys %hash2) {
- push(@clipboard,{
- 'clipboard.url'=>$key,
- 'clipboard.label'=>$hash2{$key},
- 'clipboard.count'=>$i
+ my $clipboard = WebGUI::Clipboard::getAssetsInClipboard();
+ foreach my $item (@{$clipboard}) {
+ my $title = $item->{title};
+ $title =~ s/'//g; # stops it from breaking the javascript menus
+ push(@{$var{clipboard_loop}}, {
+ 'clipboard.label'=>$title,
+ 'clipboard.url'=>WebGUI::URL::page("func=paste&assetId=".$item->{assetId})
});
- $i++;
}
- $var{'clipboard_loop'} = \@clipboard;
#--admin functions
%hash = (
- 'http://validator.w3.org/check?uri='.WebGUI::URL::escape(WebGUI::URL::page())=>WebGUI::International::get(399),
+ 'http://validator.w3.org/check?uri=referer'=>WebGUI::International::get(399),
);
my $acParams = WebGUI::AdminConsole->getAdminConsoleParams;
$hash{$acParams->{url}} = $acParams->{title} if ($acParams->{canUse});
diff --git a/lib/WebGUI/Macro/AdminToggle.pm b/lib/WebGUI/Macro/AdminToggle.pm
index 01e1e2e51..30e868aa5 100644
--- a/lib/WebGUI/Macro/AdminToggle.pm
+++ b/lib/WebGUI/Macro/AdminToggle.pm
@@ -22,9 +22,9 @@ use WebGUI::URL;
sub process {
if (WebGUI::Grouping::isInGroup(12)) {
my %var;
- my @param = WebGUI::Macro::getParams($_[0]);
- my $turnOn = $param[0] || WebGUI::International::get(516);
- my $turnOff = $param[1] || WebGUI::International::get(517);
+ my ($turnOn,$turnOff,$templateName) = WebGUI::Macro::getParams($_[0]);
+ $turnOn |= WebGUI::International::get(516);
+ $turnOff |= WebGUI::International::get(517);
if ($session{var}{adminOn}) {
$var{'toggle.url'} = WebGUI::URL::page('op=switchOffAdmin');
$var{'toggle.text'} = $turnOff;
@@ -32,7 +32,7 @@ sub process {
$var{'toggle.url'} = WebGUI::URL::page('op=switchOnAdmin');
$var{'toggle.text'} = $turnOn;
}
- return WebGUI::Template::process(WebGUI::Template::getIdByName($param[2],"Macro/AdminToggle"),"Macro/AdminToggle",\%var);
+ return WebGUI::Template::process(WebGUI::Template::getIdByName($templateName,"Macro/AdminToggle")||1,"Macro/AdminToggle",\%var);
}
return "";
}
diff --git a/lib/WebGUI/Macro/Backslash_pageUrl.pm b/lib/WebGUI/Macro/Backslash_pageUrl.pm
index 1459c2128..d7e65b6e1 100644
--- a/lib/WebGUI/Macro/Backslash_pageUrl.pm
+++ b/lib/WebGUI/Macro/Backslash_pageUrl.pm
@@ -16,7 +16,9 @@ use WebGUI::URL;
#-------------------------------------------------------------------
sub process {
- return WebGUI::URL::getScriptURL().$session{page}{urlizedTitle};
+ my $pathinfo = $session{env}{PATH_INFO};
+ $pathinfo =~ s/^\/(.*)/$1/;
+ return WebGUI::URL::getScriptURL().$pathinfo;
}
diff --git a/lib/WebGUI/Macro/H_homeLink.pm b/lib/WebGUI/Macro/H_homeLink.pm
index 462c92845..6925f2d47 100644
--- a/lib/WebGUI/Macro/H_homeLink.pm
+++ b/lib/WebGUI/Macro/H_homeLink.pm
@@ -23,7 +23,7 @@ sub process {
if ($session{setting}{defaultPage} eq $session{page}{pageId}) {
$temp = $session{page}{urlizedTitle};
} else {
- ($temp) = WebGUI::SQL->quickArray("select urlizedTitle from page where pageId=".quote($session{setting}{defaultPage}),WebGUI::SQL->getSlave);
+ ($temp) = WebGUI::SQL->quickArray("select url from asset where assetId=".quote($session{setting}{defaultPage}),WebGUI::SQL->getSlave);
}
$temp = WebGUI::URL::gateway($temp);
if ($param[0] ne "linkonly") {
diff --git a/lib/WebGUI/Macro/LoginToggle.pm b/lib/WebGUI/Macro/LoginToggle.pm
index 8549b2538..c47be4c8b 100644
--- a/lib/WebGUI/Macro/LoginToggle.pm
+++ b/lib/WebGUI/Macro/LoginToggle.pm
@@ -32,7 +32,7 @@ sub process {
$var{'toggle.url'} = WebGUI::URL::page('op=logout');
$var{'toggle.text'} = $logout;
}
- return WebGUI::Template::process(WebGUI::Template::getIdByName($param[3],"Macro/LoginToggle"), "Macro/LoginToggle", \%var);
+ return WebGUI::Template::process(WebGUI::Template::getIdByName($param[3],"Macro/LoginToggle")||1, "Macro/LoginToggle", \%var);
}
diff --git a/lib/WebGUI/SQL.pm b/lib/WebGUI/SQL.pm
index 0e543039e..8684fdaed 100644
--- a/lib/WebGUI/SQL.pm
+++ b/lib/WebGUI/SQL.pm
@@ -217,7 +217,6 @@ sub buildHashRef {
%hash = $_[0]->buildHash($_[1],$_[2]);
return \%hash;
}
-
#-------------------------------------------------------------------
diff --git a/lib/WebGUI/Storage.pm b/lib/WebGUI/Storage.pm
index fa0c87b54..3928b4308 100644
--- a/lib/WebGUI/Storage.pm
+++ b/lib/WebGUI/Storage.pm
@@ -88,7 +88,7 @@ The error message to add to the object.
sub _addError {
my $self = shift;
my $errorMessage = shift;
- push(@$self->{_errors},$errorMessage);
+ push(@{$self->{_errors}},$errorMessage);
WebGUI::ErrorHandler::warn($errorMessage);
}
@@ -375,7 +375,7 @@ sub get {
my $class = shift;
my $id = shift;
my $parts = _getStorageParts($id);
- bless {_id => $id, _part1 => $part->[0], _part2 => $part->[1]}, $class;
+ bless {_id => $id, _part1 => $parts->[0], _part2 => $parts->[1]}, $class;
}
#-------------------------------------------------------------------
@@ -473,18 +473,8 @@ Returns the size of this file.
sub getFileSize {
my $self = shift;
my $filename = shift;
- my ($size);
my (@attributes) = stat($self->getPath($filename));
- if ($attributes[7] > 1048576) {
- $size = round($attributes[7]/1048576);
- $size .= 'MB';
- } elsif ($attributes[7] > 1024) {
- $size = round($attributes[7]/1024);
- $size .= 'kB';
- } else {
- $size = $attributes[7].'B';
- }
- return $size;
+ return $attributes[7];
}
diff --git a/lib/WebGUI/Style.pm b/lib/WebGUI/Style.pm
index b38c33af5..38aa4cef4 100644
--- a/lib/WebGUI/Style.pm
+++ b/lib/WebGUI/Style.pm
@@ -108,7 +108,7 @@ sub getTemplate {
#-------------------------------------------------------------------
-=head2 process ( content [ , templateId ] )
+=head2 process ( content, templateId )
Returns a parsed style with content based upon the current WebGUI session information.
@@ -118,19 +118,16 @@ The content to be parsed into the style. Usually generated by WebGUI::Page::gene
=head3 templateId
-The unique identifier for the template to retrieve. Defaults to the style template tied to the current page.
+The unique identifier for the template to retrieve.
=cut
sub process {
my %var;
$var{'body.content'} = shift;
- my $templateId = shift || $session{page}{styleId};
+ my $templateId = shift;
if ($session{page}{makePrintable}) {
$templateId = $session{page}{printableStyleId};
- } elsif ($session{page}{useAdminStyle}) {
- #$templateId = $session{setting}{adminStyleId};
- $templateId = "adminConsole";
} elsif ($session{scratch}{personalStyleId} ne "") {
$templateId = $session{scratch}{personalStyleId};
} elsif ($session{page}{useEmptyStyle}) {
diff --git a/lib/WebGUI/Template.pm b/lib/WebGUI/Template.pm
index e121775ad..c94f892f8 100644
--- a/lib/WebGUI/Template.pm
+++ b/lib/WebGUI/Template.pm
@@ -96,17 +96,17 @@ Returns a hash reference containing all of the template parameters.
=head3 templateId
-Defaults to "1". Specify the templateId of the template to retrieve.
+Specify the templateId of the template to retrieve.
=head3 namespace
-Defaults to "page". Specify the namespace of the template to retrieve.
+Specify the namespace of the template to retrieve.
=cut
sub get {
- my $templateId = shift || 1;
- my $namespace = shift || "page";
+ my $templateId = shift;
+ my $namespace = shift;
return WebGUI::SQL->quickHashRef("select * from template where templateId=".quote($templateId)." and namespace=".quote($namespace),WebGUI::SQL->getSlave);
}
@@ -162,11 +162,11 @@ Evaluate a template replacing template commands for HTML.
=head3 templateId
-Defaults to "1". Specify the templateId of the template to retrieve.
+Specify the templateId of the template to retrieve.
=head3 namespace
-Defaults to "page". Specify the namespace of the template to retrieve.
+Specify the namespace of the template to retrieve.
=head3 vars
@@ -175,8 +175,8 @@ A hash reference containing template variables and loops. Automatically includes
=cut
sub process {
- my $templateId = shift || 1;
- my $namespace = shift || "page";
+ my $templateId = shift;
+ my $namespace = shift;
my $vars = shift;
my $file = _getTemplateFile($templateId,$namespace);
my $fileCacheDir = $session{config}{uploadsPath}.$session{os}{slash}."temp".$session{os}{slash}."templatecache";
@@ -202,7 +202,8 @@ sub process {
}
}
if ($session{config}{templateCacheType} eq "file" && not $error) {
- $params{file_cache} = 1;
+ # disabled until we can figure out what's wrong with it
+ # $params{file_cache} = 1;
} elsif ($session{config}{templateCacheType} eq "memory") {
$params{cache} = 1;
} elsif ($session{config}{templateCacheType} eq "ipc") {
diff --git a/lib/WebGUI/URL.pm b/lib/WebGUI/URL.pm
index ab62645f1..2b3a15e40 100644
--- a/lib/WebGUI/URL.pm
+++ b/lib/WebGUI/URL.pm
@@ -121,12 +121,12 @@ Name value pairs to add to the URL in the form of:
sub gateway {
my $url = getScriptURL().$_[0];
- if ($_[1]) {
- $url = append($url,$_[1]);
- }
if ($session{setting}{preventProxyCache} == 1) {
$url = append($url,"noCache=".randint(0,1000).';'.time());
}
+ if ($_[1]) {
+ $url = append($url,$_[1]);
+ }
return $url;
}
@@ -258,13 +258,15 @@ sub page {
} else {
$url = getScriptURL();
}
- $url .= $session{page}{urlizedTitle};
- if ($pairs) {
- $url = append($url,$pairs);
- }
+ my $pathinfo = $session{env}{PATH_INFO};
+ $pathinfo =~ s/^\/(.*)/$1/;
+ $url .= $pathinfo;
if ($session{setting}{preventProxyCache} == 1) {
$url = append($url,"noCache=".randint(0,1000).';'.time());
}
+ if ($pairs) {
+ $url = append($url,$pairs);
+ }
return $url;
}
diff --git a/lib/WebGUI/Utility.pm b/lib/WebGUI/Utility.pm
index 62f9398aa..a35f485b5 100644
--- a/lib/WebGUI/Utility.pm
+++ b/lib/WebGUI/Utility.pm
@@ -22,7 +22,7 @@ use Tie::IxHash;
our @ISA = qw(Exporter);
our @EXPORT = qw(&isBetween &makeTabSafe &makeArrayTabSafe &randomizeHash &commify &randomizeArray
- &sortHashDescending &sortHash &isIn &makeCommaSafe &makeArrayCommaSafe &randint &round);
+ &formatBytes &sortHashDescending &sortHash &isIn &makeCommaSafe &makeArrayCommaSafe &randint &round);
=head1 NAME
@@ -37,6 +37,7 @@ This package provides miscellaneous but useful utilities to the WebGUI programme
use WebGUI::Utility;
$string = commify($integer);
+ $size = formatBytes($integer);
$boolean = isIn($value, @array);
makeArrayCommaSafe(\@array);
makeArrayTabSafe(\@array);
@@ -73,6 +74,32 @@ sub commify {
return scalar reverse $text;
}
+
+#-------------------------------------------------------------------
+
+=head2 formatBytes ( integer )
+
+Returns a formatted file size like "3MB" or "44kB".
+
+=head3 integer
+
+An integer representing the number of bytes to format.
+
+=cut
+
+sub formatBytes {
+ my $size = shift;
+ if ($size > 1048576) {
+ return round($size/1048576).'MB';
+ } elsif ($size > 1024) {
+ return round($size/1024).'kB';
+ } else {
+ return $size.'B';
+ }
+}
+
+
+
#-------------------------------------------------------------------
=head2 isBetween ( value, first, second )
diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm
index e787d0d36..e0f0064d3 100644
--- a/lib/WebGUI/i18n/English/WebGUI.pm
+++ b/lib/WebGUI/i18n/English/WebGUI.pm
@@ -2075,10 +2075,6 @@ Choose which group can view this page. If you want both visitors and registered
Choose the group that can edit this page. The group assigned editing rights can also always view the page.
';
return $output;
@@ -125,7 +125,7 @@ The URL to any page. Defaults to the current page.
sub cutIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '';
return $output;
@@ -158,7 +158,7 @@ sub deleteIcon {
$confirmText = qq| onclick="return confirm('$confirmText')" |;
}
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '';
@@ -195,7 +195,7 @@ The URL to any page. Defaults to the current page.
sub editIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '';
return $output;
@@ -219,7 +219,7 @@ The URL to any page. Defaults to the current page.
sub exportIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
# TODO Change icon to Jeffs export icon
$output .= '';
@@ -292,7 +292,7 @@ The URL to any page. Defaults to the current page.
sub manageIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '';
return $output;
@@ -316,7 +316,7 @@ The URL to any page. Defaults to the current page.
sub moveBottomIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '';
return $output;
@@ -340,7 +340,7 @@ The URL to any page. Defaults to the current page.
sub moveDownIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '';
return $output;
@@ -364,7 +364,7 @@ The URL to any page. Defaults to the current page.
sub moveLeftIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '';
return $output;
@@ -388,7 +388,7 @@ The URL to any page. Defaults to the current page.
sub moveRightIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '';
return $output;
@@ -412,7 +412,7 @@ The URL to any page. Defaults to the current page.
sub moveTopIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '';
return $output;
@@ -436,7 +436,7 @@ The URL to any page. Defaults to the current page.
sub moveUpIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '';
return $output;
@@ -472,7 +472,7 @@ The URL to any page. Defaults to the current page.
sub pasteIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '';
return $output;
@@ -496,7 +496,7 @@ The URL to any page. Defaults to the current page.
sub shortcutIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '';
return $output;
@@ -520,7 +520,7 @@ The URL to any page. Defaults to the current page.
sub viewIcon {
my ($output, $pageURL);
- $pageURL = $_[1] || $session{page}{urlizedTitle};
+ $pageURL = $_[1] || $session{env}{PATH_INFO};
$output = '';
$output .= '';
return $output;
diff --git a/lib/WebGUI/Macro/AdminBar.pm b/lib/WebGUI/Macro/AdminBar.pm
index 6a594c98a..fe7a758e4 100644
--- a/lib/WebGUI/Macro/AdminBar.pm
+++ b/lib/WebGUI/Macro/AdminBar.pm
@@ -14,6 +14,7 @@ use strict qw(refs vars);
use Tie::CPHash;
use Tie::IxHash;
use WebGUI::AdminConsole;
+use WebGUI::Clipboard;
use WebGUI::Grouping;
use WebGUI::International;
use WebGUI::Macro;
@@ -37,18 +38,18 @@ sub process {
$var{'packages.label'} = WebGUI::International::get(376);
my @packages;
my $i;
- my $sth = WebGUI::SQL->read("select pageId,title from page where parentId='5'");
- while (my %data = $sth->hash) {
- $data{title} =~ s/'//g;
- push(@packages, {
- 'package.url'=>WebGUI::URL::page('op=deployPackage&pid='.$data{pageId}),
- 'package.label'=>$data{title},
- 'package.count'=>$i
- });
- $i++;
- }
- $sth->finish;
- $var{package_loop} = \@packages;
+# my $sth = WebGUI::SQL->read("select pageId,title from page where parentId='5'");
+ # while (my %data = $sth->hash) {
+# $data{title} =~ s/'//g;
+# push(@packages, {
+ # 'package.url'=>WebGUI::URL::page('op=deployPackage&pid='.$data{pageId}),
+ # 'package.label'=>$data{title},
+# 'package.count'=>$i
+# });
+# $i++;
+ # }
+ # $sth->finish;
+# $var{package_loop} = \@packages;
#--contenttypes adder
$var{'contentTypes.label'} = WebGUI::International::get(1083);
foreach my $namespace (@{$session{config}{wobjects}}) {
@@ -81,64 +82,18 @@ sub process {
$var{'addpage.label'} = WebGUI::International::get(2);
#--clipboard paster
$var{'clipboard.label'} = WebGUI::International::get(1082);
- %hash2 = ();
-
- # get pages and store in array of arrays in order to integrate with wobjects and sort by buffer date
- if ($session{setting}{sharedClipboard} eq "1") {
- $query = "select bufferDate,pageId,title from page where parentId='2' order by bufferDate";
- } else {
- $query = "select bufferDate,pageId,title from page where parentId='2' "
- ." and bufferUserId=".quote($session{user}{userId})
- ." order by bufferDate";
- }
- $r = WebGUI::SQL->read($query);
- while (%cphash = $r->hash) {
- $cphash{title} =~ s/'//g;
- push @item, [ $cphash{bufferDate},
- WebGUI::URL::page('op=pastePage&pageId='.$cphash{pageId}),
- $cphash{title} . ' ('. WebGUI::International::get(2) .')' ];
- }
- $r->finish;
-
- # get wobjects and store in array of arrays in order to integrate with pages and sort by buffer date
- if ($session{setting}{sharedClipboard} eq "1") {
- $query = "select bufferDate,wobjectId,title,namespace from wobject where pageId='2' "
- ." order by bufferDate";
- } else {
- $query = "select bufferDate,wobjectId,title,namespace from wobject where pageId='2' "
- ." and bufferUserId=".quote($session{user}{userId})
- ." order by bufferDate";
- }
- $r = WebGUI::SQL->read($query);
- while (%cphash = $r->hash) {
- $cphash{title} =~ s/'//g;
- push @item, [ $cphash{bufferDate},
- WebGUI::URL::page('func=paste&wid='.$cphash{wobjectId}),
- $cphash{title} . ' ('. $cphash{namespace} .')' ];
- }
- $r->finish;
-
- # Reverse sort by bufferDate and and create hash from list values
- my @sorted_item = sort {$b->[0] <=> $a->[0]} @item;
- @item = ();
- for $i ( 0 .. $#sorted_item ) {
- $hash2{ $sorted_item[$i][1] } = $sorted_item[$i][2];
- }
- @sorted_item = ();
- my @clipboard;
- $i = 0;
- foreach my $key (keys %hash2) {
- push(@clipboard,{
- 'clipboard.url'=>$key,
- 'clipboard.label'=>$hash2{$key},
- 'clipboard.count'=>$i
+ my $clipboard = WebGUI::Clipboard::getAssetsInClipboard();
+ foreach my $item (@{$clipboard}) {
+ my $title = $item->{title};
+ $title =~ s/'//g; # stops it from breaking the javascript menus
+ push(@{$var{clipboard_loop}}, {
+ 'clipboard.label'=>$title,
+ 'clipboard.url'=>WebGUI::URL::page("func=paste&assetId=".$item->{assetId})
});
- $i++;
}
- $var{'clipboard_loop'} = \@clipboard;
#--admin functions
%hash = (
- 'http://validator.w3.org/check?uri='.WebGUI::URL::escape(WebGUI::URL::page())=>WebGUI::International::get(399),
+ 'http://validator.w3.org/check?uri=referer'=>WebGUI::International::get(399),
);
my $acParams = WebGUI::AdminConsole->getAdminConsoleParams;
$hash{$acParams->{url}} = $acParams->{title} if ($acParams->{canUse});
diff --git a/lib/WebGUI/Macro/AdminToggle.pm b/lib/WebGUI/Macro/AdminToggle.pm
index 01e1e2e51..30e868aa5 100644
--- a/lib/WebGUI/Macro/AdminToggle.pm
+++ b/lib/WebGUI/Macro/AdminToggle.pm
@@ -22,9 +22,9 @@ use WebGUI::URL;
sub process {
if (WebGUI::Grouping::isInGroup(12)) {
my %var;
- my @param = WebGUI::Macro::getParams($_[0]);
- my $turnOn = $param[0] || WebGUI::International::get(516);
- my $turnOff = $param[1] || WebGUI::International::get(517);
+ my ($turnOn,$turnOff,$templateName) = WebGUI::Macro::getParams($_[0]);
+ $turnOn |= WebGUI::International::get(516);
+ $turnOff |= WebGUI::International::get(517);
if ($session{var}{adminOn}) {
$var{'toggle.url'} = WebGUI::URL::page('op=switchOffAdmin');
$var{'toggle.text'} = $turnOff;
@@ -32,7 +32,7 @@ sub process {
$var{'toggle.url'} = WebGUI::URL::page('op=switchOnAdmin');
$var{'toggle.text'} = $turnOn;
}
- return WebGUI::Template::process(WebGUI::Template::getIdByName($param[2],"Macro/AdminToggle"),"Macro/AdminToggle",\%var);
+ return WebGUI::Template::process(WebGUI::Template::getIdByName($templateName,"Macro/AdminToggle")||1,"Macro/AdminToggle",\%var);
}
return "";
}
diff --git a/lib/WebGUI/Macro/Backslash_pageUrl.pm b/lib/WebGUI/Macro/Backslash_pageUrl.pm
index 1459c2128..d7e65b6e1 100644
--- a/lib/WebGUI/Macro/Backslash_pageUrl.pm
+++ b/lib/WebGUI/Macro/Backslash_pageUrl.pm
@@ -16,7 +16,9 @@ use WebGUI::URL;
#-------------------------------------------------------------------
sub process {
- return WebGUI::URL::getScriptURL().$session{page}{urlizedTitle};
+ my $pathinfo = $session{env}{PATH_INFO};
+ $pathinfo =~ s/^\/(.*)/$1/;
+ return WebGUI::URL::getScriptURL().$pathinfo;
}
diff --git a/lib/WebGUI/Macro/H_homeLink.pm b/lib/WebGUI/Macro/H_homeLink.pm
index 462c92845..6925f2d47 100644
--- a/lib/WebGUI/Macro/H_homeLink.pm
+++ b/lib/WebGUI/Macro/H_homeLink.pm
@@ -23,7 +23,7 @@ sub process {
if ($session{setting}{defaultPage} eq $session{page}{pageId}) {
$temp = $session{page}{urlizedTitle};
} else {
- ($temp) = WebGUI::SQL->quickArray("select urlizedTitle from page where pageId=".quote($session{setting}{defaultPage}),WebGUI::SQL->getSlave);
+ ($temp) = WebGUI::SQL->quickArray("select url from asset where assetId=".quote($session{setting}{defaultPage}),WebGUI::SQL->getSlave);
}
$temp = WebGUI::URL::gateway($temp);
if ($param[0] ne "linkonly") {
diff --git a/lib/WebGUI/Macro/LoginToggle.pm b/lib/WebGUI/Macro/LoginToggle.pm
index 8549b2538..c47be4c8b 100644
--- a/lib/WebGUI/Macro/LoginToggle.pm
+++ b/lib/WebGUI/Macro/LoginToggle.pm
@@ -32,7 +32,7 @@ sub process {
$var{'toggle.url'} = WebGUI::URL::page('op=logout');
$var{'toggle.text'} = $logout;
}
- return WebGUI::Template::process(WebGUI::Template::getIdByName($param[3],"Macro/LoginToggle"), "Macro/LoginToggle", \%var);
+ return WebGUI::Template::process(WebGUI::Template::getIdByName($param[3],"Macro/LoginToggle")||1, "Macro/LoginToggle", \%var);
}
diff --git a/lib/WebGUI/SQL.pm b/lib/WebGUI/SQL.pm
index 0e543039e..8684fdaed 100644
--- a/lib/WebGUI/SQL.pm
+++ b/lib/WebGUI/SQL.pm
@@ -217,7 +217,6 @@ sub buildHashRef {
%hash = $_[0]->buildHash($_[1],$_[2]);
return \%hash;
}
-
#-------------------------------------------------------------------
diff --git a/lib/WebGUI/Storage.pm b/lib/WebGUI/Storage.pm
index fa0c87b54..3928b4308 100644
--- a/lib/WebGUI/Storage.pm
+++ b/lib/WebGUI/Storage.pm
@@ -88,7 +88,7 @@ The error message to add to the object.
sub _addError {
my $self = shift;
my $errorMessage = shift;
- push(@$self->{_errors},$errorMessage);
+ push(@{$self->{_errors}},$errorMessage);
WebGUI::ErrorHandler::warn($errorMessage);
}
@@ -375,7 +375,7 @@ sub get {
my $class = shift;
my $id = shift;
my $parts = _getStorageParts($id);
- bless {_id => $id, _part1 => $part->[0], _part2 => $part->[1]}, $class;
+ bless {_id => $id, _part1 => $parts->[0], _part2 => $parts->[1]}, $class;
}
#-------------------------------------------------------------------
@@ -473,18 +473,8 @@ Returns the size of this file.
sub getFileSize {
my $self = shift;
my $filename = shift;
- my ($size);
my (@attributes) = stat($self->getPath($filename));
- if ($attributes[7] > 1048576) {
- $size = round($attributes[7]/1048576);
- $size .= 'MB';
- } elsif ($attributes[7] > 1024) {
- $size = round($attributes[7]/1024);
- $size .= 'kB';
- } else {
- $size = $attributes[7].'B';
- }
- return $size;
+ return $attributes[7];
}
diff --git a/lib/WebGUI/Style.pm b/lib/WebGUI/Style.pm
index b38c33af5..38aa4cef4 100644
--- a/lib/WebGUI/Style.pm
+++ b/lib/WebGUI/Style.pm
@@ -108,7 +108,7 @@ sub getTemplate {
#-------------------------------------------------------------------
-=head2 process ( content [ , templateId ] )
+=head2 process ( content, templateId )
Returns a parsed style with content based upon the current WebGUI session information.
@@ -118,19 +118,16 @@ The content to be parsed into the style. Usually generated by WebGUI::Page::gene
=head3 templateId
-The unique identifier for the template to retrieve. Defaults to the style template tied to the current page.
+The unique identifier for the template to retrieve.
=cut
sub process {
my %var;
$var{'body.content'} = shift;
- my $templateId = shift || $session{page}{styleId};
+ my $templateId = shift;
if ($session{page}{makePrintable}) {
$templateId = $session{page}{printableStyleId};
- } elsif ($session{page}{useAdminStyle}) {
- #$templateId = $session{setting}{adminStyleId};
- $templateId = "adminConsole";
} elsif ($session{scratch}{personalStyleId} ne "") {
$templateId = $session{scratch}{personalStyleId};
} elsif ($session{page}{useEmptyStyle}) {
diff --git a/lib/WebGUI/Template.pm b/lib/WebGUI/Template.pm
index e121775ad..c94f892f8 100644
--- a/lib/WebGUI/Template.pm
+++ b/lib/WebGUI/Template.pm
@@ -96,17 +96,17 @@ Returns a hash reference containing all of the template parameters.
=head3 templateId
-Defaults to "1". Specify the templateId of the template to retrieve.
+Specify the templateId of the template to retrieve.
=head3 namespace
-Defaults to "page". Specify the namespace of the template to retrieve.
+Specify the namespace of the template to retrieve.
=cut
sub get {
- my $templateId = shift || 1;
- my $namespace = shift || "page";
+ my $templateId = shift;
+ my $namespace = shift;
return WebGUI::SQL->quickHashRef("select * from template where templateId=".quote($templateId)." and namespace=".quote($namespace),WebGUI::SQL->getSlave);
}
@@ -162,11 +162,11 @@ Evaluate a template replacing template commands for HTML.
=head3 templateId
-Defaults to "1". Specify the templateId of the template to retrieve.
+Specify the templateId of the template to retrieve.
=head3 namespace
-Defaults to "page". Specify the namespace of the template to retrieve.
+Specify the namespace of the template to retrieve.
=head3 vars
@@ -175,8 +175,8 @@ A hash reference containing template variables and loops. Automatically includes
=cut
sub process {
- my $templateId = shift || 1;
- my $namespace = shift || "page";
+ my $templateId = shift;
+ my $namespace = shift;
my $vars = shift;
my $file = _getTemplateFile($templateId,$namespace);
my $fileCacheDir = $session{config}{uploadsPath}.$session{os}{slash}."temp".$session{os}{slash}."templatecache";
@@ -202,7 +202,8 @@ sub process {
}
}
if ($session{config}{templateCacheType} eq "file" && not $error) {
- $params{file_cache} = 1;
+ # disabled until we can figure out what's wrong with it
+ # $params{file_cache} = 1;
} elsif ($session{config}{templateCacheType} eq "memory") {
$params{cache} = 1;
} elsif ($session{config}{templateCacheType} eq "ipc") {
diff --git a/lib/WebGUI/URL.pm b/lib/WebGUI/URL.pm
index ab62645f1..2b3a15e40 100644
--- a/lib/WebGUI/URL.pm
+++ b/lib/WebGUI/URL.pm
@@ -121,12 +121,12 @@ Name value pairs to add to the URL in the form of:
sub gateway {
my $url = getScriptURL().$_[0];
- if ($_[1]) {
- $url = append($url,$_[1]);
- }
if ($session{setting}{preventProxyCache} == 1) {
$url = append($url,"noCache=".randint(0,1000).';'.time());
}
+ if ($_[1]) {
+ $url = append($url,$_[1]);
+ }
return $url;
}
@@ -258,13 +258,15 @@ sub page {
} else {
$url = getScriptURL();
}
- $url .= $session{page}{urlizedTitle};
- if ($pairs) {
- $url = append($url,$pairs);
- }
+ my $pathinfo = $session{env}{PATH_INFO};
+ $pathinfo =~ s/^\/(.*)/$1/;
+ $url .= $pathinfo;
if ($session{setting}{preventProxyCache} == 1) {
$url = append($url,"noCache=".randint(0,1000).';'.time());
}
+ if ($pairs) {
+ $url = append($url,$pairs);
+ }
return $url;
}
diff --git a/lib/WebGUI/Utility.pm b/lib/WebGUI/Utility.pm
index 62f9398aa..a35f485b5 100644
--- a/lib/WebGUI/Utility.pm
+++ b/lib/WebGUI/Utility.pm
@@ -22,7 +22,7 @@ use Tie::IxHash;
our @ISA = qw(Exporter);
our @EXPORT = qw(&isBetween &makeTabSafe &makeArrayTabSafe &randomizeHash &commify &randomizeArray
- &sortHashDescending &sortHash &isIn &makeCommaSafe &makeArrayCommaSafe &randint &round);
+ &formatBytes &sortHashDescending &sortHash &isIn &makeCommaSafe &makeArrayCommaSafe &randint &round);
=head1 NAME
@@ -37,6 +37,7 @@ This package provides miscellaneous but useful utilities to the WebGUI programme
use WebGUI::Utility;
$string = commify($integer);
+ $size = formatBytes($integer);
$boolean = isIn($value, @array);
makeArrayCommaSafe(\@array);
makeArrayTabSafe(\@array);
@@ -73,6 +74,32 @@ sub commify {
return scalar reverse $text;
}
+
+#-------------------------------------------------------------------
+
+=head2 formatBytes ( integer )
+
+Returns a formatted file size like "3MB" or "44kB".
+
+=head3 integer
+
+An integer representing the number of bytes to format.
+
+=cut
+
+sub formatBytes {
+ my $size = shift;
+ if ($size > 1048576) {
+ return round($size/1048576).'MB';
+ } elsif ($size > 1024) {
+ return round($size/1024).'kB';
+ } else {
+ return $size.'B';
+ }
+}
+
+
+
#-------------------------------------------------------------------
=head2 isBetween ( value, first, second )
diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm
index e787d0d36..e0f0064d3 100644
--- a/lib/WebGUI/i18n/English/WebGUI.pm
+++ b/lib/WebGUI/i18n/English/WebGUI.pm
@@ -2075,10 +2075,6 @@ Choose which group can view this page. If you want both visitors and registered
Choose the group that can edit this page. The group assigned editing rights can also always view the page.
-Wobject privileges?
-Allows content managers to specify view/edit privileges on a per wobject basis rather than relying on the privileges on the page.
-
-
Recursively set privileges?
You can optionally give the privileges of this page to all pages under this page.
@@ -4018,11 +4014,6 @@ The toolbar for manipulating the properties of the page. lastUpdated => 1031514049 }, - '1003' => { - message => q|Wobject privileges?|, - lastUpdated => 1056041703 - }, - '555' => { message => q|Edit this user's karma.|, lastUpdated => 1031514049 diff --git a/www/extras/assets/layout.gif b/www/extras/assets/layout.gif new file mode 100644 index 000000000..0687b2424 Binary files /dev/null and b/www/extras/assets/layout.gif differ diff --git a/www/extras/assets/small/layout.gif b/www/extras/assets/small/layout.gif new file mode 100644 index 000000000..68fabbe32 Binary files /dev/null and b/www/extras/assets/small/layout.gif differ