From 82ae5cf26c1a0436b95531de9a998e55ec5beef2 Mon Sep 17 00:00:00 2001
From: Leo McArdle <leomcardle@gmail.com>
Date: Wed, 14 Feb 2018 18:21:21 +0000
Subject: [PATCH] remove mayo and change banner back to nightly

This reverts commit ccda43a87d4310d226bc78c3d4e848db9903f44f.
---
 common/after_header.html          | 4 ++--
 common/head_tag.html              | 2 +-
 src/common/head_tag/4_sad_mayo.js | 7 -------
 3 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 src/common/head_tag/4_sad_mayo.js

diff --git a/common/after_header.html b/common/after_header.html
index 876f91e..719acab 100644
--- a/common/after_header.html
+++ b/common/after_header.html
@@ -2,8 +2,8 @@
   <div class="alert alert-info alert-dismissible" role="alert">
     <button type="button" class="close" data-dismiss="alert" aria-label="Close" onclick="sad_mayo(); dataLayer.push({'event': 'download-banner-nightly-close'})"><span aria-hidden="true">&times;</span></button>
     <strong>Want to help test Firefox?</strong>
-    Give Firefox Beta a try:
-    <a href="https://beta.mozilla.org/" class="alert-link">
+    Give Firefox Nightly a try:
+    <a href="https://nightly.mozilla.org/" class="alert-link">
       <i class="fa fa-download"></i>
       Download
     </a>
diff --git a/common/head_tag.html b/common/head_tag.html
index 467ca10..22947c3 100644
--- a/common/head_tag.html
+++ b/common/head_tag.html
@@ -1,7 +1,7 @@
 <meta name="google-site-verification" content="t3OXbAnBhDID5loRpNRgaaBOfOE7W7-Kh04-3dyKgVs">
 
 <script>
-"use strict";function _dntEnabled(a,e){var t=a||navigator.doNotTrack||window.doNotTrack||navigator.msDoNotTrack,n=e||navigator.userAgent,o=["Windows NT 6.1","Windows NT 6.2","Windows NT 6.3"],i=n.match(/Firefox\/(\d+)/),s=/MSIE|Trident/i.test(n),d=n.match(/Windows.+?(?=;)/g);return(!s||"function"==typeof Array.prototype.indexOf)&&"Enabled"===(t=i&&parseInt(i[1],10)<32?"Unspecified":s&&d&&-1!==o.indexOf(""+d)?"Unspecified":{0:"Disabled",1:"Enabled"}[t]||"Unspecified")}function detect(a){return a.test(userAgent)}function displayBanner(a,e,t){if(!detect(/Mobi/i)){"string"===$.type(e)&&(e=[e]),"string"===$.type(t)&&(t=[t]);for(var n=!1,o=0;o<e.length;o++){switch(e[o]){case"chrome":n=detect(/Chrome/)}if(n)break}n&&t.forEach(function(e){$("head").append("<style> .category-"+e+" .download-banner-"+a+" { display: block } </style>")})}}function sad_mayo(){$(".category-mozillians-nda").append('<div class="sad-mayo"><button type="button" class="btn" aria-label="Close" onclick="very_sad_mayo()"><span aria-hidden="true">&times;</span></button><h1>What would Mark Mayo do?</h1><div class="make-mayo-happy"><img id="sad-mayo" src="https://discourse-paas-production-content.s3.amazonaws.com/original/2X/1/1a0a730dc86ce17381a017e68c432759a6d038e9.jpg"><img id="happy-mayo" src="https://discourse-paas-production-content.s3.amazonaws.com/original/2X/8/8693b13c9e3f5bdb5ac251aa68657c6afe3ae6c6.jpg"><a href="https://nightly.mozilla.org/"><i class="fa fa-download"></i> Download</a></div></div>')}function very_sad_mayo(){$(".category-mozillians-nda .sad-mayo").remove()}_dntEnabled()||function(a,e,t,n,o){a[n]=a[n]||[],a[n].push({"gtm.start":(new Date).getTime(),event:"gtm.js"});var i=e.getElementsByTagName(t)[0],s=e.createElement(t);s.async=!0,s.src="https://www.googletagmanager.com/gtm.js?id=GTM-TMGHNBJ",i.parentNode.insertBefore(s,i)}(window,document,"script","dataLayer");var userAgent=window.navigator&&navigator.userAgent||"";displayBanner("nightly","chrome","mozillians-nda");
+"use strict";function _dntEnabled(e,t){var n=e||navigator.doNotTrack||window.doNotTrack||navigator.msDoNotTrack,a=t||navigator.userAgent,i=["Windows NT 6.1","Windows NT 6.2","Windows NT 6.3"],r=a.match(/Firefox\/(\d+)/),o=/MSIE|Trident/i.test(a),d=a.match(/Windows.+?(?=;)/g);return(!o||"function"==typeof Array.prototype.indexOf)&&"Enabled"===(n=r&&parseInt(r[1],10)<32?"Unspecified":o&&d&&-1!==i.indexOf(""+d)?"Unspecified":{0:"Disabled",1:"Enabled"}[n]||"Unspecified")}function detect(e){return e.test(userAgent)}function displayBanner(e,t,n){if(!detect(/Mobi/i)){"string"===$.type(t)&&(t=[t]),"string"===$.type(n)&&(n=[n]);for(var a=!1,i=0;i<t.length;i++){switch(t[i]){case"chrome":a=detect(/Chrome/)}if(a)break}a&&n.forEach(function(t){$("head").append("<style> .category-"+t+" .download-banner-"+e+" { display: block } </style>")})}}_dntEnabled()||function(e,t,n,a,i){e[a]=e[a]||[],e[a].push({"gtm.start":(new Date).getTime(),event:"gtm.js"});var r=t.getElementsByTagName(n)[0],o=t.createElement(n);o.async=!0,o.src="https://www.googletagmanager.com/gtm.js?id=GTM-TMGHNBJ",r.parentNode.insertBefore(o,r)}(window,document,"script","dataLayer");var userAgent=window.navigator&&navigator.userAgent||"";displayBanner("nightly","chrome","mozillians-nda");
 </script>
 
 <script type="text/discourse-plugin" version="0.7">
diff --git a/src/common/head_tag/4_sad_mayo.js b/src/common/head_tag/4_sad_mayo.js
deleted file mode 100644
index ea16b05..0000000
--- a/src/common/head_tag/4_sad_mayo.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function sad_mayo () {
-  $('.category-mozillians-nda').append('<div class="sad-mayo"><button type="button" class="btn" aria-label="Close" onclick="very_sad_mayo()"><span aria-hidden="true">&times;</span></button><h1>What would Mark Mayo do?</h1><div class="make-mayo-happy"><img id="sad-mayo" src="https://discourse-paas-production-content.s3.amazonaws.com/original/2X/1/1a0a730dc86ce17381a017e68c432759a6d038e9.jpg"><img id="happy-mayo" src="https://discourse-paas-production-content.s3.amazonaws.com/original/2X/8/8693b13c9e3f5bdb5ac251aa68657c6afe3ae6c6.jpg"><a href="https://nightly.mozilla.org/"><i class="fa fa-download"></i> Download</a></div></div>')
-}
-
-function very_sad_mayo () {
-  $('.category-mozillians-nda .sad-mayo').remove()
-}