diff --git a/CHANGELOG.md b/CHANGELOG.md index e27704e14..7d060a02a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -224,7 +224,7 @@ Update from Maintenance > Update — Queue Update hands the job to cron, which u - Capitals: page and window titles, menu items and buttons are in Title Case - New Ticket, Mark Reviewed, Back Up Now, Turn Off Portal Access - and field labels, section headings, tabs and help are in sentence case - Postal code, Tax rate, Physical location - in the agent pages, Admin and the client portal alike. The settings pages in the menu are now Company Details, Invoices and Billing, Purchase Orders, Client Portal and Single Sign-on. - Lists: the first click on a column you aren't sorting by sorts names A-Z and dates, money and counts newest or largest first, and a second click flips it. It used to go the opposite way to the column you were on, so the first click could go either way. - Badges and blanks: every badge is a rounded pill, the menu counts included, and an empty value shows as a grey dash everywhere. A request that can't be done - credit over the balance, say - shows in red like every other error, and the client portal's search boxes read Search ... like the agent pages'. -- Lengths of time: booking lengths, the dispatch board and how long a cron job ran are written 1h 30m like time logged everywhere else - they read 1 hour 30 min and 2 min 5 s - and hours as a number are 12.5 h, project hours included. +- Sizes and lengths of time: a file or backup size reads 512 B or 1.5 MB everywhere - some pages said 1.53 MB, a portal attachment never less than 1 KB, and setup bytes. Booking lengths, the dispatch board and how long a cron job ran are written 1h 30m like time logged everywhere else - they read 1 hour 30 min and 2 min 5 s - and hours as a number are 12.5 h, project hours included. ### Bug Fixes @@ -455,6 +455,7 @@ Update from Maintenance > Update — Queue Update hands the job to cron, which u - Bootstrap 5 classes: `fw-bold` in place of the `text-bold` shim, `text-body-secondary` in place of `text-muted`, and `fas` as the icon prefix in place of Font Awesome 5's `fa` alias, everywhere. The user menu's buttons are `btn-light border`. `css/itflow_custom.css` loses the shims for `text-bold`, `text-xs`, `btn-default`, `btn-flat`, `bg-olive`, `bg-pink` and `bg-purple` and the unused `.small-box` styles. The `data-bs-toggle="tooltip"` on the menu counts did nothing - their `title` still shows - and is gone. - Messages: `flashAlert()` and `itflowToast()` are called with 'success', 'info', 'warning' and 'error' only - the 'danger' and 'alert' callers now say 'error' (both are still understood), and the unused 'errpr' alias is gone. Column headings are sentence case like field labels. - Menus: 30 menu items carried `text-dark`, which no other menu item has; it's gone. +- Sizes: `formatBytes()` (one decimal, whole bytes, a unit at 1024) is the one formatter - `backupFormatBytes()` calls it, and the portal and setup scripts write sizes the same way. ## [26.11.8] diff --git a/functions/backup.php b/functions/backup.php index 6cac4afd0..fea6f21dc 100644 --- a/functions/backup.php +++ b/functions/backup.php @@ -1490,12 +1490,5 @@ function backupParseIniBytes($value): int function backupFormatBytes($bytes): string { - $bytes = floatval($bytes); - $units = ['B', 'KB', 'MB', 'GB', 'TB']; - $i = 0; - while ($bytes >= 1024 && $i < count($units) - 1) { - $bytes /= 1024; - $i++; - } - return round($bytes, $i === 0 ? 0 : 1) . ' ' . $units[$i]; + return formatBytes($bytes); } diff --git a/functions/format.php b/functions/format.php index cb2bf00dd..b767f6e14 100644 --- a/functions/format.php +++ b/functions/format.php @@ -524,16 +524,17 @@ function validateRecurringFrequency($frequency) { } /* - * Formats bytes into human readable file sizes + * A size for people - "512 B", "1.5 MB" - the one way sizes are written. */ -function formatBytes($bytes, $precision = 2) { - $units = array('B', 'KB', 'MB', 'GB', 'TB'); +function formatBytes($bytes, $precision = 1) { + $bytes = floatval($bytes); + $units = ['B', 'KB', 'MB', 'GB', 'TB']; - for ($i = 0; $bytes > 1024 && $i < count($units) - 1; $i++) { + for ($i = 0; $bytes >= 1024 && $i < count($units) - 1; $i++) { $bytes /= 1024; } - return round($bytes, $precision) . ' ' . $units[$i]; + return round($bytes, $i === 0 ? 0 : $precision) . ' ' . $units[$i]; } diff --git a/js/portal.js b/js/portal.js index 0739a1cbd..171f96297 100644 --- a/js/portal.js +++ b/js/portal.js @@ -111,11 +111,15 @@ } // ---------- Attachments ---------- + // As formatBytes() in functions/format.php writes them - "512 B", "1.5 MB" function formatSize(bytes) { - if (bytes >= 1048576) { - return (bytes / 1048576).toFixed(1) + ' MB'; + var units = ['B', 'KB', 'MB', 'GB']; + var i = 0; + while (bytes >= 1024 && i < units.length - 1) { + bytes /= 1024; + i++; } - return Math.max(1, Math.round(bytes / 1024)) + ' KB'; + return (i === 0 ? bytes : Math.round(bytes * 10) / 10) + ' ' + units[i]; } function listFiles(zone) { diff --git a/js/setup.js b/js/setup.js index d0888ad3e..1620c92c8 100644 --- a/js/setup.js +++ b/js/setup.js @@ -201,13 +201,14 @@ } function formatBytes(bytes) { - var units = ['bytes', 'KB', 'MB', 'GB']; + // As formatBytes() in functions/format.php writes them - "512 B", "1.5 MB" + var units = ['B', 'KB', 'MB', 'GB']; var i = 0; while (bytes >= 1024 && i < units.length - 1) { bytes /= 1024; i++; } - return (i === 0 ? bytes : bytes.toFixed(bytes < 10 ? 1 : 0)) + ' ' + units[i]; + return (i === 0 ? bytes : Math.round(bytes * 10) / 10) + ' ' + units[i]; } /*