From 5a76941129b0798ea3df0f421a65becdc4040d88 Mon Sep 17 00:00:00 2001 From: gothack329 Date: Tue, 27 Feb 2018 00:21:34 +0800 Subject: [PATCH] update article page --- article/__pycache__/views.cpython-36.pyc | Bin 1285 -> 1324 bytes article/templates/article/.detail.html.swp | Bin 0 -> 12288 bytes article/templates/article/detail.html | 22 ++++---- article/views.py | 4 +- db.sqlite3 | Bin 266240 -> 266240 bytes static/bootstrap/css/style.css | 59 +++++++++++++++++++++ static/image/reply.png | Bin 0 -> 1461 bytes templates/base.html | 6 ++- templates/index.html | 15 +----- 9 files changed, 81 insertions(+), 25 deletions(-) create mode 100644 article/templates/article/.detail.html.swp create mode 100644 static/image/reply.png diff --git a/article/__pycache__/views.cpython-36.pyc b/article/__pycache__/views.cpython-36.pyc index 5a54e084d44cdb971d0892f80685d2820416f8e0..1ebde1bdd9acae8129e2275bded34e10359daa46 100644 GIT binary patch delta 183 zcmZqWTEoR@%*)FqturNR_eRe1jC^bi3=AAV>EiL~pSNrzV$V=I7mFPRz+E zVgj0_$u_x=S&C75ayzrUj2KXWfsv05Xv1Akh0I9Jj+W-In delta 184 zcmZ3()yln1;A%;&3NNa3hqs$s5SN#UHs zJUO4KRDt;xb7E1+Eso^;+}zZ>lHyxDP*!|eeo?L_|70%aBK9ICpc$I1lP5AuO?GAB zpS+)$M@j@J#K6eMD8j@ABsoBkiI0hksYreDbLJvm1)yv(NE-uVk;ddSmNss6AiGEd RMDR~`WD%as#j40C1OPP8DT@FA diff --git a/article/templates/article/.detail.html.swp b/article/templates/article/.detail.html.swp new file mode 100644 index 0000000000000000000000000000000000000000..187803bda69a8dceb351fbcd1232acb732cb935d GIT binary patch literal 12288 zcmeHNO^6&t6s{FPM~x9ZiI=jM4SJaA-2_B;dj>ozcrdFTL|Cf3Yi7#rKe}qxtdr3w zim3Rr_!CTW@gj;z^dO?aC7_UlcoG6e@F48!+#(2`Jor^t&uq{Bn0Pc)!Ph-quimTo zzV}|ivgOY{@z5jm{>Ci9xQ&oUXWxDD`tRN*?>t3_6uIb0E%^7bC=O#?$R8AWBVx&( zi=Q(F-9@3eba@!0NhA{PvRsKE;;!Ox7BMXw&4gSr5jDChj`p-_1(pHJz|}FZj~qHU zSG4-Hb2q)?_Q$VI&91TxSOzQumI2FvWxz6E8L$jk2CfMPR5nGPMnw9|6aK_ks6-7l6lrANCQl1}p*%U<&y47D9do zE&&&SFM*T5i$Dl`e={NLz**pR;7;J;O@w?7JOCU3?gIX*5i$gR0lo#k0L}oXfe(OV zz|+9Pz~6}R58yH|1a!Mymg&rZcy1_GT7*yx z&uyo9+$w(8Jin(@n$RF(QZ^l5B^0QKyv=%%qFFDB>bdB2l|$8P#+#1p`LR$=YxAwO z;fEi4uF)^8_4_nPg!c7s=e%-c&UUFM1Q3+_-)FQqY8-85`ESt?Z0x_}nbY!IJ!M=f1K0atOnzaa*6)jvmq#UQ^P^k_ zEaPyvR;zg#Y-Pq!p-*cg+mJ%eXgBBWrZbIAMckoMtw!KT6c;<|1^W(_dC+uRsTi(# zx*}#B?&ds;RvTH;aVU#KCuus&m$3-Lh&$9z^N{CFXI2YU(>bgc>!{eIC)Kzsd1@7& z?=GZm7SeWrxg}po)#d@(P7rROaxrmxgE074F=bHezO_54W4?qnSlX*AXIU!U7ff@0T=^;5%RFJsG{omy>5;}GlN1j?60 zI4%HZbOM=*sH4T5mhr2qqN|vVYk$YlwM7ywFLu|_KMIE=(vR$$L%N*OnJ0R7m(yG4 za>ogVsqS103ZkveL*KZjgo@B##u8*R1L$I9!EiO{dSixr=r|H4T=!X`C--U^vrCY! z={% if art %}{{art.title}}{% endif %} {% block content %} -
+
作者： {{art.author}}           发表于：{{art.publish_time}} - - {{art.detail|safe}} +

广告位

+ {{art.detail|safe|escape }}
+

评论

{% for i in comments %}
-
-

{{i.user.username}}

+
+ {{i.user}}
-

- {{i.comment|safe}} -  {{i.publish_time}} +  {{i.comment_time}} + # {{forloop.counter}} -   #{{forloop.counter}} + Reply +

+ {{i.comment|safe|escape}}
@@ -48,7 +50,7 @@

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

