added title to comic list.

This commit is contained in:
2015-07-24 11:29:43 +01:00
parent 6baede6201
commit 6102459dc0
3 changed files with 11 additions and 2 deletions

View File

@@ -1,5 +1,5 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}CBreader{% endblock %} {% block title %}{{ title }}{% endblock %}
{% block breadcrumb %} {% block breadcrumb %}
{% for crumb in breadcrumbs %} {% for crumb in breadcrumbs %}

View File

@@ -5,6 +5,12 @@ from collections import OrderedDict
import os import os
def generate_title_from_path(path):
if path == '':
return 'CBWebReader'
return 'CBWebReader - ' + ' - '.join(path.split(os.sep))
class Menu: class Menu:
def __init__(self, user, page=''): def __init__(self, user, page=''):
""" """
@@ -59,6 +65,7 @@ def generate_breadcrumbs_from_menu(paths):
output.append(bc) output.append(bc)
return output return output
def get_ordered_dir_list(folder): def get_ordered_dir_list(folder):
directories = [] directories = []
files = [] files = []

View File

@@ -6,7 +6,7 @@ from django.contrib.auth.decorators import login_required, user_passes_test
from django.contrib.auth.models import User from django.contrib.auth.models import User
from comic.models import Setting, ComicBook, ComicStatus 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 forms import SettingsForm, AccountForm, EditUserForm, AddUserForm
from util import Menu from util import Menu
from os import path from os import path
@@ -22,11 +22,13 @@ def comic_list(request, comic_path=''):
return redirect('/comic/settings/') return redirect('/comic/settings/')
comic_path = urlsafe_base64_decode(comic_path) comic_path = urlsafe_base64_decode(comic_path)
title = generate_title_from_path(comic_path)
files = ComicBook.generate_directory(request.user, base_dir, comic_path) files = ComicBook.generate_directory(request.user, base_dir, comic_path)
context = RequestContext(request, { context = RequestContext(request, {
'file_list': files, 'file_list': files,
'breadcrumbs': generate_breadcrumbs_from_path(comic_path), 'breadcrumbs': generate_breadcrumbs_from_path(comic_path),
'menu': Menu(request.user, 'Browse'), 'menu': Menu(request.user, 'Browse'),
'title': title,
}) })
return render(request, 'comic/comic_list.html', context) return render(request, 'comic/comic_list.html', context)