From 6c38ff54d5a96a2d9ba02588c1346293ca05f1cf Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Tue, 22 Sep 2015 21:31:56 -0600
Subject: [PATCH] * WIP replacement NUA system

---
 core/view_controller.js         |   1 -
 mods/menu.hjson                 |  33 +++++++++++++++++++++-----------
 mods/themes/NU-MAYA/NUA.ANS     | Bin 0 -> 2680 bytes
 mods/themes/NU-MAYA/theme.hjson |  23 ++++++++++++++++++++++
 4 files changed, 45 insertions(+), 12 deletions(-)
 create mode 100644 mods/themes/NU-MAYA/NUA.ANS

diff --git a/core/view_controller.js b/core/view_controller.js
index d5d7d48f..4b544969 100644
--- a/core/view_controller.js
+++ b/core/view_controller.js
@@ -43,7 +43,6 @@ function ViewController(options) {
 		//	Everything else is forwarded on to the focused View, if any.
 		//
 		var actionForKey = key ? self.actionKeyMap[key.name] : self.actionKeyMap[ch];
-		//var actionForKey = self.actionKeyMap[key.name] || self.actionKeyMap[ch];
 		if(actionForKey) {
 			if(_.isNumber(actionForKey.viewId)) {
 				//
diff --git a/mods/menu.hjson b/mods/menu.hjson
index bfe1e3b0..751f5a92 100644
--- a/mods/menu.hjson
+++ b/mods/menu.hjson
@@ -81,7 +81,8 @@
 								},
 								{
 									value: { 1: 1 },
-									action: @menu:apply
+									action: @menu:newUserApplication
+									//action: @menu:apply
 								},
 								{
 									value: { 1: 2 },
@@ -175,10 +176,10 @@
 							argName: birthdate
 							maskPattern: "####/##/##"
 						}
-						//	:TODO: use a mask edit for this:
-						ET4: {
+						ME4: {
 							argName: sex
-							maxLength: 1
+							maskPattern: A
+							textStyle: U
 						}
 						ET5: {
 							argName: location
@@ -206,16 +207,26 @@
 							password: true
 							maxLength: @config:users.passwordMax
 						}
-						BT12: {
+						TM12: {
+							argName: submission
+							items: [ "Apply", "Cancel" ]
 							submit: true
-							text: Apply
-						}
-						BT13: {
-							submit: true
-							text: Cancel
 						}
 					}
-				}
+
+					submit: {
+						*: [
+							{
+								value: { "submission" : 0 }
+								action: @method:apply/submitApplication
+								extraArgs: {
+									inactive: userNeedsActivated
+									error: newUserCreateError
+								}
+							}
+						]
+					}
+				}				
 			}
 		}
 		"apply" : {
diff --git a/mods/themes/NU-MAYA/NUA.ANS b/mods/themes/NU-MAYA/NUA.ANS
new file mode 100644
index 0000000000000000000000000000000000000000..a53ce1e3aaf165647e877397ad9232787cd44709
GIT binary patch
literal 2680
zcmb_eO>fgc5N(fC>WK>?m*vnKME*!qs+`&?ph`qSYTy!aa2lsI^4gW{5Rmv$ZT?Q8
z`e$&fcr!ceI8G`qY}M??%)a+##^a<la(W%7=bvcR8o52+)vHx&<Y;W1i`Izt_=Hu#
zjvY@YFdrK$-69u2)LbnVW`^>N^OJ$HM281tCPcT_VeWEap_W2xeM@#V5{Q!aM2VTz
ztudY!#7eehSpzWyi`By3Tv{=N0!PxIacHh$0Y#+Fpkc-2*0F*qS*bPiHQ=n{Sgt5c
zlV9K0_thG#)_WZ`35FBAOf6a?5{1($zYJmX^|*v*E!GX=eHF}Vg{2|4H}97Vdvl8t
zfEz%M6;R0;Wh3RcnKXKIIE@d$=7hm@$51%KzfFvJ0!%S&BFhqW;_@N^fa|b<LzU-+
zQptOAq*5ibH?<Q@0LG4m<evdqp^cur>c;h&VCnIy_^~#4te5d&t5lSwf@l&~^+RbR
zWQASv?Q*M$Q<r9Y0~-v5ziRN!b?lJs<31<abZQTK*|I)^!S^3(Vrs`LKBf}UT@y?K
zTu+C5=IJ@77{(bN=k`3a=K-JJ-Nn&$P(-O*OC(%qcB$bxV3W{VFX7$cpBgg@F=_3h
zWwyt{HcxBR6-e9xBq+KD<H6=weUMy5ajeo=p^Dp3P186|=TUN_qGXz8n$#xhI>^H5
zERKJ*f#&E-xtRP2;%K7MOpVi<S*|8Q5vVN8XK|4e3(8;;;OHoU;d^*Za0X;}b}leV
zr$546jl*IdhKZU+VLZv-GE@HwqD?M>aher*+u-7LO7By)P`@x&ZNJ$=8(KUn5-REG
zJj{}SYRE8c9t3pMAG$b{ncl~~zb2DDtYY(YCU{{GQ@9$>2IDud1=<s6%nVIss^S2+
zqGqp+hWN37M_F;pY!k~?)FWZCLEmRGo_EASRB&)E%&VmqQZAt3PZ4Lbvrf^V-w|lc
zJD|<?9k+jLbYep!!bUu?Fs0lWNZocZj+v=H#LP_eJ<DF4sYbdea}5eKAJ=0#jba2=
zBWSk?67}v11?FZj4KUl<I*1^B1IvP)2pDDtYgV{cTwXR9<{~#7bA7G)$poEMlP}8O
z3mN97^6g~b33QO>^EAVgQ`0Yar-Fz1-+0%8mnPFFqjwB_t;nMyc&;OWv>-%}-ev4a
z!SAfzMnZgjH2mbEA?b35UurH<buW&F1DCo9zeDH?ShkKnJUBdfhcQxKM}4E!v*Y)(
xmWJW=)!CPezT@EM&Hoyn;~qPwp7ZC$-roNH=e<{ZJYHU&57gI>XJ%J@{sqe2Li_*#

literal 0
HcmV?d00001

diff --git a/mods/themes/NU-MAYA/theme.hjson b/mods/themes/NU-MAYA/theme.hjson
index 9e394cf2..233f0b6f 100644
--- a/mods/themes/NU-MAYA/theme.hjson
+++ b/mods/themes/NU-MAYA/theme.hjson
@@ -56,6 +56,29 @@
 				ET10: { width: 21 }
 			}
 
+			newUserApplication: {
+				ET1: { width: 21 }
+				
+				ET2: { width: 21 }
+				
+				/*ME3: {
+					styleSGR1: |00|30|01
+					styleSGR2: |00|37
+					fillChar: "#"
+				}*/
+
+				//ET4: { width: 1	}
+				ET5: { width: 21 }
+				ET6: { width: 21 }
+				ET7: { width: 21 }
+				ET8: { width: 21 }
+				ET9: { width: 21 }
+				ET10: { width: 21 }
+				TM12: {
+					focusTextStyle: first lower
+				}
+			}
+
 			lastCallers: {
 				TL1: {
 					resizable: false