diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-12-19 09:51:18 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-12-19 09:51:18 +0100 |
| commit | 995f01fa2aaaa92a883a75d9d2ecc1673e7fb573 (patch) | |
| tree | 4e531621610c78dd8660b498e91e06876b0f889e /settings/templates | |
| parent | 587bdd9a74d06ddfedf9a7deae4c38047582b817 (diff) | |
| parent | 5913af8a72e384f8fee89501b3a297b70460c1e0 (diff) | |
| download | nextcloud-server-995f01fa2aaaa92a883a75d9d2ecc1673e7fb573.tar.gz nextcloud-server-995f01fa2aaaa92a883a75d9d2ecc1673e7fb573.zip | |
Merge pull request #12921 from owncloud/user-mail-user-management
Mail address of users is now changable in the user management
Diffstat (limited to 'settings/templates')
| -rw-r--r-- | settings/templates/users/main.php | 8 | ||||
| -rw-r--r-- | settings/templates/users/part.userlist.php | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/settings/templates/users/main.php b/settings/templates/users/main.php index 2004c10b9ac..73552f8ad2e 100644 --- a/settings/templates/users/main.php +++ b/settings/templates/users/main.php @@ -65,7 +65,13 @@ translation('settings'); <p> <input type="checkbox" name="MailOnUserCreate" value="MailOnUserCreate" id="CheckboxMailOnUserCreate"> <label for="CheckboxMailOnUserCreate"> - <?php p($l->t('Send mail to new user')) ?> + <?php p($l->t('Send email to new user')) ?> + </label> + </p> + <p> + <input type="checkbox" name="EmailAddress" value="EmailAddress" id="CheckboxEmailAddress"> + <label for="CheckboxEmailAddress"> + <?php p($l->t('Show email address')) ?> </label> </p> </div> diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php index 6a6b0b69fa2..4346920e43a 100644 --- a/settings/templates/users/part.userlist.php +++ b/settings/templates/users/part.userlist.php @@ -7,6 +7,7 @@ <th id='headerName'><?php p($l->t('Username'))?></th> <th id="headerDisplayName"><?php p($l->t( 'Full Name' )); ?></th> <th id="headerPassword"><?php p($l->t( 'Password' )); ?></th> + <th class="mailAddress"><?php p($l->t( 'Email' )); ?></th> <th id="headerGroups"><?php p($l->t( 'Groups' )); ?></th> <?php if(is_array($_['subadmins']) || $_['subadmins']): ?> <th id="headerSubAdmins"><?php p($l->t('Group Admin for')); ?></th> @@ -33,6 +34,10 @@ src="<?php print_unescaped(image_path('core', 'actions/rename.svg'))?>" alt="<?php p($l->t("set new password"))?>" title="<?php p($l->t("set new password"))?>"/> </td> + <td class="mailAddress"><span></span> <img class="svg action" + src="<?php p(image_path('core', 'actions/rename.svg'))?>" + alt="<?php p($l->t('change email address'))?>" title="<?php p($l->t('change email address'))?>"/> + </td> <td class="groups"></td> <?php if(is_array($_['subadmins']) || $_['subadmins']): ?> <td class="subadmins"></td> |