works on login form

6 files changed, 55 insertions, 120 deletions

diff --git a/view/login.tpl b/view/login.tpl
index 27598cd50..5240bb9ad 100644
--- a/view/login.tpl
+++ b/view/login.tpl
@@ -1,25 +1,28 @@
 
 <form action="" method="post" >
-<input type="hidden" name="auth-params" value="login" />
-<div id="login-name-wrapper">
-        <label for="login-name" id="label-login-name">$namelabel</label>
-        <input type="text" maxlength="60" name="openid_url" class="$classname" id="login-name" value="" />
-</div>
-<div id="login-name-end" ></div>
-<div id="login-password-wrapper">
-        <label for="login-password" id="label-login-password">$passlabel</label>
-        <input type="password" maxlength="60" name="password" id="login-password" value="" />
-</div>
-<div id="login-password-end"></div>
-<div id="login-extra-links" class=".button">
-	<div id="login-extra-filler">&nbsp;</div>
-	$register_html
+	<input type="hidden" name="auth-params" value="login" />
+
+	<div id="login_standard">
+	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
+	</div>
+	
+	{{ if $openid }}
+			<div id="login_openid">
+			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
+			</div>
+	{{ endif }}
+
+	<div id="login-extra-links">
+		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
         <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-</div>
-<div id="login-extra-end"></div>
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="login-submit-button" value="$login" />
-</div>
-<div id="login-submit-end"></div>
+	</div>
+	
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="$login" />
+	</div>
+	
 </form>
 
+
+<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
diff --git a/view/register-link.tpl b/view/register-link.tpl
deleted file mode 100644
index 802c5f99f..000000000
--- a/view/register-link.tpl
+++ /dev/null
@@ -1 +0,0 @@
-	<a href="register" title = "$title" id="register-link" >$desc</a>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 9bb866e76..6f452cebc 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -27,8 +27,7 @@ input {
 
 img { border :0px; }
 
-#id_openid_url,
-.openid {
+.openid input {
    background: url(login-bg.gif) no-repeat;
    background-position: 0 50%;
    padding-left: 18px;
@@ -332,26 +331,23 @@ div.wall-item-content-wrapper.shiny {
 	margin-top: 10px;
 }
 
-#label-login-name, #label-login-password, #login-extra-filler {
-	float: left;
-	width: 200px;
-	margin-bottom: 20px;
-}
-
 
-#login-password {
+#login_standard {
+	width: 210px;
 	float: left;
-	width: 170px;
+}
+#login_openid {
+	width: 210px;
+	margin-left: 250px;
 }
 
-#login-name {
-	float: left;
-	width: 153px;
+#login_standard input,
+#login_openid input {
+	width: 180px;
 }
 
-#login-name.no-openid {
-	float: left;
-	width: 170px;
+#login-extra-links {
+	clear: both;
 }
 
 #register-link, #lost-password-link {
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index c6250c51c..447072390 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -41,18 +41,21 @@ input:hover {
 	cursor: pointer;
 }
 
-#id_openid_url,
-.openid {
+.openid input{
    background-color: #ECECEC !important;
    background: url(login-bg.gif) no-repeat;
    background-position: 0 50%;
    padding-left: 18px;
+   width: 385px !important;
 }
-#id_openid_url:hover,
-.openid:hover {
+
+.openid input:hover {
 	background-color: #0CBEFE !important;
 }
 
+
+
+
 option {
 	background-color: #ECD6D2;
 }
@@ -451,27 +454,20 @@ nav {
 	margin-top: 10px;
 }
 
-#label-login-name, #label-login-password, #login-extra-filler {
-	float: left;
-	width: 200px;
-	margin-bottom: 20px;
-}
-
-
-#login-password {
+#login_standard {
+	width: 480px;
 	float: left;
-	width: 170px;
 }
-
-#login-name {
-	float: left;
-	width: 153px;
+#login_openid {
+	width: 480px;
+	margin-left: 490px;
 }
 
