From 7177d3a4963ab43a6b24e4f1676bff5d74fc0a52 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 6 May 2014 12:07:53 +0200
Subject: first step of infield label removal, fix login screen

---
 core/css/styles.css | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

(limited to 'core/css')

diff --git a/core/css/styles.css b/core/css/styles.css
index a9ffd83629b..2fd2ad36ab3 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -464,19 +464,19 @@ input[name='password-clone'] {
 	width: 223px !important;
 	padding-left: 36px !important;
 }
-#adminlogin+label+img,
+#adminlogin~img,
 #adminpass-icon,
-#user+label+img,
+#user~img,
 #password-icon {
 	position: absolute;
-	left: 1.25em;
-	top: 1.65em;
+	left: 16px;
+	top: 24px;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
 	filter: alpha(opacity=30);
 	opacity: .3;
 }
 #adminpass-icon, #password-icon {
-	top: 1.1em;
+	top: 18px;
 }
 
 /* General new input field look */
@@ -489,6 +489,11 @@ input[name='password-clone'] {
 }
 
 /* Nicely grouping input field sets */
+.grouptop,
+.groupmiddle,
+.groupbottom {
+	position: relative;
+}
 #body-login .grouptop input {
 	margin-bottom: 0;
 	border-bottom: 0;
@@ -511,23 +516,11 @@ input[name='password-clone'] {
 	box-shadow: 0 1px 0 rgba(0,0,0,.1) inset !important;
 }
 
-/* In field labels. No, HTML placeholder does not work as well. */
-#body-login .groupmiddle label, #body-login .groupbottom label { top:.65em; }
-p.infield { position:relative; }
-label.infield { cursor:text !important; top:1.05em; left:.85em; }
-#body-login form label.infield { /* labels are ellipsized when too long, keep them short */
-	position: absolute;
-	width: 82%;
-	margin-left: 26px;
-	font-size: 19px;
-	color: #aaa;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-#body-login #databaseField .infield {
-	margin-left: 0;
+/* keep the labels for screen readers but hide them since we use placeholders */
+label.infield {
+	display: none;
 }
+
 #body-login form input[type="checkbox"]+label {
 	position: relative;
 	margin: 0;
-- 
cgit v1.2.3


From 04aa08529257b5c981603b50743818fab8f064a9 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 6 May 2014 12:14:11 +0200
Subject: infield label removal: fix installation screen

---
 core/css/styles.css             |  2 +-
 core/templates/installation.php | 35 +++++++++++++++++++++--------------
 2 files changed, 22 insertions(+), 15 deletions(-)

(limited to 'core/css')

diff --git a/core/css/styles.css b/core/css/styles.css
index 2fd2ad36ab3..39ba541fcaa 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -578,7 +578,7 @@ label.infield {
 }
 #show + label, #dbpassword + label, #personal-show + label {
 	position: absolute !important;
-	height: 14px;
+	height: 20px;
 	width: 24px;
 	background-image: url("../img/actions/toggle.png");
 	background-repeat: no-repeat;
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 6d73fb431f5..f934e3a86c2 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -46,15 +46,17 @@
 	<?php endif; ?>
 	<fieldset id="adminaccount">
 		<legend><?php print_unescaped($l->t( 'Create an <strong>admin account</strong>' )); ?></legend>
-		<p class="infield grouptop">
-			<input type="text" name="adminlogin" id="adminlogin" placeholder=""
+		<p class="grouptop">
+			<input type="text" name="adminlogin" id="adminlogin"
+				placeholder="<?php p($l->t( 'Username' )); ?>"
 				value="<?php p($_['adminlogin']); ?>"
 				autocomplete="off" autocapitalize="off" autocorrect="off" autofocus required />
 			<label for="adminlogin" class="infield"><?php p($l->t( 'Username' )); ?></label>
 			<img class="svg" src="<?php p(image_path('', 'actions/user.svg')); ?>" alt="" />
 		</p>
-		<p class="infield groupbottom">
-			<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass" placeholder=""
+		<p class="groupbottom">
+			<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass"
+				placeholder="<?php p($l->t( 'Password' )); ?>"
 				value="<?php p($_['adminpass']); ?>"
 				autocomplete="off" autocapitalize="off" autocorrect="off" required />
 			<label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label>
@@ -105,40 +107,45 @@
 		<?php if($hasOtherDB): ?>
 		<fieldset id='databaseField'>
 		<div id="use_other_db">
-			<p class="infield grouptop">
+			<p class="grouptop">
 				<label for="dbuser" class="infield"><?php p($l->t( 'Database user' )); ?></label>
