Minor sizing fixes.

[wolnelektury.git] / src / catalogue / fields.py

diff --git a/src/catalogue/fields.py b/src/catalogue/fields.py
index 52a6d1b..79fe67e 100644 (file)
--- a/src/catalogue/fields.py
+++ b/src/catalogue/fields.py
@@ -191,7 +191,7 @@ class BuildPdf(BuildEbook):
     def transform(wldoc, fieldfile):
         return wldoc.as_pdf(
             morefloats=settings.LIBRARIAN_PDF_MOREFLOATS, cover=True,
     def transform(wldoc, fieldfile):
         return wldoc.as_pdf(
             morefloats=settings.LIBRARIAN_PDF_MOREFLOATS, cover=True,

-            ilustr_path=gallery_path(wldoc.book_info.url.slug), customizations=['notoc'])
+            base_url=gallery_url(wldoc.book_info.url.slug), customizations=['notoc'])

 
     def build(self, fieldfile):
         BuildEbook.build(self, fieldfile)
 
     def build(self, fieldfile):
         BuildEbook.build(self, fieldfile)


@@ -203,7 +203,7 @@ class BuildPdf(BuildEbook):
 class BuildEpub(BuildEbook):
     @staticmethod
     def transform(wldoc, fieldfile):
 class BuildEpub(BuildEbook):
     @staticmethod
     def transform(wldoc, fieldfile):

-        return wldoc.as_epub(cover=True, ilustr_path=gallery_path(wldoc.book_info.url.slug))
+        return wldoc.as_epub(cover=True, base_url=gallery_url(wldoc.book_info.url.slug))

 
 
 @BuildEbook.register('mobi')
 
 
 @BuildEbook.register('mobi')


@@ -211,7 +211,7 @@ class BuildEpub(BuildEbook):
 class BuildMobi(BuildEbook):
     @staticmethod
     def transform(wldoc, fieldfile):
 class BuildMobi(BuildEbook):
     @staticmethod
     def transform(wldoc, fieldfile):

-        return wldoc.as_mobi(cover=True, ilustr_path=gallery_path(wldoc.book_info.url.slug))
+        return wldoc.as_mobi(cover=True, base_url=gallery_url(wldoc.book_info.url.slug))

 
 
 @BuildEbook.register('html')
 
 
 @BuildEbook.register('html')


@@ -311,10 +311,13 @@ class BuildHtml(BuildEbook):
         from librarian import DCNS
         url_elem = wldoc.edoc.getroot().find('.//' + DCNS('identifier.url'))
         if url_elem is None:
         from librarian import DCNS
         url_elem = wldoc.edoc.getroot().find('.//' + DCNS('identifier.url'))
         if url_elem is None:

-            gallery = ''
+            gal_url = ''
+            gal_path = ''

         else:
         else:

-            gallery = gallery_url(slug=url_elem.text.rsplit('/', 1)[1])
-        return wldoc.as_html(options={'gallery': "'%s'" % gallery})
+            slug = url_elem.text.rstrip('/').rsplit('/', 1)[1]
+            gal_url = gallery_url(slug=slug)
+            gal_path = gallery_path(slug=slug)
+        return wldoc.as_html(gallery_path=gal_path, gallery_url=gal_url, base_url=gal_url)

 
 
 class BuildCover(BuildEbook):
 
 
 class BuildCover(BuildEbook):