From aea50a83134a6f02ba5e23e4248bedbc896b3d9f Mon Sep 17 00:00:00 2001
From: Pellaeon Lin <nfsmwlin@gmail.com>
Date: Tue, 21 Oct 2014 22:31:05 +0800
Subject: [PATCH] Polish appearance of askEmail

---
 css/style.css          |  9 +++++++++
 templates/register.php | 24 ++++++++++++++----------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/css/style.css b/css/style.css
index 67f0d78..86ac714 100644
--- a/css/style.css
+++ b/css/style.css
@@ -16,3 +16,12 @@
 #username-icon {
 	top: 17px;
 }
+
+.msg {
+	color: white;
+	margin: 5px;
+}
+
+.groupofone {
+	position: relative;
+}
diff --git a/templates/register.php b/templates/register.php
index 7aca9af..ef4b73c 100644
--- a/templates/register.php
+++ b/templates/register.php
@@ -1,4 +1,6 @@
-<?php if ($_['entered']): ?>
+<?php
+\OCP\Util::addStyle('registration', 'style');
+if ($_['entered']): ?>
 	<?php if (empty($_['errormsg'])): ?>
 		<ul class="success">
 			<li>
@@ -11,10 +13,10 @@
 				<ul class="error">
 					<li><?php print_unescaped($_['errormsg']); ?></li>
 				</ul>
-				<p class="infield">
-					<input type="email" name="email" id="email" placeholder="" value="" required autofocus />
+				<p class="groupofone">
+				<input type="email" name="email" id="email" placeholder="<?php print_unescaped($l->t('Email')); ?>" value="" required autofocus />
 					<label for="email" class="infield"><?php print_unescaped($l->t( 'Email' )); ?></label>
-					<img class="svg" src="<?php print_unescaped(image_path('', 'actions/mail.svg')); ?>" alt=""/>
+					<img id="email-icon" class="svg" src="<?php print_unescaped(image_path('', 'actions/mail.svg')); ?>" alt=""/>
 				</p>
 				<input type="submit" id="submit" value="<?php print_unescaped($l->t('Request verification link')); ?>" />
 			</fieldset>
@@ -26,15 +28,17 @@
 			<?php if (!empty($_['errormsg'])): ?>
 				<ul class="error">
 					<li><?php print_unescaped($_['errormsg']); ?></li>
+					<li><?php print_unescaped($l->t('Please re-enter a valid email address')); ?></li>
 				</ul>
-				<?php print_unescaped($l->t('Please re-enter a valid email address')); ?>
 			<?php else: ?>
-				<?php print_unescaped($l->t('You will receive an email with verification link')); ?>
+				<ul class="msg">
+					<li><?php print_unescaped($l->t('You will receive an email with verification link')); ?></li>
+				</ul>
 			<?php endif; ?>
-			<p class="infield">
-				<input type="email" name="email" id="email" placeholder="" value="" required autofocus />
-				<label for="email" class="infield"><?php print_unescaped($l->t( 'Email' )); ?></label>
-				<img class="svg" src="<?php print_unescaped(image_path('', 'actions/mail.svg')); ?>" alt=""/>
+			<p class="groupofone">
+			<input type="email" name="email" id="email" placeholder="<?php print_unescaped($l->t('Email')); ?>" value="" required autofocus />
+				<label for="email" class="infield"><?php print_unescaped($l->t('Email')); ?></label>
+				<img id="email-icon" class="svg" src="<?php print_unescaped(image_path('', 'actions/mail.svg')); ?>" alt=""/>
 			</p>
 			<input type="submit" id="submit" value="<?php print_unescaped($l->t('Request verification link')); ?>" />
 		</fieldset>