webgui/js/app/windows/AdminClientRealms.js

+/*
+Admin Client Realms
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+
+function showAdminClientRealmsWindow(clientID) {
+
+	var AdminClientRealmsWindow = new Ext.ux.GenericGridWindow(
+		// Window config
+		{
+			title: "Realms",
+			iconCls: 'silk-world',
+			
+			width: 400,
+			height: 335,
+		
+			minWidth: 400,
+			minHeight: 335
+		},
+		// Grid config
+		{
+			// Inline toolbars
+			tbar: [
+				{
+					text:'Add',
+					tooltip:'Add realm',
+					iconCls: 'silk-world_add',
+					handler: function() {
+						showAdminClientRealmAddWindow(AdminClientRealmsWindow,clientID);
+					}
+				}, 
+				'-', 
+				{
+					text:'Remove',
+					tooltip:'Remove realm',
+					iconCls: 'silk-world_delete',
+					handler: function() {
+						var selectedItem = Ext.getCmp(AdminClientRealmsWindow.gridPanelID).getSelectionModel().getSelected();
+						// Check if we have selected item
+						if (selectedItem) {
+							// If so display window
+							showAdminClientRealmRemoveWindow(AdminClientRealmsWindow,selectedItem.data.ID);
+						} else {
+							AdminClientRealmsWindow.getEl().mask();
+
+							// Display error
+							Ext.Msg.show({
+								title: "Nothing selected",
+								msg: "No realm selected",
+								icon: Ext.MessageBox.ERROR,
+								buttons: Ext.Msg.CANCEL,
+								modal: false,
+								fn: function() {
+									AdminClientRealmsWindow.getEl().unmask();
+								}
+							});
+						}
+					}
+				}
+			],
+			// Column model
+			colModel: new Ext.grid.ColumnModel([
+				{
+					id: 'ID',
+					header: "ID",
+					sortable: true,
+					dataIndex: 'ID'
+				},
+				{
+					header: "Name",
+					sortable: true,
+					dataIndex: 'Name'
+				}
+			]),
+			autoExpandColumn: 'Name'
+		},
+		// Store config
+		{
+			baseParams: {
+				ID: clientID,
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'AdminClientRealms',
+				SOAPFunction: 'getAdminClientRealms',
+				SOAPParams: 'ID,__search'
+			}
+		},
+		// Filter config
+		{
+			filters: [
+				{type: 'numeric',  dataIndex: 'ID'},
+				{type: 'string',  dataIndex: 'Name'}
+			]
+		}
+	);
+
+	AdminClientRealmsWindow.show();
+}
+
+
+// Display edit/add form
+function showAdminClientRealmAddWindow(AdminClientRealmsWindow,clientID,id) {
+
+	var submitAjaxConfig;
+	var icon;
+
+	// We doing an update
+	if (id) {
+		icon = 'silk-world_edit',
+		submitAjaxConfig = {
+			params: {
+				ID: id,
+				SOAPFunction: 'updateAdminRealm',
+				SOAPParams: 
+					'0:ID,'+
+					'0:RealmID'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminClientRealmsWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
+		};
+
+	// We doing an Add
+	} else {
+		icon = 'silk-world_add',
+		submitAjaxConfig = {
+			params: {
+				ClientID: clientID,
+				SOAPFunction: 'addAdminClientRealm',
+				SOAPParams: 
+					'0:ClientID,'+
+					'0:RealmID'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminClientRealmsWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
+		};
+	}
+	
+	// Create window
+	var adminRealmFormWindow = new Ext.ux.GenericFormWindow(
+		// Window config
+		{
+			title: "Realm Information",
+			iconCls: icon,
+
+			width: 310,
+			height: 113,
+
+			minWidth: 310,
+			minHeight: 113
+		},
+		// Form panel config
+		{
+			labelWidth: 85,
+			baseParams: {
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'AdminRealms'
+			},
+			items: [
+				{
+					xtype: 'combo',
+					//id: 'combo',
+					fieldLabel: 'Realm',
+					name: 'Realm',
+					allowBlank: false,
+					width: 160,
+
+					store: new Ext.ux.JsonStore({
+						sortInfo: { field: "Name", direction: "ASC" },
+						baseParams: {
+							SOAPUsername: globalConfig.soap.username,
+							SOAPPassword: globalConfig.soap.password,
+							SOAPAuthType: globalConfig.soap.authtype,
+							SOAPModule: 'AdminClientRealms',
+							SOAPFunction: 'getAdminRealms',
+							SOAPParams: '__null,__search'
+						}
+					}),
+					displayField: 'Name',
+					valueField: 'ID',
+					hiddenName: 'RealmID',
+					forceSelection: true,
+					triggerAction: 'all',
+					editable: false
+				}
+			]
+		},
+		// Submit button config
+		submitAjaxConfig
+	);
+
+	adminRealmFormWindow.show();
+
+	if (id) {
+		Ext.getCmp(adminRealmFormWindow.formPanelID).load({
+			params: {
+				ID: id,
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'AdminRealms',
+				SOAPFunction: 'getAdminRealm',
+				SOAPParams: 'ID'
+			}
+		});
+	}
+}
+
+
+
+
+// Display remove form
+function showAdminClientRealmRemoveWindow(AdminClientRealmsWindow,id) {
+	// Mask AdminClientRealmsWindow window
+	AdminClientRealmsWindow.getEl().mask();
+
+	// Display remove confirm window
+	Ext.Msg.show({
+		title: "Confirm removal",
+		msg: "Are you very sure you wish to unlink this realm?",
+		icon: Ext.MessageBox.ERROR,
+		buttons: Ext.Msg.YESNO,
+		modal: false,
+		fn: function(buttonId,text) {
+			// Check if user clicked on 'yes' button
+			if (buttonId == 'yes') {
+
+				// Do ajax request
+				uxAjaxRequest(AdminClientRealmsWindow,{
+					params: {
+						ID: id,
+						SOAPUsername: globalConfig.soap.username,
+						SOAPPassword: globalConfig.soap.password,
+						SOAPAuthType: globalConfig.soap.authtype,
+						SOAPModule: 'AdminClientRealms',
+						SOAPFunction: 'removeAdminClientRealm',
+						SOAPParams: 'ID'
+					},
+					customSuccess: function() {
+						var store = Ext.getCmp(AdminClientRealmsWindow.gridPanelID).getStore();
+						store.load({
+							params: {
+								limit: 25
+							}
+						});
+					}
+				});
+
+
+			// Unmask if user answered no
+			} else {
+				AdminClientRealmsWindow.getEl().unmask();
+			}
+		}
+	});
+}
+
+
+// vim: ts=4

webgui/js/app/windows/AdminClients.js

+/*
+Admin Clients
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+
+function showAdminClientWindow() {
+
+	var AdminClientWindow = new Ext.ux.GenericGridWindow(
+		// Window config
+		{
+			title: "Clients",
+			
+			width: 600,
+			height: 335,
+		
+			minWidth: 600,
+			minHeight: 335
+		},
+		// Grid config
+		{
+			// Inline toolbars
+			tbar: [
+				{
+					text:'Add',
+					tooltip:'Add client',
+					iconCls:'silk-server_add',
+					handler: function() {
+						showAdminClientAddEditWindow(AdminClientWindow);
+					}
+				}, 
+				'-',
+				{
+					text:'Edit',
+					tooltip:'Edit client',
+					iconCls:'silk-server_edit',
+					handler: function() {
+						var selectedItem = Ext.getCmp(AdminClientWindow.gridPanelID).getSelectionModel().getSelected();
+						// Check if we have selected item
+						if (selectedItem) {
+							// If so display window
+							showAdminClientAddEditWindow(AdminClientWindow,selectedItem.data.ID);
+						} else {
+							AdminClientWindow.getEl().mask();
+
+							// Display error
+							Ext.Msg.show({
+								title: "Nothing selected",
+								msg: "No client selected",
+								icon: Ext.MessageBox.ERROR,
+								buttons: Ext.Msg.CANCEL,
+								modal: false,
+								fn: function() {
+									AdminClientWindow.getEl().unmask();
+								}
+							});
+						}
+					}
+				},
+				{
+					text:'Remove',
+					tooltip:'Remove client',
+					iconCls:'silk-server_delete',
+					handler: function() {
+						var selectedItem = Ext.getCmp(AdminClientWindow.gridPanelID).getSelectionModel().getSelected();
+						// Check if we have selected item
+						if (selectedItem) {
+							// If so display window
+							showAdminClientRemoveWindow(AdminClientWindow,selectedItem.data.ID);
+						} else {
+							AdminClientWindow.getEl().mask();
+
+							// Display error
+							Ext.Msg.show({
+								title: "Nothing selected",
+								msg: "No client selected",
+								icon: Ext.MessageBox.ERROR,
+								buttons: Ext.Msg.CANCEL,
+								modal: false,
+								fn: function() {
+									AdminClientWindow.getEl().unmask();
+								}
+							});
+						}
+					}
+				},
+				'-',
+				{
+					text:'Attributes',
+					tooltip:'Client attributes',
+					iconCls:'silk-table',
+					handler: function() {
+						var selectedItem = Ext.getCmp(AdminClientWindow.gridPanelID).getSelectionModel().getSelected();
+						// Check if we have selected item
+						if (selectedItem) {
+							// If so display window
+							showAdminClientAttributesWindow(selectedItem.data.ID);
+						} else {
+							AdminClientWindow.getEl().mask();
+
+							// Display error
+							Ext.Msg.show({
+								title: "Nothing selected",
+								msg: "No client selected",
+								icon: Ext.MessageBox.ERROR,
+								buttons: Ext.Msg.CANCEL,
+								modal: false,
+								fn: function() {
+									AdminClientWindow.getEl().unmask();
+								}
+							});
+						}
+					}
+				},
+				'-',
+				{
+					text:'Realms',
+					tooltip:'Realms',
+					iconCls:'silk-world',
+					handler: function() {
+						var selectedItem = Ext.getCmp(AdminClientWindow.gridPanelID).getSelectionModel().getSelected();
+						// Check if we have selected item
+						if (selectedItem) {
+							// If so display window
+							showAdminClientRealmsWindow(selectedItem.data.ID);
+						} else {
+							AdminClientWindow.getEl().mask();
+
+							// Display error
+							Ext.Msg.show({
+								title: "Nothing selected",
+								msg: "No client selected",
+								icon: Ext.MessageBox.ERROR,
+								buttons: Ext.Msg.CANCEL,
+								modal: false,
+								fn: function() {
+									AdminClientWindow.getEl().unmask();
+								}
+							});
+						}
+					}
+				}
+			],
+			// Column model
+			colModel: new Ext.grid.ColumnModel([
+				{
+					id: 'ID',
+					header: "ID",
+					sortable: true,
+					dataIndex: 'ID'
+				},
+				{
+					header: "Name",
+					sortable: true,
+					dataIndex: 'Name'
+				},
+				{
+					header: "AccessList",
+					sortable: true,
+					dataIndex: 'AccessList'
+				}
+			]),
+			autoExpandColumn: 'Name'
+		},
+		// Store config
+		{
+			baseParams: {
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'AdminClients',
+				SOAPFunction: 'getAdminClients',
+				SOAPParams: '__null,__search'
+			}
+		},
+		// Filter config
+		{
+			filters: [
+				{type: 'numeric',  dataIndex: 'ID'},
+				{type: 'string',  dataIndex: 'Name'},
+				{type: 'string',  dataIndex: 'AccessList'}
+			]
+		}
+	);
+
+	AdminClientWindow.show();
+}
+
+
+// Display edit/add form
+function showAdminClientAddEditWindow(AdminClientWindow,id) {
+
+	var submitAjaxConfig;
+	var icon;
+
+	// We doing an update
+	if (id) {
+		icon = 'silk-server_edit';
+		submitAjaxConfig = {
+			params: {
+				ID: id,
+				SOAPFunction: 'updateAdminClient',
+				SOAPParams: 
+					'0:ID,'+
+					'0:Name,'+
+					'0:AccessList'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminClientWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
+		};
+
+	// We doing an Add
+	} else {
+		icon = 'silk-server_add';
+		submitAjaxConfig = {
+			params: {
+				SOAPFunction: 'createAdminClient',
+				SOAPParams: 
+					'0:Name,'+
+					'0:AccessList'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminClientWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
+		};
+	}
+
+	// Create window
+	var adminClientFormWindow = new Ext.ux.GenericFormWindow(
+		// Window config
+		{
+			title: "Client Information",
+			iconCls: icon,
+
+			width: 310,
+			height: 143,
+
+			minWidth: 310,
+			minHeight: 143
+		},
+		// Form panel config
+		{
+			labelWidth: 85,
+			baseParams: {
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'AdminClients'
+			},
+			items: [
+				{
+					fieldLabel: 'Name',
+					name: 'Name',
+					allowBlank: false
+				},
+				{
+					fieldLabel: 'AccessList',
+					name: 'AccessList',
+					allowBlank: true
+				}
+			]
+		},
+		// Submit button config
+		submitAjaxConfig
+	);
+
+	adminClientFormWindow.show();
+
+	if (id) {
+		Ext.getCmp(adminClientFormWindow.formPanelID).load({
+			params: {
+				ID: id,
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'AdminClients',
+				SOAPFunction: 'getAdminClient',
+				SOAPParams: 'ID'
+			}
+		});
+	}
+}
+
+
+// Display remove form
+function showAdminClientRemoveWindow(AdminClientWindow,id) {
+	// Mask AdminClientWindow window
+	AdminClientWindow.getEl().mask();
+
+	// Display remove confirm window
+	Ext.Msg.show({
+		title: "Confirm removal",
+		msg: "Are you very sure you wish to remove this client?",
+		icon: Ext.MessageBox.ERROR,
+		buttons: Ext.Msg.YESNO,
+		modal: false,
+		fn: function(buttonId,text) {
+			// Check if user clicked on 'yes' button
+			if (buttonId == 'yes') {
+
+				// Do ajax request
+				uxAjaxRequest(AdminClientWindow,{
+					params: {
+						ID: id,
+						SOAPUsername: globalConfig.soap.username,
+						SOAPPassword: globalConfig.soap.password,
+						SOAPAuthType: globalConfig.soap.authtype,
+						SOAPModule: 'AdminClients',
+						SOAPFunction: 'removeAdminClient',
+						SOAPParams: 'ID'
+					},
+					customSuccess: function() {
+						var store = Ext.getCmp(AdminClientWindow.gridPanelID).getStore();
+						store.load({
+							params: {
+								limit: 25
+							}
+						});
+					}
+				});
+
+
+			// Unmask if user answered no
+			} else {
+				AdminClientWindow.getEl().unmask();
+			}
+		}
+	});
+}
+
+
+
+// vim: ts=4

webgui/js/app/windows/AdminGroupAttributes.js

+/*
+Admin Group Attributes
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+
+function showAdminGroupAttributesWindow(groupID) {
+
+	var AdminGroupAttributesWindow = new Ext.ux.GenericGridWindow(
+		// Window config
+		{
+			title: "Attributes",
+			iconCls: 'silk-table',
+			
+			width: 600,
+			height: 335,
+		
+			minWidth: 600,
+			minHeight: 335
+		},
+		// Grid config
+		{
+			// Inline toolbars
+			tbar: [
+				{
+					text:'Add',
+					tooltip:'Add attribute',
+					iconCls:'silk-table_add',
+					handler: function() {
+						showAdminGroupAttributeAddEditWindow(AdminGroupAttributesWindow,groupID);
+					}
+				}, 
+				'-', 
+				{
+					text:'Edit',
+					tooltip:'Edit attribute',
+					iconCls:'silk-table_edit',
+					handler: function() {
+						var selectedItem = Ext.getCmp(AdminGroupAttributesWindow.gridPanelID).getSelectionModel().getSelected();
+						// Check if we have selected item
+						if (selectedItem) {
+							// If so display window
+							showAdminGroupAttributeAddEditWindow(AdminGroupAttributesWindow,groupID,selectedItem.data.ID);
+						} else {
+							AdminGroupAttributesWindow.getEl().mask();
+
+							// Display error
+							Ext.Msg.show({
+								title: "Nothing selected",
+								msg: "No attribute selected",
+								icon: Ext.MessageBox.ERROR,
+								buttons: Ext.Msg.CANCEL,
+								modal: false,
+								fn: function() {
+									AdminGroupAttributesWindow.getEl().unmask();
+								}
+							});
+						}
+					}
+				},
+				'-', 
+				{
+					text:'Remove',
+					tooltip:'Remove attribute',
+					iconCls:'silk-table_delete',
+					handler: function() {
+						var selectedItem = Ext.getCmp(AdminGroupAttributesWindow.gridPanelID).getSelectionModel().getSelected();
+						// Check if we have selected item
+						if (selectedItem) {
+							// If so display window
+							showAdminGroupAttributeRemoveWindow(AdminGroupAttributesWindow,selectedItem.data.ID);
+						} else {
+							AdminGroupAttributesWindow.getEl().mask();
+
+							// Display error
+							Ext.Msg.show({
+								title: "Nothing selected",
+								msg: "No attribute selected",
+								icon: Ext.MessageBox.ERROR,
+								buttons: Ext.Msg.CANCEL,
+								modal: false,
+								fn: function() {
+									AdminGroupAttributesWindow.getEl().unmask();
+								}
+							});
+						}
+					}
+				}
+			],
+			// Column model
+			colModel: new Ext.grid.ColumnModel([
+				{
+					id: 'ID',
+					header: "ID",
+					sortable: true,
+					dataIndex: 'ID'
+				},
+				{
+					header: "Name",
+					sortable: true,
+					dataIndex: 'Name'
+				},
+				{
+					header: "Operator",
+					sortable: true,
+					dataIndex: 'Operator'
+				},
+				{
+					header: "Value",
+					sortable: true,
+					dataIndex: 'Value'
+				},
+				{
+					header: "Disabled",
+					sortable: true,
+					dataIndex: 'Disabled'
+				}
+			]),
+			autoExpandColumn: 'Name'
+		},
+		// Store config
+		{
+			baseParams: {
+				ID: groupID,
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'AdminGroupAttributes',
+				SOAPFunction: 'getAdminGroupAttributes',
+				SOAPParams: 'ID,__search'
+			}
+		},
+		// Filter config
+		{
+			filters: [
+				{type: 'numeric',  dataIndex: 'ID'},
+				{type: 'string',  dataIndex: 'Name'},
+				{type: 'string',  dataIndex: 'Operator'},
+				{type: 'string',  dataIndex: 'Value'},
+				{type: 'boolean', dataIndex: 'Disabled'}
+			]
+		}
+	);
+
+	AdminGroupAttributesWindow.show();
+}
+
+
+// Display edit/add form
+function showAdminGroupAttributeAddEditWindow(AdminGroupAttributesWindow,groupID,attrID) {
+
+	var submitAjaxConfig;
+	var icon;
+
+	// We doing an update
+	if (attrID) {
+		icon = 'silk-table_edit';
+		submitAjaxConfig = {
+			params: {
+				ID: attrID,
+				SOAPFunction: 'updateAdminGroupAttribute',
+				SOAPParams: 
+					'0:ID,'+
+					'0:Name,'+
+					'0:Operator,'+
+					'0:Value,'+
+					'0:Disabled:boolean'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminGroupAttributesWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
+		};
+
+	// We doing an Add
+	} else {
+		icon = 'silk-table_add';
+		submitAjaxConfig = {
+			params: {
+				GroupID: groupID,
+				SOAPFunction: 'addAdminGroupAttribute',
+				SOAPParams: 
+					'0:GroupID,'+
+					'0:Name,'+
+					'0:Operator,'+
+					'0:Value,'+
+					'0:Disabled:boolean'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminGroupAttributesWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
+		};
+	}
+	
+	// Create window
+	var adminGroupAttributesFormWindow = new Ext.ux.GenericFormWindow(
+		// Window config
+		{
+			title: "Attribute Information",
+			iconCls: icon,
+
+			width: 310,
+			height: 200,
+
+			minWidth: 310,
+			minHeight: 200
+		},
+		// Form panel config
+		{
+			labelWidth: 85,
+			baseParams: {
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'AdminGroupAttributes'
+			},
+			items: [
+				{
+					fieldLabel: 'Name',
+					name: 'Name',
+					allowBlank: false
+				},
+				{
+					xtype: 'combo',
+					fieldLabel: 'Operator',
+					name: 'Operator',
+					allowBlank: false,
+					width: 157,
+					store: [ 
+						[ '=', '=' ], 
+						[ ':=', ':='  ],
+						[ '==', '==' ], 
+						[ '+=', '+=' ],
+						[ '!=', '!=' ],
+						[ '<', '<' ],
+						[ '>', '>' ],
+						[ '<=', '<=' ],
+						[ '>=', '>=' ],
+						[ '=~', '=~' ],
+						[ '!~', '!~' ],
+						[ '=*', '=*' ],
+						[ '!*', '!*' ],
+						[ '||==', '||==' ]
+					],
+					displayField: 'Operator',
+					valueField: 'Operator',
+					hiddenName: 'Operator',
+					forceSelection: false,
+					triggerAction: 'all',
+					editable: true
+				},
+				{
+					fieldLabel: "Value",
+					name: "Value",
+					allowBlank: false
+				},
+				{
+					xtype: 'checkbox',
+					fieldLabel: 'Disabled',
+					name: 'Disabled'
+				}
+			]
+		},
+		// Submit button config
+		submitAjaxConfig
+	);
+
+	adminGroupAttributesFormWindow.show();
+
+	if (attrID) {
+		Ext.getCmp(adminGroupAttributesFormWindow.formPanelID).load({
+			params: {
+				ID: attrID,
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'AdminGroupAttributes',
+				SOAPFunction: 'getAdminGroupAttribute',
+				SOAPParams: 'ID'
+			}
+		});
+	}
+}
+
+
+
+
+// Display remove form
+function showAdminGroupAttributeRemoveWindow(AdminGroupAttributesWindow,id) {
+	// Mask AdminGroupAttributesWindow window
+	AdminGroupAttributesWindow.getEl().mask();
+
+	// Display remove confirm window
+	Ext.Msg.show({
+		title: "Confirm removal",
+		msg: "Are you very sure you wish to remove this attribute?",
+		icon: Ext.MessageBox.ERROR,
+		buttons: Ext.Msg.YESNO,
+		modal: false,
+		fn: function(buttonId,text) {
+			// Check if user clicked on 'yes' button
+			if (buttonId == 'yes') {
+
+				// Do ajax request
+				uxAjaxRequest(AdminGroupAttributesWindow,{
+					params: {
+						ID: id,
+						SOAPUsername: globalConfig.soap.username,
+						SOAPPassword: globalConfig.soap.password,
+						SOAPAuthType: globalConfig.soap.authtype,
+						SOAPModule: 'AdminGroupAttributes',
+						SOAPFunction: 'removeAdminGroupAttribute',
+						SOAPParams: 'ID'
+					},
+					customSuccess: function() {
+						var store = Ext.getCmp(AdminGroupAttributesWindow.gridPanelID).getStore();
+						store.load({
+							params: {
+								limit: 25
+							}
+						});
+					}
+				});
+
+
+			// Unmask if user answered no
+			} else {
+				AdminGroupAttributesWindow.getEl().unmask();
+			}
+		}
+	});
+}
+
+// vim: ts=4

webgui/js/app/windows/AdminGroupMembers.js

+/*
+Admin Group Members
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+
+function showAdminGroupMembersWindow(groupID) {
+
+	var AdminGroupMembersWindow = new Ext.ux.GenericGridWindow(
+		// Window config
+		{
+			title: "Members",
+			iconCls: 'silk-user',
+			
+			width: 600,
+			height: 335,
+		
+			minWidth: 600,
+			minHeight: 335
+		},
+		// Grid config
+		{
+			// Inline toolbars
+			tbar: [
+				{
+					text:'Remove',
+					tooltip:'Remove member',
+					iconCls:'silk-user_delete',
+					handler: function() {
+						var selectedItem = Ext.getCmp(AdminGroupMembersWindow.gridPanelID).getSelectionModel().getSelected();
+						// Check if we have selected item
+						if (selectedItem) {
+							// If so display window
+							showAdminGroupMemberRemoveWindow(AdminGroupMembersWindow,selectedItem.data.ID);
+						} else {
+							AdminGroupMembersWindow.getEl().mask();
+
+							// Display error
+							Ext.Msg.show({
+								title: "Nothing selected",
+								msg: "No member selected",
+								icon: Ext.MessageBox.ERROR,
+								buttons: Ext.Msg.CANCEL,
+								modal: false,
+								fn: function() {
+									AdminGroupMembersWindow.getEl().unmask();
+								}
+							});
+						}
+					}
+				}
+			],
+			// Column model
+			colModel: new Ext.grid.ColumnModel([
+				{
+					id: 'ID',
+					header: "ID",
+					sortable: true,
+					dataIndex: 'ID'
+				},
+				{
+					header: "Username",
+					sortable: true,
+					dataIndex: 'Username'
+				},
+				{
+					header: "Disabled",
+					sortable: true,
+					dataIndex: 'Disabled'
+				}
+			]),
+			autoExpandColumn: 'Username'
+		},
+		// Store config
+		{
+			baseParams: {
+				ID: groupID,
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'AdminGroupMembers',
+				SOAPFunction: 'getAdminGroupMembers',
+				SOAPParams: 'ID,__search'
+			}
+		},
+		// Filter config
+		{
+			filters: [
+				{type: 'numeric',  dataIndex: 'ID'},
+				{type: 'string',  dataIndex: 'Username'},
+				{type: 'boolean', dataIndex: 'Disabled'}
+			]
+		}
+	);
+
+	AdminGroupMembersWindow.show();
+}
+
+
+// Display remove form
+function showAdminGroupMemberRemoveWindow(AdminGroupMembersWindow,id) {
+	// Mask AdminGroupMembersWindow window
+	AdminGroupMembersWindow.getEl().mask();
+
+	// Display remove confirm window
+	Ext.Msg.show({
+		title: "Confirm removal",
+		msg: "Are you very sure you wish to remove this member?",
+		icon: Ext.MessageBox.ERROR,
+		buttons: Ext.Msg.YESNO,
+		modal: false,
+		fn: function(buttonId,text) {
+			// Check if user clicked on 'yes' button
+			if (buttonId == 'yes') {
+
+				// Do ajax request
+				uxAjaxRequest(AdminGroupMembersWindow,{
+					params: {
+						ID: id,
+						SOAPUsername: globalConfig.soap.username,
+						SOAPPassword: globalConfig.soap.password,
+						SOAPAuthType: globalConfig.soap.authtype,
+						SOAPModule: 'AdminGroupMembers',
+						SOAPFunction: 'removeAdminGroupMember',
+						SOAPParams: 'ID'
+					},
+					customSuccess: function() {
+						var store = Ext.getCmp(AdminGroupMembersWindow.gridPanelID).getStore();
+						store.load({
+							params: {
+								limit: 25
+							}
+						});
+					}
+				});
+
+
+			// Unmask if user answered no
+			} else {
+				AdminGroupMembersWindow.getEl().unmask();
+			}
+		}
+	});
+}
+
+
+// vim: ts=4

webgui/js/app/windows/AdminGroups.js

+/*
+Admin Groups
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 
 function showAdminGroupWindow() {
@@ -6,12 +24,13 @@ function showAdminGroupWindow() {
 		// Window config
 		{
 			title: "Groups",
+			iconCls: 'silk-group',
 			
 			width: 600,
 			height: 335,
 		
 			minWidth: 600,
-			minHeight: 335,
+			minHeight: 335
 		},
 		// Grid config
 		{
@@ -20,22 +39,22 @@ function showAdminGroupWindow() {
 				{
 					text:'Add',
 					tooltip:'Add group',
-					iconCls:'add',
+					iconCls:'silk-group_add',
 					handler: function() {
-						showAdminGroupAddEditWindow();
+						showAdminGroupAddEditWindow(AdminGroupWindow);
 					}
 				}, 
 				'-', 
 				{
 					text:'Edit',
 					tooltip:'Edit group',
-					iconCls:'edit',
+					iconCls:'silk-group_edit',
 					handler: function() {
-						var selectedItem = AdminGroupWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
-							showAdminGroupAddEditWindow(selectedItem.data.ID);
+							showAdminGroupAddEditWindow(AdminGroupWindow,selectedItem.data.ID);
 						} else {
 							AdminGroupWindow.getEl().mask();
 
@@ -57,9 +76,9 @@ function showAdminGroupWindow() {
 				{
 					text:'Remove',
 					tooltip:'Remove group',
-					iconCls:'remove',
+					iconCls:'silk-group_delete',
 					handler: function() {
-						var selectedItem = AdminGroupWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -85,9 +104,9 @@ function showAdminGroupWindow() {
 				{
 					text:'Attributes',
 					tooltip:'Group attributes',
-					iconCls:'logs',
+					iconCls:'silk-table',
 					handler: function() {
-						var selectedItem = AdminGroupWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -113,9 +132,9 @@ function showAdminGroupWindow() {
 				{
 					text:'Members',
 					tooltip:'Group members',
-					iconCls:'topups',
+					iconCls:'silk-group',
 					handler: function() {
-						var selectedItem = AdminGroupWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminGroupWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -197,27 +216,50 @@ function showAdminGroupWindow() {
 
 
 // Display edit/add form
-function showAdminGroupAddEditWindow(id) {
+function showAdminGroupAddEditWindow(AdminGroupWindow,id) {
 
 	var submitAjaxConfig;
-
+	var icon;
 
 	// We doing an update
+
 	if (id) {
+		icon = 'silk-group_edit';
 		submitAjaxConfig = {
-			ID: id,
-			SOAPFunction: 'updateAdminGroup',
-			SOAPParams: 
-				'0:ID,'+
-				'0:Name'
+			params: {
+				ID: id,
+				SOAPFunction: 'updateAdminGroup',
+				SOAPParams: 
+					'0:ID,'+
+					'0:Name'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminGroupWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
 		};
 
 	// We doing an Add
 	} else {
+		icon = 'silk-group_add';
 		submitAjaxConfig = {
-			SOAPFunction: 'createAdminGroup',
-			SOAPParams: 
-				'0:Name'
+			params: {
+				SOAPFunction: 'createAdminGroup',
+				SOAPParams: 
+					'0:Name'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminGroupWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
 		};
 	}
 	
@@ -226,12 +268,13 @@ function showAdminGroupAddEditWindow(id) {
 		// Window config
 		{
 			title: "Group Information",
+			iconCls: icon,
 
-			width: 475,
-			height: 260,
+			width: 310,
+			height: 113,
 
-			minWidth: 475,
-			minHeight: 260
+			minWidth: 310,
+			minHeight: 113
 		},
 		// Form panel config
 		{
@@ -246,11 +289,9 @@ function showAdminGroupAddEditWindow(id) {
 				{
 					fieldLabel: 'Name',
 					name: 'Name',
-					vtype: 'usernamePart',
-					maskRe: usernamePartRe,
 					allowBlank: false
-				},
-			],
+				}
+			]
 		},
 		// Submit button config
 		submitAjaxConfig
@@ -259,7 +300,7 @@ function showAdminGroupAddEditWindow(id) {
 	adminGroupFormWindow.show();
 
 	if (id) {
-		adminGroupFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminGroupFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,
@@ -276,10 +317,10 @@ function showAdminGroupAddEditWindow(id) {
 
 
 
-// Display edit/add form
-function showAdminGroupRemoveWindow(parent,id) {
-	// Mask parent window
-	parent.getEl().mask();
+// Display remove form
+function showAdminGroupRemoveWindow(AdminGroupWindow,id) {
+	// Mask AdminGroupWindow window
+	AdminGroupWindow.getEl().mask();
 
 	// Display remove confirm window
 	Ext.Msg.show({
@@ -293,7 +334,7 @@ function showAdminGroupRemoveWindow(parent,id) {
 			if (buttonId == 'yes') {
 
 				// Do ajax request
-				uxAjaxRequest(parent,{
+				uxAjaxRequest(AdminGroupWindow,{
 					params: {
 						ID: id,
 						SOAPUsername: globalConfig.soap.username,
@@ -302,15 +343,25 @@ function showAdminGroupRemoveWindow(parent,id) {
 						SOAPModule: 'AdminGroups',
 						SOAPFunction: 'removeAdminGroup',
 						SOAPParams: 'ID'
+					},
+					customSuccess: function() {
+						var store = Ext.getCmp(AdminGroupWindow.gridPanelID).getStore();
+						store.load({
+							params: {
+								limit: 25
+							}
+						});
 					}
 				});
 
 
 			// Unmask if user answered no
 			} else {
-				parent.getEl().unmask();
+				AdminGroupWindow.getEl().unmask();
 			}
 		}
 	});
 }
 
+
+// vim: ts=4

webgui/js/app/windows/AdminRealmAttributes.js

+/*
+Admin Realm Attributes
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+
+function showAdminRealmAttributesWindow(realmID) {
+
+	var AdminRealmAttributesWindow = new Ext.ux.GenericGridWindow(
+		// Window config
+		{
+			title: "Attributes",
+			iconCls: 'silk-table',
+			
+			width: 600,
+			height: 335,
+		
+			minWidth: 600,
+			minHeight: 335
+		},
+		// Grid config
+		{
+			// Inline toolbars
+			tbar: [
+				{
+					text:'Add',
+					tooltip:'Add attribute',
+					iconCls:'silk-table_add',
+					handler: function() {
+						showAdminRealmAttributeAddEditWindow(AdminRealmAttributesWindow,realmID);
+					}
+				}, 
+				'-', 
+				{
+					text:'Edit',
+					tooltip:'Edit attribute',
+					iconCls:'silk-table_edit',
+					handler: function() {
+						var selectedItem = Ext.getCmp(AdminRealmAttributesWindow.gridPanelID).getSelectionModel().getSelected();
+						// Check if we have selected item
+						if (selectedItem) {
+							// If so display window
+							showAdminRealmAttributeAddEditWindow(AdminRealmAttributesWindow,realmID,selectedItem.data.ID);
+						} else {
+							AdminRealmAttributesWindow.getEl().mask();
+
+							// Display error
+							Ext.Msg.show({
+								title: "Nothing selected",
+								msg: "No attribute selected",
+								icon: Ext.MessageBox.ERROR,
+								buttons: Ext.Msg.CANCEL,
+								modal: false,
+								fn: function() {
+									AdminRealmAttributesWindow.getEl().unmask();
+								}
+							});
+						}
+					}
+				},
+				'-', 
+				{
+					text:'Remove',
+					tooltip:'Remove attribute',
+					iconCls:'silk-table_delete',
+					handler: function() {
+						var selectedItem = Ext.getCmp(AdminRealmAttributesWindow.gridPanelID).getSelectionModel().getSelected();
+						// Check if we have selected item
+						if (selectedItem) {
+							// If so display window
+							showAdminRealmAttributeRemoveWindow(AdminRealmAttributesWindow,selectedItem.data.ID);
+						} else {
+							AdminRealmAttributesWindow.getEl().mask();
+
+							// Display error
+							Ext.Msg.show({
+								title: "Nothing selected",
+								msg: "No attribute selected",
+								icon: Ext.MessageBox.ERROR,
+								buttons: Ext.Msg.CANCEL,
+								modal: false,
+								fn: function() {
+									AdminRealmAttributesWindow.getEl().unmask();
+								}
+							});
+						}
+					}
+				}
+			],
+			// Column model
+			colModel: new Ext.grid.ColumnModel([
+				{
+					id: 'ID',
+					header: "ID",
+					sortable: true,
+					dataIndex: 'ID'
+				},
+				{
+					header: "Name",
+					sortable: true,
+					dataIndex: 'Name'
+				},
+				{
+					header: "Operator",
+					sortable: true,
+					dataIndex: 'Operator'
+				},
+				{
+					header: "Value",
+					sortable: true,
+					dataIndex: 'Value'
+				},
+				{
+					header: "Disabled",
+					sortable: true,
+					dataIndex: 'Disabled'
+				}
+			]),
+			autoExpandColumn: 'Name'
+		},
+		// Store config
+		{
+			baseParams: {
+				ID: realmID,
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'AdminRealmAttributes',
+				SOAPFunction: 'getAdminRealmAttributes',
+				SOAPParams: 'ID,__search'
+			}
+		},
+		// Filter config
+		{
+			filters: [
+				{type: 'numeric',  dataIndex: 'ID'},
+				{type: 'string',  dataIndex: 'Name'},
+				{type: 'string',  dataIndex: 'Operator'},
+				{type: 'string',  dataIndex: 'Value'},
+				{type: 'boolean', dataIndex: 'Disabled'}
+			]
+		}
+	);
+
+	AdminRealmAttributesWindow.show();
+}
+
+
+// Display edit/add form
+function showAdminRealmAttributeAddEditWindow(AdminRealmAttributesWindow,realmID,attrID) {
+
+	var submitAjaxConfig;
+	var icon;
+
+
+	// We doing an update
+	if (attrID) {
+		icon = 'silk-table_edit';
+		submitAjaxConfig = {
+			params: {
+				ID: attrID,
+				SOAPFunction: 'updateAdminRealmAttribute',
+				SOAPParams: 
+					'0:ID,'+
+					'0:Name,'+
+					'0:Operator,'+
+					'0:Value,'+
+					'0:Disabled:boolean'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminRealmAttributesWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
+		};
+
+	// We doing an Add
+	} else {
+		icon = 'silk-table_add';
+		submitAjaxConfig = {
+			params: {
+				RealmID: realmID,
+				SOAPFunction: 'addAdminRealmAttribute',
+				SOAPParams: 
+					'0:RealmID,'+
+					'0:Name,'+
+					'0:Operator,'+
+					'0:Value,'+
+					'0:Disabled:boolean'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminRealmAttributesWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
+		};
+	}
+	
+	// Create window
+	var adminRealmAttributesFormWindow = new Ext.ux.GenericFormWindow(
+		// Window config
+		{
+			title: "Attribute Information",
+			iconCls: icon,
+
+			width: 310,
+			height: 200,
+
+			minWidth: 310,
+			minHeight: 200
+		},
+		// Form panel config
+		{
+			labelWidth: 85,
+			baseParams: {
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'AdminRealmAttributes'
+			},
+			items: [
+				{
+					fieldLabel: 'Name',
+					name: 'Name',
+					allowBlank: false
+				},
+				{
+					xtype: 'combo',
+					fieldLabel: 'Operator',
+					name: 'Operator',
+					allowBlank: false,
+					width: 157,
+					store: [ 
+						[ '=', '=' ], 
+						[ ':=', ':='  ],
+						[ '==', '==' ], 
+						[ '+=', '+=' ],
+						[ '!=', '!=' ],
+						[ '<', '<' ],
+						[ '>', '>' ],
+						[ '<=', '<=' ],
+						[ '>=', '>=' ],
+						[ '=~', '=~' ],
+						[ '!~', '!~' ],
+						[ '=*', '=*' ],
+						[ '!*', '!*' ],
+						[ '||==', '||==' ]
+					],
+					displayField: 'Operator',
+					valueField: 'Operator',
+					hiddenName: 'Operator',
+					forceSelection: false,
+					triggerAction: 'all',
+					editable: true
+				},
+				{
+					fieldLabel: "Value",
+					name: "Value",
+					allowBlank: false
+				},
+				{
+					xtype: 'checkbox',
+					fieldLabel: 'Disabled',
+					name: 'Disabled'
+				}
+			]
+		},
+		// Submit button config
+		submitAjaxConfig
+	);
+
+	adminRealmAttributesFormWindow.show();
+
+	if (attrID) {
+		Ext.getCmp(adminRealmAttributesFormWindow.formPanelID).load({
+			params: {
+				ID: attrID,
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'AdminRealmAttributes',
+				SOAPFunction: 'getAdminRealmAttribute',
+				SOAPParams: 'ID'
+			}
+		});
+	}
+}
+
+
+
+
+// Display remove form
+function showAdminRealmAttributeRemoveWindow(AdminRealmAttributesWindow,id) {
+	// Mask AdminRealmAttributesWindow window
+	AdminRealmAttributesWindow.getEl().mask();
+
+	// Display remove confirm window
+	Ext.Msg.show({
+		title: "Confirm removal",
+		msg: "Are you very sure you wish to remove this attribute?",
+		icon: Ext.MessageBox.ERROR,
+		buttons: Ext.Msg.YESNO,
+		modal: false,
+		fn: function(buttonId,text) {
+			// Check if user clicked on 'yes' button
+			if (buttonId == 'yes') {
+
+				// Do ajax request
+				uxAjaxRequest(AdminRealmAttributesWindow,{
+					params: {
+						ID: id,
+						SOAPUsername: globalConfig.soap.username,
+						SOAPPassword: globalConfig.soap.password,
+						SOAPAuthType: globalConfig.soap.authtype,
+						SOAPModule: 'AdminRealmAttributes',
+						SOAPFunction: 'removeAdminRealmAttribute',
+						SOAPParams: 'ID'
+					},
+					customSuccess: function() {
+						var store = Ext.getCmp(AdminRealmAttributesWindow.gridPanelID).getStore();
+						store.load({
+							params: {
+								limit: 25
+							}
+						});
+					}
+				});
+
+
+			// Unmask if user answered no
+			} else {
+				AdminRealmAttributesWindow.getEl().unmask();
+			}
+		}
+	});
+}
+
+
+// vim: ts=4

webgui/js/app/windows/AdminRealmMembers.js

+/*
+Admin Realm Members
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+
+function showAdminRealmMembersWindow(realmID) {
+
+	var AdminRealmMembersWindow = new Ext.ux.GenericGridWindow(
+		// Window config
+		{
+			title: "Members",
+			iconCls: 'silk-server',
+			
+			width: 600,
+			height: 335,
+		
+			minWidth: 600,
+			minHeight: 335
+		},
+		// Grid config
+		{
+			// Inline toolbars
+			tbar: [
+				{
+					text:'Remove',
+					tooltip:'Remove member',
+					iconCls:'silk-server_delete',
+					handler: function() {
+						var selectedItem = Ext.getCmp(AdminRealmMembersWindow.gridPanelID).getSelectionModel().getSelected();
+						// Check if we have selected item
+						if (selectedItem) {
+							// If so display window
+							showAdminRealmMemberRemoveWindow(AdminRealmMembersWindow,selectedItem.data.ID);
+						} else {
+							AdminRealmMembersWindow.getEl().mask();
+
+							// Display error
+							Ext.Msg.show({
+								title: "Nothing selected",
+								msg: "No member selected",
+								icon: Ext.MessageBox.ERROR,
+								buttons: Ext.Msg.CANCEL,
+								modal: false,
+								fn: function() {
+									AdminRealmMembersWindow.getEl().unmask();
+								}
+							});
+						}
+					}
+				}
+			],
+			// Column model
+			colModel: new Ext.grid.ColumnModel([
+				{
+					id: 'ID',
+					header: "ID",
+					sortable: true,
+					dataIndex: 'ID'
+				},
+				{
+					header: "Name",
+					sortable: true,
+					dataIndex: 'Name'
+				}
+			]),
+			autoExpandColumn: 'Name'
+		},
+		// Store config
+		{
+			baseParams: {
+				ID: realmID,
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'AdminRealmMembers',
+				SOAPFunction: 'getAdminRealmMembers',
+				SOAPParams: 'ID,__search'
+			}
+		},
+		// Filter config
+		{
+			filters: [
+				{type: 'numeric',  dataIndex: 'ID'},
+				{type: 'string',  dataIndex: 'Name'}
+			]
+		}
+	);
+
+	AdminRealmMembersWindow.show();
+}
+
+
+// Display remove form
+function showAdminRealmMemberRemoveWindow(AdminRealmMembersWindow,id) {
+	// Mask AdminRealmMembersWindow window
+	AdminRealmMembersWindow.getEl().mask();
+
+	// Display remove confirm window
+	Ext.Msg.show({
+		title: "Confirm removal",
+		msg: "Are you very sure you wish to remove this member?",
+		icon: Ext.MessageBox.ERROR,
+		buttons: Ext.Msg.YESNO,
+		modal: false,
+		fn: function(buttonId,text) {
+			// Check if user clicked on 'yes' button
+			if (buttonId == 'yes') {
+
+				// Do ajax request
+				uxAjaxRequest(AdminRealmMembersWindow,{
+					params: {
+						ID: id,
+						SOAPUsername: globalConfig.soap.username,
+						SOAPPassword: globalConfig.soap.password,
+						SOAPAuthType: globalConfig.soap.authtype,
+						SOAPModule: 'AdminRealmMembers',
+						SOAPFunction: 'removeAdminRealmMember',
+						SOAPParams: 'ID'
+					},
+					customSuccess: function() {
+						var store = Ext.getCmp(AdminRealmMembersWindow.gridPanelID).getStore();
+						store.load({
+							params: {
+								limit: 25
+							}
+						});
+					}
+				});
+
+
+			// Unmask if user answered no
+			} else {
+				AdminRealmMembersWindow.getEl().unmask();
+			}
+		}
+	});
+}
+
+
+// vim: ts=4

webgui/js/app/windows/AdminRealms.js

+/*
+Admin Realms
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 
 function showAdminRealmWindow() {
@@ -6,12 +24,13 @@ function showAdminRealmWindow() {
 		// Window config
 		{
 			title: "Realms",
+			iconCls: 'silk-world',
 			
 			width: 600,
 			height: 335,
 		
 			minWidth: 600,
-			minHeight: 335,
+			minHeight: 335
 		},
 		// Grid config
 		{
@@ -20,22 +39,22 @@ function showAdminRealmWindow() {
 				{
 					text:'Add',
 					tooltip:'Add realm',
-					iconCls:'add',
+					iconCls:'silk-world_add',
 					handler: function() {
-						showAdminRealmAddEditWindow();
+						showAdminRealmAddEditWindow(AdminRealmWindow);
 					}
 				}, 
 				'-',
 				{
 					text:'Edit',
 					tooltip:'Edit realm',
-					iconCls:'edit',
+					iconCls:'silk-world_edit',
 					handler: function() {
-						var selectedItem = AdminRealmWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminRealmWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
-							showAdminRealmAddEditWindow(selectedItem.data.ID);
+							showAdminRealmAddEditWindow(AdminRealmWindow,selectedItem.data.ID);
 						} else {
 							AdminRealmWindow.getEl().mask();
 
@@ -53,12 +72,13 @@ function showAdminRealmWindow() {
 						}
 					}
 				},
+				'-',
 				{
 					text:'Remove',
 					tooltip:'Remove realm',
-					iconCls:'remove',
+					iconCls:'silk-world_delete',
 					handler: function() {
-						var selectedItem = AdminRealmWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminRealmWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -81,12 +101,40 @@ function showAdminRealmWindow() {
 					}
 				},
 				'-',
+				{
+					text:'Attributes',
+					tooltip:'Realm attributes',
+					iconCls:'silk-table',
+					handler: function() {
+						var selectedItem = Ext.getCmp(AdminRealmWindow.gridPanelID).getSelectionModel().getSelected();
+						// Check if we have selected item
+						if (selectedItem) {
+							// If so display window
+							showAdminRealmAttributesWindow(selectedItem.data.ID);
+						} else {
+							AdminRealmWindow.getEl().mask();
+
+							// Display error
+							Ext.Msg.show({
+								title: "Nothing selected",
+								msg: "No realm selected",
+								icon: Ext.MessageBox.ERROR,
+								buttons: Ext.Msg.CANCEL,
+								modal: false,
+								fn: function() {
+									AdminRealmWindow.getEl().unmask();
+								}
+							});
+						}
+					}
+				},
+				'-',
 				{
 					text:'Members',
 					tooltip:'Realm members',
-					iconCls:'logs',
+					iconCls:'silk-server',
 					handler: function() {
-						var selectedItem = AdminRealmWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminRealmWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -156,27 +204,50 @@ function showAdminRealmWindow() {
 
 
 // Display edit/add form
-function showAdminRealmAddEditWindow(id) {
+function showAdminRealmAddEditWindow(AdminRealmWindow,id) {
 
 	var submitAjaxConfig;
+	var icon;
 
 
 	// We doing an update
 	if (id) {
+		icon = 'silk-world_edit';
 		submitAjaxConfig = {
-			ID: id,
-			SOAPFunction: 'updateAdminRealm',
-			SOAPParams: 
-				'0:ID,'+
-				'0:Name'
+			params: {
+				ID: id,
+				SOAPFunction: 'updateAdminRealm',
+				SOAPParams: 
+					'0:ID,'+
+					'0:Name'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminRealmWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
 		};
 
 	// We doing an Add
 	} else {
+		icon = 'silk-world_add';
 		submitAjaxConfig = {
-			SOAPFunction: 'createAdminRealm',
-			SOAPParams: 
-				'0:Name'
+			params: {
+				SOAPFunction: 'createAdminRealm',
+				SOAPParams: 
+					'0:Name'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminRealmWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
 		};
 	}
 
@@ -185,12 +256,13 @@ function showAdminRealmAddEditWindow(id) {
 		// Window config
 		{
 			title: "Realm Information",
+			iconCls: icon,
 
-			width: 475,
-			height: 260,
+			width: 310,
+			height: 113,
 
-			minWidth: 475,
-			minHeight: 260
+			minWidth: 310,
+			minHeight: 113
 		},
 		// Form panel config
 		{
@@ -205,11 +277,9 @@ function showAdminRealmAddEditWindow(id) {
 				{
 					fieldLabel: 'Name',
 					name: 'Name',
-					vtype: 'usernamePart',
-					maskRe: usernamePartRe,
 					allowBlank: false
-				},
-			],
+				}
+			]
 		},
 		// Submit button config
 		submitAjaxConfig
@@ -218,7 +288,7 @@ function showAdminRealmAddEditWindow(id) {
 	adminRealmFormWindow.show();
 
 	if (id) {
-		adminRealmFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminRealmFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,
@@ -235,10 +305,10 @@ function showAdminRealmAddEditWindow(id) {
 
 
 
-// Display edit/add form
-function showAdminRealmRemoveWindow(parent,id) {
-	// Mask parent window
-	parent.getEl().mask();
+// Display remove form
+function showAdminRealmRemoveWindow(AdminRealmWindow,id) {
+	// Mask AdminRealmWindow window
+	AdminRealmWindow.getEl().mask();
 
 	// Display remove confirm window
 	Ext.Msg.show({
@@ -252,7 +322,7 @@ function showAdminRealmRemoveWindow(parent,id) {
 			if (buttonId == 'yes') {
 
 				// Do ajax request
-				uxAjaxRequest(parent,{
+				uxAjaxRequest(AdminRealmWindow,{
 					params: {
 						ID: id,
 						SOAPUsername: globalConfig.soap.username,
@@ -261,13 +331,21 @@ function showAdminRealmRemoveWindow(parent,id) {
 						SOAPModule: 'AdminRealms',
 						SOAPFunction: 'removeAdminRealm',
 						SOAPParams: 'ID'
+					},
+					customSuccess: function() {
+						var store = Ext.getCmp(AdminRealmWindow.gridPanelID).getStore();
+						store.load({
+							params: {
+								limit: 25
+							}
+						});
 					}
 				});
 
 
 			// Unmask if user answered no
 			} else {
-				parent.getEl().unmask();
+				AdminRealmWindow.getEl().unmask();
 			}
 		}
 	});
@@ -282,3 +360,5 @@ function showAdminRealmRemoveWindow(parent,id) {
 
 
 
+
+// vim: ts=4

webgui/js/app/windows/AdminUserAttributes.js

+/*
+Admin User Attributes
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 
 function showAdminUserAttributesWindow(userID) {
@@ -6,12 +24,13 @@ function showAdminUserAttributesWindow(userID) {
 		// Window config
 		{
 			title: "Attributes",
+			iconCls: 'silk-table',
 			
 			width: 600,
 			height: 335,
 		
 			minWidth: 600,
-			minHeight: 335,
+			minHeight: 335
 		},
 		// Grid config
 		{
@@ -20,22 +39,22 @@ function showAdminUserAttributesWindow(userID) {
 				{
 					text:'Add',
 					tooltip:'Add attribute',
-					iconCls:'add',
+					iconCls:'silk-table_add',
 					handler: function() {
-						showAdminUserAttributeAddEditWindow(userID);
+						showAdminUserAttributeAddEditWindow(AdminUserAttributesWindow,userID);
 					}
 				}, 
 				'-', 
 				{
 					text:'Edit',
 					tooltip:'Edit attribute',
-					iconCls:'edit',
+					iconCls:'silk-table_edit',
 					handler: function() {
-						var selectedItem = AdminUserAttributesWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserAttributesWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
-							showAdminUserAttributeAddEditWindow(userID,selectedItem.data.ID);
+							showAdminUserAttributeAddEditWindow(AdminUserAttributesWindow,userID,selectedItem.data.ID);
 						} else {
 							AdminUserAttributesWindow.getEl().mask();
 
@@ -57,9 +76,9 @@ function showAdminUserAttributesWindow(userID) {
 				{
 					text:'Remove',
 					tooltip:'Remove attribute',
-					iconCls:'remove',
+					iconCls:'silk-table_delete',
 					handler: function() {
-						var selectedItem = AdminUserAttributesWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserAttributesWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -142,29 +161,58 @@ function showAdminUserAttributesWindow(userID) {
 
 
 // Display edit/add form
-function showAdminUserAttributeAddEditWindow(userID,attrID) {
+function showAdminUserAttributeAddEditWindow(AdminUserAttributesWindow,userID,attrID) {
 
 	var submitAjaxConfig;
+	var icon;
 
 
 	// We doing an update
 	if (attrID) {
+		icon = 'silk-table_edit';
 		submitAjaxConfig = {
-			ID: attrID,
-			SOAPFunction: 'updateAdminUserAttribute',
-			SOAPParams: 
-				'0:ID,'+
-				'0:Name'
+			params: {
+				ID: attrID,
+				SOAPFunction: 'updateAdminUserAttribute',
+				SOAPParams: 
+					'0:ID,'+
+					'0:Name,'+
+					'0:Operator,'+
+					'0:Value,'+
+					'0:Disabled:boolean'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminUserAttributesWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
 		};
 
 	// We doing an Add
 	} else {
+		icon = 'silk-table_add';
 		submitAjaxConfig = {
-			UserID: userID,
-			SOAPFunction: 'addAdminUserAttribute',
-			SOAPParams: 
-				'0:UserID,'+
-				'0:Name'
+			params: {
+				UserID: userID,
+				SOAPFunction: 'addAdminUserAttribute',
+				SOAPParams: 
+					'0:UserID,'+
+					'0:Name,'+
+					'0:Operator,'+
+					'0:Value,'+
+					'0:Disabled:boolean'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminUserAttributesWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
 		};
 	}
 	
@@ -173,12 +221,13 @@ function showAdminUserAttributeAddEditWindow(userID,attrID) {
 		// Window config
 		{
 			title: "Attribute Information",
+			iconCls: icon,
 
-			width: 475,
-			height: 260,
+			width: 310,
+			height: 200,
 
-			minWidth: 475,
-			minHeight: 260
+			minWidth: 310,
+			minHeight: 200
 		},
 		// Form panel config
 		{
@@ -193,11 +242,50 @@ function showAdminUserAttributeAddEditWindow(userID,attrID) {
 				{
 					fieldLabel: 'Name',
 					name: 'Name',
-					vtype: 'usernamePart',
-					maskRe: usernamePartRe,
+					//vtype: 'usernamePart',
+					//maskRe: usernamePartRe,
 					allowBlank: false
 				},
-			],
+				{
+					xtype: 'combo',
+					fieldLabel: 'Operator',
+					name: 'Operator',
+					allowBlank: false,
+					width: 157,
+					store: [ 
+						[ '=', '=' ], 
+						[ ':=', ':='  ],
+						[ '==', '==' ], 
+						[ '+=', '+=' ],
+						[ '!=', '!=' ],
+						[ '<', '<' ],
+						[ '>', '>' ],
+						[ '<=', '<=' ],
+						[ '>=', '>=' ],
+						[ '=~', '=~' ],
+						[ '!~', '!~' ],
+						[ '=*', '=*' ],
+						[ '!*', '!*' ],
+						[ '||==', '||==' ]
+					],
+					displayField: 'Operator',
+					valueField: 'Operator',
+					hiddenName: 'Operator',
+					forceSelection: false,
+					triggerAction: 'all',
+					editable: true
+				},
+				{
+					fieldLabel: "Value",
+					name: "Value",
+					allowBlank: false
+				},
+				{
+					xtype: 'checkbox',
+					fieldLabel: 'Disabled',
+					name: 'Disabled'
+				}
+			]
 		},
 		// Submit button config
 		submitAjaxConfig
@@ -206,7 +294,7 @@ function showAdminUserAttributeAddEditWindow(userID,attrID) {
 	adminGroupFormWindow.show();
 
 	if (attrID) {
-		adminGroupFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminGroupFormWindow.formPanelID).load({
 			params: {
 				ID: attrID,
 				SOAPUsername: globalConfig.soap.username,
@@ -224,9 +312,9 @@ function showAdminUserAttributeAddEditWindow(userID,attrID) {
 
 
 // Display remove form
-function showAdminUserAttributeRemoveWindow(parent,id) {
-	// Mask parent window
-	parent.getEl().mask();
+function showAdminUserAttributeRemoveWindow(AdminUserAttributesWindow,id) {
+	// Mask AdminUserAttributesWindow window
+	AdminUserAttributesWindow.getEl().mask();
 
 	// Display remove confirm window
 	Ext.Msg.show({
@@ -240,7 +328,7 @@ function showAdminUserAttributeRemoveWindow(parent,id) {
 			if (buttonId == 'yes') {
 
 				// Do ajax request
-				uxAjaxRequest(parent,{
+				uxAjaxRequest(AdminUserAttributesWindow,{
 					params: {
 						ID: id,
 						SOAPUsername: globalConfig.soap.username,
@@ -249,15 +337,25 @@ function showAdminUserAttributeRemoveWindow(parent,id) {
 						SOAPModule: 'AdminUserAttributes',
 						SOAPFunction: 'removeAdminUserAttribute',
 						SOAPParams: 'ID'
+					},
+					customSuccess: function() {
+						var store = Ext.getCmp(AdminUserAttributesWindow.gridPanelID).getStore();
+						store.load({
+							params: {
+								limit: 25
+							}
+						});
 					}
 				});
 
 
 			// Unmask if user answered no
 			} else {
-				parent.getEl().unmask();
+				AdminUserAttributesWindow.getEl().unmask();
 			}
 		}
 	});
 }
 
+
+// vim: ts=4

webgui/js/app/windows/AdminUserGroups.js

+/*
+Admin User Groups
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 
 function showAdminUserGroupsWindow(userID) {
@@ -6,12 +24,13 @@ function showAdminUserGroupsWindow(userID) {
 		// Window config
 		{
 			title: "Groups",
+			iconCls: 'silk-group',
 			
-			width: 600,
+			width: 400,
 			height: 335,
 		
-			minWidth: 600,
-			minHeight: 335,
+			minWidth: 400,
+			minHeight: 335
 		},
 		// Grid config
 		{
@@ -20,18 +39,18 @@ function showAdminUserGroupsWindow(userID) {
 				{
 					text:'Add',
 					tooltip:'Add group',
-					iconCls:'add',
+					iconCls:'silk-group_add',
 					handler: function() {
-						showAdminUserGroupAddWindow(userID);
+						showAdminUserGroupAddWindow(AdminUserGroupsWindow,userID);
 					}
 				}, 
 				'-', 
 				{
 					text:'Remove',
 					tooltip:'Remove group',
-					iconCls:'remove',
+					iconCls:'silk-group_delete',
 					handler: function() {
-						var selectedItem = AdminUserGroupsWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserGroupsWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -96,29 +115,52 @@ function showAdminUserGroupsWindow(userID) {
 
 
 // Display edit/add form
-function showAdminUserGroupAddWindow(userID,id) {
+function showAdminUserGroupAddWindow(AdminUserGroupsWindow,userID,id) {
 
 	var submitAjaxConfig;
+	var icon;
 
 
 	// We doing an update
 	if (id) {
+		icon = 'silk-group_edit';
 		submitAjaxConfig = {
-			ID: id,
-			SOAPFunction: 'updateAdminGroup',
-			SOAPParams: 
-				'0:ID,'+
-				'0:GroupID'
+			params: {
+				ID: id,
+				SOAPFunction: 'updateAdminGroup',
+				SOAPParams: 
+					'0:ID,'+
+					'0:GroupID'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminUserGroupsWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
 		};
 
 	// We doing an Add
 	} else {
+		icon = 'silk-group_add';
 		submitAjaxConfig = {
-			UserID: userID,
-			SOAPFunction: 'addAdminUserGroup',
-			SOAPParams: 
-				'0:UserID,'+
-				'0:GroupID'
+			params: {
+				UserID: userID,
+				SOAPFunction: 'addAdminUserGroup',
+				SOAPParams: 
+					'0:UserID,'+
+					'0:GroupID'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminUserGroupsWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
 		};
 	}
 	
@@ -127,12 +169,13 @@ function showAdminUserGroupAddWindow(userID,id) {
 		// Window config
 		{
 			title: "Group Information",
+			iconCls: icon,
 
-			width: 475,
-			height: 260,
+			width: 310,
+			height: 113,
 
-			minWidth: 475,
-			minHeight: 260
+			minWidth: 310,
+			minHeight: 113
 		},
 		// Form panel config
 		{
@@ -169,8 +212,8 @@ function showAdminUserGroupAddWindow(userID,id) {
 					forceSelection: true,
 					triggerAction: 'all',
 					editable: false
-				},
-			],
+				}
+			]
 		},
 		// Submit button config
 		submitAjaxConfig
@@ -179,7 +222,7 @@ function showAdminUserGroupAddWindow(userID,id) {
 	adminGroupFormWindow.show();
 
 	if (id) {
-		adminGroupFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminGroupFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,
@@ -197,9 +240,9 @@ function showAdminUserGroupAddWindow(userID,id) {
 
 
 // Display edit/add form
-function showAdminUserGroupRemoveWindow(parent,id) {
-	// Mask parent window
-	parent.getEl().mask();
+function showAdminUserGroupRemoveWindow(AdminUserGroupsWindow,id) {
+	// Mask AdminUserGroupsWindow window
+	AdminUserGroupsWindow.getEl().mask();
 
 	// Display remove confirm window
 	Ext.Msg.show({
@@ -213,7 +256,7 @@ function showAdminUserGroupRemoveWindow(parent,id) {
 			if (buttonId == 'yes') {
 
 				// Do ajax request
-				uxAjaxRequest(parent,{
+				uxAjaxRequest(AdminUserGroupsWindow,{
 					params: {
 						ID: id,
 						SOAPUsername: globalConfig.soap.username,
@@ -222,15 +265,25 @@ function showAdminUserGroupRemoveWindow(parent,id) {
 						SOAPModule: 'AdminUserGroups',
 						SOAPFunction: 'removeAdminUserGroup',
 						SOAPParams: 'ID'
+					},
+					customSuccess: function() {
+						var store = Ext.getCmp(AdminUserGroupsWindow.gridPanelID).getStore();
+						store.load({
+							params: {
+								limit: 25
+							}
+						});
 					}
 				});
 
 
 			// Unmask if user answered no
 			} else {
-				parent.getEl().unmask();
+				AdminUserGroupsWindow.getEl().unmask();
 			}
 		}
 	});
 }
 
+
+// vim: ts=4

webgui/js/app/windows/AdminUserLogs.js

+/*
+Admin User Logs
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 
 function showAdminUserLogsWindow(id) {
@@ -5,11 +23,21 @@ function showAdminUserLogsWindow(id) {
 	var today = new Date();
 	var firstOfMonth = today.getFirstDateOfMonth();
 	var firstOfNext = today.getLastDateOfMonth().add(Date.DAY, 1);
-	
+
+	var formID = Ext.id();
+	var formPeriodKeyID = Ext.id();
+	var formSearchButtonID = Ext.id();
+
+	var summaryFormID = Ext.id();
+	var summaryTotalID = Ext.id();
+
+	var currentPeriod = today.format('Y-m');
+
 	var adminUserLogsWindow = new Ext.ux.GenericGridWindow(
 		// Window config
 		{
-			title: 'User Logs',
+			title: 'Logs',
+			iconCls: 'silk-page_white_text',
 			layout:'border',
 			height: 480,
 			width: 700,
@@ -20,66 +48,60 @@ function showAdminUserLogsWindow(id) {
 			uxItems: [
 				{
 					xtype: 'form',
-					id: 'search-form',
+					id: formID,
 					title: 'Search',
 					region: 'west',
 					border: true,
 					frame: true,
-					defaultType: 'datefield',
 					height: 180,
-					width: 300,
+					width: 320,
 					labelWidth: 100,
 					items: [
 						{
-							id: 'after',
-							name: 'after',
-							width: 180,
-							fieldLabel: 'From',
-							vtype: 'daterange',
-							format: 'Y-m-d',
-							value: firstOfMonth,
-							endDateField: 'before',
-						},
-						{
-							id: 'before',
-							name: 'before',
-							width: 180,
-							fieldLabel: 'To',
-							vtype: 'daterange',
-							format: 'Y-m-d',
-							value: firstOfNext,
-							startDateField: 'after'
+							id: formPeriodKeyID,
+							xtype: 'textfield',
+							name: 'periodkey',
+							regex: /^\d{4}\-(0[1-9]|1(0|1|2))$/,
+							regexText: 'Please enter month in the format: YYYY-MM',
+							height: 25,
+							width: 100,
+							fieldLabel: 'Period',
+							value: currentPeriod
 						}
 					],
 					buttons: [
 						{
 							text: 'Search',
-							id: 'formbtn',
+							id: formSearchButtonID,
 							handler: function() {
 								// Pull in window, grid & form	
-								var mainWindow = this.ownerCt.ownerCt;
-								var grid = mainWindow.getComponent('gridpanel');
-								var form = mainWindow.getComponent('search-form');
+								var grid = Ext.getCmp(adminUserLogsWindow.gridPanelID);
 
 								// Grab store
 								var store = grid.getStore();
 
 								// Grab timestamp filter
 								var gridFilters = grid.filters;
-								var timestampFilter = gridFilters.getFilter('Timestamp');
+								var timestampFilter = gridFilters.getFilter('EventTimestamp');
+
+								// Grab	form field
+								var periodKeyField = Ext.getCmp(formPeriodKeyID);
+								if (periodKeyField.isValid()) {
+									var periodKeyValue = periodKeyField.getValue();
 
-								// Grab	form fields
-								var afterField = form.getForm().findField('after');
-								var beforeField = form.getForm().findField('before');
+									// Convert our periodKey into DateTime values
+									var dtSearchStart = Date.parseDate(periodKeyValue+'-01','Y-m-d');
+									var dtSearchEnd = dtSearchStart.add(Date.MONTH,1);
 
-								// Set filter values from form
-								timestampFilter.setValue({
-									after: afterField.getValue(),
-									before: beforeField.getValue()
-								});
+									// Set filter values from form
+									timestampFilter.setValue({
+										after: dtSearchStart,
+										before: dtSearchEnd
+									});
 
-								// Trigger store reload
-								store.reload();
+									// Trigger store reload
+									store.reload();
+								}
 							}
 						}
 					],
@@ -87,23 +109,24 @@ function showAdminUserLogsWindow(id) {
 				},
 				{
 					xtype: 'form',
-					id: 'summary-form',
+					id: summaryFormID,
 					region: 'center',
 					split: true,
-					border: true,
+					border: false,
 					autoScroll: true,
 					defaultType: 'textarea',
-					height: 180,
+					height: 300,
 					width: 400,
-					labelWidth: 80,
+					labelWidth: 0,
 					items: [
 						{
-							id: 'summaryTotal',
+							id: summaryTotalID,
 							name: 'summaryTotal',
 							readOnly: true,
-							height: 135,
-							width: 200,
+							height: 300,
+							width: 400,
 							fieldLabel: 'Summary',
+							hideLabel: true,
 							fieldClass: 'font-family: monospace; font-size: 10px;',
 							value: ''
 						}
@@ -116,15 +139,13 @@ function showAdminUserLogsWindow(id) {
 			region: 'south',
 			width: 700,
 			border: true,
-			tbar: [
-				{
-					text: 'Add Port Lock',
-					tooltip: 'Add port lock',
-					iconCls: 'add'
-				}	
-			],
 			// Column model
 			colModel: new Ext.grid.ColumnModel([
+				{
+					header: "ID",
+					hidden: true,
+					dataIndex: 'ID'
+				},
 				{
 					header: "Timestamp",
 					sortable: true,
@@ -133,6 +154,7 @@ function showAdminUserLogsWindow(id) {
 				{
 					header: "Status",
 					sortable: true,
+					hidden: true,
 					dataIndex: 'AcctStatusType'
 				},
 				{
@@ -145,21 +167,11 @@ function showAdminUserLogsWindow(id) {
 					sortable: true,
 					dataIndex: 'FramedProtocol'
 				},
-				{
-					header: "NAS Port",
-					sortable: true,
-					dataIndex: 'NASPort'
-				},
 				{
 					header: "NAS Port Type",
-					sortable: true,
+					hidden: true,
 					dataIndex: 'NASPortType'
 				},
-				{
-					header: "NAS Port ID",
-					sortable: true,
-					dataIndex: 'NASPortID'
-				},
 				{
 					header: "Calling Station",
 					sortable: true,
@@ -167,31 +179,37 @@ function showAdminUserLogsWindow(id) {
 				},
 				{
 					header: "Called Station",
-					sortable: true,
+					hidden: true,
 					dataIndex: 'CalledStationID'
 				},
 				{
 					header: "Session ID",
-					sortable: true,
+					hidden: true,
 					dataIndex: 'AcctSessionID'
 				},
 				{
-					header: "Framed IP",
-					sortable: true,
+					header: "IP Address",
+					hidden: true,
 					dataIndex: 'FramedIPAddress'
-				}/*,
+				},
 				{
 					header: "Input Mbyte",
-					dataIndex: 'AcctInputMbyte'
+					dataIndex: 'AcctInput',
+					renderer: renderUsageFloat
 				},
 				{
 					header: "Output Mbyte",
-					dataIndex: 'AcctOutputMbyte'
+					dataIndex: 'AcctOutput',
+					renderer: renderUsageFloat
+				},
+				{
+					header: "Session Uptime",
+					dataIndex: 'AcctSessionTime'
 				},
 				{
 					header: "Term. Reason",
 					dataIndex: 'ConnectTermReason'
-				}*/
+				}
 			])
 		},
 		// Store config
