diff options
author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2012-12-05 11:17:41 +0100 |
---|---|---|
committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2012-12-07 17:21:26 +0100 |
commit | 8cf1e560bb4c04dba91adc069e0bb38dcc4efa93 (patch) | |
tree | 4b8c9fd70bee2fad83a56ea9fd1672a78729a99f /apps | |
parent | 810e02099ecd35446e5d6b458cb16a45227c8524 (diff) | |
download | nextcloud-server-8cf1e560bb4c04dba91adc069e0bb38dcc4efa93.tar.gz nextcloud-server-8cf1e560bb4c04dba91adc069e0bb38dcc4efa93.zip |
add IE9 CSS checkbox fixes
Diffstat (limited to 'apps')
-rw-r--r-- | apps/files/css/files.css | 17 | ||||
-rw-r--r-- | apps/files/js/files.js | 14 | ||||
-rw-r--r-- | apps/files/templates/index.php | 2 |
3 files changed, 19 insertions, 14 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index b82ed6eb434..8ce760db773 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -32,19 +32,24 @@ box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; background-color:#5bb75b; margin-left:0.2em; - height:27px; } + height:27px; +} #file_newfolder_name { background-image:url('%webroot%/core/img/places/folder.svg'); font-weight:normal; width:7em; } -.file_upload_start { font-size:1em; } + #file_newfolder_submit, #file_upload_submit { width:3em; } .file_upload_target { display:none; } -.file_upload_start { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; z-index:-1; position:relative; left:0; top:0; width:28px; height:27px; padding:0; cursor:pointer; overflow: hidden; } +#file_upload_start { + left:0; top:0; width:28px; height:27px; padding:0; + font-size:1em; + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; + z-index:-1; position:relative; cursor:pointer; overflow: hidden; } #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_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; } @@ -70,13 +75,13 @@ table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; } 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) +/* TODO fix usability bug (accidental file/folder selection) */ table td.filename .nametext { width:40em; 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; } table thead.fixed { height:2em; } -#fileList tr td.filename>input[type=checkbox]:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; float:left; margin:.7em 0 0 1em; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/ -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; } +#fileList tr td.filename>input[type="checkbox"]:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; float:left; margin:.7em 0 0 1em; /* bigger clickable area doesn’t work in FF width:2.8em; height:2.4em;*/ -webkit-transition:opacity 200ms; -moz-transition:opacity 200ms; -o-transition:opacity 200ms; transition:opacity 200ms; } #fileList tr td.filename>input[type="checkbox"]:hover:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; } #fileList tr td.filename>input[type="checkbox"]:checked:first-child { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } #fileList tr td.filename { -webkit-transition:background-image 500ms; -moz-transition:background-image 500ms; -o-transition:background-image 500ms; transition:background-image 500ms; position:relative; } diff --git a/apps/files/js/files.js b/apps/files/js/files.js index a6216b02168..7e1a90f45bd 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -67,7 +67,7 @@ $(document).ready(function() { // Triggers invisible file input $('.file_upload_button_wrapper').live('click', function() { - $(this).parent().children('.file_upload_start').trigger('click'); + $(this).parent().children('#file_upload_start').trigger('click'); return false; }); @@ -201,9 +201,9 @@ $(document).ready(function() { e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone }); - if ( document.getElementById("data-upload-form") ) { + if ( document.getElementById('data-upload-form') ) { $(function() { - $('.file_upload_start').fileupload({ + $('#file_upload_start').fileupload({ dropZone: $('#content'), // restrict dropZone to content div add: function(e, data) { var files = data.files; @@ -218,7 +218,7 @@ $(document).ready(function() { totalSize+=files[i].size; if(FileList.deleteFiles && FileList.deleteFiles.indexOf(files[i].name)!=-1){//finish delete if we are uploading a deleted file FileList.finishDelete(function(){ - $('.file_upload_start').change(); + $('#file_upload_start').change(); }); return; } @@ -292,7 +292,7 @@ $(document).ready(function() { var dropTarget = $(e.originalEvent.target).closest('tr'); if(dropTarget && dropTarget.attr('data-type') === 'dir') { // drag&drop upload to folder var dirName = dropTarget.attr('data-file') - var jqXHR = $('.file_upload_start').fileupload('send', {files: files[i], + var jqXHR = $('#file_upload_start').fileupload('send', {files: files[i], formData: function(form) { var formArray = form.serializeArray(); // array index 0 contains the max files size @@ -353,7 +353,7 @@ $(document).ready(function() { } uploadingFiles[dirName][fileName] = jqXHR; } else { - var jqXHR = $('.file_upload_start').fileupload('send', {files: files[i]}) + var jqXHR = $('#file_upload_start').fileupload('send', {files: files[i]}) .success(function(result, textStatus, jqXHR) { var response; response=jQuery.parseJSON(result); @@ -450,7 +450,7 @@ $(document).ready(function() { //add multiply file upload attribute to all browsers except konqueror (which crashes when it's used) if(navigator.userAgent.search(/konqueror/i)==-1){ - $('.file_upload_start').attr('multiple','multiple') + $('#file_upload_start').attr('multiple','multiple') } //if the breadcrumb is to long, start by replacing foldernames with '...' except for the current folder diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index a329726da49..82dc96d6435 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -31,7 +31,7 @@ <input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)"> <input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir"> - <input class="file_upload_start" type="file" name='files[]'/> + <input type="file" id="file_upload_start" name='files[]'/> <a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a> |