From 76bc5c52a74eb28281387832122c31312a8419d7 Mon Sep 17 00:00:00 2001
From: ingerjm0 <jenna@highfidelity.io>
Date: Wed, 20 Mar 2019 10:20:30 -0700
Subject: [PATCH] Template fixes for new API system

---
 .../hifi-jsdoc-template/tmpl/layout.tmpl      | 54 ++++++++++++++++++-
 .../hifi-jsdoc-template/tmpl/params.tmpl      |  9 ++++
 .../hifi-jsdoc-template/tmpl/signalList.tmpl  |  4 +-
 3 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/tools/jsdoc/hifi-jsdoc-template/tmpl/layout.tmpl b/tools/jsdoc/hifi-jsdoc-template/tmpl/layout.tmpl
index 6f267587c0..41a324fdaf 100644
--- a/tools/jsdoc/hifi-jsdoc-template/tmpl/layout.tmpl
+++ b/tools/jsdoc/hifi-jsdoc-template/tmpl/layout.tmpl
@@ -16,10 +16,11 @@
 <body>
 
 <div class="nav-header">
-    <p><img src="images/white-logo.png" width="200px" /></p>
+    <p><a href="https://www.highfidelity.com"><img src="images/white-logo.png" width="214px" /></a></p>
     <?js if (env.conf.docdash.search) { ?>
-    <input type="text" class="search-input" id="nav-search" placeholder="Search ..." />
+    <input type="text" class="search-input" id="nav-search" placeholder="Search API Docs ..." />
     <?js } ?>
+    <p><a href="https://docs.highfidelity.com">Looking for <strong>High Fidelity</strong><br /> Documentation?</a></p>
 </div>
 
 <nav>
@@ -69,5 +70,54 @@
     <?js } ?>
 <?js } ?>
 
+<!-- Start Google Analytics Tag -->
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', '{{ theme_config.google_analytics_code }}', 'auto');
+  ga('send', 'pageview');
+</script>
+<!-- End Google Analytics Tag -->
+
+<!-- Start of HubSpot Embed Code -->
+<script type="text/javascript" id="hs-script-loader" async defer src="//js.hs-scripts.com/5066246.js"></script>
+<!-- End of HubSpot Embed Code -->
+
+<!-- Start Quantcast Tag -->
+<script type="text/javascript">
+var _qevents = _qevents || [];
+ (function() {
+   var elem = document.createElement('script');
+   elem.src = (document.location.protocol == "https:" ? "https://secure" : "http://edge") + ".quantserve.com/quant.js";
+   elem.async = true;
+   elem.type = "text/javascript";
+   var scpt = document.getElementsByTagName('script')[0];
+   scpt.parentNode.insertBefore(elem, scpt);
+  })();
+_qevents.push({qacct: "p-tK6PFLJY3q1s-"});
+</script>
+<noscript>
+ <img src="//pixel.quantserve.com/pixel/p-tK6PFLJY3q1s-.gif?labels=_fp.event.Default" style="display: none;" border="0" height="1" width="1" alt="Quantcast"/>
+</noscript>
+<!-- End Quantcast Tag -->
+
+
+<!-- Start Hotjar Tracking Code for https://highfidelity.com/ -->
+<script>
+    (function(h,o,t,j,a,r){
+        h.hj=h.hj||function(){(h.hj.q=h.hj.q||[]).push(arguments)};
+        h._hjSettings={hjid:908553,hjsv:6};
+        a=o.getElementsByTagName('head')[0];
+        r=o.createElement('script');r.async=1;
+        r.src=t+h._hjSettings.hjid+j+h._hjSettings.hjsv;
+        a.appendChild(r);
+    })(window,document,'https://static.hotjar.com/c/hotjar-','.js?sv=');
+</script>
+<!-- End Hotjar Tracking Code for https://highfidelity.com/ -->
+
+
 </body>
 </html>
diff --git a/tools/jsdoc/hifi-jsdoc-template/tmpl/params.tmpl b/tools/jsdoc/hifi-jsdoc-template/tmpl/params.tmpl
index 17f58b1677..24f9914c2a 100644
--- a/tools/jsdoc/hifi-jsdoc-template/tmpl/params.tmpl
+++ b/tools/jsdoc/hifi-jsdoc-template/tmpl/params.tmpl
@@ -96,6 +96,15 @@
             <?js } ?>
             </td>
 
+
+            <?js if (params.hasAttributes) {?>
+                <td class="default">
+                <?js if (typeof param.attributes !== 'undefined') { ?>
+                    <?js= self.htmlsafe(param.attributes) ?>
+                <?js } ?>
+                </td>
+            <?js } ?>
+            
             <?js if (params.hasDefault) {?>
                 <td class="default">
                 <?js if (typeof param.defaultvalue !== 'undefined') { ?>
diff --git a/tools/jsdoc/hifi-jsdoc-template/tmpl/signalList.tmpl b/tools/jsdoc/hifi-jsdoc-template/tmpl/signalList.tmpl
index b9a0e0ca86..c5fdefc7d8 100644
--- a/tools/jsdoc/hifi-jsdoc-template/tmpl/signalList.tmpl
+++ b/tools/jsdoc/hifi-jsdoc-template/tmpl/signalList.tmpl
@@ -13,8 +13,8 @@ var self = this;
                     <code><?js= (kind === 'class' ? 'new ' : '') + name + (data.signatureHead || '') ?></code></a>
                 </td>
                 <td>
-                <?js if (data.summary) { ?>
-                <?js= summary ?>
+                <?js if (data.description) { ?>
+                <?js= description ?>
                 <?js= this.partial('details.tmpl', data) ?>
                 <?js } else { ?>
                     <?js= this.partial('details.tmpl', data) ?>