@@ -209,9 +227,11 @@ function showAdminUserLogsWindow(id) {
 		// Filter config
 		{
 			filters: [
+				{type: 'numeric', dataIndex: 'ID'},
 				{
-					type: 'date',  
-					dataIndex: 'Timestamp', 
+					type: 'date',
+					format: 'Y-m-d H:i:s',
+					dataIndex: 'EventTimestamp',
 					value: {
 						after: firstOfMonth,
 						before: firstOfNext
@@ -220,38 +240,146 @@ function showAdminUserLogsWindow(id) {
 				{type: 'numeric',  dataIndex: 'AcctStatusType'},
 				{type: 'numeric',  dataIndex: 'ServiceType'},
 				{type: 'numeric',  dataIndex: 'FramedProtocol'},
-				{type: 'string',  dataIndex: 'NASPort'},
 				{type: 'numeric',  dataIndex: 'NASPortType'},
 				{type: 'string',  dataIndex: 'NASPortID'},
 				{type: 'string',  dataIndex: 'CallingStationID'},
 				{type: 'string',  dataIndex: 'CalledStationID'},
 				{type: 'string',  dataIndex: 'AcctSessionID'},
-				{type: 'string',  dataIndex: 'FramedIPAddress'}
+				{type: 'string',  dataIndex: 'FramedIPAddress'},
+				{type: 'numeric',  dataIndex: 'AcctInput'},
+				{type: 'numeric',  dataIndex: 'AcctOutput'},
+				{type: 'numeric',  dataIndex: 'AcctSessionTime'},
+				{type: 'string',  dataIndex: 'ConnectTermReason'}
 			]
 		}
 	);
 	// Grab store
-	var store = adminUserLogsWindow.getComponent('gridpanel').getStore();
+	var store = Ext.getCmp(adminUserLogsWindow.gridPanelID).getStore();
 
 	store.on('load',function() {
-		var inputTotal = store.sum('AcctInputMbyte');
-		var outputTotal = store.sum('AcctOutputMbyte');
 
-		var userCap = 3000;
-		var userTopups = 1000;
-		
-		// Total up into this ... 
-		
-		var userTotalAllowed = userCap + userTopups;
-		var userUsage = inputTotal + outputTotal;
-		var userLeft = userTotalAllowed - userUsage;
+		// Fetch periodKey from form
+		var periodKeyField = (Ext.getCmp(formPeriodKeyID)).getValue();
+
+		// Mask parent window
+		adminUserLogsWindow.getEl().mask();
+
+		uxAjaxRequest(
+			adminUserLogsWindow,
+			{
+				params: {
+					PeriodKey: periodKeyField,
+					ID: id,
+					SOAPUsername: globalConfig.soap.username,
+					SOAPPassword: globalConfig.soap.password,
+					SOAPAuthType: globalConfig.soap.authtype,
+					SOAPModule: 'AdminUserLogs',
+					SOAPFunction: 'getAdminUserLogsSummary',
+					SOAPParams: '0:ID,0:PeriodKey'
+				},
+
+				customSuccess: function (result) {
+					response = Ext.decode(result.responseText);
+
+					// Caps
+					var trafficCap = response.data.trafficCap; // value of -1: prepaid
+					var uptimeCap = response.data.uptimeCap; // value of -1: prepaid
+					
+					// Usage
+					var trafficUsage = response.data.trafficUsage;
+					var uptimeUsage = response.data.uptimeUsage;
+
+					// Topups
+					var trafficTopups = response.data.trafficTopups;
+					var uptimeTopups = response.data.uptimeTopups;
+					var totalTrafficTopups = response.data.TotalTrafficTopups;
+					var totalUptimeTopups = response.data.TotalUptimeTopups;
+
+					// Format string before printing
+					var trafficString = '';
+					// Prepaid traffic
+					if (trafficCap == -1) {
+						trafficCap = 'Prepaid';
+						trafficString += sprintf('Traffic:\nCap: %s \nTopup balance for current month: %d MB\nTotal Topups: %d MB\nUsage: %d/%d MB\n',
+								trafficCap,trafficTopups,totalTrafficTopups,trafficUsage,trafficTopups);
+						trafficString += '---\n';
+					// Uncapped traffic
+					} else if (trafficCap == 0) {
+						trafficString += sprintf('Traffic:\nCap: Uncapped\nUsage: %d MB\n',
+								trafficUsage);
+						trafficString += '---\n';
+					// Capped traffic
+					} else {
+						var combinedTrafficCap = trafficCap + trafficTopups;
+						trafficString += sprintf('Traffic:\nCap: %d MB\nTopup balance for current month: %d MB\nTotal Topups: %d MB\n'+
+								'Usage: %d/%d MB\n',
+								trafficCap,trafficTopups,totalTrafficTopups,trafficUsage,combinedTrafficCap);
+						trafficString += '---\n';
+					}
+
+					// Format string before printing
+					var uptimeString = '';
+					// Prepaid uptime
+					if (uptimeCap == -1) {
+						uptimeCap = 'Prepaid';
+						uptimeString += sprintf('Uptime:\nCap: %s \nTopup balance for current month: %d Min\nTotal Topups: %d Min\n'+
+								'Usage: %d/%d Min\n',
+								uptimeCap,uptimeTopups,totalUptimeTopups,uptimeUsage,uptimeTopups);
+						uptimeString += '---\n';
+					// Uncapped uptime
+					} else if (uptimeCap == 0) {
+						uptimeString += sprintf('Uptime:\nCap: Uncapped\nUsage: %d Min\n',
+								uptimeUsage);
+						uptimeString += '---\n';
+					// Capped uptime
+					} else {
+						var combinedUptimeCap = uptimeCap + uptimeTopups;
+						uptimeString += sprintf('Uptime:\nCap: %d Min\nTopup balance for current month: %d Min\nTotal Topups: %d Min\n'+
+								'Usage: %d/%d Min\n',
+								uptimeCap,uptimeTopups,totalUptimeTopups,uptimeUsage,combinedUptimeCap);
+						uptimeString += '---\n';
+					}
+
+					// Topup breakdown
+					var tTopups = response.data.AllTrafficTopups;
+					var uTopups = response.data.AllUptimeTopups;
 
-		var form = adminUserLogsWindow.getComponent('summary-form');
-		var summaryTotal = form.getForm().findField('summaryTotal');
+					// Format topups string
+					var topupString = '';
+					if (tTopups.length > 0) {
+						topupString += 'Valid Traffic Topups:';
+					}
+					for (var i = 0; i < tTopups.length; i++) {
+						var id = tTopups[i].ID;
+						var used = tTopups[i].Used;
+						var cap = tTopups[i].Cap;
+						var validTo = tTopups[i].ValidTo;
+						topupString += sprintf('\nID: %s\nUsage: %d/%d MB\nValid Until: %s\n--',id,used,cap,validTo);
+					}
+					if (uTopups.length > 0) {
+						topupString += 'Valid Uptime Topups:';
+					}
+					for (var i = 0; i < uTopups.length; i++) {
+						var id = uTopups[i].ID;
+						var used = uTopups[i].Used;
+						var cap = uTopups[i].Cap;
+						var validTo = uTopups[i].ValidTo;
+						topupString += sprintf('\nID: %s\nUsage: %d/%d MB\nValid Until: %s\n--',id,used,cap,validTo);
+					}
 
-		summaryTotal.setValue(
-				sprintf('Cap Total: %6d\nTopups   : %6d\n-----------------\n           %6d\n-----------------\nUsage    : %6d\n=================\nAvailable: %6d',userCap,userTopups,userTotalAllowed,userUsage,userLeft)
+					// Get summary field
+					var form = Ext.getCmp(summaryFormID);
+					var summaryField = Ext.getCmp(summaryTotalID);
+					summaryField.setValue(trafficString+uptimeString+topupString);
+				},
+				failure: function (result) {
+					Ext.MessageBox.alert('Failed', 'Couldn\'t fetch data: '+result.date);
+				}
+			}
 		);
 	});
-	adminUserLogsWindow.show();				
+	adminUserLogsWindow.show();
 }
+
+
+// vim: ts=4

webgui/js/app/windows/AdminUserTopups.js

+/*
+Admin User Topups
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+
+function showAdminUserTopupsWindow(userID) {
+
+	var adminUserTopupsWindow = new Ext.ux.GenericGridWindow(
+		// Window config
+		{
+			title: "User Topups",
+			iconCls: 'silk-chart_bar',
+
+			width: 500,
+			height: 335,
+			minWidth: 500,
+			minHeight: 335
+		},
+		// Grid config
+		{
+			// Inline toolbars
+			tbar: [
+				{
+					text:'Add',
+					tooltip:'Add topup',
+					iconCls:'silk-chart_bar_add',
+					handler: function() {
+						showAdminUserTopupAddEditWindow(adminUserTopupsWindow,userID,0);
+					}
+				},
+				'-',
+				{
+					text:'Edit',
+					tooltip:'Edit topup',
+					iconCls:'silk-chart_bar_edit',
+					handler: function() {
+						var selectedItem = Ext.getCmp(adminUserTopupsWindow.gridPanelID).getSelectionModel().getSelected();
+						// Check if we have selected item
+						if (selectedItem) {
+							// If so display window
+							showAdminUserTopupAddEditWindow(adminUserTopupsWindow,userID,selectedItem.data.ID);
+						} else {
+							adminUserTopupsWindow.getEl().mask();
+
+							// Display error
+							Ext.Msg.show({
+								title: "Nothing selected",
+								msg: "No topup selected",
+								icon: Ext.MessageBox.ERROR,
+								buttons: Ext.Msg.CANCEL,
+								modal: false,
+								fn: function() {
+									adminUserTopupsWindow.getEl().unmask();
+								}
+							});
+						}
+					}
+				},
+				'-',
+				{
+					text:'Remove',
+					tooltip:'Remove topup',
+					iconCls:'silk-chart_bar_delete',
+					handler: function() {
+						var selectedItem = Ext.getCmp(adminUserTopupsWindow.gridPanelID).getSelectionModel().getSelected();
+						// Check if we have selected item
+						if (selectedItem) {
+							// If so display window
+							showAdminUserTopupRemoveWindow(adminUserTopupsWindow,selectedItem.data.ID);
+						} else {
+							adminUserTopupsWindow.getEl().mask();
+
+							// Display error
+							Ext.Msg.show({
+								title: "Nothing selected",
+								msg: "No topup selected",
+								icon: Ext.MessageBox.ERROR,
+								buttons: Ext.Msg.CANCEL,
+								modal: false,
+								fn: function() {
+									adminUserTopupsWindow.getEl().unmask();
+								}
+							});
+						}
+					}
+				}
+			],
+			// Column model
+			colModel: new Ext.grid.ColumnModel([
+				{
+					id: 'ID',
+					header: "ID",
+					sortable: true,
+					hidden: true,
+					dataIndex: 'ID'
+				},
+				{
+					header: "Type",
+					sortable: true,
+					dataIndex: 'Type'
+				},
+				{
+					header: "Value",
+					sortable: true,
+					dataIndex: 'Value'
+				},
+				{
+					header: "Timestamp",
+					sortable: true,
+					hidden: true,
+					dataIndex: 'Timestamp'
+				},
+				{
+					header: "ValidFrom",
+					sortable: true,
+					dataIndex: 'ValidFrom'
+				},
+				{
+					header: "ValidTo",
+					sortable: true,
+					dataIndex: 'ValidTo'
+				}
+			])
+		},
+		// Store config
+		{
+			baseParams: {
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'AdminUsers',
+				SOAPFunction: 'getAdminUserTopups',
+				SOAPParams: '0:UserID,__search',
+				UserID: userID
+			}
+		},
+		// Filter config
+		{
+			filters: [
+				{type: 'numeric',  dataIndex: 'ID'},
+				{type: 'date',  dataIndex: 'Timestamp'},
+				{type: 'numeric',  dataIndex: 'Value'},
+				{type: 'date',  dataIndex: 'ValidFrom'},
+				{type: 'date',  dataIndex: 'ValidTo'}
+			]
+		}
+	);
+
+	adminUserTopupsWindow.show();
+}
+
+
+// Display edit/add form
+function showAdminUserTopupAddEditWindow(adminUserTopupsWindow,userID,topupID) {
+	var today = new Date();
+	var firstOfMonth = today.getFirstDateOfMonth();
+	var firstOfNext = today.getLastDateOfMonth().add(Date.DAY, 1);
+
+	var submitAjaxConfig;
+	var icon;
+
+	// We doing an update
+	if (topupID) {
+		icon = 'silk-chart_bar_edit';
+		submitAjaxConfig = {
+			params: {
+				ID: topupID,
+				SOAPFunction: 'updateAdminUserTopup',
+				SOAPParams: 
+					'0:ID,0:Value,0:Type,'+
+					'0:ValidFrom,0:ValidTo'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(adminUserTopupsWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
+		};
+	// We doing an Add
+	} else {
+		icon = 'silk-chart_bar_add';
+		submitAjaxConfig = {
+			params: {
+				UserID: userID,
+				SOAPFunction: 'createAdminUserTopup',
+				SOAPParams:
+					'0:UserID,0:Value,0:Type,'+
+					'0:ValidFrom,0:ValidTo'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(adminUserTopupsWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
+		};
+	}
+
+	// Create window
+	var adminUserTopupFormWindow = new Ext.ux.GenericFormWindow(
+		// Window config
+		{
+			title: "Topup Information",
+			iconCls: icon,
+
+			width: 400,
+			height: 200,
+			minWidth: 400,
+			minHeight: 200
+		},
+		// Form panel config
+		{
+			labelWidth: 85,
+			baseParams: {
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'AdminUsers'
+			},
+			items: [
+				{
+					xtype: 'combo',
+					fieldLabel: 'Type',
+					name: 'Type',
+					allowBlank: false,
+					width: 157,
+					store: [ 
+						[ '1', 'Traffic' ],
+						[ '2', 'Uptime' ]
+					],
+					displayField: 'Type',
+					valueField: 'Type',
+					hiddenName: 'Type',
+					forceSelection: true,
+					triggerAction: 'all',
+					editable: false
+				},
+				{
+					xtype: 'numberfield',
+					fieldLabel: 'Value',
+					name: 'Value',
+					minValue: 1,
+					allowBlank: false
+				},
+				{
+					xtype: 'datefield',
+					fieldLabel: 'ValidFrom',
+					name: 'ValidFrom',
+					id: 'ValidFrom',
+					vtype: 'daterange',
+					disabledDates: ["(0(2|3|4|5|6|7|8|9)|1[0-9]|2[0-9]|3[0-1])$"],
+					value: firstOfMonth,
+					format: 'Y-m-d',
+					endDateField: 'ValidTo'
+				},
+				{
+					xtype: 'datefield',
+					fieldLabel: 'ValidTo',
+					name: 'ValidTo',
+					id: 'ValidTo',
+					vtype: 'daterange',
+					disabledDates: ["(0(2|3|4|5|6|7|8|9)|1[0-9]|2[0-9]|3[0-1])$"],
+					value: firstOfNext,
+					format: 'Y-m-d',
+					startDateField: 'ValidFrom'
+				}
+			]
+		},
+		// Submit button config
+		submitAjaxConfig
+	);
+
+	adminUserTopupFormWindow.show();
+
+	if (topupID) {
+		Ext.getCmp(adminUserTopupFormWindow.formPanelID).load({
+			params: {
+				id: topupID,
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'AdminUsers',
+				SOAPFunction: 'getAdminUserTopup',
+				SOAPParams: 'id'
+			}
+		});
+	}
+}
+
+
+
+
+// Display edit/add form
+function showAdminUserTopupRemoveWindow(adminUserTopupsWindow,id) {
+	// Mask adminUserTopupsWindow window
+	adminUserTopupsWindow.getEl().mask();
+
+	// Display remove confirm window
+	Ext.Msg.show({
+		title: "Confirm removal",
+		msg: "Are you very sure you wish to remove this topup?",
+		icon: Ext.MessageBox.ERROR,
+		buttons: Ext.Msg.YESNO,
+		modal: false,
+		fn: function(buttonId,text) {
+			// Check if user clicked on 'yes' button
+			if (buttonId == 'yes') {
+
+				// Do ajax request
+				uxAjaxRequest(adminUserTopupsWindow,{
+					params: {
+						id: id,
+						SOAPUsername: globalConfig.soap.username,
+						SOAPPassword: globalConfig.soap.password,
+						SOAPAuthType: globalConfig.soap.authtype,
+						SOAPModule: 'AdminUsers',
+						SOAPFunction: 'removeAdminUserTopup',
+						SOAPParams: 'id'
+					},
+					customSuccess: function() {
+						var store = Ext.getCmp(adminUserTopupsWindow.gridPanelID).getStore();
+						store.load({
+							params: {
+								limit: 25
+							}
+						});
+					}
+				});
+
+
+			// Unmask if user answered no
+			} else {
+				adminUserTopupsWindow.getEl().unmask();
+			}
+		}
+	});
+}
+
+
+// vim: ts=4

webgui/js/app/windows/AdminUsers.js

+/*
+Admin Users
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 
 function showAdminUserWindow() {
@@ -6,12 +24,13 @@ function showAdminUserWindow() {
 		// Window config
 		{
 			title: "Users",
+			iconCls: 'silk-user',
 			
 			width: 600,
 			height: 335,
 		
 			minWidth: 600,
-			minHeight: 335,
+			minHeight: 335
 		},
 		// Grid config
 		{
@@ -20,22 +39,22 @@ function showAdminUserWindow() {
 				{
 					text:'Add',
 					tooltip:'Add user',
-					iconCls:'add',
+					iconCls:'silk-user_add',
 					handler: function() {
-						showAdminUserAddEditWindow();
+						showAdminUserAddEditWindow(AdminUserWindow);
 					}
 				}, 
 				'-', 
 				{
 					text:'Edit',
 					tooltip:'Edit user',
-					iconCls:'option',
+					iconCls:'silk-user_edit',
 					handler: function() {
-						var selectedItem = AdminUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
-							showAdminUserAddEditWindow(selectedItem.data.ID);
+							showAdminUserAddEditWindow(AdminUserWindow,selectedItem.data.ID);
 						} else {
 							AdminUserWindow.getEl().mask();
 
@@ -57,9 +76,9 @@ function showAdminUserWindow() {
 				{
 					text:'Remove',
 					tooltip:'Remove user',
-					iconCls:'remove',
+					iconCls:'silk-user_delete',
 					handler: function() {
-						var selectedItem = AdminUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -85,9 +104,9 @@ function showAdminUserWindow() {
 				{
 					text:'Attributes',
 					tooltip:'User attributes',
-					iconCls:'logs',
+					iconCls:'silk-table',
 					handler: function() {
-						var selectedItem = AdminUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -113,9 +132,9 @@ function showAdminUserWindow() {
 				{
 					text:'Logs',
 					tooltip:'User logs',
-					iconCls:'logs',
+					iconCls: 'silk-page_white_text',
 					handler: function() {
-						var selectedItem = AdminUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -141,9 +160,9 @@ function showAdminUserWindow() {
 				{
 					text:'Groups',
 					tooltip:'User groups',
-					iconCls:'topups',
+					iconCls:'silk-group',
 					handler: function() {
-						var selectedItem = AdminUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -151,6 +170,34 @@ function showAdminUserWindow() {
 						} else {
 							AdminUserWindow.getEl().mask();
 
+							// Display error
+							Ext.Msg.show({
+								title: "Nothing selected",
+								msg: "No user selected",
+								icon: Ext.MessageBox.ERROR,
+								buttons: Ext.Msg.CANCEL,
+								modal: false,
+								fn: function() {
+									AdminUserWindow.getEl().unmask();
+								}
+							});
+						}
+					}
+				},
+				'-',
+				{
+					text:'Topups',
+					tooltip:'User topups',
+					iconCls:'silk-chart_bar',
+					handler: function() {
+						var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
+						// Check if we have selected item
+						if (selectedItem) {
+							// If so display window
+							showAdminUserTopupsWindow(selectedItem.data.ID);
+						} else {
+							AdminUserWindow.getEl().mask();
+
 							// Display error
 							Ext.Msg.show({
 								title: "Nothing selected",
@@ -213,26 +260,51 @@ function showAdminUserWindow() {
 
 
 // Display edit/add form
-function showAdminUserAddEditWindow(id) {
+function showAdminUserAddEditWindow(AdminUserWindow,id) {
 
 	var submitAjaxConfig;
+	var icon;
 
 	// We doing an update
 	if (id) {
+		icon = 'silk-user_edit';
 		submitAjaxConfig = {
-			ID: id,
-			SOAPFunction: 'updateAdminUser',
-			SOAPParams: 
-				'0:ID,'+
-				'0:Username'
+			params: {
+				ID: id,
+				SOAPFunction: 'updateAdminUser',
+				SOAPParams: 
+					'0:ID,'+
+					'0:Username,'+
+					'0:Disabled'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminUserWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
 		};
 
 	// We doing an Add
 	} else {
+		icon = 'silk-user_add';
 		submitAjaxConfig = {
-			SOAPFunction: 'createAdminUser',
-			SOAPParams: 
-				'0:Username'
+			params: {
+				SOAPFunction: 'createAdminUser',
+				SOAPParams: 
+					'0:Username,'+
+					'0:Disabled'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(AdminUserWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
 		};
 	}
 
@@ -241,12 +313,13 @@ function showAdminUserAddEditWindow(id) {
 		// Window config
 		{
 			title: "User Information",
+			iconCls: icon,
 
-			width: 475,
-			height: 260,
+			width: 310,
+			height: 133,
 
-			minWidth: 475,
-			minHeight: 260
+			minWidth: 310,
+			minHeight: 133
 		},
 		// Form panel config
 		{
@@ -261,11 +334,17 @@ function showAdminUserAddEditWindow(id) {
 				{
 					fieldLabel: 'Username',
 					name: 'Username',
-					vtype: 'usernamePart',
-					maskRe: usernamePartRe,
-					allowBlank: false,
+					vtype: 'usernameRadius',
+					maskRe: usernameRadiusPartRe,
+					allowBlank: false
 				},
-			],
+				{
+					fieldLabel: 'Disabled',
+					name: 'Disabled',
+					xtype: 'checkbox',
+					inputValue: '1'
+				}
+			]
 		},
 		// Submit button config
 		submitAjaxConfig
@@ -274,7 +353,7 @@ function showAdminUserAddEditWindow(id) {
 	adminUserFormWindow.show();
 
 	if (id) {
-		adminUserFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(adminUserFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,
@@ -292,9 +371,9 @@ function showAdminUserAddEditWindow(id) {
 
 
 // Display edit/add form
-function showAdminUserRemoveWindow(parent,id) {
-	// Mask parent window
-	parent.getEl().mask();
+function showAdminUserRemoveWindow(AdminUserWindow,id) {
+	// Mask AdminUserWindow window
+	AdminUserWindow.getEl().mask();
 
 	// Display remove confirm window
 	Ext.Msg.show({
@@ -308,7 +387,7 @@ function showAdminUserRemoveWindow(parent,id) {
 			if (buttonId == 'yes') {
 
 				// Do ajax request
-				uxAjaxRequest(parent,{
+				uxAjaxRequest(AdminUserWindow,{
 					params: {
 						ID: id,
 						SOAPUsername: globalConfig.soap.username,
@@ -317,13 +396,21 @@ function showAdminUserRemoveWindow(parent,id) {
 						SOAPModule: 'AdminUsers',
 						SOAPFunction: 'removeAdminUser',
 						SOAPParams: 'ID'
+					},
+					customSuccess: function() {
+						var store = Ext.getCmp(AdminUserWindow.gridPanelID).getStore();
+						store.load({
+							params: {
+								limit: 25
+							}
+						});
 					}
 				});
 
 
 			// Unmask if user answered no
 			} else {
-				parent.getEl().unmask();
+				AdminUserWindow.getEl().unmask();
 			}
 		}
 	});
@@ -338,3 +425,5 @@ function showAdminUserRemoveWindow(parent,id) {
 
 
 
+
+// vim: ts=4

webgui/js/app/windows/WiSPLocationMembers.js

+/*
+WiSP Location Members
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+
+function showWiSPLocationMembersWindow(locationID) {
+
+	var WiSPLocationMembersWindow = new Ext.ux.GenericGridWindow(
+		// Window config
+		{
+			title: "Members",
+			
+			width: 600,
+			height: 335,
+		
+			minWidth: 600,
+			minHeight: 335
+		},
+		// Grid config
+		{
+			// Inline toolbars
+			tbar: [
+				{
+					text:'Remove',
+					tooltip:'Remove member',
+					iconCls:'remove',
+					handler: function() {
+						var selectedItem = Ext.getCmp(WiSPLocationMembersWindow.gridPanelID).getSelectionModel().getSelected();
+						// Check if we have selected item
+						if (selectedItem) {
+							// If so display window
+							showWiSPLocationMemberRemoveWindow(WiSPLocationMembersWindow,selectedItem.data.ID);
+						} else {
+							WiSPLocationMembersWindow.getEl().mask();
+
+							// Display error
+							Ext.Msg.show({
+								title: "Nothing selected",
+								msg: "No member selected",
+								icon: Ext.MessageBox.ERROR,
+								buttons: Ext.Msg.CANCEL,
+								modal: false,
+								fn: function() {
+									WiSPLocationMembersWindow.getEl().unmask();
+								}
+							});
+						}
+					}
+				}
+			],
+			// Column model
+			colModel: new Ext.grid.ColumnModel([
+				{
+					id: 'ID',
+					header: "ID",
+					sortable: true,
+					dataIndex: 'ID'
+				},
+				{
+					header: "Username",
+					sortable: true,
+					dataIndex: 'Username'
+				}
+			]),
+			autoExpandColumn: 'Username'
+		},
+		// Store config
+		{
+			baseParams: {
+				ID: locationID,
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'WiSPLocationMembers',
+				SOAPFunction: 'getWiSPLocationMembers',
+				SOAPParams: 'ID,__search'
+			}
+		},
+		// Filter config
+		{
+			filters: [
+				{type: 'numeric',  dataIndex: 'ID'},
+				{type: 'string',  dataIndex: 'Username'}
+			]
+		}
+	);
+
+	WiSPLocationMembersWindow.show();
+}
+
+
+// Display remove form
+function showWiSPLocationMemberRemoveWindow(WiSPLocationMembersWindow,id) {
+	// Mask WiSPLocationMembersWindow window
+	WiSPLocationMembersWindow.getEl().mask();
+
+	// Display remove confirm window
+	Ext.Msg.show({
+		title: "Confirm removal",
+		msg: "Are you very sure you wish to remove this member?",
+		icon: Ext.MessageBox.ERROR,
+		buttons: Ext.Msg.YESNO,
+		modal: false,
+		fn: function(buttonId,text) {
+			// Check if user clicked on 'yes' button
+			if (buttonId == 'yes') {
+
+				// Do ajax request
+				uxAjaxRequest(WiSPLocationMembersWindow,{
+					params: {
+						ID: id,
+						SOAPUsername: globalConfig.soap.username,
+						SOAPPassword: globalConfig.soap.password,
+						SOAPAuthType: globalConfig.soap.authtype,
+						SOAPModule: 'WiSPLocationMembers',
+						SOAPFunction: 'removeWiSPLocationMember',
+						SOAPParams: 'ID'
+					},
+					customSuccess: function() {
+						var store = Ext.getCmp(WiSPLocationMembersWindow.gridPanelID).getStore();
+						store.load({
+							params: {
+								limit: 25
+							}
+						});
+					}
+				});
+
+
+			// Unmask if user answered no
+			} else {
+				WiSPLocationMembersWindow.getEl().unmask();
+			}
+		}
+	});
+}
+
+
+// vim: ts=4

webgui/js/app/windows/WiSPLocations.js

+/*
+WiSP Locations
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 
 function showWiSPLocationWindow() {
@@ -6,12 +24,13 @@ function showWiSPLocationWindow() {
 		// Window config
 		{
 			title: "Locations",
+			iconCls: 'silk-map',
 			
 			width: 600,
 			height: 335,
 		
 			minWidth: 600,
-			minHeight: 335,
+			minHeight: 335
 		},
 		// Grid config
 		{
@@ -20,22 +39,22 @@ function showWiSPLocationWindow() {
 				{
 					text:'Add',
 					tooltip:'Add location',
-					iconCls:'add',
+					iconCls:'silk-map_add',
 					handler: function() {
-						showWiSPLocationAddEditWindow();
+						showWiSPLocationAddEditWindow(WiSPLocationWindow);
 					}
 				}, 
 				'-',
 				{
 					text:'Edit',
 					tooltip:'Edit location',
-					iconCls:'edit',
+					iconCls:'silk-map_edit',
 					handler: function() {
-						var selectedItem = WiSPLocationWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPLocationWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
-							showWiSPLocationAddEditWindow(selectedItem.data.ID);
+							showWiSPLocationAddEditWindow(WiSPLocationWindow,selectedItem.data.ID);
 						} else {
 							WiSPLocationWindow.getEl().mask();
 
@@ -57,9 +76,9 @@ function showWiSPLocationWindow() {
 				{
 					text:'Remove',
 					tooltip:'Remove location',
-					iconCls:'remove',
+					iconCls:'silk-map_delete',
 					handler: function() {
-						var selectedItem = WiSPLocationWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPLocationWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -85,13 +104,13 @@ function showWiSPLocationWindow() {
 				{
 					text:'Members',
 					tooltip:'List members',
-					iconCls:'remove',
+					iconCls:'silk-user',
 					handler: function() {
-						var selectedItem = WiSPLocationWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPLocationWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
-							showWiSPLocationMembersWindow(WiSPLocationWindow,selectedItem.data.ID);
+							showWiSPLocationMembersWindow(selectedItem.data.ID);
 						} else {
 							WiSPLocationWindow.getEl().mask();
 
@@ -151,26 +170,49 @@ function showWiSPLocationWindow() {
 
 
 // Display edit/add form
-function showWiSPLocationAddEditWindow(id) {
+function showWiSPLocationAddEditWindow(WiSPLocationWindow,id) {
 
 	var submitAjaxConfig;
+	var icon;
 
 	// We doing an update
 	if (id) {
+		icon = 'silk-map_edit';
 		submitAjaxConfig = {
-			ID: id,
-			SOAPFunction: 'updateWiSPLocation',
-			SOAPParams: 
-				'0:ID,'+
-				'0:Name'
+			params: {
+				ID: id,
+				SOAPFunction: 'updateWiSPLocation',
+				SOAPParams: 
+					'0:ID,'+
+					'0:Name'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(WiSPLocationWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
 		};
 
 	// We doing an Add
 	} else {
+		icon = 'silk-map_add';
 		submitAjaxConfig = {
-			SOAPFunction: 'createWiSPLocation',
-			SOAPParams: 
-				'0:Name'
+			params: {
+				SOAPFunction: 'createWiSPLocation',
+				SOAPParams: 
+					'0:Name'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(WiSPLocationWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
 		};
 	}
 	
@@ -179,12 +221,13 @@ function showWiSPLocationAddEditWindow(id) {
 		// Window config
 		{
 			title: "Location Information",
+			iconCls: icon,
 
-			width: 475,
-			height: 260,
+			width: 310,
+			height: 113,
 
-			minWidth: 475,
-			minHeight: 260
+			minWidth: 310,
+			minHeight: 113
 		},
 		// Form panel config
 		{
@@ -199,11 +242,9 @@ function showWiSPLocationAddEditWindow(id) {
 				{
 					fieldLabel: 'Name',
 					name: 'Name',
-					vtype: 'usernamePart',
-					maskRe: usernamePartRe,
 					allowBlank: false
-				},
-			],
+				}
+			]
 		},
 		// Submit button config
 		submitAjaxConfig
@@ -212,7 +253,7 @@ function showWiSPLocationAddEditWindow(id) {
 	wispLocationFormWindow.show();
 
 	if (id) {
-		wispLocationFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(wispLocationFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,
@@ -228,9 +269,9 @@ function showWiSPLocationAddEditWindow(id) {
 
 
 // Display remove form
-function showWiSPLocationRemoveWindow(parent,id) {
-	// Mask parent window
-	parent.getEl().mask();
+function showWiSPLocationRemoveWindow(WiSPLocationWindow,id) {
+	// Mask WiSPLocationWindow window
+	WiSPLocationWindow.getEl().mask();
 
 	// Display remove confirm window
 	Ext.Msg.show({
@@ -244,7 +285,7 @@ function showWiSPLocationRemoveWindow(parent,id) {
 			if (buttonId == 'yes') {
 
 				// Do ajax request
-				uxAjaxRequest(parent,{
+				uxAjaxRequest(WiSPLocationWindow,{
 					params: {
 						id: id,
 						SOAPUsername: globalConfig.soap.username,
@@ -253,15 +294,25 @@ function showWiSPLocationRemoveWindow(parent,id) {
 						SOAPModule: 'WiSPLocations',
 						SOAPFunction: 'removeWiSPLocation',
 						SOAPParams: 'id'
+					},
+					customSuccess: function() {
+						var store = Ext.getCmp(WiSPLocationWindow.gridPanelID).getStore();
+						store.load({
+							params: {
+								limit: 25
+							}
+						});
 					}
 				});
 
 
 			// Unmask if user answered no
 			} else {
-				parent.getEl().unmask();
+				WiSPLocationWindow.getEl().unmask();
 			}
 		}
 	});
 }
 
+
+// vim: ts=4

webgui/js/app/windows/WiSPResellers.js

+/*
+WiSP Resellers
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 
 function showWiSPResellersWindow() {
@@ -8,10 +26,10 @@ function showWiSPResellersWindow() {
 			title: "Resellers",
 			
 			width: 400,
-			height: 325,
+			height: 335,
 		
 			minWidth: 400,
-			minHeight: 325,
+			minHeight: 335
 		},
 		// Grid config
 		{
@@ -31,7 +49,7 @@ function showWiSPResellersWindow() {
 					tooltip:'Edit Reseller',
 					iconCls:'option',
 					handler: function() {
-						var selectedItem = WiSPResellerWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPResellerWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -59,7 +77,7 @@ function showWiSPResellersWindow() {
 					tooltip:'Remove Reseller',
 					iconCls:'remove',
 					handler: function() {
-						var selectedItem = WiSPResellerWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPResellerWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -157,10 +175,10 @@ function showWiSPResellerEditWindow(id) {
 			title: "Reseller Information",
 
 			width: 300,
-			height: 325,
+			height: 348,
 
 			minWidth: 300,
-			minHeight: 325
+			minHeight: 348
 		},
 		// Form panel config
 		{
@@ -254,7 +272,7 @@ function showWiSPResellerEditWindow(id) {
 						}
 					]
 				}
-			],
+			]
 		},
 		// Submit button config
 		submitAjaxConfig
@@ -263,7 +281,7 @@ function showWiSPResellerEditWindow(id) {
 	WiSPResellerFormWindow.show();
 
 	if (id) {
-		WiSPResellerFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(WiSPResellerFormWindow.formPanelID).load({
 			params: {
 				id: id,
 				SOAPUsername: globalConfig.soap.username,
@@ -327,3 +345,5 @@ function showWiSPResellerRemoveWindow(parent,id) {
 
 
 
+
+// vim: ts=4

webgui/js/app/windows/WiSPUserLogs.js

+/*
+WiSP User Logs
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 
-function showWiSPUserLogsWindow(wispUserID) {
+function showWiSPUserLogsWindow(id) {
 	// Calculate dates we going to need
-/*
 	var today = new Date();
 	var firstOfMonth = today.getFirstDateOfMonth();
 	var firstOfNext = today.getLastDateOfMonth().add(Date.DAY, 1);
-*/
-	
+
+	var formID = Ext.id();
+	var formPeriodKeyID = Ext.id();
+	var formSearchButtonID = Ext.id();
+
+	var summaryFormID = Ext.id();
+	var summaryTotalID = Ext.id();
+
+	var currentPeriod = today.format('Y-m');
+
 	var wispUserLogsWindow = new Ext.ux.GenericGridWindow(
 		// Window config
 		{
-			title: 'User Logs',
+			title: 'Logs',
+			iconCls: 'silk-page_white_text',
 			layout:'border',
 			height: 480,
 			width: 700,
@@ -22,91 +48,85 @@ function showWiSPUserLogsWindow(wispUserID) {
 			uxItems: [
 				{
 					xtype: 'form',
-					id: 'search-form',
+					id: formID,
 					title: 'Search',
 					region: 'west',
 					border: true,
 					frame: true,
-					defaultType: 'datefield',
 					height: 180,
-					width: 300,
+					width: 320,
 					labelWidth: 100,
 					items: [
 						{
-							id: 'after',
-							name: 'after',
-							width: 180,
-							fieldLabel: 'From',
-					//		vtype: 'daterange',
-							format: 'Y-m-d',
-					//		value: firstOfMonth,
-					//		endDateField: 'before',
-						},
-						{
-							id: 'before',
-							name: 'before',
-							width: 180,
-							fieldLabel: 'To',
-					//		vtype: 'daterange',
-							format: 'Y-m-d',
-					//		value: firstOfNext,
-					//		startDateField: 'after'
+							id: formPeriodKeyID,
+							xtype: 'textfield',
+							name: 'periodkey',
+							regex: /^\d{4}\-(0[1-9]|1(0|1|2))$/,
+							regexText: 'Please enter month in the format: YYYY-MM',
+							height: 25,
+							width: 100,
+							fieldLabel: 'Period',
+							value: currentPeriod
 						}
 					],
 					buttons: [
 						{
 							text: 'Search',
-							id: 'formbtn',
+							id: formSearchButtonID,
 							handler: function() {
 								// Pull in window, grid & form	
-								var mainWindow = this.ownerCt.ownerCt;
-								var grid = mainWindow.getComponent('gridpanel');
-								var form = mainWindow.getComponent('search-form');
+								var grid = Ext.getCmp(wispUserLogsWindow.gridPanelID);
 
 								// Grab store
 								var store = grid.getStore();
 
 								// Grab timestamp filter
 								var gridFilters = grid.filters;
-								var timestampFilter = gridFilters.getFilter('Timestamp');
+								var timestampFilter = gridFilters.getFilter('EventTimestamp');
+
+								// Grab	form field
+								var periodKeyField = Ext.getCmp(formPeriodKeyID);
+								if (periodKeyField.isValid()) {
+									var periodKeyValue = periodKeyField.getValue();
 
-								// Grab	form fields
-								var afterField = form.getForm().findField('after');
-								var beforeField = form.getForm().findField('before');
+									// Convert our periodKey into DateTime values
+									var dtSearchStart = Date.parseDate(periodKeyValue+'-01','Y-m-d');
+									var dtSearchEnd = dtSearchStart.add(Date.MONTH,1);
 
-								// Set filter values from form
-								timestampFilter.setValue({
-									after: afterField.getValue(),
-									before: beforeField.getValue()
-								});
+									// Set filter values from form
+									timestampFilter.setValue({
+										after: dtSearchStart,
+										before: dtSearchEnd
+									});
 
-								// Trigger store reload
-								store.reload();
+									// Trigger store reload
+									store.reload();
+								}
 							}
 						}
 					],
 					buttonAlign: 'center'
-
 				},
 				{
 					xtype: 'form',
-					id: 'summary-form',
+					id: summaryFormID,
 					region: 'center',
 					split: true,
-					border: true,
+					border: false,
 					autoScroll: true,
 					defaultType: 'textarea',
-					height: 180,
+					height: 300,
 					width: 400,
-					labelWidth: 80,
+					labelWidth: 0,
 					items: [
 						{
-							id: 'summaryTotal',
+							id: summaryTotalID,
 							name: 'summaryTotal',
 							readOnly: true,
-							height: 135,
-							width: 200,
+							height: 300,
+							width: 400,
 							fieldLabel: 'Summary',
+							hideLabel: true,
 							fieldClass: 'font-family: monospace; font-size: 10px;',
 							value: ''
 						}
@@ -119,78 +139,53 @@ function showWiSPUserLogsWindow(wispUserID) {
 			region: 'south',
 			width: 700,
 			border: true,
-			tbar: [
-				{
-					text: 'Add Port Lock',
-					tooltip: 'Add port lock',
-					iconCls: 'add'
-				}	
-			],
 			// Column model
 			colModel: new Ext.grid.ColumnModel([
 				{
-					id: 'ID',
 					header: "ID",
 					hidden: true,
 					dataIndex: 'ID'
 				},
 				{
-					header: "Username",
-					hidden: true,
-					dataIndex: 'Username'
+					header: "Timestamp",
+					sortable: true,
+					dataIndex: 'EventTimestamp'
 				},
 				{
 					header: "Status",
 					sortable: true,
 					hidden: true,
-					dataIndex: 'Status'
+					dataIndex: 'AcctStatusType'
 				},
 				{
-					header: "Timestamp",
+					header: "Service Type",
 					sortable: true,
-					dataIndex: 'Timestamp'
-				},
-				{
-					header: "Session ID",
-					hidden: true,
-					dataIndex: 'AcctSessionID'
+					dataIndex: 'ServiceType'
 				},
 				{
-					header: "Session Time",
-					dataIndex: 'AcctSessionTime'
-				},
-				{
-					header: "NAS IP",
-					hidden: true,
-					dataIndex: 'NASIPAddress'
+					header: "Framed Protocol",
+					sortable: true,
+					dataIndex: 'FramedProtocol'
 				},
 				{
-					header: "Port Type",
+					header: "NAS Port Type",
 					hidden: true,
 					dataIndex: 'NASPortType'
 				},
-				{
-					header: "NAS Port",
-					dataIndex: 'NASPort'
-				},
-				{
-					header: "Called Station",
-					hidden: true,
-					dataIndex: 'CalledStationID'
-				},
 				{
 					header: "Calling Station",
 					sortable: true,
 					dataIndex: 'CallingStationID'
 				},
 				{
-					header: "NAS Xmit Rate",
-					dataIndex: 'NASTransmitRate'
+					header: "Called Station",
+					hidden: true,
+					dataIndex: 'CalledStationID'
 				},
 				{
-					header: "NAS Recv Rate",
+					header: "Session ID",
 					hidden: true,
-					dataIndex: 'NASReceiveRate'
+					dataIndex: 'AcctSessionID'
 				},
 				{
 					header: "IP Address",
@@ -199,16 +194,17 @@ function showWiSPUserLogsWindow(wispUserID) {
 				},
 				{
 					header: "Input Mbyte",
-					dataIndex: 'AcctInputMbyte'
+					dataIndex: 'AcctInput',
+					renderer: renderUsageFloat
 				},
 				{
 					header: "Output Mbyte",
-					dataIndex: 'AcctOutputMbyte'
+					dataIndex: 'AcctOutput',
+					renderer: renderUsageFloat
 				},
 				{
-					header: "Last Update",
-					hidden: true,
-					dataIndex: 'LastAcctUpdate'
+					header: "Session Uptime",
+					dataIndex: 'AcctSessionTime'
 				},
 				{
 					header: "Term. Reason",
@@ -219,73 +215,171 @@ function showWiSPUserLogsWindow(wispUserID) {
 		// Store config
 		{
 			baseParams: {
+				ID: id,
 				SOAPUsername: globalConfig.soap.username,
 				SOAPPassword: globalConfig.soap.password,
 				SOAPAuthType: globalConfig.soap.authtype,
-				SOAPModule: 'WiSPUsers',
+				SOAPModule: 'WiSPUserLogs',
 				SOAPFunction: 'getWiSPUserLogs',
-				SOAPParams: '0:UserID,__search',
-				UserID: wispUserID
+				SOAPParams: 'ID,__search'
 			}
 		},
 		// Filter config
 		{
 			filters: [
-				{type: 'numeric',  dataIndex: 'ID'},
-				{type: 'string',  dataIndex: 'Username'},
-				{type: 'numeric',  dataIndex: 'Status'},
-/*
+				{type: 'numeric', dataIndex: 'ID'},
 				{
-					type: 'date',  
-					dataIndex: 'Timestamp', 
+					type: 'date',
+					format: 'Y-m-d H:i:s',
+					dataIndex: 'EventTimestamp',
 					value: {
 						after: firstOfMonth,
 						before: firstOfNext
 					}
 				},
-*/
-				{type: 'string',  dataIndex: 'AcctSessionID'},
-				{type: 'numeric',  dataIndex: 'AcctSessionTime'},
-
-				{type: 'string',  dataIndex: 'NASIPAddress'},
-				{type: 'string',  dataIndex: 'NASPortType'},
-				{type: 'string',  dataIndex: 'NASPort'},
-				{type: 'string',  dataIndex: 'CalledStationID'},
+				{type: 'numeric',  dataIndex: 'AcctStatusType'},
+				{type: 'numeric',  dataIndex: 'ServiceType'},
+				{type: 'numeric',  dataIndex: 'FramedProtocol'},
+				{type: 'numeric',  dataIndex: 'NASPortType'},
+				{type: 'string',  dataIndex: 'NASPortID'},
 				{type: 'string',  dataIndex: 'CallingStationID'},
-
-				{type: 'string',  dataIndex: 'NASTransmitRate'},
-				{type: 'string',  dataIndex: 'NASReceiveRate'},
-
+				{type: 'string',  dataIndex: 'CalledStationID'},
+				{type: 'string',  dataIndex: 'AcctSessionID'},
 				{type: 'string',  dataIndex: 'FramedIPAddress'},
-
-				{type: 'date',  dataIndex: 'LastAcctUpdate'},
-
+				{type: 'numeric',  dataIndex: 'AcctInput'},
+				{type: 'numeric',  dataIndex: 'AcctOutput'},
+				{type: 'numeric',  dataIndex: 'AcctSessionTime'},
 				{type: 'string',  dataIndex: 'ConnectTermReason'}
 			]
 		}
 	);
 	// Grab store
-	var store = wispUserLogsWindow.getComponent('gridpanel').getStore();
+	var store = Ext.getCmp(wispUserLogsWindow.gridPanelID).getStore();
 
 	store.on('load',function() {
-		var inputTotal = store.sum('AcctInputMbyte');
-		var outputTotal = store.sum('AcctOutputMbyte');
 
-		var userCap = 3000;
-		var userTopups = 1000;
-		
-		// Total up into this ... 
-		
-		var userTotalAllowed = userCap + userTopups;
-		var userUsage = inputTotal + outputTotal;
-		var userLeft = userTotalAllowed - userUsage;
+		// Fetch periodKey from form
+		var periodKeyField = (Ext.getCmp(formPeriodKeyID)).getValue();
 
-		var form = wispUserLogsWindow.getComponent('summary-form');
-		var summaryTotal = form.getForm().findField('summaryTotal');
+		// Mask parent window
+		wispUserLogsWindow.getEl().mask();
 
-		summaryTotal.setValue(
-				sprintf('Cap Total: %6d\nTopups   : %6d\n-----------------\n           %6d\n-----------------\nUsage    : %6d\n=================\nAvailable: %6d',userCap,userTopups,userTotalAllowed,userUsage,userLeft)
+		uxAjaxRequest(
+			wispUserLogsWindow,
+			{
+				params: {
+					PeriodKey: periodKeyField,
+					ID: id,
+					SOAPUsername: globalConfig.soap.username,
+					SOAPPassword: globalConfig.soap.password,
+					SOAPAuthType: globalConfig.soap.authtype,
+					SOAPModule: 'WiSPUserLogs',
+					SOAPFunction: 'getWiSPUserLogsSummary',
+					SOAPParams: '0:ID,0:PeriodKey'
+				},
+
+				customSuccess: function (result) {
+					response = Ext.decode(result.responseText);
+
+					// Caps
+					var trafficCap = response.data.trafficCap; // value of -1: prepaid
+					var uptimeCap = response.data.uptimeCap; // value of -1: prepaid
+					
+					// Usage
+					var trafficUsage = response.data.trafficUsage;
+					var uptimeUsage = response.data.uptimeUsage;
+
+					// Topups
+					var trafficTopups = response.data.trafficTopups;
+					var uptimeTopups = response.data.uptimeTopups;
+					var totalTrafficTopups = response.data.TotalTrafficTopups;
+					var totalUptimeTopups = response.data.TotalUptimeTopups;
+
+					// Format string before printing
+					var trafficString = '';
+					// Prepaid traffic
+					if (trafficCap == -1) {
+						trafficCap = 'Prepaid';
+						trafficString += sprintf('Traffic:\nCap: %s \nTopup balance for current month: %d MB\nTotal Topups: %d MB\nUsage: %d/%d MB\n',
+								trafficCap,trafficTopups,totalTrafficTopups,trafficUsage,trafficTopups);
+						trafficString += '---\n';
+					// Uncapped traffic
+					} else if (trafficCap == 0) {
+						trafficString += sprintf('Traffic:\nCap: Uncapped\nUsage: %d MB\n',
+								trafficUsage);
+						trafficString += '---\n';
+					// Capped traffic
+					} else {
+						var combinedTrafficCap = trafficCap + trafficTopups;
+						trafficString += sprintf('Traffic:\nCap: %d MB\nTopup balance for current month: %d MB\nTotal Topups: %d MB\n'+
+								'Usage: %d/%d MB\n',
+								trafficCap,trafficTopups,totalTrafficTopups,trafficUsage,combinedTrafficCap);
+						trafficString += '---\n';
+					}
+
+					// Format string before printing
+					var uptimeString = '';
+					// Prepaid uptime
+					if (uptimeCap == -1) {
+						uptimeCap = 'Prepaid';
+						uptimeString += sprintf('Uptime:\nCap: %s \nTopup balance for current month: %d Min\nTotal Topups: %d Min\n'+
+								'Usage: %d/%d Min\n',
+								uptimeCap,uptimeTopups,totalUptimeTopups,uptimeUsage,uptimeTopups);
+						uptimeString += '---\n';
+					// Uncapped uptime
+					} else if (uptimeCap == 0) {
+						uptimeString += sprintf('Uptime:\nCap: Uncapped\nUsage: %d Min\n',
+								uptimeUsage);
+						uptimeString += '---\n';
+					// Capped uptime
+					} else {
+						var combinedUptimeCap = uptimeCap + uptimeTopups;
+						uptimeString += sprintf('Uptime:\nCap: %d Min\nTopup balance for current month: %d Min\nTotal Topups: %d Min\n'+
+								'Usage: %d/%d Min\n',
+								uptimeCap,uptimeTopups,totalUptimeTopups,uptimeUsage,combinedUptimeCap);
+						uptimeString += '---\n';
+					}
+
+					// Topup breakdown
+					var tTopups = response.data.AllTrafficTopups;
+					var uTopups = response.data.AllUptimeTopups;
+
+					// Format topups string
+					var topupString = '';
+					if (tTopups.length > 0) {
+						topupString += 'Valid Traffic Topups:';
+					}
+					for (var i = 0; i < tTopups.length; i++) {
+						var id = tTopups[i].ID;
+						var used = tTopups[i].Used;
+						var cap = tTopups[i].Cap;
+						var validTo = tTopups[i].ValidTo;
+						topupString += sprintf('\nID: %s\nUsage: %d/%d MB\nValid Until: %s\n--',id,used,cap,validTo);
+					}
+					if (uTopups.length > 0) {
+						topupString += 'Valid Uptime Topups:';
+					}
+					for (var i = 0; i < uTopups.length; i++) {
+						var id = uTopups[i].ID;
+						var used = uTopups[i].Used;
+						var cap = uTopups[i].Cap;
+						var validTo = uTopups[i].ValidTo;
+						topupString += sprintf('\nID: %s\nUsage: %d/%d MB\nValid Until: %s\n--',id,used,cap,validTo);
+					}
+
+					// Get summary field
+					var form = Ext.getCmp(summaryFormID);
+					var summaryField = Ext.getCmp(summaryTotalID);
+					summaryField.setValue(trafficString+uptimeString+topupString);
+				},
+				failure: function (result) {
+					Ext.MessageBox.alert('Failed', 'Couldn\'t fetch data: '+result.date);
+				}
+			}
 		);
 	});
-	wispUserLogsWindow.show();				
+	wispUserLogsWindow.show();
 }
+
+
+// vim: ts=4

webgui/js/app/windows/WiSPUserTopups.js

+/*
+WiSP User Topups
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 
 function showWiSPUserTopupsWindow(userID) {
@@ -6,11 +24,12 @@ function showWiSPUserTopupsWindow(userID) {
 		// Window config
 		{
 			title: "User Topups",
+			iconCls: 'silk-chart_bar',
 
 			width: 500,
 			height: 335,
 			minWidth: 500,
-			minHeight: 335,
+			minHeight: 335
 		},
 		// Grid config
 		{
@@ -19,22 +38,22 @@ function showWiSPUserTopupsWindow(userID) {
 				{
 					text:'Add',
 					tooltip:'Add topup',
-					iconCls:'add',
+					iconCls:'silk-chart_bar_add',
 					handler: function() {
-						showWiSPUserTopupEditWindow(userID,0);
+						showWiSPUserTopupAddEditWindow(wispUserTopupsWindow,userID,0);
 					}
 				}, 
-				'-', 
+				'-',
 				{
 					text:'Edit',
 					tooltip:'Edit topup',
-					iconCls:'option',
+					iconCls:'silk-chart_bar_edit',
 					handler: function() {
-						var selectedItem = wispUserTopupsWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(wispUserTopupsWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
-							showWiSPUserTopupEditWindow(userID,selectedItem.data.ID);
+							showWiSPUserTopupAddEditWindow(wispUserTopupsWindow,userID,selectedItem.data.ID);
 						} else {
 							wispUserTopupsWindow.getEl().mask();
 
@@ -56,9 +75,9 @@ function showWiSPUserTopupsWindow(userID) {
 				{
 					text:'Remove',
 					tooltip:'Remove topup',
-					iconCls:'remove',
+					iconCls:'silk-chart_bar_delete',
 					handler: function() {
-						var selectedItem = wispUserTopupsWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(wispUserTopupsWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -91,9 +110,14 @@ function showWiSPUserTopupsWindow(userID) {
 					dataIndex: 'ID'
 				},
 				{
-					header: "Bandwidth",
+					header: "Type",
 					sortable: true,
-					dataIndex: 'Bandwidth'
+					dataIndex: 'Type'
+				},
+				{
+					header: "Value",
+					sortable: true,
+					dataIndex: 'Value'
 				},
 				{
 					header: "Timestamp",
@@ -110,13 +134,8 @@ function showWiSPUserTopupsWindow(userID) {
 					header: "ValidTo",
 					sortable: true,
 					dataIndex: 'ValidTo'
-				},
-				{
-					header: "AgentRef",
-					sortable: true,
-					dataIndex: 'AgentRef'
 				}
-			]),
+			])
 		},
 		// Store config
 		{
@@ -134,11 +153,10 @@ function showWiSPUserTopupsWindow(userID) {
 		{
 			filters: [
 				{type: 'numeric',  dataIndex: 'ID'},
-				{type: 'numeric',  dataIndex: 'Bandwidth'},
 				{type: 'date',  dataIndex: 'Timestamp'},
+				{type: 'numeric',  dataIndex: 'Value'},
 				{type: 'date',  dataIndex: 'ValidFrom'},
-				{type: 'date',  dataIndex: 'ValidTo'},
-				{type: 'string',  dataIndex: 'AgentRef'}
+				{type: 'date',  dataIndex: 'ValidTo'}
 			]
 		}
 	);
@@ -148,30 +166,53 @@ function showWiSPUserTopupsWindow(userID) {
 
 
 // Display edit/add form
-function showWiSPUserTopupEditWindow(userID,topupID) {
+function showWiSPUserTopupAddEditWindow(wispUserTopupsWindow,userID,topupID) {
 	var today = new Date();
 	var firstOfMonth = today.getFirstDateOfMonth();
 	var firstOfNext = today.getLastDateOfMonth().add(Date.DAY, 1);
 
 	var submitAjaxConfig;
+	var icon;
 
 	// We doing an update
 	if (topupID) {
+		icon = 'silk-chart_bar_edit';
 		submitAjaxConfig = {
-			ID: topupID,
-			SOAPFunction: 'updateWiSPUserTopup',
-			SOAPParams: 
-				'0:ID,0:Bandwidth,'+
-				'0:Timestamp,0:ValidFrom,0:ValidTo,0:AgentRef'
+			params: {
+				ID: topupID,
+				SOAPFunction: 'updateWiSPUserTopup',
+				SOAPParams: 
+					'0:ID,0:Value,0:Type,'+
+					'0:ValidFrom,0:ValidTo'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(wispUserTopupsWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
 		};
 	// We doing an Add
 	} else {
+		icon = 'silk-chart_bar_add';
 		submitAjaxConfig = {
-			UserID: userID,
-			SOAPFunction: 'createWiSPUserTopup',
-			SOAPParams: 
-				'0:UserID,0:Bandwidth,'+
-				'0:Timestamp,0:ValidFrom,0:ValidTo,0:AgentRef'
+			params: {
+				UserID: userID,
+				SOAPFunction: 'createWiSPUserTopup',
+				SOAPParams: 
+					'0:UserID,0:Value,0:Type,'+
+					'0:ValidFrom,0:ValidTo'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(wispUserTopupsWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			}
 		};
 	}
 
@@ -180,6 +221,7 @@ function showWiSPUserTopupEditWindow(userID,topupID) {
 		// Window config
 		{
 			title: "Topup Information",
+			iconCls: icon,
 
 			width: 400,
 			height: 200,
@@ -196,23 +238,40 @@ function showWiSPUserTopupEditWindow(userID,topupID) {
 				SOAPModule: 'WiSPUsers'
 			},
 			items: [
+				{
+					xtype: 'combo',
+					fieldLabel: 'Type',
+					name: 'Type',
+					allowBlank: false,
+					width: 157,
+					store: [ 
+						[ '1', 'Traffic' ],
+						[ '2', 'Uptime' ]
+					],
+					displayField: 'Type',
+					valueField: 'Type',
+					hiddenName: 'Type',
+					forceSelection: true,
+					triggerAction: 'all',
+					editable: false
+				},
 				{
 					xtype: 'numberfield',
-					fieldLabel: 'Bandwidth',
-					name: 'Bandwidth',
+					fieldLabel: 'Value',
+					name: 'Value',
 					minValue: 1,
 					allowBlank: false
 				},
 				{
-					xtype: 'datefield', 
+					xtype: 'datefield',
 					fieldLabel: 'ValidFrom',
 					name: 'ValidFrom',
 					id: 'ValidFrom',
 					vtype: 'daterange',
+					disabledDates: ["(0(2|3|4|5|6|7|8|9)|1[0-9]|2[0-9]|3[0-1])$"],
 					value: firstOfMonth,
 					format: 'Y-m-d',
 					endDateField: 'ValidTo'
-
 				},
 				{
 					xtype: 'datefield',
@@ -220,15 +279,12 @@ function showWiSPUserTopupEditWindow(userID,topupID) {
 					name: 'ValidTo',
 					id: 'ValidTo',
 					vtype: 'daterange',
+					disabledDates: ["(0(2|3|4|5|6|7|8|9)|1[0-9]|2[0-9]|3[0-1])$"],
 					value: firstOfNext,
 					format: 'Y-m-d',
 					startDateField: 'ValidFrom'
-				},
-				{
-					fieldLabel: 'AgentRef',
-					name: 'AgentRef'
 				}
-			],
+			]
 		},
 		// Submit button config
 		submitAjaxConfig
@@ -237,7 +293,7 @@ function showWiSPUserTopupEditWindow(userID,topupID) {
 	wispUserTopupFormWindow.show();
 
 	if (topupID) {
-		wispUserTopupFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(wispUserTopupFormWindow.formPanelID).load({
 			params: {
 				id: topupID,
 				SOAPUsername: globalConfig.soap.username,
@@ -254,10 +310,10 @@ function showWiSPUserTopupEditWindow(userID,topupID) {
 
 
 
-// Display edit/add form
-function showWiSPUserTopupRemoveWindow(parent,id) {
-	// Mask parent window
-	parent.getEl().mask();
+// Display remove form
+function showWiSPUserTopupRemoveWindow(wispUserTopupsWindow,id) {
+	// Mask wispUserTopupsWindow window
+	wispUserTopupsWindow.getEl().mask();
 
 	// Display remove confirm window
 	Ext.Msg.show({
@@ -271,7 +327,7 @@ function showWiSPUserTopupRemoveWindow(parent,id) {
 			if (buttonId == 'yes') {
 
 				// Do ajax request
-				uxAjaxRequest(parent,{
+				uxAjaxRequest(wispUserTopupsWindow,{
 					params: {
 						id: id,
 						SOAPUsername: globalConfig.soap.username,
@@ -280,15 +336,25 @@ function showWiSPUserTopupRemoveWindow(parent,id) {
 						SOAPModule: 'WiSPUsers',
 						SOAPFunction: 'removeWiSPUserTopup',
 						SOAPParams: 'id'
+					},
+					customSuccess: function() {
+						var store = Ext.getCmp(wispUserTopupsWindow.gridPanelID).getStore();
+						store.load({
+							params: {
+								limit: 25
+							}
+						});
 					}
 				});
 
 
 			// Unmask if user answered no
 			} else {
-				parent.getEl().unmask();
+				wispUserTopupsWindow.getEl().unmask();
 			}
 		}
 	});
 }
 
+
+// vim: ts=4

webgui/js/app/windows/WiSPUsers.js

+/*
+WiSP Users
+Copyright (C) 2007-2011, AllWorldIT
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 
 
 function showWiSPUserWindow() {
@@ -6,12 +24,13 @@ function showWiSPUserWindow() {
 		// Window config
 		{
 			title: "Users",
-			
+			iconCls: 'silk-user',
+
 			width: 600,
 			height: 335,
 		
 			minWidth: 600,
-			minHeight: 335,
+			minHeight: 335
 		},
 		// Grid config
 		{
@@ -20,22 +39,22 @@ function showWiSPUserWindow() {
 				{
 					text:'Add',
 					tooltip:'Add user',
-					iconCls:'add',
+					iconCls:'silk-user_add',
 					handler: function() {
-						showWiSPUserEditWindow();
+						showWiSPUserAddEditWindow(WiSPUserWindow);
 					}
-				}, 
-				'-', 
+				},
+				'-',
 				{
 					text:'Edit',
 					tooltip:'Edit user',
-					iconCls:'option',
+					iconCls:'silk-user_edit',
 					handler: function() {
-						var selectedItem = WiSPUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
-							showWiSPUserEditWindow(selectedItem.data.ID);
+							showWiSPUserAddEditWindow(WiSPUserWindow,selectedItem.data.ID);
 						} else {
 							WiSPUserWindow.getEl().mask();
 
@@ -57,9 +76,9 @@ function showWiSPUserWindow() {
 				{
 					text:'Remove',
 					tooltip:'Remove user',
-					iconCls:'remove',
+					iconCls:'silk-user_delete',
 					handler: function() {
-						var selectedItem = WiSPUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -85,9 +104,9 @@ function showWiSPUserWindow() {
 				{
 					text:'Logs',
 					tooltip:'User logs',
-					iconCls:'logs',
+					iconCls: 'silk-page_white_text',
 					handler: function() {
-						var selectedItem = WiSPUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -113,9 +132,9 @@ function showWiSPUserWindow() {
 				{
 					text:'Topups',
 					tooltip:'User topups',
-					iconCls:'topups',
+					iconCls:'silk-chart_bar',
 					handler: function() {
-						var selectedItem = WiSPUserWindow.getComponent('gridpanel').getSelectionModel().getSelected();
+						var selectedItem = Ext.getCmp(WiSPUserWindow.gridPanelID).getSelectionModel().getSelected();
 						// Check if we have selected item
 						if (selectedItem) {
 							// If so display window
@@ -151,11 +170,6 @@ function showWiSPUserWindow() {
 					sortable: true,
 					dataIndex: 'Username'
 				},
-				{
-					header: "Disabled",
-					sortable: true,
-					dataIndex: 'Disabled'
-				},
 				{
 					header: "First Name",
 					sortable: true,
@@ -175,6 +189,11 @@ function showWiSPUserWindow() {
 					header: "Phone",
 					sortable: true,
 					dataIndex: 'Phone'
+				},
+				{
+					header: "Disabled",
+					sortable: true,
+					dataIndex: 'Disabled'
 				}
 			]),
 			autoExpandColumn: 'Username'
@@ -209,42 +228,520 @@ function showWiSPUserWindow() {
 
 
 // Display edit/add form
-function showWiSPUserEditWindow(id) {
+function showWiSPUserAddEditWindow(WiSPUserWindow,id) {
 
 	var submitAjaxConfig;
 	var editMode;
+	var icon;
+
+	// Arrays for removed items
+	var RemovedAttributes = new Array();
+	var RemovedGroups = new Array();
+
+	// To identify newly inserted rows
+	var attributeInsertID = -1;
+	var groupInsertID = -1;
+
+	// Attribute record that can be added to below store
+	var attributeRecord = Ext.data.Record.create([
+		{name: 'ID'},
+		{name: 'Name'},
+		{name: 'Operator'},
+		{name: 'Value'},
+		{name: 'Modifier'}
+	]);
+
+	// Attribute store
+	var attributeStore;
+	// If this is an update we need to pull in record
+	if (id) {
+		attributeStore = new Ext.ux.JsonStore({
+			pruneModifiedRecords: true,
+			baseParams: {
+				ID: id,
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'WiSPUsers',
+				SOAPFunction: 'getWiSPUserAttributes',
+				SOAPParams: 'ID'
+			}
+		});
+	} else {
+		attributeStore = new Ext.data.SimpleStore({
+			pruneModifiedRecords: true,
+			fields: ['ID', 'Name', 'Operator', 'Value', 'Modifer']
+		});
+	}
 
+	// Group record that can be added to below store
+	var groupRecord = Ext.data.Record.create([
+		{name: 'Name'}
+	]);
+
+	// Group store
+	var groupStore;
+	// If this is an update we need to pull in record
+	if (id) {
+		groupStore = new Ext.ux.JsonStore({
+			pruneModifiedRecords: true,
+			baseParams: {
+				ID: id,
+				SOAPUsername: globalConfig.soap.username,
+				SOAPPassword: globalConfig.soap.password,
+				SOAPAuthType: globalConfig.soap.authtype,
+				SOAPModule: 'WiSPUsers',
+				SOAPFunction: 'getWiSPUserGroups',
+				SOAPParams: 'ID'
+			}
+		});
+	} else {
+		groupStore = new Ext.data.SimpleStore({
+			pruneModifiedRecords: true,
+			fields: [
+				'Name'
+			]
+		});
+	}
 
 	// We doing an update
 	if (id) {
+		icon = 'silk-user_edit';
 		submitAjaxConfig = {
-			ID: id,
-			SOAPFunction: 'updateWiSPUser',
-			SOAPParams: 
-				'0:ID,'+
-				'0:Username'
-		};
+			params: {
+				ID: id,
+				SOAPFunction: 'updateWiSPUser',
+				SOAPParams:
+					'0:ID,'+
+					'0:Username,'+
+					'0:Password,'+
+					'0:Disabled,'+
+					'0:Firstname,'+
+					'0:Lastname,'+
+					'0:Phone,'+
+					'0:LocationID,'+
+					'0:Attributes,'+
+					'0:Groups,'+
+					'0:Email,'+
+					'0:RGroups,'+
+					'0:RAttributes'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(WiSPUserWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			},
+
+			hook: function() {
+				// Get modified attribute records
+				var attributes = attributeStore.getModifiedRecords();
+				// Get modified group records
+				var groups = groupStore.getModifiedRecords();
+
+				var ret = { };
+				// Set attributes we will be adding
+				for (var i = 0, len = attributes.length; i < len; i++) {
+					var attribute = attributes[i];
+
+					// Safe to add this attribute
+					ret['Attributes['+i+'][ID]'] = attribute.get('ID');
+					ret['Attributes['+i+'][Name]'] = attribute.get('Name');
+					ret['Attributes['+i+'][Operator]'] = attribute.get('Operator');
+					ret['Attributes['+i+'][Value]'] = attribute.get('Value');
+					ret['Attributes['+i+'][Modifier]'] = attribute.get('Modifier');
+				}
+				// Set groups we will be adding
+				for (var i = 0, len = groups.length; i < len; i++) {
+					var group = groups[i];
+
+					// Safe to add this attribute
+					ret['Groups['+i+'][Name]'] = group.get('Name');
+				}
+
+				// Add removed attributes
+				if ((id) && (RemovedAttributes.length > 0)) {
+					var c = 0;
+					var len = RemovedAttributes.length;
+					for (var i = 0; i < len; i++) {
+						// If this is a new add then the user has no attributes
+						if (RemovedAttributes[i] >= 0) {
+							ret['RAttributes['+c+']'] = RemovedAttributes[i];
+							c++;
+						}
+					}
+				}
+
+				// Add removed groups
+				if ((id) && (RemovedGroups.length > 0)) {
+					var c = 0;
+					var len = RemovedGroups.length;
+					for (var i = 0; i < len; i++) {
+						// If this is a new add then the user has no attributes
+						if (RemovedGroups[i] >= 0) {
+							ret['RGroups['+c+']'] = RemovedGroups[i];
+							c++;
+						}
+					}
+				}
 
+				return ret;
+			}
+		};
 	// We doing an Add
 	} else {
+		icon = 'silk-user_add';
 		submitAjaxConfig = {
-			SOAPFunction: 'createWiSPUser',
-			SOAPParams: 
-				'0:Username'
+			params: {
+				SOAPFunction: 'createWiSPUser',
+				SOAPParams:
+					'0:Username,'+
+					'0:Disabled,'+
+					'0:Password,'+
+					'0:Firstname,'+
+					'0:Lastname,'+
+					'0:Phone,'+
+					'0:Email,'+
+					'0:LocationID,'+
+					'0:Attributes,'+
+					'0:Groups,'+
+					'0:Number,'+
+					'0:Prefix'
+			},
+			onSuccess: function() {
+				var store = Ext.getCmp(WiSPUserWindow.gridPanelID).getStore();
+				store.load({
+					params: {
+						limit: 25
+					}
+				});
+			},
+
+			hook: function() {
+				// Get modified attribute records
+				var attributes = attributeStore.getModifiedRecords();
+				// Get modified group records
+				var groups = groupStore.getModifiedRecords();
+
+				var ret = { };
+				// Set attributes we will be adding
+				for (var i = 0, len = attributes.length; i < len; i++) {
+					var attribute = attributes[i];
+
+					// Safe to add this attribute
+					ret['Attributes['+i+'][ID]'] = attribute.get('ID');
+					ret['Attributes['+i+'][Name]'] = attribute.get('Name');
+					ret['Attributes['+i+'][Operator]'] = attribute.get('Operator');
+					ret['Attributes['+i+'][Value]'] = attribute.get('Value');
+					ret['Attributes['+i+'][Modifier]'] = attribute.get('Modifier');
+				}
+				// Set groups we will be adding
+				for (var i = 0, len = groups.length; i < len; i++) {
+					var group = groups[i];
+
+					// Safe to add this attribute
+					ret['Groups['+i+'][Name]'] = group.get('Name');
+				}
+				return ret;
+			}
 		};
 	}
 
+
+	// Build the attribute editor grid
+	var attributeEditor = new Ext.grid.EditorGridPanel({
+		plain: true,
+		autoHeight: true,
+
+		// Set row selection model
+		selModel: new Ext.grid.RowSelectionModel({
+			singleSelect: true
+		}),
+
+		// Inline toolbars
+		tbar: [
+			{
+				text:'Add',
+				tooltip:'Add attribute',
+				iconCls:'silk-table_add',
+				handler: function() {
+					var newAttrStoreRecord = new attributeRecord({
+						ID: attributeInsertID,
+						Name: '',
+						Operator: '',
+						Value: '',
+						Modifier: ''
+					});
+					attributeStore.insert(0,newAttrStoreRecord);
+					attributeInsertID -= 1;
+				}
+			},
+			'-',
+			{
+				text:'Remove',
+				tooltip:'Remove attribute',
+				iconCls:'silk-table_delete',
+				handler: function() {
+					var selectedItem = attributeEditor.getSelectionModel().getSelected();
+
+					// Check if we have selected item
+					if (selectedItem) {
+						// Get selected item value
+						var attributeID = selectedItem.get('ID');
+
+						// Remove selected
+						attributeStore.remove(selectedItem);
+
+						// Add to list of removed attributes
+						RemovedAttributes.push(attributeID);
+					} else {
+						wispUserFormWindow.getEl().mask();
+
+						// Display error
+						Ext.Msg.show({
+							title: "Nothing selected",
+							msg: "No attribute selected",
+							icon: Ext.MessageBox.ERROR,
+							buttons: Ext.Msg.CANCEL,
+							modal: false,
+							fn: function() {
+								wispUserFormWindow.getEl().unmask();
+							}
+						});
+					}
+				}
+			}
+		],
+
+		cm: new Ext.grid.ColumnModel([
+			{
+				id: 'ID',
+				header: 'ID',
+				dataIndex: 'ID',
+				hidden: true,
+				width: 30
+			},
+			{
+				id: 'Name',
+				header: 'Name',
+				dataIndex: 'Name',
+				width: 150,
+				editor: new Ext.form.ComboBox({
+					allowBlank: false,
+					mode: 'local',
+					store: [
+						[ 'SMRadius-Capping-Traffic-Limit', 'Traffic Limit' ],
+						[ 'SMRadius-Capping-Uptime-Limit', 'Uptime Limit' ],
+						[ 'Framed-IP-Address', 'IP Address' ],
+						[ 'Calling-Station-Id', 'MAC Address' ]
+					],
+					triggerAction: 'all',
+					editable: false
+				})
+			},
+			{
+				id: 'Operator',
+				header: 'Operator',
+				dataIndex: 'Operator',
+				width: 300,
+				editor: new Ext.form.ComboBox({
+					allowBlank: false,
+					mode: 'local',
+					store: [
+						[ '=', 'Add as reply if unique' ],
+						[ ':=', 'Set configuration value'  ],
+						[ '==', 'Match value in request' ],
+						[ '+=', 'Add reply and set configuration' ],
+						[ '!=', 'Inverse match value in request' ],
+						[ '<', 'Match less-than value in request' ],
+						[ '>', 'Match greater-than value in request' ],
+						[ '<=', 'Match less-than or equal value in request' ],
+						[ '>=', 'Match greater-than or equal value in request' ],
+						[ '=~', 'Match string containing regex in request' ],
+						[ '!~', 'Match string not containing regex in request' ],
+						[ '=*', 'Match if attribute is defined in request' ],
+						[ '!*', 'Match if attribute is not defined in request' ],
+						[ '||==', 'Match any of these values in request' ]
+					],
+					triggerAction: 'all',
+					editable: true
+				})
+			},
+			{
+				id: 'Value',
+				header: 'Value',
+				dataIndex: 'Value',
+				width: 100,
+				editor: new Ext.form.TextField({
+					allowBlank: false
+				})
+			},
+			{
+				id: 'Modifier',
+				header: 'Modifier',
+				dataIndex: 'Modifier',
+				width: 80,
+				editor: new Ext.form.ComboBox({
+					allowBlank: false,
+					mode: 'local',
+					store: [
+						[ 'Seconds', 'Seconds' ],
+						[ 'Minutes', 'Minutes' ],
+						[ 'Hours', 'Hours' ],
+						[ 'Days', 'Days' ],
+						[ 'Weeks', 'Weeks' ],
+						[ 'Months', 'Months' ],
+						[ 'MBytes', 'MBytes' ],
+						[ 'GBytes', 'GBytes' ],
+						[ 'TBytes', 'TBytes' ]
+					],
+					triggerAction: 'all',
+					editable: true
+				})
+			}
+		]),
+		store: attributeStore
+	});
+
+	// Editor combobox ID
+	var editorComboBoxID = Ext.id();
+
+	// Render display value
+	editorComboBoxRenderer = function(editorComboBoxID) {
+		var combo = Ext.getCmp(editorComboBoxID);
+		return function(value){
+			var record = combo.findRecord(combo.valueField, value);
+			return record ? record.get(combo.displayField) : value;
+		}
+	}
+
+	// Build the group editor grid
+	var groupEditor = new Ext.grid.EditorGridPanel({
+		plain: true,
+		autoHeight: true,
+
+		// Set row selection model
+		selModel: new Ext.grid.RowSelectionModel({
+			singleSelect: true
+		}),
+		
+		// Inline toolbars
+		tbar: [
+			{
+				text:'Add',
+				tooltip:'Add group',
+				iconCls:'silk-group_add',
+				handler: function() {
+					var newGroupStoreRecord = new groupRecord({
+						ID: groupInsertID,
+						Name: ''
+					});
+					groupStore.insert(0,newGroupStoreRecord);
+					groupInsertID -= 1;
+				}
+			},
+			'-',
+			{
+				text:'Remove',
+				tooltip:'Remove group',
+				iconCls:'silk-group_delete',
+				handler: function() {
+					var selectedItem = groupEditor.getSelectionModel().getSelected();
+
+					// Check if we have selected item
+					if (selectedItem) {
+						// Get selected item value
+						var groupID = selectedItem.get('ID');
+
+						// Remove selected
+						groupStore.remove(selectedItem);
+
+						// Add to our removed groups hash
+						RemovedGroups.push(groupID);
+					} else {
+						wispUserFormWindow.getEl().mask();
+
+						// Display error
+						Ext.Msg.show({
+							title: "Nothing selected",
+							msg: "No group selected",
+							icon: Ext.MessageBox.ERROR,
+							buttons: Ext.Msg.CANCEL,
+							modal: false,
+							fn: function() {
+								wispUserFormWindow.getEl().unmask();
+							}
+						});
+					}
+				}
+			}
+		],
+
+		cm: new Ext.grid.ColumnModel([
+			{
+				id: 'ID',
+				header: 'ID',
+				dataIndex: 'ID',
+				hidden: true,
+				width: 30
+			},
+			{
+				id: 'Name',
+				header: 'Name',
+				dataIndex: 'Name',
+				width: 150,
+				editor: new Ext.form.ComboBox({
+					id: editorComboBoxID,
+					allowBlank: false,
+					store: new Ext.ux.JsonStore({
+						sortInfo: { field: "Name", direction: "ASC" },
+						baseParams: {
+							SOAPUsername: globalConfig.soap.username,
+							SOAPPassword: globalConfig.soap.password,
+							SOAPAuthType: globalConfig.soap.authtype,
+							SOAPModule: 'AdminUserGroups',
+							SOAPFunction: 'getAdminGroups',
+							SOAPParams: '__null,__search'
+						}
+					}),
+					displayField: 'Name',
+					valueField: 'ID',
+					forceSelection: true,
+					triggerAction: 'all',
+					editable: false
+				}),
+				renderer: editorComboBoxRenderer(editorComboBoxID)
+			}
+		]),
+		store: groupStore
+	});
+
+	var locationStore = new Ext.ux.JsonStore({
+		sortInfo: { field: "Name", direction: "ASC" },
+		baseParams: {
+			SOAPUsername: globalConfig.soap.username,
+			SOAPPassword: globalConfig.soap.password,
+			SOAPAuthType: globalConfig.soap.authtype,
+			SOAPModule: 'WiSPUsers',
+			SOAPFunction: 'getWiSPLocations',
+			SOAPParams: '__null,__search'
+		}
+	})
+
 	// Create window
 	var wispUserFormWindow = new Ext.ux.GenericFormWindow(
 		// Window config
 		{
 			title: "User Information",
+			iconCls: icon,
 
-			width: 475,
-			height: 260,
+			width: 700,
+			height: 362,
 
-			minWidth: 475,
-			minHeight: 260
+			minWidth: 700,
+			minHeight: 362
 		},
 		// Form panel config
 		{
@@ -259,11 +756,120 @@ function showWiSPUserEditWindow(id) {
 				{
 					fieldLabel: 'Username',
 					name: 'Username',
-					vtype: 'usernamePart',
-					maskRe: usernamePartRe,
-					allowBlank: false,
+					vtype: 'usernameRadius',
+					maskRe: usernameRadiusPartRe,
+					allowBlank: true
 				},
-			],
+				{
+					fieldLabel: 'Password',
+					name: 'Password',
+					allowBlank: true
+				},
+				{
+					fieldLabel: 'Disabled',
+					name: 'Disabled',
+					xtype: 'checkbox',
+					inputValue: '1'
+				},
+				{
+					xtype: 'tabpanel',
+					plain: 'true',
+					deferredRender: false, // Load all panels!
+					activeTab: 0,
+					height: 200,
+					maxHeight: 200,
+					defaults: {
+						layout: 'form',
+						bodyStyle: 'padding: 10px;'
+					},
+
+					items: [
+						{
+							title: 'Personal',
+							iconCls: 'silk-user_comment',
+							layout: 'form',
+							defaultType: 'textfield',
+							items: [
+								{
+									fieldLabel: 'First Name',
+									name: 'Firstname',
+									allowBlank: true
+								},
+								{
+									fieldLabel: 'Last Name',
+									name: 'Lastname',
+									allowBlank: true
+								},
+								{
+									fieldLabel: 'Phone',
+									name: 'Phone',
+									vtype: 'number',
+									allowBlank: true
+								},
+								{
+									fieldLabel: 'Email',
+									name: 'Email',
+									allowBlank: true
+								},
+								{
+									xtype: 'combo',
+									fieldLabel: 'Location',
+									name: 'Location',
+									allowBlank: true,
+									width: 140,
+
+									store: locationStore,
+									displayField: 'Name',
+									valueField: 'ID',
+									hiddenName: 'LocationID',
+									forceSelection: true,
+									triggerAction: 'all',
+									editable: false
+								}
+							]
+						},
+						{
+							title: 'Groups',
+							iconCls: 'silk-group',
+							layout: 'form',
+							autoScroll: true,
+							defaultType: 'textfield',
+							items: [
+								groupEditor
+							]
+						},
+						{
+							title: 'Attributes',
+							iconCls: 'silk-table',
+							layout: 'form',
+							autoScroll: true,
+							defaultType: 'textfield',
+							items: [
+								attributeEditor
+							]
+						},
+						{
+							title: 'Add Many',
+							iconCls: 'silk-user_suit',
+							layout: 'form',
+							defaultType: 'textfield',
+							items: [
+								{
+									fieldLabel: 'Prefix',
+									name: 'Prefix',
+									allowBlank: true
+								},
+								{
+									fieldLabel: 'Number',
+									name: 'Number',
+									vtype: 'number',
+									allowBlank: true
+								}
+							]
+						}
+					]
+				}
+			]
 		},
 		// Submit button config
 		submitAjaxConfig
@@ -271,7 +877,7 @@ function showWiSPUserEditWindow(id) {
 	wispUserFormWindow.show();
 
 	if (id) {
-		wispUserFormWindow.getComponent('formpanel').load({
+		Ext.getCmp(wispUserFormWindow.formPanelID).load({
 			params: {
 				ID: id,
 				SOAPUsername: globalConfig.soap.username,
@@ -282,16 +888,19 @@ function showWiSPUserEditWindow(id) {
 				SOAPParams: 'ID'
 			}
 		});
+		locationStore.load();
+		attributeStore.load();
+		groupStore.load();
 	}
 }
 
 
 
 
-// Display edit/add form
-function showWiSPUserRemoveWindow(parent,id) {
-	// Mask parent window
-	parent.getEl().mask();
+// Display remove form
+function showWiSPUserRemoveWindow(WiSPUserWindow,id) {
+	// Mask WiSPUserWindow window
+	WiSPUserWindow.getEl().mask();
 
 	// Display remove confirm window
 	Ext.Msg.show({
@@ -305,7 +914,7 @@ function showWiSPUserRemoveWindow(parent,id) {
 			if (buttonId == 'yes') {
 
 				// Do ajax request
-				uxAjaxRequest(parent,{
+				uxAjaxRequest(WiSPUserWindow,{
 					params: {
 						ID: id,
 						SOAPUsername: globalConfig.soap.username,
@@ -314,13 +923,21 @@ function showWiSPUserRemoveWindow(parent,id) {
 						SOAPModule: 'WiSPUsers',
 						SOAPFunction: 'removeWiSPUser',
 						SOAPParams: 'ID'
+					},
+					customSuccess: function() {
+						var store = Ext.getCmp(WiSPUserWindow.gridPanelID).getStore();
+						store.load({
+							params: {
+								limit: 25
+							}
+						});
 					}
 				});
 
 
 			// Unmask if user answered no
 			} else {
-				parent.getEl().unmask();
+				WiSPUserWindow.getEl().unmask();
 			}
 		}
 	});
@@ -335,3 +952,5 @@ function showWiSPUserRemoveWindow(parent,id) {
 
 
 
+
+// vim: ts=4

webgui/js/custom/GridFilters.js

-/*
- * Ext JS Library 2.1
- * Copyright(c) 2006-2008, Ext JS, LLC.
- * licensing@extjs.com
- * 
- * http://extjs.com/license
- */
-
-Ext.grid.GridFilters = function(config){		
-	this.filters = new Ext.util.MixedCollection();
-	this.filters.getKey = function(o) {return o ? o.dataIndex : null};
-	
-	for(var i=0, len=config.filters.length; i<len; i++) {
-		this.addFilter(config.filters[i]);
-  }
-  
-	this.deferredUpdate = new Ext.util.DelayedTask(this.reload, this);
-	
-	delete config.filters;
-	Ext.apply(this, config);
-};
-
-Ext.extend(Ext.grid.GridFilters, Ext.util.Observable, {
-	/**
-	 * @cfg {Integer} updateBuffer
-	 * Number of milisecond to defer store updates since the last filter change.
-	 */
-	updateBuffer: 500,
-	/**
-	 * @cfg {String} paramPrefix
-	 * The url parameter prefix for the filters.
-	 */
-	paramPrefix: 'filter',
-	/**
-	 * @cfg {String} fitlerCls
-	 * The css class to be applied to column headers that active filters. Defaults to 'ux-filterd-column'
-	 */
-	filterCls: 'ux-filtered-column',
-	/**
-	 * @cfg {Boolean} local
-	 * True to use Ext.data.Store filter functions instead of server side filtering.
-	 */
-	local: false,
-	/**
-	 * @cfg {Boolean} autoReload
-	 * True to automagicly reload the datasource when a filter change happens.
-	 */
-	autoReload: true,
-	/**
-	 * @cfg {String} stateId
-	 * Name of the Ext.data.Store value to be used to store state information.
-	 */
-	stateId: undefined,
-	/**
-	 * @cfg {Boolean} showMenu
-	 * True to show the filter menus
-	 */
-	showMenu: true,
-
-	init: function(grid){
-    if(grid instanceof Ext.grid.GridPanel){
-      this.grid  = grid;
-      
-      this.store = this.grid.getStore();
-      if(this.local){
-        this.store.on('load', function(store) {
-          store.filterBy(this.getRecordFilter());
-        }, this);
-      } else {
-        this.store.on('beforeload', this.onBeforeLoad, this);
-      }
-      
-      this.grid.filters = this;
-      
-      this.grid.addEvents('filterupdate');
-      
-      grid.on("render", this.onRender, this);
-      grid.on("beforestaterestore", this.applyState, this);
-      grid.on("beforestatesave", this.saveState, this);
-      
-    } else if(grid instanceof Ext.PagingToolbar) {
-      this.toolbar = grid;
-    }
-	},
-		
-	/** private **/
-	applyState: function(grid, state) {
-		this.suspendStateStore = true;
-		this.clearFilters();
-		if(state.filters) {
-			for(var key in state.filters) {
-				var filter = this.filters.get(key);
-				if(filter) {
-					filter.setValue(state.filters[key]);
-					filter.setActive(true);
-				}
-			}
-    }
-    
-		this.deferredUpdate.cancel();
-		if(this.local) {
-			this.reload();
-    }
-    
-		this.suspendStateStore = false;
-	},
-	
-	/** private **/
-	saveState: function(grid, state){
-		var filters = {};
-		this.filters.each(function(filter) {
-			if(filter.active) {
-				filters[filter.dataIndex] = filter.getValue();
-      }
-		});
-		return state.filters = filters;
-	},
-	
-	/** private **/
-	onRender: function(){
-		var hmenu;
-		
-		if(this.showMenu) {
-			hmenu = this.grid.getView().hmenu;
-			
-			this.sep  = hmenu.addSeparator();
-			this.menu = hmenu.add(new Ext.menu.CheckItem({
-					text: 'Filters',
-					menu: new Ext.menu.Menu()
-				}));
-			this.menu.on('checkchange', this.onCheckChange, this);
-			this.menu.on('beforecheckchange', this.onBeforeCheck, this);
-				
-			hmenu.on('beforeshow', this.onMenu, this);
-		}
-		
-		this.grid.getView().on("refresh", this.onRefresh, this);
-		this.updateColumnHeadings(this.grid.getView());
-	},
-	
-	/** private **/
-	onMenu: function(filterMenu) {
-		var filter = this.getMenuFilter();
-		if(filter) {
-			this.menu.menu = filter.menu;
-			this.menu.setChecked(filter.active, false);
-		}
-		
-		this.menu.setVisible(filter !== undefined);
-		this.sep.setVisible(filter !== undefined);
-	},
-	
-	/** private **/
-	onCheckChange: function(item, value) {
-		this.getMenuFilter().setActive(value);
-	},
-	
-	/** private **/
-	onBeforeCheck: function(check, value) {
-		return !value || this.getMenuFilter().isActivatable();
-	},
-	
-	/** private **/
-	onStateChange: function(event, filter) {
-    if(event == "serialize") {
-      return;
-    }
-    
-		if(filter == this.getMenuFilter()) {
-			this.menu.setChecked(filter.active, false);
-    }
-			
-		if(this.autoReload || this.local) {
-			this.deferredUpdate.delay(this.updateBuffer);
-    }
-		
-		var view = this.grid.getView();
-		this.updateColumnHeadings(view);
-			
-		this.grid.saveState();
-			
-		this.grid.fireEvent('filterupdate', this, filter);
-	},
-	
-	/** private **/
-	onBeforeLoad: function(store, options) {
-    options.params = options.params || {};
-		this.cleanParams(options.params);		
-		var params = this.buildQuery(this.getFilterData());
-		Ext.apply(options.params, params);
-	},
-	
-	/** private **/
-	onRefresh: function(view) {
-		this.updateColumnHeadings(view);
-	},
-	
-	/** private **/
-	getMenuFilter: function() {
-		var view = this.grid.getView();
-		if(!view || view.hdCtxIndex === undefined) {
-			return null;
-    }
-		
-		return this.filters.get(view.cm.config[view.hdCtxIndex].dataIndex);
-	},
-	
-	/** private **/
-	updateColumnHeadings: function(view) {
-		if(!view || !view.mainHd) {
-      return;
-    }
-		
-		var hds = view.mainHd.select('td').removeClass(this.filterCls);
-		for(var i=0, len=view.cm.config.length; i<len; i++) {
-			var filter = this.getFilter(view.cm.config[i].dataIndex);
-			if(filter && filter.active) {
-				hds.item(i).addClass(this.filterCls);
-      }
-		}
-	},
-	
-	/** private **/
-	reload: function() {
-		if(this.local){
-			this.grid.store.clearFilter(true);
-			this.grid.store.filterBy(this.getRecordFilter());
-		} else {
-			this.deferredUpdate.cancel();
-			var store = this.grid.store;
-			if(this.toolbar) {
-				var start = this.toolbar.paramNames.start;
-				if(store.lastOptions && store.lastOptions.params && store.lastOptions.params[start]) {
-					store.lastOptions.params[start] = 0;
-        }
-			}
-			store.reload();
-		}
-	},
-	
-	/**
-	 * Method factory that generates a record validator for the filters active at the time
-	 * of invokation.
-	 * 
-	 * @private
-	 */
-	getRecordFilter: function() {
-		var f = [];
-		this.filters.each(function(filter) {
-			if(filter.active) {
-        f.push(filter);
-      }
-		});
-		
-		var len = f.length;
-		return function(record) {
-			for(var i=0; i<len; i++) {
-				if(!f[i].validateRecord(record)) {
-					return false;
-        }
-      }
-			return true;
-		};
-	},
-	
-	/**
-	 * Adds a filter to the collection.
-	 * 
-	 * @param {Object/Ext.grid.filter.Filter} config A filter configuration or a filter object.
-	 * 
-	 * @return {Ext.grid.filter.Filter} The existing or newly created filter object.
-	 */
-	addFilter: function(config) {
-		var filter = config.menu ? config : new (this.getFilterClass(config.type))(config);
-		this.filters.add(filter);
-		
-		Ext.util.Observable.capture(filter, this.onStateChange, this);
-		return filter;
-	},
-	
-	/**
-	 * Returns a filter for the given dataIndex, if on exists.
-	 * 
-	 * @param {String} dataIndex The dataIndex of the desired filter object.
-	 * 
-	 * @return {Ext.grid.filter.Filter}
-	 */
-	getFilter: function(dataIndex){
-		return this.filters.get(dataIndex);
-	},
-
-	/**
-	 * Turns all filters off. This does not clear the configuration information.
-	 */
-	clearFilters: function() {
-		this.filters.each(function(filter) {
-			filter.setActive(false);
-		});
-	},
-
-	/** private **/
-	getFilterData: function() {
-		var filters = [];
-		
-		this.filters.each(function(f) {
-			if(f.active) {
-				var d = [].concat(f.serialize());
-				for(var i=0, len=d.length; i<len; i++) {
-					filters.push({field: f.dataIndex, data: d[i]});
-        }
-			}
-		});
-		
-		return filters;
-	},
-	
-	/**
-	 * Function to take structured filter data and 'flatten' it into query parameteres. The default function
-	 * will produce a query string of the form:
-	 * 		filters[0][field]=dataIndex&filters[0][data][param1]=param&filters[0][data][param2]=param...
-	 * 
-	 * @param {Array} filters A collection of objects representing active filters and their configuration.
-	 * 	  Each element will take the form of {field: dataIndex, data: filterConf}. dataIndex is not assured
-	 *    to be unique as any one filter may be a composite of more basic filters for the same dataIndex.
-	 * 
-	 * @return {Object} Query keys and values
-	 */
-	buildQuery: function(filters) {
-		var p = {};
-		for(var i=0, len=filters.length; i<len; i++) {
-			var f = filters[i];
-			var root = [this.paramPrefix, '[', i, ']'].join('');
-			p[root + '[field]'] = f.field;
-			
-			var dataPrefix = root + '[data]';
-			for(var key in f.data) {
-				p[[dataPrefix, '[', key, ']'].join('')] = f.data[key];
-      }
-		}
-		
-		return p;
-	},
-	
-	/**
-	 * Removes filter related query parameters from the provided object.
-	 * 
-	 * @param {Object} p Query parameters that may contain filter related fields.
-	 */
-	cleanParams: function(p) {
-		var regex = new RegExp("^" + this.paramPrefix + "\[[0-9]+\]");
-		for(var key in p) {
-			if(regex.test(key)) {
-				delete p[key];
-      }
-    }
-	},
-	
-	/**
-	 * Function for locating filter classes, overwrite this with your favorite
-	 * loader to provide dynamic filter loading.
-	 * 
-	 * @param {String} type The type of filter to load.
-	 * 
-	 * @return {Class}
-	 */
-	getFilterClass: function(type){
-		return Ext.grid.filter[type.substr(0, 1).toUpperCase() + type.substr(1) + 'Filter'];
-	}
-});