diff --git a/article/__pycache__/models.cpython-36.pyc b/article/__pycache__/models.cpython-36.pyc
index e7bcdd7..e1d8e1c 100644
Binary files a/article/__pycache__/models.cpython-36.pyc and b/article/__pycache__/models.cpython-36.pyc differ
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 %}
-
+
{% if art %}{{art.title}}{% endif %}
@@ -57,7 +57,7 @@
{% if art %}{{art.title}}{% endif %}
发表于:{{art.publish_time|timetonow}}
标签:{% if arg.tag %}{{art.tag}}{% endif %}
-
广告位
+
{{art.detail|safe }}
diff --git a/article/templates/article/publish.html b/article/templates/article/publish.html
index 51eda7a..3ef79e3 100644
--- a/article/templates/article/publish.html
+++ b/article/templates/article/publish.html
@@ -73,7 +73,7 @@
{{operation}}文章
-
广告位
+
{{art.detail|safe|escape }}
diff --git a/db.sqlite3 b/db.sqlite3
index 38fc2ef..2b886c7 100644
Binary files a/db.sqlite3 and b/db.sqlite3 differ
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 @@