summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2016-05-17 10:12:19 +0200
committerVincent Petry <pvince81@owncloud.com>2016-05-17 10:12:19 +0200
commit819b7250220e1acaff20ace26fa984ce826d75dd (patch)
tree75e4ea061c772937545ad9e95a30d95250f4be6f /settings
parent5585fa0a6875c69dfba44a2ec683a8f2cf420521 (diff)
parent0d78fbdc2655de79b7bae40b496c28bf6f8ec3d2 (diff)
downloadnextcloud-server-819b7250220e1acaff20ace26fa984ce826d75dd.tar.gz
nextcloud-server-819b7250220e1acaff20ace26fa984ce826d75dd.zip
Merge pull request #24634 from owncloud/sharesettings-sort
fix admin link share settings sorting, use same order as in sidebar
Diffstat (limited to 'settings')
-rw-r--r--settings/templates/admin.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 521f49d708a..6cf4b43c162 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -208,22 +208,22 @@ if ($_['cronErrors']) {
</p>
<p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
- <input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword" class="checkbox"
- value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> />
- <label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/>
-
<input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload" class="checkbox"
value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> />
<label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
- <input type="checkbox" name="shareapi_allow_public_notification" id="allowPublicMailNotification" class="checkbox"
- value="1" <?php if ($_['allowPublicMailNotification'] == 'yes') print_unescaped('checked="checked"'); ?> />
- <label for="allowPublicMailNotification"><?php p($l->t('Allow users to send mail notification for shared files'));?></label><br/>
+ <input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword" class="checkbox"
+ value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> />
+ <label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/>
<input type="checkbox" name="shareapi_default_expire_date" id="shareapiDefaultExpireDate" class="checkbox"
value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') print_unescaped('checked="checked"'); ?> />
<label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date'));?></label><br/>
+ <input type="checkbox" name="shareapi_allow_public_notification" id="allowPublicMailNotification" class="checkbox"
+ value="1" <?php if ($_['allowPublicMailNotification'] == 'yes') print_unescaped('checked="checked"'); ?> />
+ <label for="allowPublicMailNotification"><?php p($l->t('Allow users to send mail notification for shared files'));?></label><br/>
+
</p>
<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden');?>">
<?php p($l->t( 'Expire after ' )); ?>