diff --git a/comic/templates/comic/comic_list.html b/comic/templates/comic/comic_list.html index 17a8a1e..93a5eb6 100644 --- a/comic/templates/comic/comic_list.html +++ b/comic/templates/comic/comic_list.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% block title %}CBreader{% endblock %} +{% block title %}{{ title }}{% endblock %} {% block breadcrumb %} {% for crumb in breadcrumbs %} diff --git a/comic/util.py b/comic/util.py index 3c434ce..72ef678 100644 --- a/comic/util.py +++ b/comic/util.py @@ -5,6 +5,12 @@ from collections import OrderedDict import os +def generate_title_from_path(path): + if path == '': + return 'CBWebReader' + return 'CBWebReader - ' + ' - '.join(path.split(os.sep)) + + class Menu: def __init__(self, user, page=''): """ @@ -59,6 +65,7 @@ def generate_breadcrumbs_from_menu(paths): output.append(bc) return output + def get_ordered_dir_list(folder): directories = [] files = [] diff --git a/comic/views.py b/comic/views.py index 98edd9e..0e242f9 100644 --- a/comic/views.py +++ b/comic/views.py @@ -6,7 +6,7 @@ from django.contrib.auth.decorators import login_required, user_passes_test from django.contrib.auth.models import User from comic.models import Setting, ComicBook, ComicStatus -from util import generate_breadcrumbs_from_path, generate_breadcrumbs_from_menu +from util import generate_breadcrumbs_from_path, generate_breadcrumbs_from_menu, generate_title_from_path from forms import SettingsForm, AccountForm, EditUserForm, AddUserForm from util import Menu from os import path @@ -22,11 +22,13 @@ def comic_list(request, comic_path=''): return redirect('/comic/settings/') comic_path = urlsafe_base64_decode(comic_path) + title = generate_title_from_path(comic_path) files = ComicBook.generate_directory(request.user, base_dir, comic_path) context = RequestContext(request, { 'file_list': files, 'breadcrumbs': generate_breadcrumbs_from_path(comic_path), 'menu': Menu(request.user, 'Browse'), + 'title': title, }) return render(request, 'comic/comic_list.html', context)