From b146b898f4770138eb00d67df4cf5abd0cb4f2ce Mon Sep 17 00:00:00 2001
From: Ala Qasem <qasema@berea.edu>
Date: Tue, 7 Dec 2021 21:03:13 +0000
Subject: [PATCH 1/2] add institution name and instructor name

---
 .../sphinx_bootstrap/layout.html              | 42 +++++++++++++++++--
 .../sphinx_bootstrap/static/layout.js         | 14 +++++++
 2 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/static/layout.js

diff --git a/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html b/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html
index 844e89673..bb03812de 100644
--- a/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html
+++ b/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html
@@ -45,10 +45,24 @@
         {% else %}
           <div class="brand-logo"><img src="{{pathto(logo, 1)}}" alt=""></div>
         {% endif %}
-        <a class="navbar-brand" href="{{ pathto(master_doc) }}" aria-label="index-page">
+        <a class="navbar-brand" href="{{ pathto(master_doc) }}" aria-label="index-page" style="margin-bottom: 15px;" >
           {% if dynamic_pages == 'True' %}
             {% raw %}
-            {{ =course_name }}
+            <div id="myinstitution">{{ =institution}}</div>
+            {{=course_name}}           
+            <!-- <script src="../sphinx_bootstrap/static/layout.js"></script> -->
+            <script>
+               let tagword = document.getElementById("myinstitution").textContent; // get the contenet of the retrieved institution name  
+               let noinstitution; // this variable to store the name will be displayed 
+               if (tagword == "None" ) {
+                   noinstitution ="";    // display an empty string in case of generic textbooks  
+               }
+               else {
+                   noinstitution = tagword; // if not generic textbook display the retrieved name from database 
+               }
+               document.getElementById("myinstitution").innerHTML = noinstitution;  // change the inner text of the tag 
+            </script>
+              
             {% endraw %}
           {% else %}
           {% if course_title -%}{{ course_title|e }}{%- else -%}{{ course_id|e }}{%- endif -%}
@@ -110,9 +124,9 @@
           </a>
           <ul class='dropdown-menu'>
             {% if 'overview' in course_id %}
-                <li><a href='{{ pathto(master_doc) }}/overview.html' aria-label="index-page">Table of Contents</a></li>
+                <li><a href='{{ pathto(master_doc) }}/overview.html' aria-label="index-page">Table of Contents m</a></li>
             {% else: %}
-                <li><a href='{{ pathto(master_doc) }}' aria-label="index-page">Table of Contents</a></li>
+                <li><a href='{{ pathto(master_doc) }}' aria-label="index-page">Table of Contents n</a></li>
             {% endif %}
             <li><a href='{{ pathto("genindex.html",1) }}'>Book Index</a></li>
             <li class="divider"></li>
@@ -295,6 +309,26 @@
 <div class="container" id="main-content" role="main">
   
 <!-- Ad Serving for Runestone Campaign -->
+{% raw %}
+  <br>
+  <p id="intrname" style="font-size: large;">Instructor: {{ =instructor_name}}</p>
+  <script>
+    let intr_name = document.getElementById("intrname").textContent;
+    let no_intr_name;
+    if ( document.URL.includes("index.html") ) {
+      if (intr_name == "Instructor: None" ) {
+        no_intr_name = "";
+        }
+      else {
+        no_intr_name = intr_name;
+        }
+      document.getElementById("intrname").innerHTML = no_intr_name;
+    }
+    else{
+      document.getElementById("intrname").innerHTML = "";
+    }
+  </script>
+{% endraw %}
 {% if dynamic_pages == 'True' %}
     {% raw %}
         {{ if settings.num_banners > 0 and settings.show_rs_banner: }}
diff --git a/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/static/layout.js b/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/static/layout.js
new file mode 100644
index 000000000..0989c737f
--- /dev/null
+++ b/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/static/layout.js
@@ -0,0 +1,14 @@
+function renderinstitution_name(){
+    myword = document.getElementById("institution2").textContent;
+    let noinstitution;
+              
+    if (myword == "None" ) {
+        noinstitution = "";
+    }
+    else {
+        noinstitution = myword;
+    }
+    
+    
+    document.getElementById("institution2").innerHTML = noinstitution;
+}
\ No newline at end of file

From 8b827a2f7ae132752746feb042171b58f68d2d35 Mon Sep 17 00:00:00 2001
From: Ala Qasem <qasema@berea.edu>
Date: Tue, 7 Dec 2021 21:15:39 +0000
Subject: [PATCH 2/2] fix JavaScript of the layout

---
 .../_templates/plugin_layouts/sphinx_bootstrap/layout.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html b/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html
index bb03812de..f918b24f9 100644
--- a/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html
+++ b/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html
@@ -316,7 +316,7 @@
     let intr_name = document.getElementById("intrname").textContent;
     let no_intr_name;
     if ( document.URL.includes("index.html") ) {
-      if (intr_name == "Instructor: None" ) {
+      if (intr_name == "Instructor: None" || intr_name == "Instructor: " ) {
         no_intr_name = "";
         }
       else {