-				<input type="text" name="dbuser" id="dbuser" placeholder=""
+				<input type="text" name="dbuser" id="dbuser"
+					placeholder="<?php p($l->t( 'Database user' )); ?>"
 					value="<?php p($_['dbuser']); ?>"
 					autocomplete="off" autocapitalize="off" autocorrect="off" />
 			</p>
-			<p class="infield groupmiddle">
-				<input type="password" name="dbpass" id="dbpass" placeholder="" data-typetoggle="#dbpassword"
+			<p class="groupmiddle">
+				<input type="password" name="dbpass" id="dbpass" data-typetoggle="#dbpassword"
+					placeholder="<?php p($l->t( 'Database password' )); ?>"
 					value="<?php p($_['dbpass']); ?>"
 					autocomplete="off" autocapitalize="off" autocorrect="off" />
 				<label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label>
 				<input type="checkbox" id="dbpassword" name="dbpassword" />
 				<label for="dbpassword"></label>
 			</p>
-			<p class="infield groupmiddle">
+			<p class="groupmiddle">
 				<label for="dbname" class="infield"><?php p($l->t( 'Database name' )); ?></label>
-				<input type="text" name="dbname" id="dbname" placeholder=""
+				<input type="text" name="dbname" id="dbname"
+					placeholder="<?php p($l->t( 'Database name' )); ?>"
 					value="<?php p($_['dbname']); ?>"
 					autocomplete="off" autocapitalize="off" autocorrect="off"
 					pattern="[0-9a-zA-Z$_-]+" />
 			</p>
 			<?php if($_['hasOracle']): ?>
 			<div id="use_oracle_db">
-				<p class="infield groupmiddle">
+				<p class="groupmiddle">
 					<label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label>
-					<input type="text" name="dbtablespace" id="dbtablespace" placeholder=""
+					<input type="text" name="dbtablespace" id="dbtablespace"
+						placeholder="<?php p($l->t( 'Database tablespace' )); ?>"
 						value="<?php p($_['dbtablespace']); ?>"
 						autocomplete="off" autocapitalize="off" autocorrect="off" />
 				</p>
 			</div>
 			<?php endif; ?>
-			<p class="infield groupbottom">
+			<p class="groupbottom">
 				<label for="dbhost" class="infield"><?php p($l->t( 'Database host' )); ?></label>
-				<input type="text" name="dbhost" id="dbhost" placeholder=""
+				<input type="text" name="dbhost" id="dbhost"
+					placeholder="<?php p($l->t( 'Database host' )); ?>"
 					value="<?php p($_['dbhost']); ?>"
 					autocomplete="off" autocapitalize="off" autocorrect="off" />
 			</p>
-- 
cgit v1.2.3


From 4ef94ddd2eb87afe4cd8a0de3b70f32bbd9328fc Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 6 May 2014 12:43:52 +0200
Subject: infield label removal: remove last occurences of infield labels

---
 apps/files_sharing/css/authenticate.css       | 7 -------
 apps/files_sharing/templates/authenticate.php | 4 ++--
 core/css/fixes.css                            | 4 ----
 core/lostpassword/templates/lostpassword.php  | 6 ++++--
 core/lostpassword/templates/resetpassword.php | 6 ++++--
 5 files changed, 10 insertions(+), 17 deletions(-)

(limited to 'core/css')

diff --git a/apps/files_sharing/css/authenticate.css b/apps/files_sharing/css/authenticate.css
index ef963ba7c65..a5aa55632bb 100644
--- a/apps/files_sharing/css/authenticate.css
+++ b/apps/files_sharing/css/authenticate.css
@@ -1,10 +1,3 @@
-#body-login form label.infield {
-	width: 190px;
-	padding: 10px;
-	left: 8px;
-	top: 8px;
-}
-
 #password {
 	width: 190px !important;
 	padding: 10px;
diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php
index 055329ecabf..f899a54e0f9 100644
--- a/apps/files_sharing/templates/authenticate.php
+++ b/apps/files_sharing/templates/authenticate.php
@@ -6,10 +6,10 @@
 		<?php if (isset($_['wrongpw'])): ?>
 			<div class="warning"><?php p($l->t('The password is wrong. Try again.')); ?></div>
 		<?php endif; ?>
-		<p class="infield">
+		<p>
 			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
 			<input type="password" name="password" id="password"
-				placeholder="" value=""
+				placeholder="<?php p($l->t('Password')); ?>" value=""
 				autocomplete="off" autocapitalize="off" autocorrect="off"
 				autofocus />
 			<input type="submit" value="" class="svg icon-confirm" />
diff --git a/core/css/fixes.css b/core/css/fixes.css
index 0f18f0a56cd..fc122b1eff1 100644
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -42,10 +42,6 @@ select {
 	border-bottom: 1px solid lightgrey;
 	background-color: white; /* don't change background on hover */
 }
