Merge pull request #3694 from howard0su/issue3682

luci-base: Show used memory instead of Free

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/20_memory.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/20_memory.js
index b2ebdec710868ed43c6e904b72a02e0a98d47e61..4219a8797d1160506893d32e8717b7f386e4d83b 100644 (file)
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/20_memory.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/20_memory.js
@@ -32,7 +32,7 @@ return L.Class.extend({
 
                var fields = [
                        _('Total Available'), (mem.available) ? mem.available : (mem.total && mem.free && mem.buffered) ? mem.free + mem.buffered : null, mem.total,
-                       _('Free'),            (mem.total && mem.free) ? mem.free : null, mem.total,
+                       _('Used'),            (mem.total && mem.free) ? (mem.total - mem.free) : null, mem.total,
                        _('Buffered'),        (mem.total && mem.buffered) ? mem.buffered : null, mem.total
                ];