From 31ec80db25156edde217e7d1a9e769a741b514eb Mon Sep 17 00:00:00 2001 From: gothack329 Date: Sun, 11 Mar 2018 21:49:55 +0800 Subject: [PATCH] fix bugs --- article/__pycache__/models.cpython-36.pyc | Bin 4713 -> 4699 bytes article/models.py | 2 +- article/templates/article/detail.html | 4 ++-- article/templates/article/publish.html | 2 +- db.sqlite3 | Bin 380928 -> 380928 bytes static/bootstrap/css/style.css | 18 +++++++++++++++--- templates/base.html | 18 +++++++++++------- 7 files changed, 30 insertions(+), 14 deletions(-) diff --git a/article/__pycache__/models.cpython-36.pyc b/article/__pycache__/models.cpython-36.pyc index e7bcdd76a580de6f1dcd9e83879da7a5a2f2153e..e1d8e1cf5e01ea94af557ae6aadab3d757ec4f9f 100644 GIT binary patch delta 93 zcmaE2DW03#@kYc*Unv|26mwk&RuQVrT^M96^OpH96XR=@50ssTd93cPz delta 104 zcmcbu@=}G=(EI Dwc{R_ diff --git a/article/models.py b/article/models.py index 4343a4b..594cb11 100644 --- a/article/models.py +++ b/article/models.py @@ -28,7 +28,7 @@ class Article(models.Model): section=models.ForeignKey(Section,on_delete=models.CASCADE,default=0) author_id = models.ForeignKey(Profile,on_delete=models.CASCADE,default=0) publish_time = models.DateTimeField(auto_now_add=True,editable=False) - cover = models.ImageField(upload_to='static/upload/', blank=True, null=True) + cover = models.ImageField(upload_to='static/upload/') title = models.CharField(max_length=1024) detail = HTMLField() ip = models.GenericIPAddressField(blank=True,null=True) diff --git a/article/templates/article/detail.html b/article/templates/article/detail.html index 314c7f0..19e50dc 100644 --- a/article/templates/article/detail.html +++ b/article/templates/article/detail.html @@ -33,7 +33,7 @@ {% block banner %} -
-

广告位

+
{{art.detail|safe|escape }}
diff --git a/db.sqlite3 b/db.sqlite3 index 38fc2eff97ef5072d68765863987301b26c5b68e..2b886c771f47c4403dcdd879fd7be11424a62247 100644 GIT binary patch delta 716 zcmZva&1(}u7{+&YX0!R6?TYy#Le|#8ZXwC;CQa9>)gYeKL_C--)wWWrT;)6YNQS(%ZY7b0Td2i#%c93B!8 z=yTej@+$p;(HYsLNj{Ff)2*O9FZpPTz#o8KxQ@R1{Z3w5|KwE?PN6Pju#*UqWXZ>D z+t`6r2U1xw=TTROHU>moLT?ckF`&N)Tyq?EeGVM8`;O6R8dyPpWT<-AiP%I1-n-7G zqgx=z2E# z|G$h)yEsn{#E&8~RyLDPACilA)FOG)Mj^sxAkbPHU2X=B*%8B>Na}1E0^Q3Ae`CNy OQa6P#J-8((%l`noD6#Ya delta 378 zcmZozAl|S*e1bG%-$WT_#=eaSs(Os!liT#7Rn$c^nROZS@=G$)GLsWaGV}A|bBoi} zxmB5^8I$vKb5rw5!kSt2+gbG)ftYDKt3LC81!f;Ui|OnE%riF|D$L;BZV|_PMi3%a z02VvTGd;JK`6!!`LQ;NF%65x7<}-}U>ipu<*&CSsHwz{l2KbFH4vJ^^UDp+YFv_SLgkB1M_Q8N;TtZ(vzJxlv#NlScUTbsJg4 urUTu_y1jTKi}wUx&PWMEBXd0iAT(sze%g`suk`eZv8)o?AH=dM6afI~4t9zF diff --git a/static/bootstrap/css/style.css b/static/bootstrap/css/style.css index 3ce5821..6a3b7ea 100755 --- a/static/bootstrap/css/style.css +++ b/static/bootstrap/css/style.css @@ -165,6 +165,7 @@ span.floor { } .ad1 { + display:none; height:100px; background-color:silver; text-align:center; @@ -174,6 +175,7 @@ span.floor { } .ad2 { + display:none; height:250px; background-color:silver; text-align:center; @@ -246,7 +248,9 @@ footer, footer a{ } .foot-wrap .foot-top { - padding:20px; + padding-top:20px; + + height:60px; } .foot-wrap .foot-bottom { @@ -254,6 +258,14 @@ footer, footer a{ border-top:1px solid rgba(255,255,255,.2); } +.foot-wrap .foot-top ul { + list-style: none; + float:left; + padding-left:20px; + width:100%; +} - - +.foot-wrap .foot-top ul li { + float:left; + padding-right:20px; +} diff --git a/templates/base.html b/templates/base.html index 4e32852..8413042 100644 --- a/templates/base.html +++ b/templates/base.html @@ -144,7 +144,6 @@

主题分区

{% endfor %}
-

广告位

{% endblock %} @@ -154,18 +153,23 @@

广告位