diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-01-23 00:39:11 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-01-23 00:39:11 +0100 |
| commit | f950ce82ae137977eeca5babe69d732ca55cbeaa (patch) | |
| tree | 4c1b949c81b45ce081503343780eea91afd6b659 /core/templates | |
| parent | 4ec6debe2b145b0df106c7e5a3f4ed0cf2885957 (diff) | |
| parent | 4474421ada2a4b5642f1a081d6491d7858b3b9b0 (diff) | |
| download | nextcloud-server-f950ce82ae137977eeca5babe69d732ca55cbeaa.tar.gz nextcloud-server-f950ce82ae137977eeca5babe69d732ca55cbeaa.zip | |
Merge branch 'master' into mobile-style
Conflicts:
apps/files/js/files.js
apps/files_sharing/css/public.css
apps/files_sharing/js/public.js
apps/files_sharing/templates/public.php
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/installation.php | 1 | ||||
| -rw-r--r-- | core/templates/mail.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/templates/installation.php b/core/templates/installation.php index ec55a65ea58..182fc83a4d4 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -59,6 +59,7 @@ <img class="svg" id="adminpass-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt="" /> <input type="checkbox" id="show" name="show" /> <label for="show"></label> + <div class="strengthify-wrapper"></div> </p> </fieldset> diff --git a/core/templates/mail.php b/core/templates/mail.php index 4fa54aa5283..b8b0a2bfe96 100644 --- a/core/templates/mail.php +++ b/core/templates/mail.php @@ -12,7 +12,7 @@ <td bgcolor="#f8f8f8" width="20px"> </td> <td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;"> <?php -print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link']))); +print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link']))); if ( isset($_['expiration']) ) { p($l->t("The share will expire on %s.", array($_['expiration']))); print_unescaped('<br><br>'); |