From 9525b61e8be8493077472865bd08f5beddf37cc6 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Mon, 30 Sep 2019 10:45:06 +0200
Subject: [PATCH] Fixes a couple of issues + better UX

---
 db.sqlite3                            | Bin 196608 -> 196608 bytes
 news/__pycache__/views.cpython-37.pyc | Bin 5463 -> 5470 bytes
 news/static/news/css/app.css          |   1 +
 news/templates/news/post.html         |  20 +++++++++++---------
 news/views.py                         |   4 ++--
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/db.sqlite3 b/db.sqlite3
index 5eef67a848ee16e2ff5e4a893d632aae414d1389..a5631b5f5c83796158abf4e851b3f53124bbab0b 100644
GIT binary patch
delta 1042
zcmah|U1%It7@d3fW_Ck&=VT`l>*jB_DD=l9GqaOzCL*CRi=^#Nh#gXPTChzln%yQT
zCYWY?=(d$UB!bliN5QVP6tNYoB_*MGX!W5bSV>z&T8gbjMU5aWq88By@125zJ_y5i
z?w$F*Gv|EwyQNaJREi$1CkwAOJV6#t?})d_sRye<X;S_;T3eoOdxWU7AGY=Hfby`!
zqBkTwrJRc1i0zwAB|nKq_OA-Xr2T6)lpn1OBn(ZrS~ROAttGXNPQ&6)t6^E~TBdxU
z(poMZ*`?n9q^CPIvo&q$9aek!-jNn2Nz%;0)s^|x74qfI#0o4*_!IZ=Gk(Gk_y)J|
zIhJr8i?i`P&%r+g+AUXw2w|$f1e!5dVl%-X*p4e0!Zj4}3qHb8yvfVI!#KXeX1s{A
zIE@on#A}$rK{&H1tqxsbMhH<tsQ^`$lvy>WZ4S0!))ZibH3k@C4FM{wKEOCj%+EB_
zDUAz0FY*8XiaS`wO`PYFui+{#;Q|+Y6oFQ%`WK$2UBVps+uZj&`+8vR>%iQ}`?+Ct
zerb$mYC<cq$q$!kss;z(;dvA=h;7({O<a8~y5tm-gnT(EP-RukOsXbKZW7xtlN$v_
znA{*R#^ic|3X>B8<IJCag?hYs<D%R9xR954r>F57KE)Y)fV=n+hw&|5=PmpU7kNt;
z@E(rgElhD+kD*N*fsztYO|nomX%@?HlZcT<5n~M^D)l196aKNc=^(e{`QdkHQ?18)
zbOy&!!5jQcUdADmIBhpHksS(XSyHT7z{>(&7Vxrwmj%2m;h#K3-NcI6a!C0d@1umg
zvZ#1U7HgF{d=XpblX@w(ZjBm|9@s!4giP!jpZM3P@@eg8&FJe5tDVvCeBC)ZS2Hj+
z^vpzNXn4}l2dzwDaBq5a=j7D0d&Y({9iv6Vc){JeaoBe9lWrkz*iKfnd-~J1F;M7x
zGHd3YT-tSpOn0k0;*Rw0wY`3mzt?TgPhO@E5zp_uOvkqvd8d1K-s$D_InV7W>h?&l
z+2`cibA|3=pX2U!oqo^uil%L3^_-D6?VhaGJE}b%=-0It-TddOr8P5SuAjR?ZzK7C
R+UIW5JBa_M_}#m-<}c!W0rmg@

delta 652
zcmaixPe_w-7{}lDx8*|I``v1gQq%-138wG6y?fUN5!yS#!~2fa7Q8!@=4|UtQxkG~
zFRp?Pdg#v%FCDb>5NVK^;;=*1!4QgRMd+bFQqeyMB`k?L^s_^k4#9JJ_<p{8c%EFY
zESD?0xS1Wiv}GSVIM(Q_EveYF&f;V956U*?duz9|&hgu|(MB)~W3~4%IKYi^Rra3o
zN_V?G-_w6=gE!#jgCSlD@xhvaBnqOGU+wo;&#brD&s7f;st4E?P35I1GWdm6e8m@h
z#9O?=GZe8f?(EQEo(HKfp?pZ#Z5BbKDhK*l{KOpQv4Z;;#1)FY$7@Vs48xegW%N<B
z8HK)WB+JwKX@=&%VF{n`lGe}T2_9jZW`<!-A0d0!4A{R0A82UdkHH%nxr0Knok$Lg
z1HGm#M=I&=FswT)Hpc9|Kn$ugv}V6Rt-s?jCU6VO_>6aWiicG1E^c6mG6u|{tK=xH
z88L0w$X3fdCg}Ps%#l%&C@<w)7VZabA_t9|;S4T}U7QQg=_yz2R_tVI3a)!((s3x0
z^mm@}>)Ea*N$l)yYfh#+{JNBC2_{bmS~>$AnjRH2LlY9Q`m|=meTtmoBeLRE<*;8h
z!v07snb!1HJrS!j6g`<%<#<++P4_IRU^8ZDmUJByBKzZlDyK4<9`>nvT~_l(4W%tE
zDlsjSkQ=h9p&nO^lrN!2jfi}rI}uB_Hk{=5czGe{5qOUvtbN@l(y0l0MNtY)&XGm9
S|K~orNS5II2fn^c9KQiZY1ga(

diff --git a/news/__pycache__/views.cpython-37.pyc b/news/__pycache__/views.cpython-37.pyc
index a18a4172ea32e29bd920a33aa0a14d6f692ba083..e3f10c5d3667bd1d53c7ae86daf643c145bfcf81 100644
GIT binary patch
delta 2298
zcmaJ?OKcoP5S`x7?0?t0Yp?&m_&bihIEfPkM9Id94N*dn<3xl8vYu>@opq*nOwBla
zB_kyQBtRl+ap8c(fdk@#lp8`w+>!VQ326=>j$Gl4L{+bGHaW1`d0kyyRb9WS`E~BM
zx!iItmp1VC^EdZij@--j?*+^-gdvz~NXD6r@Q94^C?j6PjmbEVOOu;2!4sMnb(1p1
zQ<{#sX_?^}O~>7=%<-J2O*bzKyrAiX+a-&<sOh9zl4V}jbjt0PJ-kQmRd_}A@?P1;
z`}9HD?Uw_5K+_pi9^`|X&bmW#m=7bJ6M1(;j`C4C#>eD1AJ@Esdq__32|39p<rJUN
zI$iFxoaWP-F1j;(27@ZPvwT*RMES14Ez!LvdXSiN21G^l-Zkzpei-RK(XZ)wqzA;H
zrWeGJ7)IHu7!jkmK89ywVqBjsibG-oc}K*gn8Nj_m=-g*9uu>|!gWc^iNm-a7xQ8P
z*At?+Zdlbn4a35JG&I3!2?xUBmJ`&y8{19;7pN~SE`>>OL=%v4|67)gm;+cl7*;<<
zyQ?`Q!-T)vXgIzP2|7p-L=db<m;mRMUB?eXw)uqtQ>qkOV>3#`zGTCyD?VV(lB}f`
z<LCB9NFxiQ#2F+QCKy8qvklj=TaKs;JFp>7`~ty)>&Oi_M4&H@!vxWj1nn!33S+yz
z129EQ4b#Ll{pMDy*&0)S$0yjl>NU@fcag+_ZHu*yb?B)#%@MYsJ~1y@`ksy>GMTU&
z4R5y<Jb@dZ{4pX>RmFtDpg&K%^OBA<(~h)^r*N3yAY2%yZIR&Nu);XH?|~I<J49yM
zsvY;McauliqWU^{hxMpaskKr!Nev-{@xT-I>rhdjrAAp=eTO)q{zz38m*_OLV{bKE
zcHjXV!#$7hcz)oAiH6q-oY#WRw5gf&Bs--prf*-ZkaY?%%x$`MP;YorI<3Ihe(gIN
zCdgF1DWFEu9nR90crW7P#}EvbWl+1{o5?WD)kIcY)43XJ=c*qCbeh8W>iLT+>$*8W
zyKn-JLbCym9XRcrP{?qcV2)sw;Aw(q2+phDvu9YJ8qZZ;I6{mSgfM?~edTg}{p#|w
z=dWB@IoB@4K_fiWS~~ePQc7+%U8iMB2QHAIj_}k+xwGt=`X#r`GU{}GeEE42pr+&*
zfiDH6yXm#Uc;n`7>sF^G$*m#0jgN047_7wd4A!vc7Ss><k*-JkPW_V~VAoY&VYRA{
z&Z5pE7O9rHI`5HH-IokD)CYx+_s)?tr2w1#G|`l)H&QL<RsTsUp2fnL4O_ldfL=P*
z4f`O&QR3-3)Q}4EJ2sAzgJx)Vw$43uc4*%Aut<IwwS{QEW|wJXSh03nljmW2-&N|G
z4P-nL3e=JJK0ba4p`Dy0CMe4YlML$WudY3IT0wE9w}ujM2EodK_Ed*ZQ(qN_FOXMZ
zLO8AyI6~JuG}}8}ZCEB<iuOP69Aaz`)CfAO-B(&LZy~c0QTGbn?4;T#E$jtJ5qT@R
zo!Vp~`eEb_!-*Taw4ddN5)3w~TImiC8+3sn(COAwp+?(-jtnDB@&As+P<&bql}Am9
zn%3j$OnGP(kZXh)v2C}uyz0#$*nv3NrAE`n!@~Yq;K&_(tsO{qYV3mRLrQ&G9xT&m
z{J;{9icQF<@5`f=Eb;UER%nDk^9JM;>+bJ)FuwJiEuthJQ9qUOE9f*lpb6vyl@(|<
zhF$wc#Eq)-urxl<L<`ORjqW;K&^}_vH$9L(=t-f!Qu<4x$6vzrws692!E<DLhG3px
zfuM@OVUfsF1T}(d1oRrhb%G57YCNDS10}Sh{<;(N7bSTTecN@NQw$~ilL*~vsOPDF
E0kAdYod5s;

delta 2306
zcmZWrNpBoQ6z-aR-|VqHUS`J2*cmTlCvlJvS)JG<WFf%`AqB~(J=M0y>6$jxJ!X-m
z2}*>-1&Ne$K?uPSaR4cI&K!^s2ZYoIgt&1)`~}{t9_%r(G+(`XOTDFDz4q_3zs)9B
zlF66`fA<2P-XHrcS?KH%O=B7(rp5^++(&%`_de6l12n*cG{{3Vq<DTa%p)|S=ztmJ
zF&a~J(2Vm0O(;5KCV7gc6dg9xJVP^zj+j}Vqd7%K%|6~w`+1(`d1rtQ@IgAL1Tk}n
z7idAzaWEdH!-`IrBYc#O0-a<jbBq^hk(X$RmuXq?(&jjypc8zOPVy-_rED^0g;!`r
z(OGkvPD4^zbB4~a9P4|c(PONi<)3IBS~Uu6fDJy;9uqnX^bjj3dJgDeHlpZxHp<4p
zXn_@33Dz3O%4}T87TE-w1l|&xVij1AvuQR1>j`#@Rbf5JX4xF9%WR%4z<P>h*R^Wx
zFT91SZ^R7=qs0v2X15HdZf)!s4Om2dd1?9iPbA^HTmU^W3gAYXc70Dbo6HT^`ko;Y
z$PC-<M#Hde5kkEPf)AkTbHl=Tw{6&tOE$mJ#FQ)tZjosz0^gERSqu(`W>EK-JR7{!
z8AFSNC?aPV0sV;*fSYKThTbw*o#~D)lE_aX9J<3W#5jU-9265sPa=3OfN}$E+Yn+3
znF=b%4B5@CR<l)>Bs59pWF>TQJdGL$XIF`LSdX3jBvd5x^83_+{53RQRla(}cx+g2
zG^}>Zc^Nh~#-#bgf-Hq4B>p`7@jEKpxR-4Xq+%A~AZ1a;Z3f|JYHkoxute4G1%=0W
zrak`Uv&aduD1VGRCjIhS^j5A9wMGEkpkp!p1Cf{CMN1?qe+Hb8|3n9tPNFort8X=1
zx?>4(0`@exYuS$Nh8tGPG2VB2OD9jorpOsdV|yeoe~As9#`wEYxnZ=cH<>sG%w8+p
zBJXYZ*#Q8JB#1coyb_NSD9rH$drK9j>=kAR6uh<zu3fpdx~{rG<dJ&{zzsEop*x0G
z0L)J;BUBMq5!Mi1MYt^gPFx^^axpn@ZwVQf0Nm7__0>1(>vvYJU%7pI^^#ZhgPT9n
zORCZsyBpbTnnp|KhIkDR>Mi`2$&2K!{4=>jV)A-weC174z%Hb52Co2X+q7D4u(924
zJ?ynay_*1!;Adk18p)9q5jUa9u4ew<U^1Q_CimrZdM&R+E1=(dn*1m|MC$VM^t0SW
z6k)E=#%GaUlNU0D&H$3C<qpf{N1iIKN;9>q!&GqU4U2PFz1~y>ErX&P+OweYw(Hj!
z>v=2zuP-qoH`X=9PN?JI2c-%Ne0$=7{3BB$51wW_<g9#@of$;O;yge#DO5Nr&U5mI
z?ATRw?S`3Q8jiu#O}Qa&r|wByKwH&?-53}$lwWo1fpbxj)42t*^E6u^E3%ba=<LI{
zX5YW>|0=St?F7Ci%>RY&u^%R6;6}G>AEsKyd-fvsb#2?>X4U8Q_IdD8jrPR4fleC;
zs=8&QlzSgi7-RK?@G>vNSL`cw9-{6`G{biE)|OSXw=Ll`+K%mIi`8-CUD>wd?1}(7
z2qIwrxaqFUG5D^Dk0jh{(H5qy2DO{->NPB3)DGW&w9~5&17K6ckW)BNhn8q=)bzHq
zUE8z-w?!P~siSi5`_Olksf>EYxSF>(>uB*%QJ(M5ce20~I3C^q%D^^i+=6Sj1r9Yg
z)ZM7IRn0Pp?4TEsnjh-hr9LQX0)|a%3x?d5xPfO+Bg`SpBP<{+BAh{ZU0uvwB=K>I
n`v`S}2M9X|cuj|m?NRE(5;+aAwN2wJ{Bxt(rvWl@GXKiI9bfZf

diff --git a/news/static/news/css/app.css b/news/static/news/css/app.css
index ab7ede9..0a85185 100644
--- a/news/static/news/css/app.css
+++ b/news/static/news/css/app.css
@@ -127,6 +127,7 @@ a h1 {
 .quote {
   padding: 15px;
   background-color: #333;
+  margin-bottom: 8px;
 }
 @media print, screen and (min-width: 40em) {
   .quote {
diff --git a/news/templates/news/post.html b/news/templates/news/post.html
index 5002146..ea06802 100644
--- a/news/templates/news/post.html
+++ b/news/templates/news/post.html
@@ -47,13 +47,15 @@
 
   <script type="text/javascript">
     function myFunction(divID) {
-    var x = document.getElementById(divID);
-    if (x.style.display === "none") {
-      x.style.display = "block";
-    } else {
-      x.style.display = "none";
+      var x = document.getElementById("div_" + divID);
+      if (x.style.display === "none") {
+        x.style.display = "block";
+        window.location.hash = "sub_" + divID;
+        document.getElementById("text_" + divID).focus();
+      } else {
+        x.style.display = "none";
+      }
     }
-  }
   </script>
 
   <br/>
@@ -81,13 +83,13 @@
         </form>
         {% endif %}
 
-        <button class="secondary_button inline" onclick="myFunction('div_{{ comment.id }}')">reply</button>
+        <button class="secondary_button inline" onclick="myFunction('{{ comment.id }}')">reply</button>
 
         <div id="div_{{ comment.id }}" class="inline reply_form" style="display:none">
           <form action="{% url 'news:comment_with_parent' post.id comment.id %}" method="post">
             {% csrf_token %}
-            <textarea name="body" rows="3" cols="50"></textarea>
-            <button class="primary_button" type="submit">Submit</button>
+            <textarea id="text_{{ comment.id}}" name="body" rows="3" cols="50"></textarea>
+            <button id="sub_{{ comment.id}}" class="primary_button" type="submit">Submit</button>
           </form>
         </div>
 
diff --git a/news/views.py b/news/views.py
index 142d57c..4701cb1 100644
--- a/news/views.py
+++ b/news/views.py
@@ -1,4 +1,4 @@
-from django.shortcuts import render, get_object_or_404
+from django.shortcuts import render, get_object_or_404, redirect
 from django.http import HttpResponse, Http404, HttpResponseRedirect
 from django.template import loader
 from django.urls import reverse
@@ -163,4 +163,4 @@ def upvote(request, comment_id):
     comment.voters.add(request.user)
     comment.save()
     post = comment.post
-    return render(request, 'news/post.html', {'post': post, 'comments': post.flat_comments(request.user) })
+    return HttpResponseRedirect(reverse('news:post', args=(post.id,)))