Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor

This commit is contained in:
Tom Needham 2011-10-07 17:10:50 +01:00
commit 538abb99f1
13 changed files with 7 additions and 7 deletions

View File

Before

Width:  |  Height:  |  Size: 591 B

After

Width:  |  Height:  |  Size: 591 B

View File

Before

Width:  |  Height:  |  Size: 691 B

After

Width:  |  Height:  |  Size: 691 B

View File

Before

Width:  |  Height:  |  Size: 481 B

After

Width:  |  Height:  |  Size: 481 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 342 B

View File

Before

Width:  |  Height:  |  Size: 675 B

After

Width:  |  Height:  |  Size: 675 B

View File

Before

Width:  |  Height:  |  Size: 524 B

After

Width:  |  Height:  |  Size: 524 B

View File

Before

Width:  |  Height:  |  Size: 578 B

After

Width:  |  Height:  |  Size: 578 B

View File

Before

Width:  |  Height:  |  Size: 621 B

After

Width:  |  Height:  |  Size: 621 B

View File

Before

Width:  |  Height:  |  Size: 587 B

After

Width:  |  Height:  |  Size: 587 B

View File

Before

Width:  |  Height:  |  Size: 700 B

After

Width:  |  Height:  |  Size: 700 B

View File

Before

Width:  |  Height:  |  Size: 603 B

After

Width:  |  Height:  |  Size: 603 B

View File

@ -3,7 +3,7 @@ FileList={
$('#fileList').empty().html(fileListHtml); $('#fileList').empty().html(fileListHtml);
}, },
addFile:function(name,size,lastModified,loading){ addFile:function(name,size,lastModified,loading){
var img=(loading)?OC.imagePath('core', 'loading.gif'):OC.imagePath('core', 'filetypes/file'); var img=(loading)?OC.imagePath('core', 'loading.gif'):OC.imagePath('core', 'filetypes/file.png');
var html='<tr data-file="'+name+'" data-type="file" data-size="'+size+'">'; var html='<tr data-file="'+name+'" data-type="file" data-size="'+size+'">';
if(name.indexOf('.')!=-1){ if(name.indexOf('.')!=-1){
var basename=name.substr(0,name.lastIndexOf('.')); var basename=name.substr(0,name.lastIndexOf('.'));

View File

@ -101,20 +101,20 @@ class OC_Helper {
// Is it a dir? // Is it a dir?
if( $mimetype == "dir" ){ if( $mimetype == "dir" ){
return OC::$WEBROOT."/core/img/places/folder.svg"; return OC::$WEBROOT."/core/img/filetypes/folder.png";
} }
// Icon exists? // Icon exists?
if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.svg" )){ if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )){
return OC::$WEBROOT."/core/img/filetypes/$mimetype.svg"; return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
} }
//try only the first part of the filetype //try only the first part of the filetype
$mimetype=substr($mimetype,0,strpos($mimetype,'-')); $mimetype=substr($mimetype,0,strpos($mimetype,'-'));
if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.svg" )){ if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )){
return OC::$WEBROOT."/core/img/filetypes/$mimetype.svg"; return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
} }
else{ else{
return OC::$WEBROOT."/core/img/filetypes/file.svg"; return OC::$WEBROOT."/core/img/filetypes/file.png";
} }
} }