diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-11-27 14:10:11 -0800 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-11-27 14:10:11 -0800 |
| commit | 54b24ca88d34bfdafaeecb12c9c8ba85e21de8f7 (patch) | |
| tree | ab7a5d00e1e593522abc186cb029fef560aec703 /core | |
| parent | 5295993144bf7a67fdcd48c9f8e99e336fd1293e (diff) | |
| parent | 55d7cf8ffd1170f2397fecefaeef5749bb182f32 (diff) | |
| download | nextcloud-server-54b24ca88d34bfdafaeecb12c9c8ba85e21de8f7.tar.gz nextcloud-server-54b24ca88d34bfdafaeecb12c9c8ba85e21de8f7.zip | |
Merge pull request #6048 from owncloud/encryption_initial_enc_indicator
show a message at the log-in screen if inital encryption take place
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 9 | ||||
| -rw-r--r-- | core/templates/login.php | 6 |
2 files changed, 14 insertions, 1 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 5c0aa1fedc2..859f11ff0a8 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -283,6 +283,11 @@ input[type="submit"].enabled { opacity: .6; } +#body-login p#message img { + vertical-align: middle; + padding: 5px; +} + #body-login div.buttons { text-align:center; } #body-login p.info { width: 22em; @@ -481,6 +486,10 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } color: #ccc; } +#body-login .update img.float-spinner { + float: left; +} + #body-user .warning, #body-settings .warning { margin-top: 8px; padding: 5px; diff --git a/core/templates/login.php b/core/templates/login.php index aca42c84387..b81128a3269 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -1,5 +1,5 @@ <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]--> -<form method="post"> +<form method="post" name="login"> <fieldset> <?php if (!empty($_['redirect_url'])) { print_unescaped('<input type="hidden" name="redirect_url" value="' . OC_Util::sanitizeHTML($_['redirect_url']) . '" />'); @@ -18,6 +18,10 @@ <small><?php p($l->t('Please contact your administrator.')); ?></small> </div> <?php endif; ?> + <p id="message" class="hidden"> + <img class="float-spinner" src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>"/> + <span id="messageText"></span> + </p> <p class="infield grouptop"> <input type="text" name="user" id="user" placeholder="" value="<?php p($_['username']); ?>"<?php p($_['user_autofocus'] ? ' autofocus' : ''); ?> |