Merge pull request #234 from asm-products/develop

Develop to staging

Author: madflojo

src/web/instance/web.cfg.default

@@ -132,3 +132,9 @@ SUBSCRIPTIONS = {
         'interval': 'month'
     }
 }
+DATACENTERS = {
+    'choices' : {
+        ("dc1queue", 'DigitalOcean - nyc2'),
+        ("dc2queue", 'DigitalOcean - sfo1')
+    }
+}

src/web/instance/web.cfg.example

@@ -133,3 +133,10 @@ SUBSCRIPTIONS = {
         'interval': 'month'
     }
 }
+DATACENTERS = {
+    'choices' : {
+        ("dc1queue", 'DigitalOcean - nyc2'),
+        ("dc2queue", 'DigitalOcean - sfo1')
+    }
+}
+

src/web/instance/web_sample.cfg

@@ -75,3 +75,10 @@ SUBSCRIPTIONS = {
         'interval': 'month'
     }
 }
+DATACENTERS = {
+    'choices' : {
+        ("dc1queue", 'DigitalOcean - nyc2'),
+        ("dc2queue", 'DigitalOcean - sfo1')
+    }
+}
+

src/web/monitorforms/datacenter.py

@@ -7,15 +7,12 @@
 from wtforms import SelectMultipleField
 from wtforms.validators import DataRequired
 from timer import TimerCheckForm
-
+from web import app
 
 class DatacenterCheckForm(TimerCheckForm):
 
     ''' Class that creates an datacenter form for the dashboard '''
-    dc_choices = [
-        ("dc1queue", 'DigitalOcean - nyc2'),
-        ("dc2queue", 'DigitalOcean - sfo1')
-    ]
+    dc_choices = app.config['DATACENTERS']['choices']
 
     datacenter = SelectMultipleField(
         "Datacenter",

src/web/templates/assembly.js

@@ -0,0 +1,14 @@
+<script type="text/javascript">
+  ;(function(p,l,o,w,i){if(!p[i]){p.__asml=p.__asml||[];
+  p.__asml.push(i);p[i]=function(){(p[i].q=p[i].q||[]).push(arguments)
+  };p[i].q=p[i].q||[];n=l.createElement(o);g=l.getElementsByTagName(o)[0];n.async=1;
+  n.src=w;g.parentNode.insertBefore(n,g)}}(window,document,"script","https://d1uxm17u44dmmr.cloudfront.net/1.0.0/asml.js","asml"));
+
+  asml('create', 'fdc1605623bb4606f9f0c6eaa37942cfbd519389');
+
+  {% if data['loggedin'] %}
+    asml('track', '{{ data['email_digest'] }}');
+  {% else %}
+    asml('track');
+  {% endif %}
+</script>

src/web/templates/dash-footer.html

@@ -41,6 +41,7 @@
   {% for item in data['js_bottom'] %}
     {% include item %}
   {% endfor %}
+  {% include "assembly.js" %}
   {% block js %}{% endblock %}
   </body>
 </html>

src/web/templates/footer.html

@@ -1,14 +1,17 @@
-<!-- FOOTER -->
-<div class="footer">
-  <div class="container">
+    <!-- FOOTER -->
+    <div class="footer">
+      <div class="container">
 
-    <ul>
-      <li><a href="/pages/tos">Terms of Service</a></li>
-      <li><a href="/pages/faq">FAQ</a></li>
-      <li><a href="https://twitter.com/runbookio">Twitter</a></li>
-      <li><a href="mailto:[email protected]">Contact</a></li>
-    </ul>
+        <ul>
+          <li><a href="/pages/tos">Terms of Service</a></li>
+          <li><a href="/pages/faq">FAQ</a></li>
+          <li><a href="https://twitter.com/runbookio">Twitter</a></li>
+          <li><a href="mailto:[email protected]">Contact</a></li>
+        </ul>
 
-  </div>
-</div>
-<!-- end FOOTER -->
+      </div>
+    </div>
+    <!-- end FOOTER -->
+    {% include "assembly.js" %}
+  </body>
+</html>

src/web/web.py

@@ -23,6 +23,7 @@
 import os
 import sys
 import cookies
+import md5
 
 # Flask modules
 from flask import Flask
@@ -73,6 +74,7 @@ def startData(user=None):
         data['stripe_pubkey'] = app.config['STRIPE_PUBKEY']
         data['subplans'] = user.subplans
         data['subscription'] = user.subscription
+        data['email_digest'] = md5.new(user.email).hexdigest()
     data['js_bottom'] = []
     data['js_header'] = []
     return data