From 20ba0ef9141ad2c97064f7d7d706553fc40de402 Mon Sep 17 00:00:00 2001 From: William Zhang Date: Wed, 21 Feb 2018 15:35:54 -0500 Subject: [PATCH 1/2] update bring back old flickr image and update jpgs to be 48x48 --- css/footer.css | 2 +- icons/fb.jpg | Bin 1670 -> 795 bytes icons/flickr.jpg | Bin 1976 -> 0 bytes icons/flickr.png | Bin 0 -> 1097 bytes icons/mail.jpg | Bin 2070 -> 944 bytes icons/tw.jpg | Bin 1899 -> 849 bytes 6 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 icons/flickr.jpg create mode 100644 icons/flickr.png diff --git a/css/footer.css b/css/footer.css index d75e2eb..c6bf5eb 100644 --- a/css/footer.css +++ b/css/footer.css @@ -32,7 +32,7 @@ button.social#tw { } button.social#flickr { - background: url('../icons/flickr.jpg'); + background: url('../icons/flickr.png'); background-size: cover; background-color: #fff; } diff --git a/icons/fb.jpg b/icons/fb.jpg index 4c2c68e6afa94f72401b5e6ffbb8a58a62cf6c99..e73cdedca873d66f21ea1ef13c3ea56f9ee285d6 100644 GIT binary patch delta 648 zcmZqUoy|63e*FOkK@J831_NeBB?cxzMrJ|A|3?_47#JBDn1L7$I2ah&*jZSCa=HQx zj7+RdEUYZdP+3MMW(F2kHbHhnAz{T$93rCTj)93KrAmbpfyyP&3}Rql2C8KO$|wsm zFtXG$GQ-VbU|?imVisg!6;f0(GA=YsJox_>0}nG$P>@-W!JgsyMpu!%Yqfz>nwGLG z5n5EhAgOYcOP>3iubJPaw70XS<-VHoYg$BMCi{d-Awf*V8&!n-ese_YtM0h?-e%EZ z!KqgSk3?T*%&~l7n#X)a`=oW>jh|iho?cxclQ=9CdIahw+}Kg-bYwy3+@+yKJ)HCgHOOvh3i-~I=; zKDvqod}6xs)>`T1uGD$676i%8OKoS))8tdM(K=T6r{jmgo{PUiojRA5ScL{f23?-? z>1n;*mPMSNj{}dnxgE2xZ-48#ZB3V`pWlvj=gr2MrTbiV78JCwe6{@5;Td)Hr1qqH zlh*}%?+eP6$t@NH-bqe%5Jz-{0 z;296)nz!?3D1TKD&Hw!OsI6V(yjv5uu!i3XSM14rX|`ffmxk&zw+|OD*r%`Ef7JF> zW5GQsEA}^kxBpnaH&8zEqxtdvIxdqgZZo>4)(DmMc{aJ!AkrvZ)-EC{#UN5C zlG)@*TD7!N#M&N_?ShbU2@}ypRNK?ezSC~(zxzASdH*@*{r*1R=lgqK#bZS;AXhD0 zxeOo(00?}5q8oSu9HY@_7!DU4$LT8SgbFMzH8oXrN{hjuv?xkjkEyS%W2j3}1{?!J zBO?}zrLE63~kp{r;Tgr>0$rDOcROK}@e1PBJf7{Uc8g_p7u$g4FGfm<^G>KEy|d)U!;e(5#K8bA8UcmT}&2bV`m_?}_aKBaBm z;tQG!T|M?@nE7`$w`pE%f&WybAM1qdrjU$|0fdH4v!jrmj_~*tsiVu*b990(2xtz$ z(awQYV#|W5GQpjlVM)o~sAd=2;=g}opHkC!@7F zr`HcWb(ZSQA6*#ohQaAxt`Woe(=BJ>W8C|-afj9gS-17~eQL-v`KX3C$kSQ!(p|}w z`4{2#r@Jp!ZrHT9>tavf_TjM7T}vzTM|ymEe}u>^3gW^vrh%2=U=9?Uv}bU5Uua<( z?#M@B^QXC0IOpzFaGb37EyxX5iyycmW$DDUQ7(&ftoqU!+l`bcHClIHjkuzFU@~x{za{N#+`CZuI5p9Xb z=x>?#Ppz4kUDlYZacYMZ9_OtVGUdCrx)?4uy0cE-Y&z7DE6qyF++cOK3%0f+0qlj+ zXH9!TAO^+YkvnPH9D9kB%{6fnh#JzOYFA1_V@#u zj^S+D^S@@7+r4s4HY3MF3SU~W$0B9ss9Q_XOI3?^7qYrmmTA44rFx!!&)q3?_r|Qn zOj(cHX17-(4O3jV^hFLkZD!}-i3je5Rmc|5VnIjAL~C!JsMKs?%! zR~Ejtfd2tk_uO&|LVY>JK#5Kg>_le4ZNkjRnw_X!FCf?n-Etwpt|?$A5_a2&xk9za z#wyUTAq6i4Wlc{hLIJit>G8#*az4p^cTTOp>-;TC25KDz{Mz7UF5Gs?Kft!&Y+~?4 z$p-IdP{x@0=i-^sK>!71I9Ei0GxJE++2&}B0PkC6x<}Su@2((l*S>1sn$i*P+NhUE zSTiDfuO~afKc6ZaWzCZh4!Rnzp(cl$_PH3z``J2HM5FYbZzUB55HIyj pbDQLEKkx%*-o&3zTfZXxAt=F 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 literal 0 HcmV?d00001 diff --git a/icons/mail.jpg b/icons/mail.jpg index b7ddff035c27662f17d97027b28ceb0b8215c255..98462e59b8bcc62663474e20819c0bbc7b61c247 100644 GIT binary patch delta 798 zcmbOxuz`KT{Q3h7f*cG630bOad~nVFb4*qC9qF*36VGB6oBvI&VQ1{W^8sA3#gbns!~#Et)NG4L=m z0^P|h$Y9U#Fk?XpqX17?aM7(hMqUq^GxcRlowe?sO0`Jwd3H)kYKjZ{6n4jTTb@4R zbtBY{Natl+Cp??w$BkVbsx4W6Hios%Go4 z`iS7!_LuBJ%WlR!clx_`|0i9COR4YOj(jbiDJf&PdY47-syoZJDJeWNJhU&gyVfn1 zJ+$*;lwR(-exufO7S!ifz^TBm$>Uz`)||7FwRYqm{4+Vgd* z_vKW~Ufxi&a(bfHg<|8$X*qoYvTZN*TT0e$TvJis9o=3saeBSZn_`>E6*=$3WtY9s zZ!zFHaXQ|(e*62&>*8l!tyr&LzWep{<)3!UjMhrZlk$3gSMa2)ZQjY!2$u!!ud&A;zBDpoS zq?bErr)`YS$@()7do!DbI!fC_o^;-4w3ZdSWUF0e@Fb^EP_t)OgBsHm?v9t6CYOXh z_nA<}5OuS!UX*w9(OZ*(cB#$1lbk2__Gn$Ht;S>Ng710SpI5&0l+vi?Z0D&vUln(| z_Q(tC;7QRnJYRZ(cYM`-aY*nIyUQ`HQ%M1aE{hbG-SQPN&|nu2NQ`zhT&*I-B)Cnj QY zc|ekf5l|^2qJrQOL_~s!_#`MAM2ff>FlhdL=g#Mz&&=FApYQq2IY)S3_y>gTv2(D4 zU>Jg6@Ib;b$OgirI2;begBKo;ClJXbA~1@ms0f)#q0y)mDpg!kUP_!UD?z17Go)n| z6qJ;d#HCc!R20?Z6_pg%4}rn2L;_KaL=sb^Q|XHTw+TBTDhUdJ0#H~5LZ~oGg@xUa z96L?93Da?V1%G-gt^iIF$n|$zW z1`l@LTOq?`)~?U1E*IIV46%aEe@z!cy^+o)k6T-Y8V3DI;^&d0)t zvY)YdnR8WAR-Ldfa2xMZ%NdEPqO#DDnT=(srAh(MDHAuxgxh#&O^Gsq2xN#Ln8Jp&FyMU`pAF5qs2 z0J^?UWOd(NsTZY$OvZ|5sQ^k3+;&8|SW@ z2Up!kG#vMa-RcxV9xL>-GCFEwJ6zgzPdjuMFS#6ez|Ta?X=aqR#`l6aLil8T897lQ zEHwOjxYMQjnil%SX9*c=aYUe&F$Td1LLlK#k$>3M)f&VBsSH_|xUySP;pt{PgOf;i zS!k!|+;GftX? ztuu4xVog^~)o_hc3GYi^t)*goXv>U`?c23O2KF`lE19D@R~m~tc!QYl5zB@6^l$S* zhcnyOQg6v0>=Dfo+*^IUzwYF=42G@BbdZL!=}=OBgsN?x;KX9Yo4icEwtblHY&7Al zl{LXyQ{I9Xn5#3z^IFj+=N=ZVD-V~hw0N}I&Nhsv1b)SdIk(1_U5R|u{(afCv-j*L z=j60FF$zZ1158IP<581QCtrH5;$ZU)DbBksyD1@~vWlaz^4)mU2>10fWN#UBkVU2s>|NL(fpkPmZ3lX$)O_vC@stEJO|t{I8o(lw%jEdvD;&h%>im&q~wmZu`IF zx%A|M>4J%gBU^kp)~PH?mx};KWh-u)he&V9c;5AR5XMITg4XjIBQv|e&{9sqG4KAT zH-T(;-#@*JOu{;`_4N-!2(4>G1sw!IiTF*4K!>O5VS}$2EH@6fX&#hkVnN4-M(g#7 zEofG$M@$=~Y1WxJvHQGyeGEsx_FWN3c#pOw&veT)`bF4jTNSnX8x&~cG)EMR?`MeE zb**-n!L@RE4W{3{SQ2~#HC>u9v@xraxr6m@Ev;Qyr2r1K4GsbV68_U&>0u1F!TDFL zL?#Dxi4BPLio}*aliaEmX`UP_kn2DH2rDf9y!@{baqA*0zdJVtGcSz&>Pil=f9f0K zqjOK)U)lS!^F(Szt$!SD59!$_F`;{$-4k+TFH3tuS1?!351IQSIHcteWzyx^ItR!Z z&~$O1KwywEEM*9DV>7K>xrqhy9}@<9xr5)fmOfQ^E9_knp_-9)WZ><~iS{_?yy*Vw z?2*pQKY1tlnYpH=CS%9W>0dA3LqvX$%?@#XPhlBf&n;S)QhYqQ@2iJ)2M)6{x8l;hTJJhbHdDKh)a|Cp_PNeA#fTl-&f>`IE>&8kUwu|_pj^y+#KhIOxz*EK TUwO(xu5Jwz1CxqM!qLA0i|Pkw diff --git a/icons/tw.jpg b/icons/tw.jpg index 5372cef5b0179cb0b55023ca9b1dc25335f28bf2..62a15b3b903b66cf6632301d8fc4bea14cd0e85b 100644 GIT binary patch delta 702 zcmaFOcad$v{Q3h7f*cG63b6c%Z0ng~=Z&ImLI$q)tx7FKp?V+9pig$x4=H?k!*PJH;`|1Aa{pnfJnWkhdD?OHUG2+H%<|IVeH-*jbHC=pug_(>{;XVgyl{%F zN#wJjIdZR*<60W;toVLG`mRRU#3x%7%1y$(PPv3H7CY{C+BL31Kz3sDPAUJlDNg!3 zCNy95RQWYw%fv7kSefq63xzZe|W&@MbWm!&ay`4YQ-7Ye4VZP^=q zqgTr8aYjJ?)a{~5zj}A8vb51b0g0x+s-3e zZl)PKMP!#=k9t~CpSR#YgK}MFT9@H7#t%0#Oa8rTOmd!hmUru><*nbt*niwwe^JTK zLg?8pan-lVfBasuo9mx>ztibZo{><;$#5fOBg<&^Cw;H%eDy9m9=oJ?O!sYD_4B*3 X+EKGL%&eYSJ-#Xu=xVgI^#4r&#g`#5 literal 1899 zcmb7^dstIt9LL|YvkfL|J7+`G0b}5}>Tu(dBqAHk5sPpvd^GUVkme;w?qOiMC@lgM zK?ySDBFfd+N-P8y3i1e{TowY#J+(nf1LToQtTW8$slWQY&vTyhyzhC>_w)O`-`}h6 z)(-+iEb(THqpgay^aghWQEG#W}pQM#GM3c4v{ zIf|~dUdgbuw6e0Iudrd;FxeJNE2iNm5VqBbXhbnKrZ7!WQ|A8;{SAN`gK!WILpA`1 zLNE&H8vp}?#K9QoQV@s`&IoTW)5nh}*RXr|IG^u04^Kj^vnlaP}{X7=*C!#_(7O zMhG>w!?HtWRls{TVkfBt8CC&zAmaN-DxY2=f$JI zf>ful>Ir9(s(j5^rQ)vcJ8h6x?0%EpGP3Vw-Qn*xC=doU1#W8wD^>5St6fI|NCLmF zAFm!!jdeG4rqzr6r59r4Hg564up{60r<;xb61n?kk38|_`hl4NjM5GT5Drg-2rs~~ zCssg!C!h$8&a&p&a9#O=phZ@!)ZWmP+ZT38(Vtv#Z)#faPwCuw@VYudnw%TN9=5#j z>Kjp^zI#qe!Y+=`L5BZeZ%R z26fDS@W0h*m^MPU5n%F*;y8o&bI+7>%-Mio=v33`W0!hkGvb2hclvDZXOww((sq$m zwhou7GrX>UKJA&_M;rZmf0_g3y>Z{+**^}Pl+x|CIpkb4<~$hC9l?aT2!LP+Zw!-O zDnmFJ1(;7z$MF^bHB_P-8`=#87ozQU#ER)(f1?*=Mwze4Tvc{}28 zNjBT9wlT7#cH+7ak|Z~3wjhq>l#6Yp?~KvU%pNzFCZ)<>+Z$M1U?OQeypDLL*iMAs z%jYEAiB8N2RwQ!lOv$Mbzu>1LxK}H!0{+D{iD?6xjWP?T=3+M5@wle?BlW{MPWRc= z!rILR@MI`$Yn`7kk2B|ZI`-*u`$2v}+wJXLob{m&k?zAa#c_RF!_nF!n7v>a#$z^o z5fBQjd8{BAB8ZkKGL_u=_TP0cedujHWq$Cv?G+y7N2wlw`UhhUpEatcb&~fJ??s~K zo5bhO3sKMdq_=E@pTxCvgNc#RFPDE5C=QN%ctTssooRM#-1KOC$7gyFHFT%+2Yk06 zrfBUW&6IyDK#=%P)%gq0cE^cY?N5f+-OA2;+oPh;``EQ|@-*|Vsb%@HERl%Qb3Y`k zQt9mmAM$nDV;a75VFQa#u3QdD=Du<%H}wEmwrLo;9%gNVeX3um!nLD8872umPS zv~&5&p~Zq3ngMz4nqaRcHPW@)LqtgVAh@Q$CmGQTJyBS_3)HEU0Kyr~`<&O5H1CM}0L@LfX_ zbrEE_LM*B<*B0yUvyOj7^hso_NKxeEi34>9EddK{FZ3ZpkOn2|!I#^#55}4)DF;q; z<-&Ic;#=l-M7J&_Z@Y7WQ_SUW5(^1vri=T> g-^-HKz4;mAQ_@b2IU`y5?2W4y14b2A8Ty_-0eUvPUH||9 From 292b4593d11d1838d0cd3c7ef7349e0b801efe73 Mon Sep 17 00:00:00 2001 From: William Zhang Date: Wed, 28 Feb 2018 15:52:20 -0500 Subject: [PATCH 2/2] firebase data --- Gemfile | 2 + _config.yml | 5 ++ _data/about/excomm.json | 98 --------------------------------------- _data/about/officers.json | 35 -------------- _data/about/senators.json | 49 -------------------- _data/about/sponsors.json | 21 --------- _data/forms/events.json | 10 ---- _data/forms/general.json | 10 ---- _plugins/jekyll_get.rb | 40 ++++++++++++++++ about.html | 16 +++---- forms.html | 13 ++---- 11 files changed, 59 insertions(+), 240 deletions(-) delete mode 100644 _data/about/excomm.json delete mode 100644 _data/about/officers.json delete mode 100644 _data/about/senators.json delete mode 100644 _data/about/sponsors.json delete mode 100644 _data/forms/events.json delete mode 100644 _data/forms/general.json create mode 100644 _plugins/jekyll_get.rb diff --git a/Gemfile b/Gemfile index 7f21fd4..d87e1e9 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,8 @@ gem "jekyll", "3.5.2" # This is the default theme for new Jekyll sites. You may change this to anything you like. gem "minima", "~> 2.0" +gem "hash-joiner", "~> 0.0.7" +gem "json", "~> 2.1.0" # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. diff --git a/_config.yml b/_config.yml index 7b3c891..0bb39d1 100644 --- a/_config.yml +++ b/_config.yml @@ -28,6 +28,11 @@ markdown: kramdown plugins: - jekyll-feed +jekyll_get: + - data: about + json: 'https://sgawebsite-e30e2.firebaseio.com/about.json' + - data: forms + json: 'https://sgawebsite-e30e2.firebaseio.com/forms.json' # Exclude from processing. # The following items will not be processed, by default. Create a custom list # to override the default setting. diff --git a/_data/about/excomm.json b/_data/about/excomm.json deleted file mode 100644 index a57e63a..0000000 --- a/_data/about/excomm.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "username" : "excomm", - "name": "SGA Executive Committee", - "description": "The Executive Committee (ExComm) is a integral sub-group of the SGA. Its members act as representatives of the student body. The members work with the officers to organize events and activities throughout to year. While several ExComm positions may have more specific roles, all are working towards the goals of the SGA. Applications to be on ExComm are released every June after Class Council elections have been completed.", - "members": [ - { - "first": "MiJin", - "last": "Cho", - "year": 2019, - "title": "General Activities Coordinator", - "intro": "" - }, - { - "first": "Michael", - "last": "Huang", - "year": 2020, - "title": "General Activities Coordinator", - "intro": "" - }, - { - "first": "Rohan", - "last": "Kalra", - "year": 2020, - "title": "General Activities Coordinator", - "intro": "" - }, - { - "first": "Michael", - "last": "Kyrychenko", - "year": 2020, - "title": "General Activities Coordinator", - "intro": "" - }, - { - "first": "Jade", - "last": "Wang", - "year": 2018, - "title": "General Activities Coordinator", - "intro": "" - }, - { - "first": "Liana", - "last": "Keesing", - "year": 2019, - "title": "Policy Specialist", - "intro": "" - }, - { - "first": "Lulu", - "last": "Lin", - "year": 2018, - "title": "Policy Specialist", - "intro": "" - }, - { - "first": "Afreen", - "last": "Mohideen", - "year": 2019, - "title": "Policy Specialist", - "intro": "" - }, - { - "first": "Ethan", - "last": "Phillips", - "year": 2019, - "title": "Policy Specialist", - "intro": "" - }, - { - "first": "Jahnavi", - "last": "Prabhala", - "year": 2018, - "title": "Policy Specialist", - "intro": "" - }, - { - "first": "William", - "last": "Zhang", - "year": 2018, - "title": "Technology Specialist", - "intro": "" - }, - { - "first": "Beyonce", - "last": "Andrades", - "year": 2020, - "title": "Technology Specialist", - "intro": "" - }, - { - "first": "Katherine", - "last": "Du", - "year": 2018, - "title": "Technology Specialist", - "intro": "" - } - ] -} diff --git a/_data/about/officers.json b/_data/about/officers.json deleted file mode 100644 index d22a4c2..0000000 --- a/_data/about/officers.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "username" : "officers", - "name": "SGA Officers", - "description": "", - "members": [ - { - "first": "Nick", - "last": "Begotka", - "year": 2018, - "title": "", - "intro": "" - }, - { - "first": "Sherry", - "last": "Xie", - "year": 2018, - "title": "", - "intro": "" - }, - { - "first": "Shreya", - "last": "Chappidi", - "year": 2018, - "title": "", - "intro": "" - }, - { - "first": "Sitara", - "last": "Uppalapati", - "year": 2019, - "title": "", - "intro": "" - } - ] -} diff --git a/_data/about/senators.json b/_data/about/senators.json deleted file mode 100644 index bd77ac2..0000000 --- a/_data/about/senators.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "username" : "senators", - "name": "SGA Class Senators", - "description": "Jefferson's student government is divided into school-wide student government (SGA) and grade-level student government (Class Council). While the SGA organizes school-wide events and addresses school-wide concerns and issues, Class Councils represent their grade's needs and host fundraisers and events with the goal to raise money for both Prom and Graduation at the end of senior year. SGA Class Senators serve as Class Council members who are liaisons with the SGA.", - "members": [ - { - "first": "Ashley", - "last": "Lin", - "year": 2018, - "title": "2018 Senator", - "intro": "" - }, - { - "first": "Anna", - "last": "Lulushi", - "year": 2018, - "title": "2018 Senator", - "intro": "" - }, - { - "first": "Laura", - "last": "Gersony", - "year": 2019, - "title": "2019 Senator", - "intro": "" - }, - { - "first": "Sabria", - "last": "Kazmi", - "year": 2019, - "title": "2019 Senator", - "intro": "" - }, - { - "first": "Divjot", - "last": "Bedi", - "year": 2020, - "title": "2020 Senator", - "intro": "" - }, - { - "first": "Megan", - "last": "Dass", - "year": 2020, - "title": "2020 Senator", - "intro": "" - } - ] -} diff --git a/_data/about/sponsors.json b/_data/about/sponsors.json deleted file mode 100644 index 4814dfa..0000000 --- a/_data/about/sponsors.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "username" : "sponsors", - "name": "SGA Sponsors", - "description": "The SGA Sponsors attend all SGA meetings and functions. They also provide invaluable guidance and feedback - whether through late night emails, frigid-cold morning meetings, lunch discussions, or anything in between.", - "members": [ - { - "first": "Amanda", - "last": "Hurowitz", - "year": -1, - "title": "TJ Humanities", - "intro": "" - }, - { - "first": "Marianne", - "last": "Razzino", - "year": -1, - "title": "TJ Mathematics", - "intro": "" - } - ] -} diff --git a/_data/forms/events.json b/_data/forms/events.json deleted file mode 100644 index 415e8a7..0000000 --- a/_data/forms/events.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "username": "events", - "name": "Events", - "items": [ - { - "name": "February Frenzy Volleyball Tournament 2018", - "link": "https://docs.google.com/document/d/1rjzg8tW_NH52lUESdEZMJRsc2Bd-lntKaFYqZ1srmOQ/edit" - } - ] -} diff --git a/_data/forms/general.json b/_data/forms/general.json deleted file mode 100644 index d6c8e25..0000000 --- a/_data/forms/general.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "username": "general", - "name": "General", - "items": [ - { - "name": "Feedback and Suggestions", - "link": "https://docs.google.com/forms/d/18KRo3RritoN6RddNvI-l2zZs1h_1mmVWWgRQGOk2vvQ/viewform" - } - ] -} diff --git a/_plugins/jekyll_get.rb b/_plugins/jekyll_get.rb new file mode 100644 index 0000000..f5fb7e3 --- /dev/null +++ b/_plugins/jekyll_get.rb @@ -0,0 +1,40 @@ +require 'json' +require 'hash-joiner' +require 'open-uri' + +module Jekyll_Get + class Generator < Jekyll::Generator + safe true + priority :highest + + def generate(site) + config = site.config['jekyll_get'] + if !config + return + end + if !config.kind_of?(Array) + config = [config] + end + config.each do |d| + begin + target = site.data[d['data']] + source = JSON.load(open(d['json'])) + if target + HashJoiner.deep_merge target, source + else + site.data[d['data']] = source + end + if d['cache'] + data_source = (site.config['data_source'] || '_data') + path = "#{data_source}/#{d['data']}.json" + open(path, 'wb') do |file| + file << JSON.generate(site.data[d['data']]) + end + end + rescue + next + end + end + end + end +end diff --git a/about.html b/about.html index 2c520e7..97dd1e2 100644 --- a/about.html +++ b/about.html @@ -27,17 +27,15 @@ orgs: ["officers", "excomm", "senators", "sponsors"]
- {% for org_name in site.data.about %} - {% assign name = page.orgs[forloop.index0] %} - {% assign org = site.data.about[name] %} -
-

