From 7e3d47aa5ce63ffcd8550f99e06841ed03fadf2d Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Sun, 16 Oct 2016 03:30:12 -0500 Subject: [PATCH] Fix / improve progress display somewhat --- tailbone/progress.py | 6 +++--- tailbone/templates/progress.mako | 19 +++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/tailbone/progress.py b/tailbone/progress.py index 86c7666d..95a3290f 100644 --- a/tailbone/progress.py +++ b/tailbone/progress.py @@ -2,7 +2,7 @@ ################################################################################ # # Rattail -- Retail Software Framework -# Copyright © 2010-2014 Lance Edgar +# Copyright © 2010-2016 Lance Edgar # # This file is part of Rattail. # @@ -20,12 +20,11 @@ # along with Rattail. If not, see . # ################################################################################ - """ Progress Indicator """ -from __future__ import unicode_literals +from __future__ import unicode_literals, absolute_import from beaker.session import Session @@ -56,6 +55,7 @@ class SessionProgress(object): self.clear() self.session['message'] = message self.session['maximum'] = maximum + self.session['maximum_display'] = '{:,d}'.format(maximum) self.session['value'] = 0 self.session.save() return self diff --git a/tailbone/templates/progress.mako b/tailbone/templates/progress.mako index 2d33e8bc..0594a0e0 100644 --- a/tailbone/templates/progress.mako +++ b/tailbone/templates/progress.mako @@ -1,13 +1,14 @@ ## -*- coding: utf-8 -*- +<%namespace file="tailbone:templates/base.mako" import="core_javascript" /> +<%namespace file="/base.mako" import="jquery_theme" /> Working... - ${h.javascript_link('https://code.jquery.com/jquery-1.11.3.min.js')} - ${h.javascript_link('https://code.jquery.com/ui/1.11.4/jquery-ui.min.js')} - ${h.javascript_link(request.static_url('tailbone:static/js/lib/jquery.ui.menubar.js'))} - ${h.javascript_link(request.static_url('tailbone:static/js/tailbone.js'))} + ${core_javascript()} + ${h.stylesheet_link(request.static_url('tailbone:static/css/normalize.css'))} + ${jquery_theme()} ${h.stylesheet_link(request.static_url('tailbone:static/css/base.css'))} ${h.stylesheet_link(request.static_url('tailbone:static/css/layout.css'))} @@ -69,7 +70,7 @@ location.href = '${cancel_url}'; } else if (data.complete || data.maximum) { $('#message').html(data.message); - $('#total').html('('+data.maximum+' total)'); + $('#total').html('('+data.maximum_display+' total)'); $('#cancel button').show(); if (data.complete) { clearInterval(updater); @@ -96,10 +97,11 @@ updater = setInterval(function() {update_progress()}, 1000); $(function() { + $('#cancel button').click(function() { if (confirm("Do you really wish to cancel this operation?")) { clearInterval(updater); - disable_button(this, "Cancelling"); + $(this).button('disable').button('option', 'label', "Canceling, please wait..."); $.ajax({ url: '${url('progress.cancel', key=key)}', data: { @@ -111,6 +113,7 @@ }); } }); + });