diff options
| author | Jan-Christoph Borchardt <jan@unhosted.org> | 2012-04-15 15:32:45 +0400 |
|---|---|---|
| committer | Jan-Christoph Borchardt <jan@unhosted.org> | 2012-04-15 15:34:30 +0400 |
| commit | 7ddd0434270fa1cc51769e812f257cf63b0ec92f (patch) | |
| tree | 10a2cac32c4cdb05e4c88b9008d6b1e05e670faa /files | |
| parent | d32799e4bf48412d71222401dba84aaab47a75a7 (diff) | |
renamed extention to extension, also now only showing lowercase
Diffstat (limited to 'files')
| -rw-r--r-- | files/css/files.css | 6 | ||||
| -rw-r--r-- | files/index.php | 4 | ||||
| -rw-r--r-- | files/js/filelist.js | 10 | ||||
| -rw-r--r-- | files/templates/part.list.php | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/files/css/files.css b/files/css/files.css index 03945f030b2..e103f0a7a6c 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -40,9 +40,9 @@ tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; h tbody tr { background-color:#fff; } 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; } 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/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> |