diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-23 10:39:12 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-09-23 10:39:12 +0200 |
| commit | f6e8a388a90fff82c16589cf09911ef3aeb4005d (patch) | |
| tree | a47f16ed41fa3b884a4d709ef09136a4d0c785d0 /apps/files/templates | |
| parent | 82cbbb8ab8cfe81559c45905d7fca819d71df346 (diff) | |
| parent | 9851f0f4f2a97dc6ac1382bcd533eb23feffa4e0 (diff) | |
| download | nextcloud-server-f6e8a388a90fff82c16589cf09911ef3aeb4005d.tar.gz nextcloud-server-f6e8a388a90fff82c16589cf09911ef3aeb4005d.zip | |
Merge branch 'master' into encryption_improved_error_messages_4617
Conflicts:
settings/ajax/changepassword.php
Diffstat (limited to 'apps/files/templates')
| -rw-r--r-- | apps/files/templates/fileexists.html | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/apps/files/templates/fileexists.html b/apps/files/templates/fileexists.html new file mode 100644 index 00000000000..662177ac7ed --- /dev/null +++ b/apps/files/templates/fileexists.html @@ -0,0 +1,26 @@ +<div id="{dialog_name}" title="{title}" class="fileexists"> + <span class="why">{why}<!-- Which files do you want to keep --></span><br/> + <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" />New Files<span class="count"></span></label></th> + <th><label><input class="allexistingfiles" type="checkbox" />Already existing files<span class="count"></span></label></th> + </table> + <div class="conflicts"> + <div class="template"> + <div class="filename"></div> + <div class="replacement"> + <input type="checkbox" /> + <span class="svg icon"></span> + <div class="mtime"></div> + <div class="size"></div> + </div> + <div class="original"> + <input type="checkbox" /> + <span class="svg icon"></span> + <div class="mtime"></div> + <div class="size"></div> + </div> + </div> + </div> +</div> |