From 08fb30378a2f19a336b640e03ce54469f2113e93 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Mon, 17 Aug 2015 11:31:31 -0400
Subject: [PATCH] Closes #3302

- Fixes issue where the served path for the favicon was incorrect (included relative path when one was not needed)
- Also fixes issue where favicons were just plain not served for subfolder installations
- Fixed unsemantic HTML in ACP/General regarding Site Logo and Favicon fieldsets
---
 src/controllers/admin/uploads.js     |  2 +-
 src/middleware/index.js              |  2 +-
 src/views/admin/settings/general.tpl | 37 ++++++++++++++++++----------
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/controllers/admin/uploads.js b/src/controllers/admin/uploads.js
index 88509df0a0..8cdf5f81f3 100644
--- a/src/controllers/admin/uploads.js
+++ b/src/controllers/admin/uploads.js
@@ -38,7 +38,7 @@ uploadsController.uploadFavicon = function(req, res, next) {
 				return next(err);
 			}
 
-			res.json([{name: uploadedFile.name, url: nconf.get('relative_path') + image.url}]);
+			res.json([{name: uploadedFile.name, url: image.url}]);
 		});
 	}
 };
diff --git a/src/middleware/index.js b/src/middleware/index.js
index c7358ca5ac..51f7b10d05 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -22,7 +22,7 @@ var middleware = {};
 function setupFavicon(app) {
 	var faviconPath = path.join(__dirname, '../../', 'public', meta.config['brand:favicon'] ? meta.config['brand:favicon'] : 'favicon.ico');
 	if (fs.existsSync(faviconPath)) {
-		app.use(favicon(faviconPath));
+		app.use(nconf.get('relative_path'), favicon(faviconPath));
 	}
 }
 
diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl
index ae63b28cbf..9b3c0e73f2 100644
--- a/src/views/admin/settings/general.tpl
+++ b/src/views/admin/settings/general.tpl
@@ -31,25 +31,36 @@
 <div class="panel panel-default">
 	<div class="panel-heading">Site Logo</div>
 	<div class="panel-body">
-		<form>
-			<label>Image</label>
-			<input id="logoUrl" type="text" class="form-control" placeholder="Path to a logo to display on forum header" data-field="brand:logo" /><br />
-			<input data-action="upload" data-target="logoUrl" data-route="{config.relative_path}/api/admin/uploadlogo" type="button" class="btn btn-default" value="Upload"></input>
-			<br/><br/>
-			<label>URL</label>
-			<input type="text" class="form-control" placeholder="The URL of the site logo" data-field="brand:logo:url" /><br />
-		</form>
+		<div class="form-group">
+			<label for="logoUrl">Image</label>
+			<div class="input-group">
+				<input id="logoUrl" type="text" class="form-control" placeholder="Path to a logo to display on forum header" data-field="brand:logo" data-action="upload" data-target="logoUrl" data-route="{config.relative_path}/api/admin/uploadlogo" readonly />
+				<span class="input-group-btn">
+					<input data-action="upload" data-target="logoUrl" data-route="{config.relative_path}/api/admin/uploadlogo" type="button" class="btn btn-default" value="Upload"></input>
+				</span>
+			</div>
+		</div>
+		<div class="form-group">
+			<label for="brand:logo:url">URL</label>
+			<input id ="brand:logo:url" type="text" class="form-control" placeholder="The URL of the site logo" data-field="brand:logo:url" />
+			<p class="help-block">
+				When the logo is clicked, send users to this address. If left blank, user will be sent to the forum index.
+			</p>
+		</div>
 	</div>
 </div>
 
 <div class="panel panel-default">
 	<div class="panel-heading">Favicon</div>
 	<div class="panel-body">
-		<form>
-			<label>Favicon</label><br />
-			<input id="faviconUrl" type="text" class="form-control" placeholder="favicon.ico" data-field="brand:favicon" /><br />
-			<input data-action="upload" data-target="faviconUrl" data-route="{config.relative_path}/api/admin/uploadfavicon" type="button" class="btn btn-default" value="Upload"></input>
-		</form>
+		<div class="form-group">
+			<div class="input-group">
+				<input id="faviconUrl" type="text" class="form-control" placeholder="favicon.ico" data-field="brand:favicon" data-action="upload" data-target="faviconUrl" data-route="{config.relative_path}/api/admin/uploadfavicon" readonly />
+				<span class="input-group-btn">
+					<input data-action="upload" data-target="faviconUrl" data-route="{config.relative_path}/api/admin/uploadfavicon" type="button" class="btn btn-default" value="Upload"></input>
+				</span>
+			</div>
+		</div>
 	</div>
 </div>