-#login-name.no-openid {
-	float: left;
-	width: 170px;
+#login_standard input,
+#login_openid input {
+	width: 180px!important;
 }
+#login-extra-links { clear: both; }
 
 #register-link, #lost-password-link {
 	float: left;
@@ -479,9 +475,6 @@ nav {
 	margin-right: 15px;
 }
 
-#login-name-end, #login-password-end, #login-extra-end, #login-submit-end {
-	clear: both;
-}
 
 #login-submit-button {
 /*	margin-top: 10px; */
diff --git a/view/theme/testbubble/login.tpl b/view/theme/testbubble/login.tpl
deleted file mode 100644
index c17950ece..000000000
--- a/view/theme/testbubble/login.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<form action="" method="post" >
-	<input type="hidden" name="auth-params" value="login" />
-	<div id="login-name-wrapper">
-	        <label for="login-name" id="label-login-name">$namelabel</label>
-	        <input type="text" maxlength="60" name="openid_url" class="$classname" id="login-name" value="" />
-	</div>
-	<div id="login-name-end" ></div>
-	<div id="login-password-wrapper">
-	        <label for="login-password" id="label-login-password">$passlabel</label>
-	        <input type="password" maxlength="60" name="password" id="login-password" value="" />
-	</div>
-	<div id="login-password-end"></div>
-	<div id="login-submit-wrapper" >
-	        <input type="submit" name="submit" id="login-submit-button" value="$login" />
-			<a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
-	</div>
-	<div id="login-submit-end"></div>
-	<div id="login-extra-links" class=".button">
-		<div id="login-extra-filler">&nbsp;</div>
-		$register_html
-	</div>
-	<div id="login-extra-end"></div>
-</form>
-
diff --git a/view/theme/testbubble/style.css b/view/theme/testbubble/style.css
index 4a3edc163..83afe78f4 100644
--- a/view/theme/testbubble/style.css
+++ b/view/theme/testbubble/style.css
@@ -823,7 +823,7 @@ profile-jot-banner-wrapper {
 /* ======== */
 
 .tabs {
-	width: 600px;
+	width: 450px;
 	list-style: none;
 	padding: 10px;
 	margin: 0px 0px 10px 0px;
@@ -2101,19 +2101,11 @@ margin-left: 0px;
 /* = Register, Settings, Profile Forms = */
 /* ===================================== */
 
-#id_openid_url,
-.openid {
+.openid input{
 	background: url(login-bg.gif) no-repeat;
 	background-position: 0 50%;
-	padding-left: 18px !important;
-	width: 385px;
-}
-
-.openid {
-	width: 150px !important;
-}
-#login-password {
-	width: 168px !important;
+	padding-left: 18px;
+	width: 384px!important;
 }
 
 #profile-tabs-wrapper {
@@ -2218,25 +2210,6 @@ margin-left: 0px;
     padding: 5px;
 }
 
-.settings-block {
-	margin-top: 20px;
-	-moz-box-shadow: 1px 2px 6px 0px #959494;
-	-webkit-box-shadow: 1px 2px 6px 0px #959494;
-	box-shadow: 1px 2px 6px 0px #959494;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #f8f8f8), color-stop(1, #f6f6f6) );
-	background:-moz-linear-gradient( center top, #f8f8f8 5%, #f6f6f6 100% );
-	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f8f8f8', endColorstr='#f6f6f6');
-	background-color:#f8f8f8;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-	border:1px solid #eee;
-	color:#a6a6a6;
-	text-shadow:-1px 0px 0px #bdbdbd;
-	border: 1px solid #cdcdcd;
-	padding: 5px;
-}
-
 #register-form div,
 #profile-edit-form div { 
 	clear: both;
@@ -2621,10 +2594,6 @@ tr {
 	width: 150px;	
 }
 
-.directory-end {
-	clear: both;
-}
-
 /* ========= */
 /* = Admin = */
 /* ========= */