more changes for better xhtml compatibility

This commit is contained in:
JT Smith 2006-03-21 23:31:34 +00:00
parent 225140c8a5
commit 1efaec679a
5 changed files with 8 additions and 8 deletions

View file

@ -1075,21 +1075,21 @@ sub manageAssets {
</div> </div>
<div style="float: left; padding-right: 30px; font-size: 14px;width: 28%;"><fieldset><legend>'.$i18n->get(1083).'</legend>'; <div style="float: left; padding-right: 30px; font-size: 14px;width: 28%;"><fieldset><legend>'.$i18n->get(1083).'</legend>';
foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets","assetContainers")}) { foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets","assetContainers")}) {
$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" style="border: 0px;" /> $output .= '<p style="display:inline;vertical-align:middle;"><img src="'.$link->{'icon.small'}.'" alt="'.$link->{label}.'" style="border: 0px;vertical-align:middle;" /></p>
<a href="'.$link->{url}.'">'.$link->{label}.'</a> '; <a href="'.$link->{url}.'">'.$link->{label}.'</a> ';
$output .= $self->session->icon->edit("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype}); $output .= $self->session->icon->edit("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
$output .= '<br />'; $output .= '<br />';
} }
$output .= '<hr />'; $output .= '<hr />';
foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets")}) { foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets")}) {
$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" style="border: 0px;" /> $output .= '<p style="display:inline;vertical-align:middle;"><img src="'.$link->{'icon.small'}.'" alt="'.$link->{label}.'" style="border: 0px;vertical-align:middle;" /></p>
<a href="'.$link->{url}.'">'.$link->{label}.'</a> '; <a href="'.$link->{url}.'">'.$link->{label}.'</a> ';
$output .= $self->session->icon->edit("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype}); $output .= $self->session->icon->edit("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
$output .= '<br />'; $output .= '<br />';
} }
$output .= '<hr />'; $output .= '<hr />';
foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets","utilityAssets")}) { foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets","utilityAssets")}) {
$output .= '<img src="'.$link->{'icon.small'}.'" align="middle" alt="'.$link->{label}.'" style="border: 0px;" /> $output .= '<p style="display:inline;vertical-align:middle;"><img src="'.$link->{'icon.small'}.'" alt="'.$link->{label}.'" style="border: 0px;vertical-align:middle;" /></p>
<a href="'.$link->{url}.'">'.$link->{label}.'</a> '; <a href="'.$link->{url}.'">'.$link->{label}.'</a> ';
$output .= $self->session->icon->edit("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype}); $output .= $self->session->icon->edit("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype});
$output .= '<br />'; $output .= '<br />';
@ -1127,7 +1127,7 @@ sub manageAssets {
my $hasPackages = 0; my $hasPackages = 0;
my $packages; my $packages;
foreach my $asset (@{$self->getPackageList}) { foreach my $asset (@{$self->getPackageList}) {
$packages .= '<img src="'.$asset->getIcon(1).'" align="middle" alt="'.$asset->getName.'" style="border: 0px;" /> $packages .= '<p style="display:inline;vertical-align:middle;"><img src="'.$asset->getIcon(1).'" alt="'.$asset->getName.'" style="vertical-align:middle;border: 0px;" /></p>
<a href="'.$self->getUrl("func=deployPackage;assetId=".$asset->getId).'">'.$asset->getTitle.'</a> ' <a href="'.$self->getUrl("func=deployPackage;assetId=".$asset->getId).'">'.$asset->getTitle.'</a> '
.$self->session->icon->edit("func=edit;proceed=manageAssets",$asset->get("url")) .$self->session->icon->edit("func=edit;proceed=manageAssets",$asset->get("url"))
.'<br />'; .'<br />';

View file

@ -137,7 +137,7 @@ sub getEditForm {
$tabform->getTab("properties")->readOnly( $tabform->getTab("properties")->readOnly(
-label=>$i18n->get('current file'), -label=>$i18n->get('current file'),
-hoverHelp=>$i18n->get('current file description', 'Asset_File'), -hoverHelp=>$i18n->get('current file description', 'Asset_File'),
-value=>'<a href="'.$self->getFileUrl.'"><img src="'.$self->getFileIconUrl.'" alt="'.$self->get("filename").'" style="border-style:none;" align="middle" /> '.$self->get("filename").'</a>' -value=>'<p style="display:inline;vertical-align:middle;"><a href="'.$self->getFileUrl.'"><img src="'.$self->getFileIconUrl.'" alt="'.$self->get("filename").'" style="border-style:none;vertical-align:middle;" /> '.$self->get("filename").'</a></p>'
); );
} }

View file

@ -341,7 +341,7 @@ $self->session->style->setLink($self->session->config->get("extrasURL").'/assetM
value=>$child->getId value=>$child->getId
}) })
."','<a href=\"".$child->getUrl("func=manageAssets")."\">".$title ."','<a href=\"".$child->getUrl("func=manageAssets")."\">".$title
."</a>','<img src=\"".$child->getIcon(1)."\" style=\"border-style:none;\" alt=\"".$child->getName."\" /> ".$child->getName ."</a>','<p style=\"display:inline;vertical-align:middle;\"><img src=\"".$child->getIcon(1)."\" style=\"border-style:none;vertical-align:middle;\" alt=\"".$child->getName."\" /></p> ".$child->getName
."','".$self->session->datetime->epochToHuman($child->get("revisionDate")) ."','".$self->session->datetime->epochToHuman($child->get("revisionDate"))
."','".formatBytes($child->get("assetSize"))."');\n"; ."','".formatBytes($child->get("assetSize"))."');\n";
$output .= "assetManager.AddLineSortData('','".$title."','".$child->getName $output .= "assetManager.AddLineSortData('','".$title."','".$child->getName

View file

@ -221,7 +221,7 @@ sub www_manageTrash {
value=>$child->getId value=>$child->getId
}) })
."','<a href=\"".$child->getUrl("func=manageAssets")."\">".$title ."','<a href=\"".$child->getUrl("func=manageAssets")."\">".$title
."</a>','<img src=\"".$child->getIcon(1)."\" style=\"border-style:none;\" alt=\"".$child->getName."\" /> ".$child->getName ."</a>','<p style=\"display:inline;vertical-align:middle;\"><img src=\"".$child->getIcon(1)."\" style=\"vertical-align:middle;border-style:none;\" alt=\"".$child->getName."\" /></p> ".$child->getName
."','".$self->session->datetime->epochToHuman($child->get("revisionDate")) ."','".$self->session->datetime->epochToHuman($child->get("revisionDate"))
."','".formatBytes($child->get("assetSize"))."');\n"; ."','".formatBytes($child->get("assetSize"))."');\n";
$output .= "assetManager.AddLineSortData('','".$title."','".$child->getName $output .= "assetManager.AddLineSortData('','".$title."','".$child->getName

View file

@ -97,7 +97,7 @@ sub toHtml {
$self->set("size", 6); $self->set("size", 6);
$self->set("maxlength", 6); $self->set("maxlength", 6);
$self->session->scratch->set("captcha_".$self->get("name"), $challenge); $self->session->scratch->set("captcha_".$self->get("name"), $challenge);
$self->set("subtext", '<img src="'.$storage->getUrl($filename).'" style="border-style:none;" alt="captcha" align="middle" />'.$self->get("subtext")); $self->set("subtext", '<p style="display:inline;vertical-align:middle;"><img src="'.$storage->getUrl($filename).'" style="border-style:none;vertical-align:middle;" alt="captcha" /></p>'.$self->get("subtext"));
return $self->SUPER::toHtml; return $self->SUPER::toHtml;
} }