planet: Update posting header

diff --git a/static/css/style.css b/static/css/style.css
index 0bd54ca57e0d4529a7c43cf49e6ae56950a569fa..0f0150954d04113885792c851541e0b6af58269b 100644 (file)
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -72,6 +72,10 @@ section > .page-header ~ .page-header {
        text-align: center;
 }
 
+.jumbotron a {
+       color: white;
+}
+
 /* Download button */
 .masthead .btn, .download-button {
        padding: 19px 24px;

diff --git a/templates/planet/posting.html b/templates/planet/posting.html
index 9be8c74aeafae33533c9a49eadae68ae7f3b6670..dcc1d13c1243c4dd1c37c239c3420c765c950156 100644 (file)
--- a/templates/planet/posting.html
+++ b/templates/planet/posting.html
@@ -2,20 +2,23 @@
 
 {% block title %}{{ entry.title }}{% end block %}
 
-{% block body %}
-       <div class="page-header">
-               <h1>
-                       <a href="/post/{{ entry.slug }}">{{ entry.title }}</a>
-
-                       <br>
+{% block header %}
+       <header class="jumbotron subhead" id="overview">
+               <div class="container">
+                       <h1>
+                               <i class="fa fa-comment"></i>
+                               <a href="/post/{{ entry.slug }}">{{ entry.title }}</a>
+                       </h1>
 
-                       <small>
-                               {{ _("by") }} <a href="/user/{{ entry.author.uid }}">{{ entry.author.name }}</a>,
-                               {{ locale.format_date(entry.published, shorter=True) }}
-                       </small>
-               </h1>
-       </div>
+                       <p class="lead">
+                               {{ _("by") }} <a href="/user/{{ entry.author.uid }}">{{ entry.author.name }}</a>
+                               &bull; {{ locale.format_date(entry.published, shorter=True) }}
+                       </p>
+               </div>
+       </header>
+{% end header %}
 
+{% block body %}
        {% if entry.is_draft() %}
                <div class="alert alert-warning alert-dismissable">
                        <button type="button" class="close" data-dismiss="alert">&times;</button>
@@ -26,4 +29,14 @@
        {% module PlanetAuthorBox(entry.author) %}
 
        {% raw entry.text %}
+
+       <hr class="clear">
+
+       <p class="text-muted ac">
+               {{ _("Posted:") }} {{ locale.format_date(entry.published, shorter=True, relative=False) }}
+
+               &bull;
+
+               {{ _("One view", "%(views)s views", entry.views) % { "views" : entry.views } }}
+       </p>
 {% end block %}

diff --git a/webapp/backend/planet.py b/webapp/backend/planet.py
index d116ced35610528550c61958cb9d0026281948ac..9916770948ca96b965dd38141c34fbba8dd886d5 100644 (file)
--- a/webapp/backend/planet.py
+++ b/webapp/backend/planet.py
@@ -119,6 +119,19 @@ class PlanetEntry(Object):
                self.db.execute("INSERT INTO planet_views(post_id, referer, location) \
                        VALUES(%s, %s, %s)", self.id, referer, location)
 
+               if hasattr(self, "_views"):
+                       self._views += 1
+
+       @property
+       def views(self):
+               if not hasattr(self, "_views"):
+                       res = self.db.get("SELECT COUNT(*) AS views FROM planet_views \
+                               WHERE post_id = %s", self.id)
+
+                       self._views = res.views
+
+               return self._views
+
 
 class Planet(Object):
        def get_authors(self):