From d8a20175b685e26df3fc40f338a2cf074b26ccf6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 11:43:14 -0700
Subject: [PATCH] Adds email template layout and formatting

---
 bookwyrm/emailing.py                          |  32 ++++++++++++------
 bookwyrm/static/images/logo-small.png         | Bin 7039 -> 7314 bytes
 bookwyrm/templates/email/html_layout.html     |  26 ++++++++++++++
 .../templates/email/invite/html_content.html  |  17 +++++++++-
 bookwyrm/templates/email/invite/subject.html  |   2 +-
 .../templates/email/invite/text_content.html  |  10 +++++-
 .../email/password_reset/html_content.html    |  15 +++++++-
 .../email/password_reset/subject.html         |   2 +-
 .../email/password_reset/text_content.html    |   9 ++++-
 bookwyrm/templates/email/preview.html         |  19 +++++++++++
 bookwyrm/templates/email/snippets/action.html |   5 +++
 bookwyrm/templates/email/text_layout.html     |   3 ++
 .../templates/password_reset_request.html     |   7 +++-
 bookwyrm/urls.py                              |   9 +++--
 bookwyrm/views/site.py                        |  16 ++++++++-
 15 files changed, 152 insertions(+), 20 deletions(-)
 create mode 100644 bookwyrm/templates/email/html_layout.html
 create mode 100644 bookwyrm/templates/email/preview.html
 create mode 100644 bookwyrm/templates/email/snippets/action.html
 create mode 100644 bookwyrm/templates/email/text_layout.html

diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py
index 7069286d7..4025aa220 100644
--- a/bookwyrm/emailing.py
+++ b/bookwyrm/emailing.py
@@ -4,25 +4,37 @@ from django.template.loader import get_template
 
 from bookwyrm import models
 from bookwyrm.tasks import app
+from bookwyrm.settings import DOMAIN
+
+
+def email_data():
+    """ fields every email needs """
+    site = models.SiteSettings.objects.get()
+    if site.logo_small:
+        logo_path = '/images/{}'.format(site.logo_small.url)
+    else:
+        logo_path = '/static/images/logo-small.png'
+
+    return {
+        "site_name": site.name,
+        "logo": logo_path,
+        "domain": DOMAIN,
+        "user": None,
+    }
 
 
 def invite_email(invite_request):
     """ send out an invite code """
-    site = models.SiteSettings.objects.get()
-    data = {
-        "site_name": site.name,
-        "invite_link": invite_request.invite.link,
-    }
+    data = email_data()
+    data["invite_link"] = invite_request.invite.link
     send_email.delay(invite_request.email, "invite", data)
 
 
 def password_reset_email(reset_code):
     """ generate a password reset email """
-    site = models.SiteSettings.objects.get()
-    data = {
-        "site_name": site.name,
-        "reset_link": reset_code.link,
-    }
+    data = email_data()
+    data["reset_link"] = reset_code.link
+    data["user"] = reset_code.user.diplay_name
     send_email.delay(reset_code.user.email, "password_reset", data)
 
 
