From: freestorm77 Date: Sun, 2 Jan 2011 03:42:14 +0000 (-0800) Subject: status_web_pages_review.darcs.patch X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/uri/reedownlee?a=commitdiff_plain;h=4027a136f374de8de0ecd1f0462931c2e6049336;p=tahoe-lafs%2Ftahoe-lafs.git status_web_pages_review.darcs.patch I make some changes on status web pages status.xhtml: - Delete unused webform_css link - Align tables on the left tahoe-css: - Do some minor changes on code synthax - changes table.status-download-events style to look like other tables status.py: - Align table on the left - Changes table header - Add heading tags - Modify google api graph: add image border, calculate height to feet data signed-off-by: zooko@zooko.com fixes #1219 --- diff --git a/src/allmydata/web/status.py b/src/allmydata/web/status.py index 9f96f1da..7f1937f2 100644 --- a/src/allmydata/web/status.py +++ b/src/allmydata/web/status.py @@ -383,11 +383,11 @@ class DownloadStatusPage(DownloadResultsRendererMixin, rend.Page): if not self.download_status.storage_index: return srt = self.short_relative_time - l = T.ul() - - t = T.table(class_="status-download-events") - t[T.tr[T.td["serverid"], T.td["sent"], T.td["received"], - T.td["shnums"], T.td["RTT"]]] + l = T.div() + + t = T.table(align="left", class_="status-download-events") + t[T.tr[T.th["serverid"], T.th["sent"], T.th["received"], + T.th["shnums"], T.th["RTT"]]] dyhb_events = [] for serverid,requests in self.download_status.dyhb_requests.iteritems(): for req in requests: @@ -400,18 +400,20 @@ class DownloadStatusPage(DownloadResultsRendererMixin, rend.Page): if received is not None: rtt = received - sent if not shnums: - shnums = [] + shnums = ["-"] t[T.tr(style="background: %s" % self.color(serverid))[ [T.td[serverid_s], T.td[srt(sent)], T.td[srt(received)], T.td[",".join([str(shnum) for shnum in shnums])], T.td[self.render_time(None, rtt)], ]]] - l["DYHB Requests:", t] - - t = T.table(class_="status-download-events") - t[T.tr[T.td["range"], T.td["start"], T.td["finish"], T.td["got"], - T.td["time"], T.td["decrypttime"], T.td["pausedtime"], - T.td["speed"]]] + + l[T.h2["DYHB Requests:"], t] + l[T.br(clear="all")] + + t = T.table(align="left",class_="status-download-events") + t[T.tr[T.th["range"], T.th["start"], T.th["finish"], T.th["got"], + T.th["time"], T.th["decrypttime"], T.th["pausedtime"], + T.th["speed"]]] for r_ev in self.download_status.read_events: (start, length, requesttime, finishtime, bytes, decrypt, paused) = r_ev if finishtime is not None: @@ -427,17 +429,25 @@ class DownloadStatusPage(DownloadResultsRendererMixin, rend.Page): T.td[bytes], T.td[rtt], T.td[decrypt], T.td[paused], T.td[speed], ]] - l["Read Events:", t] - - t = T.table(class_="status-download-events") - t[T.tr[T.td["type"], T.td["segnum"], T.td["when"], T.td["range"], - T.td["decodetime"], T.td["segtime"], T.td["speed"]]] + + l[T.h2["Read Events:"], t] + l[T.br(clear="all")] + + t = T.table(align="left",class_="status-download-events") + t[T.tr[T.th["type"], T.th["segnum"], T.th["when"], T.th["range"], + T.th["decodetime"], T.th["segtime"], T.th["speed"]]] reqtime = (None, None) for s_ev in self.download_status.segment_events: (etype, segnum, when, segstart, seglen, decodetime) = s_ev if etype == "request": - t[T.tr[T.td["request"], T.td["seg%d" % segnum], - T.td[srt(when)]]] + t[T.tr[T.td["request"], + T.td["seg%d" % segnum], + T.td[srt(when)], + T.td["-"], + T.td["-"], + T.td["-"], + T.td["-"]]] + reqtime = (segnum, when) elif etype == "delivery": if reqtime[0] == segnum: @@ -453,11 +463,13 @@ class DownloadStatusPage(DownloadResultsRendererMixin, rend.Page): T.td[segtime], T.td[speed]]] elif etype == "error": t[T.tr[T.td["error"], T.td["seg%d" % segnum]]] - l["Segment Events:", t] + + l[T.h2["Segment Events:"], t] + l[T.br(clear="all")] - t = T.table(border="1") - t[T.tr[T.td["serverid"], T.td["shnum"], T.td["range"], - T.td["txtime"], T.td["rxtime"], T.td["received"], T.td["RTT"]]] + t = T.table(align="left",class_="status-download-events") + t[T.tr[T.th["serverid"], T.th["shnum"], T.th["range"], + T.th["txtime"], T.th["rxtime"], T.th["received"], T.th["RTT"]]] reqtime = (None, None) request_events = [] for serverid,requests in self.download_status.requests.iteritems(): @@ -476,7 +488,9 @@ class DownloadStatusPage(DownloadResultsRendererMixin, rend.Page): T.td[srt(sent)], T.td[srt(received)], T.td[receivedlen], T.td[self.render_time(None, rtt)], ]] - l["Requests:", t] + + l[T.h2["Requests:"], t] + l[T.br(clear="all")] return l @@ -822,11 +836,14 @@ class MapupdateStatusPage(rend.Page, RateAndTimeMixin): total = self.update_status.timings.get("total") per_server = self.update_status.timings.get("per_server") base = "http://chart.apis.google.com/chart?" - pieces = ["cht=bhs", "chs=400x300"] + pieces = ["cht=bhs"] pieces.append("chco=ffffff,4d89f9,c6d9fd") # colors data0 = [] data1 = [] data2 = [] + nb_nodes = 0 + graph_botom_margin= 21 + graph_top_margin = 5 peerids_s = [] top_abs = started # we sort the queries by the time at which we sent the first request @@ -836,6 +853,7 @@ class MapupdateStatusPage(rend.Page, RateAndTimeMixin): peerids = [t[1] for t in sorttable] for peerid in peerids: + nb_nodes += 1 times = per_server[peerid] peerid_s = idlib.shortnodeid_b2a(peerid) peerids_s.append(peerid_s) @@ -855,10 +873,12 @@ class MapupdateStatusPage(rend.Page, RateAndTimeMixin): if finished: top_abs = max(top_abs, finished) top_rel = top_abs - started + chs ="chs=400x%d" % ( (nb_nodes*28) + graph_top_margin + graph_botom_margin ) chd = "chd=t:" + "|".join([",".join(data0), ",".join(data1), ",".join(data2)]) pieces.append(chd) + pieces.append(chs) chds = "chds=0,%0.3f" % top_rel pieces.append(chds) pieces.append("chxt=x,y") @@ -874,7 +894,7 @@ class MapupdateStatusPage(rend.Page, RateAndTimeMixin): pieces.append("chm=r,FF0000,0,%0.3f,%0.3f" % (finished_f, finished_f+0.01)) url = base + "&".join(pieces) - return T.img(src=url, align="right", float="right") + return T.img(src=url,border="1",align="right", float="right") class Status(rend.Page): diff --git a/src/allmydata/web/status.xhtml b/src/allmydata/web/status.xhtml index f4b0f79a..d891e0d8 100644 --- a/src/allmydata/web/status.xhtml +++ b/src/allmydata/web/status.xhtml @@ -1,7 +1,6 @@ Tahoe-LAFS - Current Uploads/Downloads - @@ -11,7 +10,7 @@

