From fa96194749e4deadc27a1e96bc26f0fb96846d88 Mon Sep 17 00:00:00 2001 From: Remy Date: Thu, 14 Jul 2011 22:34:56 -0700 Subject: [PATCH] Changed the reload mechanism, moved the shutdown header to templates.py --- headphones/templates.py | 12 ++++++++++++ headphones/webserve.py | 15 +++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/headphones/templates.py b/headphones/templates.py index fd8409d2..4dabac0d 100644 --- a/headphones/templates.py +++ b/headphones/templates.py @@ -8,6 +8,18 @@ _header = '''
''' + +_shutdownheader = ''' + + + Headphones + + + + + + +
''' _logobar = ''' diff --git a/headphones/webserve.py b/headphones/webserve.py index 9702baae..7b756eb9 100644 --- a/headphones/webserve.py +++ b/headphones/webserve.py @@ -628,23 +628,26 @@ class WebInterface(object): def shutdown(self): logger.info(u"Headphones is shutting down...") threading.Timer(2, headphones.shutdown).start() - return ''' - Shutting Down Headphones....''' + page = [templates._shutdownheader % 10] + page.append('Shutting down Headphones...') + return page shutdown.exposed = True def restart(self): logger.info(u"Headphones is restarting...") threading.Timer(2, headphones.shutdown, [True]).start() - return ''' - Restarting Headphones....''' + page = [templates._shutdownheader % 20] + page.append('Restarting Headphones...') + return page restart.exposed = True def update(self): logger.info('Headphones is updating...') threading.Timer(2, headphones.shutdown, [True, True]).start() - return ''' - Updating Headphones....''' + page = [templates._shutdownheader % 60] + page.append('Updating Headphones...') + return page update.exposed = True \ No newline at end of file