Consistently use standard date formats for news entries

This appears to have become dependent on a django setting that we no
longer set -- and it's best to have a predictable format regardless.

Most things on the frontpage used the standard format, but not news,
leading to an annoyingly inconsistent view.

diff --git a/pgweb/news/models.py b/pgweb/news/models.py
index 330f203234eecdbb9cbe6676cf72b634e8d316d7..77a8fa04c55beb7b24b71044e994a95e84206211 100644 (file)
--- a/pgweb/news/models.py
+++ b/pgweb/news/models.py
@@ -30,5 +30,9 @@ class NewsArticle(models.Model):
                        return True
                return False
 
+       @property
+       def displaydate(self):
+               return self.date.strftime("%Y-%m-%d")
+
        class Meta:
                ordering = ('-date',)

diff --git a/templates/index.html b/templates/index.html
index 884b832ab040d108292fcb97383627c0d1a43c40..c3e46efbdc9eb8cf388576b3a620de6a3937dda8 100644 (file)
--- a/templates/index.html
+++ b/templates/index.html
@@ -103,7 +103,7 @@
            <div class="pgNewsEventsWrap">
              {% for n in news %}
              <p>
-              <span class="txtDate">{{n.date}}</span> <br/>
+              <span class="txtDate">{{n.displaydate}}</span> <br/>
               <a href="/about/news/{{n.id}}/">{{n.title}}</a>
              </p>
              {% endfor %}

diff --git a/templates/news/item.html b/templates/news/item.html
index 1399fb22294de98eda058ec25b95517286e2e3b7..6b9f970e36eb4ec952dc14f73949250324b395ac 100644 (file)
--- a/templates/news/item.html
+++ b/templates/news/item.html
@@ -3,7 +3,7 @@
 {%block title%}{{obj.title}}{%endblock%}
 {%block contents%}
 <h1>{{obj.title}}</h1>
-<div class="newsdate">Posted on <b>{{obj.date}}</b></div>
+<div class="newsdate">Posted on <b>{{obj.displaydate}}</b></div>
 {{obj.content|markdown}}
 {%if obj.is_migrated%}
 <p><i>This post has been migrated from a previous version of the PostgreSQL

diff --git a/templates/news/newsarchive.html b/templates/news/newsarchive.html
index 4c552605c54df838c4ddaa926edc5aee9c3b5840..93f7d0347e3a58bf3d33d59b04c357ea51425496 100644 (file)
--- a/templates/news/newsarchive.html
+++ b/templates/news/newsarchive.html
@@ -5,7 +5,7 @@
 <h1>News archive</h1>
 {%for obj in news %}
 <h2><a href="/about/news/{{obj.id}}/">{{obj.title}}</a></h2>
-<div class="newsdate">Posted on <b>{{obj.date}}</b></div>
+<div class="newsdate">Posted on <b>{{obj.displaydate}}</b></div>
 {{obj.content|markdown|striptags|truncatewords:20}}
 {%endfor%}
 <p><a href="/account/news/new/">Submit news</a></p>