Merge pull request #6897 from stangri/master-luci-app-opkg

luci-app-opkg: show disk space consistent with overview
This commit is contained in:
Stan Grishin 2024-02-12 10:42:15 -07:00 committed by GitHub
commit eb40b0bd57
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1088,11 +1088,11 @@ function updateLists(data)
return (data ? Promise.resolve(data) : downloadLists()).then(function(data) {
var pg = document.querySelector('.cbi-progressbar'),
mount = L.toArray(data[0].filter(function(m) { return m.mount == '/' || m.mount == '/overlay' }))
.sort(function(a, b) { return a.mount > b.mount })[0] || { size: 0, free: 0 };
mount = L.toArray(data[0].filter(function(m) { return m.mount == '/' || m.mount == '/overlay' }))
.sort(function(a, b) { return a.mount > b.mount })[0] || { size: 0, free: 0 };
pg.firstElementChild.style.width = Math.floor(mount.size ? ((100 / mount.size) * mount.free) : 100) + '%';
pg.setAttribute('title', '%s (%1024mB)'.format(pg.firstElementChild.style.width, mount.free));
pg.firstElementChild.style.width = Math.floor(mount.size ? (100 / mount.size) * (mount.size - mount.free) : 100) + '%';
pg.setAttribute('title', _('%s used (%1024mB used of %1024mB, %1024mB free)').format(pg.firstElementChild.style.width, mount.size - mount.free, mount.size, mount.free));
parseList(data[1], packages.available);
parseList(data[2], packages.installed);
@ -1131,7 +1131,7 @@ return view.extend({
E('div', { 'class': 'controls' }, [
E('div', {}, [
E('label', {}, _('Free space') + ':'),
E('label', {}, _('Disk space') + ':'),
E('div', { 'class': 'cbi-progressbar', 'title': _('unknown') }, E('div', {}, [ '\u00a0' ]))
]),