ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-07 10:56:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

web: improve layout of storage status with a table

Browse Source
This commit is contained in:
Brian Warner 2009-02-26 19:58:38 -07:00
parent 112dc35563
commit 8251572e01
3 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/allmydata/test/test_storage.py
View File

@ -1530,7 +1530,9 @@ class WebStatus(unittest.TestCase, pollmixin.PollMixin):
def test_util(self):
w = StorageStatus(None)
self.failUnlessEqual(w.render_space(None, None), "?")
self.failUnlessEqual(w.render_space(None, 10e6), "10.00 MB (10000000)")
self.failUnlessEqual(w.render_space(None, 10e6), "10000000")
self.failUnlessEqual(w.render_abbrev_space(None, None), "?")
self.failUnlessEqual(w.render_abbrev_space(None, 10e6), "10.00 MB")
self.failUnlessEqual(remove_prefix("foo.bar", "foo."), "bar")
self.failUnlessEqual(remove_prefix("foo.bar", "baz."), None)

7
src/allmydata/web/storage.py
View File

@ -25,10 +25,15 @@ class StorageStatus(rend.Page):
def render_bool(self, ctx, data):
return {True: "Yes", False: "No"}[bool(data)]
def render_abbrev_space(self, ctx, size):
if size is None:
return "?"
return abbreviate_space(size)
def render_space(self, ctx, size):
if size is None:
return "?"
return "%s (%d)" % (abbreviate_space(size), size)
return "%d" % size
def data_stats(self, ctx, data):
# FYI: 'data' appears to be self, rather than the StorageServer

42
src/allmydata/web/storage_status.xhtml
View File

@ -12,23 +12,45 @@
<table n:data="stats">
<tr><td>Total disk space:</td>
<td><span n:render="space" n:data="disk_total" /></td></tr>
<td><span n:render="abbrev_space" n:data="disk_total" /></td>
<td>(<span n:render="space" n:data="disk_total" />)</td>
<td />
</tr>
<tr><td>Disk space used:</td>
<td>- <span n:render="space" n:data="disk_used" /></td></tr>
<td>- <span n:render="abbrev_space" n:data="disk_used" /></td>
<td>(<span n:render="space" n:data="disk_used" />)</td>
<td />
</tr>
<tr><td />
<td>======</td></tr>
<td>======</td>
<td />
<td />
</tr>
<tr><td>Disk space free (root):</td>
<td><span n:render="space" n:data="disk_free_for_root"/>
[see 1]</td></tr>
<td><span n:render="abbrev_space" n:data="disk_free_for_root"/></td>
<td>(<span n:render="space" n:data="disk_free_for_root"/>)</td>
<td>[see 1]</td>
</tr>
<tr><td>Disk space free (non-root):</td>
<td><span n:render="space" n:data="disk_free_for_nonroot" />
[see 2]</td></tr>
<td><span n:render="abbrev_space" n:data="disk_free_for_nonroot" /></td>
<td>(<span n:render="space" n:data="disk_free_for_nonroot" />)</td>
<td>[see 2]</td>
</tr>
<tr><td>Reserved space:</td>
<td>- <span n:render="space" n:data="reserved_space" /></td></tr>
<td>- <span n:render="abbrev_space" n:data="reserved_space" /></td>
<td>(<span n:render="space" n:data="reserved_space" />)</td>
<td />
</tr>
<tr><td />
<td>======</td></tr>
<td>======</td>
<td />
<td />
</tr>
<tr><td>Space Available to Tahoe:</td>
<td><span n:render="space" n:data="disk_avail" /></td></tr>
<td><span n:render="abbrev_space" n:data="disk_avail" /></td>
<td>(<span n:render="space" n:data="disk_avail" />)</td>
<td />
</tr>
</table>
<ul n:data="stats">