Merge branch 'master' into ui

server/config.js

@@ -22,6 +22,11 @@ const conf = convict({
     arg: 'port',
     env: 'PORT'
   },
+  analytics_id: {
+    format: String,
+    default: 'UA-101393094-1',
+    env: 'GOOGLE_ANALYTICS_ID'
+  },
   env: {
     format: ['production', 'development', 'test'],
     default: 'development',

server/portal_server.js

@@ -16,7 +16,10 @@ const log = mozlog('portal.server');
 
 const app = express();
 
-app.engine('handlebars', exphbs({ defaultLayout: 'main' }));
+app.engine('handlebars', exphbs({ 
+  defaultLayout: 'main',
+  partialsDir: 'views/partials/'
+}));
 app.set('view engine', 'handlebars');
 
 app.use(helmet());
@@ -25,7 +28,10 @@ app.use(bodyParser.json());
 app.use(express.static(path.join(__dirname, '../public')));
 
 app.get('/', (req, res) => {
-  res.render('index');
+  res.render('index', {
+    shouldRenderAnalytics: notLocalHost,
+    trackerId: conf.analytics_id
+  });
 });
 
 app.get('/exists/:id', (req, res) => {
@@ -43,7 +49,9 @@ app.get('/download/:id', (req, res) => {
       .then(contentLength => {
         res.render('download', {
           filename: filename,
-          filesize: bytes(contentLength)
+          filesize: bytes(contentLength),
+          shouldRenderAnalytics: notLocalHost,
+          trackerId: conf.analytics_id
         });
       })
       .catch(() => {