From a2f9602058bbf5348e9d5b99321b4c3ce2313d13 Mon Sep 17 00:00:00 2001
From: Renze Yu <renzeyu@microsoft.com>
Date: Mon, 14 Nov 2016 16:56:21 +0800
Subject: [PATCH 1/2] support customizing logo and favicon

---
 Documentation/tutorial/docfx.exe_user_manual.md               | 2 ++
 src/docfx.website.themes/default/partials/head.tmpl.partial   | 2 +-
 src/docfx.website.themes/default/partials/navbar.tmpl.partial | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Documentation/tutorial/docfx.exe_user_manual.md b/Documentation/tutorial/docfx.exe_user_manual.md
index a413759bf25..4f2f2f5a970 100644
--- a/Documentation/tutorial/docfx.exe_user_manual.md
+++ b/Documentation/tutorial/docfx.exe_user_manual.md
@@ -304,6 +304,8 @@ Metadata Name         | Type    | Description
 ----------------------|---------|---------------------------
 _appTitle             | string  | Will be appended to each output page's head title.
 _appFooter            | string  | The footer text. Will show DocFX's Copyright text if not specified.
+_appLogoPath          | string  | Logo file's path from output root. Will show DocFX's logo if not specified. Remember to add file to resource.
+_appFaviconPath       | string  | Favicon file's path from output root. Will show DocFX's favicon if not specified. Remember to add file to resource.
 _enableSearch         | bool    | Indicate whether to show the search box on the top of page.
 _disableNavbar        | bool    | Indicate whether to show the navigation bar on the top of page.
 _disableBreadcrumb    | bool    | Indicate whether to show breadcrumb on the top of page.
diff --git a/src/docfx.website.themes/default/partials/head.tmpl.partial b/src/docfx.website.themes/default/partials/head.tmpl.partial
index b2f1163f8b1..39794e34de9 100644
--- a/src/docfx.website.themes/default/partials/head.tmpl.partial
+++ b/src/docfx.website.themes/default/partials/head.tmpl.partial
@@ -8,7 +8,7 @@
   <meta name="title" content="{{#title}}{{title}}{{/title}}{{^title}}{{>partials/title}}{{/title}} {{#_appTitle}}| {{_appTitle}} {{/_appTitle}}">
   <meta name="generator" content="docfx {{_docfxVersion}}">
   {{#_description}}<meta name="description" content="{{_description}}">{{/_description}}
-  <link rel="shortcut icon" href="{{_rel}}favicon.ico">
+  <link rel="shortcut icon" href="{{_rel}}{{{_appFaviconPath}}}{{^_appFaviconPath}}favicon.ico{{/_appFaviconPath}}">
   <link rel="stylesheet" href="{{_rel}}styles/docfx.vendor.css">
   <link rel="stylesheet" href="{{_rel}}styles/docfx.css">
   <link rel="stylesheet" href="{{_rel}}styles/main.css">
diff --git a/src/docfx.website.themes/default/partials/navbar.tmpl.partial b/src/docfx.website.themes/default/partials/navbar.tmpl.partial
index 9f9939e387d..674daafaaa3 100644
--- a/src/docfx.website.themes/default/partials/navbar.tmpl.partial
+++ b/src/docfx.website.themes/default/partials/navbar.tmpl.partial
@@ -10,7 +10,7 @@
         <span class="icon-bar"></span>
       </button>
       <a class="navbar-brand" href="{{_rel}}index.html">
-        <img id="logo" class="svg" src="{{_rel}}logo.svg" alt="{{_appName}}" >
+        <img id="logo" class="svg" src="{{_rel}}{{{_appLogoPath}}}{{^_appLogoPath}}logo.svg{{/_appLogoPath}}" alt="{{_appName}}" >
       </a>
     </div>
     <div class="collapse navbar-collapse" id="navbar">

From 018b436421366640d20763ca55e72609fef6c251 Mon Sep 17 00:00:00 2001
From: Renze Yu <renzeyu@microsoft.com>
Date: Tue, 15 Nov 2016 09:54:56 +0800
Subject: [PATCH 2/2] extract logo partial

---
 src/docfx.website.themes/default/partials/logo.tmpl.partial  | 5 +++++
 .../default/partials/navbar.tmpl.partial                     | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 src/docfx.website.themes/default/partials/logo.tmpl.partial

diff --git a/src/docfx.website.themes/default/partials/logo.tmpl.partial b/src/docfx.website.themes/default/partials/logo.tmpl.partial
new file mode 100644
index 00000000000..8209615a35b
--- /dev/null
+++ b/src/docfx.website.themes/default/partials/logo.tmpl.partial
@@ -0,0 +1,5 @@
+{{!Copyright (c) Microsoft. All rights reserved. Licensed under the MIT license. See LICENSE file in the project root for full license information.}}
+
+<a class="navbar-brand" href="{{_rel}}index.html">
+  <img id="logo" class="svg" src="{{_rel}}{{{_appLogoPath}}}{{^_appLogoPath}}logo.svg{{/_appLogoPath}}" alt="{{_appName}}" >
+</a>
diff --git a/src/docfx.website.themes/default/partials/navbar.tmpl.partial b/src/docfx.website.themes/default/partials/navbar.tmpl.partial
index 674daafaaa3..fb22e78befc 100644
--- a/src/docfx.website.themes/default/partials/navbar.tmpl.partial
+++ b/src/docfx.website.themes/default/partials/navbar.tmpl.partial
@@ -9,9 +9,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="{{_rel}}index.html">
-        <img id="logo" class="svg" src="{{_rel}}{{{_appLogoPath}}}{{^_appLogoPath}}logo.svg{{/_appLogoPath}}" alt="{{_appName}}" >
-      </a>
+      {{>partials/logo}}
     </div>
     <div class="collapse navbar-collapse" id="navbar">
       <form class="navbar-form navbar-right" role="search" id="search">