From cbba45830694091856da7beb1d698a9eb5c7cf01 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Mon, 28 Nov 2005 17:31:23 +0000 Subject: [PATCH] a couple bug fixes --- lib/WebGUI/Asset/Template.pm | 42 +++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm index 5807eae83..1d3461b61 100644 --- a/lib/WebGUI/Asset/Template.pm +++ b/lib/WebGUI/Asset/Template.pm @@ -374,17 +374,21 @@ sub www_styleWizard { $f->submit; $output = $f->print; } elsif ($session{form}{step} == 3) { - my $storage = WebGUI::Storage::Image->get(WebGUI::FormProcessor::file("logo")); - my $logo = $self->addChild({ - className=>"WebGUI::Asset::File::Image", - title=>WebGUI::FormProcessor::text("heading")." Logo", - menuTitle=>WebGUI::FormProcessor::text("heading")." Logo", - url=>WebGUI::FormProcessor::text("heading")." Logo", - storageId=>$storage->getId, - filename=>@{$storage->getFiles}[0], - templateId=>"PBtmpl0000000000000088" - }); - $logo->generateThumbnail if ($logo->get("filename")); + my $storageId = WebGUI::FormProcessor::file("logo"); + my $logo; + if ($storageId) { + my $storage = WebGUI::Storage::Image->get(WebGUI::FormProcessor::file("logo")); + $logo = $self->addChild({ + className=>"WebGUI::Asset::File::Image", + title=>WebGUI::FormProcessor::text("heading")." Logo", + menuTitle=>WebGUI::FormProcessor::text("heading")." Logo", + url=>WebGUI::FormProcessor::text("heading")." Logo", + storageId=>$storage->getId, + filename=>@{$storage->getFiles}[0], + templateId=>"PBtmpl0000000000000088" + }); + $logo->generateThumbnail; + } my $style = ' @@ -405,7 +409,7 @@ my $style = ' .heading { background-color: '.WebGUI::FormProcessor::color("headingBackgroundColor").'; color: '.WebGUI::FormProcessor::color("headingForegroundColor").'; - font-size: 25px; + font-size: 30px; margin-left: 10%; margin-right: 10%; vertical-align: middle; @@ -415,19 +419,23 @@ my $style = ' float: left; text-align: center; } + .logo img { + border: 0px; + } .endFloat { clear: both; } .padding { padding: 5px; } - .content { + .bodyContent { background-color: '.WebGUI::FormProcessor::color("bodyBackgroundColor").'; color: '.WebGUI::FormProcessor::color("bodyForegroundColor").'; width: 55%; '; if ($session{form}{layout} == 1) { $style .= ' float: left; + height: 75%; margin-right: 10%; '; } else { @@ -470,7 +478,11 @@ if ($session{form}{layout} == 1) { ^AdminBar;
- +'; + if (defined $logo) { + $style .= ''; + } + $style .= ' '.WebGUI::FormProcessor::text("heading").'
@@ -478,7 +490,7 @@ if ($session{form}{layout} == 1) {
^AssetProxy('.($session{form}{layout} == 1 ? 'flexmenu' : 'toplevelmenuhorizontal').');
-
+
'; if ($session{form}{layout} == 1) {