Merge branch 'master' into bugfix/#902

Cadasta · Nov 10, 2016 · 4f63170 · 4f63170
2 parents 6d39766 + 250f46e
commit 4f63170
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/cadasta/core/static/js/inline-manual-player.js b/cadasta/core/static/js/inline-manual-player.js
@@ -3,13 +3,6 @@ Inline Manual Player, v2.34.1
 http://inlinemanual.com/
 */
 
-// User tracking
-
-window.inlineManualTracking = {
-  uid: "{{ user.id }}",
-  username: "{{ user.username }}"
-}
-
 // Embed correct player for site; default is dev version
 
 var myplayer = "c384a8ce835342a913859b2a50d1f6a9";

diff --git a/cadasta/templates/core/base.html b/cadasta/templates/core/base.html
@@ -236,6 +236,13 @@
       $(".alert-success").fadeTo(500, 0).slideUp(500, function(){ $(this).hide(); });
     }, 5000);
     </script>
+    <script>
+      // User tracking
+      window.inlineManualTracking = {
+        uid: "{{ user.id }}",
+        username: "{{ user.username }}"
+      }
+    </script>
     <script type="text/javascript" src="{% static 'js/inline-manual-player.js' %}"></script>
   </body>
 </html>
diff --git a/provision/roles/cadasta/production/templates/inline-manual-player b/provision/roles/cadasta/production/templates/inline-manual-player
@@ -3,14 +3,7 @@ Inline Manual Player, v2.34.1
 http://inlinemanual.com/
 */
 
-// User tracking
-
-window.inlineManualTracking = {
-  uid: "{{ user.id }}",
-  username: "{{ user.username }}"
-}
-
-// Embed correct player for site - myplayer variable
+// Embed correct player for environment - myplayer variable
 
 var myplayer = "{{ myplayer }}";