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

Fixed a few XHTML 1.0 related bugs

Browse source
This commit is contained in:
Wouter van Oijen 2005-09-01 13:11:28 +00:00
parent ad6b484f0e
commit 01ad8fd12c
7 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/WebGUI/Operation/Commerce.pm
View file

@ -433,7 +433,7 @@ sub www_editCommerceSettings {
# payment plugin # payment plugin
if (%paymentPlugins) { if (%paymentPlugins) {
$tabform->getTab('payment')->raw('<script language="JavaScript" type="text/javascript"> var activePayment="'.$paymentPlugin.'"; </script>'); $tabform->getTab('payment')->raw('<script type="text/javascript"> var activePayment="'.$paymentPlugin.'"; </script>');
$tabform->getTab("payment")->selectList( $tabform->getTab("payment")->selectList(
-name => 'commercePaymentPlugin', -name => 'commercePaymentPlugin',
-options => \%paymentPlugins, -options => \%paymentPlugins,
@ -442,7 +442,7 @@ sub www_editCommerceSettings {
-extras => 'onchange="activePayment=operateHidden(this.options[this.selectedIndex].value,activePayment)"' -extras => 'onchange="activePayment=operateHidden(this.options[this.selectedIndex].value,activePayment)"'
); );
$jscript = '<script language="JavaScript" type="text/javascript">'; $jscript = '<script type="text/javascript">';
foreach $currentPlugin (@paymentPlugins) { foreach $currentPlugin (@paymentPlugins) {
$tabform->getTab('payment')->raw('<tr id="'.$currentPlugin->namespace.'"><td colspan="2" width="100%">'. $tabform->getTab('payment')->raw('<tr id="'.$currentPlugin->namespace.'"><td colspan="2" width="100%">'.
'<table border=0 cellspacing=0 cellpadding=0 width="100%">'. '<table border=0 cellspacing=0 cellpadding=0 width="100%">'.
@ -474,7 +474,7 @@ sub www_editCommerceSettings {
# shipping plugin # shipping plugin
if (%shippingPlugins) { if (%shippingPlugins) {
$tabform->getTab('shipping')->raw('<script language="JavaScript" type="text/javascript"> var activeShipping="'.$shippingPlugin.'"; </script>'); $tabform->getTab('shipping')->raw('<script type="text/javascript"> var activeShipping="'.$shippingPlugin.'"; </script>');
$tabform->getTab('shipping')->selectList( $tabform->getTab('shipping')->selectList(
-name => 'commerceShippingPlugin', -name => 'commerceShippingPlugin',
-options=> \%shippingPlugins, -options=> \%shippingPlugins,
@ -483,7 +483,7 @@ sub www_editCommerceSettings {
-extras => 'onchange="activeShipping=operateHidden(this.options[this.selectedIndex].value,activeShipping)"' -extras => 'onchange="activeShipping=operateHidden(this.options[this.selectedIndex].value,activeShipping)"'
); );
$jscript = '<script language="JavaScript" type="text/javascript">'; $jscript = '<script type="text/javascript">';
foreach $currentPlugin (@shippingPlugins) { foreach $currentPlugin (@shippingPlugins) {
$tabform->getTab('shipping')->raw('<tr id="'.$currentPlugin->namespace.'"><td colspan="2" width="100%">'. $tabform->getTab('shipping')->raw('<tr id="'.$currentPlugin->namespace.'"><td colspan="2" width="100%">'.
'<table border=0 cellspacing=0 cellpadding=0 width="100%">'. '<table border=0 cellspacing=0 cellpadding=0 width="100%">'.
@ -498,7 +498,7 @@ sub www_editCommerceSettings {
$tabform->submit; $tabform->submit;
WebGUI::Style::setScript($session{config}{extrasURL}.'/swapLayers.js',{language=>"Javascript"}); WebGUI::Style::setScript($session{config}{extrasURL}.'/swapLayers.js',{type=>"text/javascript"});
return _submenu($tabform->print, 'edit commerce settings title', 'commerce manage'); return _submenu($tabform->print, 'edit commerce settings title', 'commerce manage');
} }

4
lib/WebGUI/Operation/FormHelpers.pm
View file

@ -67,7 +67,7 @@ sub www_richEditPageTree {
WebGUI::Style::setScript($session{config}{extrasURL}."/tinymce/jscripts/tiny_mce/tiny_mce_popup.js",{type=>"text/javascript"}); WebGUI::Style::setScript($session{config}{extrasURL}."/tinymce/jscripts/tiny_mce/tiny_mce_popup.js",{type=>"text/javascript"});
my $output = '<fieldset><legend>Insert A Link</legend> my $output = '<fieldset><legend>Insert A Link</legend>
<fieldset><legend>Link Settings</legend>'.$f->print.'</fieldset> <fieldset><legend>Link Settings</legend>'.$f->print.'</fieldset>
<script language="javascript"> <script type="text/javascript">
function createLink() { function createLink() {
if (window.opener) { if (window.opener) {
if (document.getElementById("url_formId").value == "") { if (document.getElementById("url_formId").value == "") {
@ -131,7 +131,7 @@ sub www_richEditViewThumbnail {
$output .= '<br />'; $output .= '<br />';
$output .= $image->get("filename"); $output .= $image->get("filename");
$output .= '</div>'; $output .= '</div>';
$output .= '<script type="text/javascript" language="javascript">'; $output .= '<script type="text/javascript">';
$output .= "\nvar src = '".$image->getFileUrl."';\n"; $output .= "\nvar src = '".$image->getFileUrl."';\n";
$output .= "if(src.length > 0) { $output .= "if(src.length > 0) {
var manager=window.parent; var manager=window.parent;

18
lib/WebGUI/Operation/ProductManager.pm
View file

@ -159,7 +159,7 @@ sub www_editProductSave {
push(@error, $i18n->get('edit product weight error')) unless (defined $session{form}{weight} && $session{form}{price} =~ /^\d+(\.\d+)?$/); push(@error, $i18n->get('edit product weight error')) unless (defined $session{form}{weight} && $session{form}{price} =~ /^\d+(\.\d+)?$/);
push(@error, $i18n->get('edit product sku error')) unless ($session{form}{sku}); push(@error, $i18n->get('edit product sku error')) unless ($session{form}{sku});
return '<ul><li>'.join('</li><li>', @error).'</li></ul><br>'.WebGUI::Operation::execute('editProduct') if (@error); return '<ul><li>'.join('</li><li>', @error).'</li></ul><br />'.WebGUI::Operation::execute('editProduct') if (@error);
$productId = $session{form}{productId}; $productId = $session{form}{productId};
$product = WebGUI::Product->new($productId); $product = WebGUI::Product->new($productId);
@ -335,7 +335,7 @@ sub www_editProductParameterOptionSave {
push (@error, $i18n->get('edit option value error')) unless ($session{form}{value}); push (@error, $i18n->get('edit option value error')) unless ($session{form}{value});
push (@error, $i18n->get('edit option parameterId error')) unless ($session{form}{parameterId}); push (@error, $i18n->get('edit option parameterId error')) unless ($session{form}{parameterId});
return '<ul><li>'.join('</li><li>', @error).'</li></ul><br>'.WebGUI::Operation::execute('editProduct') if (@error); return '<ul><li>'.join('</li><li>', @error).'</li></ul><br />'.WebGUI::Operation::execute('editProduct') if (@error);
$product = WebGUI::Product->getByParameterId($session{form}{parameterId}); $product = WebGUI::Product->getByParameterId($session{form}{parameterId});
$optionId = $session{form}{optionId}; $optionId = $session{form}{optionId};
@ -425,13 +425,13 @@ sub www_editSkuTemplate {
$productId = $session{form}{productId}; $productId = $session{form}{productId};
$product = WebGUI::Product->new($productId); $product = WebGUI::Product->new($productId);
$output .= "Available are: <br>\n"; $output .= "Available are: <br />\n";
$output .= "<ul><li>base</li>\n"; $output .= "<ul><li>base</li>\n";
foreach (@{$product->getParameter}) { foreach (@{$product->getParameter}) {
($name = $_->{name}) =~ s/[ ><]/\./g; ($name = $_->{name}) =~ s/[ ><]/\./g;
$output .= "<li>param.".$name."</li>\n"; $output .= "<li>param.".$name."</li>\n";
} }
$output .= "</ul><br>"; $output .= "</ul><br />";
$f = WebGUI::HTMLForm->new; $f = WebGUI::HTMLForm->new;
$f->hidden( $f->hidden(
@ -599,21 +599,21 @@ sub www_manageProduct {
$output .= "<h2>Parameters</h2>"; $output .= "<h2>Parameters</h2>";
$output .= '<a href="'.WebGUI::URL::page('op=editProductParameter;parameterId=new;productId='.$product->get('productId')).'">'. $output .= '<a href="'.WebGUI::URL::page('op=editProductParameter;parameterId=new;productId='.$product->get('productId')).'">'.
$i18n->get('add parameter').'</a><br>'; $i18n->get('add parameter').'</a><br />';
foreach $parameter (@{$product->getParameter}) { foreach $parameter (@{$product->getParameter}) {
$output .= deleteIcon('op=deleteProductParameter;parameterId='.$parameter->{parameterId}). $output .= deleteIcon('op=deleteProductParameter;parameterId='.$parameter->{parameterId}).
editIcon('op=editProductParameter;parameterId='.$parameter->{parameterId}); editIcon('op=editProductParameter;parameterId='.$parameter->{parameterId});
$output .= '<span style="margin-left: 10px"><b>'.$parameter->{name}.'</b></span><br>'; $output .= '<span style="margin-left: 10px"><b>'.$parameter->{name}.'</b></span><br />';
$output .= '<a style="margin-left: 20px" href="'. $output .= '<a style="margin-left: 20px" href="'.
WebGUI::URL::page('op=editProductParameterOption;optionId=new;parameterId='.$parameter->{parameterId}).'">'. WebGUI::URL::page('op=editProductParameterOption;optionId=new;parameterId='.$parameter->{parameterId}).'">'.
$i18n->get('add option').'</a><br>'; $i18n->get('add option').'</a><br />';
foreach $optionId (@{$parameter->{options}}) { foreach $optionId (@{$parameter->{options}}) {
$option = $product->getOption($optionId); $option = $product->getOption($optionId);
$output .= '<span style="margin-left: 20px">'. $output .= '<span style="margin-left: 20px">'.
deleteIcon('op=deleteProductParameterOption;optionId='.$option->{optionId}). deleteIcon('op=deleteProductParameterOption;optionId='.$option->{optionId}).
editIcon('op=editProductParameterOption;parameterId='.$parameter->{parameterId}.';optionId='.$option->{optionId}).$option->{value}.'</span><br>'; editIcon('op=editProductParameterOption;parameterId='.$parameter->{parameterId}.';optionId='.$option->{optionId}).$option->{value}.'</span><br />';
} }
$output .= '<br>'; $output .= '<br />';
} }
return _submenu($output, 'manage product', 'manage product', 'ProductManager'); return _submenu($output, 'manage product', 'manage product', 'ProductManager');

4
lib/WebGUI/Operation/ProfileSettings.pm
View file

@ -301,7 +301,7 @@ sub www_editProfileSettings {
$output .= moveDownIcon('op=moveProfileCategoryDown;cid='.$category{profileCategoryId}); $output .= moveDownIcon('op=moveProfileCategoryDown;cid='.$category{profileCategoryId});
$output .= ' <b>'; $output .= ' <b>';
$output .= WebGUI::Operation::Shared::secureEval($category{categoryName}); $output .= WebGUI::Operation::Shared::secureEval($category{categoryName});
$output .= '</b><br>'; $output .= '</b><br />';
$b = WebGUI::SQL->read("select * from userProfileField where $b = WebGUI::SQL->read("select * from userProfileField where
profileCategoryId=".quote($category{profileCategoryId})." order by sequenceNumber"); profileCategoryId=".quote($category{profileCategoryId})." order by sequenceNumber");
while (%field = $b->hash) { while (%field = $b->hash) {
@ -312,7 +312,7 @@ sub www_editProfileSettings {
$output .= moveDownIcon('op=moveProfileFieldDown;fid='.$field{fieldName}); $output .= moveDownIcon('op=moveProfileFieldDown;fid='.$field{fieldName});
$output .= ' '; $output .= ' ';
$output .= WebGUI::Operation::Shared::secureEval($field{fieldLabel}); $output .= WebGUI::Operation::Shared::secureEval($field{fieldLabel});
$output .= '<br>'; $output .= '<br />';
} }
$b->finish; $b->finish;
} }

6
lib/WebGUI/Operation/Settings.pm
View file

@ -229,8 +229,8 @@ sub www_editSettings {
-extras=>' onChange="alert(\''.$i18n->get("Illegal Warning").'\')" ' -extras=>' onChange="alert(\''.$i18n->get("Illegal Warning").'\')" '
); );
# auth settings # auth settings
WebGUI::Style::setScript($session{config}{extrasURL}."/swapLayers.js",{language=>"Javascript"}); WebGUI::Style::setScript($session{config}{extrasURL}."/swapLayers.js",{type=>"text/javascript"});
$tabform->getTab("auth")->raw('<script language="JavaScript" > var active="'.$session{setting}{authMethod}.'"; </script>'); $tabform->getTab("auth")->raw('<script type="text/javascript" > var active="'.$session{setting}{authMethod}.'"; </script>');
my $options; my $options;
foreach (@{$session{config}{authMethods}}) { foreach (@{$session{config}{authMethods}}) {
$options->{$_} = $_; $options->{$_} = $_;
@ -242,7 +242,7 @@ sub www_editSettings {
-value=>[$session{setting}{authMethod}], -value=>[$session{setting}{authMethod}],
-extras=>"onChange=\"active=operateHidden(this.options[this.selectedIndex].value,active)\"" -extras=>"onChange=\"active=operateHidden(this.options[this.selectedIndex].value,active)\""
); );
my $jscript = '<script language="JavaScript">'; my $jscript = '<script type="text/javascript">';
foreach (@{$session{config}{authMethods}}) { foreach (@{$session{config}{authMethods}}) {
my $authInstance = WebGUI::Operation::Auth::getInstance($_,1); my $authInstance = WebGUI::Operation::Auth::getInstance($_,1);
$tabform->getTab("auth")->raw('<tr id="'.$_.'"><td colspan="2" width="100%"><table border=0 cellspacing=0 cellpadding=0 width="100%">'.$authInstance->editUserSettingsForm.'<tr><td width="304">&nbsp;</td><td width="496">&nbsp;</td></tr></table></td></tr>'); $tabform->getTab("auth")->raw('<tr id="'.$_.'"><td colspan="2" width="100%"><table border=0 cellspacing=0 cellpadding=0 width="100%">'.$authInstance->editUserSettingsForm.'<tr><td width="304">&nbsp;</td><td width="496">&nbsp;</td></tr></table></td></tr>');

4
lib/WebGUI/Operation/Subscription.pm
View file

@ -352,9 +352,9 @@ sub www_listSubscriptionCodes {
$codes = $p->getPageData; $codes = $p->getPageData;
$output .= '<br>'.$delete.'<br>' if ($delete); $output .= '<br />'.$delete.'<br />' if ($delete);
$output .= $p->getBarTraditional($session{form}{pn}); $output .= $p->getBarTraditional($session{form}{pn});
$output .= '<br>'; $output .= '<br />';
$output .= '<table border="1" cellpadding="5" cellspacing="0" align="center">'; $output .= '<table border="1" cellpadding="5" cellspacing="0" align="center">';
$output .= '<tr>'; $output .= '<tr>';
$output .= '<th>'.$i18n->get('batchId').'</th><th>'.$i18n->get('code').'</th><th>'.$i18n->get('creation date'). $output .= '<th>'.$i18n->get('batchId').'</th><th>'.$i18n->get('code').'</th><th>'.$i18n->get('creation date').

6
lib/WebGUI/Operation/User.pm
View file

@ -225,8 +225,8 @@ sub www_editUser {
my $tabform = WebGUI::TabForm->new(\%tabs); my $tabform = WebGUI::TabForm->new(\%tabs);
$tabform->formHeader({extras=>'autocomplete="off"'}); $tabform->formHeader({extras=>'autocomplete="off"'});
my $u = WebGUI::User->new(($session{form}{uid} eq 'new') ? '' : $session{form}{uid}); my $u = WebGUI::User->new(($session{form}{uid} eq 'new') ? '' : $session{form}{uid});
WebGUI::Style::setScript($session{config}{extrasURL}."/swapLayers.js", {language=>"JavaScript"}); WebGUI::Style::setScript($session{config}{extrasURL}."/swapLayers.js", {type=>"text/javascript"});
$tabform->getTab("account")->raw('<script language="JavaScript" > var active="'.$u->authMethod.'"; </script>'); $tabform->getTab("account")->raw('<script type="text/javascript" > var active="'.$u->authMethod.'"; </script>');
$tabform->hidden({name=>"op",value=>"editUserSave"}); $tabform->hidden({name=>"op",value=>"editUserSave"});
$tabform->hidden({name=>"uid",value=>$session{form}{uid}}); $tabform->hidden({name=>"uid",value=>$session{form}{uid}});
$tabform->getTab("account")->raw('<tr><td width="170">&nbsp;</td><td>&nbsp;</td></tr>'); $tabform->getTab("account")->raw('<tr><td width="170">&nbsp;</td><td>&nbsp;</td></tr>');
@ -270,7 +270,7 @@ sub www_editUser {
-value=>[$u->authMethod], -value=>[$u->authMethod],
-extras=>"onChange=\"active=operateHidden(this.options[this.selectedIndex].value,active)\"" -extras=>"onChange=\"active=operateHidden(this.options[this.selectedIndex].value,active)\""
); );
my $jscript = '<script language="JavaScript">'; my $jscript = '<script type="text/javascript">';
foreach (@{$session{config}{authMethods}}) { foreach (@{$session{config}{authMethods}}) {
my $authInstance = WebGUI::Operation::Auth::getInstance($_,$u->userId); my $authInstance = WebGUI::Operation::Auth::getInstance($_,$u->userId);
$tabform->getTab("account")->raw('<tr id="'.$_.'"><td colspan="2" align="center"><table>'.$authInstance->editUserForm.'<tr><td width="170">&nbsp;</td><td>&nbsp;</td></tr></table></td></tr>'); $tabform->getTab("account")->raw('<tr id="'.$_.'"><td colspan="2" align="center"><table>'.$authInstance->editUserForm.'<tr><td width="170">&nbsp;</td><td>&nbsp;</td></tr></table></td></tr>');