sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

user mgmt: move 'Show storage location' and 'Show last log in' to settings area

remotes/origin/fix-10825
Jan-Christoph Borchardt 2014-08-29 00:08:01 +07:00
parent c7c54d9361
commit ba841d9561
4 changed files with 46 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
settings/css/settings.css
Unescape Escape View File

@ -100,11 +100,6 @@ tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:point
tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
tr:hover>td.remove>a { float:right; }
div.quota {
margin: 10px;
display: block;
}
div.quota-select-wrapper { position: relative; }
div.recoveryPassword { left:50em; display:block; position:absolute; top:-1px; }
input#recoveryPassword {width:15em;}
#controls select.quota {
@ -113,11 +108,6 @@ input#recoveryPassword {width:15em;}
height: 37px;
}
select.quota-user { position:relative; left:0; top:0; width:10em; }
div.quota>span {
white-space: nowrap;
color: #888;
text-shadow: 0 1px 0 #fff;
}
select.quota.active { background: #fff; }
input.userFilter {width: 200px;}

18
settings/templates/users/main.php
Unescape Escape View File

@ -22,7 +22,23 @@ $userlistParams['subadmingroups'] = array_flip($items);
<div id="app-navigation">
<?php print_unescaped($this->inc('users/part.grouplist')); ?>
<div id="app-settings">
<?php print_unescaped($this->inc('users/part.setquota')); ?>
<div id="app-settings-header">
<button class="settings-button" tabindex="0" data-apps-slide-toggle="#app-settings-content"></button>
</div>
<div id="app-settings-content">
<?php print_unescaped($this->inc('users/part.setquota')); ?>
<div id="userlistoptions">
<p><label>
<input type="checkbox" name="StorageLocation" value="StorageLocation" id="CheckboxStorageLocation">
<?php p($l->t('Show storage location')) ?>
</label></p>
<p><label>
<input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin">
<?php p($l->t('Show last log in')) ?>
</label></p>
</div>
</div>
</div>
</div>

11
settings/templates/users/part.createuser.php
Unescape Escape View File

@ -28,17 +28,6 @@
alt="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"/>
</div>
<?php endif; ?>
<form id="userlistoptions">
<?php p($l->t('Display')) ?> :
<label><input type="checkbox" name="StorageLocation" value="StorageLocation" id="CheckboxStorageLocation">
<?php p($l->t('Location')) ?>
</label>
<label><input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin">
<?php p($l->t('Last login')) ?>
</label>
</form>
<form autocomplete="off" id="usersearchform">
<input type="text" class="input userFilter" placeholder="<?php p($l->t('Search Users and Groups')); ?>" />
</form>

63
settings/templates/users/part.setquota.php
Unescape Escape View File

@ -1,39 +1,34 @@
<div id="app-settings-header">
<button class="settings-button" tabindex="0" data-apps-slide-toggle="#app-settings-content"></button>
</div>
<div id="app-settings-content">
<div class="quota">
<!-- Default storage -->
<span><?php p($l->t('Default Quota'));?></span>
<?php if((bool) $_['isAdmin']): ?>
<select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>" data-tipsy-gravity="s">
<option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
<?php p($l->t('Unlimited'));?>
</option>
<?php foreach($_['quota_preset'] as $preset):?>
<?php if($preset !== 'default'):?>
<option <?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?> value='<?php p($preset);?>'>
<?php p($preset);?>
</option>
<?php endif;?>
<?php endforeach;?>
<?php if($_['defaultQuotaIsUserDefined']):?>
<option selected="selected" value='<?php p($_['default_quota']);?>'>
<?php p($_['default_quota']);?>
<div class="quota">
<!-- Default storage -->
<span><?php p($l->t('Default Quota'));?></span>
<?php if((bool) $_['isAdmin']): ?>
<select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>" data-tipsy-gravity="s">
<option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
<?php p($l->t('Unlimited'));?>
</option>
<?php foreach($_['quota_preset'] as $preset):?>
<?php if($preset !== 'default'):?>
<option <?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?> value='<?php p($preset);?>'>
<?php p($preset);?>
</option>
<?php endif;?>
<option data-new value='other'>
<?php p($l->t('Other'));?>
...
</option>
</select>
<?php endif; ?>
<?php if((bool) !$_['isAdmin']): ?>
<select class='quota' disabled="disabled">
<option selected="selected">
<?php endforeach;?>
<?php if($_['defaultQuotaIsUserDefined']):?>
<option selected="selected" value='<?php p($_['default_quota']);?>'>
<?php p($_['default_quota']);?>
</option>
</select>
<?php endif; ?>
</div>
<?php endif;?>
<option data-new value='other'>
<?php p($l->t('Other'));?>
...
</option>
</select>
<?php endif; ?>
<?php if((bool) !$_['isAdmin']): ?>
<select class='quota' disabled="disabled">
<option selected="selected">
<?php p($_['default_quota']);?>
</option>
</select>
<?php endif; ?>
</div>