From 80d8ca24ec5d8b0071c0c901dfe042d99a46fcd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 7 Dec 2012 12:12:40 +0100 Subject: [PATCH] fix svg -> png replacement for android, cleanup and remove obsolete css --- apps/files/css/files.css | 61 +++++++++++++++++++--------------- apps/files/js/files.js | 8 +---- apps/files/templates/index.php | 8 ++--- core/js/js.js | 2 +- 4 files changed, 39 insertions(+), 40 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 89427124f8..b56d3e29d7 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -5,43 +5,46 @@ /* FILE MENU */ .actions { padding:.3em; float:left; height:2em; } .actions input, .actions button, .actions .button { margin:0; float:left; } -#file_menu { right:0; position:absolute; top:0; } -#file_menu a { display:block; float:left; background-image:none; text-decoration:none; } -.file_upload_form, #file_newfolder_form { display:inline; float: left; margin:0; padding:0; } -#fileSelector, #file_upload_submit, #file_newfolder_submit { display:none; } -.file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .5em; padding-left:2em; } -.file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:block; float:left; padding-left:0; overflow:hidden; position:relative; margin:0; margin-left:2px; } -.file_upload_button_wrapper { position:relative; display:block; width:100%; height:27px; cursor:pointer; z-index:1000; } -#new { background-color:#5bb75b; float:left; margin:0 0 0 1em; z-index:1010; height:17px; } + +#new { + height:17px; margin:0 0 0 1em; z-index:1010; float:left; + background-color:#5bb75b; + border:1px solid; border-color:#51a351 #419341 #387038; + -moz-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; + -webkit-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; + box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; +} #new:hover, #upload:hover { background-color:#4b964b; } #new.active { border-bottom-left-radius:0; border-bottom-right-radius:0; border-bottom:none; } #new>a { padding:.5em 1.2em .3em; color:#fff; text-shadow:0 1px 0 #51a351; } -#new>ul { display:none; position:fixed; text-align:left; padding:.5em; background:#f8f8f8; margin-top:0.075em; border:1px solid #ddd; min-width:7em; margin-left:-.5em; z-index:-1; } +#new>ul { + display:none; position:fixed; min-width:7em; z-index:-1; + padding:.5em; margin-top:0.075em; margin-left:-.5em; + text-align:left; + background:#f8f8f8; border:1px solid #ddd; +} #new>ul>li { height:20px; margin:.3em; padding-left:2em; padding-bottom:0.1em; background-repeat:no-repeat; cursor:pointer; } #new>ul>li>p { cursor:pointer; } #new>ul>li>input { padding:0.3em; margin:-0.3em; } -#new { border:1px solid; border-color:#51a351 #419341 #387038; -moz-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; } #new .popup { border-top-left-radius:0; z-index:10; } -#upload { background-image: url('%webroot%/core/img/actions/upload-white.svg'); - background-repeat: no-repeat; - background-position: 7px 6px; - padding:0; - color:#fff; - text-shadow:0 1px 0 #51a351; + +#upload { + height:27px; padding:0; margin-left:0.2em; overflow:hidden; + color:#fff; text-shadow:0 1px 0 #51a351; border-color:#51a351 #419341 #387038; box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; background-color:#5bb75b; - margin-left:0.2em; - height:27px; - overflow:hidden; } - -#file_newfolder_name { background-image:url('%webroot%/core/img/places/folder.svg'); font-weight:normal; width:7em; } - -#file_newfolder_submit, #file_upload_submit { width:3em; } +#upload a { + position:relative; display:block; width:100%; height:27px; + cursor:pointer; z-index:1000; + background-image: url('%webroot%/core/img/actions/upload-white.svg'); + background-repeat: no-repeat; + background-position: 7px 6px; +} .file_upload_target { display:none; } - +.file_upload_form { display:inline; float: left; margin:0; padding:0; cursor:pointer; overflow: visible; } #file_upload_start { left:0; top:0; width:28px; height:27px; padding:0; font-size:1em; @@ -51,10 +54,14 @@ #uploadprogresswrapper { position:absolute; right:13.5em; top:0em; } #uploadprogresswrapper #uploadprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; } -.file_upload_form, .file_upload_wrapper, #file_upload_start, #file_upload_submit { cursor:pointer; overflow: visible; } /* 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; } + +#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 { background-color:#fff; height:2.5em; } tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; } @@ -78,7 +85,7 @@ table td.filename input.filename { 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, .uploadtext, .modified { float:left; padding:.3em 0; } /* TODO fix usability bug (accidental file/folder selection) */ -table td.filename .nametext { width:40em; overflow:hidden; text-overflow:ellipsis; } +table td.filename .nametext { overflow:hidden; text-overflow:ellipsis; } table td.filename .uploadtext { font-weight:normal; margin-left:.5em; } table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; } 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; } diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 7e1a90f45b..ece0b29ae1 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -66,7 +66,7 @@ $(document).ready(function() { } // Triggers invisible file input - $('.file_upload_button_wrapper').live('click', function() { + $('#upload a').live('click', function() { $(this).parent().children('#file_upload_start').trigger('click'); return false; }); @@ -168,12 +168,6 @@ $(document).ready(function() { procesSelection(); }); - $('#file_newfolder_name').click(function(){ - if($('#file_newfolder_name').val() == 'New Folder'){ - $('#file_newfolder_name').val(''); - } - }); - $('.download').click('click',function(event) { var files=getSelectedFiles('name').join(';'); var dir=$('#dir').val()||'/'; diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 82dc96d643..bd34c9a76d 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -15,7 +15,6 @@
-
- - + - +
-
diff --git a/core/js/js.js b/core/js/js.js index 3b4cabe710..7d967321d9 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -615,7 +615,7 @@ $(document).ready(function(){ $('.jp-controls .jp-previous').tipsy({gravity:'nw', fade:true, live:true}); $('.jp-controls .jp-next').tipsy({gravity:'n', fade:true, live:true}); $('.password .action').tipsy({gravity:'se', fade:true, live:true}); - $('.file_upload_button_wrapper').tipsy({gravity:'w', fade:true}); + $('#upload a').tipsy({gravity:'w', fade:true}); $('.selectedActions a').tipsy({gravity:'s', fade:true, live:true}); $('a.delete').tipsy({gravity: 'e', fade:true, live:true}); $('a.action').tipsy({gravity:'s', fade:true, live:true});