diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2013-10-30 23:45:47 +0400 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2013-10-30 23:46:53 +0400 |
| commit | 9d230bcc75185e855d28656ab898ff05c15bebc8 (patch) | |
| tree | 979d5ad4071aa1a3d493941839e7370e366d8831 /settings | |
| parent | ca4a1ee5f7e223b521e41784b0d9b7ed2af162af (diff) | |
Improve quota input field
- Added tooltip with examples
- The quota value returned by the server is now displayed after update
- Fixes #5346
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/js/users.js | 13 | ||||
| -rw-r--r-- | settings/templates/users.php | 4 |
2 files changed, 13 insertions, 4 deletions
diff --git a/settings/js/users.js b/settings/js/users.js index 4c2ad5417ca..6222c0e70cd 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -147,7 +147,11 @@ var UserList = { quotaSelect.on('change', function () { var uid = $(this).parent().parent().attr('data-uid'); var quota = $(this).val(); - setQuota(uid, quota); + setQuota(uid, quota, function(returnedQuota){ + if (quota !== returnedQuota) { + $(quotaSelect).find(':selected').text(returnedQuota); + } + }); }); }, // From http://my.opera.com/GreyWyvern/blog/show.dml/1671288 @@ -428,9 +432,14 @@ $(document).ready(function () { }); $('select.quota, select.quota-user').singleSelect().on('change', function () { + var select = $(this); var uid = $(this).parent().parent().attr('data-uid'); var quota = $(this).val(); - setQuota(uid, quota); + setQuota(uid, quota, function(returnedQuota){ + if (quota !== returnedQuota) { + select.find(':selected').text(returnedQuota); + } + }); }); $('#newuser').submit(function (event) { diff --git a/settings/templates/users.php b/settings/templates/users.php index b556ef4b92e..3c7bfd9f031 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -41,7 +41,7 @@ $_['subadmingroups'] = array_flip($items); <div class="quota"> <span><?php p($l->t('Default Storage'));?></span> <?php if((bool) $_['isadmin']): ?> - <select class='quota'> + <select class='quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB"')) ?>"> <option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'> @@ -136,7 +136,7 @@ $_['subadmingroups'] = array_flip($items); </td> <?php endif;?> <td class="quota"> - <select class='quota-user'> + <select class='quota-user' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB"')) ?>"> <option <?php if($user['quota'] === 'default') print_unescaped('selected="selected"');?> value='default'> |