Fix bug 893884 - Add favicon

mozilla · Aug 27, 2013 · 26b049a · 26b049a
1 parent 6550084
commit 26b049a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/public/static/images/favicon.ico b/public/static/images/favicon.ico
diff --git a/server.js b/server.js
@@ -25,6 +25,7 @@ var app = express(),
     nunjucksEnv = new nunjucks.Environment( new nunjucks.FileSystemLoader( path.join( __dirname, 'views' )), {
       autoescape: true
     }),
+    oneYear = 31556952000,
     optimizeCSS = env.get("OPTIMIZE_CSS"),
     tmpDir = path.join(require("os").tmpDir(), "make-valet");
 
@@ -46,6 +47,9 @@ app.locals({
 });
 nunjucksEnv.express( app );
 
+app.use(express.favicon("public/static/images/favicon.ico", {
+  maxAge: oneYear
+}));
 app.use(express.logger());
 app.use(express.compress());
 // Redirect paths with trailing slashes to paths w/o trailing slashes
@@ -59,13 +63,13 @@ app.use(lessMiddleware({
   optimization: optimizeCSS ? 0 : 2
 }));
 app.use(express.static(tmpDir, {
-  maxAge: "31556952000" // one year
+  maxAge: oneYear
 }));
 app.use(express.static(path.join(__dirname, "public"), {
-  maxAge: "31556952000" // one year
+  maxAge: oneYear
 }));
 app.use("/static/bower", express.static(path.join(__dirname, "bower_components"), {
-  maxAge: "31556952000" // one year
+  maxAge: oneYear
 }));
 app.use(middleware.setVanityURL);
 app.use(app.router);

diff --git a/views/embed-shell.html b/views/embed-shell.html
@@ -2,6 +2,7 @@
 <html>
   <head>
     <title>{{make.title}}</title>
+    <link rel="shortcut icon" href="/favicon.ico">
     <link rel="stylesheet" href="/static/stylesheets/makedetails.css">
   </head>
   <body>