oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

a couple bug fixes

Browse source
This commit is contained in:
JT Smith 2005-11-28 17:31:23 +00:00
parent ca3e0b2503
commit cbba458306
1 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

42
lib/WebGUI/Asset/Template.pm
View file

@ -374,17 +374,21 @@ sub www_styleWizard {
$f->submit; $f->submit;
$output = $f->print; $output = $f->print;
} elsif ($session{form}{step} == 3) { } elsif ($session{form}{step} == 3) {
my $storage = WebGUI::Storage::Image->get(WebGUI::FormProcessor::file("logo")); my $storageId = WebGUI::FormProcessor::file("logo");
my $logo = $self->addChild({ my $logo;
className=>"WebGUI::Asset::File::Image", if ($storageId) {
title=>WebGUI::FormProcessor::text("heading")." Logo", my $storage = WebGUI::Storage::Image->get(WebGUI::FormProcessor::file("logo"));
menuTitle=>WebGUI::FormProcessor::text("heading")." Logo", $logo = $self->addChild({
url=>WebGUI::FormProcessor::text("heading")." Logo", className=>"WebGUI::Asset::File::Image",
storageId=>$storage->getId, title=>WebGUI::FormProcessor::text("heading")." Logo",
filename=>@{$storage->getFiles}[0], menuTitle=>WebGUI::FormProcessor::text("heading")." Logo",
templateId=>"PBtmpl0000000000000088" url=>WebGUI::FormProcessor::text("heading")." Logo",
}); storageId=>$storage->getId,
$logo->generateThumbnail if ($logo->get("filename")); filename=>@{$storage->getFiles}[0],
templateId=>"PBtmpl0000000000000088"
});
$logo->generateThumbnail;
}
my $style = '<html> my $style = '<html>
<head> <head>
<tmpl_var head.tags> <tmpl_var head.tags>
@ -405,7 +409,7 @@ my $style = '<html>
.heading { .heading {
background-color: '.WebGUI::FormProcessor::color("headingBackgroundColor").'; background-color: '.WebGUI::FormProcessor::color("headingBackgroundColor").';
color: '.WebGUI::FormProcessor::color("headingForegroundColor").'; color: '.WebGUI::FormProcessor::color("headingForegroundColor").';
font-size: 25px; font-size: 30px;
margin-left: 10%; margin-left: 10%;
margin-right: 10%; margin-right: 10%;
vertical-align: middle; vertical-align: middle;
@ -415,19 +419,23 @@ my $style = '<html>
float: left; float: left;
text-align: center; text-align: center;
} }
.logo img {
border: 0px;
}
.endFloat { .endFloat {
clear: both; clear: both;
} }
.padding { .padding {
padding: 5px; padding: 5px;
} }
.content { .bodyContent {
background-color: '.WebGUI::FormProcessor::color("bodyBackgroundColor").'; background-color: '.WebGUI::FormProcessor::color("bodyBackgroundColor").';
color: '.WebGUI::FormProcessor::color("bodyForegroundColor").'; color: '.WebGUI::FormProcessor::color("bodyForegroundColor").';
width: 55%; '; width: 55%; ';
if ($session{form}{layout} == 1) { if ($session{form}{layout} == 1) {
$style .= ' $style .= '
float: left; float: left;
height: 75%;
margin-right: 10%; margin-right: 10%;
'; ';
} else { } else {
@ -470,7 +478,11 @@ if ($session{form}{layout} == 1) {
^AdminBar; ^AdminBar;
<div class="heading"> <div class="heading">
<div class="padding"> <div class="padding">
<div class="logo">^AssetProxy('.$logo->get("url").');</div> ';
if (defined $logo) {
$style .= '<div class="logo"><a href="^H(linkonly);">^AssetProxy('.$logo->get("url").');</a></div>';
}
$style .= '
'.WebGUI::FormProcessor::text("heading").' '.WebGUI::FormProcessor::text("heading").'
<div class="endFloat"></div> <div class="endFloat"></div>
</div> </div>
@ -478,7 +490,7 @@ if ($session{form}{layout} == 1) {
<div class="menu"> <div class="menu">
<div class="padding">^AssetProxy('.($session{form}{layout} == 1 ? 'flexmenu' : 'toplevelmenuhorizontal').');</div> <div class="padding">^AssetProxy('.($session{form}{layout} == 1 ? 'flexmenu' : 'toplevelmenuhorizontal').');</div>
</div> </div>
<div class="content"> <div class="bodyContent">
<div class="padding"><tmpl_var body.content></div> <div class="padding"><tmpl_var body.content></div>
</div>'; </div>';
if ($session{form}{layout} == 1) { if ($session{form}{layout} == 1) {