Changeset 3f9f453 in trunk


Ignore:
Timestamp:
2019-07-24T17:11:41Z (6 years ago)
Author:
GitHub <noreply@…>
Branches:
master
Children:
3d624ec7, 56b46ee, 7f16735, 8e4b052, e10a032
Parents:
d6f0ce9 (diff), a1a8d13 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
meejah <meejah@…> (2019-07-24 17:11:41)
git-committer:
GitHub <noreply@…> (2019-07-24 17:11:41)
Message:

Merge pull request #633 from meejah/ticket3228-remote-old-js

delete ancient jquery, d3 and the thing that depends on them

Files:
1 added
6 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified src/allmydata/web/status.py

    rd6f0ce9 r3f9f453  
    338338        rend.Page.__init__(self, data)
    339339        self.download_status = data
    340 
    341     def child_timeline(self, ctx):
    342         return DownloadStatusTimelinePage(self.download_status)
    343340
    344341    def download_results(self):
     
    648645        return data.get_status()
    649646
    650 class DownloadStatusTimelinePage(rend.Page):
    651     docFactory = getxmlfile("download-status-timeline.xhtml")
    652 
    653     def render_started(self, ctx, data):
    654         started_s = render_time(data.get_started())
    655         return started_s + " (%s)" % data.get_started()
    656 
    657     def render_si(self, ctx, data):
    658         si_s = base32.b2a_or_none(data.get_storage_index())
    659         if si_s is None:
    660             si_s = "(None)"
    661         return si_s
    662 
    663     def render_helper(self, ctx, data):
    664         return {True: "Yes",
    665                 False: "No"}[data.using_helper()]
    666 
    667     def render_total_size(self, ctx, data):
    668         size = data.get_size()
    669         if size is None:
    670             return "(unknown)"
    671         return size
    672 
    673     def render_progress(self, ctx, data):
    674         progress = data.get_progress()
    675         # TODO: make an ascii-art bar
    676         return "%.1f%%" % (100.0 * progress)
    677 
    678     def render_status(self, ctx, data):
    679         return data.get_status()
    680 
    681647class RetrieveStatusPage(rend.Page, RateAndTimeMixin):
    682648    docFactory = getxmlfile("retrieve-status.xhtml")
Note: See TracChangeset for help on using the changeset viewer.