From 91576e3f63e992b6c3aa518495a356135fd9c6cb Mon Sep 17 00:00:00 2001 From: Remy Date: Tue, 16 Aug 2011 15:02:06 -0700 Subject: [PATCH] Fixed some stuff --- data/css/style.css | 4 ++-- data/interfaces/default/managenew.html | 1 + headphones/webserve.py | 7 +++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/data/css/style.css b/data/css/style.css index 24bc2943..a621f1f2 100755 --- a/data/css/style.css +++ b/data/css/style.css @@ -178,9 +178,9 @@ div#albumheader { padding-top: 48px; height: 200px; } div#track_wrapper { margin-left: -50px; padding-top: 20px; font-size: 16px; width: 100%; } table#track_table th#number { text-align: right; min-width: 10px; } -table#track_table th#name { text-align: center; min-width: 320px; } +table#track_table th#name { text-align: center; min-width: 300px; } table#track_table th#duration { width: 175px; text-align: center; min-width: 100px; } -table#track_table th#location { text-align: center; min-width: 200px; } +table#track_table th#location { text-align: center; width: 200px; } table#track_table th#bitrate { text-align: center; min-width: 75px; } table#track_table td#number { vertical-align: middle; text-align: right; } diff --git a/data/interfaces/default/managenew.html b/data/interfaces/default/managenew.html index 779e709e..bea493b2 100644 --- a/data/interfaces/default/managenew.html +++ b/data/interfaces/default/managenew.html @@ -5,6 +5,7 @@ <%def name="body()">

Manage New Artists

+

Scan Music Library

diff --git a/headphones/webserve.py b/headphones/webserve.py index 295ff6b6..61f7f1ed 100644 --- a/headphones/webserve.py +++ b/headphones/webserve.py @@ -236,7 +236,7 @@ class WebInterface(object): raise cherrypy.HTTPRedirect("home") importItunes.exposed = True - def musicScan(self, path): + def musicScan(self, path, redirect=None): headphones.MUSIC_DIR = path headphones.config_write() try: @@ -244,7 +244,10 @@ class WebInterface(object): except Exception, e: logger.error('Unable to complete the scan: %s' % e) time.sleep(10) - raise cherrypy.HTTPRedirect("home") + if redirect: + raise cherrypy.HTTPRedirect(redirect) + else: + raise cherrypy.HTTPRedirect("home") musicScan.exposed = True def forceUpdate(self):