From 468c5171cfff362395110628aba4a052301f43f6 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Sat, 4 Mar 2006 08:07:17 +0000 Subject: [PATCH] changed border= to style="border: for better xhtml compliance --- docs/changelog/6.x.x.txt | 1 + lib/WebGUI/Asset.pm | 22 ++++++++++----------- lib/WebGUI/Asset/File/Image.pm | 2 +- lib/WebGUI/Session/Icon.pm | 36 +++++++++++++++++----------------- 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 385eb5152..f595b880a 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -1,4 +1,5 @@ 6.99.0 + - Many changes for better XHTML compliance. - Refactored admin bar to be more dynamic. - Added version tags menu to admin bar. - Added a revisions list to the edit screen of assets, so that you can diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index 303aef3d6..a12d4d2a0 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -1026,11 +1026,11 @@ sub manageAssets { my $locked; my $edit; if ($child->isLocked) { - $locked = 'locked'; + $locked = 'locked'; $edit = "'getUrl("func=edit;proceed=manageAssets")."\">Edit | '+" if ($child->canEditIfLocked && $self->session->scratch->get("versionTag") eq $self->get("tagId")); } else { $edit = "'getUrl("func=edit;proceed=manageAssets")."\">Edit | '+"; - $locked = 'unlocked'; + $locked = 'unlocked'; } my $lockLink = ", 'getUrl("func=manageRevisions")."\">".$locked."'" unless ($self->session->setting->get("autoCommit")); $output .= "assetManager.AddLine('" @@ -1041,7 +1041,7 @@ sub manageAssets { ."',".$edit."contextMenu.draw()," .$child->getRank .",'getUrl("func=manageAssets")."\">".$title - ."','getIcon(1)."\" border=\"0\" alt=\"".$child->getName."\" /> ".$child->getName + ."','getIcon(1)."\" style=\"border: 0px;\" alt=\"".$child->getName."\" /> ".$child->getName ."','".$self->session->datetime->epochToHuman($child->get("revisionDate")) ."','".formatBytes($child->get("assetSize"))."'".$lockLink.");\n"; $output .= "assetManager.AddLineSortData('','','','".$title."','".$child->getName @@ -1066,21 +1066,21 @@ sub manageAssets {
'.$i18n->get(1083).''; foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets","assetContainers")}) { - $output .= ''.$link->{label}.' + $output .= ''.$link->{label}.' '.$link->{label}.' '; $output .= $self->session->icon->edit("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype}); $output .= '
'; } $output .= '
'; foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets")}) { - $output .= ''.$link->{label}.' + $output .= ''.$link->{label}.' '.$link->{label}.' '; $output .= $self->session->icon->edit("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype}); $output .= '
'; } $output .= '
'; foreach my $link (@{$self->getAssetAdderLinks("proceed=manageAssets","utilityAssets")}) { - $output .= ''.$link->{label}.' + $output .= ''.$link->{label}.' '.$link->{label}.' '; $output .= $self->session->icon->edit("func=edit;proceed=manageAssets",$link->{asset}->get("url")) if ($link->{isPrototype}); $output .= '
'; @@ -1090,7 +1090,7 @@ sub manageAssets { tie %options, 'Tie::IxHash'; my $hasClips = 0; foreach my $asset (@{$self->getAssetsInClipboard(1)}) { - $options{$asset->getId} = ''.$asset->getName.' '.$asset->getTitle; + $options{$asset->getId} = ''.$asset->getName.' '.$asset->getTitle; $hasClips = 1; } if ($hasClips) { @@ -1118,7 +1118,7 @@ sub manageAssets { my $hasPackages = 0; my $packages; foreach my $asset (@{$self->getPackageList}) { - $packages .= ''.$asset->getName.' + $packages .= ''.$asset->getName.' getId).'">'.$asset->getTitle.' ' .$self->session->icon->edit("func=edit;proceed=manageAssets",$asset->get("url")) .'
'; @@ -1188,11 +1188,11 @@ sub manageAssetsSearch { my $locked; my $edit; if ($child->isLocked) { - $locked = 'locked'; + $locked = 'locked'; $edit = "'getUrl("func=edit;proceed=manageAssets")."\">Edit | '+" if ($child->canEditIfLocked && $self->session->scratch->get("versionTag") eq $self->get("tagId")); } else { $edit = "'getUrl("func=edit;proceed=manageAssets")."\">Edit | '+"; - $locked = 'unlocked'; + $locked = 'unlocked'; } my $lockLink = ", 'getUrl("func=manageRevisions")."\">".$locked."'" unless ($self->session->setting->get("autoCommit")); $output .= "assetManager.AddLine('" @@ -1203,7 +1203,7 @@ sub manageAssetsSearch { ."',".$edit."contextMenu.draw()," .$child->getRank .",'getUrl("func=manageAssets&manage=1")."\">".$title - ."','getIcon(1)."\" border=\"0\" alt=\"".$child->getName."\" /> ".$child->getName + ."','getIcon(1)."\" style=\"border: 0px;\" alt=\"".$child->getName."\" /> ".$child->getName ."','".$self->session->datetime->epochToHuman($child->get("revisionDate")) ."','".formatBytes($child->get("assetSize"))."'".$lockLink.");\n"; $output .= "assetManager.AddLineSortData('','','','".$title."','".$child->getName diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm index 6b147067c..0765e1963 100644 --- a/lib/WebGUI/Asset/File/Image.pm +++ b/lib/WebGUI/Asset/File/Image.pm @@ -74,7 +74,7 @@ sub definition { }, parameters=>{ fieldType=>'textarea', - defaultValue=>'border="0"' + defaultValue=>'style="border: 0px;"' } } }); diff --git a/lib/WebGUI/Session/Icon.pm b/lib/WebGUI/Session/Icon.pm index 6b4ec924d..0e963b699 100644 --- a/lib/WebGUI/Session/Icon.pm +++ b/lib/WebGUI/Session/Icon.pm @@ -97,7 +97,7 @@ sub copy { my $pageURL = shift || $self->session->url->getRequestedUrl; my $i18n = WebGUI::International->new($self->session,'Icon'); my $output = ''; - $output .= ''.$i18n->get('Copy').''; + $output .= ''.$i18n->get('Copy').''; return $output; } @@ -123,7 +123,7 @@ sub cut { my $pageURL = shift || $self->session->url->getRequestedUrl; my $i18n = WebGUI::International->new($self->session,'Icon'); my $output = ''; - $output .= ''.$i18n->get('Cut').''; + $output .= ''.$i18n->get('Cut').''; return $output; } @@ -171,7 +171,7 @@ sub delete { } my $i18n = WebGUI::International->new($self->session,'Icon'); my $output = ''; - $output .= ''.$i18n->get('Delete').''; + $output .= ''.$i18n->get('Delete').''; return $output; } @@ -186,7 +186,7 @@ Generates an icon that can be used to drag content. sub drag { my $self = shift; my $i18n = WebGUI::International->new($self->session,'Icon'); - return ''.$i18n->get('Drag').''; + return ''.$i18n->get('Drag').''; } #------------------------------------------------------------------- @@ -211,7 +211,7 @@ sub edit { my $pageURL = shift || $self->session->url->getRequestedUrl; my $i18n = WebGUI::International->new($self->session,'Icon'); my $output = ''; - $output .= ''.$i18n->get('Edit').''; + $output .= ''.$i18n->get('Edit').''; return $output; } @@ -237,7 +237,7 @@ sub export { my $pageURL = shift || $self->session->url->getRequestedUrl; my $i18n = WebGUI::International->new($self->session,'Icon'); my $output = ''; - $output .= ''.$i18n->get('Export').''; + $output .= ''.$i18n->get('Export').''; return $output; } @@ -289,7 +289,7 @@ sub help { my ($output, $namespace); my $i18n = WebGUI::International->new($self->session,'Icon'); $output = ''.$i18n->get('Help').''; + '" target="_blank">'.$i18n->get('Help').''; rneturn $output; } @@ -315,7 +315,7 @@ sub locked { my $pageURL = shift || $self->session->url->getRequestedUrl; my $i18n = WebGUI::International->new($self->session,'Icon'); my $output = ''; - $output .= ''.$i18n->get('locked').''; + $output .= ''.$i18n->get('locked').''; return $output; } @@ -341,7 +341,7 @@ sub manage { my $pageURL = shift || $self->session->url->getRequestedUrl; my $i18n = WebGUI::International->new($self->session,'Icon'); my $output = ''; - $output .= ''.$i18n->get('Manage').''; + $output .= ''.$i18n->get('Manage').''; return $output; } @@ -367,7 +367,7 @@ sub moveBottom { my $pageURL = shift || $self->session->url->getRequestedUrl; my $i18n = WebGUI::International->new($self->session,'Icon'); my $output = ''; - $output .= ''.$i18n->get('Move To Bottom').''; + $output .= ''.$i18n->get('Move To Bottom').''; return $output; } @@ -393,7 +393,7 @@ sub moveDown { my $pageURL = shift || $self->session->url->getRequestedUrl; my $i18n = WebGUI::International->new($self->session,'Icon'); my $output = ''; - $output .= ''.$i18n->get('Move Down').''; + $output .= ''.$i18n->get('Move Down').''; return $output; } @@ -419,7 +419,7 @@ sub moveLeft { my $pageURL = shift || $self->session->url->getRequestedUrl; my $i18n = WebGUI::International->new($self->session,'Icon'); my $output = ''; - $output .= ''.$i18n->get('Move Left').''; + $output .= ''.$i18n->get('Move Left').''; return $output; } @@ -445,7 +445,7 @@ sub moveRight { my $pageURL = shift || $self->session->url->getRequestedUrl; my $i18n = WebGUI::International->new($self->session,'Icon'); my $output = ''; - $output .= ''.$i18n->get('Move Right').''; + $output .= ''.$i18n->get('Move Right').''; return $output; } @@ -471,7 +471,7 @@ sub moveTop { my $pageURL = shift || $self->session->url->getRequestedUrl; my $i18n = WebGUI::International->new($self->session,'Icon'); my $output = ''; - $output .= ''.$i18n->get('Move To Top').''; + $output .= ''.$i18n->get('Move To Top').''; return $output; } @@ -497,7 +497,7 @@ sub moveUp { my $pageURL = shift || $self->session->url->getRequestedUrl; my $i18n = WebGUI::International->new($self->session,'Icon'); my $output = ''; - $output .= ''.$i18n->get('Move Up').''; + $output .= ''.$i18n->get('Move Up').''; return $output; } @@ -543,7 +543,7 @@ sub paste { my $pageURL = shift || $self->session->url->getRequestedUrl; my $i18n = WebGUI::International->new($self->session,'Icon'); my $output = ''; - $output .= ''.$i18n->get('Paste').''; + $output .= ''.$i18n->get('Paste').''; return $output; } @@ -583,7 +583,7 @@ sub shortcut { my $pageURL = shift || $self->session->url->getRequestedUrl; my $i18n = WebGUI::International->new($self->session,'Icon'); my $output = ''; - $output .= ''.$i18n->get('Create Shortcut').''; + $output .= ''.$i18n->get('Create Shortcut').''; return $output; } @@ -609,7 +609,7 @@ sub view { my $pageURL = shift || $self->session->url->getRequestedUrl; my $i18n = WebGUI::International->new($self->session,'Icon'); my $output = ''; - $output .= ''.$i18n->get('View').''; + $output .= ''.$i18n->get('View').''; return $output; }