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

Merge pull request #5278 from nextcloud/stable12-5277 

[stable12] Allow to change avatar when groups are disables
This commit is contained in:
Morris Jobke 2017-06-07 11:42:21 -05:00 committed by GitHub
parent d08a6c74ab d866547805
commit 3ba2d6179a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
settings/css/settings.css
View File

@ -12,6 +12,10 @@ input#openid, input#webdav {
/* PERSONAL */
.clear {
clear: both;
}
/* icons for sidebar */
.nav-icon-personal-settings {
background-image: url('../img/personal.svg?v=1');
@ -226,8 +230,7 @@ input#openid, input#webdav {
}
#lostpassword,
#groups,
#passwordform {
#groups {
display: inline-block;
margin-bottom: 0;
padding-bottom: 0;

4
settings/templates/personal.php
View File

@ -239,6 +239,8 @@
</div>
</div>
<div class="clear"></div>
<?php if ($_['showGroupMembership'] === true): ?>
<div id="groups" class="section">
<h2><?php p($l->t('Groups')); ?></h2>
@ -353,7 +355,7 @@ if($_['passwordChangeSupported']) {
<h3><?php p($l->t('App passwords'));?></h3>
<p class="settings-hint"><?php p($l->t('Here you can generate individual passwords for apps so you don’t have to give out your password. You can revoke them individually too.'));?></p>
<div id="app-password-form">
<input id="app-password-name" type="text" placeholder="<?php p($l->t('App name')); ?>">
<button id="add-app-password" class="button"><?php p($l->t('Create new app password')); ?></button>