fix password reset redirection, fix epub cover, fix release link

diff --git a/doc/content/TM-1.5.rst b/doc/content/TM-1.5.rst
index c29de145a8d49f1433178228217b1cb15b13e485..72b780a99fcf81bb540ba77bba32dc3b442757e4 100644 (file)
--- a/doc/content/TM-1.5.rst
+++ b/doc/content/TM-1.5.rst
@@ -17,4 +17,4 @@ Changelog:
 
 Download
 
-* http://pypi.python.org/packages/source/T/Telemeta/Telemeta-1.4.6.tar.gz
+* http://pypi.python.org/packages/source/T/Telemeta/Telemeta-1.5.1.tar.gz

diff --git a/telemeta/urls.py b/telemeta/urls.py
index 7ebc6a2dad634636ef40a1fc82fd50ccef36e8ba..e26ae6103967c18fd8f0bfa38bf465c2abbbd44c 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -216,7 +216,7 @@ urlpatterns = patterns('',
     url(r'^accounts/password_change_done/$', 'django.contrib.auth.views.password_change_done', {'template_name': 'telemeta/registration/password_change_done.html'}, name="password_change_done"),
     url(r'^accounts/password_reset/$', 'django.contrib.auth.views.password_reset', {'template_name': 'telemeta/registration/password_reset_form.html', 'email_template_name': 'registration/password_reset_email.html'}, name="password_reset"),
     url(r'^accounts/password_reset_done/$', 'django.contrib.auth.views.password_reset_done', {'template_name': 'telemeta/registration/password_reset_done.html'}, name="password_reset_done"),
-    url(r'^accounts/password_reset_confirm/(?P<uidb36>[A-Za-z0-9._-]+)/(?P<token>[A-Za-z0-9._-]+)/$', 'django.contrib.auth.views.password_reset_confirm', {'template_name': 'telemeta/registration/password_reset_confirm.html'}, name="password_reset_confirm"),
+    url(r'^accounts/password_reset_confirm/(?P<uidb64>[A-Za-z0-9._-]+)/(?P<token>[A-Za-z0-9._-]+)/$', 'django.contrib.auth.views.password_reset_confirm', {'template_name': 'telemeta/registration/password_reset_confirm.html'}, name="password_reset_confirm"),
     url(r'^accounts/password_reset_complete/$', 'django.contrib.auth.views.password_reset_complete', {'template_name': 'telemeta/registration/password_reset_complete.html'}, name="password_reset_complete"),
 
     # JSON RPC

diff --git a/telemeta/views/core.py b/telemeta/views/core.py
index b336964bb88bd18737d2d06b30cc574184b6fb9c..9544be1ff75f2d888ac8b48573caadc666fee939 100644 (file)
--- a/telemeta/views/core.py
+++ b/telemeta/views/core.py
@@ -341,7 +341,7 @@ class BaseEpubMixin(TelemetaBaseMixin):
         # add cover image
         for media in self.corpus.related.all():
             if 'cover' in media.title or 'Cover' in media.title:
-                self.book.set_cover("cover.jpg", open(media.file.path, 'r').read())
+                self.book.set_cover("cover.png", open(media.file.path, 'r').read())
                 break
 
         if collection: