dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4646: made login/loginfailed work correctly for both standard and mobile

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Thu, 22 Sep 2011 09:23:10 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 4646
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-09-22 11:21:26 +0200
message:
  made login/loginfailed work correctly for both standard and mobile
modified:
  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_mobile.vm
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml


--
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/security/login.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2011-09-22 07:18:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm	2011-09-22 09:21:26 +0000
@@ -43,7 +43,7 @@
                 </table>
             </form>
             </div>
-            #if( $failed )
+            #if( $failed == true )
             <span class="loginMessage">Wrong username or password. Please try again.</span>
 			#end            
         </div>

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm	2011-09-22 07:18:09 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm	2011-09-22 09:21:26 +0000
@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <html>
 
 <head>
@@ -31,10 +30,10 @@
 
 <div id="wrapper" align="center">
 <p>
-	<img alt="" src="logo_banner.png">
+	<img alt="DHIS2" src="logo_banner.png">
 </p>
 
-<form id='loginForm' action="../../dhis-web-commons-security/login.action" method="post">
+<form id='loginForm' action="../../dhis-web-commons-security/login.action" method="POST">
 
 <table>
 	<tr>
@@ -64,7 +63,7 @@
 
 </form>
 
-#if( $failed )
+#if( $failed == true )
 <p style="color: #eee;">
 	Wrong username or password. Please try again.
 </p>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2011-09-21 20:13:56 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml	2011-09-22 09:21:26 +0000
@@ -95,10 +95,6 @@
     <property name="deviceResolver" ref="org.springframework.mobile.device.DeviceResolver" />
   </bean>
 
-  <bean id="org.hisp.dhis.security.action.LogoutAction" class="org.hisp.dhis.security.action.LogoutAction">
-    <property name="deviceResolver" ref="org.springframework.mobile.device.DeviceResolver" />
-  </bean>
-
   <!-- Organisation Unit Web Tree -->
 
   <bean id="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" class="org.hisp.dhis.ouwt.manager.DefaultOrganisationUnitSelectionManager">