{{ org.name }}

+ {% for org in site.data.about %} +
+

{{ org['name'] }}

{% for member in org.members %}
{% assign year = member.year | downcase %} {% assign first = member.first | slice: 0 %} {% assign last = member.last | slice: 0,7 %} - {% if name != "sponsors" %} + {% if org['username'] != "sponsors" %} {% capture filename %}img/people/{{ year }}{{ first }}{{ last }}.jpg{% endcapture %} {% else %} {% capture filename %}img/people/{{ first }}{{ last }}.jpg{% endcapture %} @@ -53,15 +51,15 @@ orgs: ["officers", "excomm", "senators", "sponsors"]
{{ member.first }} {{ member.last }} - {% if name != "sponsors" and name != "senators" %} + {% if org['username'] != "sponsors" and org['username'] != "senators" %} {{ year }} {% endif %} - {% if name != "officers" %} + {% if org['username'] != "officers" %} {{ member.title }} {% endif %} - {% if name == "officers" %} + {% if org['username'] == "officers" %}

{{ member.intro }}

{% endif %}
diff --git a/forms.html b/forms.html index 04825b2..2be2879 100644 --- a/forms.html +++ b/forms.html @@ -14,17 +14,14 @@ sections: ["general", "events", "elections"] {% include header.html %}
- {% for form_name in site.data.forms %} - {% assign name = page.sections[forloop.index0] %} - {% assign form = site.data.forms[name] %} + {% for form in site.data.forms %}
- -

{{ form.name }}

+

{{ form['name'] }}