applied patch provided by bug #966 to fix broken user specific quota settings
This commit is contained in:
parent
2473348c5d
commit
107c2de25d
|
@ -34,8 +34,8 @@ li.selected { background-color:#ddd; }
|
||||||
#content>table:not(.nostyle) { margin-top:3em; }
|
#content>table:not(.nostyle) { margin-top:3em; }
|
||||||
table:not(.nostyle) { width:100%; }
|
table:not(.nostyle) { width:100%; }
|
||||||
#rightcontent { padding-left: 1em; }
|
#rightcontent { padding-left: 1em; }
|
||||||
td.quota { position:relative; }
|
|
||||||
div.quota { float:right; display:block; position:absolute; right:25em; top:0; }
|
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 { position:absolute; left:0; top:0; width:10em; }
|
||||||
select.quota-user { position:relative; 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; }
|
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; }
|
||||||
|
|
|
@ -95,9 +95,9 @@ $(document).ready(function(){
|
||||||
$(this).children('img').click();
|
$(this).children('img').click();
|
||||||
});
|
});
|
||||||
|
|
||||||
$('select.quota').live('change',function(){
|
$('select.quota, select.quota-user').live('change',function(){
|
||||||
var select=$(this);
|
var select=$(this);
|
||||||
var uid=$(this).parent().parent().data('uid');
|
var uid=$(this).parent().parent().parent().data('uid');
|
||||||
var quota=$(this).val();
|
var quota=$(this).val();
|
||||||
var other=$(this).next();
|
var other=$(this).next();
|
||||||
if(quota!='other'){
|
if(quota!='other'){
|
||||||
|
@ -110,7 +110,7 @@ $(document).ready(function(){
|
||||||
other.focus();
|
other.focus();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
$('select.quota').each(function(i,select){
|
$('select.quota, select.quota-user').each(function(i,select){
|
||||||
$(select).data('previous',$(select).val());
|
$(select).data('previous',$(select).val());
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -207,9 +207,9 @@ $(document).ready(function(){
|
||||||
applyMultiplySelect(select);
|
applyMultiplySelect(select);
|
||||||
$('#content table tbody').last().append(tr);
|
$('#content table tbody').last().append(tr);
|
||||||
|
|
||||||
tr.find('select.quota option').attr('selected',null);
|
tr.find('select.quota-user option').attr('selected',null);
|
||||||
tr.find('select.quota option').first().attr('selected','selected');
|
tr.find('select.quota-user option').first().attr('selected','selected');
|
||||||
tr.find('select.quota').data('previous','default');
|
tr.find('select.quota-user').data('previous','default');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
|
@ -12,29 +12,43 @@ foreach($_["groups"] as $group) {
|
||||||
|
|
||||||
<div id="controls">
|
<div id="controls">
|
||||||
<form id="newuser">
|
<form id="newuser">
|
||||||
<input id="newusername" placeholder="<?php echo $l->t('Name')?>" />
|
<input id="newusername" placeholder="<?php echo $l->t('Name')?>" /> <input
|
||||||
<input type="password" id="newuserpassword" placeholder="<?php echo $l->t('Password')?>" />
|
type="password" id="newuserpassword"
|
||||||
<select id="newusergroups" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple">
|
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): ?>
|
<?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;?>
|
<?php endforeach;?>
|
||||||
</select>
|
</select> <input type="submit" value="<?php echo $l->t('Create')?>" />
|
||||||
<input type="submit" value="<?php echo $l->t('Create')?>" />
|
|
||||||
</form>
|
</form>
|
||||||
<div class="quota">
|
<div class="quota">
|
||||||
<span><?php echo $l->t('Default Quota');?>:</span>
|
<span><?php echo $l->t('Default Quota');?>:</span>
|
||||||
|
<div class="quota-select-wrapper">
|
||||||
<select class='quota'>
|
<select class='quota'>
|
||||||
<?php foreach($_['quota_preset'] as $preset):?>
|
<?php foreach($_['quota_preset'] as $preset):?>
|
||||||
<?php if($preset!='default'):?>
|
<?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 endif;?>
|
||||||
<?php endforeach;?>
|
<?php endforeach;?>
|
||||||
<?php if(array_search($_['default_quota'],$_['quota_preset'])===false):?>
|
<?php if(array_search($_['default_quota'],$_['quota_preset'])===false):?>
|
||||||
<option selected="selected" value='<?php echo $_['default_quota'];?>'><?php echo $_['default_quota'];?></option>
|
<option selected="selected"
|
||||||
|
value='<?php echo $_['default_quota'];?>'>
|
||||||
|
<?php echo $_['default_quota'];?>
|
||||||
|
</option>
|
||||||
<?php endif;?>
|
<?php endif;?>
|
||||||
<option value='other'><?php echo $l->t('Other');?>...</option>
|
<option value='other'>
|
||||||
</select>
|
<?php echo $l->t('Other');?>
|
||||||
<input class='quota-other'></input>
|
...
|
||||||
|
</option>
|
||||||
|
</select> <input class='quota-other'></input>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -52,33 +66,47 @@ foreach($_["groups"] as $group) {
|
||||||
<?php foreach($_["users"] as $user): ?>
|
<?php foreach($_["users"] as $user): ?>
|
||||||
<tr data-uid="<?php echo $user["name"] ?>">
|
<tr data-uid="<?php echo $user["name"] ?>">
|
||||||
<td class="name"><?php echo $user["name"]; ?></td>
|
<td class="name"><?php echo $user["name"]; ?></td>
|
||||||
<td class="password">
|
<td class="password"><span>●●●●●●●</span> <img class="svg action"
|
||||||
<span>●●●●●●●</span>
|
src="<?php echo image_path('core','actions/rename.svg')?>"
|
||||||
<img class="svg action" src="<?php echo image_path('core','actions/rename.svg')?>" alt="set new password" title="set new password" />
|
alt="set new password" title="set new password" />
|
||||||
</td>
|
</td>
|
||||||
<td class="groups">
|
<td class="groups"><select
|
||||||
<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">
|
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): ?>
|
<?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;?>
|
<?php endforeach;?>
|
||||||
</select>
|
</select>
|
||||||
</td>
|
</td>
|
||||||
<td class="quota">
|
<td class="quota">
|
||||||
|
<div class="quota-select-wrapper">
|
||||||
<select class='quota-user'>
|
<select class='quota-user'>
|
||||||
<?php foreach($_['quota_preset'] as $preset):?>
|
<?php foreach($_['quota_preset'] as $preset):?>
|
||||||
<option <?php if($user['quota']==$preset) echo 'selected="selected"';?> value='<?php echo $preset;?>'><?php echo $preset;?></option>
|
<option
|
||||||
|
<?php if($user['quota']==$preset) echo 'selected="selected"';?>
|
||||||
|
value='<?php echo $preset;?>'>
|
||||||
|
<?php echo $preset;?>
|
||||||
|
</option>
|
||||||
<?php endforeach;?>
|
<?php endforeach;?>
|
||||||
<?php if(array_search($user['quota'],$_['quota_preset'])===false):?>
|
<?php if(array_search($user['quota'],$_['quota_preset'])===false):?>
|
||||||
<option selected="selected" value='<?php echo $user['quota'];?>'><?php echo $user['quota'];?></option>
|
<option selected="selected" value='<?php echo $user['quota'];?>'>
|
||||||
|
<?php echo $user['quota'];?>
|
||||||
|
</option>
|
||||||
<?php endif;?>
|
<?php endif;?>
|
||||||
<option value='other'><?php echo $l->t('Other');?>...</option>
|
<option value='other'>
|
||||||
</select>
|
<?php echo $l->t('Other');?>
|
||||||
<input class='quota-other'></input>
|
...
|
||||||
|
</option>
|
||||||
|
</select> <input class='quota-other'></input>
|
||||||
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td class="remove">
|
<td class="remove"><?php if($user['name']!=OC_User::getUser()):?> <img
|
||||||
<?php if($user['name']!=OC_User::getUser()):?>
|
alt="Delete" title="<?php echo $l->t('Delete')?>" class="svg action"
|
||||||
<img alt="Delete" title="<?php echo $l->t('Delete')?>" class="svg action" src="<?php echo image_path('core','actions/delete.svg') ?>" />
|
src="<?php echo image_path('core','actions/delete.svg') ?>" /> <?php endif;?>
|
||||||
<?php endif;?>
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
|
|
Loading…
Reference in New Issue