From 3ffccc35dab8b8f52b025241a24dc0e19ff8aa93 Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Mon, 21 Dec 2015 18:07:03 -0700 Subject: [PATCH 1/4] Switch to Renegade style color codes as default pipe code system --- core/client_term.js | 2 +- core/color_codes.js | 74 ++++++++++++++++++++------------------ core/connect.js | 6 ++-- core/vertical_menu_view.js | 4 +-- 4 files changed, 45 insertions(+), 41 deletions(-) diff --git a/core/client_term.js b/core/client_term.js index 7b367583..2cf90ac3 100644 --- a/core/client_term.js +++ b/core/client_term.js @@ -159,7 +159,7 @@ ClientTerminal.prototype.rawWrite = function(s) { }; ClientTerminal.prototype.pipeWrite = function(s, spec) { - spec = spec || 'enigma'; + spec = spec || 'renegade'; var conv = { enigma : enigmaToAnsi, diff --git a/core/color_codes.js b/core/color_codes.js index 1efbb071..3ccb9029 100644 --- a/core/color_codes.js +++ b/core/color_codes.js @@ -7,10 +7,10 @@ var getPredefinedMCIValue = require('./predefined_mci.js').getPredefinedMCIValue var assert = require('assert'); var _ = require('lodash'); -exports.pipeToAnsi = exports.enigmaToAnsi = enigmaToAnsi; +exports.enigmaToAnsi = enigmaToAnsi; exports.stripPipeCodes = exports.stripEnigmaCodes = stripEnigmaCodes; exports.pipeStrLen = exports.enigmaStrLen = enigmaStrLen; -exports.renegadeToAnsi = renegadeToAnsi; +exports.pipeToAnsi = exports.renegadeToAnsi = renegadeToAnsi; // :TODO: Not really happy with the module name of "color_codes". Would like something better @@ -83,13 +83,13 @@ function enigmaStrLen(s) { return stripEnigmaCodes(s).length; } -function renegadeToAnsi(s) { -if(-1 == s.indexOf('|')) { +function renegadeToAnsi(s, client) { + if(-1 == s.indexOf('|')) { return s; // no pipe codes present } var result = ''; - var re = /\|(\d{2}|\|)/g; + var re = /\|([A-Z\d]{2}|\|)/g; var m; var lastIndex = 0; while((m = re.exec(s))) { @@ -101,42 +101,46 @@ if(-1 == s.indexOf('|')) { } // convert to number - val = parseInt(val, 10); + val = parseInt(val, 10); if(isNaN(val)) { - val = 0; + val = getPredefinedMCIValue(client, m[1]) || ('|' + m[1]); // value itself or literal } - assert(val >= 0 && val <= 23); - var attr = ansi.sgr({ - 0 : [ 'reset', 'black' ], - 1 : [ 'reset', 'blue' ], - 2 : [ 'reset', 'green' ], - 3 : [ 'reset', 'cyan' ], - 4 : [ 'reset', 'red' ], - 5 : [ 'reset', 'magenta' ], - 6 : [ 'reset', 'yellow' ], - 7 : [ 'reset', 'white' ], + if(_.isString(val)) { + result += s.substr(lastIndex, m.index - lastIndex) + val; + } else { + var attr = ansi.sgr({ + 0 : [ 'reset', 'black' ], + 1 : [ 'reset', 'blue' ], + 2 : [ 'reset', 'green' ], + 3 : [ 'reset', 'cyan' ], + 4 : [ 'reset', 'red' ], + 5 : [ 'reset', 'magenta' ], + 6 : [ 'reset', 'yellow' ], + 7 : [ 'reset', 'white' ], - 8 : [ 'bold', 'black' ], - 9 : [ 'bold', 'blue' ], - 10 : [ 'bold', 'green' ], - 11 : [ 'bold', 'cyan' ], - 12 : [ 'bold', 'red' ], - 13 : [ 'bold', 'magenta' ], - 14 : [ 'bold', 'yellow' ], - 15 : [ 'bold', 'white' ], + 8 : [ 'bold', 'black' ], + 9 : [ 'bold', 'blue' ], + 10 : [ 'bold', 'green' ], + 11 : [ 'bold', 'cyan' ], + 12 : [ 'bold', 'red' ], + 13 : [ 'bold', 'magenta' ], + 14 : [ 'bold', 'yellow' ], + 15 : [ 'bold', 'white' ], - 16 : [ 'blackBG' ], - 17 : [ 'blueBG' ], - 18 : [ 'greenBG' ], - 19 : [ 'cyanBG' ], - 20 : [ 'redBG' ], - 21 : [ 'magentaBG' ], - 22 : [ 'yellowBG' ], - 23 : [ 'whiteBG' ], - }[val] || 'normal'); + 16 : [ 'blackBG' ], + 17 : [ 'blueBG' ], + 18 : [ 'greenBG' ], + 19 : [ 'cyanBG' ], + 20 : [ 'redBG' ], + 21 : [ 'magentaBG' ], + 22 : [ 'yellowBG' ], + 23 : [ 'whiteBG' ], + }[val] || 'normal'); + + result += s.substr(lastIndex, m.index - lastIndex) + attr; + } - result += s.substr(lastIndex, m.index - lastIndex) + attr; lastIndex = re.lastIndex; } diff --git a/core/connect.js b/core/connect.js index cd20a619..67ab1c1f 100644 --- a/core/connect.js +++ b/core/connect.js @@ -78,9 +78,9 @@ function prepareTerminal(term) { function displayBanner(term) { term.pipeWrite( - '|33Conected to |32EN|33|01i|00|32|22GMA|32|01½|00 |33BBS version|31|01 |VN\n' + - '|00|33Copyright (c) 2014-2015 Bryan Ashby |33|01- |31|01http://l33t.codes/\n' + - '|00|33Updates & source |01- |31|01https://github.com/NuSkooler/enigma-bbs/\n' + + '|06Conected to |02EN|10i|02GMA|10½ |06BBS version |12|VN\n' + + '|06Copyright (c) 2014-2015 Bryan Ashby |14- |12http://l33t.codes/\n' + + '|06Updates & source |14- |12https://github.com/NuSkooler/enigma-bbs/\n' + '|00'); } diff --git a/core/vertical_menu_view.js b/core/vertical_menu_view.js index 90fc566e..72bc2a40 100644 --- a/core/vertical_menu_view.js +++ b/core/vertical_menu_view.js @@ -89,8 +89,8 @@ function VerticalMenuView(options) { // :TODO: Need to support pad() // :TODO: shoudl we detect if pipe codes are used? self.client.term.write( - ansi.goto(item.row, self.position.col) + - colorCodes.enigmaToAnsi(text) + ansi.goto(item.row, self.position.col) + + colorCodes.pipeToAnsi(text, self.client) ); } else { From ca8373bded510042011480c2c9a78219c24b6726 Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Mon, 21 Dec 2015 18:07:29 -0700 Subject: [PATCH 2/4] Removal of NU-MAYA theme --- mods/themes/NU-MAYA/APPLY1.ANS | Bin 3924 -> 0 bytes mods/themes/NU-MAYA/LASTCALL.ANS | Bin 1550 -> 0 bytes mods/themes/NU-MAYA/MATRIX.ANS | Bin 3327 -> 0 bytes mods/themes/NU-MAYA/MMENU1.ANS | Bin 3780 -> 0 bytes mods/themes/NU-MAYA/MNUPRMT.ANS | Bin 255 -> 0 bytes mods/themes/NU-MAYA/MSGBODY.ANS | Bin 177 -> 0 bytes mods/themes/NU-MAYA/MSGEFTR1.ANS | Bin 335 -> 0 bytes mods/themes/NU-MAYA/MSGEHDR1.ANS | Bin 1801 -> 0 bytes mods/themes/NU-MAYA/MSGEHLP.ANS | Bin 3485 -> 0 bytes mods/themes/NU-MAYA/MSGEMFT1.ANS | Bin 225 -> 0 bytes mods/themes/NU-MAYA/MSGHDR1.ANS | Bin 199 -> 0 bytes mods/themes/NU-MAYA/MSGQUOT.ANS | Bin 516 -> 0 bytes mods/themes/NU-MAYA/MSGVFTR1.ANS | Bin 227 -> 0 bytes mods/themes/NU-MAYA/MSGVHDR1.ANS | Bin 1832 -> 0 bytes mods/themes/NU-MAYA/MSGVHLP.ANS | Bin 3570 -> 0 bytes mods/themes/NU-MAYA/NUA.ANS | Bin 2729 -> 0 bytes mods/themes/NU-MAYA/NUAFDBK.ANS | Bin 262 -> 0 bytes mods/themes/NU-MAYA/PAUSE.ANS | Bin 253 -> 0 bytes mods/themes/NU-MAYA/STATUS.ANS | Bin 2383 -> 0 bytes mods/themes/NU-MAYA/SYSSTAT1.ANS | Bin 3954 -> 0 bytes mods/themes/NU-MAYA/USERLOG.ANS | Bin 1816 -> 0 bytes mods/themes/NU-MAYA/theme.hjson | 119 ------------------------------- 22 files changed, 119 deletions(-) delete mode 100644 mods/themes/NU-MAYA/APPLY1.ANS delete mode 100644 mods/themes/NU-MAYA/LASTCALL.ANS delete mode 100644 mods/themes/NU-MAYA/MATRIX.ANS delete mode 100644 mods/themes/NU-MAYA/MMENU1.ANS delete mode 100644 mods/themes/NU-MAYA/MNUPRMT.ANS delete mode 100644 mods/themes/NU-MAYA/MSGBODY.ANS delete mode 100644 mods/themes/NU-MAYA/MSGEFTR1.ANS delete mode 100644 mods/themes/NU-MAYA/MSGEHDR1.ANS delete mode 100644 mods/themes/NU-MAYA/MSGEHLP.ANS delete mode 100644 mods/themes/NU-MAYA/MSGEMFT1.ANS delete mode 100644 mods/themes/NU-MAYA/MSGHDR1.ANS delete mode 100644 mods/themes/NU-MAYA/MSGQUOT.ANS delete mode 100644 mods/themes/NU-MAYA/MSGVFTR1.ANS delete mode 100644 mods/themes/NU-MAYA/MSGVHDR1.ANS delete mode 100644 mods/themes/NU-MAYA/MSGVHLP.ANS delete mode 100644 mods/themes/NU-MAYA/NUA.ANS delete mode 100644 mods/themes/NU-MAYA/NUAFDBK.ANS delete mode 100644 mods/themes/NU-MAYA/PAUSE.ANS delete mode 100644 mods/themes/NU-MAYA/STATUS.ANS delete mode 100644 mods/themes/NU-MAYA/SYSSTAT1.ANS delete mode 100644 mods/themes/NU-MAYA/USERLOG.ANS delete mode 100644 mods/themes/NU-MAYA/theme.hjson diff --git a/mods/themes/NU-MAYA/APPLY1.ANS b/mods/themes/NU-MAYA/APPLY1.ANS deleted file mode 100644 index c6196ea4c1374c89c2ae254bbe311760eef0bc5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3924 zcmb`KO>g8x5Qei?B)D)vn~OO_3epO>$McaWr(_iY(k_bFEF9)EkVK3WCsMKq_*ZTJ z6^?e~zq0RJRsG?a%JSO*-(|O&t4gQuj?BIG*hj~16cJO{^+fP_@L%U@FAF`&4 zkQ;>dD4<0*SOgiVAd(#n9?Js_$VA5r07Hm5X+6m}*V&xfS{SsEDK!Z;@;yV9Sk)-3 zv1Oxv=_fPM#o5m&UaAdf74&kKXMrcGBobxqs0d|og)l@o40WcZlg5o6+S zV84rrx{hKDI%phYtu&UTd9+DuMXf&NN4^_NnYoe*TBuArRmybgylc!`3g*ua}XK};QrlS)PW&T-F=x$yY zkgewi9^g`Skm}h|B_>ql9MQ%AxfRDy0hwDglCtZB2`;Ah__M88v@BT364@+^%TJ;MX#8Ypr>}abe(W`M@=b+?-(F^TGthR@E}4pq{suy zFJk5D>(y=X^Qulb^beLv#xmhMIH_2sJYpe|Ffm0u#iE2(hk_P}x?+UHDDX*O0uQ*) zjAs4t;m@npzcv|^d3#B42>7je|KBQ}ERH>@8kWk&SD}wBU{%m23;s7eD31Udb*EdX%UB!ETkY7Y(!;OUTiW+{RVP|6oxH?w*ZiIKfi z!@9Xy-##X&Sl9CmYi?MRP}fq?tXF17K1La9CxJMcK3r9|#Dk*p-4hf;YVD}g%?+M& zZcppXr5b>dnv( zEOac+#1%y&f&rNX+!F$g9|d}V?UxrPReG(0{K|Tf5o8W&kpoQI zkvI$&ZTPNkz>i;juD<*0TMOMFTKVIqpeErke+v3+BPW35XKLY;^HrfCH diff --git a/mods/themes/NU-MAYA/LASTCALL.ANS b/mods/themes/NU-MAYA/LASTCALL.ANS deleted file mode 100644 index ce09facde5362e4b5ecb690a9e9744fdb0872192..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1550 zcmbtTO-sW-5UmFNjD{6PFh3+1;LL?Pa>8Uj6Ep$EBr4>|IRM-ulQzW zce6?AMYlBBdGqG&d~A|MT4rUQmO86;v=RWkPZo@H?O-tzgb1iP{tu62p><`<&d^F0 zxh{2DS&JP~A&-G5{h7hfeXM{*fvsE%)}*W}MF`c*oM1*iK38nDZ?QmQluNsyv_-5T z@q!I0L2>f6GS(2^5-sqBLRs~oAtDXx(Odyi5S@fLUmt;fZ)yW?BZw~u7P`>I;A5C_ z-Ex1zi5eY)FRsm)ZH>IR4R|!BCN*ltfJ%|ROI&rsx%0f~L>~8mWVSA6qVS+lkLPVaH=2JLohGMx|G>&Y1W(CD@)jJBq4hcqAO4(H=3QS$_9yvMyy r?$00RmucEg{NKB2n$6N;I{Q8xjSdd(M#m#wN7om(>gnoStnmB+w_9cN diff --git a/mods/themes/NU-MAYA/MATRIX.ANS b/mods/themes/NU-MAYA/MATRIX.ANS deleted file mode 100644 index 456eddf81ec9dcd2e1a1b87f1dd2881c0a151e61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3327 zcma)8v2GMG5WVztG>9~&K!R>Jdt8vN3MYgp5+OyTxhe$(0uw3XBxv}iyZfEBw7jW&_tvx$_^E`eY@9DN#x9erI?pi;bZkMg^@!w4Q_8zXS51B{o54}zvhy74k z_&$O7ig)ok8>E2iZY8W%{)i~RTKRs`-08OELc($Kg2RD?MhY0R6($?NifmXjs~C$x zIXn6n9$-Y;a9pl@nDf?1^g`mRjqf^tJZN*ydeMN#XhRRtxj#rl=l9N8d}S&Llzo=; zF}V62ltC?RAXP9xycvakW^#$xp51-Ewi&)4rwNB~ZnBLgffGB|IB;poUXmBWf$4Lz z5RrZY9ARoE<$O3q%#gOkfJey$ZYO0TA-T-XN65J7;2fNE)8*9Q&l>5A7=x`N&E=8_ zNADCL`sG0PQE(usE@?(ir1AkBCJ5Y`ji4Y^7FD0l0j4{rOSe%G%+#0Yk$)D5gd`Yg zdoG<+lR!mq0JG`h+he-grel(S2U%`{b>Pn5S2fRCh*Gx}xx;Rw-GgFTtQtya`h9>;Tyr{|8UKWTGNs{wNeV#a2@c zt7K=VuU7%fiK9nBgHn+r)jN5m8=GgU#-J461dw@)H$e!)z>tXw2YH)Jm6_Q&kjyynJg+LL$N#%QS{N%J_!YdMz0pdPYV?2Ym5SHzK_bxgcx~A zt&~)X{FzU1G8q>Tq#=Tu`*#EGz8)1Yn(-gQ#QYH#}+0fCx@X}6bDo2DRPom z>Wp_RO4wfL&QL4BlhgP3?TrtC2TJ*zu}Cus3!HL-${K1j`sg0(&~jr=R$`@Cu3h^g z!}f3sxkYw$hDxo_ diff --git a/mods/themes/NU-MAYA/MMENU1.ANS b/mods/themes/NU-MAYA/MMENU1.ANS deleted file mode 100644 index 68c690f34630b20b448fe532008d008ec592f85b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3780 zcmb_e!EO^t5Dix(xNuuv%pc6`1c%6{5Fx~2C8X7I@yUP%kd5CuAUgUFo(q5UDfsK)vKDBEUNiwHE+(sbh2og&~67jZQFM3fDPTQL*J)G6L8)Y z4_)xcUizOL=w14Y;ZA(SY4_xDvTj0Wzw7yFJ#XqTAUGh_p|ukL5MBEN%O=29 zosRhoWln+$`5+x0Xqt=~w$YnWiqum~31Yzdv@OU|l+vgbk`id<0L#**7ixV-Lija5 zd+<`l`q4UpF#@+VAb~t-!hUy95GZ*WT}skM|8xqF;+@hW%^4yJ1kgS$RKh~1$gGZu ztn0w9MCR2I`C$v>ytNMdh|}F;1(6Ceyq6Rb^U{EPOTs+XZif)yfIL(3LWH4S_t^3eYNk=JtfW_3y1KezW26c3-S@(U^`T=+~ zvZ)>;%dSxU=FU=IX&_UFBnf*cR{N53RF!VsFl3B0#C>(kT6c7SerN$bJHIT_9G0oX z3W8Gy&34@u5D5nB9nGh21ve5@Z8P+^{U}Ly(XcD{@sk#KB7SFY7jwS3ZE0DRUQX0> zkmE^H_(B)MBqK?o@&4v6r{P$1g|&lXG^gm=-oPvASVt9+xBa*oi+5)%wiHdj7g9$I zB?~@PRf{qTt$DmX-op+uekVmmWgPgu<6WW%hNN?lGO%M?H(sDzrAzh^0fhffw9@UT z&Ah3?&HeMqf}d-yoe(BNh3)8L!O6fH&or6m7f_HG>M~{B1e|MFRE$B9kG^R@R-A>B zhE0)tA1pyD4uv5Fi#BEI+SD+JM=(ku@d4(3>-V9!pc*ZCm3!eKV}esa_r&Jmyw;TV zF%VkrK|VX5u2oaz$nRj>dln{(7nc%1@Wie2xFt(<*vXK#p*su(8(Ao*P=4ZVFXL@a zf|v|r#iv-DLunyzzqGUx`!@kp&#ap{w-wf8`lO`2YX_ diff --git a/mods/themes/NU-MAYA/MNUPRMT.ANS b/mods/themes/NU-MAYA/MNUPRMT.ANS deleted file mode 100644 index 5b10c3d0ce7d7e0f91bb76f1041a663915bb34e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 255 zcmb1+Hn27^ur@Z&Rk(9|Kp=60Md5<{>IzV(I)2B#z4spKo-O_u(HVf(jtZA{M_8cycDn@2D$bi1B`Q3T|3>2sbj0_A-4J?h!>KGUp7#RZ?n1M792zxsDDulT^LU?cz082$Tp8x;= diff --git a/mods/themes/NU-MAYA/MSGBODY.ANS b/mods/themes/NU-MAYA/MSGBODY.ANS deleted file mode 100644 index 78771ade371cdfb9432bd6d994388e43ca490783..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmb1+Hn27^ur@Z&RrL)q5^mKzIJ2;^H? zfpi+?x&}Lg^&phm!VK|E%_{|}0owsFL_q;0mkSg$2I@kx(JU7vgDQZ+H_Y|TPf3Ma z4zmL2P9t6}sbI%YXIBFQpz+iKMh1qa2IdB)=NK3m7#RZ?7=bhp2zxsDDulT^LU?cz E03N+S(*OVf diff --git a/mods/themes/NU-MAYA/MSGEHDR1.ANS b/mods/themes/NU-MAYA/MSGEHDR1.ANS deleted file mode 100644 index 69546953dd98240708676ec817e2227c61e750b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1801 zcmb_cJ#Q015Oo?PEV-h?%~7Pa_P%V;RVE4uiAYFsXs!Z@25E?dl>flb@$KK)i|?Nx z-kbgKok>zLgKqIGa0bJ{xr75s08LmBI6NE4dgjO`ys$aJlL&{gDht_a zaE1K-@y&~jtX3;NCFfV$df670&)*?(54S1H_efA6HL&#%gT(7#YQ*+OmYhpSNnZq; zVW0Wjj1r@<{~s~IYYM@qvWp7AwkE%b5w~is$DE}Q5%S@|u>vC4NeK`v>r1SKmkLD@ zj^W@21%o6)ek7P3rO)^@Biy7*WPebUAp16mMr7|k=SQ;lk?dnES~erT@fbU70=qu3Ee8KNl( zUW@VoB&lWo!mmEXqJMPJna&(+kYkP#Yll4?`N^HY`S`sMUE>i`s4JSI9)c!G?8q8J zV`OgR*WDX7w!gCHAmW(Rkr|laykV1Sk0G43p7hVgdT3=3+I}&AeZ9T8xHKkvzEzmK fHt)>l&x_gY?Ci_z^mQ$$+zQXkB&_nY}b4@SnxnYe>gZi_)HQ)xR}L(v*eSRmYfQEv?Xo-GBLEID&m1Cb zEOFqF9iTCJWHXirj!58KZp&qYks;6{wq~5chz*_=@d+0mCzs6050oK%VU6(y%H$T# zle|ctZK-F>%|p`D&@;be)fn!jNH^-hhHVH5fE2M_Z=uCvjX9f(Th2VCO$m}i`Ij(j zW8fay9Xr}?Esmb7NJ=*VYjo_2T>m)GH3`zvgJeFxni-7HLDbMEWvG7m2!GW?3>_sPti)6xyKH*ho8DS^helN(aOH zY?h{K8P+t2_Tt{E9emn6^r$2X+{B5 z#C@U z*m;Hb2U>Mnhz~ELcqel>(QG!G)pi3*=Wi#6$X}M@H%Liopk%iT@ME*XKqWs_l25J~ z==-QPmtn~Na=C_iqvDb$K8R|DBM^=g?$i~WIhcZH0k8+EG!O$W7tLtA!+(Z~evwYe5tSZ$ z-;~~|ZV6p*V>pfai{ZshuOCJ7ZF=JREQ;Sm=kfW=My+;oa$P&E(e>>8+kv`$cfq^j F{tM_#^9cX| diff --git a/mods/themes/NU-MAYA/MSGEMFT1.ANS b/mods/themes/NU-MAYA/MSGEMFT1.ANS deleted file mode 100644 index 6c3342045ca359888ca816fab3242f00dfdd1790..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 225 zcmb1+Hn29dHZia^Hpo?w26BuIb5%Wj4W*-jqK4MS#$cXCs3uS@S326%$QdL9RBUAh zR1Q?^8VnRMHU()0irT`=a8AriPR-%vk_vVVb#^r{P@o<#GB7kXFgLJBU|?WiWDH1ZPp=it($ zEGu3vx1#)9kbsf1rwfoP73>)5>}p`3Ks{h&U}$P!W@O^Vz`(%B7{I^`q=7)#)5%vM K%-s>fgOdQWn{l5QU*7Ar^MhY-2ymdZ8e0QSRiwk`>!+_mbooHItcC94D*n&9jv1bl5XhGg)m_eJ~cy pMEK`>gH^i8CIIYv6$1Z(7{u9i9M_#YJ;zjkHqKcwP3_mS-vL)0nUw$l diff --git a/mods/themes/NU-MAYA/MSGVFTR1.ANS b/mods/themes/NU-MAYA/MSGVFTR1.ANS deleted file mode 100644 index 3b1c40943274770f0951124b751daec804608573..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 227 zcmb1+Hn27^ur@Z!jaHD3HncW2%$1OolLxYaf`+-O9=?VkVH2Q?F_dSJD;;fW=nPhE zl&c!zW2OL6Zj`GJG6N)J4%Tm$8_UZj73>)5>}p`3Ks{h&U}$P!X<(kjz`(%B7{I^? Sq=7)#)5%vM%-s>fgOdOVv?b2~ diff --git a/mods/themes/NU-MAYA/MSGVHDR1.ANS b/mods/themes/NU-MAYA/MSGVHDR1.ANS deleted file mode 100644 index 6bb0f6355a04b69d3d04246168619cac6326474d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1832 zcmb_cJ#X7E5OtOU4Unl@wWvc^gZi=&XmZmJ6i9#qal2?rfh+~s07dhgx?1`>RIPtf z^u0ThmgKrqIM~$P@p$jOJ0^{(OH&tx?UJS}>LQnou|v|pIQWH+l}#rm@pK^o|9U>N zJ8Y0K=LV;kXf0>4A81?Kq^YjdIrTEzBz*eas&jN2{i*XhCkP~nk>%2{%nObZ;$N)%zH%seW=bU45EC*WUfW{Zr z{SF4wncI!z$?cE(yWm(ZmoVD&_047ujUtI!JiMY*ntWXMsBqT7RCG(=;9M*mP9TfL zgDGUjwLL}cB0$6(0T2m`OVw~6ibP~o8Ysb{NZ=X!7mF;xA=KEeKQQH7yqpw<`%~;w z)n_D*z&Qp%Rz*foB!oeAg`u>+7c*#oKr?Ec;*Q*JuQQJe87eXjYH+raR?gT(0T}BY z9GfR#oOBN{vNdhjAxnvV@}K_04M7sv4^(p)e_kmVFr!D71k zxI@QapNu@rP#MF`0N1l6_yXYFnX3jSRW-a#d*q5^@dq9WW@DdRk#=G}elp&A4(@*5 zhtzW-s?fXLu*3cOu*a$txEe7~S}KjQLO4YCo@nVt(Rd<8;l_S{e8rj9BRf7jd`0C& z9nBZ#SLO&6udGZn|4*$Hj;_Bre|fw4eD%(l^yyY^vdUbV^{;1(#o5`X#q))%7a!l; Mq+dR4^eg`U1>LQHQ~&?~ diff --git a/mods/themes/NU-MAYA/MSGVHLP.ANS b/mods/themes/NU-MAYA/MSGVHLP.ANS deleted file mode 100644 index 5fed6314d3a702d79729377a8f571dcfa919e86e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3570 zcmeHJ!EVz)5KXU~uVdse6@Q+V*40yu%3Sc0J ztlGDS$6dLCw+HAdm+cD?Wp=lXb_P+G87eWin!duHII)`lzgg^S^0r7gwL%pUPqbi z!j&Y?lUKIXGx}9R(yVK)T(WwM>LpLMn&1uF5E1|>e7W92i}@0B){kmAJxhZM#6Z=T zFl%jKFBKz2wA~gsnpu&Qb^wLZ@BR_>x4Tf28XegW(=-@|;&dJc;yMa%#G5dl?Q;+E z88JI3=ATXh>+??>Ko9xy95*U22d99JLbNgRuX zTT_#(I!=M?hY=L_#()zI=HW6*7HLgDCYmjtoVu-%<00qJ!F)LEN5ZRMGzs;I zFW+$*(=>6EW)2=br7a(G%K`RUjTZX@IO8;D3po>6QX_>4NeA$RTT%cu`R@_r8@r@TOqj8WytEAC%EV4-`;%Gd{M!_5so-RZ(7bDOg=7UkP48c%|F*OfgDTAnHc(1}cihY%HUSyODb-@4&$Ay)cin|>e zIPN2mYgb~O@LKDDSRPyiWgAEYwoKs{B%^Eg|63}RxKdhIRc!qVEvZ6iz;4Z|Xjt?G RdLF!e(HGaRPt_=Y{{+Xb9s~dY diff --git a/mods/themes/NU-MAYA/NUA.ANS b/mods/themes/NU-MAYA/NUA.ANS deleted file mode 100644 index 780ad55df79871c214fe52bcfcc3579dd29d2247..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2729 zcmb_eO>5gg5KXRuoO&tsWqSzpP>eoer@^NrxFyg)A#N`|$+4WMXr&;@ar>`q{~ep? zpM<`dot0$8P$=EftafMSy_vU~l{;f+aOw>FGp#yfci_8vyX}k}jfHd78PghnVO6kW z#nTzgJ!7RPasfoc)nZ|0D9<>*7${40d_-nKbO)!*U9K(EMrf^X$*v{^qNFuZV&?2> zjF&aBl5JBqKn%fpyS9-Vn+&1Ak#f-3G@*DvMwFdF!xNKR#|oz8Os$#2fK%78*;1KC zU*Ffu>KUxoyDpm&h7-KZS#-vf6m~0p8N%xIyn$z<)*a)rDrURIqanAE%gx$GzM=%+ z4$yN2RI;LMBz@bW(W}EUu7J&g!FA72*u#G-jCljhVOk-}66eIn3jqLk$_6e~-WQUR z*W^e?mCWBab~FJPJ03)T2ILHF_2ktw*3Se>uUEy7XM@N2GCpio7G1_%oS(tq_*EmB#`c!C>4+%S6q5kg z(;@G9dchLIIOpx$?q_yC;QhzPIJygpD3!28%0HR!c)1U}c7UuJ~$cY8VU<7bFYV^N-9lyhYMRi(rywMcy^IxK8OlWefESb2ZkxJygY<)iKgeRf-;+ z9S+#jd6*>u9WA4Gc@X}|aO7fBX1b<*lDNtNh>9AuF?K}obS4a85R)z%FA+1g*o4dz zGR#co*JMIv4E)`ZELwyUA&9c#ff=W=5fsh(2q8Pb1 zpt@ZO#)PC3Q5!p_}@J5WwQ|J%kgXPkd8LAHa5(4k_L(b>D09RqEvYHCVSVsbV}q$DF%A-J;Gzd({Nx! z5{1mXlGLKqVxYO{io9G>!H%KMt_B7Q)B{EahNcFVM#ilS3=E8n0Sqia8VH0voqQF- K+#Ml2I0*ovWjL4s diff --git a/mods/themes/NU-MAYA/PAUSE.ANS b/mods/themes/NU-MAYA/PAUSE.ANS deleted file mode 100644 index e0bc33cf1013c10a24aeb081d2634ce381589bc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 253 zcmb1+Hn29dHZia^Hptag(3Oq`Qqs|eAi~%hCnhkQLqb;4mro;kCbC8J;v!Pb;a!Ca{hB~_%7${H= k7#SFv8kidy*Dx?JFfs-(Fal{H5cYKPRS0u;gz(@b07?cgBme*a diff --git a/mods/themes/NU-MAYA/STATUS.ANS b/mods/themes/NU-MAYA/STATUS.ANS deleted file mode 100644 index e14289d908cbd94a8674813abbfd116f8b91e590..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2383 zcmb_e!EO^V5KV6gi4zw@F3X`;wC<(}RZpb?gw#R>giB5lq)@4DP}BaGcRz$5uq*!x z?~TWs-L&b6sba;uo;Ppaj3*t=%EM84SWWD3wr`Gyv#PQI<~Iy4#uiUwjCBau(P1>s z4jZR+TZosBik7`9^?KL|Pu0&CcfM|##%IU9$Rt5_K0U2)Q9L?j5)_j zava+N1|F3a47UYInb-NXGJhCEPeIZ~gvBbRAi+a7F55sNPB%{0;mojx6dJ@)&&oD{ zx%V)-2GKNt^ELh&-(-DR7`PZ4iV$!}aANG>B!XN8#MtDHgXoR|g~nfa_A~=h_5?^` zAx1`?Bnew6;4`FmEP)`QjxIXDIXO<@1!XGlja@CSujY0kPfPn6h8LEn?C$i_a5h2M z68&kU?5rJVDF)?YLoz>5;Z`m4@I{XZiQ{~q$roj^m|sd*1O;GT9=CDia_Ly~%ch%rvbNC9wQ4zqwdm$ zL1!OIEKxhADUi6bLBXTxFrhF-j84nlQaMs8=jRufs}7M~mEL!#NHmSCSu#C&><|-W*55&{ zeq}x=lk4T}pRIE6P?rgGZ6k{Sguic{wxCYvBZ-ZLQ%eL)`l)MJ&n*dnEZJi;4uNs! zIw+7CB_Lcc7Fb9gWbC995pctF;k`0#3+DhW^;*K`z45aenc= z*4q2K#1qeuDJKZ_o$H$0b9ti!1oTC#`Q`e~h|BJjuh<)uowEZ$gcC#O58mWLvP1b% zK=MkW`!wsoWrNJA9$o!f5!;^We!03?{FGprB#FeH{6q+c98fO=VPQQHuxSOxFGGqi zSuvAdI;=$opxfHga5A<=Z=1uBu~)aR@UMr=d%2|;O8h0|Z_mrGN7LhXWr>>nFWW24 fetA$%{yrHDc6QDNF9u@IKfXOJzJEAMyLSBtoXb$$ diff --git a/mods/themes/NU-MAYA/SYSSTAT1.ANS b/mods/themes/NU-MAYA/SYSSTAT1.ANS deleted file mode 100644 index 57211932a9b5d3a3b972bb6bd8f26d2545a3da9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3954 zcmb_fyKdD$6bx;o(9j@m<0dtJB^Tr>1cWFEks@f)LP4>j03q>LwtvTl`wjd7Gjq@cQjlR&e2|FO(vPm_Sg5 z?|7=h`3LOD!Mb44tERRygmRj39)`n#y5(UUhhgMx6`UvTReF|<+H+!Sv49RHdmh^C z(AjN)cX6ovGAxqzj7bO|$omG8u^Ba4jn$&3p-` zjR3x3Jwukg1;Wnp5OMN#+(w)7xl6a9+%Y0jH|bj3z*T4J(Q9(ct_nXzM0H?boHbSJ zlWN+Pv)4CqOw^D-JS1sW{95=?O06wp^(Iiihz)tQ1=1#K$cz&3o%YuJRyp2kG{vDg z3q7zk;UT4^8#Bm)0DlQSWQcyO33{wokBy^CI-;J;6K3`dtE4H|Z&R^Q8BO*i2}%Qw zvTPgyFg38dv2s@DY2ZaItp^*T%>eaj3wwlB~hJ#vBBtjg__bKs#DJ%Rq6NQ;<|=6^6n94-3~ z&_>jx6w*Y2ExOPhZI5?ART+Bw#=NWLW~nD+em5gDq96~|*kaCMIYL1}$vr=!Fcffk zu@4|t32 zO^U4-r_Ej3&N?PZPD4c1yqqyI5wH>u(VOQUPAGbeps0xxIpEBuPKJFE?r4Yp`0@4IC$PgBjtsPd7anFz3wNeLuX=LC zh_YtWLl&`7YIsMeu`--++e*C6w{6?g$3$Nb7&F@2_fajXyW}a(3GkdJj%e?|l-x*; zgn5Jg=?hGgDSFaVXT5Y_L5{6j zm?`i0h0Hp8EJbmjC|ByJX<73dv*3r?q@9VZ2Lo8zKVA{7f~AsE`^G<}O*#qq&|y7W zIn8Sh(UpSR_nw04(f|p$Z;g&uzgr%Wx;y%0&0bzRNPatD9Eab^4PRjxbCaeoi=kru z^E9QhD4$)Yks-A>yLoAk?#@o1++DrDewF7u@BF8$%!`ZsdA|Ss@Z{vdgWHqGC%PWJ OdGR*;@cPQ0(%(NI*|Wa@ diff --git a/mods/themes/NU-MAYA/USERLOG.ANS b/mods/themes/NU-MAYA/USERLOG.ANS deleted file mode 100644 index cd090c7e022b6a0f779a98bff3c01f73812147b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1816 zcmb_cyH3L}6fFxwr4ERVELoUw>P8i0f(ju9BqSb7CO*Ij3GprbMxEbrsQ(0U?)584 z(;_5Xsfv%!eVu#ltQOTmRC1|i)8Q|xrBHdE)kP&s)wXR`3zgN2a)pyZ>Dd%V%4T(0 zEtW)SK&Y5(uwV$5wICn>6KNZE_+ZSPf%ePF*Lw&)$1mF$i!>>rPBsl?UP-CGk-e-? z6#%MQDr2^xJqT&w4IQgc>wxHJmq;Vtp-dp^j=O|*z}8bcQAk;=t>_NMf2%j)JCG%bt^tD)^* zyr(8dk21B4)nK(ql7&L_s?7{NY@9EXPni-(madZ)U5DeVrf^o-D}HNY9+a&2ra z<(}rmNzMtPH<-0_44ylsS8T+@Lv+YI*l)4MEIaO;Dc|>A=#gXtm99hxV~llL`-wD0 z$1j|;^l*d+y1~fxG{ZRJb%69Vvb1=_@eLaQy$;0K->RO2W|JGa-r8pPM&%?>&;NX68G~so8dv%vT-(0#~{Qm)y543#% diff --git a/mods/themes/NU-MAYA/theme.hjson b/mods/themes/NU-MAYA/theme.hjson deleted file mode 100644 index 96a03e51..00000000 --- a/mods/themes/NU-MAYA/theme.hjson +++ /dev/null @@ -1,119 +0,0 @@ -{ - info: { - name: Nu Mayan - author: NuSkooler - } - - customization: { - - defaults: { - general: { - passwordChar: φ - } - - dateFormat: { - short: YYYY-MMM-DD - } - - timeFormat: { - short: h:mm:ss a - } - - mci: { - TM: { - styleSGR1: |00|30|01 - } - } - } - - menus: { - matrix: { - VM1: { - itemSpacing: 1 - justify: center - width: 12 - focusTextStyle: l33t - } - } - - apply: { - 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 } - } - - newUserApplication: { - ET1: { width: 38 } - - ET2: { width: 38 } - - /*ME3: { - styleSGR1: |00|30|01 - styleSGR2: |00|37 - fillChar: "#" - }*/ - - //ET4: { width: 1 } - ET5: { width: 38 } - ET6: { width: 38 } - ET7: { width: 38 } - ET8: { width: 38 } - ET9: { width: 38 } - ET10: { width: 38 } - TM12: { - focusTextStyle: first lower - } - } - - lastCallers: { - TL1: { - resizable: false - width: 16 - textOverflow: ... - } - - TL2: { - resizable: false - width: 19 - textOverflow: ... - } - - TL3: { - resizable: false - width: 17 - textOverflow: ... - } - } - - messageAreaViewPost: { - 0: { - TL3: { - width: 27 - textOverflow: ... - } - } - } - } - - prompts: { - userCredentials: { - ET1: { width: 21 } - ET2: { width: 21 } - } - } - } -} From 19fc28fd8eda1fc6c78ceff7a8606d8a3302773c Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Mon, 21 Dec 2015 18:21:25 -0700 Subject: [PATCH 3/4] Update luciano_blocktronics to use Renegade style pipe codes --- mods/themes/luciano_blocktronics/theme.hjson | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mods/themes/luciano_blocktronics/theme.hjson b/mods/themes/luciano_blocktronics/theme.hjson index 375fb479..53a33ce5 100644 --- a/mods/themes/luciano_blocktronics/theme.hjson +++ b/mods/themes/luciano_blocktronics/theme.hjson @@ -114,7 +114,7 @@ mainMenuLastCallers: { config: { - listFormat: "|00|01|36{userName:<17.17}{location:<20.20}{affils:<17.17}{ts:<15}" + listFormat: "|00|11{userName:<17.17}|03{location:<20.20}|11{affils:<17.17}|03{ts:<15}" dateTimeFormat: MMM Do h:mma } mci: { @@ -124,8 +124,8 @@ mainMenuUserList: { config: { - listFormat: "|00|01|36{userName:<17.17}{affils:<21.21}{note:<19.19}{lastLoginTs}" - focusListFormat: "|00|42|30{userName:<17.17}{affils:<21.21}{note:<19.19}{lastLoginTs}" + listFormat: "|00|11{userName:<17.17}|03{affils:<21.21}|11{note:<19.19}|03{lastLoginTs}" + focusListFormat: "|00|19|15{userName:<17.17}{affils:<21.21}{note:<19.19}{lastLoginTs}" dateTimeFormat: MMM Do h:mma } mci: { @@ -135,7 +135,7 @@ mainMenuWhosOnline: { config: { - listFormat: "|00|01|36{node:<6.6}{userName:<17.17}{affils:<19.19}{action:<20.20}{timeOn:<8}" + listFormat: "|00|03{node:<6.6}|11{userName:<17.17}|03{affils:<19.19}|11{action:<20.20}|03{timeOn:<8}" } mci: { VM1: { height: 10 } @@ -144,8 +144,8 @@ messageAreaMessageList: { config: { - listFormat: "|00|01|37{msgNum:>4} |00|37- |36{subj:<29.29} {from:<20.20} {ts} |01|31{newIndicator}" - focusListFormat: "|00|42|30{msgNum:>4} - {subj:<29.29} {from:<20.20} {ts} {newIndicator}" + listFormat: "|00|15{msgNum:>4} |03{subj:<29.29} |11{from:<20.20} |03{ts} |01|31{newIndicator}" + focusListFormat: "|00|19|15{msgNum:>4} {subj:<29.29} {from:<20.20} {ts} {newIndicator}" dateTimeFormat: ddd MMM Do } mci: { @@ -157,8 +157,8 @@ messageAreaChangeCurrentArea: { config: { - listFormat: "|00|01|37{index} |00|37- |36{desc}" - focusListFormat: "|00|42|30{index} - {desc}" + listFormat: "|00|15{index} |07- |03{desc}" + focusListFormat: "|00|19|15{index} - {desc}" } mci: { VM1: { @@ -240,7 +240,7 @@ fullLoginSequenceLastCallers: { config: { - listFormat: "|00|01|36{userName:<17.17}{location:<20.20}{affils:<17.17}{ts:<15}" + listFormat: "|00|11{userName:<17.17}|03{location:<20.20}|11{affils:<17.17}|03{ts:<15}" dateTimeFormat: MMM Do h:mma } mci: { @@ -250,7 +250,7 @@ fullLoginSequenceWhosOnline: { config: { - listFormat: "|00|01|36{node:<6.6}{userName:<17.17}{affils:<19.19}{action:<20.20}{timeOn:<8}" + listFormat: "|00|03{node:<6.6}|11{userName:<17.17}|03{affils:<19.19}|11{action:<20.20}|03{timeOn:<8}" } mci: { VM1: { height: 10 } From 66ec24b31ad4bcfa4ccb99ceb7209abec33213c3 Mon Sep 17 00:00:00 2001 From: Bryan Ashby Date: Mon, 21 Dec 2015 18:21:43 -0700 Subject: [PATCH 4/4] Add {location} format object --- mods/user_list.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/user_list.js b/mods/user_list.js index 7cb6a687..59826753 100644 --- a/mods/user_list.js +++ b/mods/user_list.js @@ -84,10 +84,11 @@ UserListModule.prototype.mciReady = function(mciData, cb) { userId : ue.userId, userName : ue.userName, affils : ue.affiliation, + location : ue.location, // :TODO: the rest! note : ue.note || '', lastLoginTs : moment(ue.last_login_timestamp).format(dateTimeFormat), - } + }; } userListView.setItems(_.map(userList, function formatUserEntry(ue) {