Merge pull request #1580 from openhealthcare/javascirpt-and-analytics…

…-blocks adds the blocks analytics anad javascripts in the base template, allo…
openhealthcare · Sep 5, 2018 · 3f35a9c · 3f35a9c
2 parents 3a628c9 + 2ee6ee5
commit 3f35a9c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,9 @@
 ### 0.12.0 (Major Release)
 
 #### Misc Changes
+* Adds the {% block analytics %} in the base template (opal/templates/base.html) that by default contains the google analytics code.
+
+* Adds the block {% block javascripts %} in the base template (opal/templates/base.html) that will compress all javascripts.
 
 * Adds a method `.demographics()` to `opal.models.Patient` which returns the relevant demographics instance.
 

diff --git a/opal/templates/base.html b/opal/templates/base.html
@@ -25,6 +25,7 @@
     </script>
 
     {% compress js %}
+    {% block javascripts %}
     {% core_javascripts 'opal.upstream.deps' %}
     {% block opal_js %}
     {% plugin_javascripts 'opal.upstream.deps' %}
@@ -47,11 +48,12 @@
     {% block angularapp %}
     <script type="text/javascript" src="{% static "js/opal/app.js" %}"></script>
     <script type="text/javascript" src="{% static "js/opal/routes.js" %}"></script>
-    {% endblock %}
+    {% endblock angularapp %}
 
     {% application_javascripts %}
     <script type="text/javascript" src="{% static "js/opal/timer.js" %}"></script>
     {% endblock opal_js %}
+    {% endblock javascripts %}
     {% endcompress %}
 
   <link href="{% static "js/lib/c3-0.4.10/c3.css" %}" rel="stylesheet" media="all">
@@ -101,20 +103,22 @@ <h4 class="growl-title" ng-show="message.title" ng-bind="message.title"></h4>
     </script>
 
     <!-- google analytics -->
-    <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');
-
-      {% if OPAL_ANALYTICS_NODOMAIN %}
-      ga('create', '{{ OPAL_ANALYTICS_ID }}', {
-      'cookieDomain': 'none'
-      });
-      {% else %}
-      ga('create', '{{ OPAL_ANALYTICS_ID }}', 'auto');
-      {% endif %}
-    </script>
+    {% block analytics %}
+      <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');
+
+        {% if OPAL_ANALYTICS_NODOMAIN %}
+        ga('create', '{{ OPAL_ANALYTICS_ID }}', {
+        'cookieDomain': 'none'
+        });
+        {% else %}
+        ga('create', '{{ OPAL_ANALYTICS_ID }}', 'auto');
+        {% endif %}
+      </script>
+    {% endblock analytics %}
   </body>
 
 </html>