diff --git a/comic/templates/base.html b/comic/templates/base.html index 4470eb5..81625f7 100644 --- a/comic/templates/base.html +++ b/comic/templates/base.html @@ -36,15 +36,13 @@ - CBReader + CBWebReader
diff --git a/comic/util.py b/comic/util.py index eb0560b..13041bf 100644 --- a/comic/util.py +++ b/comic/util.py @@ -1,9 +1,18 @@ from django.utils.http import urlsafe_base64_encode from os import path +from collections import OrderedDict import os +class Menu: + def __init__(self, page=''): + self.menu_items = OrderedDict() + self.menu_items['Browse'] = '/comic/' + self.menu_items['Settings'] = '/comic/settings/' + self.menu_items['Logout'] = '/logout/' + self.current_page = page + class Breadcrumb: def __init__(self): self.name = 'Home' @@ -15,7 +24,6 @@ class Breadcrumb: def __unicode__(self): return self.name - def generate_breadcrumbs(comic_path): output = [Breadcrumb()] prefix = '/comic/' @@ -32,7 +40,6 @@ def generate_breadcrumbs(comic_path): output.append(bc) return output - def get_ordered_dir_list(folder): directories = [] files = [] diff --git a/comic/views.py b/comic/views.py index 7ed3d38..77a98e4 100644 --- a/comic/views.py +++ b/comic/views.py @@ -7,7 +7,7 @@ from django.contrib.auth.decorators import login_required from comic.models import Setting, ComicBook, ComicStatus from util import generate_breadcrumbs from forms import SettingsForm - +from util import Menu from os import path @login_required @@ -25,6 +25,7 @@ def comic_list(request, comic_path=''): context = RequestContext(request, { 'file_list': files, 'breadcrumbs': breadcrumbs, + 'menu': Menu('Browse'), }) return render(request, 'comic/comic_list.html', context) @@ -58,6 +59,7 @@ def settings_page(request): context = RequestContext(request, { 'error_message': error_message, 'form': form, + 'menu': Menu('Settings') }) return render(request, 'comic/settings_page.html', context) @@ -82,6 +84,7 @@ def read_comic(request, comic_path, page): 'orig_file_name': book.page_name(page), 'nav': book.nav(comic_path, page), 'breadcrumbs': breadcrumbs, + 'menu': Menu() }) return render(request, 'comic/read_comic.html', context)