MDL-20787 final switch to new $OUTPUT->pix_url() - yay!

This commit is contained in:
Petr Skoda 2009-12-16 21:50:45 +00:00
parent cb1e046d6e
commit b5d0cafc6f
157 changed files with 576 additions and 576 deletions

View file

@ -123,11 +123,11 @@ class repository_alfresco extends repository {
{
$ret['list'][] = array('title'=>$child->child->cm_name,
'path'=>$child->child->id,
'thumbnail'=>$OUTPUT->old_icon_url('f/folder-32') . '',
'thumbnail'=>$OUTPUT->pix_url('f/folder-32') . '',
'children'=>array());
} elseif ($child->child->type == $file_filter) {
$ret['list'][] = array('title'=>$child->child->cm_name,
'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($child->child->cm_name, 32)),
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($child->child->cm_name, 32)),
'source'=>$child->child->id);
}
}

View file

@ -153,7 +153,7 @@ class repository_boxnet extends repository {
'date'=>$filedates[$n],
'source'=>'http://box.net/api/1.0/download/'
.$this->auth_token.'/'.$fileids[$n],
'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($v, 32)));
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($v, 32)));
}
}
}

View file

@ -525,7 +525,7 @@ default:
} else {
// a folder
echo '<li>';
echo '<img src="'.$OUTPUT->old_icon_url('f/folder') . '" class="iconsmall" />';
echo '<img src="'.$OUTPUT->pix_url('f/folder') . '" class="iconsmall" />';
$url->param('action', 'browse');
$url->param('draftpath', $file->get_filepath());

View file

@ -66,7 +66,7 @@ class repository_filesystem extends repository {
'source' => $path.'/'.$file,
'size' => filesize($this->root_path.$file),
'date' => time(),
'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($this->root_path.$file, 32))
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($this->root_path.$file, 32))
);
} else {
if (!empty($path)) {
@ -77,7 +77,7 @@ class repository_filesystem extends repository {
$list['list'][] = array(
'title' => $file,
'children' => array(),
'thumbnail' => $OUTPUT->old_icon_url('f/folder-32'),
'thumbnail' => $OUTPUT->pix_url('f/folder-32'),
'path' => $current_path
);
}

View file

@ -838,7 +838,7 @@ abstract class repository {
'url'=>$ret->get_url(),
'id'=>$file->get_itemid(),
'file'=>$file->get_filename(),
'icon' => $OUTPUT->old_icon_url(file_extension_icon($path, 32))
'icon' => $OUTPUT->pix_url(file_extension_icon($path, 32))
);
} else {
return null;
@ -944,7 +944,7 @@ abstract class repository {
'size' => 0,
'date' => $filedate,
'path' => array_reverse($path),
'thumbnail' => $OUTPUT->old_icon_url('f/folder-32')
'thumbnail' => $OUTPUT->pix_url('f/folder-32')
);
//if ($dynamicmode && $child->is_writable()) {
@ -981,7 +981,7 @@ abstract class repository {
'date' => $filedate,
//'source' => $child->get_url(),
'source' => base64_encode($source),
'thumbnail'=>$OUTPUT->old_icon_url(file_extension_icon($filename, 32)),
'thumbnail'=>$OUTPUT->pix_url(file_extension_icon($filename, 32)),
);
$filecount++;
}
@ -1859,13 +1859,13 @@ function repository_get_client($context, $id = '', $accepted_filetypes = '*', $
} else {
$options['externallink'] = true;
}
$options['icons']['loading'] = $OUTPUT->old_icon_url('i/loading');
$options['icons']['logout'] = $OUTPUT->old_icon_url('a/logout');
$options['icons']['help'] = $OUTPUT->old_icon_url('a/help');
$options['icons']['progressbar'] = $OUTPUT->old_icon_url('i/progressbar');
$options['icons']['search'] = $OUTPUT->old_icon_url('a/search');
$options['icons']['setting'] = $OUTPUT->old_icon_url('a/setting');
$options['icons']['refresh'] = $OUTPUT->old_icon_url('a/refresh');
$options['icons']['loading'] = $OUTPUT->pix_url('i/loading');
$options['icons']['logout'] = $OUTPUT->pix_url('a/logout');
$options['icons']['help'] = $OUTPUT->pix_url('a/help');
$options['icons']['progressbar'] = $OUTPUT->pix_url('i/progressbar');
$options['icons']['search'] = $OUTPUT->pix_url('a/search');
$options['icons']['setting'] = $OUTPUT->pix_url('a/setting');
$options['icons']['refresh'] = $OUTPUT->pix_url('a/refresh');
$options = json_encode($options);
// fp_config includes filepicker options

View file

@ -109,7 +109,7 @@ class repository_local extends repository {
'date' => '',
'path' => $params,
'children'=>array(),
'thumbnail' => $OUTPUT->old_icon_url('f/folder-32') . ''
'thumbnail' => $OUTPUT->pix_url('f/folder-32') . ''
);
$list[] = $node;
} else {
@ -120,7 +120,7 @@ class repository_local extends repository {
'size' => 0,
'date' => '',
'source'=> $params,
'thumbnail' => $OUTPUT->old_icon_url($icon),
'thumbnail' => $OUTPUT->pix_url($icon),
);
$list[] = $node;
}

