From 7506c4b21fcdd28646405dde55074bb74b8a9d00 Mon Sep 17 00:00:00 2001 From: gothack329 Date: Thu, 1 Mar 2018 21:32:54 +0800 Subject: [PATCH] update tab --- article/__pycache__/models.cpython-36.pyc | Bin 4188 -> 4688 bytes .../migrations/0015_article_comment_count.py | 18 ++++ article/migrations/0016_comment_invalid.py | 18 ++++ .../0015_article_comment_count.cpython-36.pyc | Bin 0 -> 582 bytes .../0016_comment_invalid.cpython-36.pyc | Bin 0 -> 654 bytes article/models.py | 17 +++- article/templates/article/detail.html | 15 ++-- article/templatetags/__init__.py | 0 .../__pycache__/__init__.cpython-36.pyc | Bin 0 -> 145 bytes .../__pycache__/upto.cpython-36.pyc | Bin 0 -> 450 bytes article/templatetags/upto.py | 10 +++ db.sqlite3 | Bin 282624 -> 290816 bytes static/bootstrap/css/style.css | 12 ++- templates/index.html | 2 + userpage/__pycache__/models.cpython-36.pyc | Bin 2325 -> 2366 bytes userpage/__pycache__/views.cpython-36.pyc | Bin 1564 -> 1598 bytes userpage/models.py | 9 +- userpage/templates/userpage/profile.html | 85 +++++++++++++----- userpage/views.py | 4 +- 19 files changed, 155 insertions(+), 35 deletions(-) create mode 100644 article/migrations/0015_article_comment_count.py create mode 100644 article/migrations/0016_comment_invalid.py create mode 100644 article/migrations/__pycache__/0015_article_comment_count.cpython-36.pyc create mode 100644 article/migrations/__pycache__/0016_comment_invalid.cpython-36.pyc create mode 100644 article/templatetags/__init__.py create mode 100644 article/templatetags/__pycache__/__init__.cpython-36.pyc create mode 100644 article/templatetags/__pycache__/upto.cpython-36.pyc create mode 100644 article/templatetags/upto.py diff --git a/article/__pycache__/models.cpython-36.pyc b/article/__pycache__/models.cpython-36.pyc index dd1582895cfb95223eb5f4c5d73f473d4af7e02d..8791d4123dd6b824b316e34e0cdbbd9369aa57ee 100644 GIT binary patch delta 2436 zcma)8-ES0C6rVdYJ6}8d(cO02-IhWuC|jVEFR6TmN(2+60mTXn!_0?o3N; zYWATdCMFxf8v_qM7!o!3pozX16a5p6PbN-$BcOfp%_m(- zMxiFPZYtDbq?%gMyfj#B>VU=RS~6fsQWq>P%YsKA=qZ{8J>B)lfh9w;V9834Jad`D zaT;N)ItluA}(=NOXIc}Nfya(VpRM7MW$7YRHKD9@rLOj9lEJ_BM^9zmLTxb zit25l!w})t*qr83P^qztWx^ftueQ^0afT65*3XZkSXTLSXc`z*+pm-W!$)PP&W7!%5o051UaQ#Ag*AhoY|N+QWCqJO9!#=VzYU*$|_M9Cl~$N z0t@GAK^SeibyMO8XKcDt?E1!G(frh&C!hhB_n0gvWNm)~wS7`7Ci`0@V7X1*HZUAY zJx2+=z;n>^p!Y-RXQ1>4K+e)E?W4K2>J`>$gEUY3ffhqRivd~yS`>g5MLGzy7>>Z+*#kf)RKllfOomC3A8@ zzRTIT**ti!+MZO#133=DE@Cr0;!omyCbid2O*FlCwzllT50<_AdjdQJMA>WIx zNF6?junPexAL|Pt8j;ZDt7cZip88o041Ik}Q(-DMY0G?B+1r_g_WUrUt z>|Msagg+0Aeg>D%L+^9&g?LKf37dmAO$?HS*99q!C+>M5cfFPL5>#UbHSl)&Or>_4 z1jI9`1C``1WxJIG2Tgqf?|@EtZ^5{o0OV>ffx4vco1EOS>VOF8n?{G1Q6`eKxMMOg z8+$@6DrIY9hA{ws2H{l%JUjVo2%BxL4~-!nD0sx`YWI5jAB=4&TwY3-q3=652yQOi zZ>Yn4X@sl+r+Wo=44(viD4&Hd#O+=te0QW&NmX4|t6Ej3q)k51mvvpKCa8K?QI)yG zvR*Y-6#O>;In`!hSoQj~Rmn-S)v25r7%JB0S=7lA?i)XjHeFua3H~-JW`#39Vl=jb zMi}{x3X6?vH+()HdYaFBPca!24iLa6FIq*_Wf90>XUYSyO{;!mUVNIVw7elHHz(-T ziF%W=S~wBHwc^)8ZsNR|$IU@_-H$5oalE%;o2A9Mq delta 1896 zcma)7TW=dh6y8~{z3cVe&Bb=oCg4_h(y-VND`CaNn(;pBgIoMYfk#k{S~>)zF`UZCwq!zWJ!O8nX;#! zKAWKTi#!%NkT)G$r0HK|09pB$UOX3rNT<@2#*i6h5VnL#fSGR* zSS-%sx)lDtH&TZx|jv?2;`7Zt9?Q~Fy<0{ZLBfcG!tIQ$DzId(CQfTvKD@) zH*`wq9U%y;mf)VKHg|@$?Hv;Fd7Orij9SbXMC?mlJW7Np5|Dfx@(BX+_ax+b$VZ2x z3U(Sn7vq2lg22Ag5?*zu`GWT@#qCC9j!nuhBIj92{ua6B{73k6WC6pUmJM?{Y*OrV zU*9$zHdDe2RshQYxG$aroCchcKUyD-D^lt7NvxFQjp*IpC5V>^x=~(kmls5kaR#z_hjKx^QaK0@Hl5UHj95;7 zV86DC;tI^x8#S-e_Ji2l<$A~Suh*-7`_MG4%0jGov0u=}s9Del?p&jVQ#Af*h&5He zpHTg7^%!Sp)7_Ap@j|sM5Ao@Rt-plLl#pl-z?zyT}~1V+dAgg`3X_^@jt1Qqx!o&cN$oFj1UO1)ZntJ3N;+hP(# zSa@%G!VQ;qD9DGl&q<-KuMOJqJPjYMi0dm$Pm)Dgn&c!);xgNiza$$y+YR%O7r`CQ z&5v~|2v%jT$)l9iST{XLD)n+>5!Y+~OjpTj-)lJBHI|o_PCP`4C{q`(_B3Rs+GNu) z4%*~cDww^&y^Kw8T08@I7Jy4h;1GxAXqy&&bT95MLm%At|Gz!1Y1)|fI*cHZ^uZv4 z+BPjOWokSKZ?w2qS6>2^(;%t{ghHUP`u<|eK@JAi`9_O(>fQy|_Ok?W6@80YW;T|c JN>607e*+p6NC5x< diff --git a/article/migrations/0015_article_comment_count.py b/article/migrations/0015_article_comment_count.py new file mode 100644 index 0000000..5b3ed46 --- /dev/null +++ b/article/migrations/0015_article_comment_count.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.2 on 2018-03-01 03:50 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('article', '0014_auto_20180228_1552'), + ] + + operations = [ + migrations.AddField( + model_name='article', + name='comment_count', + field=models.IntegerField(default=0), + ), + ] diff --git a/article/migrations/0016_comment_invalid.py b/article/migrations/0016_comment_invalid.py new file mode 100644 index 0000000..d7e5115 --- /dev/null +++ b/article/migrations/0016_comment_invalid.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.2 on 2018-03-01 06:00 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('article', '0015_article_comment_count'), + ] + + operations = [ + migrations.AddField( + model_name='comment', + name='invalid', + field=models.CharField(choices=[('Y', '是'), ('N', '否')], default='N', max_length=64), + ), + ] diff --git a/article/migrations/__pycache__/0015_article_comment_count.cpython-36.pyc b/article/migrations/__pycache__/0015_article_comment_count.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..77c2ba50e3e4e5e2704f38f8cbc277418a55e12b GIT binary patch literal 582 zcmYjOPixyS6qhX9aZCe)4f+iVh7u>)0zHh8T~>N%E~OV=gy;7X6l^(@Y}n2n?38mq zL%)))JM}B{)F(HkmC%o;_xJacK2IiT|NFl9#~J(2-mQ@A6&-s<01SA|8eZ@wC<4wd z83Z8yG7!jj;!YF-!W))FkCe-@z@?4anzB=^wk~d3z}i+m^txg)R&?w+0kVPvD*{Ni zybu`fBH+|G-i;uH=)fU92#O>yq7h>^zJBfPMy2UgRiitd&E{WZ*>|m6%;p!f#o|KF zm&=8lRBh9s?qt>Wx-%q_W!#MbH)UUUnINW~oz!K6E*vo0D6CQQ4>1!nWM9N=%S^GMF1Kgtq)RjVO0xERLcYq(hpAr6ga-}=mq8VH+ZTEP5r3Yp{ z`e`1X*7>bPV{@yF>TQ0bIQp7{!$+OB=w!->Hd%LU+HDolpqmt s81jJj;9qB<8^f;D+ja^+2hs!8A^67W#rj0`F8TT*|C?82y~+>b89%g{4FCWD literal 0 HcmV?d00001 diff --git a/article/migrations/__pycache__/0016_comment_invalid.cpython-36.pyc b/article/migrations/__pycache__/0016_comment_invalid.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..420bdf44162c0ff55be0971a86c1ad9e94527d56 GIT binary patch literal 654 zcmYjPJCD>b5Vqs&=5f1l4GmBurMVp9QJv5sB%ooN69s9kkeSPRl{kx?AgG}|iSGCX zNK~}^7Pknb`vEjmjI%ioTONOtd4A*ETQ1WZ=jX+D&e#w3-wFvI)3J9*00Z8zmKVGY zih#3c3<3}z83^PX@j(;2k#cj_KI@B#;#x zSP{Uo=7qp;GXqM8^GyWT;CdZE1PP>P0`|@XdBm`wQu{7>aaqGfrRi1Gpu2f^c=v&v zG+A|Ri@K+K(7lT$)kR9bEgJ=nzxpkx{;$v99AAy_=cg|hzOPJ>`?^yVS{DJHmP6AM zsq&p{P}lvM?CD5L>as-_j&gRYuz^(;m>H!obDt+LiO1;%)c^o%a`)v&-47H zMPqZTj2diyqI$GBLe=R;Y0Rf#{% if art %}{{art.title}}{% endif %}

评论

- + {% for i in comments %} -
+
{{i.user}}
-
+
 {{i.comment_time}}    - {% ifequal request.user.id art.author_id.id %} + {% ifequal request.user.id i.user.id %} 作者 {% endifequal %} # {{forloop.counter}} @@ -72,10 +72,15 @@

{% if art %}{{art.title}}{% endif %}

+ {% ifequal i.invalid 'Y' %} +

“此评论违规”

+ {% else %} {{i.comment|safe|escape}} + {% endifequal %} +
- + {% endfor %}
diff --git a/article/templatetags/__init__.py b/article/templatetags/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/article/templatetags/__pycache__/__init__.cpython-36.pyc b/article/templatetags/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..e6e30807b3739540498d6b62215ffd9179b53d96 GIT binary patch literal 145 zcmXr!<>d-{Ha&^~2p)q77+?f49Dul(1xTbY1T$zd`mJOr0tq9CUv~PT#i>Qb`o)<= znWe@0!I>qg#rml!$@zIXnR%)DiA5!u$vLU|C8@auIf*5yC5h?9`tk9Zd6^~g@p=W7 Uw>WHa^HWN5Qtd$I76UN@0JZ=m$N&HU literal 0 HcmV?d00001 diff --git a/article/templatetags/__pycache__/upto.cpython-36.pyc b/article/templatetags/__pycache__/upto.cpython-36.pyc new file mode 100644 index 0000000000000000000000000000000000000000..e2e5b1ea0be0873af4310fe6242de6d4dabf9288 GIT binary patch literal 450 zcmYjMyG{c!5VUV!))h)u#ktC5+la^ML2F)~Uqbi~VXcO;A zl|a&@5Xnr&GI^nU+*Kx1$W~lNOH%MJ^dJTG+(A2N;Q)1Rol#xAQQCo7tXXKm70!S= zggr;vk%sKhQPK;7UTk3~zM?^52d!MeeDW;x2!0|#t5%`g8!;L7{9Koh7K|;eGHSHt z5^J^ux$ZlyIw*y4YOSF>g>s^{fXIl0{~M`k|nUV&YTTh_3EUsQAm{ zWp;9zN!W-{yW?QiM4>6WS5HQmt>*@6Wig{qj|~T3pDDYtVgrZV|A>dr{HE>Ys9_!k Pw>eTybH-Ur89iseNilMO literal 0 HcmV?d00001 diff --git a/article/templatetags/upto.py b/article/templatetags/upto.py new file mode 100644 index 0000000..c8d5b18 --- /dev/null +++ b/article/templatetags/upto.py @@ -0,0 +1,10 @@ +from django import template +from django.template.defaultfilters import stringfilter + +register = template.Library() + +@register.filter +@stringfilter +def upto(value, delimiter=None): + return value.split(delimiter)[0] +upto.is_safe = True \ No newline at end of file diff --git a/db.sqlite3 b/db.sqlite3 index 6ad43d39f690ca733162624429e096e58c294ccf..16a8c5667750c7c7c14d31d157090e9f9eb091e1 100644 GIT binary patch delta 2903 zcmb7FeQZlL*jxFDFe&?Kfe&^oV^EIaC&@#&(pEU*WK1>YLSY) z%idkA+5a|M{G;Px)&|X>oQAQgsi>G?82_MXOB2DQ)G7>wS_H>UO8WRp|jmDCb;dIYl(Us2a?a3ZII2rmXv2?gU$i16(wj z;-meMOysdhI(j_J^=7&D)qUk%7S2mH)i3f6UUYL#Cq;n{IcvQ1S72GZv+|ACjW*Os zp+BRe=pag=C~CyD=RvbBfVLqQYDIR*dmj9W#ruB^RP{C$1OPQDx>3tgf9pv;(z~4&GS{!YCk&0>UUDi~_<~BogT*BecOmthqr@n48Q` zn7xb<{tONhW-?GaVAD~^4EEs@zXzM~A3gxAhgq#y=3=E{-Ya@M@g^NrBZ4RZ0p8U% z(Q)hYv$tP;!4e;fC$iY_A*c_O>1=&`dirs64-#Ru;CBfQ(JA_PZf7GwYSC?#k=z97 zlj1X<6z9l$?k4!!y(thfd;Ctf!za4kBG+q`Qz$vEPeJxg-V>Dgy8TYCL*NC@>+>`a z-)2xF2X$7`Z)=_Cp!coImN>fnyxZXweJ(fOWsx0ALBDjA!ts!9-?Ttr zTyM(}+ZuTtY85NRgO7EO`|vWL*@ZccMy3N8!V3+q|7uNr~7-I&dvmldI|(uv=2Q5%y4zvWWrb2Ciq-}-0KQ6Wu9cmv!k-;IfwG}AQ?tfVCZ!) zCE{@|m&aG(T4_|;S_kik+QG_D%?gxi9aM=_g4^l#R-hh~jBlyNH zV8s&`p&L(MfF0OSpjljBpns()4?6zz6kXS4SD&LkGudq5>BDQGl&hnRr~LMH?Fk0@ zgO>iljz@wP>)NFvr*+|LyT~E58m$55@+$n7d3c1*Gx&)Gm{#TTw8n&oX6Z>f5Aclz z$YCZ=_o+K))TT#UaLvomjtld!meF4YxA70>;cp%KtJHkE8RQL#?8xZUYQ)^((L+NC zbsoxBH$}~SPh;w`fqWzW`#fw`E4g~{sRdYvxdmw1r2JvEe9O9e^Cm{Dc7ihM?iVc2l0Xq4Lc_|FBEd=tEve$D_WrNB%<*zm=lc$5ARQd8#bOtwHgqyUh$>J*) zpsC7U{Ud756e0n);*Vx&dnw?#pF*Fh5-*;cd~%!=HbP#jUFv%UUS?PoDG;E~J3`y>@rNVbvw24h^yHkg%;5$valbrr`RAF8lIgA z8LQ->G0Pl9|Hssnhov$+kzGgz5=%f|d2VL1GUwNWMY~xUthogCRVQaXN~Fsmqcqej zwUrNbp+)doIFH{Y`Z=e=i+fH(WZ?ymGW-0Oxzo^bzm+!9S0!8VWvh2i z!Fc)d0*;V21D` z_h0z&Da^2jpqvn0eU@T<)n^GUp02Jv*`!C*hJdFqy;0#(yH2`z4Nd?kMi^|m4z0B( eyLE`F4~!O$ZBQ)2TB+|koCC0xSiJu`xaB|C6%BO& delta 1440 zcmZWpZ)_7~7{B-4>s`CH_qIjWLEWw!P{FY6uHDvlvl|;OY?Lh$0*NGM?bc>=^w0jZ z&`pqSEoOXBS&F{VXl$1K5kU|tyP*(e8oyu&e$Xs}WD+I9hhd^7MnB+t-GHF?-1EG7 z@A*CdpWN`GaX4!{ZZRe)ifSfYPnaQmc6_q~B+vOK5!}d%8P2dXS882Q<;23f8cxOk zg-pnlGx{#`nI9{j=1ZXkbj2c(U^K4R3K_1lW{rSep^7wJh7!2pp{k=J77pk#dn!+Y zjpxNo%q4XVwa54Sqsf-N?)B9#B-a?n}m72KTxn;o#Qh z9hIGXrDW4U?&|wBTeKugz|T|sygr@r8@|YWvpA>A4gXXR)T4Dk)s|K@;>G*Gn!C5O z_8c#uZ4|nT4x&D^AH9g5%7SO)<}A3yk7q@^?JT$q1?0or$Dn~!wHC>~&%vYt3aV1f zT_@lCh8v7r`W;v-$cIHYDRdLb1bPP9S`$t&QQcW3C8}KFU?7xq2gK_BWH=P4=^F~T zx?S`-*rri(v9Y%)bQ^t1>^?oWG&;V72LWq`@oi3rPkBLRY7HJ%z}A?b6GU!!SmZgf}Setco{_;;axa z9f5@f5ZNen0fmr_1TI3d?G1RtAgE?2Ex1Ub2>&}DgGbd~?i#qr`PjQ!FT0!FEnBnj zAQ;bVdeQOtsQ~z#sSbSN8i41fvx_z1>hC%WRP} z>ZV|*Clu{o(GLXu1ED}rL8wR+fc_zp@{q$jKJJoR7U5@=1^NU`_AiQ^7tCY wPRk7@<}1DK`PW8&P0#(3`RM+oV=IcrGG@M5hS%Y5NN;S1lHFM$5|ZeD0lIgZlK=n! diff --git a/static/bootstrap/css/style.css b/static/bootstrap/css/style.css index fa337c3..ff4cb2f 100755 --- a/static/bootstrap/css/style.css +++ b/static/bootstrap/css/style.css @@ -128,6 +128,10 @@ div.container-fluid { padding-bottom:30px; } +.card .comment { + border-top:1px solid #e2e2e2; +} + .card .comment div { display: inline-block; margin:10px; @@ -194,9 +198,13 @@ span.floor { margin:auto; } +.invalid { + background-color: #eee; +} - - +.profile-tab { + display:none; +} diff --git a/templates/index.html b/templates/index.html index f6f2f7d..38b7929 100644 --- a/templates/index.html +++ b/templates/index.html @@ -27,6 +27,8 @@

{% if title %}{{title}}{% endif %}

     {{i.section}}     +  {{i.readtime}} +      {{i.tag}} 阅读全文 diff --git a/userpage/__pycache__/models.cpython-36.pyc b/userpage/__pycache__/models.cpython-36.pyc index 02de96646f91ef2c67130d9d9bd34f1158317e37..9b1e15969b81de1d6f6a11a90ab874078c842c88 100644 GIT binary patch delta 269 zcmbO#v`>i3n3tF9MAh`DaQ2N{w^-`g85kHGfVemaNTf1EF{Us?F{Ls`v83=tv8J-6 zu%@u3u+L#i;pk-q^Egp>Tqrzl7%zoq4oeh!3U4rjCVv%gXmM(hTYgclo^NVNVv!Kg zo?BdLnMK7V@p*}p16Y-~qBuZG@)C1XCs(m5*s!_k<|bz5RB^e16e;)t#j7}d5}`~@ z7O)XT`apAvbU}n3knn>FPd>t$$io8^;9z87WMSfC+^o;GhLKTg@*Q?pM$O4e9I1@A LCUXu)WTckX>ip5k<0VJsoA~ZmRBAieHvTpH}7NjJWq{bIO^hr#< z%c9C?FqxV4RNyVP#FG5n%;X|vkQM{DJ~R_JY;yBcN^?@}7=bE^K@R0%6kwDAVjdvm N0AUs;MgcA+MgVQoM&$qi delta 301 zcmdnTGlxgnn3tE!;_S4jlWYtOj~S2v3y|#q#Kp5FD%bO+aHVj!Fhq%_@}&x7iA~(~ zk8m1bS8rBrnIn2$>!3>&glUbRRCYv(NlR;WK}uptYJ34ipV;KTEUJupla*Od`4=gI6tE?h[ {{request.user}} ]用户详情 - 物志 + {% endblock %} {% block banner %} @@ -41,43 +51,76 @@
-