closes #1182

public/src/forum/admin/themes.js

@@ -1,15 +1,20 @@
 define(['forum/admin/settings'], function(Settings) {
 	var Themes = {};
 
+	function highlightSelectedTheme(themeId) {
+		$('#themes li[data-theme]').removeClass('btn-warning');
+		$('#themes li[data-theme="' + themeId + '"]').addClass('btn-warning');
+	}
+
 	Themes.init = function() {
 		var scriptEl = $('<script />');
 		scriptEl.attr('src', 'http://api.bootswatch.com/3/?callback=bootswatchListener');
 		$('body').append(scriptEl);
 
 		var bootstrapThemeContainer = $('#bootstrap_themes'),
-			installedThemeContainer = $('#installed_themes'),
+			installedThemeContainer = $('#installed_themes');
 
-			themeEvent = function(e) {
+		function themeEvent(e) {
 			var target = $(e.target),
 				action = target.attr('data-action');
 
@@ -26,6 +31,11 @@ define(['forum/admin/settings'], function(Settings) {
 							id: themeId,
 							src: cssSrc
 						}, function(err) {
+							if (err) {
+								return app.alertError(err.message);
+							}
+							highlightSelectedTheme(themeId);
+
 							app.alert({
 								alert_id: 'admin:theme',
 								type: 'success',
@@ -37,7 +47,7 @@ define(['forum/admin/settings'], function(Settings) {
 						break;
 				}
 			}
-			};
+		}
 
 		bootstrapThemeContainer.on('click', themeEvent);
 		installedThemeContainer.on('click', themeEvent);
@@ -49,6 +59,10 @@ define(['forum/admin/settings'], function(Settings) {
 						type: 'local',
 						id: 'nodebb-theme-cerulean'
 					}, function(err) {
+						if (err) {
+							return app.alertError(err.message);
+						}
+						highlightSelectedTheme('nodebb-theme-cerulean');
 						app.alert({
 							alert_id: 'admin:theme',
 							type: 'success',
@@ -59,7 +73,7 @@ define(['forum/admin/settings'], function(Settings) {
 					});
 				}
 			});
-		}, false);
+		});
 
 		// Installed Themes
 		socket.emit('admin.themes.getInstalled', function(err, themes) {
@@ -69,7 +83,11 @@ define(['forum/admin/settings'], function(Settings) {
 
 			var instListEl = $('#installed_themes').empty(), liEl;
 
-			if (themes.length > 0) {
+			if (!themes.length) {
+				instListEl.append($('<li/ >').addClass('no-themes').html('No installed themes found'));
+				return;
+			}
+
 			for (var x = 0, numThemes = themes.length; x < numThemes; x++) {
 				liEl = $('<li/ >').attr({
 					'data-type': 'local',
@@ -89,10 +107,8 @@ define(['forum/admin/settings'], function(Settings) {
 
 				instListEl.append(liEl);
 			}
-			} else {
+
-				// No themes found
+			highlightSelectedTheme(config['theme:id']);
-				instListEl.append($('<li/ >').addClass('no-themes').html('No installed themes found'));
-			}
 		});
 
 		// Proper tabbing for "Custom CSS" field

public/templates/admin/themes.tpl

@@ -10,6 +10,11 @@
 
 	<div class="tab-content">
 		<div class="tab-pane active" id="themes">
+			<h3>Revert to Default</h3>
+			<p class="alert">
+				<button class="btn btn-warning" id="revert_theme">Revert</button> This will remove any custom theme applied to your NodeBB, and restore the base theme.
+			</p>
+
 			<h3>Installed Themes</h3>
 			<p>
 				The following themes are currently installed in this NodeBB instance.
@@ -27,10 +32,6 @@
 				<li><i class="fa fa-refresh fa-spin"></i> Loading Themes</li>
 			</ul>
 
-			<h3>Revert to Default</h3>
-			<p class="alert">
-				<button class="btn btn-warning" id="revert_theme">Revert</button> This will remove any custom theme applied to your NodeBB, and restore the base theme.
-			</p>
 		</div>
 		<div class="tab-pane" id="customise">
 			<h3>Custom CSS</h3>

src/meta.js

@@ -152,9 +152,7 @@ var fs = require('fs'),
 
 							db.setObject('config', themeData, next);
 						}
-					], function(err) {
+					], callback);
-						callback(err);
-					});
 				break;
 
 				case 'bootswatch':

src/routes/api.js

@@ -66,6 +66,7 @@ var path = require('path'),
 				config.topicsPerPage = meta.config.topicsPerPage || 20;
 				config.postsPerPage = meta.config.postsPerPage || 20;
 				config.maximumFileSize = meta.config.maximumFileSize;
+				config['theme:id'] = meta.config['theme:id'];
 				config.defaultLang = meta.config.defaultLang || 'en_GB';
 				config.environment = process.env.NODE_ENV;