From e4b2d2fdc6aeadcf74f4c8f268925f750c748561 Mon Sep 17 00:00:00 2001
From: Robert Anderson <randerson@lbsd.net>
Date: Mon, 19 Jul 2010 10:35:28 +0000
Subject: [PATCH] Description text is easier to understand
---
webgui/js/app/windows/AdminUserLogs.js | 8 ++++----
webgui/js/app/windows/WiSPUserLogs.js | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/webgui/js/app/windows/AdminUserLogs.js b/webgui/js/app/windows/AdminUserLogs.js
index e52454f4..b00b6d72 100644
--- a/webgui/js/app/windows/AdminUserLogs.js
+++ b/webgui/js/app/windows/AdminUserLogs.js
@@ -300,7 +300,7 @@ function showAdminUserLogsWindow(id) {
// Prepaid traffic
if (trafficCap == -1) {
trafficCap = 'Prepaid';
- trafficString += sprintf('Traffic:\nCap: %s \nTopup Available: %d MB\nTotal Topups: %d MB\nUsage: %d/%d MB\n',
+ 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
@@ -311,7 +311,7 @@ function showAdminUserLogsWindow(id) {
// Capped traffic
} else {
var combinedTrafficCap = trafficCap + trafficTopups;
- trafficString += sprintf('Traffic:\nCap: %d MB\nTopup Available: %d MB\nTotal Topups: %d MB\n'+
+ 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';
@@ -322,7 +322,7 @@ function showAdminUserLogsWindow(id) {
// Prepaid uptime
if (uptimeCap == -1) {
uptimeCap = 'Prepaid';
- uptimeString += sprintf('Uptime:\nCap: %s \nTopup Available: %d Min\nTotal Topups: %d Min\n'+
+ 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';
@@ -334,7 +334,7 @@ function showAdminUserLogsWindow(id) {
// Capped uptime
} else {
var combinedUptimeCap = uptimeCap + uptimeTopups;
- uptimeString += sprintf('Uptime:\nCap: %d Min\nTopup Available: %d Min\nTotal Topups: %d Min\n'+
+ 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';
diff --git a/webgui/js/app/windows/WiSPUserLogs.js b/webgui/js/app/windows/WiSPUserLogs.js
index 5032c02f..80fc4c68 100644
--- a/webgui/js/app/windows/WiSPUserLogs.js
+++ b/webgui/js/app/windows/WiSPUserLogs.js
@@ -300,7 +300,7 @@ function showWiSPUserLogsWindow(id) {
// Prepaid traffic
if (trafficCap == -1) {
trafficCap = 'Prepaid';
- trafficString += sprintf('Traffic:\nCap: %s \nTopup Available: %d MB\nTotal Topups: %d MB\nUsage: %d/%d MB\n',
+ 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
@@ -311,7 +311,7 @@ function showWiSPUserLogsWindow(id) {
// Capped traffic
} else {
var combinedTrafficCap = trafficCap + trafficTopups;
- trafficString += sprintf('Traffic:\nCap: %d MB\nTopup Available: %d MB\nTotal Topups: %d MB\n'+
+ 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';
@@ -322,7 +322,7 @@ function showWiSPUserLogsWindow(id) {
// Prepaid uptime
if (uptimeCap == -1) {
uptimeCap = 'Prepaid';
- uptimeString += sprintf('Uptime:\nCap: %s \nTopup Available: %d Min\nTotal Topups: %d Min\n'+
+ 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';
@@ -334,7 +334,7 @@ function showWiSPUserLogsWindow(id) {
// Capped uptime
} else {
var combinedUptimeCap = uptimeCap + uptimeTopups;
- uptimeString += sprintf('Uptime:\nCap: %d Min\nTopup Available: %d Min\nTotal Topups: %d Min\n'+
+ 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';
--
GitLab