aboutsummaryrefslogtreecommitdiffstats
path: root/core/js/share
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2018-11-01 02:36:05 +0100
committerDaniel Calviño Sánchez <danxuliu@gmail.com>2018-11-01 21:33:10 +0100
commit9dea41f8fee933f496a452efc10bcbac9d3b2df5 (patch)
treea5ee7afac0f5c129c3309c35269928f1a1c101cb /core/js/share
parentb23289da1a9c7a6be87d2e421a44199fc64a986c (diff)
downloadnextcloud-server-9dea41f8fee933f496a452efc10bcbac9d3b2df5.tar.gz
nextcloud-server-9dea41f8fee933f496a452efc10bcbac9d3b2df5.zip
Fix wording, sort 'Add another link' to bottom so it does not confuse
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Diffstat (limited to 'core/js/share')
-rw-r--r--core/js/share/sharedialoglinkshareview_popover_menu.handlebars39
1 files changed, 20 insertions, 19 deletions
diff --git a/core/js/share/sharedialoglinkshareview_popover_menu.handlebars b/core/js/share/sharedialoglinkshareview_popover_menu.handlebars
index 97a642fbf9a..cc951ce047d 100644
--- a/core/js/share/sharedialoglinkshareview_popover_menu.handlebars
+++ b/core/js/share/sharedialoglinkshareview_popover_menu.handlebars
@@ -5,23 +5,6 @@
<input id="linkText-{{cid}}" class="linkText" type="text" readonly="readonly" value="{{shareLinkURL}}" />
</span>
</li>
- <li>
- <a href="#" class="new-share">
- <span class="icon-loading-small hidden"></span>
- <span class="icon icon-add"></span>
- <span>{{newShareLabel}}</span>
- </a>
- </li>
- {{#if showHideDownloadCheckbox}}
- <li>
- <span class="menuitem">
- <span class="icon-loading-small hidden"></span>
- <input type="checkbox" name="hideDownload" id="sharingDialogHideDownload-{{cid}}" class="checkbox hideDownloadCheckbox"
- {{#if hideDownload}}checked="checked"{{/if}} />
- <label for="sharingDialogHideDownload-{{cid}}">{{hideDownloadLabel}}</label>
- </span>
- </li>
- {{/if}}
{{#if publicUpload}}
<li>
<span class="menuitem">
@@ -35,7 +18,8 @@
<span class="icon-loading-small hidden"></span>
<input type="radio" name="publicUpload" value="{{publicUploadRWValue}}" id="sharingDialogAllowPublicUpload-rw-{{cid}}" class="radio publicUploadRadio" {{{publicUploadRWChecked}}} />
<label for="sharingDialogAllowPublicUpload-rw-{{cid}}">{{publicUploadRWLabel}}</label>
- </span></li>
+ </span>
+ </li>
<li>
<span class="menuitem">
<span class="icon-loading-small hidden"></span>
@@ -53,6 +37,16 @@
</span>
</li>
{{/if}}
+ {{#if showHideDownloadCheckbox}}
+ <li>
+ <span class="menuitem">
+ <span class="icon-loading-small hidden"></span>
+ <input type="checkbox" name="hideDownload" id="sharingDialogHideDownload-{{cid}}" class="checkbox hideDownloadCheckbox"
+ {{#if hideDownload}}checked="checked"{{/if}} />
+ <label for="sharingDialogHideDownload-{{cid}}">{{hideDownloadLabel}}</label>
+ </span>
+ </li>
+ {{/if}}
{{#if showPasswordCheckBox}}
<li>
<span class="menuitem">
@@ -107,7 +101,14 @@
</li>
{{/each}}
<li>
- <a href="#" class="unshare"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span>{{unshareLabel}}</span></a>
+ <a href="#" class="unshare"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span>{{unshareLinkLabel}}</span></a>
+ </li>
+ <li>
+ <a href="#" class="new-share">
+ <span class="icon-loading-small hidden"></span>
+ <span class="icon icon-add"></span>
+ <span>{{newShareLabel}}</span>
+ </a>
</li>
</ul>
</div>