From b669c846b097b6f16d99191fb2ecfe0a408ea589 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 15 Apr 2012 13:25:31 +0200 Subject: [PATCH 1/6] add span around fileactions --- files/js/fileactions.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/files/js/fileactions.js b/files/js/fileactions.js index 60c4fadedd..93b0d97336 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(''); var defaultAction=FileActions.getDefault(FileActions.getCurrentMimeType(),FileActions.getCurrentType()); for(name in actions){ if((name=='Download' || actions[name]!=defaultAction) && name!='Delete'){ @@ -81,7 +82,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 +114,7 @@ FileActions={ return false; }, hide:function(){ - $('#fileList .action').fadeOut(200,function(){ + $('#fileList span.fileactions').fadeOut(200,function(){ $(this).remove(); }); }, From 5868199e85b88f81f3b75fa2d203bb2074cb5215 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 15 Apr 2012 12:23:01 +0200 Subject: [PATCH 2/6] fixed settings hover, now whole row sensitive and fading not jerky --- core/css/styles.css | 5 +++-- core/js/js.js | 3 --- core/templates/layout.user.php | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 45bfb285dd..89e5c91e3c 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -95,8 +95,9 @@ label.infield { cursor: text !important; } #navigation a.active, #navigation a:hover, #navigation a:focus { background-color:#dbdbdb; border-top:1px solid #d4d4d4; border-bottom:1px solid #ccc; color:#333; } #navigation a.active { background-color:#ddd; } #navigation #settings { position:absolute; bottom:3.5em; width:100%; } -#expand { margin:0 0 .2em 1.2em; cursor:pointer; } -#expand+span { position:relative; bottom:.4em; left:.2em; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; } +#expand { position:relative; margin-bottom:-.5em; padding:.5em 10.1em .7em 1.2em; cursor:pointer; } +#expand+span { position:absolute; margin:-1.7em 0 0 2.5em; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; opacity:0; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; } +#expand:hover+span, #expand+span:hover { opacity:1; cursor:pointer; } #logout { position:absolute; right:0; top:0; padding:1.2em 2em .55em 1.2em; } diff --git a/core/js/js.js b/core/js/js.js index e3941fba6d..2e65dfac50 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -406,9 +406,6 @@ $(document).ready(function(){ $('#settings #expanddiv').click(function(event){ event.stopPropagation(); }); - $('#settings #expand').hover(function(){ - $('#settings #expand+span').fadeToggle(); - }); $(window).click(function(){//hide the settings menu when clicking oustide it if($('body').attr("id")=="body-user"){ $('#settings #expanddiv').slideUp(); diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 85cf089979..61eb0de9f4 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -44,7 +44,7 @@
    <?php echo $l->t('Settings');?> - t('Settings');?> + t('Settings');?>
    >
  • class="active">
  • From d32799e4bf48412d71222401dba84aaab47a75a7 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 15 Apr 2012 13:28:11 +0200 Subject: [PATCH 3/6] show text for file actions --- files/css/files.css | 6 +++--- files/js/fileactions.js | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/files/css/files.css b/files/css/files.css index 9e950517b8..03945f030b 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -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,8 @@ 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; } +.selectedActions a,#fileList a.action { display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; } +a.action>img{ max-height:16px; max-width:16px; vertical-align:text-top; } .selectedActions { display:none; } /* add breadcrumb divider to the File item in navigation panel */ diff --git a/files/js/fileactions.js b/files/js/fileactions.js index 93b0d97336..5c6dc65d49 100644 --- a/files/js/fileactions.js +++ b/files/js/fileactions.js @@ -67,11 +67,10 @@ FileActions={ if(img.call){ img=img(file); } - var html=''; var element=$(html); - if(img){ - element.append($('')); - } element.data('action',name); element.click(function(event){ event.stopPropagation(); From 7ddd0434270fa1cc51769e812f257cf63b0ec92f Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 15 Apr 2012 13:32:45 +0200 Subject: [PATCH 4/6] renamed extention to extension, also now only showing lowercase --- apps/files_archive/lib/tar.php | 4 ++-- apps/files_encryption/lib/proxy.php | 4 ++-- apps/files_sharing/get.php | 2 +- apps/media/js/loader.js | 6 +++--- apps/media/js/music.js | 6 +++--- apps/media/lib_scanner.php | 2 +- core/js/js.js | 4 ++-- files/css/files.css | 6 +++--- files/index.php | 4 ++-- files/js/filelist.js | 10 +++++----- files/templates/part.list.php | 2 +- lib/filestorage/common.php | 12 ++++++------ lib/helper.php | 12 ++++++------ lib/mimetypes.list.php | 2 +- lib/template.php | 2 +- 15 files changed, 39 insertions(+), 39 deletions(-) diff --git a/apps/files_archive/lib/tar.php b/apps/files_archive/lib/tar.php index a5d5400478..1eed11a762 100644 --- a/apps/files_archive/lib/tar.php +++ b/apps/files_archive/lib/tar.php @@ -30,8 +30,8 @@ class OC_Archive_TAR extends OC_Archive{ */ static public function getTarType($file){ if(strpos($file,'.')){ - $extention=substr($file,strrpos($file,'.')); - switch($extention){ + $extension=substr($file,strrpos($file,'.')); + switch($extension){ case 'gz': case 'tgz': return self::GZIP; diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php index c1c26d7754..c68df06f9f 100644 --- a/apps/files_encryption/lib/proxy.php +++ b/apps/files_encryption/lib/proxy.php @@ -41,8 +41,8 @@ class OC_FileProxy_Encryption extends OC_FileProxy{ if(self::isEncrypted($path)){ return true; } - $extention=substr($path,strrpos($path,'.')+1); - if(array_search($extention,self::$blackList)===false){ + $extension=substr($path,strrpos($path,'.')+1); + if(array_search($extension,self::$blackList)===false){ return true; } } diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php index fa3535fd14..3e42bf6a6c 100644 --- a/apps/files_sharing/get.php +++ b/apps/files_sharing/get.php @@ -31,7 +31,7 @@ if ($source !== false) { if ($i['type'] == 'file') { $fileinfo = pathinfo($i['name']); $i['basename'] = $fileinfo['filename']; - $i['extention'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : ''; + $i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : ''; } $i['directory'] = substr($i['directory'], $rootLength); if ($i['directory'] == "/") { diff --git a/apps/media/js/loader.js b/apps/media/js/loader.js index 514965666f..393f8ba914 100644 --- a/apps/media/js/loader.js +++ b/apps/media/js/loader.js @@ -1,10 +1,10 @@ function musicTypeFromFile(file){ - var extention=file.substr(file.indexOf('.')+1).toLowerCase(); - if(extention=='ogg'){ + var extension=file.substr(file.indexOf('.')+1).toLowerCase(); + if(extension=='ogg'){ return 'oga'; } //TODO check for more specific cases - return extention; + return extension; } function playAudio(filename){ diff --git a/apps/media/js/music.js b/apps/media/js/music.js index f93f0fded6..db12922762 100644 --- a/apps/media/js/music.js +++ b/apps/media/js/music.js @@ -48,10 +48,10 @@ function getUrlVars(){ } function musicTypeFromFile(file){ - var extention=file.split('.').pop().toLowerCase(); - if(extention=='ogg'){ + var extension=file.split('.').pop().toLowerCase(); + if(extension=='ogg'){ return 'oga'; } //TODO check for more specific cases - return extention; + return extension; } diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php index 341f411bdb..78c6ad491d 100644 --- a/apps/media/lib_scanner.php +++ b/apps/media/lib_scanner.php @@ -127,7 +127,7 @@ class OC_MEDIA_SCANNER{ } /** - * quick check if a song is a music file by checking the extention, not as good as a proper mimetype check but way faster + * quick check if a song is a music file by checking the extension, not as good as a proper mimetype check but way faster * @param string $filename * @return bool */ diff --git a/core/js/js.js b/core/js/js.js index 2e65dfac50..51dcbe5413 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -69,10 +69,10 @@ OC={ * @param file the name of the image file * @return string * - * if no extention is given for the image, it will automatically decide between .png and .svg based on what the browser supports + * if no extension is given for the image, it will automatically decide between .png and .svg based on what the browser supports */ imagePath:function(app,file){ - if(file.indexOf('.')==-1){//if no extention is given, use png or svg depending on browser support + if(file.indexOf('.')==-1){//if no extension is given, use png or svg depending on browser support file+=(SVGSupport())?'.svg':'.png'; } return OC.filePath(app,'img',file); diff --git a/files/css/files.css b/files/css/files.css index 03945f030b..e103f0a7a6 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 82d0960892..aea91542db 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 35847e06df..533e03b43c 100644 --- a/files/js/filelist.js +++ b/files/js/filelist.js @@ -7,15 +7,15 @@ FileList={ var html=''; 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+=''; html+=''+basename - if(extention){ - html+=''+extention+''; + if(extension){ + html+=''+extension+''; } html+=''; if(size!='Pending'){ @@ -147,7 +147,7 @@ FileList={ span.text(basename); td.children('a.name').append(span); if(newname.indexOf('.')>0){ - span.append($(''+newname.substr(newname.lastIndexOf('.'))+'')); + span.append($(''+newname.substr(newname.lastIndexOf('.'))+'')); } $.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 b117d81a1a..5a5941fc7a 100644 --- a/files/templates/part.list.php +++ b/files/templates/part.list.php @@ -18,7 +18,7 @@ - + diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php index f632474df0..f0bfc064cb 100644 --- a/lib/filestorage/common.php +++ b/lib/filestorage/common.php @@ -100,11 +100,11 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { } $head=fread($source,8192);//8kb should suffice to determine a mimetype if($pos=strrpos($path,'.')){ - $extention=substr($path,$pos); + $extension=substr($path,$pos); }else{ - $extention=''; + $extension=''; } - $tmpFile=OC_Helper::tmpFile($extention); + $tmpFile=OC_Helper::tmpFile($extension); file_put_contents($tmpFile,$head); $mime=OC_Helper::getMimeType($tmpFile); unlink($tmpFile); @@ -129,11 +129,11 @@ abstract class OC_Filestorage_Common extends OC_Filestorage { return false; } if($pos=strrpos($path,'.')){ - $extention=substr($path,$pos); + $extension=substr($path,$pos); }else{ - $extention=''; + $extension=''; } - $tmpFile=OC_Helper::tmpFile($extention); + $tmpFile=OC_Helper::tmpFile($extension); $target=fopen($tmpFile,'w'); $count=OC_Helper::streamCopy($source,$target); return $tmpFile; diff --git a/lib/helper.php b/lib/helper.php index 2026286352..c33db5f10f 100755 --- a/lib/helper.php +++ b/lib/helper.php @@ -310,9 +310,9 @@ class OC_Helper { $mimeType='application/octet-stream'; if ($mimeType=='application/octet-stream') { self::$mimetypes = include('mimetypes.fixlist.php'); - $extention=strtolower(strrchr(basename($path), ".")); - $extention=substr($extention,1);//remove leading . - $mimeType=(isset(self::$mimetypes[$extention]))?self::$mimetypes[$extention]:'application/octet-stream'; + $extension=strtolower(strrchr(basename($path), ".")); + $extension=substr($extension,1);//remove leading . + $mimeType=(isset(self::$mimetypes[$extension]))?self::$mimetypes[$extension]:'application/octet-stream'; } if (@is_dir($path)) { @@ -346,9 +346,9 @@ class OC_Helper { if(!self::$mimetypes || self::$mimetypes != include('mimetypes.list.php')){ self::$mimetypes=include('mimetypes.list.php'); } - $extention=strtolower(strrchr(basename($path), ".")); - $extention=substr($extention,1);//remove leading . - $mimeType=(isset(self::$mimetypes[$extention]))?self::$mimetypes[$extention]:'application/octet-stream'; + $extension=strtolower(strrchr(basename($path), ".")); + $extension=substr($extension,1);//remove leading . + $mimeType=(isset(self::$mimetypes[$extension]))?self::$mimetypes[$extension]:'application/octet-stream'; } return $mimeType; } diff --git a/lib/mimetypes.list.php b/lib/mimetypes.list.php index e0570e84ea..ccf47999b1 100644 --- a/lib/mimetypes.list.php +++ b/lib/mimetypes.list.php @@ -21,7 +21,7 @@ */ /** - * list of mimetypes by extention + * list of mimetypes by extension */ return array( diff --git a/lib/template.php b/lib/template.php index cb39a10df3..eeba2410b6 100644 --- a/lib/template.php +++ b/lib/template.php @@ -161,7 +161,7 @@ class OC_Template{ } /** - * @brief Returns the formfactor extention for current formfactor + * @brief Returns the formfactor extension for current formfactor */ protected function getFormFactorExtension() { From 38cb716a572a8af136f6260089bc486413c6ca9f Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 15 Apr 2012 13:34:16 +0200 Subject: [PATCH 5/6] increasing the file row height a bit --- files/css/files.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/css/files.css b/files/css/files.css index e103f0a7a6..96bc711a4b 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -36,8 +36,8 @@ /* 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.extension, td.date { color:#999; } From 897261daf48a0b60227c7fce248cfd1c56fe68b1 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Sun, 15 Apr 2012 14:15:11 +0200 Subject: [PATCH 6/6] display file actions perfectly --- files/css/files.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/files/css/files.css b/files/css/files.css index 96bc711a4b..eb05d468f0 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -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 { display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; } -a.action>img{ max-height:16px; max-width:16px; vertical-align:text-top; } +.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 */