diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-08-11 19:37:17 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2016-08-11 19:37:17 +0200 |
| commit | 8261ccce1be32c1467874d537240585c0d841600 (patch) | |
| tree | 2b654700b2069eafbc2562e89621c748632c0e31 /settings/templates | |
| parent | 225eb27bcac1e710a4aba723483745bb3677460f (diff) | |
| parent | f68f1d5f37e248aa7e5ac56e34fe79ce184ce149 (diff) | |
| download | nextcloud-server-8261ccce1be32c1467874d537240585c0d841600.tar.gz nextcloud-server-8261ccce1be32c1467874d537240585c0d841600.zip | |
Merge branch 'master' into implement_712
Diffstat (limited to 'settings/templates')
| -rw-r--r-- | settings/templates/personal.php | 6 | ||||
| -rw-r--r-- | settings/templates/settings.development.notice.php | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 890bfd1bbeb..edbc0d24c5d 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -200,7 +200,10 @@ if($_['passwordChangeSupported']) { <button id="add-app-password" class="button"><?php p($l->t('Create new app password')); ?></button> </div> <div id="app-password-result" class="hidden"> - <span><?php p($l->t('Use the credentials below to configure your app or device.')); ?></span> + <span> + <?php p($l->t('Use the credentials below to configure your app or device.')); ?> + <?php p($l->t('For security reasons this password will only be shown once.')); ?> + </span> <div class="app-password-row"> <span class="app-password-label"><?php p($l->t('Username')); ?></span> <input id="new-app-login-name" type="text" readonly="readonly"/> @@ -208,6 +211,7 @@ if($_['passwordChangeSupported']) { <div class="app-password-row"> <span class="app-password-label"><?php p($l->t('Password')); ?></span> <input id="new-app-password" type="text" readonly="readonly"/> + <a class="clipboardButton icon icon-clippy" data-clipboard-target="#new-app-password"></a> <button id="app-password-hide" class="button"><?php p($l->t('Done')); ?></button> </div> </div> diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings.development.notice.php index 4e6bbd8db9f..a96661e5de1 100644 --- a/settings/templates/settings.development.notice.php +++ b/settings/templates/settings.development.notice.php @@ -1,4 +1,6 @@ -<?php if (OC_Util::getEditionString() === ''): ?> +<?php +/** @var \OCP\IL10N $l */ +if (OC_Util::getEditionString() === ''): ?> <p> <?php print_unescaped(str_replace( [ @@ -13,7 +15,7 @@ '<a href="https://www.gnu.org/licenses/agpl-3.0.html" target="_blank" rel="noreferrer">', '</a>', ], - $l->t('Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title="Affero General Public License">AGPL</abbr>{linkclose}.') + $l->t('Developed by the {communityopen}Nextcloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}AGPL{linkclose}.') )); ?> </p> <?php endif; ?> |