adding icons to filepicker

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index d40c433bda2ffc638df9e8575c2c433fa3b6ae3c..7ae9bc9d2ad20b2ef52e43248857a639af22c342 100644 (file)
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -204,7 +204,7 @@ OCdialogs = {
     var entry_template = '<div onclick="javascript:OC.dialogs.handlePickerClick(this, \'*ENTRYNAME*\',\''+dialog_content_id+'\')" data="*ENTRYTYPE*"><img src="*MIMETYPEICON*" style="margin-right:1em;"><span id="filename">*NAME*</span><div style="float:right;margin-right:1em;">*LASTMODDATE*</div></div>';
     var names = '';
     for (var a in r.data) {
-      names += entry_template.replace('*LASTMODDATE*', OC.mtime2date(r.data[a].mtime)).replace('*NAME*', r.data[a].name).replace('*MIMETYPEICON*', OC.webroot+'/core/img/filetypes/'+(r.data[a].type=='dir'?'folder':r.data[a].mimetype.replace('/','-'))+'.png').replace('*ENTRYNAME*', r.data[a].name).replace('*ENTRYTYPE*', r.data[a].type);
+      names += entry_template.replace('*LASTMODDATE*', OC.mtime2date(r.data[a].mtime)).replace('*NAME*', r.data[a].name).replace('*MIMETYPEICON*', r.data[a].mimetype_icon).replace('*ENTRYNAME*', r.data[a].name).replace('*ENTRYTYPE*', r.data[a].type);
     }
     $(dialog_content_id + ' #filelist').html(names);
   },

diff --git a/files/ajax/rawlist.php b/files/ajax/rawlist.php
index 0abe81e672599e1f4f5b2a877977a3c5c6be9837..88ba48a6c481a4800be8731a1c860953ce7557d3 100644 (file)
--- a/files/ajax/rawlist.php
+++ b/files/ajax/rawlist.php
@@ -5,6 +5,7 @@ $RUNTIME_APPTYPES=array('filesystem');
 
 // Init owncloud
 require_once('../../lib/base.php');
+require_once('../../lib/template.php');
 
 OC_JSON::checkLoggedIn();
 
@@ -15,6 +16,7 @@ $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
 $files = array();
 foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
        $i["date"] = OC_Util::formatDate($i["mtime"] );
+  $i['mimetype_icon'] = $i['type'] == 'dir' ? mimetype_icon('dir'): mimetype_icon($i['mimetype']);
        $files[] = $i;
 }