update epub slyle and format, add new ebooklib dependency

diff --git a/setup.py b/setup.py
index 92390c0e29d321ed87bd22185bfe1bfdde905452..4dfdbefad540729c0d7fa35a2cf15465847451f8 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -72,6 +72,7 @@ setup(
         'pyyaml',
         'python-ebml',
         'zipstream',
+        'ebooklib',
     ],
   tests_require=['pytest-django', 'pytest-cov', 'factory-boy'],
   # Provide a test command through django-setuptest

diff --git a/telemeta/static/telemeta/css/telemeta_epub.css b/telemeta/static/telemeta/css/telemeta_epub.css
index c01fa2a0620db4997a8e8863d0df56ab3c87a67b..efaab25e23b4ee16c89aa4262259a68e652296de 100644 (file)
--- a/telemeta/static/telemeta/css/telemeta_epub.css
+++ b/telemeta/static/telemeta/css/telemeta_epub.css
@@ -15,6 +15,7 @@ h3 {
      text-align: left;
      font-size: 0.8em;
      margin-top: 0px;
+     font-weight: normal;
 }
 
 
@@ -35,3 +36,15 @@ nav[epub|type~='toc'] > ol > li > ol  {
 nav[epub|type~='toc'] > ol > li > ol > li {
         margin-top: 0.3em;
 }
+
+.item {
+    page-break-after: always;
+}
+
+.item-image {
+    float: left;
+}
+
+.item-image {
+    float: left;
+}

diff --git a/telemeta/templates/telemeta/collection_epub.html b/telemeta/templates/telemeta/collection_epub.html
index c01b113a4249880ac1cfcef33da521bdf2420a7a..75c86313ee96bc82ce0d77ab4dd27584ecea7966 100644 (file)
--- a/telemeta/templates/telemeta/collection_epub.html
+++ b/telemeta/templates/telemeta/collection_epub.html
@@ -1,24 +1,22 @@
+<link rel="stylesheet" type="text/css" href="style/nav.css" />
 
 {% for item in items %}
-
-<p>
-  <span style="font-size:0.8em;">
+<div class="item">
+  <h3>
   <b>{{ item.old_code }}</b> : {{ item.title }} (p. {{ item.track }})
-  </span>
-  <br>
-    {% for image in item.related.all %}
-      {% if 'image' in image.mime_type %}
-         <div class="item-image">
-          <img src="{{ image.file }}"/>
-         </div>
-      {% endif %}
-     {% endfor %}
+  </h3>
 
-<br>
-<div class="item-audio">
- <audio src="{{ item.file }}" controls="controls"></audio>
-</div>
+  <div class="item-audio">
+   <audio src="{{ item.file }}" controls="controls"></audio>
+  </div>
 
-</p>
+  {% for image in item.related.all %}
+    {% if 'image' in image.mime_type %}
+       <div class="item-image">
+        <img src="{{ image.file }}"/>
+       </div>
+    {% endif %}
+   {% endfor %}
 
+</div>
 {% endfor %}

diff --git a/telemeta/views/resource.py b/telemeta/views/resource.py
index d3251f162f36181c4cfd0e4fcc4d56962c77f99b..a4a4d7eeb0920508aee1d9202e72b2279885c2e2 100644 (file)
--- a/telemeta/views/resource.py
+++ b/telemeta/views/resource.py
@@ -384,12 +384,11 @@ class CorpusEpubView(View):
         book.set_language('fr')
         book.add_author(corpus.descriptions)
 
-
         # add cover image
-        # for media in corpus.related.all():
-        #     if 'cover' in media.title or 'Cover' in media.title:
-        #         book.set_cover("cover.jpg", open(media.file.path, 'r').read())
-        #         break
+        for media in corpus.related.all():
+            if 'cover' in media.title or 'Cover' in media.title:
+                book.set_cover("cover.jpg", open(media.file.path, 'r').read())
+                break
 
         chapters = []
         for collection in corpus.children.all():
@@ -426,11 +425,10 @@ class CorpusEpubView(View):
 
         book.toc = (( chapters ))
 
-            # add navigation files
+        # add navigation files
         book.add_item(epub.EpubNcx())
         book.add_item(epub.EpubNav())
 
-
         # add css style
         style = open(css, 'r')
         nav_css = epub.EpubItem(uid="style_nav", file_name="style/nav.css", media_type="text/css", content=style.read())