{% csrf_token %} - {{ comment_form.as_p }} + {{ comment_form.comment }}
diff --git a/article/views.py b/article/views.py index 5f5bef9..b53ec54 100644 --- a/article/views.py +++ b/article/views.py @@ -25,7 +25,9 @@ def detail(request, article_id): else: comment_form = CommentForm(instance=None) - return render(request,'article/detail.html',{'art':art,'comments':comments,'comment_form':comment_form}) + secs = Section.objects.all() + + return render(request,'article/detail.html',{'art':art,'comments':comments,'comment_form':comment_form,'secs':secs}) #return HttpResponse("You're looking at article %s." % article_id) diff --git a/db.sqlite3 b/db.sqlite3 index 0877efc69d178c6b03a41ed81ca7edd8a5daf06b..0074135d557aa05597577d19af9e9ae08dc589d7 100644 GIT binary patch delta 334 zcmZozAkeTtV1hK`hKVxHj2kv4EYV|Rnarwh!6@8pr@!4!pYd1$voL@EboK>|3he#- zkNKDLFWfAckjT%*%FM{fFFbwfdd7U9ibd1eH!!L)@h<{OmhiK(Fmo~rZ(qKjF;;*{ zm~%SY1x7U{PT|dp3Qsxs8f%5Q82FoIIkg!%9ZjZlGqIeQ?t6z(hR@W>z{twTQqR=F zz|_p3UHBH`cHvu0A4_?d`QJ0}|K|S+q>O;(--lSv#IpTsJTt!l7c>7W2L5mSANXGZ zEr{pco?FXY%LH~GP|1gSW|06MW*!#?el`AlAY}$rWWuA-8qdPb;Mf%}%^@nv$Y^9> zXrXIhq-$iRUFf&_6<8nh zFXvylSui1!e|rCVM%L-G)-z@SWtUH9-@vE}6tCvrzI;DptN@b`*L1cEjB1+|6`pgp z3*TbgE_{pWV<`_4|5pb7-#~(a!3e1QDgX5M@yx8-f5kI%32-p+e_-JM#{U7RDUo-3 sZY^^y6PvDqk*<-+_7C;UA^||%Y7G2p{P{rLWv4 zq}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7*i={n4aiL` zNmQuF&B-gas<2f8n`;GRgM{^!6u?SKvTcwn`Gtf;oFf&jvGt@IQ zHZeCh*HJJsFf`CNFw!?P(ls=ndS0-B(gnVDi`;OJ^@Ze(g;X<=YuXz1c*2^4TNFmrQpG&M7J zb+Ulzb;(aI%}vcKf$2>_=rzQt7nBro3xGDeq!wkCrKY$Q<>xAZy=;|<#Vr=j7A~#^ zu1=QbZm!tf0@0g-#Vt_1&N%hz10ACeiddwGh6w>v4~Pj*wm=R%;iu*SQ+p9GSsz-r zLWhBYNz>ECF{I+wlqtR*(vC7m)6HkU_bu~u5@7K@n9bib-7DX=wJAW5MODG2D0h8p zoX!`GFS8bOim$(?BDXh6!#47RO2wy1@AWsGRNH6%rcEU)iM{R2xikNs?fpK#chc#n zNA@h!;HnS1_}+c-MAO~#&ZaG&ch%Kk{q^1Q94!B`W{H(ND4zZ8Qq!tcY!1gKdZb7v zU(7H$l3?(oULn-sY!zV>2< zms?(Z{;6^%m*s1fZRXs$kMp*lu1k!(=BPHgQX<+djxD6N^Y~+{HCz$%nk-o-byZ4y zKaylP(MOFn>1WH%*GU_HLK;wmw2lv{r z)9bEg-M5~5&i%<@ZX4D^a}Lb9nPVpUCe$FV`Re+Hc&0SQJzVVWp91PMZDxjLa#~8A z*vxTse(csWt7G(LGhCgUts44C_KWHn*@yGqg{;16zUfrRkp(MR)UW^k`%mnFWXzlR zfQ7~L0#-;zr$6QNTYg#RMBK`dU9BBw3xBmRsl+!)1+EP7Gl+9nsaI2eFeCJNoZO>r zAzELV+x2aK2JM(BJyZ9}y+x~}XV}d-`*kOqy7>9J)9a!{8WXs$?fY06*xXRB|Ibq3 n)g6YJ;#2j5I{)5vXJlhAVHJy;^SWmxs37%p^>bP0l+XkKACMmO literal 0 HcmV?d00001 diff --git a/templates/base.html b/templates/base.html index 1789a70..3ca6408 100644 --- a/templates/base.html +++ b/templates/base.html @@ -94,7 +94,7 @@

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

{% block sidebar %} - +

分类

@@ -103,6 +103,10 @@

分类

{% endfor %}
+ +
+

广告位

+
{% endblock %}
diff --git a/templates/index.html b/templates/index.html index 24dbf36..df169cf 100644 --- a/templates/index.html +++ b/templates/index.html @@ -19,7 +19,8 @@

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

{{i.title}}

-

{{i.detail|truncatewords:"30"|striptags}}

+

{{i.detail|striptags|truncatechars:140|safe}}

+

 {{i.publish_time}}      {{i.author}} @@ -34,15 +35,3 @@

{{i.title}}

{% endblock %} -{% block sidebar %} - -
-

分类

- - {% for i in secs %} -

{{i.name}}

- - {% endfor %} -
- -{% endblock %}