applied patch provided by bug #966 to fix broken user specific quota settings

diff --git a/settings/css/settings.css b/settings/css/settings.css
index d40838579774f5b0cb9cc114a6b8f132a54a4af3..df1e3cfd3c2947bbf0f96d0a58213562d05c0c15 100644 (file)
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -34,8 +34,8 @@ li.selected { background-color:#ddd; }
 #content>table:not(.nostyle) { margin-top:3em; }
 table:not(.nostyle) { width:100%; }
 #rightcontent { padding-left: 1em; }
-td.quota { position:relative; }
 div.quota { float:right; display:block; position:absolute; right:25em; top:0; }
+div.quota-select-wrapper { position: relative; }
 select.quota { position:absolute; left:0; top:0; width:10em; }
 select.quota-user { position:relative; left:0; top:0; width:10em; }
 input.quota-other { display:none; position:absolute; left:0.1em; top:0.1em; width:7em; border:none; -webkit-box-shadow: none -mox-box-shadow:none ; box-shadow:none; }

diff --git a/settings/js/users.js b/settings/js/users.js
index 7c3c3d37b18e3f09cb04fa86c138eeb123b43802..f173357749e5e046e378ba0a6b3ae12ae0299fe3 100644 (file)
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -95,9 +95,9 @@ $(document).ready(function(){
                $(this).children('img').click();
        });
        
-       $('select.quota').live('change',function(){
+       $('select.quota, select.quota-user').live('change',function(){
                var select=$(this);
-               var uid=$(this).parent().parent().data('uid');
+               var uid=$(this).parent().parent().parent().data('uid');
                var quota=$(this).val();
                var other=$(this).next();
                if(quota!='other'){
@@ -110,7 +110,7 @@ $(document).ready(function(){
                        other.focus();
                }
        });
-       $('select.quota').each(function(i,select){
+       $('select.quota, select.quota-user').each(function(i,select){
                $(select).data('previous',$(select).val());
        })
        
@@ -207,9 +207,9 @@ $(document).ready(function(){
                                        applyMultiplySelect(select);
                                        $('#content table tbody').last().append(tr);
 
-                                       tr.find('select.quota option').attr('selected',null);
-                                       tr.find('select.quota option').first().attr('selected','selected');
-                                       tr.find('select.quota').data('previous','default');
+                                       tr.find('select.quota-user option').attr('selected',null);
+                                       tr.find('select.quota-user option').first().attr('selected','selected');
+                                       tr.find('select.quota-user').data('previous','default');
                                }
                        }
                );

diff --git a/settings/templates/users.php b/settings/templates/users.php
index 1951f17a0b7723534d9900655519fba66060225c..ea3fe777ffee05634f14d2cb63b61998b6d6409d 100644 (file)
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -12,29 +12,43 @@ foreach($_["groups"] as $group) {
 
 <div id="controls">
        <form id="newuser">
-               <input id="newusername" placeholder="<?php echo $l->t('Name')?>" />
-               <input type="password" id="newuserpassword" placeholder="<?php echo $l->t('Password')?>" />
-               <select id="newusergroups" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple">
-               <?php foreach($_["groups"] as $group): ?>
-                       <option value="<?php echo $group['name'];?>"><?php echo $group['name'];?></option>
-               <?php endforeach;?>
-               </select>
-               <input type="submit" value="<?php echo $l->t('Create')?>" />
+               <input id="newusername" placeholder="<?php echo $l->t('Name')?>" /> <input
+                       type="password" id="newuserpassword"
+                       placeholder="<?php echo $l->t('Password')?>" /> <select
+                       id="newusergroups" data-placeholder="groups"
+                       title="<?php echo $l->t('Groups')?>" multiple="multiple">
+                       <?php foreach($_["groups"] as $group): ?>
+                       <option value="<?php echo $group['name'];?>">
+                               <?php echo $group['name'];?>
+                       </option>
+                       <?php endforeach;?>
+               </select> <input type="submit" value="<?php echo $l->t('Create')?>" />
        </form>
        <div class="quota">
                <span><?php echo $l->t('Default Quota');?>:</span>
-               <select class='quota'>
-                       <?php foreach($_['quota_preset'] as $preset):?>
+               <div class="quota-select-wrapper">
+                       <select class='quota'>
+                               <?php foreach($_['quota_preset'] as $preset):?>
                                <?php if($preset!='default'):?>
-                                       <option <?php if($_['default_quota']==$preset) echo 'selected="selected"';?> value='<?php echo $preset;?>'><?php echo $preset;?></option>
+                               <option
+                               <?php if($_['default_quota']==$preset) echo 'selected="selected"';?>
+                                       value='<?php echo $preset;?>'>
+                                       <?php echo $preset;?>
+                               </option>
                                <?php endif;?>
-                       <?php endforeach;?>
-                       <?php if(array_search($_['default_quota'],$_['quota_preset'])===false):?>
-                               <option selected="selected" value='<?php echo $_['default_quota'];?>'><?php echo $_['default_quota'];?></option>
-                       <?php endif;?>
-                       <option value='other'><?php echo $l->t('Other');?>...</option>
-               </select>
-               <input class='quota-other'></input>
+                               <?php endforeach;?>
+                               <?php if(array_search($_['default_quota'],$_['quota_preset'])===false):?>
+                               <option selected="selected"
+                                       value='<?php echo $_['default_quota'];?>'>
+                                       <?php echo $_['default_quota'];?>
+                               </option>
+                               <?php endif;?>
+                               <option value='other'>
+                                       <?php echo $l->t('Other');?>
+                                       ...
+                               </option>
+                       </select> <input class='quota-other'></input>
+               </div>
        </div>
 </div>
 
@@ -49,38 +63,52 @@ foreach($_["groups"] as $group) {
                </tr>
        </thead>
        <tbody>
-       <?php foreach($_["users"] as $user): ?>
+               <?php foreach($_["users"] as $user): ?>
                <tr data-uid="<?php echo $user["name"] ?>">
                        <td class="name"><?php echo $user["name"]; ?></td>
-                       <td class="password">
-                               <span>●●●●●●●</span>
-                               <img class="svg action" src="<?php echo image_path('core','actions/rename.svg')?>" alt="set new password" title="set new password" />
+                       <td class="password"><span>●●●●●●●</span> <img class="svg action"
+                               src="<?php echo image_path('core','actions/rename.svg')?>"
+                               alt="set new password" title="set new password" />
                        </td>
-                       <td class="groups">
-                               <select data-username="<?php echo $user['name'] ;?>" data-user-groups="<?php echo $user['groups'] ;?>" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple">
+                       <td class="groups"><select
+                               data-username="<?php echo $user['name'] ;?>"
+                               data-user-groups="<?php echo $user['groups'] ;?>"
+                               data-placeholder="groups" title="<?php echo $l->t('Groups')?>"
+                               multiple="multiple">
                                        <?php foreach($_["groups"] as $group): ?>
-                                               <option value="<?php echo $group['name'];?>"><?php echo $group['name'];?></option>
+                                       <option value="<?php echo $group['name'];?>">
+                                               <?php echo $group['name'];?>
+                                       </option>
                                        <?php endforeach;?>
-                               </select>
+                       </select>
                        </td>
                        <td class="quota">
-                               <select class='quota-user'>
-                                       <?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(array_search($user['quota'],$_['quota_preset'])===false):?>
-                                               <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'></input>
+                               <div class="quota-select-wrapper">
+                                       <select class='quota-user'>
+                                               <?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(array_search($user['quota'],$_['quota_preset'])===false):?>
+                                               <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'></input>
+                               </div>
                        </td>
-                       <td class="remove">
-                               <?php if($user['name']!=OC_User::getUser()):?>
-                                       <img alt="Delete" title="<?php echo $l->t('Delete')?>" class="svg action" src="<?php echo image_path('core','actions/delete.svg') ?>" />
-                               <?php endif;?>
+                       <td class="remove"><?php if($user['name']!=OC_User::getUser()):?> <img
+                               alt="Delete" title="<?php echo $l->t('Delete')?>" class="svg action"
+                               src="<?php echo image_path('core','actions/delete.svg') ?>" /> <?php endif;?>
                        </td>
                </tr>
-       <?php endforeach; ?>
+               <?php endforeach; ?>
        </tbody>
 </table>