From f50b33c8fbb5c97e61cb2a144d5bdfe71c1c9f85 Mon Sep 17 00:00:00 2001
From: William Daniau <william.daniau@femto-st.fr>
Date: Fri, 11 Oct 2019 22:55:14 +0200
Subject: [PATCH] =?UTF-8?q?Ajout=20d'une=20fonction=20pour=20r=C3=A9soudre?=
 =?UTF-8?q?=20un=20pb=20d'affichage=20dans=20chrome=20lorsque=20le=20logo?=
 =?UTF-8?q?=20est=20absent.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/html/Wize.html                | 15 ++++++++++++---
 templates/html/Wize_Print.html          | 15 ++++++++++++---
 templates/html/Wize_Print_Template.html | 15 ++++++++++++---
 templates/html/Wize_with_index.html     | 15 ++++++++++++---
 templates/html/Wize_with_index_sod.html | 15 ++++++++++++---
 5 files changed, 60 insertions(+), 15 deletions(-)
diff --git a/templates/html/Wize.html b/templates/html/Wize.html
index 62b75e7..e753953 100644
--- a/templates/html/Wize.html
+++ b/templates/html/Wize.html
@@ -96,8 +96,17 @@
     
     <script src="[% resource('common-spec/notice.js') %]"></script> 
 
+    <script>
+    function testLogo() {
+        logo=document.getElementById("logoImgId");
+        logodiv=document.getElementById("logoDivId");
+        if (logo.naturalHeight == 0) {
+            logodiv.setAttribute("style","display:none;");
+        }
+    }
+    </script>
 </head>
-<body>
+<body onload="testLogo()">
 
 [% options.empty_lines = "default" %]
 
@@ -176,8 +185,8 @@
 <hr />
 </div>
 
-<div style="float:right">
-<img src='[% resource("common-spec/logo.png") %]' alt=' '>
+<div id="logoDivId" style="float:right">
+<img id="logoImgId" src='[% resource("common-spec/logo.png") %]' alt=' '>
 </div>
 
 <!-- Wiki content -->
diff --git a/templates/html/Wize_Print.html b/templates/html/Wize_Print.html
index db3f4e8..2ba23fd 100644
--- a/templates/html/Wize_Print.html
+++ b/templates/html/Wize_Print.html
@@ -42,15 +42,24 @@
     
     <script src="file:////home/daniau/.local/share/zim/templates/html/print-common/notice.js"></script>
 
+    <script>
+    function testLogo() {
+        logo=document.getElementById("logoImgId");
+        logodiv=document.getElementById("logoDivId");
+        if (logo.naturalHeight == 0) {
+            logodiv.setAttribute("style","display:none;");
+        }
+    }
+    </script>
 </head>
-<body>
+<body onload="testLogo()">
 
 [% options.empty_lines = "default" %]
 
 <!-- Wiki content -->
 
-<div style="float:right">
-<img src="file:////home/daniau/.local/share/zim/templates/html/print-common/logo.png" alt=' '>
+<div id="logoDivId" style="float:right">
+<img id="logoImgId" src="file:////home/daniau/.local/share/zim/templates/html/print-common/logo.png" alt=' '>
 </div>
 
 
diff --git a/templates/html/Wize_Print_Template.html b/templates/html/Wize_Print_Template.html
index b35a4cf..324a750 100644
--- a/templates/html/Wize_Print_Template.html
+++ b/templates/html/Wize_Print_Template.html
@@ -42,15 +42,24 @@
     
     <script src="file:///%%HOME%%/.local/share/zim/templates/html/print-common/notice.js"></script>
 
+    <script>
+    function testLogo() {
+        logo=document.getElementById("logoImgId");
+        logodiv=document.getElementById("logoDivId");
+        if (logo.naturalHeight == 0) {
+            logodiv.setAttribute("style","display:none;");
+        }
+    }
+    </script>
 </head>
-<body>
+<body onload="testLogo()">
 
 [% options.empty_lines = "default" %]
 
 <!-- Wiki content -->
 
-<div style="float:right">
-<img src="file:///%%HOME%%/.local/share/zim/templates/html/print-common/logo.png" alt=' '>
+<div id="logoDivId" style="float:right">
+<img id="logoImgId" src="file:///%%HOME%%/.local/share/zim/templates/html/print-common/logo.png" alt=' '>
 </div>
 
 
diff --git a/templates/html/Wize_with_index.html b/templates/html/Wize_with_index.html
index 9e43657..1a6824b 100644
--- a/templates/html/Wize_with_index.html
+++ b/templates/html/Wize_with_index.html
@@ -141,8 +141,17 @@
     
     <script src="[% resource('common-spec/notice.js') %]"></script>
     
+    <script>
+    function testLogo() {
+        logo=document.getElementById("logoImgId");
+        logodiv=document.getElementById("logoDivId");
+        if (logo.naturalHeight == 0) {
+            logodiv.setAttribute("style","display:none;");
+        }
+    }
+    </script>
 </head>
-<body>
+<body onload="testLogo()">
 
 <!-- Header -->
 <div class='header'>
@@ -217,8 +226,8 @@
 <hr />
 </div>
 
-<div style="float:right">
-<img src='[% resource("common-spec/logo.png") %]' alt=' '>
+<div id="logoDivId" style="float:right">
+<img id="logoImgId" src='[% resource("common-spec/logo.png") %]' alt=' '>
 </div>
 
 <div id="mySidenav" class="menu menuClosed">
diff --git a/templates/html/Wize_with_index_sod.html b/templates/html/Wize_with_index_sod.html
index bea3a48..db1c1a9 100644
--- a/templates/html/Wize_with_index_sod.html
+++ b/templates/html/Wize_with_index_sod.html
@@ -153,8 +153,17 @@
     
     <script src="[% resource('common-spec/notice.js') %]"></script>
     
+    <script>
+    function testLogo() {
+        logo=document.getElementById("logoImgId");
+        logodiv=document.getElementById("logoDivId");
+        if (logo.naturalHeight == 0) {
+            logodiv.setAttribute("style","display:none;");
+        }
+    }
+    </script>    
 </head>
-<body>
+<body onload="testLogo()">
 
 <!-- Header -->
 <div class='header'>
@@ -229,8 +238,8 @@
 <hr />
 </div>
 
-<div style="float:right">
-<img src='[% resource("common-spec/logo.png") %]' alt=' '>
+<div id="logoDivId" style="float:right">
+<img id="logoImgId" src='[% resource("common-spec/logo.png") %]' alt=' '>
 </div>
 
 <div class="zemaster">
-- 
2.16.4

