diff --git a/lib/WebGUI/AdSpace/Ad.pm b/lib/WebGUI/AdSpace/Ad.pm
index 6bcad32e1..304d6d6f6 100644
--- a/lib/WebGUI/AdSpace/Ad.pm
+++ b/lib/WebGUI/AdSpace/Ad.pm
@@ -58,8 +58,9 @@ The properties used to create this object. See the set() method for details.
sub create {
my $class = shift;
my $session = shift;
+ my $adSpaceId = shift;
my $properties = shift;
- my $id = $session->db->setRow("adSpace","adSpaceId",{adSpaceId=>"new"});
+ my $id = $session->db->setRow("advertisement","adId",{adSpaceId=>$adSpaceId, adId=>"new"});
my $self = $class->new($session, $id);
$self->set($properties);
return $self;
@@ -76,8 +77,8 @@ Deletes this ad.
sub delete {
my $self = shift;
- my $storage = WebGUI::Storage::Image->new($self->session, $self->get("storageId"));
- $storage->delete;
+ my $storage = WebGUI::Storage::Image->get($self->session, $self->get("storageId"));
+ $storage->delete if defined $storage;
$self->session->db->deleteRow("advertisement","adId",$self->getId);
$self = undef;
}
@@ -186,10 +187,6 @@ A chunk of text, no longer than 255 characters that will be displayed in text ad
The id of the storage location that holds the image for an image style ad.
-=head4 filename
-
-The name of the file from the storage location to display for an image ad.
-
=head4 richMedia
A chunk of HTML that will be inserted into the page for rich media ads.
@@ -244,7 +241,6 @@ sub set {
$self->{_properties}{impressionsBought} = $properties->{impressionsBought} || $self->{_properties}{impressionsBought};
$self->{_properties}{url} = $properties->{url} || $self->{_properties}{url};
$self->{_properties}{adText} = $properties->{adText} || $self->{_properties}{adText};
- $self->{_properties}{filename} = $properties->{filename} || $self->{_properties}{filename};
$self->{_properties}{storageId} = $properties->{storageId} || $self->{_properties}{storageId};
$self->{_properties}{richMedia} = $properties->{richMedia} || $self->{_properties}{richMedia};
$self->{_properties}{ownerUserId} = $properties->{ownerUserId} || $self->{_properties}{ownerUserId} || "3";
@@ -257,10 +253,16 @@ sub set {
# prerender the ad for faster display
my $adSpace = WebGUI::AdSpace->new($self->session, $self->get("adSpaceId"));
if ($self->get("type") eq "text") {
- $self->{_properties}{renderedAd} = 'getId).'">get("height").'px; color: '.$self->get("textColor").'; background-color: '.$self->get("backgroundColor").'; border: 1px solid '.$self->get("borderColor").';">'.$self->get("title").'
'.$self->get("adText").'
';
+ $self->{_properties}{renderedAd} = 'getId)
+ .'">get("height").'px; color: '
+ .$self->get("textColor")
+ .'; background-color: '.$self->get("backgroundColor")
+ .'; border: 1px solid '.$self->get("borderColor").';">'
+ .$self->get("title").'
'.$self->get("adText").'
';
} elsif ($self->get("type") eq "image") {
- my $storage = WebGUI::Storage::Image->new($self->session, $self->get("storageId"));
- $self->{_properties}{renderedAd} = 'getId).'">get("height").'px;">
get("height").'px;">
.')
'.$i18n->get("macro code prompt").'
^AdSpace('.$adSpace->get("name").');
'
+ ."";
+ my $rs = $session->db->read("select adId, title from advertisement where adSpaceId=?",[$id]);
while (my ($adId, $title) = $rs->array) {
$ads .= $session->icon->delete("op=deleteAd;adSpaceId=".$id.";adId=".$adId, undef, $i18n->get("confirm ad delete"))
.$session->icon->edit("op=editAd;adSpaceId=".$id.";adId=".$adId)
.' '.$title.'
';
}
+ $ads .= "
";
}
$ac->render($f->print.$ads, $i18n->get("edit ad space"));
}
diff --git a/lib/WebGUI/i18n/English/AdSpace.pm b/lib/WebGUI/i18n/English/AdSpace.pm
index c235452f9..cb88c8f7d 100644
--- a/lib/WebGUI/i18n/English/AdSpace.pm
+++ b/lib/WebGUI/i18n/English/AdSpace.pm
@@ -2,6 +2,84 @@ package WebGUI::i18n::English::AdSpace;
our $I18N = {
+ 'macro code prompt' => {
+ message => q|Use this code to place this ad space:|,
+ lastUpdated => 0,
+ context => q|this is a label for the output of macro code that the user can use to place his/her ad space|
+ },
+
+ 'border color' => {
+ message => q|Border Color|,
+ lastUpdated => 0,
+ context => q|a form property in the ad editor|
+ },
+
+ 'border color help' => {
+ message => q|The hex value of the color of the border to be used around this text ad.|,
+ lastUpdated => 0,
+ context => q|help for a form property in the ad editor|
+ },
+
+ 'text color' => {
+ message => q|Text Color|,
+ lastUpdated => 0,
+ context => q|a form property in the ad editor|
+ },
+
+ 'text color help' => {
+ message => q|The hex value of the color of the text in this text ad.|,
+ lastUpdated => 0,
+ context => q|help for a form property in the ad editor|
+ },
+
+ 'background color' => {
+ message => q|Background Color|,
+ lastUpdated => 0,
+ context => q|a form property in the ad editor|
+ },
+
+ 'background color help' => {
+ message => q|The hex value of the color of the background in this text ad.|,
+ lastUpdated => 0,
+ context => q|help for a form property in the ad editor|
+ },
+
+ 'url' => {
+ message => q|URL|,
+ lastUpdated => 0,
+ context => q|a form property in the ad editor|
+ },
+
+ 'url help' => {
+ message => q|The URL that this ad will link to. Note that this won't be used for Rich Media ads.|,
+ lastUpdated => 0,
+ context => q|help for a form property in the ad editor|
+ },
+
+ 'image help' => {
+ message => q|The image file that will be displayed on each ad impression.|,
+ lastUpdated => 0,
+ context => q|help for a form property in the ad editor|
+ },
+
+ 'rich help' => {
+ message => q|Place the code here that will be used to generate the ad to be displayed.|,
+ lastUpdated => 0,
+ context => q|help for a form property in the ad editor|
+ },
+
+ 'priority' => {
+ message => q|Priority|,
+ lastUpdated => 0,
+ context => q|a form property in the ad editor|
+ },
+
+ 'priority help' => {
+ message => q|A scaling mechanism to determine how often an ad should be displayed. The lower this number the more often it will be displayed. This really has no affect low traffic sites. If ad A has a priority of 0 and ad B has a priority of 10, and the site averages about one impression per second then ad A will be displayed roughly 100 times more frequently than ad B. Note that since this property is a scaling mechanism, it is not an exact ratio. The heavier the traffic is on the site, the more impact priority has.|,
+ lastUpdated => 0,
+ context => q|help for a form property in the ad editor|
+ },
+
'ad text' => {
message => q|Ad Text|,
lastUpdated => 0,