-
-
- ');">
-
+
- ');">
+ X
+
+ Upload an attachment.
+ ';
+ }
+ my $attachments = '';
+ my $attachmentsList = "attachments=".join(";attachments=", @assetIds) if (scalar(@assetIds));
+ foreach my $assetId (@assetIds) {
+ my $asset = WebGUI::Asset->newByDynamicClass($session, $assetId);
+ if (defined $asset) {
+ $attachments .= 'param("maxAttachments").";"
+ .$attachmentsList.";assetId=".$assetId.";name=".$form->param("name")).'" class="deleteAttachment">X
+ ';
+ if ($asset->isa("WebGUI::Asset::File::Image")) {
+ $attachments .= '
+ 
+ '.$asset->getTitle.'
+ 
';
+ }
+ else {
+ $attachments .= '
+ 
+ '.$asset->getTitle.'';
+ }
+ $attachments .= '
';
+ }
+ }
+ my $output = ' '.$style->generateAdditionalHeadTags.'
+
+
+ '.$uploadControl.' Upload attachments here. Copy and paste attachments into the editor.
+ '.$attachments.'
';
+ return $output;
+}
+
+#-------------------------------------------------------------------
+
+=head2 www_upload
+
+A web accessible method that uploads an attachment to tempsace.
+
+=cut
+
+sub www_upload {
+ my $session = shift;
+ my $form = $session->form;
+ my @assetIds = $form->param("attachments");
+ my $storage = WebGUI::Storage::Image->createTemp($session);
+ my $filename = $storage->addFileFromFormPost("attachment");
+ my $tempspace = WebGUI::Asset->getTempspace($session);
+ if ($storage->isImage($filename)) {
+ my $image = $tempspace->addChild({
+ title => $filename,
+ url => "attachments/".$filename,
+ className => "WebGUI::Asset::File::Image",
+ filename => $filename,
+ templateId => "PBtmpl0000000000000088",
+ });
+ $image->getStorageLocation->addFileFromFilesystem($storage->getPath($filename));
+ $image->generateThumbnail();
+ $image->setSize;
+ push(@assetIds, $image->getId);
+ }
+ else {
+ my $file = $tempspace->addChild({
+ title => $filename,
+ url => "attachments/".$filename,
+ className => "WebGUI::Asset::File",
+ filename => $filename,
+ templateId => "PBtmpl0000000000000024",
+ });
+ $file->getStorageLocation->addFileFromFilesystem($storage->getPath($filename));
+ $file->setSize;
+ push(@assetIds, $file->getId);
+ }
+ if ($session->setting->get("autoRequestCommit")) {
+ WebGUI::VersionTag->getWorking($session)->requestCommit;
+ }
+ $storage->delete;
+ return www_show($session, \@assetIds);
+}
+
+
+1;
+
diff --git a/lib/WebGUI/Form/_control.skeleton b/lib/WebGUI/Form/_control.skeleton
new file mode 100644
index 000000000..01824150a
--- /dev/null
+++ b/lib/WebGUI/Form/_control.skeleton
@@ -0,0 +1,122 @@
+package WebGUI::Form::MyControl;
+
+=head1 LEGAL
+
+ -------------------------------------------------------------------
+ WebGUI is Copyright 2001-2007 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 base 'WebGUI::Form::Control';
+use WebGUI::International;
+
+=head1 NAME
+
+Package WebGUI::Form::MyControl
+
+=head1 DESCRIPTION
+
+Creates a text input box form field.
+
+=head1 SEE ALSO
+
+This is a subclass of WebGUI::Form::Control.
+
+=head1 METHODS
+
+The following methods are specifically available from this class. Check the superclass for additional methods.
+
+=cut
+
+#-------------------------------------------------------------------
+
+=head2 definition ( [ additionalTerms ] )
+
+See the super class for additional details.
+
+=head3 additionalTerms
+
+The following additional parameters have been added via this sub class.
+
+=head4 size
+
+Defaults to the setting textBoxSize or 30 if that's not set. Specifies how big of a text box to display.
+
+=head4 profileEnabled
+
+Flag that tells the User Profile system that this is a valid form element in a User Profile
+
+=cut
+
+sub definition {
+ my $class = shift;
+ my $session = shift;
+ my $definition = shift || [];
+ my $i18n = WebGUI::International->new($session);
+ push(@{$definition}, {
+ formName=>{
+ defaultValue=> $i18n->get("475")
+ },
+ size=>{
+ defaultValue=>$session->setting->get("textBoxSize") || 30
+ },
+ profileEnabled=>{
+ defaultValue=>1
+ },
+ });
+ return $class->SUPER::definition($session, $definition);
+}
+
+#-------------------------------------------------------------------
+
+=head2 getValueFromPost ( [ value ] )
+
+Retrieves a value from a form GET or POST and returns it. If the value comes back as undef, this method will return the defaultValue instead.
+
+=head3 value
+
+An optional value to process, instead of POST input.
+
+=cut
+
+sub getValueFromPost {
+ my $self = shift;
+ my $formValue;
+
+ if (@_) {
+ $formValue = shift;
+ }
+ elsif ($self->session->request) {
+ $formValue = $self->session->form->param($self->get("name"));
+ }
+ if (defined $formValue) {
+ return $formValue;
+ } else {
+ return $self->{defaultValue};
+ }
+}
+
+#-------------------------------------------------------------------
+
+=head2 toHtml ( )
+
+Renders an input tag of type text.
+
+=cut
+
+sub toHtml {
+ my $self = shift;
+ my $value = $self->fixMacros($self->fixQuotes($self->fixSpecialCharacters($self->get("value"))));
+ return 'get("extras").' />';
+}
+
+1;
+
diff --git a/lib/WebGUI/Setup.pm b/lib/WebGUI/Setup.pm
index a08343c58..ebbdf2d04 100644
--- a/lib/WebGUI/Setup.pm
+++ b/lib/WebGUI/Setup.pm
@@ -210,7 +210,7 @@ sub setup {
my $form = $session->form;
my $snippet = '/* auto generated by WebGUI '.$WebGUI::VERSION.' */
.clearFloat { clear: both; }
-body { background-color: '.$form->get("pageBackgroundColor").'; }
+body { background-color: '.$form->get("pageBackgroundColor").'; color: '.$form->get("contentTextColor").'}
a { color: '.$form->get("linkColor").';}
a:visited { color: '.$form->get("visitedLinkColor").'; }
#editToggleContainer { padding: 1px; }
@@ -367,6 +367,7 @@ a:visited { color: '.$form->get("visitedLinkColor").'; }
addAsset($page, {
title => "Wiki",
isHidden => 1,
+ allowAttachments => 5,
className => "WebGUI::Asset::Wobject::WikiMaster",
description => "Welcome to our wiki. Here you can help us keep information up to date.",
});
diff --git a/lib/WebGUI/VersionTag.pm b/lib/WebGUI/VersionTag.pm
index 5ec7a969e..f46ec8120 100644
--- a/lib/WebGUI/VersionTag.pm
+++ b/lib/WebGUI/VersionTag.pm
@@ -420,7 +420,7 @@ sub requestCommit {
=head2 rollback ( )
-A class method. Eliminates all revisions of all assets created under a specific version tag. Also removes the version tag.
+Eliminates all revisions of all assets created under a specific version tag. Also removes the version tag.
=cut
diff --git a/lib/WebGUI/i18n/English/Asset_WikiMaster.pm b/lib/WebGUI/i18n/English/Asset_WikiMaster.pm
index e66a9f4a0..15561158c 100644
--- a/lib/WebGUI/i18n/English/Asset_WikiMaster.pm
+++ b/lib/WebGUI/i18n/English/Asset_WikiMaster.pm
@@ -1,6 +1,16 @@
package WebGUI::i18n::English::Asset_WikiMaster;
our $I18N = {
+ 'allow attachments' => {
+ lastUpdated => 0,
+ message => q|Allowed Attachments|,
+ context => "field label"
+ },
+ 'allow attachments help' => {
+ lastUpdated => 0,
+ message => q|?|,
+ context => "The number of attachments that are allowed to be placed on each wiki page."
+ },
'assetName' => { lastUpdated => 1160157064, message => 'Wiki' },
'asset description' => { lastUpdated => 1160157064, message => q|A wiki is a collaborative content publishing mechanism. Traditionally wiki's use the wiki markup language, but that's generally not much easier to deal with than HTML, so WebGUI's wiki instead just uses a rich editor to help users publish rich great looking content.| },
diff --git a/www/extras/AttachmentsControl/AttachmentsControl.css b/www/extras/AttachmentsControl/AttachmentsControl.css
new file mode 100644
index 000000000..fda7dfe48
--- /dev/null
+++ b/www/extras/AttachmentsControl/AttachmentsControl.css
@@ -0,0 +1,21 @@
+#attachments { width: 100%; background-color: #eeeeee; padding: 3px; height: 100%; }
+.attachment { position: relative; width: 100px; height: 80px; border: 0px; margin-right: 5px; padding: 0px; padding-left: 20px;
+ border: 1px dashed #bbbbbb; overflow: hidden; float: left; text-align: center;}
+.attachment img { border: 0px; width: 90px; max-height: 70px; vertical-align: middle; margin: 5px; }
+.attachment a { vertical-align: middle; margin: 5px; }
+body { margin: 0px; padding: 0px; background-color: #eeeeee; }
+#upload { position:fixed; _position:absolute; bottom:0; right:0; font-family: sans-serif; cursor: pointer;
+_top:expression(document.body.scrollTop+document.body.clientHeight-this.clientHeight); width: 150px; font-size: 12px; background-color: #008000; text-align: center; text-decoration: none; z-index: 10; color: white; }
+#instructions { font-size: 11px; color: white; width: 100%; background-color: black; font-family: sans-serif;}
+#uploadForm { position:fixed; _position:absolute; top:0; _top:expression(eval(document.body.scrollTop)); left:0; margin:0; padding:0; background-color: #eeeeee; z-index: 20; width: 100%; height: 100%; display: none; vertical-align: middle; text-align: center; padding-top: 5px; }
+#uploadFormCloser { position: absolute; top: 0px; right: 0px; background-color: #800000; color: #ffffff; margin: 3px;
+ padding: 3px; border: 2px solid black; text-decoration: none; cursor: pointer; }
+.deleteAttachment {position: absolute; top: 0px; left: 0px; background-color: #800000; color: white; z-index: 10;
+ font-size: 14px; text-decoration: none; border: 1px solid black; width: 16px; height: 16px;}
+.thumbnail {position: absolute; z-index: 10; top: 20px; left: 0px;}
+.thumbnail img { width: 15px; height: 15px; border: 1px solid black; }
+.imageLink { position: absolute; top: 40px; left: 0px; background-color: #eeeeee; color: blue; z-index: 10;
+ font-size: 14px; text-decoration: underline; border: 1px solid black; width: 16px; height: 16px;
+ overflow: hidden; }
+
+
diff --git a/www/extras/AttachmentsControl/AttachmentsControl.js b/www/extras/AttachmentsControl/AttachmentsControl.js
new file mode 100644
index 000000000..c70a10e31
--- /dev/null
+++ b/www/extras/AttachmentsControl/AttachmentsControl.js
@@ -0,0 +1,12 @@
+WebguiAttachmentUploadForm = function () {
+ return {
+ show: function () {
+ document.getElementById("uploadForm").style.display = "block";
+ },
+ hide: function () {
+ document.getElementById("uploadForm").style.display = "none";
+ }
+ }
+}();
+
+