From 59029a0ef096d767da7610ebb4d86493d756ead0 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Tue, 23 Jul 2013 16:43:02 -0400
Subject: [PATCH] minor tweaks to theme engine

---
 .gitignore                       |   1 +
 public/images/themes/default.png | Bin 0 -> 3559 bytes
 public/src/forum/admin/themes.js |   7 +++++--
 public/templates/header.tpl      |   2 +-
 src/meta.js                      |   2 ++
 src/webserver.js                 |   5 ++++-
 6 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 public/images/themes/default.png

diff --git a/.gitignore b/.gitignore
index 7ae63a58f6..93d4ccda41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,6 @@ sftp-config.json
 config.json
 public/config.json
 public/css/*.css
+public/themes/*
 *.sublime-project
 *.sublime-workspace
diff --git a/public/images/themes/default.png b/public/images/themes/default.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b2e6a05e741ca51457181c90c5bb9c8565a4d99
GIT binary patch
literal 3559
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
W*`~ed{uR)XK@4<_uN7T&dh~CMr5n)z

literal 0
HcmV?d00001

diff --git a/public/src/forum/admin/themes.js b/public/src/forum/admin/themes.js
index 54d0140be2..66b04a9de2 100644
--- a/public/src/forum/admin/themes.js
+++ b/public/src/forum/admin/themes.js
@@ -89,14 +89,17 @@ var nodebb_admin = (function(nodebb_admin) {
 		for(var x=0,numThemes=themes.length;x<numThemes;x++) {
 			liEl.setAttribute('data-theme', themes[x].id);
 			liEl.setAttribute('data-css', themes[x].src);
-			liEl.innerHTML =	'<img src="' + themes[x].thumbnail + '" />' +
+			liEl.innerHTML =	'<img src="' + themes[x].screenshot + '" />' +
 								'<div>' +
 									'<div class="pull-right">' +
 										'<button class="btn btn-primary" data-action="use">Use</button> ' +
 										'<button class="btn" data-action="preview">Preview</button>' +
 									'</div>' +
 									'<h4>' + themes[x].name + '</h4>' +
-									'<p>' + themes[x].description + '</p>' +
+									'<p>' +
+										themes[x].description +
+										(themes[x].url ? ' (<a href="' + themes[x].url + '">Homepage</a>)' : '') +
+									'</p>' +
 								'</div>' +
 								'<div class="clear">';
 			themeFrag.appendChild(liEl.cloneNode(true));
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 896c009e74..2215f0b742 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<meta name="title" CONTENT="NodeBB">
 	<meta name="keywords" content="" />
-	<meta name="description" content="" />
+	<meta name="description" content="{meta.description}" />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 	<meta name="apple-mobile-web-app-capable" content="yes" />
 	<link href="{cssSrc}" rel="stylesheet" media="screen">
diff --git a/src/meta.js b/src/meta.js
index c0e868569b..130edb312e 100644
--- a/src/meta.js
+++ b/src/meta.js
@@ -61,6 +61,8 @@ var utils = require('./../public/src/utils.js'),
 									fs.readFile(themeConfPath, function(err, conf) {
 										conf = JSON.parse(conf);
 										conf.src = global.nconf.get('url') + 'themes/' + themeDir + '/' + conf.src;
+										if (conf.screenshot) conf.screenshot = global.nconf.get('url') + 'themes/' + themeDir + '/' + conf.screenshot;
+										else conf.screenshot = global.nconf.get('url') + 'images/themes/default.png';
 										themeArr.push(conf);
 										next();
 									});
diff --git a/src/webserver.js b/src/webserver.js
index 3c692a5812..3065d71b99 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -31,7 +31,10 @@ var express = require('express'),
 			cssSrc: global.config['theme:src'] || global.nconf.get('relative_path') + '/vendor/bootstrap/css/bootstrap.min.css',
 			title: global.config['title'] || 'NodeBB',
 			csrf:res.locals.csrf_token,
-			relative_path: global.nconf.get('relative_path')
+			relative_path: global.nconf.get('relative_path'),
+			meta: {
+				description: 'test'
+			}
 		});
 	};