From 7039a4d76267e5c1e24e29d4675894434990e29c Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 22 Oct 2013 12:39:14 -0400
Subject: [PATCH] closes #425

---
 public/templates/admin/settings.tpl |  2 ++
 public/templates/header.tpl         | 13 ++++++++-----
 src/webserver.js                    |  4 +++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/public/templates/admin/settings.tpl b/public/templates/admin/settings.tpl
index 7aa4fefb30..9172ba310e 100644
--- a/public/templates/admin/settings.tpl
+++ b/public/templates/admin/settings.tpl
@@ -10,6 +10,8 @@
 		<input type="text" class="form-control" placeholder="A short description about your community" data-field="description" /><br />
 		<label>Site Keywords</label>
 		<input type="text" class="form-control" placeholder="Keywords describing your community, comma-seperated" data-field="keywords" /><br />
+		<label>Site Logo</label>
+		<input type="text" class="form-control" placeholder="Path to a logo to display on forum header" data-field="brand:logo" /><br />
 		<label>Imgur Client ID</label>
 		<input type="text" class="form-control" placeholder="Imgur ClientID for image uploads" data-field="imgurClientID" /><br />
 		<label>Maximum User Image Size</label>
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 4b25b60dcd..24584b68c8 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -40,9 +40,12 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a href="/">
-					<h1 class="navbar-brand forum-title">{title}</h1>
-				</a>
+				<div>
+					<img class="{brand:logo:display} forum-logo" src="{brand:logo}" />
+					<a href="/">
+						<h1 class="navbar-brand forum-title">{title}</h1>
+					</a>
+				</div>
 			</div>
 
 			<div class="navbar-collapse collapse navbar-ex1-collapse">
@@ -65,7 +68,7 @@
 					</li>
 					<!-- END navigation -->
 				</ul>
-				
+
 
 				<ul id="logged-in-menu" class="nav navbar-nav navbar-right hide">
 					<li>
@@ -106,7 +109,7 @@
 							</li>
 						</ul>
 					</li>
-					
+
 				</ul>
 
 				<ul id="logged-out-menu" class="nav navbar-nav navbar-right">
diff --git a/src/webserver.js b/src/webserver.js
index 69e8f6803b..850bbfae30 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -72,7 +72,9 @@ var express = require('express'),
 				templateValues = {
 					cssSrc: meta.config['theme:src'] || nconf.get('relative_path') + '/vendor/bootstrap/css/bootstrap.min.css',
 					pluginCSS: plugins.cssFiles.map(function(file) { return { path: file } }),
-					title: meta.config.title || 'NodeBB',
+					title: meta.config.title || '',
+					'brand:logo': meta.config['brand:logo'] || '',
+					'brand:logo:display': meta.config['brand:logo']?'':'hide',
 					browserTitle: meta.config.title || 'NodeBB',
 					csrf: options.res.locals.csrf_token,
 					relative_path: nconf.get('relative_path'),