=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/MenuAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/MenuAction.java	2012-09-14 08:40:13 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/MenuAction.java	2012-09-19 07:48:54 +0000
@@ -182,14 +182,23 @@
 
         for (String each: user.getUserCredentials().getAllAuthorities())
         {
-            if ( each.equals( "M_dhis-web-maintenance-patient" ) )
+            if ( each.equals( "ALL" ))
             {
                 trackingAuthority = true;
-            }
-            if ( each.equals( "M_dhis-web-dataentry" ))
-            {
+                
                 aggregateAuthority = true;
             }
+            else
+            {
+                if ( each.equals( "M_dhis-web-maintenance-patient" ) )
+                {
+                    trackingAuthority = true;
+                }
+                if ( each.equals( "M_dhis-web-dataentry" ))
+                {
+                    aggregateAuthority = true;
+                }
+            }
         }
         
         if ( complete )

=== 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-09-07 10:23:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/javascript/gateway.js	2012-09-19 07:48:54 +0000
@@ -164,31 +164,50 @@
 	}
 	else if ( currentType == 'clickatell' )
 	{
-		lockScreen();
-		jQuery.postJSON( "saveClickatellConfig.action", {
-			gatewayType: getFieldValue( 'gatewayType' ),
-			name: getFieldValue( 'clickatellFields input[id=name]' ),
-			username: getFieldValue( 'clickatellFields input[id=username]' ),
-			password: getFieldValue( 'clickatellFields input[id=password]' ),
-			apiId: getFieldValue( 'clickatellFields input[id=apiId]' )
-		}, function ( json ) {
-			unLockScreen();
-			showMessage( json );
-		} );
+		var username = getFieldValue( 'clickatellFields input[id=username]' );
+		var password = getFieldValue( 'clickatellFields input[id=password]' );
+		if ( username == "" || password == "")
+		{	
+			showErrorMessage( i18n_required_data_error );
+		}
+		else
+		{
+			lockScreen();
+			jQuery.postJSON( "saveClickatellConfig.action", {
+				gatewayType: getFieldValue( 'gatewayType' ),
+				name: getFieldValue( 'clickatellFields input[id=name]' ),
+				username: getFieldValue( 'clickatellFields input[id=username]' ),
+				password: getFieldValue( 'clickatellFields input[id=password]' ),
+				apiId: getFieldValue( 'clickatellFields input[id=apiId]' )
+			}, function ( json ) {
+				unLockScreen();
+				showMessage( json );
+			} );
+		}
 	}
 	else
 	{
-		lockScreen();
-		jQuery.postJSON( "saveHTTPConfig.action", {
-			gatewayType: getFieldValue( 'gatewayType' ),
-			name: getFieldValue( 'genericHTTPFields input[id=name]' ),
-			username: getFieldValue( 'genericHTTPFields input[id=username]' ),
-			password: getFieldValue( 'genericHTTPFields input[id=password]' ),
-			urlTemplate: getFieldValue( 'genericHTTPFields input[id=urlTemplate]' )
-		}, function ( json ) {
-			unLockScreen();
-			showMessage( json );
-		} );
+		var username = getFieldValue( 'genericHTTPFields input[id=username]' );
+		var password = getFieldValue( 'genericHTTPFields input[id=password]' );
+		var URL = getFieldValue( 'genericHTTPFields input[id=urlTemplate]' );
+		if( username == "" || password == "" || URL == "" )
+		{	
+			showErrorMessage( i18n_required_data_error );
+		}
+		else
+		{
+			lockScreen();
+			jQuery.postJSON( "saveHTTPConfig.action", {
+				gatewayType: getFieldValue( 'gatewayType' ),
+				name: getFieldValue( 'genericHTTPFields input[id=name]' ),
+				username: getFieldValue( 'genericHTTPFields input[id=username]' ),
+				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/updateGateway.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/updateGateway.vm	2012-09-07 10:18:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/src/main/webapp/dhis-web-maintenance-mobile/updateGateway.vm	2012-09-19 07:48:54 +0000
@@ -169,7 +169,7 @@
 				<td><input type="password" name="password" id="password" style="width: 28em" value="$!params.get( 'password' )"/></td>
 			</tr>
 			<tr>
-				<td>$i18n.getString( "url_template" ):</td>
+				<td>$i18n.getString( "url_template" ) <em title="$i18n.getString( 'required' )" class="required">*</em>:</td>
 				<td><input type="text" name="urlTemplate" id="urlTemplate" style="width: 28em" value="$!encoder.htmlEncode( $!httpGateway.urlTemplate )"/></td>
 			</tr>
 		</tbody>