diff options
| author | Marvin Thomas Rabe <m.rabe@echtzeitraum.de> | 2011-09-30 19:35:25 +0200 |
|---|---|---|
| committer | Marvin Thomas Rabe <m.rabe@echtzeitraum.de> | 2011-09-30 19:35:25 +0200 |
| commit | 5775421f7880d5c7f421fc723c8f1ce2b012c200 (patch) | |
| tree | c68179bb994618dc491249c887994c2cefaddf5b | |
| parent | 301d7bd3a9fed419b8f024f7aa7ecc2da80e3f51 (diff) | |
| download | nextcloud-server-5775421f7880d5c7f421fc723c8f1ce2b012c200.tar.gz nextcloud-server-5775421f7880d5c7f421fc723c8f1ce2b012c200.zip | |
user list has descriptions now
| -rw-r--r-- | core/css/multiselect.css | 2 | ||||
| -rw-r--r-- | settings/css/settings.css | 2 | ||||
| -rw-r--r-- | settings/templates/users.php | 34 |
3 files changed, 25 insertions, 13 deletions
diff --git a/core/css/multiselect.css b/core/css/multiselect.css index 22e5098d3bf..ee426351769 100644 --- a/core/css/multiselect.css +++ b/core/css/multiselect.css @@ -1,5 +1,5 @@ ul.multiselectoptions { z-index:49; position:absolute; background-color:#fff; padding-top:.5em; border:1px solid #ddd; border-top:none; -moz-border-radius-bottomleft:.5em; -webkit-border-bottom-left-radius:.5em; border-bottom-left-radius:.5em; -moz-border-radius-bottomright:.5em; -webkit-border-bottom-right-radius:.5em; border-bottom-right-radius:.5em; -moz-box-shadow:0 1px 1px #ddd; -webkit-box-shadow:0 1px 1px #ddd; box-shadow:0 1px 1px #ddd; } -div.multiselect { padding-right:.6em; display:inline; position:relative; display:inline-block } +div.multiselect { padding-right:.6em; display:inline; position:relative; display:inline-block; vertical-align: bottom; } div.multiselect.active { background-color:#fff; border-bottom:none; border-bottom-left-radius:0; border-bottom-right-radius:0; z-index:50; position:relative } div.multiselect>span:first-child { margin-right:2em; float:left; } div.multiselect>span:last-child { float:right; position:relative } diff --git a/settings/css/settings.css b/settings/css/settings.css index d68d05a73e6..827f215efbe 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -12,6 +12,8 @@ input#identity { width:20em; } /* USERS */ form { display:inline; } +table th { height:2em; padding:0 .5em; color:#999; padding-left:.8em; } +table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; } td.name, td.password { padding-left:.8em; } td.password>img, td.remove>img, td.quota>img { visibility:hidden; } td.password>span { margin-right:1.2em; } diff --git a/settings/templates/users.php b/settings/templates/users.php index a97774cea0b..bcc4d65fe43 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -10,19 +10,29 @@ foreach($_["groups"] as $group) { } ?> +<div id="controls"> + <form id="newuser"> + <th class="name"><input id="newusername" placeholder="<?php echo $l->t('Name')?>" /></th> + <th class="password"><input type="password" id="newuserpassword" placeholder="<?php echo $l->t('Password')?>" /></th> + <th class="groups"><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></th> + <th class="quota"></th> + <th><input type="submit" value="<?php echo $l->t('Create')?>" /></th> + </form> +</div> + <table data-groups="<?php echo implode(', ',$allGroups);?>"> - <thead id="controls"> - <tr><form id="newuser"> - <th class="name"><input id="newusername" placeholder="<?php echo $l->t('Name')?>" /></th> - <th class="password"><input type="password" id="newuserpassword" placeholder="<?php echo $l->t('Password')?>" /></th> - <th class="groups"><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></th> - <th class="quota"></th> - <th><input type="submit" value="<?php echo $l->t('Create')?>" /></th> - </form></tr> + <thead> + <tr> + <th id='headerName'><?php echo $l->t('Name')?></th> + <th id="headerPassword"><?php echo $l->t( 'Password' ); ?></th> + <th id="headerGroups"><?php echo $l->t( 'Groups' ); ?></th> + <th id="headerQuota"><?php echo $l->t( 'Quota' ); ?></th> + <th id="headerRemove"> </th> + </tr> </thead> <tbody> <?php foreach($_["users"] as $user): ?> |