From 9b4bfcf422176f9b8dc31eb677767a774a00d52c Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 23 Jul 2015 15:42:18 +0200 Subject: [PATCH] add password form for EPUB download access --- telemeta/forms/media.py | 7 ++- telemeta/static/telemeta/css/telemeta.css | 5 +- .../static/telemeta/css/telemeta_epub.css | 6 +- telemeta/templates/telemeta/base.html | 4 ++ .../templates/telemeta/inc/epub_list.html | 36 +++++++++++ .../telemeta/resource_epub_list.html | 31 ++++++++++ .../telemeta/resource_epub_login.html | 59 +++++++++++++++++++ .../telemeta/resource_epub_password.html | 47 +++++++++++++++ telemeta/urls.py | 4 +- telemeta/views/collection.py | 25 +++++++- telemeta/views/epub.py | 43 +------------- telemeta/views/resource.py | 43 ++++++++++++++ 12 files changed, 262 insertions(+), 48 deletions(-) create mode 100644 telemeta/templates/telemeta/inc/epub_list.html create mode 100644 telemeta/templates/telemeta/resource_epub_list.html create mode 100644 telemeta/templates/telemeta/resource_epub_login.html create mode 100644 telemeta/templates/telemeta/resource_epub_password.html diff --git a/telemeta/forms/media.py b/telemeta/forms/media.py index d41aa13f..f9c3e11b 100644 --- a/telemeta/forms/media.py +++ b/telemeta/forms/media.py @@ -39,7 +39,7 @@ from telemeta.models import * from extra_views import CreateWithInlinesView, UpdateWithInlinesView, InlineFormSet from extra_views.generic import GenericInlineFormSet from django.forms.widgets import HiddenInput - +from django.utils.translation import ugettext_lazy as _ class MediaFondsForm(ModelForm): @@ -163,3 +163,8 @@ class ItemIdentifierInline(InlineFormSet): model = MediaItemIdentifier max_num = 1 + +class EpubPasswordForm(forms.Form): + + password = forms.CharField(label=_('password')) + diff --git a/telemeta/static/telemeta/css/telemeta.css b/telemeta/static/telemeta/css/telemeta.css index 7af24b54..9eabe05d 100644 --- a/telemeta/static/telemeta/css/telemeta.css +++ b/telemeta/static/telemeta/css/telemeta.css @@ -262,11 +262,12 @@ ul.continents ul li a { line-height: 1.8em; } /* Collection */ #content .intro { font-size: 1em; - font-weight: bold; + /*font-weight: bold;*/ color: #444; margin: 5px 0; - font-size: 0.8em; + width: 400px; } + #content .intro span { padding: 3px; diff --git a/telemeta/static/telemeta/css/telemeta_epub.css b/telemeta/static/telemeta/css/telemeta_epub.css index 6cafd50c..a2367c82 100644 --- a/telemeta/static/telemeta/css/telemeta_epub.css +++ b/telemeta/static/telemeta/css/telemeta_epub.css @@ -70,4 +70,8 @@ img { padding-top : 18%; page-break-before: always; text-align: center; -} \ No newline at end of file +} + +.error { + color: red; +} diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html index 51dcb80c..8450df61 100644 --- a/telemeta/templates/telemeta/base.html +++ b/telemeta/templates/telemeta/base.html @@ -91,6 +91,7 @@ {% endif %} +{% block search %} +{% endblock search %}