update time format

gothack329 · Mar 1, 2018 · d748dc7 · d748dc7
1 parent 71abb09
commit d748dc7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 11 deletions.
diff --git a/article/templates/article/detail.html b/article/templates/article/detail.html
@@ -41,7 +41,7 @@ <h1>{% if art %}{{art.title}}{% endif %} </h1>
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
     <span class="fad">评论数：{{comments|length}}</span>
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-    <span class="fad">发表于：{{art.publish_time|timetonow}}前</span>
+    <span class="fad">发表于：{{art.publish_time|timetonow}}</span>
     {% ifequal request.user.id  art.author_id.id %}
     <span class="fad pull-right" ><button  class="btn btn-primary" onclick="window.location.href='/article/update/{{art.id}}/'">编辑</button></span>
     {% endifequal %}

diff --git a/article/templatetags/__pycache__/timetonow.cpython-36.pyc b/article/templatetags/__pycache__/timetonow.cpython-36.pyc
diff --git 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
@@ -21,7 +21,7 @@ <h1>{% if title %}{{title}}{% endif %} </h1>
                 <a href="/article/{{i.id}}/"><h2>{{i.title}}</h2></a>
                 <p class="fad">{{i.detail|striptags|truncatechars:500|safe}} </p>
                 <p></p>
-                <span class="glyphicon glyphicon-time fad"> </span>&nbsp;<span class="fad">{{i.publish_time|timetonow}}前</span>  
+                <span class="glyphicon glyphicon-time fad"> </span>&nbsp;<span class="fad">{{i.publish_time|timetonow}}</span>  
                 &nbsp;&nbsp;&nbsp;
                 <a href="/userpage/member/{{i.author_id}}/"><span class="glyphicon glyphicon-user fad"> </span>&nbsp;<span class="fad">{{i.author}}</span></a>
                 &nbsp;&nbsp;&nbsp;

diff --git a/userpage/templates/userpage/profile.html b/userpage/templates/userpage/profile.html
@@ -97,7 +97,7 @@
                 <a href="/article/{{i.id}}/"><h4>{{i.title}}</h4></a>
                 <p class="fad">{{i.detail|striptags|truncatechars:500|safe}} </p>
                 <p></p>
-                <span class="glyphicon glyphicon-time fad"> </span>&nbsp;<span class="fad">{{i.publish_time|timetonow}}前</span>  
+                <span class="glyphicon glyphicon-time fad"> </span>&nbsp;<span class="fad">{{i.publish_time|timetonow}}</span>  
                 &nbsp;&nbsp;&nbsp;
                 <span class="glyphicon glyphicon-user fad"> </span>&nbsp;<span class="fad">{{i.author}}</span>
                 &nbsp;&nbsp;&nbsp;

diff --git a/userpage/templates/userpage/update.html b/userpage/templates/userpage/update.html