=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2012-09-22 09:19:40 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2012-10-03 10:33:08 +0000 @@ -67,14 +67,13 @@ top: 0px; left: 0px; right: 0px; - box-shadow: 0 0 2px #000; } img#headerBanner { position: absolute; - top: 4px; - left: 59px; + top: 13px; + left: 55px; } img#menuSeparator1 === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_banner.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_banner.png 2012-02-20 14:25:48 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/logo_banner.png 2012-10-03 10:33:08 +0000 differ === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2012-09-21 13:55:22 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2012-10-03 10:33:08 +0000 @@ -73,8 +73,8 @@ img#headerBanner { position: absolute; - top: 4px; - left: 59px; + top: 13px; + left: 55px; } img#menuSeparator1 === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_banner.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_banner.png 2011-04-26 13:11:49 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_banner.png 2012-10-03 10:33:08 +0000 differ === 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 2012-09-29 14:17:38 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login.css 2012-10-03 10:33:08 +0000 @@ -28,7 +28,7 @@ { position: absolute; top: 15px; - left: 15px; + left: 20px; border: 1px solid #d5d5d5; border-radius: 2px; width: 105px; @@ -39,21 +39,21 @@ { position: absolute; top: 17px; - left: 140px; + left: 145px; font-size: 18px; } #loginField { position: relative; - margin: 115px auto 0 auto; - width: 340px; + margin: 120px auto 0 auto; + width: 350px; text-align: center; } #bannerArea { - margin-bottom: 11%; + margin-bottom: 42px; border: none; } === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login_mobile.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login_mobile.css 2011-09-28 19:31:03 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/login_mobile.css 2012-10-03 10:33:08 +0000 @@ -73,11 +73,10 @@ * */ body div#header { - height: 20px; + height: 17px; background-color: #1d5288; border-bottom: 4px solid #184572; - padding-top: 2px; - padding-bottom: 2px; + padding: 4px; margin-bottom: .5em; } === 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 2012-09-29 14:17:38 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm 2012-10-03 10:33:08 +0000 @@ -8,10 +8,10 @@ $('#j_username').focus(); $('#loginForm').bind('submit', function() { - $('#submit').attr('disabled', 'disabled'); - $('#reset').attr('disabled', 'disabled'); + $('#submit').attr('disabled', 'disabled'); + $('#reset').attr('disabled', 'disabled'); - sessionStorage.removeItem( 'orgUnitSelected' ); + sessionStorage.removeItem( 'orgUnitSelected' ); }); }); @@ -19,16 +19,16 @@ -
- #if ( $keyFlag ) - - #end - #if ( $applicationTitle ) - $encoder.htmlEncode( $applicationTitle ) - #end -
+
+ #if ( $keyFlag ) + + #end + #if ( $applicationTitle ) + $encoder.htmlEncode( $applicationTitle ) + #end +
-
+
@@ -43,15 +43,15 @@ +
- + -
#if( $failed == true ) Wrong username or password - #end + #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 2012-09-29 14:17:38 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login_mobile.vm 2012-10-03 10:33:08 +0000 @@ -13,7 +13,7 @@
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_front.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_front.png 2012-09-29 14:17:38 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_front.png 2012-10-03 10:33:08 +0000 differ === removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_mobile.jpg' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_mobile.jpg 2011-09-26 07:51:12 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_mobile.jpg 1970-01-01 00:00:00 +0000 differ === added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_mobile.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_mobile.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/logo_mobile.png 2012-10-03 10:33:08 +0000 differ === modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js' --- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js 2012-10-03 08:51:03 +0000 +++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/interpretation.js 2012-10-03 10:33:08 +0000 @@ -20,8 +20,6 @@ var threshold = parseInt( 350 ); var remaining = parseInt( docHeight - ( fromTop + windowHeight ) ); - log("--");log(fromTop);log(docHeight);log(windowHeight);log(remaining); - if ( remaining < threshold ) { loadNextPage(); === added directory 'resources/logo' === added directory 'resources/logo/png' === added file 'resources/logo/png/logo_banner.png' Binary files resources/logo/png/logo_banner.png 1970-01-01 00:00:00 +0000 and resources/logo/png/logo_banner.png 2012-10-03 10:33:08 +0000 differ === added file 'resources/logo/png/logo_front.png' Binary files resources/logo/png/logo_front.png 1970-01-01 00:00:00 +0000 and resources/logo/png/logo_front.png 2012-10-03 10:33:08 +0000 differ === added directory 'resources/logo/svg' === added file 'resources/logo/svg/logo_banner.svg' --- resources/logo/svg/logo_banner.svg 1970-01-01 00:00:00 +0000 +++ resources/logo/svg/logo_banner.svg 2012-10-03 10:33:08 +0000 @@ -0,0 +1,88 @@ + + + + + + + + + + image/svg+xml + + + + + + + + dhis2 + + === added file 'resources/logo/svg/logo_front.svg' --- resources/logo/svg/logo_front.svg 1970-01-01 00:00:00 +0000 +++ resources/logo/svg/logo_front.svg 2012-10-03 10:33:08 +0000 @@ -0,0 +1,88 @@ + + + + + + + + + + image/svg+xml + + + + + + + + dhis2 + + === added file 'resources/logo/svg/logo_promo1.svg' --- resources/logo/svg/logo_promo1.svg 1970-01-01 00:00:00 +0000 +++ resources/logo/svg/logo_promo1.svg 2012-10-03 10:33:08 +0000 @@ -0,0 +1,88 @@ + + + + + + + + + + image/svg+xml + + + + + + + + dhis2 + + === added file 'resources/logo/svg/logo_promo2.svg' --- resources/logo/svg/logo_promo2.svg 1970-01-01 00:00:00 +0000 +++ resources/logo/svg/logo_promo2.svg 2012-10-03 10:33:08 +0000 @@ -0,0 +1,99 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + dhis2 +