refactor layout.jade to have universal head, and customize together.js

public/js/application.js

@@ -15,4 +15,5 @@
 
 //= require lib/jquery-2.1.1.min
 //= require lib/bootstrap.min
+//= require lib/together/togetherjs
 //= require main

public/js/lib/together/togetherjs.js

@@ -17,9 +17,9 @@
         // of the hub analytics
         enableAnalytics: false,
         // The code to enable (this is defaulting to a Mozilla code):
-        analyticsCode: "UA-35433268-28",
+        analyticsCode: "UA-55446531-1",
         // The base URL of the hub (gets filled in below):
-        hubBase: null,
+        hubBase: "https://fcctogether.herokuapp.com",
         // A function that will return the name of the user:
         getUserName: null,
         // A function that will return the color of the user:
@@ -70,7 +70,7 @@
         ignoreMessages: ["cursor-update", "keydown", "scroll-update"],
         // Ignores the following forms (will ignore all forms if set to true):
         ignoreForms: [":password"]
-    };
+};
 
     var styleSheet = "/togetherjs/togetherjs.css";
 
@@ -487,13 +487,6 @@
         return "TogetherJS";
     };
 
-    var defaultHubBase = "https://hub.togetherjs.com";
-    if (defaultHubBase == "__" + "hubUrl"+ "__") {
-        // Substitution wasn't made
-        defaultHubBase = "https://hub.togetherjs.mozillalabs.com";
-    }
-    defaultConfiguration.hubBase = defaultHubBase;
-
     TogetherJS._configuration = {};
     TogetherJS._defaultConfiguration = defaultConfiguration;
     TogetherJS._configTrackers = {};

views/layout-wide.jade

@@ -1,21 +1,7 @@
 doctype html
 html(ng-app='profileValidation', lang='en')
   head
-    script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js")
+    include partials/universal-head
-    script(src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js")
-    script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js")
-    script(src="https://togetherjs.com/togetherjs-min.js")
-    link(rel='shortcut icon', href='//s3.amazonaws.com/freecodecamp/favicon.ico')
-    link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css')
-    link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css')
-    link(rel='stylesheet', href='//code.ionicframework.com/ionicons/2.0.0/css/ionicons.min.css')
-    include partials/meta
-    title #{title} | Free Code Camp
-    meta(charset='utf-8')
-    meta(http-equiv='X-UA-Compatible', content='IE=edge')
-    meta(name='viewport', content='width=device-width, initial-scale=1.0')
-    meta(name='csrf-token', content=_csrf)
-    != css('main')
 
   body.no-top-and-bottom-margins.full-screen-body-background
     include partials/navbar-wide
@@ -23,11 +9,3 @@ html(ng-app='profileValidation', lang='en')
     block content
     include partials/footer
     != js('application')
-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');
-      ga('create', 'UA-55446531-1', 'auto');
-      ga('require', 'displayfeatures');
-      ga('send', 'pageview');

views/layout.jade

@@ -1,19 +1,7 @@
 doctype html
 html(ng-app='profileValidation', lang='en')
   head
-    script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js")
+    include partials/universal-head
-    script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.11/angular.min.js")
-    script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js")
-    script(src="https://togetherjs.com/togetherjs-min.js")
-    link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css')
-    link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css')
-    include partials/meta
-    title #{title} | Free Code Camp
-    meta(charset='utf-8')
-    meta(http-equiv='X-UA-Compatible', content='IE=edge')
-    meta(name='viewport', content='width=device-width, initial-scale=1.0')
-    meta(name='csrf-token', content=_csrf)
-    != css('main')
 
   body.top-and-bottom-margins
     include partials/navbar-narrow
@@ -22,11 +10,3 @@ html(ng-app='profileValidation', lang='en')
       block content
     include partials/footer
     != js('application')
-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');
-      ga('create', 'UA-55446531-1', 'auto');
-      ga('require', 'displayfeatures');
-      ga('send', 'pageview');

views/partials/universal-head.jade

@@ -0,0 +1,20 @@
+script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js")
+script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.11/angular.min.js")
+script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.0/ui-bootstrap-tpls.min.js")
+link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css')
+link(rel='stylesheet', href='//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css')
+include meta
+title #{title} | Free Code Camp
+meta(charset='utf-8')
+meta(http-equiv='X-UA-Compatible', content='IE=edge')
+meta(name='viewport', content='width=device-width, initial-scale=1.0')
+meta(name='csrf-token', content=_csrf)
+!= css('main')
+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');
+    ga('create', 'UA-55446531-1', 'auto');
+    ga('require', 'displayfeatures');
+    ga('send', 'pageview');