diff options
Diffstat (limited to 'files')
| -rw-r--r-- | files/css/files.css | 20 | ||||
| -rw-r--r-- | files/index.php | 4 | ||||
| -rw-r--r-- | files/js/fileactions.js | 12 | ||||
| -rw-r--r-- | files/js/filelist.js | 10 | ||||
| -rw-r--r-- | files/templates/part.list.php | 2 |
5 files changed, 26 insertions, 22 deletions
diff --git a/files/css/files.css b/files/css/files.css index 9e950517b82..eb05d468f04 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -36,13 +36,13 @@ /* FILE TABLE */ #emptyfolder { position:absolute; margin:10em 0 0 10em; font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; } table { position:relative; top:37px; width:100%; } -tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; height:1em; } -tbody tr { background-color:#fff; } +tbody tr { background-color:#fff; height:2.5em; } +tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; } tbody tr.selected { background-color:#eee; } tbody a { color:#000; } -span.extention, td.date { color:#999; } -span.extention { opacity:0; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; } -tr:hover span.extention { opacity:1; } +span.extension, td.date { color:#999; } +span.extension { text-transform:lowercase; opacity:0; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; } +tr:hover span.extension { opacity:1; } div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; } div.crumb:first-child { padding-left:1em; } div.crumb.last { font-weight:bold; } @@ -60,7 +60,7 @@ table tr[data-type="dir"] td.filename a.name {font-weight:bold; } table td.filename a.name input, table td.filename a.name form { width:100%; cursor:text; } table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em 0; } table td.filename .nametext, .modified { float:left; padding:.3em 0; } -table td.filename .nametext { width:60%; } +table td.filename .nametext { width:70%; overflow:hidden; } table td.filename form { float:left; font-size:.85em; } table thead.fixed tr{ position:fixed; top:6.5em; z-index:49; -moz-box-shadow:0 -3px 7px #ddd; -webkit-box-shadow:0 -3px 7px #ddd; box-shadow:0 -3px 7px #ddd; } table thead.fixed { height:2em; } @@ -70,8 +70,12 @@ table thead.fixed { height:2em; } #fileList tr td.filename { -webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms; } #select_all { float:left; margin:.3em 0.6em 0 .5em; } #uploadsize-message,#delete-confirm { display:none; } -.selectedActions a,#fileList a.action { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; } -a.action>img{ max-height:16px; max-width:16px; } +.fileactions { position:absolute; right:0; top:.8em; font-size:.8em; } +#fileList .fileactions a.action { position:relative; top:-.3em; } +#fileList .fileactions a.action img { position:relative; top:.2em; } +.selectedActions a,#fileList a.action { display:inline; margin:-.5em 0; padding:1em .5em 1em .5em !important; } +a.action.delete { float:right; } +a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; } .selectedActions { display:none; } /* add breadcrumb divider to the File item in navigation panel */ diff --git a/files/index.php b/files/index.php index 82d09608924..aea91542db6 100644 --- a/files/index.php +++ b/files/index.php @@ -51,10 +51,10 @@ foreach( OC_Files::getdirectorycontent( $dir ) as $i ){ $fileinfo=pathinfo($i['name']); $i['basename']=$fileinfo['filename']; if (!empty($fileinfo['extension'])) { - $i['extention']='.' . $fileinfo['extension']; + $i['extension']='.' . $fileinfo['extension']; } else { - $i['extention']=''; + $i['extension']=''; } } if($i['directory']=='/'){ diff --git a/files/js/fileactions.js b/files/js/fileactions.js index 60c4fadedd0..5c6dc65d49d 100644 --- a/files/js/fileactions.js +++ b/files/js/fileactions.js @@ -59,6 +59,7 @@ FileActions={ if($('tr').filterAttr('data-file',file).data('renaming')){ return; } + parent.children('a.name').append('<span class="fileactions" />'); var defaultAction=FileActions.getDefault(FileActions.getCurrentMimeType(),FileActions.getCurrentType()); for(name in actions){ if((name=='Download' || actions[name]!=defaultAction) && name!='Delete'){ @@ -66,11 +67,10 @@ FileActions={ if(img.call){ img=img(file); } - var html='<a href="#" original-title="'+name+'" class="action" style="display:none" />'; + var html='<a href="#" class="action" style="display:none">'; + if(img) { html+='<img src="'+img+'"/> '; } + html += name+'</a>'; var element=$(html); - if(img){ - element.append($('<img src="'+img+'"/>')); - } element.data('action',name); element.click(function(event){ event.stopPropagation(); @@ -81,7 +81,7 @@ FileActions={ action(currentFile); }); element.hide(); - parent.children('a.name').append(element); + parent.find('a.name>span.fileactions').append(element); } } if(actions['Delete']){ @@ -113,7 +113,7 @@ FileActions={ return false; }, hide:function(){ - $('#fileList .action').fadeOut(200,function(){ + $('#fileList span.fileactions').fadeOut(200,function(){ $(this).remove(); }); }, diff --git a/files/js/filelist.js b/files/js/filelist.js index 35847e06dfe..533e03b43cd 100644 --- a/files/js/filelist.js +++ b/files/js/filelist.js @@ -7,15 +7,15 @@ FileList={ var html='<tr data-type="file" data-size="'+size+'">'; if(name.indexOf('.')!=-1){ var basename=name.substr(0,name.lastIndexOf('.')); - var extention=name.substr(name.lastIndexOf('.')); + var extension=name.substr(name.lastIndexOf('.')); }else{ var basename=name; - var extention=false; + var extension=false; } html+='<td class="filename" style="background-image:url('+img+')"><input type="checkbox" />'; html+='<a class="name" href="download.php?file='+$('#dir').val()+'/'+name+'"><span class="nametext">'+basename - if(extention){ - html+='<span class="extention">'+extention+'</span>'; + if(extension){ + html+='<span class="extension">'+extension+'</span>'; } html+='</span></a></td>'; if(size!='Pending'){ @@ -147,7 +147,7 @@ FileList={ span.text(basename); td.children('a.name').append(span); if(newname.indexOf('.')>0){ - span.append($('<span class="extention">'+newname.substr(newname.lastIndexOf('.'))+'</span>')); + span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>')); } $.get(OC.filePath('files','ajax','rename.php'), { dir : $('#dir').val(), newname: newname, file: name },function(){ tr.data('renaming',false); diff --git a/files/templates/part.list.php b/files/templates/part.list.php index b117d81a1a5..5a5941fc7ae 100644 --- a/files/templates/part.list.php +++ b/files/templates/part.list.php @@ -18,7 +18,7 @@ <?php if($file['type'] == 'dir'):?> <?php echo htmlspecialchars($file['name']);?> <?php else:?> - <?php echo htmlspecialchars($file['basename']);?><span class='extention'><?php echo $file['extention'];?></span> + <?php echo htmlspecialchars($file['basename']);?><span class='extension'><?php echo $file['extension'];?></span> <?php endif;?> </span> </a> |