Last style fixes and JavaScript simplification using jQuery + jQuery.placeholder

2 files changed, 21 insertions, 15 deletions

diff --git a/plugins/Login/templates/header.tpl b/plugins/Login/templates/header.tpl
index 94eafe0284..74e92cf0b7 100644
--- a/plugins/Login/templates/header.tpl
+++ b/plugins/Login/templates/header.tpl
@@ -6,7 +6,11 @@
 	<link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico" />
 	<link rel="stylesheet" type="text/css" href="plugins/Login/templates/login.css" />
 	<meta name="description" content="{'General_OpenSourceWebAnalytics'|translate|escape}" />
-
+	<!--[if lt IE 9]>
+	<script src="libs/html5shiv/html5shiv.js"></script>
+	<![endif]-->
+	<script type="text/javascript" src="libs/jquery/jquery.js"></script>
+	<script type="text/javascript" src="libs/jquery/jquery.placeholder.js"></script>
 {if isset($forceSslLogin) && $forceSslLogin}
 {literal}
 	<script type="text/javascript">
@@ -20,17 +24,12 @@
 {/if}
 {literal}
 	<script type="text/javascript">
-		function focusit() {
-			var formLogin = document.getElementById('form_login');
-			if(formLogin)
-			{
-				formLogin.focus();
-			}
-		}
-		window.onload = focusit;
+		$(function() {
+			$('#form_login').focus();
+			$('input').placeholder();
+		});
 	</script>
 {/literal}
-	<script type="text/javascript" src="libs/jquery/jquery.js"></script>
 	<script type="text/javascript" src="plugins/Login/templates/login.js"></script>
 {if 'General_LayoutDirection'|translate =='rtl'}
 <link rel="stylesheet" type="text/css" href="themes/default/rtl.css" />
diff --git a/plugins/Login/templates/login.css b/plugins/Login/templates/login.css
index 68a78dc6e0..c6df9520d3 100644
--- a/plugins/Login/templates/login.css
+++ b/plugins/Login/templates/login.css
@@ -41,7 +41,8 @@ form {
 
 #login fieldset.actions {
 	line-height: 35px;
-	width: 320px;
+	width: 315px;
+	margin-top: 10px;
 }
 
 #login h1
@@ -75,12 +76,12 @@ form {
 		0 1px 1px rgba(0, 0, 0, .2);
 }
 
-#login form { margin: 0; position: relative; }
+#login form { margin: 0 5px; position: relative; }
 #login form input[type="text"],
 #login form input[type="password"] {
-	padding: 10px 15px 10px 40px;
+	padding: 10px 15px 10px 45px;
 	margin: 0 0 15px 0;
-	width: 263px; /* 273 + 2 + 45 = 320 */
+	width: 253px; /* 258 + 2 + 55 = 315 */
 	border: 1px solid #ccc;
 	-moz-border-radius: 5px;
 	-webkit-border-radius: 5px;
@@ -90,7 +91,9 @@ form {
 	box-shadow: 0 1px 1px #ccc inset, 0 1px 0 #fff;
 }
 
-
+#login_form_rememberme {
+	vertical-align: middle;
+}
 
 #login_error,.message {
 	margin: 0 0 16px 8px;
@@ -107,6 +110,10 @@ form {
 	text-align: center;
 }
 
+#nav a:hover {
+	text-decoration: underline;
+}
+
 #login_form_password, #reset_form_password, 
 #reset_form_password_bis, #login_form_login, #reset_form_login {
 	background: #fff url(../../../themes/default/images/login-sprite.png) no-repeat;