dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #18594
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 7892: add waiting screen for SMS, gateway configuration page
------------------------------------------------------------
revno: 7892
committer: Lai <lai.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2012-08-10 13:29:51 +0700
message:
add waiting screen for SMS, gateway configuration page
modified:
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/gateway.js
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smsServiceConfiguration.vm
--
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/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 2012-08-10 02:43:42 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/security/action/LoginAction.java 2012-08-10 06:29:51 +0000
@@ -75,6 +75,11 @@
{
Device device = deviceResolver.resolveDevice( ServletActionContext.getRequest() );
+ System.out.println(ServletActionContext.getRequest().getHeader( "User-Agent" ));
+ System.out.println(ServletActionContext.getRequest().getHeader("x-wap-profile"));
+ System.out.println(ServletActionContext.getRequest().getHeader("Profile"));
+ System.out.println(ServletActionContext.getRequest().getHeader("Accept"));
+
if ( device.isMobile() )
{
return "mobile";
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/gateway.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/gateway.js 2012-08-10 02:43:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/gateway.js 2012-08-10 06:29:51 +0000
@@ -65,6 +65,7 @@
function saveGatewayConfig()
{
+ lockScreen();
if ( currentType == 'modem' )
{
jQuery.postJSON( "saveModemConfig.action", {
@@ -78,6 +79,7 @@
inbound: getFieldValue( 'modemFields select[id=inbound]' ),
outbound: getFieldValue( 'modemFields select[id=outbound]' )
}, function ( json ) {
+ unLockScreen();
showMessage( json );
} );
}
@@ -90,6 +92,7 @@
password: getFieldValue( 'bulksmsFields input[id=password]' ),
region: getFieldValue( 'bulksmsFields select[id=region]' )
}, function ( json ) {
+ unLockScreen();
showMessage( json );
} );
}
@@ -102,6 +105,7 @@
password: getFieldValue( 'clickatellFields input[id=password]' ),
apiId: getFieldValue( 'clickatellFields input[id=apiId]' )
}, function ( json ) {
+ unLockScreen();
showMessage( json );
} );
}
@@ -114,6 +118,7 @@
password: getFieldValue( 'genericHTTPFields input[id=password]' ),
urlTemplate: getFieldValue( 'genericHTTPFields input[id=urlTemplate]' )
}, function ( json ) {
+ unLockScreen();
showMessage( json );
} );
}
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smsServiceConfiguration.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smsServiceConfiguration.vm 2012-08-10 04:12:09 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/smsServiceConfiguration.vm 2012-08-10 06:29:51 +0000
@@ -22,6 +22,7 @@
<script type="text/javascript">
jQuery(document).ready( function() {
validation2( "saveSmsConfigurationForm", function( form ) {
+ lockScreen();
form.submit();
}, {
'rules': getValidationRules( 'SMSConfig' )