=== 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-16 16:57:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2013-10-29 09:37:23 +0000
@@ -24,12 +24,6 @@
   color: #fff;
 }
 
-input[type=text],input[type=password]
-{
-  border: 1px solid #888;
-  padding: 4px 6px;
-}
-
 #flagArea
 {
   position: absolute;
@@ -61,7 +55,7 @@
 
 #bannerArea
 {
-  margin-bottom: 20px;
+  margin-bottom: 21px;
   border: none;
   text-align: center;
 }
@@ -78,25 +72,27 @@
 {
   position: relative;
   margin: 120px auto 0 auto;
-  width: 280px;
+  width: 270px;
 }
 
-#usernameLabel, #passwordLabel
+#signInLabel
 {
   padding: 5px 0 1px 0;
-  display: block;
   font-size: 13px;
 }
 
 #submitDiv
 {
-  padding: 5px 0 20px 0;
+  padding: 3px 0 20px 0;
 }
 
 #loginField input[type=text],input[type=password]
 {
-  width: 266px;
+  width: 100%;
   height: 20px;
+  border: 1px solid #888;
+  padding: 6px 6px;
+  margin: 4px 0;
 }
 
 #loginMessage

=== 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-10 15:49:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.js	2013-10-29 09:37:23 +0000
@@ -37,13 +37,14 @@
 {	
 	$.get( 'loginStrings.action?keyApplication=Y&loc=' + locale, function( json ) {
 		$( '#createAccountButton' ).html( json.create_an_account );
-		$( '#usernameLabel' ).html( json.login_username );
-		$( '#passwordLabel' ).html( json.login_password );
+		$( '#signInLabel' ).html( json.sign_in );
+		$( '#j_username' ).attr( 'placeholder', json.login_username );
+		$( '#j_password' ).attr( 'placeholder', json.login_password );
 		$( '#forgotPasswordLink' ).html( json.forgot_password );
 		$( '#createAccountLink' ).html( json.create_an_account );
 		$( '#loginMessage' ).html( json.wrong_username_or_password );
 		$( '#poweredByLabel' ).html( json.powered_by );
-		$( '#submit' ).val( json.login );
+		$( '#submit' ).val( json.sign_in );
 		
 		$( '#titleArea' ).html( json.applicationTitle );		
 		$( '#introArea' ).html( json.keyApplicationIntro );

=== 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-16 16:57:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2013-10-29 09:37:23 +0000
@@ -34,13 +34,12 @@
             
             <form id="loginForm" action="../../dhis-web-commons-security/login.action" method="post">
                 <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 id="signInLabel">Sign in</div>
+                    <div><input type="text" id="j_username" name="j_username" placeholder="Username"></div>
+                    <div><input type="password" id="j_password" name="j_password" autocomplete="off" placeholder="Password"></div>
                 </div>
                 <div id="submitDiv">
-                	<input id="submit" class="button" type="submit" value="Login">
+                	<input id="submit" class="button" type="submit" value="Sign in">
                 </div>
                 #if( $keyAccountRecovery )
                 <div style="padding-bottom: 10px">

=== 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-10 15:49:20 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginStrings.vm	2013-10-29 09:37:23 +0000
@@ -6,7 +6,7 @@
 "create_an_account": "$!encoder.jsonEncode( $i18nObject.getString( "create_an_account" ) )",
 "wrong_username_or_password": "$!encoder.jsonEncode( $i18nObject.getString( "wrong_username_or_password" ) )",
 "powered_by": "$!encoder.jsonEncode( $i18nObject.getString( "powered_by" ) )",
-"login": "$!encoder.jsonEncode( $i18nObject.getString( "login" ) )",
+"sign_in": "$!encoder.jsonEncode( $i18nObject.getString( "sign_in" ) )",
 "applicationTitle": "$!encoder.jsonEncode( $!translations.get( "applicationTitle" ) )",
 "keyApplicationIntro": "$!encoder.jsonEncode( $translations.get( "keyApplicationIntro" ) )",
 "keyApplicationNotification": "$!encoder.jsonEncode( $translations.get( "keyApplicationNotification" ) )",

=== 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-22 18:10:32 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-10-29 09:37:23 +0000
@@ -745,7 +745,7 @@
 forgot_password=Forgot password?
 wrong_username_or_password=Wrong username or password
 powered_by=Powered by
-login=Login
+sign_in=Sign in
 
 #-- New User Account page ----------------------------------------------------------------#
 

=== 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-15 10:49:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_es.properties	2013-10-29 09:37:23 +0000
@@ -613,7 +613,7 @@
 forgot_password=\u00bfHas olvidado tu contrase\u00f1a?
 wrong_username_or_password=Nombre de usuario o contrase\u00f1a incorrecto
 powered_by=Desarrollado por
-login=Login
+sign_in=Login
 #-- New User Account page ----------------------------------------------------------------#
 
 new_user_account_name=Nombre

=== 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-16 16:51:29 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_fr.properties	2013-10-29 09:37:23 +0000
@@ -616,4 +616,4 @@
 forgot_password=Mot de passe oubli\u00E9?
 wrong_username_or_password=Identifiant ou mot de passe incorrect
 powered_by=Propuls\u00E9 par
-login=Entrer
+sign_in=Entrer