View file

@ -206,7 +206,7 @@ class repository_mahara extends repository {
$list = array();
if (!empty($filesandfolders['folders'])) {
foreach ($filesandfolders['folders'] as $folder) {
$list[] = array('path'=>$folder['id'], 'title'=>$folder['title'], 'date'=>$folder['mtime'], 'size'=>'0', 'children'=>array(), 'thumbnail' => $OUTPUT->old_icon_url('f/folder'));
$list[] = array('path'=>$folder['id'], 'title'=>$folder['title'], 'date'=>$folder['mtime'], 'size'=>'0', 'children'=>array(), 'thumbnail' => $OUTPUT->pix_url('f/folder'));
}
}
if (!empty($filesandfolders['files'])) {
@ -214,7 +214,7 @@ class repository_mahara extends repository {
if ($file['artefacttype'] == 'image') {
$thumbnail = $host->wwwroot."/artefact/file/download.php?file=".$file['id']."&size=70x55";
} else {
$thumbnail = $OUTPUT->old_icon_url(file_extension_icon( $file['title'], 32));
$thumbnail = $OUTPUT->pix_url(file_extension_icon( $file['title'], 32));
}
$list[] = array( 'title'=>$file['title'], 'date'=>$file['mtime'], 'source'=>$file['id'], 'thumbnail' => $thumbnail);
}

View file

@ -81,7 +81,7 @@ class repository_merlot extends repository {
foreach ($xml->results->material as $entry) {
$list[] = array(
'title'=>(string)$entry->title,
'thumbnail'=>$OUTPUT->old_icon_url('f/unknown-32'),
'thumbnail'=>$OUTPUT->pix_url('f/unknown-32'),
'date'=>userdate((int)$entry->creationDate),
'size'=>'',
'source'=>(string)$entry->URL

View file

@ -72,7 +72,7 @@ class repository_s3 extends repository {
$folder = array(
'title' => $bucket,
'children' => array(),
'thumbnail'=>$OUTPUT->old_icon_url('f/folder-32'),
'thumbnail'=>$OUTPUT->pix_url('f/folder-32'),
'path'=>$bucket
);
$tree[] = $folder;
@ -86,7 +86,7 @@ class repository_s3 extends repository {
'size'=>$file['size'],
'date'=>userdate($file['time']),
'source'=>$path.'/'.$file['name'],
'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($file['name'], 32))
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($file['name'], 32))
);
}
}

View file

@ -100,7 +100,7 @@ EOD;
$ret['list'][] = array(
'title'=>$filename,
'source'=>$this->file_url,
'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($filename, 32))
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($filename, 32))
);
}
}

View file

@ -107,7 +107,7 @@ class repository_webdav extends repository {
}
$ret['list'][] = array(
'title'=>$title,
'thumbnail'=>$OUTPUT->old_icon_url('f/folder-32'),
'thumbnail'=>$OUTPUT->pix_url('f/folder-32'),
'children'=>array(),
'date'=>$filedate,
'size'=>0,
@ -120,7 +120,7 @@ class repository_webdav extends repository {
$size = !empty($v['getcontentlength'])? $v['getcontentlength']:'';
$ret['list'][] = array(
'title'=>$title,
'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($title, 32)),
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($title, 32)),
'size'=>$size,
'date'=>$filedate,
'source'=>$v['href']

View file

@ -15,7 +15,7 @@ class repository_wikimedia extends repository {
foreach ($result as $title=>$url) {
$list['list'][] = array(
'title'=>substr($title, 5),
'thumbnail'=>$OUTPUT->old_icon_url(file_extension_icon('xx.jpg', 32)),
'thumbnail'=>$OUTPUT->pix_url(file_extension_icon('xx.jpg', 32)),
// plugin-dependent unique path to the file (id, url, path, etc.)
'source'=>$url,
// the accessible url of the file