diff -r 31271426f879 -r 004a32370ba5 lib/folders.py --- a/lib/folders.py Sat Dec 27 20:23:39 2008 -0500 +++ b/lib/folders.py Sun Dec 28 12:24:02 2008 -0500 @@ -23,8 +23,8 @@ result = l['count'] - r['count'] return -int(result) -def output(prefs, folder, parents, children, bookmarks, keywords): - tmpl = Template("folders.tmpl", prefs) +def output(prefs, folder, parents, children, bookmarks, keywords, status, status_msg): + tmpl = Template("folders.tmpl", prefs, status, status_msg) tmpl.set('Parents', parents) tmpl.set('folder', folder['id']) tmpl.set('name', folder['name']) @@ -37,7 +37,7 @@ tmpl.set('Keywords', keywords) print tmpl.process() -def do_folders(db, prefs, form = None): +def do_folders(db, prefs, form, status, status_msg): folder = 0 if form: if form.has_key('folder'): @@ -89,5 +89,5 @@ if len(bookmarks) <> 0: bookmarks = db.get_bookmarks(map(lambda bk: bk[0], bookmarks)) bookmarks = map(lambda bk: bk.dict(), bookmarks) - output(prefs, parents.pop(), parents, children, bookmarks, keywords) + output(prefs, parents.pop(), parents, children, bookmarks, keywords, status, status_msg)