diff --git a/webgui/js/app/menus.js b/webgui/js/app/menus.js
index 0cc92ece71e8d925c34ceda39f028ad2802ab627..b482957f6b56574a4acbb1f0827f9ef4ac670be0 100644
--- a/webgui/js/app/menus.js
+++ b/webgui/js/app/menus.js
@@ -22,6 +22,7 @@ var radiusMenu = new Ext.menu.Menu({
{
text: 'Users',
+ iconCls: 'silk-user',
handler: function() {
showAdminUserWindow();
}
@@ -29,6 +30,7 @@ var radiusMenu = new Ext.menu.Menu({
{
text: 'Groups',
+ iconCls: 'silk-group',
handler: function() {
showAdminGroupWindow();
}
@@ -36,6 +38,7 @@ var radiusMenu = new Ext.menu.Menu({
{
text: 'Realms',
+ iconCls: 'silk-world',
handler: function() {
showAdminRealmWindow();
}
@@ -50,6 +53,7 @@ var wispMenu = new Ext.menu.Menu({
{
text: 'Users',
+ iconCls: 'silk-user',
handler: function() {
showWiSPUserWindow();
}
@@ -64,6 +68,7 @@ var wispMenu = new Ext.menu.Menu({
{
text: 'Locations',
+ iconCls: 'silk-world',
handler: function() {
showWiSPLocationWindow();
}
diff --git a/webgui/js/app/windows/AdminGroupAttributes.js b/webgui/js/app/windows/AdminGroupAttributes.js
index a13abae3c4a7aa454c64fbb6571a3e680824952b..b1e07b623e058bb179efee4284f3fa94ef7f988f 100644
--- a/webgui/js/app/windows/AdminGroupAttributes.js
+++ b/webgui/js/app/windows/AdminGroupAttributes.js
@@ -24,6 +24,7 @@ function showAdminGroupAttributesWindow(groupID) {
// Window config
{
title: "Attributes",
+ iconCls: 'silk-table',
width: 600,
height: 335,
@@ -38,7 +39,7 @@ function showAdminGroupAttributesWindow(groupID) {
{
text:'Add',
tooltip:'Add attribute',
- iconCls:'add',
+ iconCls:'silk-table_add',
handler: function() {
showAdminGroupAttributeAddEditWindow(groupID);
}
@@ -47,7 +48,7 @@ function showAdminGroupAttributesWindow(groupID) {
{
text:'Edit',
tooltip:'Edit attribute',
- iconCls:'edit',
+ iconCls:'silk-table_edit',
handler: function() {
var selectedItem = Ext.getCmp(AdminGroupAttributesWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -75,7 +76,7 @@ function showAdminGroupAttributesWindow(groupID) {
{
text:'Remove',
tooltip:'Remove attribute',
- iconCls:'remove',
+ iconCls:'silk-table_delete',
handler: function() {
var selectedItem = Ext.getCmp(AdminGroupAttributesWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -163,10 +164,11 @@ function showAdminGroupAttributesWindow(groupID) {
function showAdminGroupAttributeAddEditWindow(groupID,attrID) {
var submitAjaxConfig;
-
+ var icon;
// We doing an update
if (attrID) {
+ icon = 'silk-table_edit';
submitAjaxConfig = {
ID: attrID,
SOAPFunction: 'updateAdminGroupAttribute',
@@ -180,6 +182,7 @@ function showAdminGroupAttributeAddEditWindow(groupID,attrID) {
// We doing an Add
} else {
+ icon = 'silk-table_add';
submitAjaxConfig = {
GroupID: groupID,
SOAPFunction: 'addAdminGroupAttribute',
@@ -197,6 +200,7 @@ function showAdminGroupAttributeAddEditWindow(groupID,attrID) {
// Window config
{
title: "Attribute Information",
+ iconCls: icon,
width: 310,
height: 200,
diff --git a/webgui/js/app/windows/AdminGroupMembers.js b/webgui/js/app/windows/AdminGroupMembers.js
index 8b7885915bee5778b1a371240a52447fac9db152..e5dad683e0160ddc4816c214476dcb24500ef193 100644
--- a/webgui/js/app/windows/AdminGroupMembers.js
+++ b/webgui/js/app/windows/AdminGroupMembers.js
@@ -24,6 +24,7 @@ function showAdminGroupMembersWindow(groupID) {
// Window config
{
title: "Members",
+ iconCls: 'silk-user',
width: 600,
height: 335,
@@ -38,7 +39,7 @@ function showAdminGroupMembersWindow(groupID) {
{
text:'Remove',
tooltip:'Remove member',
- iconCls:'remove',
+ iconCls:'silk-user_delete',
handler: function() {
var selectedItem = Ext.getCmp(AdminGroupMembersWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
diff --git a/webgui/js/app/windows/AdminGroups.js b/webgui/js/app/windows/AdminGroups.js
index bdfaa4f8e14f1de96d92e245404934f5392aa6f7..8ecb7ab479cf290c06b0baa3a30d241a077ad5f3 100644
--- a/webgui/js/app/windows/AdminGroups.js
+++ b/webgui/js/app/windows/AdminGroups.js
@@ -24,6 +24,7 @@ function showAdminGroupWindow() {
// Window config
{
title: "Groups",
+ iconCls: 'silk-group',
width: 600,
height: 335,
@@ -38,7 +39,7 @@ function showAdminGroupWindow() {
{
text:'Add',
tooltip:'Add group',
- iconCls:'add',
+ iconCls:'silk-group_add',
handler: function() {
showAdminGroupAddEditWindow();
}
@@ -47,7 +48,7 @@ function showAdminGroupWindow() {
{
text:'Edit',
tooltip:'Edit group',
- iconCls:'edit',
+ iconCls:'silk-group_edit',
handler: function() {
var selectedItem = Ext.getCmp(AdminGroupWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -75,7 +76,7 @@ function showAdminGroupWindow() {
{
text:'Remove',
tooltip:'Remove group',
- iconCls:'remove',
+ iconCls:'silk-group_delete',
handler: function() {
var selectedItem = Ext.getCmp(AdminGroupWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -103,7 +104,7 @@ function showAdminGroupWindow() {
{
text:'Attributes',
tooltip:'Group attributes',
- iconCls:'attributes',
+ iconCls:'silk-table',
handler: function() {
var selectedItem = Ext.getCmp(AdminGroupWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -131,7 +132,7 @@ function showAdminGroupWindow() {
{
text:'Members',
tooltip:'Group members',
- iconCls:'groups',
+ iconCls:'silk-group',
handler: function() {
var selectedItem = Ext.getCmp(AdminGroupWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -218,10 +219,12 @@ function showAdminGroupWindow() {
function showAdminGroupAddEditWindow(id) {
var submitAjaxConfig;
-
+ var icon;
// We doing an update
+
if (id) {
+ icon = 'silk-group_edit';
submitAjaxConfig = {
ID: id,
SOAPFunction: 'updateAdminGroup',
@@ -232,6 +235,7 @@ function showAdminGroupAddEditWindow(id) {
// We doing an Add
} else {
+ icon = 'silk-group_add';
submitAjaxConfig = {
SOAPFunction: 'createAdminGroup',
SOAPParams:
@@ -244,6 +248,7 @@ function showAdminGroupAddEditWindow(id) {
// Window config
{
title: "Group Information",
+ iconCls: icon,
width: 310,
height: 113,
diff --git a/webgui/js/app/windows/AdminRealmAttributes.js b/webgui/js/app/windows/AdminRealmAttributes.js
index 53bea2d7b4cf72d6b2f8ed6df93ecfaea65a8907..4bf66d8fc1c8ed42d8a823f404489155f2a0782c 100644
--- a/webgui/js/app/windows/AdminRealmAttributes.js
+++ b/webgui/js/app/windows/AdminRealmAttributes.js
@@ -24,6 +24,7 @@ function showAdminRealmAttributesWindow(realmID) {
// Window config
{
title: "Attributes",
+ iconCls: 'silk-table',
width: 600,
height: 335,
@@ -38,7 +39,7 @@ function showAdminRealmAttributesWindow(realmID) {
{
text:'Add',
tooltip:'Add attribute',
- iconCls:'add',
+ iconCls:'silk-table_add',
handler: function() {
showAdminRealmAttributeAddEditWindow(realmID);
}
@@ -47,7 +48,7 @@ function showAdminRealmAttributesWindow(realmID) {
{
text:'Edit',
tooltip:'Edit attribute',
- iconCls:'edit',
+ iconCls:'silk-table_edit',
handler: function() {
var selectedItem = Ext.getCmp(AdminRealmAttributesWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -75,7 +76,7 @@ function showAdminRealmAttributesWindow(realmID) {
{
text:'Remove',
tooltip:'Remove attribute',
- iconCls:'remove',
+ iconCls:'silk-table_delete',
handler: function() {
var selectedItem = Ext.getCmp(AdminRealmAttributesWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -163,10 +164,12 @@ function showAdminRealmAttributesWindow(realmID) {
function showAdminRealmAttributeAddEditWindow(realmID,attrID) {
var submitAjaxConfig;
+ var icon;
// We doing an update
if (attrID) {
+ icon = 'silk-table_edit';
submitAjaxConfig = {
ID: attrID,
SOAPFunction: 'updateAdminRealmAttribute',
@@ -180,6 +183,7 @@ function showAdminRealmAttributeAddEditWindow(realmID,attrID) {
// We doing an Add
} else {
+ icon = 'silk-table_add';
submitAjaxConfig = {
RealmID: realmID,
SOAPFunction: 'addAdminRealmAttribute',
@@ -197,6 +201,7 @@ function showAdminRealmAttributeAddEditWindow(realmID,attrID) {
// Window config
{
title: "Attribute Information",
+ iconCls: icon,
width: 310,
height: 200,
diff --git a/webgui/js/app/windows/AdminRealms.js b/webgui/js/app/windows/AdminRealms.js
index 80cfc6e6e016d5d2f495bda6987ea53f27ef256d..f7c39587b7404f640ea69bfde77f0aa055e486b9 100644
--- a/webgui/js/app/windows/AdminRealms.js
+++ b/webgui/js/app/windows/AdminRealms.js
@@ -24,6 +24,7 @@ function showAdminRealmWindow() {
// Window config
{
title: "Realms",
+ iconCls: 'silk-world',
width: 600,
height: 335,
@@ -38,7 +39,7 @@ function showAdminRealmWindow() {
{
text:'Add',
tooltip:'Add realm',
- iconCls:'add',
+ iconCls:'silk-world_add',
handler: function() {
showAdminRealmAddEditWindow();
}
@@ -47,7 +48,7 @@ function showAdminRealmWindow() {
{
text:'Edit',
tooltip:'Edit realm',
- iconCls:'edit',
+ iconCls:'silk-world_edit',
handler: function() {
var selectedItem = Ext.getCmp(AdminRealmWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -74,7 +75,7 @@ function showAdminRealmWindow() {
{
text:'Remove',
tooltip:'Remove realm',
- iconCls:'remove',
+ iconCls:'silk-world_delete',
handler: function() {
var selectedItem = Ext.getCmp(AdminRealmWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -102,7 +103,7 @@ function showAdminRealmWindow() {
{
text:'Attributes',
tooltip:'Realm attributes',
- iconCls:'attributes',
+ iconCls:'silk-table',
handler: function() {
var selectedItem = Ext.getCmp(AdminRealmWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -177,10 +178,12 @@ function showAdminRealmWindow() {
function showAdminRealmAddEditWindow(id) {
var submitAjaxConfig;
+ var icon;
// We doing an update
if (id) {
+ icon = 'silk-world_edit';
submitAjaxConfig = {
ID: id,
SOAPFunction: 'updateAdminRealm',
@@ -191,6 +194,7 @@ function showAdminRealmAddEditWindow(id) {
// We doing an Add
} else {
+ icon = 'silk-world_add';
submitAjaxConfig = {
SOAPFunction: 'createAdminRealm',
SOAPParams:
@@ -203,6 +207,7 @@ function showAdminRealmAddEditWindow(id) {
// Window config
{
title: "Realm Information",
+ iconCls: icon,
width: 310,
height: 113,
diff --git a/webgui/js/app/windows/AdminUserAttributes.js b/webgui/js/app/windows/AdminUserAttributes.js
index b700aa2d7dde5229276d41e407fd52d8e7926895..847afa13b234a7a4d23b47d203de8a7397cb30cd 100644
--- a/webgui/js/app/windows/AdminUserAttributes.js
+++ b/webgui/js/app/windows/AdminUserAttributes.js
@@ -24,6 +24,7 @@ function showAdminUserAttributesWindow(userID) {
// Window config
{
title: "Attributes",
+ iconCls: 'silk-table',
width: 600,
height: 335,
@@ -38,7 +39,7 @@ function showAdminUserAttributesWindow(userID) {
{
text:'Add',
tooltip:'Add attribute',
- iconCls:'add',
+ iconCls:'silk-table_add',
handler: function() {
showAdminUserAttributeAddEditWindow(userID);
}
@@ -47,7 +48,7 @@ function showAdminUserAttributesWindow(userID) {
{
text:'Edit',
tooltip:'Edit attribute',
- iconCls:'edit',
+ iconCls:'silk-table_edit',
handler: function() {
var selectedItem = Ext.getCmp(AdminUserAttributesWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -75,7 +76,7 @@ function showAdminUserAttributesWindow(userID) {
{
text:'Remove',
tooltip:'Remove attribute',
- iconCls:'remove',
+ iconCls:'silk-table_delete',
handler: function() {
var selectedItem = Ext.getCmp(AdminUserAttributesWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -163,10 +164,12 @@ function showAdminUserAttributesWindow(userID) {
function showAdminUserAttributeAddEditWindow(userID,attrID) {
var submitAjaxConfig;
+ var icon;
// We doing an update
if (attrID) {
+ icon = 'silk-table_edit';
submitAjaxConfig = {
ID: attrID,
SOAPFunction: 'updateAdminUserAttribute',
@@ -180,6 +183,7 @@ function showAdminUserAttributeAddEditWindow(userID,attrID) {
// We doing an Add
} else {
+ icon = 'silk-table_add';
submitAjaxConfig = {
UserID: userID,
SOAPFunction: 'addAdminUserAttribute',
@@ -197,6 +201,7 @@ function showAdminUserAttributeAddEditWindow(userID,attrID) {
// Window config
{
title: "Attribute Information",
+ iconCls: icon,
width: 310,
height: 200,
diff --git a/webgui/js/app/windows/AdminUserGroups.js b/webgui/js/app/windows/AdminUserGroups.js
index 38849d302a091cbf43e34a41500f84eeb2268166..6b06c38f02cbfe72524368b536af1bb12478e8b4 100644
--- a/webgui/js/app/windows/AdminUserGroups.js
+++ b/webgui/js/app/windows/AdminUserGroups.js
@@ -24,6 +24,7 @@ function showAdminUserGroupsWindow(userID) {
// Window config
{
title: "Groups",
+ iconCls: 'silk-group',
width: 400,
height: 335,
@@ -38,7 +39,7 @@ function showAdminUserGroupsWindow(userID) {
{
text:'Add',
tooltip:'Add group',
- iconCls:'add',
+ iconCls:'silk-group_add',
handler: function() {
showAdminUserGroupAddWindow(userID);
}
@@ -47,7 +48,7 @@ function showAdminUserGroupsWindow(userID) {
{
text:'Remove',
tooltip:'Remove group',
- iconCls:'remove',
+ iconCls:'silk-group_delete',
handler: function() {
var selectedItem = Ext.getCmp(AdminUserGroupsWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -117,10 +118,12 @@ function showAdminUserGroupsWindow(userID) {
function showAdminUserGroupAddWindow(userID,id) {
var submitAjaxConfig;
+ var icon;
// We doing an update
if (id) {
+ icon = 'silk-group_edit';
submitAjaxConfig = {
ID: id,
SOAPFunction: 'updateAdminGroup',
@@ -131,6 +134,7 @@ function showAdminUserGroupAddWindow(userID,id) {
// We doing an Add
} else {
+ icon = 'silk-group_add';
submitAjaxConfig = {
UserID: userID,
SOAPFunction: 'addAdminUserGroup',
@@ -145,6 +149,7 @@ function showAdminUserGroupAddWindow(userID,id) {
// Window config
{
title: "Group Information",
+ iconCls: icon,
width: 310,
height: 113,
diff --git a/webgui/js/app/windows/AdminUserLogs.js b/webgui/js/app/windows/AdminUserLogs.js
index 86e7982faaf4f83757310c8b2aa234095290157f..b6c8e390df4869ca97ea6f43014aa5463c8c2035 100644
--- a/webgui/js/app/windows/AdminUserLogs.js
+++ b/webgui/js/app/windows/AdminUserLogs.js
@@ -28,6 +28,7 @@ function showAdminUserLogsWindow(id) {
// Window config
{
title: 'Logs',
+ iconCls: 'logs',
layout:'border',
height: 480,
width: 700,
diff --git a/webgui/js/app/windows/AdminUserTopups.js b/webgui/js/app/windows/AdminUserTopups.js
index ecee786ed2d5e36f6944b29831468c68ef673c25..b1d6af658f6977033ddf6d4d01c34f70f0bbd853 100644
--- a/webgui/js/app/windows/AdminUserTopups.js
+++ b/webgui/js/app/windows/AdminUserTopups.js
@@ -24,6 +24,7 @@ function showAdminUserTopupsWindow(userID) {
// Window config
{
title: "User Topups",
+ iconCls: 'silk-building',
width: 500,
height: 335,
@@ -37,7 +38,7 @@ function showAdminUserTopupsWindow(userID) {
{
text:'Add',
tooltip:'Add topup',
- iconCls:'add',
+ iconCls:'silk-building_add',
handler: function() {
showAdminUserTopupAddEditWindow(userID,0);
}
@@ -46,7 +47,7 @@ function showAdminUserTopupsWindow(userID) {
{
text:'Edit',
tooltip:'Edit topup',
- iconCls:'option',
+ iconCls:'silk-building_edit',
handler: function() {
var selectedItem = Ext.getCmp(adminUserTopupsWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -74,7 +75,7 @@ function showAdminUserTopupsWindow(userID) {
{
text:'Remove',
tooltip:'Remove topup',
- iconCls:'remove',
+ iconCls:'silk-building_delete',
handler: function() {
var selectedItem = Ext.getCmp(adminUserTopupsWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -171,9 +172,11 @@ function showAdminUserTopupAddEditWindow(userID,topupID) {
var firstOfNext = today.getLastDateOfMonth().add(Date.DAY, 1);
var submitAjaxConfig;
+ var icon;
// We doing an update
if (topupID) {
+ icon = 'silk-building_edit';
submitAjaxConfig = {
ID: topupID,
SOAPFunction: 'updateAdminUserTopup',
@@ -183,6 +186,7 @@ function showAdminUserTopupAddEditWindow(userID,topupID) {
};
// We doing an Add
} else {
+ icon = 'silk-building_add';
submitAjaxConfig = {
UserID: userID,
SOAPFunction: 'createAdminUserTopup',
@@ -197,6 +201,7 @@ function showAdminUserTopupAddEditWindow(userID,topupID) {
// Window config
{
title: "Topup Information",
+ iconCls: icon,
width: 400,
height: 200,
diff --git a/webgui/js/app/windows/AdminUsers.js b/webgui/js/app/windows/AdminUsers.js
index 8924a995d5ad00ed01ee80be7638d3600f1f1367..df9e4c6d0d4428d0c55e8c60a814a93b2d197cdd 100644
--- a/webgui/js/app/windows/AdminUsers.js
+++ b/webgui/js/app/windows/AdminUsers.js
@@ -24,6 +24,7 @@ function showAdminUserWindow() {
// Window config
{
title: "Users",
+ iconCls: 'silk-user',
width: 600,
height: 335,
@@ -38,7 +39,7 @@ function showAdminUserWindow() {
{
text:'Add',
tooltip:'Add user',
- iconCls:'add',
+ iconCls:'silk-user_add',
handler: function() {
showAdminUserAddEditWindow();
}
@@ -47,7 +48,7 @@ function showAdminUserWindow() {
{
text:'Edit',
tooltip:'Edit user',
- iconCls:'option',
+ iconCls:'silk-user_edit',
handler: function() {
var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -75,7 +76,7 @@ function showAdminUserWindow() {
{
text:'Remove',
tooltip:'Remove user',
- iconCls:'remove',
+ iconCls:'silk-user_delete',
handler: function() {
var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -103,7 +104,7 @@ function showAdminUserWindow() {
{
text:'Attributes',
tooltip:'User attributes',
- iconCls:'attributes',
+ iconCls:'silk-table',
handler: function() {
var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -159,7 +160,7 @@ function showAdminUserWindow() {
{
text:'Groups',
tooltip:'User groups',
- iconCls:'groups',
+ iconCls:'silk-group',
handler: function() {
var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -187,7 +188,7 @@ function showAdminUserWindow() {
{
text:'Topups',
tooltip:'User topups',
- iconCls:'logs',
+ iconCls:'silk-building',
handler: function() {
var selectedItem = Ext.getCmp(AdminUserWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -262,9 +263,11 @@ function showAdminUserWindow() {
function showAdminUserAddEditWindow(id) {
var submitAjaxConfig;
+ var icon;
// We doing an update
if (id) {
+ icon = 'silk-user_edit';
submitAjaxConfig = {
ID: id,
SOAPFunction: 'updateAdminUser',
@@ -275,6 +278,7 @@ function showAdminUserAddEditWindow(id) {
// We doing an Add
} else {
+ icon = 'silk-user_add';
submitAjaxConfig = {
SOAPFunction: 'createAdminUser',
SOAPParams:
@@ -287,6 +291,7 @@ function showAdminUserAddEditWindow(id) {
// Window config
{
title: "User Information",
+ iconCls: icon,
width: 310,
height: 113,
diff --git a/webgui/js/app/windows/WiSPUserLogs.js b/webgui/js/app/windows/WiSPUserLogs.js
index 0f1ebc8fd8aca348e6ef96de99432e31766d2758..b9e110e86602acfb6ba3071f0a630643a871913d 100644
--- a/webgui/js/app/windows/WiSPUserLogs.js
+++ b/webgui/js/app/windows/WiSPUserLogs.js
@@ -28,6 +28,7 @@ function showWiSPUserLogsWindow(id) {
// Window config
{
title: 'Logs',
+ iconCls: 'logs',
layout:'border',
height: 480,
width: 700,
diff --git a/webgui/js/app/windows/WiSPUserTopups.js b/webgui/js/app/windows/WiSPUserTopups.js
index df1e70753b7203d1e75c5df5d1d42e3d5d191c9e..89f1cf33f0bc13aadcec49107e2f91b163a79aa2 100644
--- a/webgui/js/app/windows/WiSPUserTopups.js
+++ b/webgui/js/app/windows/WiSPUserTopups.js
@@ -24,6 +24,7 @@ function showWiSPUserTopupsWindow(userID) {
// Window config
{
title: "User Topups",
+ iconCls: 'silk-building',
width: 500,
height: 335,
@@ -37,7 +38,7 @@ function showWiSPUserTopupsWindow(userID) {
{
text:'Add',
tooltip:'Add topup',
- iconCls:'add',
+ iconCls:'silk-building_add',
handler: function() {
showWiSPUserTopupAddEditWindow(userID,0);
}
@@ -46,7 +47,7 @@ function showWiSPUserTopupsWindow(userID) {
{
text:'Edit',
tooltip:'Edit topup',
- iconCls:'option',
+ iconCls:'silk-building_edit',
handler: function() {
var selectedItem = Ext.getCmp(wispUserTopupsWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -74,7 +75,7 @@ function showWiSPUserTopupsWindow(userID) {
{
text:'Remove',
tooltip:'Remove topup',
- iconCls:'remove',
+ iconCls:'silk-building_delete',
handler: function() {
var selectedItem = Ext.getCmp(wispUserTopupsWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -171,9 +172,11 @@ function showWiSPUserTopupAddEditWindow(userID,topupID) {
var firstOfNext = today.getLastDateOfMonth().add(Date.DAY, 1);
var submitAjaxConfig;
+ var icon;
// We doing an update
if (topupID) {
+ icon = 'silk-building_edit';
submitAjaxConfig = {
ID: topupID,
SOAPFunction: 'updateWiSPUserTopup',
@@ -183,6 +186,7 @@ function showWiSPUserTopupAddEditWindow(userID,topupID) {
};
// We doing an Add
} else {
+ icon = 'silk-building_add';
submitAjaxConfig = {
UserID: userID,
SOAPFunction: 'createWiSPUserTopup',
@@ -197,6 +201,7 @@ function showWiSPUserTopupAddEditWindow(userID,topupID) {
// Window config
{
title: "Topup Information",
+ iconCls: icon,
width: 400,
height: 200,
diff --git a/webgui/js/app/windows/WiSPUsers.js b/webgui/js/app/windows/WiSPUsers.js
index 1c5cd47bab2d0ad794b7e997cb33736c5feafb05..a8e0c13237a9b8e4f0a3d94bb7e1031035f06202 100644
--- a/webgui/js/app/windows/WiSPUsers.js
+++ b/webgui/js/app/windows/WiSPUsers.js
@@ -24,6 +24,7 @@ function showWiSPUserWindow() {
// Window config
{
title: "Users",
+ iconCls: 'silk-user',
width: 600,
height: 335,
@@ -38,7 +39,7 @@ function showWiSPUserWindow() {
{
text:'Add',
tooltip:'Add user',
- iconCls:'add',
+ iconCls:'silk-user_add',
handler: function() {
showWiSPUserAddEditWindow();
}
@@ -47,7 +48,7 @@ function showWiSPUserWindow() {
{
text:'Edit',
tooltip:'Edit user',
- iconCls:'option',
+ iconCls:'silk-user_edit',
handler: function() {
var selectedItem = Ext.getCmp(WiSPUserWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -75,7 +76,7 @@ function showWiSPUserWindow() {
{
text:'Remove',
tooltip:'Remove user',
- iconCls:'remove',
+ iconCls:'silk-user_delete',
handler: function() {
var selectedItem = Ext.getCmp(WiSPUserWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -131,7 +132,7 @@ function showWiSPUserWindow() {
{
text:'Topups',
tooltip:'User topups',
- iconCls:'logs',
+ iconCls:'silk-building',
handler: function() {
var selectedItem = Ext.getCmp(WiSPUserWindow.gridPanelID).getSelectionModel().getSelected();
// Check if we have selected item
@@ -231,7 +232,7 @@ function showWiSPUserAddEditWindow(id) {
var submitAjaxConfig;
var editMode;
-
+ var icon;
// Attribute store
var attributeStore;
@@ -262,6 +263,7 @@ function showWiSPUserAddEditWindow(id) {
// We doing an update
if (id) {
+ icon = 'silk-user_edit';
submitAjaxConfig = {
ID: id,
SOAPFunction: 'updateWiSPUser',
@@ -278,6 +280,7 @@ function showWiSPUserAddEditWindow(id) {
// We doing an Add
} else {
+ icon = 'silk-user_add';
submitAjaxConfig = {
params: {
SOAPFunction: 'createWiSPUser',
@@ -338,7 +341,7 @@ function showWiSPUserAddEditWindow(id) {
{
text:'Add',
tooltip:'Add attribute',
- iconCls:'add',
+ iconCls:'silk-table_add',
handler: function() {
var newAttrStoreRecord = new attributeRecord({
name: '',
@@ -353,7 +356,7 @@ function showWiSPUserAddEditWindow(id) {
{
text:'Remove',
tooltip:'Remove attribute',
- iconCls:'remove',
+ iconCls:'silk-table_delete',
handler: function() {
var selectedItem = attributeEditor.getSelectionModel().getSelected();
@@ -480,7 +483,7 @@ function showWiSPUserAddEditWindow(id) {
{
text:'Add',
tooltip:'Add group',
- iconCls:'add',
+ iconCls:'silk-group_add',
handler: function() {
var newGroupStoreRecord = new groupRecord({
name: ''
@@ -492,7 +495,7 @@ function showWiSPUserAddEditWindow(id) {
{
text:'Remove',
tooltip:'Remove group',
- iconCls:'remove',
+ iconCls:'silk-group_delete',
handler: function() {
var selectedItem = groupEditor.getSelectionModel().getSelected();
@@ -555,6 +558,7 @@ function showWiSPUserAddEditWindow(id) {
// Window config
{
title: "User Information",
+ iconCls: icon,
width: 700,
height: 342,
@@ -600,6 +604,7 @@ function showWiSPUserAddEditWindow(id) {
items: [
{
title: 'Personal',
+ iconCls: 'silk-user_comment',
layout: 'form',
defaultType: 'textfield',
items: [
@@ -655,6 +660,7 @@ function showWiSPUserAddEditWindow(id) {
},
{
title: 'Groups',
+ iconCls: 'silk-group',
layout: 'form',
defaultType: 'textfield',
items: [
@@ -663,6 +669,7 @@ function showWiSPUserAddEditWindow(id) {
},
{
title: 'Attributes',
+ iconCls: 'silk-table',
layout: 'form',
defaultType: 'textfield',
items: [
@@ -671,6 +678,7 @@ function showWiSPUserAddEditWindow(id) {
},
{
title: 'Add Many',
+ iconCls: 'silk-user_suit',
layout: 'form',
defaultType: 'textfield',
items: [