* Distinct "menus" vs "prompts" for theme.json so conflicting names can occur

* Add support for theming prompts

core/menu_util.js

@@ -217,18 +217,18 @@ function applyThemeCustomization(options) {
 	//	options.name : menu/prompt name
 	//	options.configMci	: menu or prompt config (menu.json / prompt.json) specific mci section
 	//	options.client	: client
+	//	options.type	: menu|prompt
 	//
 	assert(_.isString(options.name));
+	assert("menus" === options.type || "prompts" === options.type);
 	assert(_.isObject(options.client));
-
-	console.log(options.configMci)
 	
 	if(_.isUndefined(options.configMci)) {
 		options.configMci = {};
 	}
 
-	if(_.has(options.client.currentTheme, [ 'customization', 'byName', options.name ])) {
-		var themeConfig = options.client.currentTheme.customization.byName[options.name];
+	if(_.has(options.client.currentTheme, [ 'customization', options.type, options.name ])) {
+		var themeConfig = options.client.currentTheme.customization[options.type][options.name];
 		Object.keys(themeConfig).forEach(function mciEntry(mci) {
 			_.defaults(options.configMci[mci], themeConfig[mci]);		
 		});

core/view_controller.js

@@ -397,6 +397,17 @@ ViewController.prototype.loadFromPromptConfig = function(options, cb) {
 					callback(err);
 				});
 			},
+			function applyThemeCustomization(callback) {
+				if(_.isObject(promptConfig)) {
+					menuUtil.applyThemeCustomization({
+						name		: self.client.currentMenuModule.menuConfig.prompt,
+						type		: "prompts",
+						client		: self.client,
+						configMci	: promptConfig.mci,
+					});
+				}
+				callback(null);
+			},
 			function applyViewConfiguration(callback) {
 				if(_.isObject(promptConfig.mci)) {
 					self.applyViewConfig(promptConfig, function configApplied(err, info) {
@@ -511,18 +522,15 @@ ViewController.prototype.loadFromMenuConfig = function(options, cb) {
 				if(_.isObject(formConfig)) {
 					menuUtil.applyThemeCustomization({
 						name		: self.client.currentMenuModule.menuName,
+						type		: "menus",
 						client		: self.client,
 						configMci	: formConfig.mci,
 					});
 				}
 
-				//console.log(test)
-
 				callback(null);
 			},
 			function applyViewConfiguration(callback) {
-				//
-				//	:TODO: need to merge configs from menu -> theme (specific) -> theme (default) -> defaults
 				if(_.isObject(formConfig)) {
 					self.applyViewConfig(formConfig, function configApplied(err, info) {
 						initialFocusId = info.initialFocusId;

mods/art/themes/NU-MAYA/theme.json

@@ -14,7 +14,7 @@
 				}
 			}
 		},
-		"byName" : {
+		"menus" : {
 			"matrix" : {
 				"VM1" : {
 					"itemSpacing" : 1
@@ -31,6 +31,12 @@
 				"ET8" : { "width" : 21 },
 				"ET9" : { "width" : 21 },
 				"ET10" : { "width" : 21 }
+			}			
+		},
+		"prompts" : {
+			"userCredentials" : {
+				"ET1" : { "width" : 21 },
+				"ET2" : { "width" : 21 }
 			}
 		}
 	}

mods/prompt.json

@@ -4,14 +4,12 @@
 		"mci" : {
 			"ET1" : {
 				"argName"	: "username",
-				"width"		: 15,
 				"maxLength"	: "@config:users.usernameMax"
 			},
 			"ET2" : {
 				"submit"	: true,
 				"argName"	: "password",
 				"password"	: true,
-				"width"		: 15,
 				"maxLength"	: "@config:users.passwordMax"
 			}
 		}