Fixed inclusion of images in EPUB

diff --git a/teleshopping.py b/teleshopping.py
index bd9064f697b9c928b3bda23c2e06f3d616411af7..14122a17f8c40971cb002091c4cd9ae1effcdd5d 100755 (executable)
--- a/teleshopping.py
+++ b/teleshopping.py
@@ -225,6 +225,11 @@ def generate_docs():
        with open(path.join(docs_path, "documentation.html"), "w", encoding="utf-8") as f:
                f.write(render_template("docs.html", data=static_data, info=static_info, book=True))
 
+       floorplan_path = path.join(app.root_path, 'static', 'floorplan.png')
+       cameras_path = path.join(app.root_path, 'static', 'cameras.png')
+       system(f"cp '{floorplan_path}' '{docs_path}'")
+       system(f"cp '{cameras_path}' '{docs_path}'")
+
        system(f"ebook-convert '{path.join(docs_path, 'documentation.html')}' '{path.join(docs_path, 'documentation.mobi')}' --title='XMDV Teleshopping Documentation' --authors='William Greenwood' --comments='Valid for {static_info['shoot']['date']}' --language=en --change-justification=left --cover='{path.join(app.root_path, 'static', 'cover.jpg')}'")
 
        system(f"ebook-convert '{path.join(docs_path, 'documentation.html')}' '{path.join(docs_path, 'documentation.epub')}' --title='XMDV Teleshopping Documentation' --authors='William Greenwood' --comments='Valid for {static_info['shoot']['date']}' --language=en --change-justification=left --cover='{path.join(app.root_path, 'static', 'cover.jpg')}'")

diff --git a/templates/docs.html b/templates/docs.html
index f220d59e99663e7365deab3ffb485681a94d4763..5fb84f393be94068114a94b4a3278c01a41cc784 100644 (file)
--- a/templates/docs.html
+++ b/templates/docs.html
@@ -153,11 +153,19 @@ details {
                        {% endfor %}
                </table>
 
-               <h2>Floor-plan</h2>
-               <img src="/static/floorplan.png" style="width:100%"></img>
+               {% if book %}
+                       <h2>Floor-plan</h2>
+                       <img src="./floorplan.png" style="width:100%"></img>
 
-               <h2>Camera layout</h2>
-               <img src="/static/cameras.png" style="width:100%"></img>
+                       <h2>Camera layout</h2>
+                       <img src="./cameras.png" style="width:100%"></img>
+               {% else %}
+                       <h2>Floor-plan</h2>
+                       <img src="/static/floorplan.png" style="width:100%"></img>
+
+                       <h2>Camera layout</h2>
+                       <img src="/static/cameras.png" style="width:100%"></img>
+               {% endif %}
 
                <h2>Text options</h2>
                <table>