added categories navigation item, ability to change logo url

install/data/navigation.json

@@ -1,4 +1,12 @@
 [
+	{
+		"route": "/categories",
+		"title": "\\[\\[global:header.categories\\]\\]",
+		"enabled": true,
+		"iconClass": "fa-list",
+		"textClass": "visible-xs-inline",
+		"text": "\\[\\[global:header.categories\\]\\]"
+	},
 	{
 		"id": "unread-count",
 		"route": "/unread",

public/language/en_GB/global.json

@@ -28,6 +28,7 @@
 	"pagination.enter_index": "Enter index",
 
 	"header.admin": "Admin",
+	"header.categories": "Categories",
 	"header.recent": "Recent",
 	"header.unread": "Unread",
 	"header.tags": "Tags",

src/middleware/middleware.js

@@ -198,6 +198,7 @@ middleware.renderHeader = function(req, res, callback) {
 		description: meta.config.description || '',
 		'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '',
 		'brand:logo': meta.config['brand:logo'] || '',
+		'brand:logo:url': meta.config['brand:logo:url'] || '',
 		'brand:logo:display': meta.config['brand:logo']?'':'hide',
 		allowRegistration: registrationType === 'normal' || registrationType === 'admin-approval',
 		searchEnabled: plugins.hasListeners('filter:search.query')

src/views/admin/settings/general.tpl

@@ -32,9 +32,12 @@
 	<div class="panel-heading">Site Logo</div>
 	<div class="panel-body">
 		<form>
-			<label>Site Logo</label>
+			<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 Logo"></input>
+			<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>
 </div>