dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12441
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-10-06 10:43:45 +0200
message:
  Login form fix
modified:
  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/security/login.vm
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_pt.properties


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== 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 17:11:35 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css	2013-10-06 08:43:45 +0000
@@ -2,7 +2,7 @@
 *
 {
   font-family: LiberationSansRegular, sans-serif;
-  line-height: 130%;
+  line-height: 125%;
   overflow: hidden;
 }
 
@@ -66,11 +66,6 @@
   text-align: center;
 }
 
-#loginFormFooter
-{
-  font-size: 14px;
-}
-
 #accountArea
 {
   position: absolute;
@@ -179,7 +174,7 @@
   border: 1px solid #444;
   border-radius: 3px;
   color: #222;
-  width: 120px;
+  width: 100px;
 }
 
 .button:hover 

=== 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 17:11:35 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2013-10-06 08:43:45 +0000
@@ -42,16 +42,10 @@
                 </div>
                 <div id="submitDiv">
                 	<input id="submit" class="button" type="submit" value="Login">
+                	#if( $keyAccountRecovery )<a id="forgotPasswordLink" href="recovery.action" style="padding-left: 18px">Forgot password?</a>#end
                 </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 style="padding-top: 10px">                	
+                	#if( $keyConfig.selfRegistrationAllowed() )<a id="createAccountLink" href="account.action">Create an account</a>#end
                 </div>
             </form>
             #if( $failed == true )
@@ -64,9 +58,9 @@
         <div id="footerArea">
         	<span id="poweredByLabel">Powered by</span>
         	<a href="http://www.dhis2.org";>DHIS 2</a>&nbsp;
-        	$!{keyApplicationFooter}&nbsp;
+        	$!{keyApplicationFooter}
 
-        	<select id="localeSelect" onchange="login.localeChanged()">
+        	<select id="localeSelect" onchange="login.localeChanged()" style="margin-left: 30px">
         		<option value="">[ Change language ]</option>
         		#foreach( $locale in $availableLocales )
         		<option value="${locale.language}">${locale.displayLanguage}</option>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_pt.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_pt.properties	2013-09-30 13:13:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global_pt.properties	2013-10-06 08:43:45 +0000
@@ -715,9 +715,9 @@
 #-- Login page ----------------------------------------------------------------#
 
 create_an_account=Criar uma conta
-login_password=Palavra-passe
+login_password=Password
 login_username=Utilizador
-forgot_password=Esqueceu a palavra-passe?
+forgot_password=Esqueceu a password?
 create_an_account=Criar uma conta
-wrong_username_or_password=Utilizador ou palavra-passe errado(s)
+wrong_username_or_password=Utilizador ou password errado(s)
 powered_by=Fornecido por