Active Operations:

- +
@@ -30,10 +29,10 @@
Type Storage Index
No active operations!
- +

Recent Operations:

- +
@@ -54,6 +53,7 @@
Started Type
No recent operations!
+
Return to the Welcome Page
diff --git a/src/allmydata/web/tahoe.css b/src/allmydata/web/tahoe.css index 0ed83fc6..e834ecc7 100644 --- a/src/allmydata/web/tahoe.css +++ b/src/allmydata/web/tahoe.css @@ -24,10 +24,22 @@ th { color: white; background-color: #58a1c3; } -td { padding: .3em .3em; } -th { padding: .3em .3em; } -.table-headings-top th { text-align: center; } -.table-headings-left th { text-align: right; vertical-align: top; } +td { + padding: .3em .3em; +} + +th { + padding: .3em .3em; +} + +.table-headings-top th { + text-align: center; + +} +.table-headings-left th { + text-align: right; + vertical-align: top; +} legend { font-weight: bold; } @@ -140,7 +152,10 @@ table.tahoe-directory { /* recent upload/download status pages */ table.status-download-events { - border: 1px solid #aaa; + #border: 1px solid #aaa; + margin: 1em auto; + border: .2em solid #3289b4; + border-spacing: 1px; } table.status-download-events td { border: 1px solid #a00;