diff --git a/bookwyrm/static/images/logo-small.png b/bookwyrm/static/images/logo-small.png
index 10ea7a38fce9c962399af6697619cc9952cde89a..72f49ef78b35ce0ab8408ea3a254398274a219bf 100644
GIT binary patch
delta 6585
zcmV;q8Aj&+Hj+7zU;%iMVNehQ=l}o!0RR94=l}o!0RRG#%^Vpf|6Uyc000SaNLh0L
z0GY}F0GY}G<B_BylL7%$12!%&vsnRB0h1F0F_Q`d4wK#jHIu6XC6h!0E`Qfktatzb
z84yWCK~!i3y*dYYR8`jJO-nC?5E4irB=lZI5UC<RmK7I4R}^JMDK7qsB33q*U0qam
z*Tq#pWtUY^B9=&R>Ag47A(=@glVm2zWF}MIy!Xz3?wgW;vig1de|zV<uiSF(Irr3i
z-T?fYf{2{Au1l)cc!!=nYkvp=$XNrB{eHrd{IX?t79%9)Nr{V#aNf#-T!75&4{Xhi
z_l{3ZMb&`=s7^{k1#9!dWOwhF|MERm#TI<xiK0M&j6D#Xt$q0EdOY-{5p(kUu&Bm}
z+BPe;wppd(vOYZUX**6_lHW&!eGYJO;Q+EpM35WSK-+)yiS3|!SAPk)yNN6M*Z*R`
z{8B3#dYmHdFkd1VgiWSw)QV<$m5V@Em(?ob+3a5Y-)HNPHsK->a@zpvj3`tNy#JCX
z8JGWrqk{otCM{oIi>EWY@ru#ztg-b7c63P${g(_yIHNTcwGJYPT3jO0N%!-%7V%+o
zHlN$qCN|c(aPu=VVSg6@(g$%YRkd#2v0p&g|BGmP7s}eVai<n@YkGu^9+z;i>oTfa
z&*K$Gugs1&I!kbATROIQ2$F~xhbZ8@)->GEmW`dRem0I5B}vFHwBnkLRm8Eh;{fNU
z4e+H%4NDo<m`JkfE5s3*oBs)C7%*BuE?Ljqzr7i&n);pEPJgFFc;X+8C3u%U19gl5
zD#_*sjP1N2YNcK#YOIPSb_0U$9DdeaOO%KxG2xW?hA!SIip4p0eEfk*A}swM0O!WJ
z*BW${i5o2L0FiU^j>O-b|0j9WlmP=ZXx5D$JxV(wcXsr`63i>_!A!kTY_(cstaf!2
z;zHW}c9;C_5`RQVDAb#<PG>`XyMRWcfDLA|aJw;+FX1~Ffh2+SW2_^>oJ8{pXA}Re
z;R;?z?ZeyG7D>c~LlB!gKk}yhV~g*~yN<w%BS{C>!kkisggob?j}}C`G5^Ixd0C#B
z`OOc#c+S|)gZ3<z*bFj3X=WX6G-XRQ7L$;jZoy4Y)qmoug~fV+yizjbl`uEYv~@=V
z?)|JCPnVdm&EynpE|ND!5S8Sf288BQ_^G*?HSoqR2c~9PaL(#dj9pTTFf6wL;OtZx
z>5;id?|-}u7q6+nqu=XXDd&xhtHm_Wt#@<0l5`{H$gF0a8LQT8sm1yhhwC4@CXCfz
z#53lrZhxVnYioy9d|(Sx^7IpA{gwh8A;07<(;#yQnd;@tM?qMg?vZD&;wQ&-SbL>k
zDlwYy7JV8%q0hxWbf8{q!_^NINv#GOe=5Tu-SJQ{fAnN0u6wLRAh=DBJl%lB^%lJS
zHzndTFIA$U!^VI6gNfEnEj)6h+_UB>KW12%kAGX5<dH5fG6SYG^VpFT6Sj2ne7>Oz
zq4f+NFjmvXAa?gSgj?^bA)r~W4$PyOKj9>g9b<-tnfr9}*>oconR+CqTj_mT8CFws
zAHm7Sd8-TYo{c3WdRdr}XA){id@ttqU~jL}Rax63s%PcPeK08x?GC|NRBEGnnf0*?
za(_r1uPp->MfT#H7(X*Le8?Ql(y<9@aJU5J#IP{<d*DcD7H!}FLHPJ%qcZbE*M5LS
zZvY%q&XL)U92HswIJR3;WTi#r`t|EYNYsqj^4ySsfG|$Hnr`Jv17<;l5GrF4=&yuT
z>;2*Vy@{~x@sV6f`9ugDBPv6N04|#!E`NoEX;gjPyyCX;D(=*ocmM}N!01AazsA9r
zRm>jOnv3NmO)JPh?x9+}=Aj~rUVO#NuGB@3?6{1T%~q+tt=}#9?yGS13PFU-E400`
z3}5F%$n1j8yvEHsH)8lrx$Q8c1K&Mp#K)g&q`5g_b-fjTxL^?NP62zYE}VW_0e_|z
zcVVl^g`XK4aC*l@taBJ;4w8LDheN>Kd#Z2&adF$uay)TbhZR-b3?rek+Jfsg)nL+F
zP1I(?i1|gxkhs2#9h(>iDvd%^D?sii;{-~MlZq;AM2Pe`aYJOLJvn)<%QKk~NOBLb
zdi4&!)2ILD)Ro?@_n+OoAwINg$$xWCIB1-0$V1!1cbZ*1Jo<(~v1h#*7OfbL^QQZA
z**V=XDkcPq_&$jCQ-Q|4EXgr|pPv%mcx4i3byf%u(~u>#b9n_;?!EmwWkfh9h6G4T
z7R;2CTcF!1)(;{m#Iw6xRCu@=6bcTN9)VQ2dlYqz6rKT=FvI~YOvG4WqkqJZkdV9M
zVq;%wYB&=$aq?snuQAqx5T6~;3FqE=0WQCDvG7o1djP!uemg%QR9W}GPnyR~Sz-2%
zja1<$`+B+A6T=~3ngYssk=X2Bkk|l7+M}kOO&Ak`+n=rCKKgSvPkZ+^t(ireOT9{p
zFM)JPKk}(v;YS7$M9uEvuYXkfB*)X_d1pEdQm5Q_7*tb&k`&eJllUQ1$8K}>+y8#K
zrp7ZK66j$bK+Fb!c6jm6aS$=#ODHM{1HW+`%$=k?AGBsokRoVo!uH>W;L9&+xbY)G
zAUYVKs@DQeH?u*dkav`Eo->*pip0@=`1I}wg-XS3YG~#k?d%p6lYbL5LQs%GlTqrd
z`s?1Adj=6y>_LVz+3liiwImM@IHJc60w!-T0W1*a!)nNeP0JkBG$Vj^$G@s^e-Ax>
z{^7^`l9elz+72ClTJQqYHZ@{c%WVopPPgKRiuV{aMS2Tp(l5YHfI|S$|3I~Jo?_EO
z!yr7Ahj_oCkUV?=aDNg9ot+M7*4nYYQBajt^+89M4MKty!1I2pIWxoKcK$A$i6ET6
zq=%|n1@zjr!ykGmKV%R=<Gtv&wj1n#VhAVDafpzR+2e;w<p-mq;q3^=dndFfZUMXF
zljp{-P0xGsk%zMysuXiqE_a3eW|`)UT7<@-!H}Q08#+aVcz@mx60H(^X%FI}yG5vM
zs>9lvS}{8_O<7j{D0kw>qj2KLYJiDxaNmkhh##tf-W~xzKHCdWZ=$u8e+3Bs7Qkhp
z{g8sE`GtM5-|&=WU(Bz=LOFixYrPuKxtgM9t6uv2^Z9);vV=4Mi+YpE%tHFO754?z
zyz}-1WuU)8N`DycuTZNz%0voelUz`!uyCiWZBS_G>2G#AH9VktX>b@!=lo%sG6Y6x
zLSU$h{2sB^j1H)B^}<_@c6cu|0hXwvL6k(WTKb{8yBj(TEu`=UxLoUm>^v)6INeUj
z=rAC%2S!Dl<YrG3XB<5a6*7*V%M-sTiu^}C*Tq{zP=5~zgap6-FX}SpZ+PMWMGj>C
zJVbf#Y*u#Z`CK#B>TN=IA1|9wZ|EYwP{=}eIsx%$5N&9dc(-AvMu#L|JKv8w-bzuo
z%QGCY%V|Z>p2uQqyRYrq2ML`H3z|&rn4NWrlpUCJ6DLi&R}O>5j(y*6DMd1FSCOg;
zoRgP1dw)g2{gW0I?1z~J+Zon$03A#awfJJA^jH44za8t^?asz_IsC_z-X=U~az_gu
zL>Lh)j+S@|!_W3L;{)wkIHfHON9axv^50OzeHKqq$kZ?L$WzGuc~2eQLj81<pji@%
z6p4GQC)ATcx3p+UQUK%Q$LW_YT^h`grQ#D4_kXMR>OJOo-U-5h*m=$(Q|3`bJ1MU}
zqqG|@xAluQn}{ZX!j0Ao_)b?j8ff<|f)iVL3!boRaZyJmKBmvcT&o_t1qU8)c@5vF
z0zBUS4X!g3;H_<`@^NB(+a)6OG^SeIp^r?MOoIC&2y$?a7cN|2mJMgmo}KMMli@fB
zPk(pox^+K3^<GDH60y2SU0ryS0cwPIQ%=~)p(<S39y>%R1Hdt2DTpA!lCA=HysHQv
z>?nl0@=rqOH)(KS=v=rtC<a2w8}{+lz>_&y5;76?gpDT)DM4EJBuJtVsxj(j7^88A
zKFoR!E+k^|YinyO6FK6Ex=Oy2WuUvqXn%QHNFtMynS+-ZG63mX4za<5IhIxWNpcrn
z>2x|OI(xB8aEqTqaABil!56<e#1_Fnz51GOpN)1s?yCWOkE+S;))$k@=Ii%9_>|7u
zFzCK}_il2YfWNwP>^6oGz&`R0zpPxxAvTFjwdb7ws|Nz_d~98vv9i$ar&U;;(|<bh
zA<d$Lx4X+>x3LORs@y?C{LCr7)hsR}SZUwFRlkNHwVM+WssQ2<d3_q?zT=PNhv<=E
z*lac^E31@a#gvoJzc6fO>r8;1b_#@jX*AzrKlMO>2H17Y0Qcc(-kpUBWcBoikD0Js
zZ*f$adc|yu9<Nv_;N1MU%%QxzJb&N*mKe|AOBI0Mw*21L#!jq1SD0~NrLC<^hPiM?
zkdX2n9R_bMB7Hi)NJj1bQ+|+2L3GgpwXdT0K<YuBVBCNpHo#5P#wYWKQs|WN{GK*U
z%kRcMD>}P6x}}8Cqvge$o10~1*yTdoNB9B}l+pe#x$Tz_!v=Z@DlMa<Hh+m5tXzZ^
z$;umATnN!Qq*K`oJShM8hTc>gc*EKsk8!uKXgXDO<b(MX^T6W0uV+2CcR#o1_pgl)
z84}b0S6W(d-c1X*Aw%epN`*O0qq7dwv_%n`QF0sMO8)iV?3p}j;G%17bH7X<19RJp
z)%m052~Fv<R10TUo=M!Fy?-R<PJIkm6!SsF`B7@G4K#{RX#pEKR0Z877W%N&*sk25
zEF+dPTfdHWiF^0fDX0GV+7A8pk%=YG(1fsgbLV1EaFC3#L$pGVs~7@EGsFEnxr`e?
zy}sE?w63K^?)qx>Y8XCr9E7)|tDcRF5Igehp&bEy$==|p+~Q%;5PwX($OkjLrLW)N
z)Sg?W<2XH#`2B=YxPB@2&O#!>nH+Cs<{e!CGhUlL`RioXGj+-&L8*{+7_6=yFpC)w
zqMQmLYLZeaGNtm<jW1p<lGs62&1HGuXQ5`8<rf8f>`HjhZ?v*%;uOh}u!P&Jj+dBq
zP*dbAn9P>gsL1jCN`KWBH}t!dgM!l=FX-t(C}tu^3JF_WI-Mnvwa1T%_u<^jcK`+I
zFw$=U1ggBg#@GF`3s|jINYBj%S^#3gM#6Gq9=xHBfoTE5SUN!Qo%Jfd?$C1$eE$!$
zRgn-FydYE+1(Aqh-85$oRj<fhw-{5hG^*Z1pSPPG>Xx~7?0;D8cmDiUnV{I%SRckc
zyiRtgLsSz<#MPuz5^;!r<O#eY<%Kl(?&S~*RxcNq!Q@F(;I|QT;5L^8MPe76baa7>
zzJtU`0bDdCm>$_Za@#8~p>1|+>QP>A7}BTY=qv(IoP5QnLj&+xJXg#SC&*>opnUh8
zIo4`zk73;rLw_S=v1KPqqeCmt7!g9W5}6cb_#iMh^K-VLz1<*>mue<qVTXmQkFvsT
ziU`ng{a}^^?xm<1LZrr^+6GliXy6wmu}dE$sBZmd=9^nD`Z&a**kpEmAhCMqo${bv
zyUa_;R#2oXd4fYE-EpQ-)}Uh6^qf&CCqcbt%{@X)On;0lwx|%mqD+Gzdb1gaL8aCL
zSKGRwrNs%$mkfg`lPQ(+GZv46QbrKg!YHmW9bn_cL@XDK97h-|_Zu$vO`I1(cct5t
z&nYIKlq5p(WD*0W=RUKYq>zbWEs(i$*Pj089)3C|=9anP5FZ;rmXS^<Iy)RcsfCm;
zioUbDQhx~g>kt<=M$u5;NaBT{3R6OQ#zH7b-3osvN3YLg%1sj|P)>EO$E=GI%T>tY
zH&_I{&y9_ZOez$Mmj|X-Rr516Hcj~Qz&L44n4dz9=BRU61k*5;EFH4aKoY|GLDHnx
zBTF*CfdhKFXJ6X(Vk=%O=s{y2&q7~z?(tQYQhzEb=W*4Y1ccm9cz7JUQ)LmuY25s~
zI(%#2Rh+fD9OvA23QwFYMYGwR6DK%7DlFgajj-)@JFZ>3PL8tgz4!TD6PA=~bE+)Z
z(B=>v4qv3<(l)ciK*skBXSX|XKY6dJm>4&8Tee)iu=k^J3+}xq*g0yLze=Ozm@W1y
z0e>gb?ovugnl)W1O-StG&Jy3Fqjk_L9)PH+H^Kfr(GVKS!T)S+1gJbiQ{RMFjR0|@
z?u1E`ron^><6-pZ(J*4f2#Ab~gfL2As?};xD%moWv#^r{98Xqi$d*J!k89W3q)^IF
zL6xGDvkHE|5vgi&aC#e)aE()*1nb<lL4Q{jvD-lu|MAs##x7WMPlzKXT<uT9u$>pW
zj7}9(_Rw&(;IEOBS<3G2Ud73iUqN`(XsE6IGu->wM0nxZ7zpuKz}&SB@VBizn7eI|
zn|BYKJo!D8mYswYQn<k-Dk_TdcdKFQ)TuCP)F>i$B6M|i%Ho!g0J<*oSiiVf|9`OH
zK!ubd>J^90W|9XbL<9rwGL3_wz;&?Dh3p#Ja9MZcS9baE<AzxgbMx%kmA%-}%gZOw
zrYn88^W`fzbZ)*icvgPzeUCTb*JnG>>_oolY7--tY6@<Du^!8s%xHCpxOPJ^e*JBW
zPpp^-84T@MSy_o^&YZyyKl~7%et-IDT(Dq)XFh{*O(n}3gR53S4us_&`_q9oY;1S9
z^4h!bXm1@JHPvI5OUEBi>85#?Sd=p8ge||x7gcJiWz)`$BmIXB^AjRN)k?j-pG%xp
z3((KM{N#&64}^pUN~cl`zrOE~;q5m+P)1IlXeWT5b6a;$fX$CZ!PJCMxPNf24OGOT
zwQELE>W>ZxG{WECpK3G=A091pg005-nDaE5Okgk=fFf(CsHlL02M<sZDM00?Xn`JE
z($u)g>Up=$4`kz2^M*yje08K3W99CGdU|%{$PEc|Bq;WFdF~HyE^YntR6A;ovgWz|
z`k|iC$=Y|_Fxa=RIszc~Q-7FHgljfei1{@=XtoKI*bs2+;sUI`Z1Qnu@B@pYnc}-#
zE?-1FxWA#Hfr%QfTzQjy`;H@oXciv*t`$G(sFS|xY{XN2SMXC~4Ytr1!tPFH5VGrN
zzR#IokEg1kRU8>HM2Q+oxAMHG$}1vG2JQ$O$i6HTlV752OYqK}Q-8WwJy3M~>Q(<u
zyS9$RQPF`A8lZ%%91}KX=(!L7eh3m1r$R#F7@+6@hLfJKC_FGwHlo+8O9;_-3_&&u
z&CM+`a@BQX{myqxp7-(bD7a<eF#M<3#cdTSrR5|eAPUevG)~OQw2%dH{*&~c2xCVZ
zUvAw8U*!_WFL;vI41Y2c7lOcc4WgpL6suRCqU8HB>mUAdW%$ca8;%}69SwD3j4(53
zG#dh6eNX-t(uDo{4>5Cf&CcC@_uVjK=1fQ&n<!hjkuhZ9h7N^LkA-9Nnb@&%$6YhH
zZ968Y;^X`v%umfdqnHA#?a>qma4;-5KvZ^WG{4$hY+Sc4^nZh778WPX5h01qyspe!
zQJ_sp>q4DL{@;O%{b_=%-ofjJk-lc7{%Nlszcc7~Xg!N>nM?8O@+*=*6yxMom+*~!
z-{XP9|KcBdWv2)$N3(7D$vP%60XJ{njPJbnE`I+*3U1xDO&)jd{5iKIdcH6Z7E5||
zKKqK6#-%^v#(&Fw@ca>u?uN|29{SRRO<fMBNdBv*$004chkc<=JF;kF-XhJMoQWjY
zpWk<XBbL`%`K!HF{6j|xzHg~;y?a<k<FfxU<@Ty)=C7%6efot3PhRf8=XJUK@rE+7
zwxSBZOgWC*-hB-xZMqL((ij^5(}b3lmdP{-g8L{g2!B3j>Nt3WeOt{q?8f)HJlv0|
z%3gfW#%e5SvIs`AoB@@3dY$5zN4oH-C+hL;2g~t~Z)@>TWs`WWN9Wx*slU%9En8Vc
z3tdcf!#qBk%<2Bw^9yYs9PY-Ps(v!($X}K0!t}08X_Gz+TaBG~rLhUKGP7{o$M50v
zm$u;Im47R6!-Ee}MB)CM03(Q;I9rEBD$c{7v2UswgB%$Jp+8@;&m25z#FieXgZRXN
zNg2*o*Sl>MVy{)Ue!{OiGjUgE0hU=hS-&IYOfM~z#-y3PNaPGkGo{87VSj+ooR00U
zHe*U^H(qM)5Vdw23!!}5e#Amw^eD4hZPcU7=6@XMaA#wk9i2|x{d*<>>HqZM@5x5_
z-f#4<`1XQ0`kdbX#pzD^Oei^;9cBrdf51cCmuZ`bKtkgya%`ZzfK}MxXlY`;D95?*
zj*`)Cm~?)UztIlJ_AR$$QCOU@l|-_1%k~ERivA){P-{k0pNsDko&0;|QrEZk2A2Hx
zR)0pY(Anj}<ZsD&j?SYmH0h7|aF*fw-u}&lC!ZZVH|HjZ$gv&x!iZ&BvyjwX<~(Sr
zb_+DE#1<oAaMf1Pch*_-ce0?IRWelHUjaO8$h$Z|n7j4T3L@@{S*waH&%UX}e|<xL
z=E$>=?{Z>Ios$Ay8=fGJzx+ByA#u4nN`K6}IcI6A$D1;p`9)$TFXb__?1S+#VL9#i
zrBnT%+`A!i#p=7FATB|KaZ&!rta?X>#HFS7!HX|6)44$TD8Ma+?r7J24w0c<b79Vp
z&MVjWiVJk?(5xi8FrO^^D5`W$XNO6NPS9cv)$G+{M`xaH9Onr>f7;hvv&@ZN++LsO
zy}jwniQOMeo>R~UQwnkVibA~gSA}^nJMRhNl<X;w9n%HSvy!S}Q1$&`klN(UVt<IB
rs**o-c)|bdy~y`x!Ji#^-GKiCO;pGV1GGQu00000NkvXXu0mjf2lml(

delta 6307
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
Z{|EBj^_`|r6vqGn002ovPDHLkV1lYr@3Q~^

diff --git a/bookwyrm/templates/email/html_layout.html b/bookwyrm/templates/email/html_layout.html
new file mode 100644
index 000000000..02527ff52
--- /dev/null
+++ b/bookwyrm/templates/email/html_layout.html
@@ -0,0 +1,26 @@
+{% load i18n %}
+<div style="font-family: BlinkMacSystemFont,-apple-system,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Fira Sans','Droid Sans','Helvetica Neue',Helvetica,Arial,sans-serif; border-radius: 6px; background-color: #efefef; max-width: 632px;">
+    <div style="padding: 1rem; overflow: auto;">
+        <div style="float: left; margin-right: 1rem;">
+            <a style="color: #3273dc;" href="https://{{ domain }}" style="text-decoration: none;"><img src="https://{{ domain }}/{{ logo }}" alt="logo"></a>
+        </div>
+        <div>
+            <a style="color: black; text-decoration: none" href="https://{{ domain }}" style="text-decoration: none;"><strong>{{ site_name }}</strong><br>
+            {{ domain }}</a>
+        </div>
+    </div>
+
+    <div style="padding: 1rem; background-color: white;">
+        <p>
+            {% if user %}{{ user }},{% else %}{% trans "Hi there," %}{% endif %}
+        </p>
+        {% block content %}{% endblock %}
+    </div>
+
+    <div style="padding: 1rem; font-size: 0.8rem;">
+        <p style="margin: 0; color: #333;">{% blocktrans %}BookWyrm hosted on <a style="color: #3273dc;" href="https://{{ domain }}">{{ site_name }}</a>{% endblocktrans %}</p>
+        {% if user %}
+        <p style="margin: 0; color: #333;"><a style="color: #3273dc;" href="https://{{ domain }}{% url 'prefs-profile' %}">{% trans "Email preference" %}</a></p>
+        {% endif %}
+    </div>
+</div>
diff --git a/bookwyrm/templates/email/invite/html_content.html b/bookwyrm/templates/email/invite/html_content.html
index 672d34077..358e23dc1 100644
--- a/bookwyrm/templates/email/invite/html_content.html
+++ b/bookwyrm/templates/email/invite/html_content.html
@@ -1,2 +1,17 @@
+{% extends 'email/html_layout.html' %}
 {% load i18n %}
-<a href="{{ invite_link }}">{% blocktrans %}Join {{ site_name }}{% endblocktrans %}</a>
+
+{% block content %}
+<p>
+    {% blocktrans %}You're invited to join {{ site_name }}!{% endblocktrans %}
+</p>
+
+{% trans "Join Now" as text %}
+{% include 'email/snippets/action.html' with path=invite_link text=text %}
+
+<p>
+    {% url 'code-of-conduct' as coc_path %}
+    {% url 'about' as about_path %}
+    {% blocktrans %}Learn more <a href="https://{{ domain }}{{ about_path }}">about this instance</a>.{% endblocktrans %}
+</p>
+{% endblock %}
diff --git a/bookwyrm/templates/email/invite/subject.html b/bookwyrm/templates/email/invite/subject.html
index b3c4a141d..efb8be5ae 100644
--- a/bookwyrm/templates/email/invite/subject.html
+++ b/bookwyrm/templates/email/invite/subject.html
@@ -1,2 +1,2 @@
 {% load i18n %}
-{% blocktrans %}You're invited! Join {{ site_name }}{% endblocktrans %}
+{% blocktrans %}You're invited to join {{ site_name }}!{% endblocktrans %}
diff --git a/bookwyrm/templates/email/invite/text_content.html b/bookwyrm/templates/email/invite/text_content.html
index 7add9010f..c3fcdc04e 100644
--- a/bookwyrm/templates/email/invite/text_content.html
+++ b/bookwyrm/templates/email/invite/text_content.html
@@ -1,2 +1,10 @@
+{% extends 'email/text_layout.html' %}
 {% load i18n %}
-{% blocktrans %}Join {{ site_name }}: {{ invite_link }}{% endblocktrans %}
+{% block content %}
+{% blocktrans %}You're invited to join {{ site_name }}! Click the link below to create an account.{% endblocktrans %}
+
+{{ invite_link }}
+
+{% trans "Learn more about this instance:" %} https://{{ domain }}{% url 'about' %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/email/password_reset/html_content.html b/bookwyrm/templates/email/password_reset/html_content.html
index e3a006b04..eef0e5e59 100644
--- a/bookwyrm/templates/email/password_reset/html_content.html
+++ b/bookwyrm/templates/email/password_reset/html_content.html
@@ -1,2 +1,15 @@
+{% extends 'email/html_layout.html' %}
 {% load i18n %}
-{% blocktrans %}Your password reset link is: {{ reset_link }}{% endblocktrans %}
+
+{% block content %}
+<p>
+    {% blocktrans %}You requested to reset your {{ site_name }} password. Click the link below to set a new password and log in to your account.{% endblocktrans %}
+</p>
+
+{% trans "Reset Password" as text %}
+{% include 'email/snippets/action.html' with path=reset_link text=text %}
+
+<p>
+    {% trans "If you didn't request to reset your password, you can ignore this email." %}
+</p>
+{% endblock %}
diff --git a/bookwyrm/templates/email/password_reset/subject.html b/bookwyrm/templates/email/password_reset/subject.html
index b216a6c26..886801402 100644
--- a/bookwyrm/templates/email/password_reset/subject.html
+++ b/bookwyrm/templates/email/password_reset/subject.html
@@ -1,2 +1,2 @@
 {% load i18n %}
-{% blocktrans %}Reset your password on {{ site_name }}{% endblocktrans %}
+{% blocktrans %}Reset your {{ site_name }} password{% endblocktrans %}
diff --git a/bookwyrm/templates/email/password_reset/text_content.html b/bookwyrm/templates/email/password_reset/text_content.html
index e3a006b04..b5cf754ef 100644
--- a/bookwyrm/templates/email/password_reset/text_content.html
+++ b/bookwyrm/templates/email/password_reset/text_content.html
@@ -1,2 +1,9 @@
+{% extends 'email/text_layout.html' %}
 {% load i18n %}
-{% blocktrans %}Your password reset link is: {{ reset_link }}{% endblocktrans %}
+{% block content %}
+{% blocktrans %}You requested to reset your {{ site_name }} password. Click the link below to set a new password and log in to your account.{% endblocktrans %}
+
+{{ reset_link }}
+
+{% trans "If you didn't request to reset your password, you can ignore this email." %}
+{% endblock %}
diff --git a/bookwyrm/templates/email/preview.html b/bookwyrm/templates/email/preview.html
new file mode 100644
index 000000000..66d856c08
--- /dev/null
+++ b/bookwyrm/templates/email/preview.html
@@ -0,0 +1,19 @@
+<html>
+<body>
+    <div>
+        <strong>Subject:</strong> {% include subject_path %}
+    </div>
+    <hr>
+
+    <strong>Html email:</strong>
+    <div style="border: 1px solid #c0c0c0; margin: 2em; padding: 1em;">
+        {% include html_content_path %}
+    </div>
+    <hr>
+
+    <strong>Text email:</strong>
+    <div style="border: 1px solid #c0c0c0; margin: 2em; padding: 1em; white-space: pre;">
+        {% include text_content_path %}
+    </div>
+</body>
+</html>
diff --git a/bookwyrm/templates/email/snippets/action.html b/bookwyrm/templates/email/snippets/action.html
new file mode 100644
index 000000000..56feb9efd
--- /dev/null
+++ b/bookwyrm/templates/email/snippets/action.html
@@ -0,0 +1,5 @@
+<p style="text-align: center; margin: 2rem;">
+    <a href="{{ path }}" style="background-color: #3273dc; color: #fff; border-radius: 4px; padding: 0.5rem 1rem; text-decoration: none;">
+        {{ text }} 
+    </a>
+</p>
diff --git a/bookwyrm/templates/email/text_layout.html b/bookwyrm/templates/email/text_layout.html
new file mode 100644
index 000000000..cd0444f16
--- /dev/null
+++ b/bookwyrm/templates/email/text_layout.html
@@ -0,0 +1,3 @@
+{% load i18n %}
+{% if user %}{{ user.display_name }},{% else %}{% trans "Hi there," %}{% endif %}
+{% block content %}{% endblock %}
diff --git a/bookwyrm/templates/password_reset_request.html b/bookwyrm/templates/password_reset_request.html
index 97191afa4..5d877442f 100644
--- a/bookwyrm/templates/password_reset_request.html
+++ b/bookwyrm/templates/password_reset_request.html
@@ -8,7 +8,9 @@
     <div class="column is-half">
         <div class="block">
             <h1 class="title">{% trans "Reset Password" %}</h1>
-            {% if message %}<p>{{ message }}</p>{% endif %}
+
+            {% if message %}<p class="notification is-primary">{{ message }}</p>{% endif %}
+
             <p>{% trans "A link to reset your password will be sent to your email address" %}</p>
             <form name="password-reset" method="post" action="/password-reset">
                 {% csrf_token %}
@@ -16,6 +18,9 @@
                     <label class="label" for="id_email_register">{% trans "Email address:" %}</label>
                     <div class="control">
                         <input type="email" name="email" maxlength="254" class="input" id="id_email_register">
+                        {% if error %}
+                        <p class="help is-danger">{{ error }}</p>
+                        {% endif %}
                     </div>
                 </div>
                 <div class="field is-grouped">
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 30c1bba4e..4aced6fe6 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -48,6 +48,11 @@ urlpatterns = [
     ),
     # admin
     re_path(r"^settings/site-settings", views.Site.as_view(), name="settings-site"),
+    re_path(
+        r"^settings/email-preview",
+        views.site.email_preview,
+        name="settings-email-preview",
+    ),
     re_path(
         r"^settings/federation", views.Federation.as_view(), name="settings-federation"
     ),
@@ -87,8 +92,8 @@ urlpatterns = [
     ),
     re_path(r"^report/?$", views.make_report, name="report"),
     # landing pages
-    re_path(r"^about/?$", views.About.as_view()),
-    path("", views.Home.as_view()),
+    re_path(r"^about/?$", views.About.as_view(), name="about"),
+    path("", views.Home.as_view(), name="landing"),
     re_path(r"^discover/?$", views.Discover.as_view()),
     re_path(r"^notifications/?$", views.Notifications.as_view()),
     # feeds
diff --git a/bookwyrm/views/site.py b/bookwyrm/views/site.py
index ce64e6e0f..5b33b92a7 100644
--- a/bookwyrm/views/site.py
+++ b/bookwyrm/views/site.py
@@ -5,7 +5,7 @@ from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 
-from bookwyrm import forms, models
+from bookwyrm import emailing, forms, models
 
 
 # pylint: disable= no-self-use
@@ -33,3 +33,17 @@ class Site(View):
         form.save()
 
         return redirect("settings-site")
+
+
+@login_required
+@permission_required("bookwyrm.edit_instance_settings", raise_exception=True)
+def email_preview(request):
+    """ for development, renders and example email template """
+    template = request.GET.get('email')
+    data = emailing.email_data()
+    data["subject_path"] = "email/{}/subject.html".format(template)
+    data["html_content_path"] = "email/{}/html_content.html".format(template)
+    data["text_content_path"] = "email/{}/text_content.html".format(template)
+    data["reset_link"] = "https://example.com/link"
+    data["invite_link"] = "https://example.com/link"
+    return TemplateResponse(request, "email/preview.html", data)