diff options
| author | Bjoern Schiessle <schiessle@owncloud.com> | 2014-06-03 20:44:55 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2014-06-05 15:44:56 +0200 |
| commit | cf9099c7885453bcf15e40cbed722f432dffa1fb (patch) | |
| tree | 9c57dfc45bba8717969c0e964f6ce627e51cf870 /settings | |
| parent | c991e148a6a50cefcf7cff3a9b0aa911c398dede (diff) | |
| download | nextcloud-server-cf9099c7885453bcf15e40cbed722f432dffa1fb.tar.gz nextcloud-server-cf9099c7885453bcf15e40cbed722f432dffa1fb.zip | |
This settings doesn't belong together
Revert "make reshare settings foldable"
This reverts commit c01f196f723dcb3dea6947c821a70d4d80563bbd.
Conflicts:
settings/templates/admin.php
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/js/admin.js | 3 | ||||
| -rw-r--r-- | settings/templates/admin.php | 18 |
2 files changed, 10 insertions, 11 deletions
diff --git a/settings/js/admin.js b/settings/js/admin.js index 8c7572fa394..bc95c6a3dc5 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -83,9 +83,6 @@ $(document).ready(function(){ $('#allowLinks').change(function() { $("#publicLinkSettings").toggleClass('hidden', !this.checked); }); - $('#allowResharing').change(function() { - $("#resharingSettings").toggleClass('hidden', !this.checked); - }); $('#security').change(function(){ $.post(OC.filePath('settings','ajax','setsecurity.php'), { enforceHTTPS: $('#forcessl').val() },function(){} ); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index e6438da7988..f0b72d0956e 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -274,14 +274,16 @@ if (!$_['internetconnectionworking']) { <input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> /> <label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/> - <div id="resharingSettings" <?php ($_['allowResharing'] === 'yes') ? print_unescaped('class="indent"') : print_unescaped('class="hidden indent"');?>> - <input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal" - value="global" <?php if ($_['sharePolicy'] === 'global') print_unescaped('checked="checked"'); ?> /> - <label for="sharePolicyGlobal"><?php p($l->t('Allow users to share with anyone')); ?></label><br/> - <input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly" - value="groups_only" <?php if ($_['sharePolicy'] === 'groups_only') print_unescaped('checked="checked"'); ?> /> - <label for="sharePolicyGroupsOnly"><?php p($l->t('Allow users to only share with users in their groups'));?></label><br/> - </div> + </td> + </tr> + <tr> + <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>> + <input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal" + value="global" <?php if ($_['sharePolicy'] === 'global') print_unescaped('checked="checked"'); ?> /> + <label for="sharePolicyGlobal"><?php p($l->t('Allow users to share with anyone')); ?></label><br/> + <input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly" + value="groups_only" <?php if ($_['sharePolicy'] === 'groups_only') print_unescaped('checked="checked"'); ?> /> + <label for="sharePolicyGroupsOnly"><?php p($l->t('Allow users to only share with users in their groups'));?></label><br/> </td> </tr> <tr> |