diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2013-02-12 11:05:07 -0800 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2013-02-12 11:05:07 -0800 |
| commit | 316807e0d3f050af3fdd4c8dbc1ca3e1e7bc8cbb (patch) | |
| tree | 10f97c9f5ffaceda74344d77b48fc55a14655ef2 /settings/templates | |
| parent | 5ee0adcd78ea4e84e987a29eb24528de94c7a8fe (diff) | |
| parent | e68e5cc849b625dccc38b903fd19e418d62d1c22 (diff) | |
| download | nextcloud-server-316807e0d3f050af3fdd4c8dbc1ca3e1e7bc8cbb.tar.gz nextcloud-server-316807e0d3f050af3fdd4c8dbc1ca3e1e7bc8cbb.zip | |
Merge pull request #1624 from owncloud/singleselect
Split editable select code used for quota selection into a jquery plugin
Diffstat (limited to 'settings/templates')
| -rw-r--r-- | settings/templates/users.php | 62 |
1 files changed, 29 insertions, 33 deletions
diff --git a/settings/templates/users.php b/settings/templates/users.php index b3cab526947..09a6ae72806 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -33,7 +33,6 @@ $_['subadmingroups'] = array_flip($items); </form> <div class="quota"> <span><?php echo $l->t('Default Storage');?></span> - <div class="quota-select-wrapper"> <?php if((bool) $_['isadmin']): ?> <select class='quota'> <option @@ -60,7 +59,7 @@ $_['subadmingroups'] = array_flip($items); <?php echo $l->t('Other');?> ... </option> - </select> <input class='quota-other'/> + </select> <?php endif; ?> <?php if((bool) !$_['isadmin']): ?> <select class='quota' disabled="disabled"> @@ -69,7 +68,6 @@ $_['subadmingroups'] = array_flip($items); </option> </select> <?php endif; ?> - </div> </div> </div> @@ -129,36 +127,34 @@ $_['subadmingroups'] = array_flip($items); </td> <?php endif;?> <td class="quota"> - <div class="quota-select-wrapper"> - <select class='quota-user'> - <option - <?php if($user['quota']=='default') echo 'selected="selected"';?> - value='default'> - <?php echo $l->t('Default');?> - </option> - <option - <?php if($user['quota']=='none') echo 'selected="selected"';?> - value='none'> - <?php echo $l->t('Unlimited');?> - </option> - <?php foreach($_['quota_preset'] as $preset):?> - <option - <?php if($user['quota']==$preset) echo 'selected="selected"';?> - value='<?php echo $preset;?>'> - <?php echo $preset;?> - </option> - <?php endforeach;?> - <?php if($user['isQuotaUserDefined']):?> - <option selected="selected" value='<?php echo $user['quota'];?>'> - <?php echo $user['quota'];?> - </option> - <?php endif;?> - <option value='other'> - <?php echo $l->t('Other');?> - ... - </option> - </select> <input class='quota-other'/> - </div> + <select class='quota-user'> + <option + <?php if($user['quota']=='default') echo 'selected="selected"';?> + value='default'> + <?php echo $l->t('Default');?> + </option> + <option + <?php if($user['quota']=='none') echo 'selected="selected"';?> + value='none'> + <?php echo $l->t('Unlimited');?> + </option> + <?php foreach($_['quota_preset'] as $preset):?> + <option + <?php if($user['quota']==$preset) echo 'selected="selected"';?> + value='<?php echo $preset;?>'> + <?php echo $preset;?> + </option> + <?php endforeach;?> + <?php if($user['isQuotaUserDefined']):?> + <option selected="selected" value='<?php echo $user['quota'];?>'> + <?php echo $user['quota'];?> + </option> + <?php endif;?> + <option value='other' data-new> + <?php echo $l->t('Other');?> + ... + </option> + </select> </td> <td class="remove"> <?php if($user['name']!=OC_User::getUser()):?> |