From 2a3970d5e3d50a23f18d89d7f98d21dd81604b59 Mon Sep 17 00:00:00 2001 From: "J. Patrick Avery, Jr" Date: Sun, 5 Feb 2017 18:06:36 -0700 Subject: [PATCH] bye bye sandia --- tools/package-puzzles.py | 16 ++++++++-------- www/cgi-bin/koth.lua | 2 +- www/credits.html | 2 +- www/images/inl.png | Bin 0 -> 9795 bytes www/index.html | 2 +- www/register.html | 2 +- www/scoring.html | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 www/images/inl.png diff --git a/tools/package-puzzles.py b/tools/package-puzzles.py index f4980a1..95fdbcd 100755 --- a/tools/package-puzzles.py +++ b/tools/package-puzzles.py @@ -31,10 +31,10 @@ def write_kv_pairs(ziphandle, filename, kv): filehandle.write("%s %s\n" % (key, kv[key])) filehandle.seek(0) ziphandle.writestr(filename, filehandle.read()) - + def escape(s): return s.replace('&', '&').replace('<', '<').replace('>', '>') - + def generate_html(ziphandle, puzzle, puzzledir, category, points, authors, files): html_content = io.StringIO() file_content = io.StringIO() @@ -50,7 +50,7 @@ def generate_html(ziphandle, puzzle, puzzledir, category, points, authors, files ''' ''') - + html_content.write( ''' @@ -77,7 +77,7 @@ def generate_html(ziphandle, puzzle, puzzledir, category, points, authors, files
Los Alamos National Laboratory US Department Of Energy - Sandia National Laboratories + Idaho National Laboratory
'''.format(category=category, points=points, body=puzzle.html_body(), file_content=file_content.getvalue(), authors=', '.join(authors))) @@ -118,7 +118,7 @@ def build_category(categorydir, outdir): hashmap = hashlib.sha1(category_seed) hashmap.update(str(puzzle.points).encode('utf-8')) puzzlehash = hashmap.hexdigest() - + mapping[puzzle.points] = puzzlehash answers[puzzle.points] = puzzle.answers summary[puzzle.points] = puzzle.summary @@ -149,9 +149,9 @@ def build_category(categorydir, outdir): zf.close() shutil.move(zipfileraw.name, zipfilename) - - -if __name__ == '__main__': + + +if __name__ == '__main__': parser = argparse.ArgumentParser(description='Build a category package') parser.add_argument('categorydirs', nargs='+', help='Directory of category source') parser.add_argument('outdir', help='Output directory') diff --git a/www/cgi-bin/koth.lua b/www/cgi-bin/koth.lua index 412d1b9..eb6c52d 100644 --- a/www/cgi-bin/koth.lua +++ b/www/cgi-bin/koth.lua @@ -43,7 +43,7 @@ function koth.page(title, body) print('
') print('Los Alamos National Laboratory') print('US Department Of Energy') - print('Sandia National Laboratories') + print('Idaho National Laboratory') print('
') print("") os.exit(0) diff --git a/www/credits.html b/www/credits.html index 55acf88..3d60d05 100644 --- a/www/credits.html +++ b/www/credits.html @@ -90,7 +90,7 @@ window.addEventListener("load", init);
Los Alamos National Laboratory US Department Of Energy - Sandia National Laboratories + Idaho National Laboratory
diff --git a/www/images/inl.png b/www/images/inl.png new file mode 100644 index 0000000000000000000000000000000000000000..6584ddde9ff3b540a72c2f776643ae726b38bbca GIT binary patch literal 9795 zcmbVy1yoc~_b(+SNO#Wwf^;*abc28jA_6mXcS%ckiZs$9IW*D@Dj^`v&>(`$kV6dc z#;@L6Z++{(-g^SS3y>9F?T{U7tdO{2g3}Ov+Wdn4JLf?(}xaen1 znL7;K(0QpCdl|agc=>`otT7aTf-) z4d3cMw|whp39G3YfPdghq5FS_1puu7An|gP1^iPf zW1VNLO0FK(tYZ9Pe3pX3LaY)Xejzb22?=3dR$)OQQ2{|A0U;4SA&``)sFa`}>%T4l zTAGKIjg*11>c3>6-(&%HUS4ie0s_9izWlx-{H`9h0zx1VNI+0nKvVAIJ@cS{0G>@^IwKSn@qqD>?R<@ zFDT&b{C8gep!W1Ku>Rj_{8wtv=l*Wi0tVKeuHGJ&Xn)uM|ILiH-Ty4;FCkhRDLoH+ zv{S%N%C45)&ekqo8p^T&^cQ|Bdn+k1QBg5#uq2odBnA=X6SWqE@PR~aAbf%nVwMmQ zYY+DJHJ0B&qaoUJVydFR+WH z^}l7?qhl~VGs279@BJa=_<`gasOvvc)w^|W(!V^vc6hu2xTbikJOE`JBP z|2pcQ^H#R@u=laHQuT0kX8nhyrR@KU7XNP+_$R;B|E~oF&`JsX4VV8TeEvOzj>*5> z|0DzYIua z>|}@Qjw zQSD`$(@(%8Aa#+Ox2&NtaT&BL1&0*Nr9K%ZzJ~0Fe*rn?~=iLZ+k%;|cLfAuG=iFl$r0J(J zL=H<~T0#v2>`o!zkE!LVa}JIA&xtmOe@F-hCH-X0`$0>l-aYg1c?hRgRJ{vr~T zo>FkKV#JxTz1iIlE_6uO&tTdhUL+%!FDM4eW|Tzr7#u>TUUk@N(a(x{sl~`g5M+9@k)Ckc}s*TotX7r8wtM0(P%%+TX zNtfexCvDfVbsEFoswhyx&QL!CxPjc*qh_N&MXGj$u$1@?Fv_FIJR90@1F6CXYsUp} zE(A~7Qq#*2Lb!2+?1A;2UTW|FzwW~Ljhh;B=>a$2oF1i6;*%w&Cz1I!for46P)9h8 z^!A!*?q>i?1PQtH(NVCy=#32Ur%;d@X-nK-VK&wea6jDMO0p(GQT_m%(WKdPGU~>8waGm8^JoBjEfqeQP`0)mP!S^RF`g3~?ST{2YDB4w|-N(>ZU141{Q5R%zVf zsh2*@#OgYHShOoF%3k@yXw ze5t66#R)`NKk&mH#FgQl+xP{knU%Wvc&sOK5<@n-!GyYVB=1&YE`-~h1&e3n3 z9I63$!|2$As%u`*eDv6XjH?0A`Qs$M^e8VdG?#ckq*|rIrmMJ9RK~3(j#)1mx>a>mxA1iE|P|-KUwm$-uF})j0<> zP55ii;uTV_EX@|T42aL)mT{9#RX5%o9n%l1g2g0pB74jTgs{5re zGY5RXy0*{#F-n>g5K3*YAC{f2r1{Ig-hZT>ZE#Je>IrVd<9+C`pYmvtj{0@CNwta! zH}1ye;0P{T$kgXJ%ngmVhqMg4MI%WyB7;!@PvXLXWnLe;aR*15ju=c{2(ihycP}_q zf=fdb#DacIC6o$ShhFMAycmi>oUH(Zro+ifM|8z*n_}Xzh?`$*n+}AZWxZAKnH>R& z68mU@6yw|1pFYcQ(JLF}+aPcn@p8i1-x$5gUDyYxY=rWv&@&W`KHR{bzW+WNkz%Q1 zcac1`$^4I9b>zXOP`bph@d%$?e56jN#XvE8=8OFPpsTeh*| zWwmsM4-H$TG7PrgBQR4aTtCewk75g2i+)pQ;0qQzpxROJTNh6{n2%sQaJJ%?r@F$1 zut_-zaSg( z8x5u)Fci6wR0s7BvD547glwD4o(uUSJn;wjBgy0N>~%}Xt7J1ET-;-&+(|6eiY0nuJ@;G)N4OkjOE%AUx`}uBTg^$pCrr~DDj1vzf z*ticW6P50^`+|ETp2W%Vr)=K>^L`GL4Y&NwN?981q^15)vNBT2P#N0{#WSc&VF~=1 zyCqdCQ1Jjqu;cFic3zk&j3QUHqw@3?i&;7^1PvK#u#irFF9anJ&p>b_l^@n@j3X;5 z%H0n`pr0hn$&!$XXJiL7?~*@-lglyx`tC0C_777YeBRx(r(~f$h*P;WL^8>vl9rL@1q@*q?Wr?~hn(Uq=0$FpY63pGcU23YCNMQGFEMyV`8O_aMe9sS zi+t;6gt#dAQ}Q0X`jDD>#m*7f8OqU$-`4x(CKv{-806e9kxBKMP2+Wy#<2p3R21g7`OMj})!v3hv?fxn-mJoaq zFGn2;Bq309AYUKw}K{f;57FJSIw;hi}uj!34- zOl^yeSqrCU(egG+_R1tx&a!^^Ha9B+!Hkiq+q0UOv30O<-OyIHD;dc|=VI z()-On^=hPmB{c}~OIPdkj>L{?kT9zml-ilgrLrKbLs0m7bHFo1We_y_MI>%;L{x`i zk5>4z439V_Uiq1eu6thc)g_e)3X0WIe+QDjT;ti;B0fy<^iT6_u~HdGl_*$ReGr9# zf7s_DWjjSf8hP$8H$v`)Dwu3(XeI9!4(+_cU-8#EoEyUKy6#0_RMpiBVNG)k4BX`B zoLggC8AffL%W<#kKGnRO?!|;qINjxLq2^%6MuVKMdoR>zv{s)odr_O)lMO$j9cJ4S zzQAkKB{0uk2-`v>SN;g{BpK{}`CAHa1OKgYJbxyBxqYf(qAay|1=iAa0ci z{D~dLjazV6X5s`@PI23rQ$*+!m|rivPsC(!NTTTwDo+MMDsWRnH`sn8if!VsYeZs` zv{UFA^z&dj0p`Y#^)3yjJ<6Z_l9KPbVdyHvh%Usb0GqV~v=x6@R2#kDxAQ`nsps zB0NHRNa`k2daqMA40&&Njr*uF<%^n6F*E4P%WmIfm5dz#&~_&s;V}Jyq~2~%HR+tJ zDkxz#acyMU^!p-7=~!~pn>st_`&naVM}hkHFN`=k`&9tNfRB4zP(yE4dB)(NPS5U5 zWESC)hST6Y9(tFdMk)qUC#Z813RND;L(vdSEGr&nFi-QbSHI6isnP^fX@E#vTh0zrU6hVXZigduT+n@ zI%^D}2u~Ng-m*SAQj*~y8?{Hb7wp~u3k}ZBd0&PrgKAq^E%Drdt+9|8?=$a@`*qs_ zL{n@)#OFqGvs9wOxHqvMejiD?{qBpENZopCWeMs7h7bqg@?W`535CE&zt=mJMHrRF z;fY-87y{)f4!Ciz$e_{Q%efILAvn?a2u^cWaUA2;pA*F5Cvxu*aiv)qJ8*?yzqks? zZMAh>9=MDo7Fo)PA@sF-pFrqhm}?WEuvyda=VUVRuQnKOlqzTs(n_Lju}=dl1DuZ`;SA_=%mXa1#9DzQKmtT&4kmq zY5A;F^Z=j{51P^ff_d~~bre3RyB7oyZ=wkf9XGt>6F%29I_-IMmt073;*HG_cm?UU z%Dj^@d@90*$0Bo!5Ct-cV7*Nl1Ul*Z*DmaI{$gCe>S^nj4(*1_gFYS}P0Z_f9c%kz zPqe&=cUy~M7uq&}()kHp6e_q^5R<7P2zN|c#tKk>%ut8VcF&u_EmPm533!?jnBVoD zt*~gVgGhh)5~-+P?hWzp5A9*qVP|Qz4?&qNxLL8BNi?g3rw=VP-YRP)jqQzRAa;n^ zhm->^jyNt%^SQ&X?rC)KFv3Kp^5@l@?kVE}5@j!4R_(_I$H*~|{1Cd(L-`pw*g9U0B5E}|YDHwEU56`O zsuTZW;bbH`6P}ifINghWo{gOxzzR}Ve0x}Q2w71&jmhdhgrON)CVFbFH$`A^c=KfF zK{?T~L3&Hc`u(3vU&lveCK`7w==#KpJH%G#THQI67{xoP{+!gdjJz8KO~Lu~y7VR* zv@?atim4{0!LV$YbS#BQ^r}AnTL5bCFoFdeL*&X*^T{19DGS>WgLLLVF%gWZo!~;m zgSMucMdMEa_OI$-9{=wyB@uN_d~2=B1suOHzGz;&G6~mR=h~A_xP>Ot0EnTzwwOBi zLm5^!r=NMX9leOMz)#IEtyq66E-rQ4>14c*CQ*d8Cy_>qIu6fLi+2?6AN$YI$Aqur!1tj6@d{@i95OQbhNpqa z&mn`Sw?qdsGA#6P>dL}DoQ1~k`$crd(-!_zDoE&T`SNkEo}ljPMa?J}w9jI;`2$>D z+C4K&U*&yT_u2ikJk=0x6OTb~9|OsVDV~oD)2Fb9Wcq~n808cj+7X^)B1GR#gJ#fG zrrA=X=ZsjEG}sC&kRUQGV4&et%6(qI%(LDrDi#fBLF^k?o@7G2kyfYpG2 zmgF7>G0H-O@v8{dC@1n?61!rAT|VuJ;*l9-I8~HYU7N662eIueMAzqGCiLRz(fhkR zjLsOS7N59npzLUsp>M<&H$9J_C=;wq(s}^o=o(epwj3#ru~|w0{7AO;dPl8tm3`)p z_fjw43~MrsjSR(B)1*nMd5PL2Owx}ha8kvnm=!Z&LKn({!`?rqp}q`e>M9y^L9M*0 z0$!~A=JIY_<=W69UBK&l6Lu7-oXp~ne0WmJ_w#d%m`S}0{CWQeaX}8h7i93{M0)7X z$$Jy3zffdO(7*;u6B>Hs)YsfAX#yoLC~G5 zlFgcrkcA*oUtpt#5YNgA>}_4?XNOVvmqGle`QX=_I8D{Iiy`^jff2-(A~;Tgf?B_i z7O8z!#R7NXge%lg4Q%mGy~A_@<(CXi@`t+N^+&ct<+-{zhw{<4zfy{?+i|QhMQx*# z`C8YGlg@WfC%!>`{Y-Jj;jT6Ru>Cp!SWIz++?Wk2v!I8ibV-kVapPST5dU$HNf7+5 zZSV1`*aakgN4P0x^Fy}c;;RX3Fl=%yFDKMgph0MDygwJPIQ077%*o{>KM^H0zQ)Ww zCoQevl(D#c7<2a(No=69)fGOq)5_fscY~#*I2H~&mS}UH!ZF$Q_;$~~G?oO05(jE3 z=d)-PZ+uB^m~o^z`F@2Vb-=K=J`(>XFMQ8=5b4LZ>6?F*MABF-uW6CWmSxWvD_y|E zk)ap>@3c6kzW5xHuoHGMJKjDK{@ldQ(KT-MSusZl5@&MR%z=jX!TCNvzT@Q0!{D8cjd=;9#NnuNrZ0nr53IEbyu;Tl>AD(l16)x<$ zYiyhgLfZA8ieJnk-waF?jazLZIN59z?O3!49{Lg+GXz*tqJ-Z z@h90be#}UyE4JKgp6(bf-kZ_poxwNH=r%T zcRYX3apO&6WeG+_^z35g;Ux;`GqZ9&2gf>H+}5G zuvNo;zVl@s`oZkmqpd*bGE-l|8O>hc7?MybOZldtNFVnmN}w3`OPUh*3cNOD?W5t* z*v6P!W z`H;QtbYdtVZ>Y!C-?<*WuGbfBzph5AXEm-WyZ`%o)-mhl3?ulh_H4qQ|jUmb#48^ZGk+_y>d!ZTqFH2W9P`6|woy(GUiD7}eJ^sX&?UbAZ8dGxo=dc3~6V6z- zqS@6FXQ|lv-ebomtLT^G;=f!PMZ?Z#)4caKWk&!eaM=U=%8uq!O7nQmUJRIP&g`mK zOVp&%_}+PR?N8m?w&eubjV4(mkgtvHU4j1hLMzS7-q|cG{!O@ZONMO2L(&>-ra!zOFVf3H250cH0y8*tA2xS=JSvQD(?tX! zNz+$czY*K{N65}-ad&$*h~Jnh=iZ8LqOQESe1uJc_N=zhs`WHia0K$kN#2K3P9hoH zg_}w^lfUSaa(29VM8Ajs^6ZXW_Pmjg;fRK8gvQ1XZlTJq&)DCSXX`e8qC6p7q;%qV zt!}XI=Napq57wZa^KfE``Xt_*;9Xy1gw)?NI%RfNYI2rx2L1GK_;&N+v47nkMHmmE zp5#De@4OEyQ{tqp(xpw(Zp;&zHA<@3M^cp&4Sh}9Vh-e&n1c+sR)h&b@ZGg}HA!g+ z9SD{!{pd6x@`MoPE#hjLrAb#i+ORcFslx?Ys2ryKQ}?xVCKmXm`UzuDE~oz- zF@fI(5#P@R8nyDIyzdG?ROrlHy|+1u5WT9&N{Ij6oZS1epmba@uv{$BP+Y7v$Uf&W-YQ48VUGWJi7 zW+GUQMI09Gl4IO;X0H~dX5I-o*TrmgU0uN$#i#Wd!=0&4%pRVeb@v5u=CJ+JNk5qp ztz$}{3s7Z*XRGyxX!EV5KN4bDCAYh`a&{})n)O(Im;7cyqqA_Ug(dQ;bB$kP>9A*- z_nQS{2+pl`q1Nr?eG>r-FFC%}9?{J8$CMA@_RWt+DCKZ%7A@XYb}NvLB=6Yr%Z{(9 z-+uc1{3~A3=WJXkul0i?rXqJ_+R_7B`BMKst$9(KB^}!mrzE3Ew0M5M2a3Out6ViF z|9VP-{0*s{rw%02geC?m9uR;>nPviC(s-uHOhV0;b*cI!g9W3hMG|)F#xfC;Gsh87 zMHV>iW@szEd)s##fj=XfzM6>X%1xo1yYMoXr;iYZK2HS`&Az)Ubx9W^iHcWrNx0*k zuwBbNP`{$X6h+K7GSt5KMHSjcNY?VFptiDOPWsS4dZevgPtH#t*T@`@hLDM!3c;?N z^8#ctHyevPCz0K1tTWv9vp_f9QMVmhxjjGyQ1@r`eIC=DYV7x`CVW?Z!jawq6jDLy zdNpAki4W`&+O$Fs1wz|mp)_KSlmbB%s+X&<4M3r~%C}XFnc~VD@^eu130Dv|MQU+$+uKw7p<* zGuRar(Vd~oEeWi;Tzx?&dHBxu(Fu}Cea2f%n#wQ3cK1^!>8adGs)fd5-ZHhkFV!|` z!L;K`pX~c+>=eufCS16`FVAAcH7M0G26OsGQ>wqGu)S%QNm9G4_FFBR zvr$_daR)#3FF(1Wwo$kY-9An5xD$RHAwl!@_3v7bhvnSmk|sYT4)oqH*{7){4RF#x zm*6vu=M_4FK^G4-29~oiRn>3z(*yEx59KDylC~Zj5_t}nCUzF-h%+r4kIZ`2B}TQE zV%XdY`iQ#t7j>aji)|g{yq1cjUtGk@l8mWDhc@F^DNe`>5VK5@99kIp?=MW67tNbBM~kZ1|(>abvk_wBM#Q{cvy& zFMn9Gpl8tYEdR;IE9EFnKZ|cTZ^Z;Y?t~qfe<-gwC59opM1!%T(|dNiqY@8flEz-1 zGFD$NN54$0idCDTd_#T08>|#@v7DTEAm~$0;<3=cR$AR1&x+)&`|h|fB`7W%hwKw$ ziSe_Uee=0bTR_uqGYu{iZEW6>44d_+mx2*ho?3Upu*?F4Y9bRCAGs#{Vz;nlTa`RCR52tt*s zgtZEEr6=wLw|wgnH3Q{Y-d{fSHk7U5SEtP|oX6lwVNO>%Qjv`1FXMkszmUXxLP3l& Yw}$c;{(d-rf9ujv(N(Thw0QTw0161kzW@LL literal 0 HcmV?d00001 diff --git a/www/index.html b/www/index.html index ffdc778..0c042ee 100644 --- a/www/index.html +++ b/www/index.html @@ -69,7 +69,7 @@
Los Alamos National Laboratory US Department Of Energy - Sandia National Laboratories + Idaho National Laboratory
diff --git a/www/register.html b/www/register.html index 1f94238..637013a 100644 --- a/www/register.html +++ b/www/register.html @@ -44,7 +44,7 @@
Los Alamos National Laboratory US Department Of Energy - Sandia National Laboratories + Idaho National Laboratory
diff --git a/www/scoring.html b/www/scoring.html index add1fd7..744b6bc 100644 --- a/www/scoring.html +++ b/www/scoring.html @@ -116,7 +116,7 @@
Los Alamos National Laboratory US Department Of Energy - Sandia National Laboratories + Idaho National Laboratory