=== 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-21 18:20:11 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm 2011-09-22 07:18:09 +0000 @@ -43,6 +43,9 @@ + #if( $failed ) + Wrong username or password. Please try again. + #end === 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-21 22:05:23 +0000 +++ 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 @@ -64,6 +64,12 @@ +#if( $failed ) +

+ Wrong username or password. Please try again. +

+#end + === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginfailed.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginfailed.vm 2011-09-21 18:20:11 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginfailed.vm 1970-01-01 00:00:00 +0000 @@ -1,47 +0,0 @@ - - - - DHIS 2 - - - - - - -
-
- -
-
- - - - - - - - - - - - - -
- - -
-
-
- Wrong username or password. Please try again. -
- - === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginfailed_mobile.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginfailed_mobile.vm 2011-09-21 22:05:55 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/loginfailed_mobile.vm 1970-01-01 00:00:00 +0000 @@ -1,73 +0,0 @@ - - - - -DHIS 2 - - - - - - - - -
-

- -

- -
- - - - - - - - - - - - - - - - - -

Username

- -

Password

- -
-
- - -
- -
- -

- Wrong username or password. Please try again. -

- - - - === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java 2011-09-21 20:13:56 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java 2011-09-22 07:18:09 +0000 @@ -56,6 +56,18 @@ // Input & Output // ------------------------------------------------------------------------- + private Boolean failed = false; + + public void setFailed( Boolean failed ) + { + this.failed = failed; + } + + public Boolean getFailed() + { + return failed; + } + // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LogoutAction.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LogoutAction.java 2011-09-21 20:13:56 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LogoutAction.java 2011-09-22 07:18:09 +0000 @@ -56,6 +56,18 @@ // Input & Output // ------------------------------------------------------------------------- + private Boolean failed = false; + + public void setFailed( Boolean failed ) + { + this.failed = failed; + } + + public Boolean getFailed() + { + return failed; + } + // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2011-09-21 18:20:11 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2011-09-22 07:18:09 +0000 @@ -27,7 +27,7 @@ === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2011-09-21 20:13:56 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/dhis-web-commons.xml 2011-09-22 07:18:09 +0000 @@ -114,12 +114,6 @@ plainTextError - - /dhis-web-commons/security/loginfailed.vm - /dhis-web-commons/security/loginfailed_mobile.vm - plainTextError - -