more analytics cleanup/refactor

view/layout/basic.php

@@ -48,6 +48,7 @@
       <div class="hide">
         <div id="fb-root"></div>
         <div id="js">
+          <?php Response::addJsAsset('//platform.twitter.com/oct.js') ?>
           <?php foreach(Response::getJsAssets() as $src): ?>
             <script src="<?php echo $src ?>"></script>
           <?php endforeach ?>
@@ -76,6 +77,8 @@
             t.src=v;s=b.getElementsByTagName(e)[0];s.parentNode.insertBefore(t,s)}(window,
             document,'script','//connect.facebook.net/en_US/fbevents.js');
 
+            fbq('init', '1618717031725766');
+            
             <?php //twitter ?>
             window.twttr = (function(d,s,id) {
               var js, fjs = d.getElementsByTagName(s)[0],

view/mail/joinList.php

@@ -2,11 +2,9 @@
   <?php if ($error): ?>
     <div class="notice notice-error spacer1"><?php echo $error ?></div>
   <?php elseif ($success): ?>
-    <?php Response::addJsAsset('//platform.twitter.com/oct.js') ?>
     <?php js_start() ?>
       ga('send', 'event', 'Sign Up', 'Join List', '<?php echo $listId ?>');
       twttr.conversion.trackPid('nty1x');
-      fbq('init', '1618717031725766');
       fbq('track', "Lead");
     <?php js_end() ?>
     <div class="notice notice-success spacer1"><?php echo $success ?></div>

view/page/feedback.php

@@ -7,7 +7,7 @@
       <div class="row-fluid" style="height: 100%">
         <div class="span9">
           <h1><?php echo __('Feedback') ?></h1>
-          <?php echo View::render('get/feedback-prompt') ?>jeremy again
+          <?php echo View::render('get/feedback-prompt') ?>
           <iframe id="feedback-form-iframe" src="https://docs.google.com/forms/d/1zqa5jBYQMmrZO1utoF2Ok9ka-gXzXLDZKXNNoprufC8/viewform?embedded=true"
                   width="760" height="1720" frameborder="0" marginheight="0" marginwidth="0">Loading...</iframe>
         </div>