diff options
| author | Hendrik Leppelsack <hendrik@leppelsack.de> | 2015-09-19 15:44:49 +0200 |
|---|---|---|
| committer | Hendrik Leppelsack <hendrik@leppelsack.de> | 2015-09-21 12:57:34 +0200 |
| commit | 964cfc8e08467c93e18d78ab20f311d05b22eeb9 (patch) | |
| tree | 06dd65d9da1d3dbd84d3d7551054625cb1c264fa | |
| parent | 6006a03ef1361f8805c323627fb6d8e9c37be9cd (diff) | |
| download | nextcloud-server-964cfc8e08467c93e18d78ab20f311d05b22eeb9.tar.gz nextcloud-server-964cfc8e08467c93e18d78ab20f311d05b22eeb9.zip | |
fix missing checkboxes in file comparator
| -rw-r--r-- | apps/files/templates/fileexists.html | 12 | ||||
| -rw-r--r-- | core/css/styles.css | 2 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 5 |
3 files changed, 15 insertions, 4 deletions
diff --git a/apps/files/templates/fileexists.html b/apps/files/templates/fileexists.html index 5360a7c8e8f..c783f9a05c7 100644 --- a/apps/files/templates/fileexists.html +++ b/apps/files/templates/fileexists.html @@ -3,24 +3,28 @@ <span class="what">{what}<!-- If you select both versions, the copied file will have a number added to its name. --></span><br/> <br/> <table> - <th><label><input class="allnewfiles" type="checkbox" />{allnewfiles}<span class="count"></span></label></th> - <th><label><input class="allexistingfiles" type="checkbox" />{allexistingfiles}<span class="count"></span></label></th> + <th><input id="checkbox-allnewfiles" class="allnewfiles" type="checkbox" /><label for="checkbox-allnewfiles">{allnewfiles}<span class="count"></span></label></th> + <th><input id="checkbox-allexistingfiles" class="allexistingfiles" type="checkbox" /><label for="checkbox-allexistingfiles">{allexistingfiles}<span class="count"></span></label></th> </table> <div class="conflicts"> <div class="template"> <div class="filename"></div> <div class="replacement"> - <input type="checkbox" /> + <input type="checkbox" class="u-left"/> + <label> <span class="svg icon"></span> <div class="mtime"></div> <div class="size"></div> + </label> </div> <div class="original"> - <input type="checkbox" /> + <input type="checkbox" class="u-left" /> + <label> <span class="svg icon"></span> <div class="mtime"></div> <div class="size"></div> <div class="message"></div> + </label> </div> </div> </div> diff --git a/core/css/styles.css b/core/css/styles.css index 2ec5129a1c5..bc4db43301d 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -178,6 +178,8 @@ input[type="checkbox"] + label:before { opacity: 0.7; } +input[type="checkbox"].u-left +label:before { float: left; } + input[type="checkbox"].white + label:before { background-image: url('../img/actions/checkbox-white.svg'); } diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 52ed34f61ec..719ac8587a4 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -400,6 +400,11 @@ var OCdialogs = { $replacementDiv.find('.icon').css('background-image','url(' + path + ')'); } ); + // connect checkboxes with labels + var checkboxId = $conflicts.find('.conflict').length; + $originalDiv.find('input:checkbox').attr('id', 'checkbox_original_'+checkboxId); + $replacementDiv.find('input:checkbox').attr('id', 'checkbox_replacement_'+checkboxId); + $conflicts.append($conflict); //set more recent mtime bold |