mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolve conflicts while picking c0fb623

This commit is contained in:
raghunayyar 2014-01-26 20:51:29 +05:30 committed by Arthur Schiwon
parent f0e69b2b99
commit 0663d954e6
3 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/css/styles.css
View File

@ -309,7 +309,7 @@ input[type="submit"].enabled {
position: fixed;
top:45px;
right: 0;
left: 0;
left:380px;
height: 44px;
width: 100%;
padding: 0;
@ -320,9 +320,6 @@ input[type="submit"].enabled {
}
/* account for shift of controls bar due to app navigation */
#body-user #controls,
#body-settings #controls {
padding-left: 80px;
}
#controls .button,
#controls button,
#controls input[type='submit'],

1
settings/css/settings.css
View File

@ -57,7 +57,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; }
table.grid { width:100%; }
div.quota {
float: right;
display: block;

72
settings/templates/users.php
View File

@ -14,30 +14,29 @@ unset($items['admin']);
$_['subadmingroups'] = array_flip($items);
?>
<div id="controls">
<form id="newuser" autocomplete="off">
<input id="newusername" type="text" placeholder="<?php p($l->t('Login Name'))?>" /> <input
type="password" id="newuserpassword"
placeholder="<?php p($l->t('Password'))?>" /> <select
class="groupsselect"
id="newusergroups" data-placeholder="groups"
title="<?php p($l->t('Groups'))?>" multiple="multiple">
<?php foreach($_["groups"] as $group): ?>
<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
<?php endforeach;?>
</select> <input type="submit" value="<?php p($l->t('Create'))?>" />
</form>
<?php if((bool)$_['recoveryAdminEnabled']): ?>
<div class="recoveryPassword">
<input id="recoveryPassword"
type="password"
placeholder="<?php p($l->t('Admin Recovery Password'))?>"
title="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"
alt="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"/>
</div>
<?php endif; ?>
<div class="quota">
<span><?php p($l->t('Default Storage'));?></span>
<!-- THE APP NAVIGATION LEFT CONTENT AREA -->
<div id="app-navigation">
<ul>
<!-- Add new group -->
<li>
<input type="text" placeholder="<?php p($l->t('Group')); ?>..." />
<button><?php p($l->t('Add')); ?></button>
</li>
<!-- Everyone -->
<li>
<a href="#"><?php p($l->t('Everyone')); ?></a>
</li>
<!--List of Groups-->
<?php foreach($_["groups"] as $group): ?>
<li>
<a href="#"><?php p($group['name']);?></a>
</li>
<?php endforeach; ?>
</ul>
<!-- Default storage -->
<div class="app-settings">
<div class="quota">
<span><?php p($l->t('Default Storage'));?></span>
<?php if((bool) $_['isadmin']): ?>
<select class='quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
<option
@ -73,9 +72,32 @@ $_['subadmingroups'] = array_flip($items);
</option>
</select>
<?php endif; ?>
</div>
</div>
</div>
<div id="controls">
<form id="newuser" autocomplete="off">
<input id="newusername" type="text" placeholder="<?php p($l->t('Login Name'))?>" /> <input
type="password" id="newuserpassword"
placeholder="<?php p($l->t('Password'))?>" /> <select
class="groupsselect"
id="newusergroups" data-placeholder="groups"
title="<?php p($l->t('Groups'))?>" multiple="multiple">
<?php foreach($_["groups"] as $group): ?>
<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
<?php endforeach;?>
</select> <input type="submit" value="<?php p($l->t('Create'))?>" />
</form>
<?php if((bool)$_['recoveryAdminEnabled']): ?>
<div class="recoveryPassword">
<input id="recoveryPassword"
type="password"
placeholder="<?php p($l->t('Admin Recovery Password'))?>"
title="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"
alt="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"/>
</div>
<?php endif; ?>
</div>
<table class="hascontrols grid" data-groups="<?php p(json_encode($allGroups));?>">
<thead>
<tr>