diff --git a/article/templates/article/detail.html b/article/templates/article/detail.html index 1bcefed..79166a4 100644 --- a/article/templates/article/detail.html +++ b/article/templates/article/detail.html @@ -41,7 +41,7 @@

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

          评论数:{{comments|length}}           - 发表于:{{art.publish_time|timetonow}}前 + 发表于:{{art.publish_time|timetonow}} {% ifequal request.user.id art.author_id.id %} {% endifequal %} diff --git a/article/templatetags/__pycache__/timetonow.cpython-36.pyc b/article/templatetags/__pycache__/timetonow.cpython-36.pyc index b2fa207..593a633 100644 Binary files a/article/templatetags/__pycache__/timetonow.cpython-36.pyc and b/article/templatetags/__pycache__/timetonow.cpython-36.pyc differ diff --git a/article/templatetags/timetonow.py b/article/templatetags/timetonow.py index 12f58db..6b4f233 100644 --- a/article/templatetags/timetonow.py +++ b/article/templatetags/timetonow.py @@ -15,11 +15,11 @@ def timetonow(value): delta = now-valuetime s = delta.seconds if s>86400: - return '%d天' % (int(s/86400)) + return '%d天前' % (int(s/86400)) elif s>3600: - return '%d小时' % (int(s/3600)) + return '%d小时前' % (int(s/3600)) elif s>120: - return '%d分钟' % (int(s/120)) + return '%d分钟前' % (int(s/120)) else: return '刚刚' diff --git a/templates/index.html b/templates/index.html index 2bf5680..a70a854 100644 --- a/templates/index.html +++ b/templates/index.html @@ -21,7 +21,7 @@

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

{{i.title}}

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

-  {{i.publish_time|timetonow}}前 +  {{i.publish_time|timetonow}}      {{i.author}}     diff --git a/userpage/templates/userpage/profile.html b/userpage/templates/userpage/profile.html index fc84c9b..fe4d162 100644 --- a/userpage/templates/userpage/profile.html +++ b/userpage/templates/userpage/profile.html @@ -97,7 +97,7 @@

{{i.title}}

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

-  {{i.publish_time|timetonow}}前 +  {{i.publish_time|timetonow}}      {{i.author}}     diff --git a/userpage/templates/userpage/update.html b/userpage/templates/userpage/update.html deleted file mode 100644 index 0a714a8..0000000 --- a/userpage/templates/userpage/update.html +++ /dev/null @@ -1,5 +0,0 @@ - -{% block content%} - - -{% endblock %} \ No newline at end of file