summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-04-01 16:44:31 +0200
committerMorris Jobke <hey@morrisjobke.de>2014-04-01 16:44:31 +0200
commit017d7953d74ffe8422dad41d2c0a80ef89ddff0f (patch)
tree70f42c262e7cf643c0201599937f9e55b8b6c45d
parent6e6a131b3258fcf91cb4573d32dd8ed9ecfe52ab (diff)
parentacfb3cfff544096342b9d44410bcb74bbffec99a (diff)
downloadnextcloud-server-017d7953d74ffe8422dad41d2c0a80ef89ddff0f.tar.gz
nextcloud-server-017d7953d74ffe8422dad41d2c0a80ef89ddff0f.zip
Merge pull request #7984 from owncloud/wording-applicable2
External Storage: change confusing 'applicable' to 'available for', default to »All Users«
-rw-r--r--apps/files_external/templates/settings.php11
1 files changed, 7 insertions, 4 deletions
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index a2bdbcf4632..e8815acaf16 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -9,7 +9,7 @@
<th><?php p($l->t('External storage')); ?></th>
<th><?php p($l->t('Configuration')); ?></th>
<!--<th><?php p($l->t('Options')); ?></th> -->
- <?php if ($_['isAdminPage']) print_unescaped('<th>'.$l->t('Applicable').'</th>'); ?>
+ <?php if ($_['isAdminPage']) print_unescaped('<th>'.$l->t('Available for').'</th>'); ?>
<th>&nbsp;</th>
</tr>
</thead>
@@ -88,9 +88,12 @@
data-applicable-users='<?php if (isset($mount['applicable']['users']))
print_unescaped(json_encode($mount['applicable']['users'])); ?>'>
<select class="chzn-select"
- multiple style="width:20em;"
- data-placeholder="<?php p($l->t('None set')); ?>">
- <option value="all" <?php if (isset($mount['applicable']['users']) && in_array('all', $mount['applicable']['users'])) print_unescaped('selected="selected"');?> ><?php p($l->t('All Users')); ?></option>
+ multiple style="width:20em;"
+ data-placeholder="<?php p($l->t('No user or group')); ?>">
+ <option value="all"
+ <?php if (empty($mount['class']) || (isset($mount['applicable']['users']) && in_array('all', $mount['applicable']['users']))) print_unescaped('selected="selected"');?> >
+ <?php p($l->t('All Users')); ?>
+ </option>
<optgroup label="<?php p($l->t('Groups')); ?>">
<?php foreach ($_['groups'] as $group): ?>
<option value="<?php p($group); ?>(group)"