From d0104d7ad13883865c3dd6a29a58afd037d023cd Mon Sep 17 00:00:00 2001
From: DhammaCharts <100090806+DhammaCharts@users.noreply.github.com>
Date: Wed, 13 Jul 2022 09:16:44 +0100
Subject: [PATCH] fix config coherence

---
 data/graphConfig.yaml       | 16 ++++++++++++----
 layouts/index.html          |  1 -
 layouts/partials/graph.html | 22 ++++++++++------------
 layouts/partials/head.html  | 10 +++++-----
 4 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/data/graphConfig.yaml b/data/graphConfig.yaml
index a6f916acb..94022c4aa 100644
--- a/data/graphConfig.yaml
+++ b/data/graphConfig.yaml
@@ -1,7 +1,15 @@
-# if true, a Global Graph will be shown on home page with full width, no backlink.
-# A different set of Local Graphs will be shown on sub pages.
-# if false, Local Graph will be default on every page as usual
-enableGlobalGraph: false
+
+# If enableColumnLayout: true in config.yaml, then you have
+# the possiblity of showing a global graph by clicking on an
+# icon at the top right corner of the graph window. To do so,
+# configure below enableGlobalGraph: true
+
+# If enableColumnLayout: false, then you have the possiblility
+# to show a Global Graph on home page with full width, no backlink
+# by setting below enableGlobalGraph: true. A different set of
+# Local Graphs will be shown on sub pages.
+
+enableGlobalGraph: true
 
 ### Local Graph ###
 
diff --git a/layouts/index.html b/layouts/index.html
index 33e168c25..ca2764f80 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -55,7 +55,6 @@
         <aside data-sm1-2 data-md1-2 data-lg1-4 data-lg3 data-m3 data-sm3 data-xs2>
           <div class="sticky">
             <div class="page-end vertical">
-              <button id="myBtn">Open Modal</button>
               <div id="myModal" class="modal">
                 <div class="modal-content">
                   <span class="close">&times;</span>
diff --git a/layouts/partials/graph.html b/layouts/partials/graph.html
index fca58b594..bce105a72 100644
--- a/layouts/partials/graph.html
+++ b/layouts/partials/graph.html
@@ -1,17 +1,15 @@
-<script
-  src="https://cdn.jsdelivr.net/npm/d3@6.7.0/dist/d3.min.js"
-  integrity="sha256-+7jaYCp29O1JusNWHaYtgUn6EhuP0VaFuswhNV06MyI="
-  crossorigin="anonymous"
-></script>
+<script src="https://cdn.jsdelivr.net/npm/d3@6.7.0/dist/d3.min.js" integrity="sha256-+7jaYCp29O1JusNWHaYtgUn6EhuP0VaFuswhNV06MyI=" crossorigin="anonymous"></script>
 <h3>Interactive Graph</h3>
 <div class="graph-grid">
-<div>
-<button id="global-graph-toggle-button">
-<span id="global-graph-svg" class="icon"></span>
-</button>
-</div>
-<div id="graph-container">
-</div>
+  <div>
+    <button id="global-graph-toggle-button">
+      {{if and ($.Site.Data.config.enableColumnLayout) ($.Site.Data.graphConfig.enableGlobalGraph)}}
+      <span id="global-graph-svg" class="icon"></span>
+      {{end}}
+    </button>
+  </div>
+  <div id="graph-container">
+  </div>
 </div>
 
 <style>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 9f390794d..e7dd004af 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -100,12 +100,12 @@
 
       {{if $.Site.Data.config.enableFooter}}
       const container = document.getElementById("graph-container")
-      // retry if the graph is not ready
+      // // retry if the graph is not ready
       if (!container) return requestAnimationFrame(render)
-      // clear the graph in case there is anything within it
+      // // clear the graph in case there is anything within it
       container.textContent = ""
 
-      const drawGlobal = isHome && {{$.Site.Data.graphConfig.enableGlobalGraph}};
+      const drawGlobal = isHome && {{$.Site.Data.graphConfig.enableGlobalGraph}} && !{{$.Site.Data.config.enableColumnLayout}};
       drawGraph(
           {{strings.TrimRight "/" .Site.BaseURL}},
           drawGlobal,
@@ -114,8 +114,8 @@
         );
 
       {{end}}
-      
-      {{if $.Site.Data.config.enableColumnLayout}}
+
+      {{if and ($.Site.Data.config.enableColumnLayout) ($.Site.Data.graphConfig.enableGlobalGraph)}}
       const containerModal = document.getElementById("graph-container-modal")
       // retry if the graph is not ready
       if (!containerModal) return requestAnimationFrame(render)