--- a/pvl/login/server.py Mon Jan 13 19:42:15 2014 +0200
+++ b/pvl/login/server.py Mon Jan 13 19:42:27 2014 +0200
@@ -147,6 +147,10 @@
}
"""
+ JS = Handler.JS + (
+ '/static/pubtkt-expire.js',
+ )
+
def process (self) :
self.process_cookie()
@@ -179,9 +183,9 @@
lifetime = self.app.login_valid
-
valid = pubtkt.valid()
grace = pubtkt.grace()
+ remaining = pubtkt.remaining()
if valid :
progress = float(valid.seconds) / float(lifetime.seconds)
@@ -190,31 +194,35 @@
if grace :
title = "Remaining renewal period"
- valid = "{grace} (Renew)".format(grace=self.render_valid(grace))
+ label = "{grace} (Renew)".format(grace=self.render_valid(grace))
status = 'warning'
elif valid :
title = "Remaining validity period"
- valid = "{valid}".format(valid=self.render_valid(valid))
+ label = "{valid}".format(valid=self.render_valid(valid))
status = 'success'
else :
title = "Expired"
- valid = "Expired"
+ label = "Expired"
status = 'danger'
if progress :
return html.div(class_='panel-body', title=title)(
html.span(class_='glyphicon glyphicon-time'),
- html.div(class_='progress')(
+ html.div(class_='progress pubtkt-progress',
+ data_start=valid.seconds,
+ data_refresh=remaining.seconds if remaining else None,
+ data_end=lifetime.seconds,
+ )(
html.div(class_='progress-bar progress-bar-{status}'.format(status=status),
role='progressbar',
style='width: {pp:.0f}%'.format(pp=progress*100),
)(
- html.span(valid)
+ html.span(class_='pubtkt-progress-label')(label)
)
)
)
else :
- return None # html.p(valid)
+ return None # html.p(label)
def render_pubtkt_fields (self, pubtkt) :
"""