From 84915a1843f1393712cbf6dbb116e01fe7bf3913 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Sun, 6 Oct 2013 13:55:30 -0400
Subject: [PATCH] added css files support for plugins, added ready output for
 NodeBB, put some minification related outputs to debug-mode only

---
 public/templates/header.tpl |  3 +++
 src/meta.js                 |  4 ++--
 src/plugins.js              | 10 ++++------
 src/webserver.js            | 20 ++------------------
 4 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 9855e8a238..398c99de88 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -5,6 +5,9 @@
 	{meta_tags}
 	<link href="{cssSrc}" rel="stylesheet" media="screen">
 	<link rel="stylesheet" href="{relative_path}/vendor/fontawesome/css/font-awesome.min.css">
+	<!-- BEGIN pluginCSS -->
+	<link rel="stylesheet" href="{pluginCSS.path}">
+	<!-- END pluginCSS -->
 	<script>
 		var RELATIVE_PATH = "{relative_path}";
 	</script>
diff --git a/src/meta.js b/src/meta.js
index e4924882cb..32d30ec12f 100644
--- a/src/meta.js
+++ b/src/meta.js
@@ -186,7 +186,7 @@ var utils = require('./../public/src/utils.js'),
 					},
 					minFile: function (next) {
 						if (!fs.existsSync(Meta.js.minFile)) {
-							winston.warn('No minified client-side library found');
+							if (process.env.NODE_ENV === 'development') winston.warn('No minified client-side library found');
 							return next(null, 0);
 						}
 
@@ -196,7 +196,7 @@ var utils = require('./../public/src/utils.js'),
 					}
 				}, function (err, results) {
 					if (results.minFile > results.mtime) {
-						winston.info('No changes to client-side libraries -- skipping minification');
+						if (process.env.NODE_ENV === 'development') winston.info('No changes to client-side libraries -- skipping minification');
 						callback(null, [path.relative(path.join(__dirname, '../public'), Meta.js.minFile)]);
 					} else {
 						Meta.js.minify(function () {
diff --git a/src/plugins.js b/src/plugins.js
index f4d1eba646..75804e94c9 100644
--- a/src/plugins.js
+++ b/src/plugins.js
@@ -109,12 +109,10 @@ var fs = require('fs'),
 					function(next) {
 						// CSS Files for plugins
 						if (pluginData.css && pluginData.css instanceof Array) {
-							for(var x=0,numCss=pluginData.css.length;x<numCss;x++) {
-								_self.cssFiles.push({
-									plugin: pluginData.id,
-									path: path.join(pluginPath, pluginData.css[x])
-								});
-							}
+							if (global.env === 'development') winston.info('[plugins] Found ' + pluginData.css.length + ' CSS file(s) for plugin ' + pluginData.id);
+							_self.cssFiles = _self.cssFiles.concat(pluginData.css.map(function(file) {
+								return path.join('/plugins', pluginData.id, file);
+							}));
 
 							next();
 						} else next();
diff --git a/src/webserver.js b/src/webserver.js
index cea6550cf7..e03e3382df 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -63,6 +63,7 @@ var express = require('express'),
 			metaString = utils.buildMetaTags(defaultMetaTags.concat(options.metaTags || [])),
 			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',
 				browserTitle: meta.config.title || 'NodeBB',
 				csrf: options.res.locals.csrf_token,
@@ -119,27 +120,10 @@ var express = require('express'),
 
 				next();
 			},
-			function(next) {
-				// Static CSS files for NodeBB Plugins
-				plugins.ready(function() {
-					var file,x,numCss,route;
-					for(x=0,numCss=plugins.cssFiles.length;x<numCss;x++) {
-						file = plugins.cssFiles[x];
-						route = path.join(nconf.get('relative_path'), '/css/', file.plugin);
-						app.use(route, express.static(file.path));
-						if (process.env.NODE_ENV === 'development') winston.info('Plugin CSS file found: ' + route);
-						console.log('route', route);
-						console.log('path', file.path);
-					}
-
-					next();
-				});
-			},
 			function(next) {
 				// Static Directories for NodeBB Plugins
 				plugins.ready(function () {
 					for (d in plugins.staticDirs) {
-						console.log(plugins.staticDirs[d]);
 						app.use(nconf.get('relative_path') + '/plugins/' + d, express.static(plugins.staticDirs[d]));
 						if (process.env.NODE_ENV === 'development') winston.info('Static directory routed for plugin: ' + d);
 					}
@@ -148,7 +132,6 @@ var express = require('express'),
 				});
 			},
 			function(next) {
-				console.log('router');
 				// Router & post-router middlewares
 				app.use(app.router);
 
@@ -212,6 +195,7 @@ var express = require('express'),
 			templates['logout'] = parsedTemplate;
 		});
 
+		winston.info('NodeBB Ready');
 		server.listen(nconf.get('PORT') || nconf.get('port'), nconf.get('bind_address'));
 	}