From 1a1dd53ca14f8732ef920a2e2f6d96f2e85190fd Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Thu, 14 May 2015 16:49:19 -0600
Subject: [PATCH] * Moved themes from mods/art/themes > mods/themes/

---
 core/art.js                              |   4 ++--
 core/config.js                           |   2 +-
 core/menu_module.js                      |   1 +
 mods/{art => }/themes/NU-MAYA/APPLY1.ANS | Bin
 mods/{art => }/themes/NU-MAYA/MATRIX.ANS | Bin
 mods/{art => }/themes/NU-MAYA/theme.json |   0
 6 files changed, 4 insertions(+), 3 deletions(-)
 rename mods/{art => }/themes/NU-MAYA/APPLY1.ANS (100%)
 rename mods/{art => }/themes/NU-MAYA/MATRIX.ANS (100%)
 rename mods/{art => }/themes/NU-MAYA/theme.json (100%)

diff --git a/core/art.js b/core/art.js
index e732113d..369f56c1 100644
--- a/core/art.js
+++ b/core/art.js
@@ -285,9 +285,9 @@ function getArt(name, options, cb) {
 	if('' !== ext) {
 		options.types = [ ext.toLowerCase() ];
 	} else {
-		if(typeof options.types === 'undefined') {
+		if(_.isUndefined(options.types)) {
 			options.types = Object.keys(SUPPORTED_ART_TYPES);
-		} else if(typeof options.types === 'string') {
+		} else if(_.isString(options.types)) {
 			options.types = [ options.types.toLowerCase() ];
 		}
 	}
diff --git a/core/config.js b/core/config.js
index 926b7158..fd051bdd 100644
--- a/core/config.js
+++ b/core/config.js
@@ -106,7 +106,7 @@ function getDefaultConfig() {
 			mods				: paths.join(__dirname, './../mods/'),
 			servers				: paths.join(__dirname, './servers/'),
 			art					: paths.join(__dirname, './../mods/art/'),
-			themes				: paths.join(__dirname, './../mods/art/themes/'),
+			themes				: paths.join(__dirname, './../mods/themes/'),
 			logs				: paths.join(__dirname, './../logs/'),	//	:TODO: set up based on system, e.g. /var/logs/enigmabbs or such
 			db					: paths.join(__dirname, './../db/'),
 		},
diff --git a/core/menu_module.js b/core/menu_module.js
index 1e369598..f1bb4890 100644
--- a/core/menu_module.js
+++ b/core/menu_module.js
@@ -55,6 +55,7 @@ function MenuModule(options) {
 				if(_.isString(assetSpec.asset)) {
 					//	:TODO: think about this more in relation to themes, etc. How can this come
 					//	from a theme (with override from menu.json) ???
+					//	look @ client.currentTheme.inlineArt[name] -> menu/prompt[name]
 				}
 				break;
 
diff --git a/mods/art/themes/NU-MAYA/APPLY1.ANS b/mods/themes/NU-MAYA/APPLY1.ANS
similarity index 100%
rename from mods/art/themes/NU-MAYA/APPLY1.ANS
rename to mods/themes/NU-MAYA/APPLY1.ANS
diff --git a/mods/art/themes/NU-MAYA/MATRIX.ANS b/mods/themes/NU-MAYA/MATRIX.ANS
similarity index 100%
rename from mods/art/themes/NU-MAYA/MATRIX.ANS
rename to mods/themes/NU-MAYA/MATRIX.ANS
diff --git a/mods/art/themes/NU-MAYA/theme.json b/mods/themes/NU-MAYA/theme.json
similarity index 100%
rename from mods/art/themes/NU-MAYA/theme.json
rename to mods/themes/NU-MAYA/theme.json