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

- Fixed broken image in asset manager.

Browse source 
- Fixed a few XHTML 1.0 related bugs.
This commit is contained in:
Wouter van Oijen 2005-09-01 12:05:13 +00:00
parent 748fddb85b
commit 060f63d01b
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/WebGUI/Asset.pm
View file

@ -693,6 +693,7 @@ sub getIcon {
my $small = shift; my $small = shift;
my $definition = $self->definition; my $definition = $self->definition;
my $icon = $definition->[0]{icon} || "assets.gif"; my $icon = $definition->[0]{icon} || "assets.gif";
return $session{config}{extrasURL}."/adminConsole/assets.gif" if ($icon eq "assets.gif");
return $session{config}{extrasURL}.'/assets/small/'.$icon if ($small); return $session{config}{extrasURL}.'/assets/small/'.$icon if ($small);
return $session{config}{extrasURL}.'/assets/'.$icon; return $session{config}{extrasURL}.'/assets/'.$icon;
} }
@ -837,7 +838,7 @@ sub getToolbar {
$toolbar .= exportIcon('func=export',$self->get("url")) if defined ($session{config}{exportPath}); $toolbar .= exportIcon('func=export',$self->get("url")) if defined ($session{config}{exportPath});
WebGUI::Style::setLink($session{config}{extrasURL}.'/contextMenu/contextMenu.css', {rel=>"stylesheet",type=>"text/css"}); WebGUI::Style::setLink($session{config}{extrasURL}.'/contextMenu/contextMenu.css', {rel=>"stylesheet",type=>"text/css"});
WebGUI::Style::setScript($session{config}{extrasURL}.'/contextMenu/contextMenu.js', {type=>"text/javascript"}); WebGUI::Style::setScript($session{config}{extrasURL}.'/contextMenu/contextMenu.js', {type=>"text/javascript"});
return '<script type="text/javascript" language="javascript"> return '<script type="text/javascript">
var contextMenu = new contextMenu_createWithImage("'.$self->getIcon(1).'","'.$self->getId.'","'.$self->getName.'"); var contextMenu = new contextMenu_createWithImage("'.$self->getIcon(1).'","'.$self->getId.'","'.$self->getName.'");
contextMenu.addLink("'.$self->getUrl("func=editBranch").'","'.$i18n->get("edit branch").'"); contextMenu.addLink("'.$self->getUrl("func=editBranch").'","'.$i18n->get("edit branch").'");
contextMenu.addLink("'.$self->getUrl("func=promote").'","'.$i18n->get("promote").'"); contextMenu.addLink("'.$self->getUrl("func=promote").'","'.$i18n->get("promote").'");
@ -1455,7 +1456,7 @@ sub www_manageAssets {
} }
my $output = '<div class="am-crumbtrail">'.join(" > ",@crumbtrail).'</div>'; my $output = '<div class="am-crumbtrail">'.join(" > ",@crumbtrail).'</div>';
$output .= " $output .= "
<script type=\"text/javascript\" language=\"javascript\"> <script type=\"text/javascript\">
var assetManager = new AssetManager(); var assetManager = new AssetManager();
assetManager.AddColumn('".WebGUI::Form::checkbox({extras=>'onchange="toggleAssetListSelectAll(this.form);"'})."','','center','form'); assetManager.AddColumn('".WebGUI::Form::checkbox({extras=>'onchange="toggleAssetListSelectAll(this.form);"'})."','','center','form');
assetManager.AddColumn('&nbsp;','','center',''); assetManager.AddColumn('&nbsp;','','center','');
@ -1479,9 +1480,9 @@ sub www_manageAssets {
my $edit; my $edit;
if ($child->isLocked) { if ($child->isLocked) {
$locked = '<img src="'.$session{config}{extrasURL}.'/assetManager/locked.gif" alt="locked" border="0" />'; $locked = '<img src="'.$session{config}{extrasURL}.'/assetManager/locked.gif" alt="locked" border="0" />';
$edit = "'<a href=\"".$child->getUrl("func=edit;proceed=manageAssets")."\">Edit</a> | '+" if ($child->canEditIfLocked && $session{scratch}{versionTag} eq $self->get("tagId")); $edit = "'<a href=\"".$child->getUrl("func=edit;proceed=manageAssets")."\">Edit<\\/a> | '+" if ($child->canEditIfLocked && $session{scratch}{versionTag} eq $self->get("tagId"));
} else { } else {
$edit = "'<a href=\"".$child->getUrl("func=edit;proceed=manageAssets")."\">Edit</a> | '+"; $edit = "'<a href=\"".$child->getUrl("func=edit;proceed=manageAssets")."\">Edit<\\/a> | '+";
$locked = '<img src="'.$session{config}{extrasURL}.'/assetManager/unlocked.gif" alt="unlocked" border="0" />'; $locked = '<img src="'.$session{config}{extrasURL}.'/assetManager/unlocked.gif" alt="unlocked" border="0" />';
} }
$output .= "assetManager.AddLine('" $output .= "assetManager.AddLine('"
@ -1492,9 +1493,9 @@ sub www_manageAssets {
."',".$edit."contextMenu.draw()," ."',".$edit."contextMenu.draw(),"
.$child->getRank .$child->getRank
.",'<a href=\"".$child->getUrl("func=manageAssets")."\">".$title .",'<a href=\"".$child->getUrl("func=manageAssets")."\">".$title
."</a>','<img src=\"".$child->getIcon(1)."\" border=\"0\" alt=\"".$child->getName."\" /> ".$child->getName ."<\\/a>','<img src=\"".$child->getIcon(1)."\" border=\"0\" alt=\"".$child->getName."\" /> ".$child->getName
."','".WebGUI::DateTime::epochToHuman($child->get("revisionDate")) ."','".WebGUI::DateTime::epochToHuman($child->get("revisionDate"))
."','".formatBytes($child->get("assetSize"))."','<a href=\"".$child->getUrl("func=manageRevisions")."\">".$locked."</a>');\n"; ."','".formatBytes($child->get("assetSize"))."','<a href=\"".$child->getUrl("func=manageRevisions")."\">".$locked."<\\/a>');\n";
$output .= "assetManager.AddLineSortData('','','','".$title."','".$child->getName $output .= "assetManager.AddLineSortData('','','','".$title."','".$child->getName
."','".$child->get("revisionDate")."','".$child->get("assetSize")."',''); ."','".$child->get("revisionDate")."','".$child->get("assetSize")."','');
assetManager.addAssetMetaData('".$child->getUrl."', '".$child->getRank."', '".$title."');\n"; assetManager.addAssetMetaData('".$child->getUrl."', '".$child->getRank."', '".$title."');\n";
@ -1554,7 +1555,7 @@ sub www_manageAssets {
.WebGUI::Form::submit({value=>"Paste"}) .WebGUI::Form::submit({value=>"Paste"})
.WebGUI::Form::formFooter() .WebGUI::Form::formFooter()
.' </fieldset></div> ' .' </fieldset></div> '
.'<script type="text/javascript" language="javascript"> .'<script type="text/javascript">
var clipboardItemSelectAllToggle = false; var clipboardItemSelectAllToggle = false;
function toggleClipboardSelectAll(form){ function toggleClipboardSelectAll(form){
clipboardItemSelectAllToggle = clipboardItemSelectAllToggle ? false : true; clipboardItemSelectAllToggle = clipboardItemSelectAllToggle ? false : true;