-.lte9 #body-login form label.infield {
-	background-color: white; /* don't change background on hover */
-	-ms-filter: "progid:DXImageTransform.Microsoft.Chroma(color='white')";
-}
 
 /* disable opacity of info text on gradient
    since we cannot set a good backround color to use the filter&background hack as with the input labels */
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index d0fed38ee27..fdfa32344ec 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -16,8 +16,10 @@ OCP\Util::addStyle('lostpassword', 'lostpassword');
 				</p></div>
 			<?php endif; ?>
 			<div class="update"><?php print_unescaped($l->t('You will receive a link to reset your password via Email.')); ?></div>
-			<p class="infield">
-				<input type="text" name="user" id="user" placeholder="" value="" autocomplete="off" required autofocus />
+			<p>
+				<input type="text" name="user" id="user"
+					placeholder="<?php print_unescaped($l->t( 'Username' )); ?>"
+					value="" autocomplete="off" required autofocus />
 				<label for="user" class="infield"><?php print_unescaped($l->t( 'Username' )); ?></label>
 				<img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
 				<?php if ($_['isEncrypted']): ?>
diff --git a/core/lostpassword/templates/resetpassword.php b/core/lostpassword/templates/resetpassword.php
index 881455f5a9d..11dce9f112b 100644
--- a/core/lostpassword/templates/resetpassword.php
+++ b/core/lostpassword/templates/resetpassword.php
@@ -4,9 +4,11 @@
 			<h1><?php p($l->t('Your password was reset')); ?></h1>
 			<p><a href="<?php print_unescaped(OC_Helper::linkTo('', 'index.php')) ?>/"><?php p($l->t('To login page')); ?></a></p>
 		<?php else: ?>
-			<p class="infield">
+			<p>
 				<label for="password" class="infield"><?php p($l->t('New password')); ?></label>
-				<input type="password" name="password" id="password" value="" required />
+				<input type="password" name="password" id="password"
+					placeholder="<?php p($l->t('New password')); ?>"
+					value="" required />
 			</p>
 			<input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" />
 		<?php endif; ?>
-- 
cgit v1.2.3


From 46fd40b7000b0d5c25655780c7e4e27c341fa0eb Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 6 May 2014 12:44:16 +0200
Subject: fix show password icon in personal settings

---
 core/css/styles.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'core/css')

diff --git a/core/css/styles.css b/core/css/styles.css
index 39ba541fcaa..4c57f000ba9 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -592,8 +592,9 @@ label.infield {
 	width: 8em;
 }
 #personal-show + label {
-	margin-top: 1em;
-	margin-left: -3em;
+	height: 14px;
+	margin-top: 14px;
+	margin-left: -36px;
 }
 #passwordbutton {
 	margin-left: .5em;
-- 
cgit v1.2.3


From b67c4b2441d1ba7909f62668ac06bdbbc9f8ce4b Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 2 Jun 2014 23:39:27 +0200
Subject: remove tilde selector for IE8 compatibility

---
 core/css/styles.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/css')

diff --git a/core/css/styles.css b/core/css/styles.css
index 4c57f000ba9..3b05a16afc0 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -464,9 +464,9 @@ input[name='password-clone'] {
 	width: 223px !important;
 	padding-left: 36px !important;
 }
-#adminlogin~img,
+#adminlogin+label+img,
 #adminpass-icon,
-#user~img,
+#user+label+img,
 #password-icon {
 	position: absolute;
 	left: 16px;
-- 
cgit v1.2.3


From eace692effe8a6f2f7b645d5d1320da3e45e8643 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 3 Jun 2014 09:58:17 +0200
Subject: fix icon alignment in input fields

---
 core/css/styles.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/css')

diff --git a/core/css/styles.css b/core/css/styles.css
index 3b05a16afc0..7d8f12b7d28 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -470,13 +470,13 @@ input[name='password-clone'] {
 #password-icon {
 	position: absolute;
 	left: 16px;
-	top: 24px;
+	top: 20px;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
 	filter: alpha(opacity=30);
 	opacity: .3;
 }
 #adminpass-icon, #password-icon {
-	top: 18px;
+	top: 15px;
 }
 
 /* General new input field look */
-- 
cgit v1.2.3


From 8a6063ff076cba636f4049298d00cd592f2dbdb6 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 3 Jun 2014 10:02:11 +0200
Subject: fix text alignment in input fields

---
 core/css/styles.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/css')

diff --git a/core/css/styles.css b/core/css/styles.css
index 7d8f12b7d28..bd688f0ada5 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -679,7 +679,7 @@ label.infield {
 #body-login input {
 	font-size: 20px;
 	margin: 5px;
-	padding: 12px 10px 8px;
+	padding: 11px 10px 9px;
 }
 #body-login input[type="text"],
 #body-login input[type="password"] {
-- 
cgit v1.2.3