fix serveral styling issues on uploaded files

diff --git a/files/js/filelist.js b/files/js/filelist.js
index 8a73d83996ed00659f18889a6731e283bd5f62eb..e4ec97e50684d07075a790fa941302518c0ff8b7 100644 (file)
--- a/files/js/filelist.js
+++ b/files/js/filelist.js
@@ -5,8 +5,26 @@ FileList={
        addFile:function(name,size,lastModified,loading){
                var img=(loading)?'img/loading.gif':'img/file.png';
                var html='<tr data-file="'+name+'" data-type="file">';
-               html+='<td class="filename"><input type="checkbox" /><a class="name" style="background-image:url('+img+')" href="download.php?file='+$('#dir').val()+'/'+name+'">'+name+'</a></td>';
-               html+='<td class="filesize">'+size+'</td>';
+               if(name.indexOf('.')!=-1){
+                       var basename=name.substr(0,name.indexOf('.'));
+                       var extention=name.substr(name.indexOf('.'));
+               }else{
+                       var basename=name;
+                       var extention=false;
+               }
+               html+='<td class="filename"><input type="checkbox" />';
+               html+='<a class="name" style="background-image:url('+img+')" href="download.php?file='+$('#dir').val()+'/'+name+'"><span class="nametext">'+basename
+               if(extention){
+                       html+='<span class="extention">'+extention+'</span>';
+               }
+               html+='</span></a></td>';
+               if(size!='Pending'){
+                       simpleSize=simpleFileSize(size);
+               }else{
+                       simpleSize='Pending';
+               }
+               sizeColor = Math.round(200-Math.pow((size/(1024*1024)),2));
+               html+='<td class="filesize" title="'+humanFileSize(size)+'" style="color:rgb('+sizeColor+','+sizeColor+','+sizeColor+')">'+simpleSize+'</td>';
                html+='<td class="date">'+lastModified+'</td>';
                html+='</tr>';
                FileList.insertElement(name,'file',$(html));

diff --git a/files/js/files.js b/files/js/files.js
index e9ae0ecd012b983738e6ab9b6ac42d944c7c5f76..44ec0b23846bd233d6906222f6016c8962ed8fee 100644 (file)
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -157,7 +157,7 @@ $(document).ready(function() {
                        var uploadTime=formatDate(date);
                        for(var i=0;i<files.length;i++){
                                if(files[i].size>0){
-                                       var size=simpleFileSize(files[i].size);
+                                       var size=files[i].size;
                                }else{
                                        var size='Pending';
                                }