mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix missing checkboxes in file comparator

This commit is contained in:
Hendrik Leppelsack 2015-09-19 15:44:49 +02:00
parent 6006a03ef1
commit 964cfc8e08
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/files/templates/fileexists.html
View File

@ -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>

2
core/css/styles.css
View File

@ -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');
}

5
core/js/oc-dialogs.js
View File

@ -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