=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2013-10-05 14:04:38 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2013-10-05 17:11:35 +0000
@@ -2,7 +2,7 @@
 *
 {
   font-family: LiberationSansRegular, sans-serif;
-  line-height: 125%;
+  line-height: 130%;
   overflow: hidden;
 }
 
@@ -61,8 +61,9 @@
 
 #bannerArea
 {
-  margin-bottom: 35px;
+  margin-bottom: 15px;
   border: none;
+  text-align: center;
 }
 
 #loginFormFooter
@@ -81,19 +82,25 @@
 #loginField
 {
   position: relative;
-  margin: 130px auto 0 auto;
-  width: 350px;
-  text-align: center;
-}
-
-#loginField td
-{
-  padding-right: 5px;
+  margin: 120px auto 0 auto;
+  width: 280px;
+}
+
+#usernameLabel, #passwordLabel
+{
+  padding: 8px 0 3px 0;
+  display: block;
+  font-size: 13px;
+}
+
+#submitDiv
+{
+  padding: 8px 0 7px 0;
 }
 
 #loginField input[type=text],input[type=password]
 {
-  width: 240px;
+  width: 100%;
   height: 20px;
 }
 
@@ -104,9 +111,9 @@
   border-width: 1px;
   border-color: #D0D0D0;
   padding: 11px;
-  margin: 20px 15px 0 40px;
+  margin: 20px 1286px5px 0 40px;
   display: block;
-  width: 286px;
+  width: 100%;
   border-radius: 2px;
 }
 
@@ -114,7 +121,7 @@
 {
   background-color: #D0E6FD;
   color: #1D5288;
-  margin: 40px 0 0 40px;
+  margin-top: 30px;
   padding: 15px;
   border-radius: 3px;
 }
@@ -168,7 +175,7 @@
   background: -moz-linear-gradient(top, #f1f1f1, #d1d1d1);
   background: -ms-linear-gradient(top, #f1f1f1, #d1d1d1);
   background: -o-linear-gradient(top, #f1f1f1, #d1d1d1);
-  height: 26px;
+  height: 28px;
   border: 1px solid #444;
   border-radius: 3px;
   color: #222;
@@ -184,11 +191,6 @@
   border: 1px solid #333333;
 }
 
-.noWrap
-{
-  white-space: nowrap;
-}
-
 @font-face {
     font-family: 'LiberationSansRegular';
     src: url('../fonts/LiberationSans-Regular-webfont.eot');

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.js	2013-10-05 14:04:38 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.js	2013-10-05 17:11:35 +0000
@@ -10,7 +10,6 @@
     $( '#loginForm').bind( 'submit', function() 
     {
         $( '#submit' ).attr( 'disabled', 'disabled' );
-        $( '#reset' ).attr( 'disabled', 'disabled' );
 
         sessionStorage.removeItem( 'orgUnitSelected' );
     } );
@@ -41,5 +40,6 @@
 		$( '#createAccountLink' ).html( json.create_an_account );
 		$( '#loginMessage' ).html( json.wrong_username_or_password );
 		$( '#poweredByLabel' ).html( json.powered_by );
+		$( '#submit' ).val( json.login );
 	} );	
 }
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2013-10-05 14:04:38 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2013-10-05 17:11:35 +0000
@@ -34,36 +34,25 @@
             <div id="bannerArea"><a href="http://www.dhis2.org"><img src="logo_front.png" style="border:none"></a></div>
             
             <form id="loginForm" action="../../dhis-web-commons-security/login.action" method="post">
-                <table>
-                    <tr>
-                        <td><label id="usernameLabel" for="j_username">Username</label></td>
-                        <td><input type="text" id="j_username" name="j_username"></td>
-                    </tr>
-                    <tr>
-                        <td><label id="passwordLabel" for="j_password">Password</label></td>
-                        <td><input type="password" id="j_password" name="j_password" autocomplete="off"></td>
-                    </tr>
-                    <tr>
-                        <td></td>
-                        <td>
-                            <input id="submit" class="button" type="submit" value="Login">
-                            <input id="reset" class="button" type="reset" value="Clear">
-                        </td>
-                    </tr>
-                    <tr>
-                        <td></td>
-                        <td style="padding-top:8px">
-                        	<span id="loginFormFooter">
-                        	#if( $keyAccountRecovery )
-                        	<a id="forgotPasswordLink" href="recovery.action">Forgot password?</a>&nbsp;
-                        	#end
-                        	#if( $keyConfig.selfRegistrationAllowed() )
-                        	<a id="createAccountLink" href="account.action">Create an account</a>	
-	                        #end
-	                        </span>
-                        </td>
-                    </tr>
-                </table>
+                <div>
+                    <div><label id="usernameLabel" for="j_username">Username</label></div>
+                    <div><input type="text" id="j_username" name="j_username"></div>
+                    <div><label id="passwordLabel" for="j_password">Password</label></div>
+                    <div><input type="password" id="j_password" name="j_password" autocomplete="off"></div>
+                </div>
+                <div id="submitDiv">
+                	<input id="submit" class="button" type="submit" value="Login">
+                </div>
+                <div style="padding-top:8px">
+                	<span id="loginFormFooter">
+                	#if( $keyAccountRecovery )
+                	<a id="forgotPasswordLink" href="recovery.action">Forgot password?</a>&nbsp;
+                	#end
+                	#if( $keyConfig.selfRegistrationAllowed() )
+                	<a id="createAccountLink" href="account.action">Create an account</a>	
+                    #end
+                    </span>
+                </div>
             </form>
             #if( $failed == true )
             <span id="loginMessage">Wrong username or password</span>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginStrings.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginStrings.vm	2013-10-04 17:06:16 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginStrings.vm	2013-10-05 17:11:35 +0000
@@ -5,5 +5,6 @@
 "forgot_password": "$!i18nObject.getString( "forgot_password" )",
 "create_an_account": "$!i18nObject.getString( "create_an_account" )",
 "wrong_username_or_password": "$!i18nObject.getString( "wrong_username_or_password" )",
-"powered_by": "$!i18nObject.getString( "powered_by" )"
+"powered_by": "$!i18nObject.getString( "powered_by" )",
+"login": "$!i18nObject.getString( "login" )"
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-10-04 16:25:27 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-10-05 17:11:35 +0000
@@ -743,5 +743,4 @@
 forgot_password=Forgot password?
 wrong_username_or_password=Wrong username or password
 powered_by=Powered by
-login=Login
-clear=Clear
\ No newline at end of file
+login=Login
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_es.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_es.properties	2013-10-04 17:06:16 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_es.properties	2013-10-05 17:11:35 +0000
@@ -611,5 +611,4 @@
 forgot_password=żOlvido su contrasena?
 wrong_username_or_password=Nombre de usuario o contrasena incorrecta
 powered_by=Impulsado por
-login=Login
-clear=Clarificar
\ No newline at end of file
+login=Login
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr.properties	2013-10-04 17:06:16 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr.properties	2013-10-05 17:11:35 +0000
@@ -616,5 +616,4 @@
 forgot_password=Mot de passe oublie?
 wrong_username_or_password=Identifiant ou mot de passe incorrect
 powered_by=Propulse par
-login=Entrer
-clear=Clair
\ No newline at end of file
+login=Entrer
\ No newline at end of file