trim a bit of fat

3 files changed, 36 insertions, 25 deletions

diff --git a/view/theme/duepuntozero/css/style.css b/view/theme/duepuntozero/css/style.css
index bbb4cb54f..34360aacf 100644
--- a/view/theme/duepuntozero/css/style.css
+++ b/view/theme/duepuntozero/css/style.css
@@ -60,18 +60,8 @@ input {
 
 img { border :0px; }
 
-#id_openid_url, .openid input {
-   background: url(../img/login-bg.gif) no-repeat;
-   background-position: 0 50%;
-   padding-left: 18px;
-}
-.openid:hover {
 
-}
 
-#id_openid_url {
-	width: 384px;
-}
 
 code {
 	font-family: Courier, monospace;
@@ -409,16 +399,32 @@ div.wall-item-content-wrapper.shiny {
 	margin-top: 10px;
 }
 
+#main-login {
+	margin-left: 100px;
+	margin-top: 50px;
+}
 
-#login_standard {
-	width: 210px;
+#main-login #id_username, #main-login #id_password {
+	width: 200px;
+	padding: 10px;
+	float: left;
+}
+
+#main-login .field_end {
+	clear: both;
+}
+
+#main-login .field.input label, #main-login .field.password label {
 	float: left;
+	width: 100px;
 }
-#login_openid {
-	width: 210px;
-	margin-left: 250px;
+
+#login_standard {
+	width: 350px;
+	float: left;
 }
 
+
 #login_standard input,
 #login_openid input {
 	width: 180px;
@@ -430,17 +436,19 @@ div.wall-item-content-wrapper.shiny {
 
 #register-link, #lost-password-link {
 	float: left;
-	font-size: 80%;
-	margin-right: 15px;
+	font-size: 90%;
+	margin-left: 100px;
 }
 
-#login-name-end, #login-password-end, #login-extra-end, #login-submit-end {
-	height: 50px;
+#login-standard-end {
+	clear: both;
 }
 
 #login-submit-button {
-/*	margin-top: 10px; */
-	margin-left: 200px;
+
+	margin-left: 100px;
+	margin-top: 10px;
+/*	margin-left: 200px; */
 }
 
 
diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl
index 748d93f3e..09417deca 100644
--- a/view/tpl/field_input.tpl
+++ b/view/tpl/field_input.tpl
@@ -1,6 +1,7 @@
 	
 	<div class='field input'>
-		<label for='id_$field.0'>$field.1</label>
+		<label for='id_$field.0' id='label_$field.0'>$field.1</label>
 		<input name='$field.0' id='id_$field.0' value="$field.2">
-		<span class='field_help'>$field.3</span>
+		<span id='help_$field.0' class='field_help'>$field.3</span>
+		<div id='end_$field.0' class='field_end'></div>
 	</div>
diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl
index 94dd85eeb..9cecef5c7 100644
--- a/view/tpl/login.tpl
+++ b/view/tpl/login.tpl
@@ -1,5 +1,5 @@
 
-<form action="$dest_url" method="post" >
+<form action="$dest_url" id="$form_id" method="post" >
 	<input type="hidden" name="auth-params" value="login" />
 
 	<div id="login_standard">
@@ -8,10 +8,12 @@
 	</div>
 	
 	<div id="login-extra-links">
-		{{ if $register }}<a href="zregister" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
+		{{ if $register }}<a href="$register.link" 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-standard-end"></div>
+
 	<div id="login-submit-wrapper" >
 		<input type="submit" name="submit" id="login-submit-button" value="$login" />
 	</div>