planet: Slight face-lift and add hottest posts

diff --git a/templates/modules/menu.html b/templates/modules/menu.html
index f4a778614ba2cd7668931b53078eec37c55b21e0..66df0d2fb527cd98d62787b0687318de3d8af68e 100644 (file)
--- a/templates/modules/menu.html
+++ b/templates/modules/menu.html
@@ -154,6 +154,10 @@
                <li>
                        <a href="/statistics">{{ _("Statistics") }}</a>
                </li>
+       {% elif hostname == "planet.ipfire.org" %}
+               <li>
+                       <a href="/hottest">{{ _("Hottest posts") }}</a>
+               </li>
        {% elif hostname == "talk.ipfire.org" and current_user %}
                <li>
                        <a href="/phonebook">{{ _("Phonebook") }}</a>

diff --git a/templates/modules/planet-entry.html b/templates/modules/planet-entry.html
index 0b125ab39c19ce90a5ece2d6b31b35f26d3e9699..62841b9c247fecb7571a5a894642afd4cf0ca823 100644 (file)
--- a/templates/modules/planet-entry.html
+++ b/templates/modules/planet-entry.html
@@ -6,13 +6,15 @@
 
 <h2>
        <a href="/post/{{ entry.slug }}">{{ entry.title }}</a>
+
+       <br>
+
+       <small>
+               {{ _("by") }} <a href="/user/{{ entry.author.uid }}">{{ entry.author.name }}</a>,
+               {{ locale.format_date(entry.published, shorter=True) }}
+       </small>
 </h2>
 
 {% raw entry.text %}
 
-<p class="pull-right clear">
-       {{ _("Posted by") }} <a href="/user/{{ entry.author.uid }}">{{ entry.author.name }}</a>
-       {{ _("on") }} {{ locale.format_date(entry.published, shorter=True) }}
-</p>
-
 <hr class="separator clear">

diff --git a/templates/planet/hottest.html b/templates/planet/hottest.html
new file mode 100644 (file)
index 0000000..7f1a044
--- /dev/null
+++ b/templates/planet/hottest.html
@@ -0,0 +1,23 @@
+{% extends "base.html" %}
+
+{% block title %}{{ _("Hottest posts") }}{% end block %}
+
+{% block body %}
+       <div class="row">
+               <div class="col-md-8 col-md-offset-2">
+                       <h3>{{ _("The hottest posts of the last month") }}</h3>
+                       
+                       <dl>
+                               {% for entry in entries %}
+                                       <dt><a href="/post/{{ entry.slug }}">{{ entry.title }}</a></dt>
+                                       <dd>
+                                               {{ _("by") }} <a href="/user/{{ entry.author.uid }}">{{ entry.author.name }}</a>
+                                               <span class="pull-right">{{ locale.format_date(entry.published, relative=True, shorter=True) }}</span>
+                                       </dd>
+
+                                       <br>
+                               {% end %}
+                       </dl>
+               </div>
+       </div>
+{% end block %}

diff --git a/templates/planet/modules/author-box.html b/templates/planet/modules/author-box.html
new file mode 100644 (file)
index 0000000..9a27605
--- /dev/null
+++ b/templates/planet/modules/author-box.html
@@ -0,0 +1,26 @@
+<div class="well pull-right ac" style="margin-left: 1em;">
+       <img class="img-thumbnail" src="{{ author.gravatar_icon(213) }}" alt="{{ author.name }}" />
+
+       <h3>
+               <a href="/user/{{ author.uid }}">{{ author.name }}</a>
+       </h3>
+
+       <br>
+
+       <ul class="list-inline">
+               <li>
+                       <a href="mailto:{{ author.email }}" title="{{ _("Write an email") }}">
+                               <i class="glyphicon glyphicon-envelope"></i>
+                       </a>
+               </li>
+
+               {% if author.is_talk_enabled() %}
+                       <li>
+                               <a href="http://talk.ipfire.org/phonebook/{{ author.uid }}"
+                                               title="{{ _("%s on talk.ipfire.org") % author.name }}">
+                                       <i class="glyphicon glyphicon-earphone"></i>
+                               </a>
+                       </li>
+               {% end %}
+       </ul>
+</div>

diff --git a/templates/planet/posting.html b/templates/planet/posting.html
index 5fa44845c135ccfc79e03be33ae45ec2fb9f02eb..9be8c74aeafae33533c9a49eadae68ae7f3b6670 100644 (file)
--- a/templates/planet/posting.html
+++ b/templates/planet/posting.html
@@ -1,11 +1,18 @@
-{% extends "user.html" %}
+{% extends "../base.html" %}
 
-{% block title %}{{ _("IPFire Planet") }} - {{ entry.title }}{% end block %}
+{% block title %}{{ entry.title }}{% end block %}
 
-{% block bodyA %}
+{% block body %}
        <div class="page-header">
                <h1>
                        <a href="/post/{{ entry.slug }}">{{ entry.title }}</a>
+
+                       <br>
+
+                       <small>
+                               {{ _("by") }} <a href="/user/{{ entry.author.uid }}">{{ entry.author.name }}</a>,
+                               {{ locale.format_date(entry.published, shorter=True) }}
+                       </small>
                </h1>
        </div>
 
@@ -16,10 +23,7 @@
                </div>
        {% end %}
 
-       {% raw entry.text %}
+       {% module PlanetAuthorBox(entry.author) %}
 
-       <p class="clear pull-right">
-               {{ _("Posted by") }} <a href="/user/{{ entry.author.uid }}">{{ entry.author.name }}</a>
-               {{ _("on") }} {{ locale.format_date(entry.published, shorter=True) }}
-       </p>
+       {% raw entry.text %}
 {% end block %}

diff --git a/templates/planet/user.html b/templates/planet/user.html
index 6ec4cf2ea80f1e665fe3d409601757d0de02a4a6..ce57a41a489c28f21a26083d4f680ea788d04614 100644 (file)
--- a/templates/planet/user.html
+++ b/templates/planet/user.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("IPFire Planet") }} - {{ author.name }}{% end block %}
 
@@ -36,23 +36,7 @@
                </div>
 
                <div class="col-lg-3 col-md-3">
-                       <div class="well">
-                               <img class="img-thumbnail" src="{{ author.gravatar_icon(213) }}" alt="{{ author.name }}" />
-
-                               <hr>
-
-                               <i class="glyphicon glyphicon-user"></i>
-                               <a href="/user/{{ author.uid }}">
-                                       {{ author.name }}
-                               </a>
-
-                               <hr>
-
-                               <i class="glyphicon glyphicon-envelope"></i>
-                               <a href="mailto:{{ author.email }}">
-                                       {{ _("Mail") }}
-                               </a>
-                       </div>
+                       {% module PlanetAuthorBox(entry.author) %}
                </div>
        </div>
 {% end block %}

diff --git a/webapp/__init__.py b/webapp/__init__.py
index 6cab6c0d7ab31054e8ddbfeaf72b8eabcd298257..de574b9113e887d55e9dc7b6594a269f0ddd6390 100644 (file)
--- a/webapp/__init__.py
+++ b/webapp/__init__.py
@@ -50,6 +50,7 @@ class Application(tornado.web.Application):
                                "NewsLine"             : NewsLineModule,
                                "NewsTable"            : NewsTableModule,
                                "NewsYearNavigation"   : NewsYearNavigationModule,
+                               "PlanetAuthorBox"      : PlanetAuthorBoxModule,
                                "PlanetEntry"          : PlanetEntryModule,
                                "PlanetSearchBox"      : PlanetSearchBoxModule,
                                "ProgressBar"          : ProgressBarModule,
@@ -145,6 +146,7 @@ class Application(tornado.web.Application):
                # planet.ipfire.org
                self.add_handlers(r"planet(\.dev)?\.ipfire\.org", [
                        (r"/", PlanetMainHandler),
+                       (r"/hottest", PlanetHotEntriesHandler),
                        (r"/post/([A-Za-z0-9_-]+)", PlanetPostingHandler),
                        (r"/user/([a-z0-9_-]+)", PlanetUserHandler),
                        (r"/search", PlanetSearchHandler),

diff --git a/webapp/backend/planet.py b/webapp/backend/planet.py
index c4f432075bacc20b6ddbf764cf44fad86fd87349..d116ced35610528550c61958cb9d0026281948ac 100644 (file)
--- a/webapp/backend/planet.py
+++ b/webapp/backend/planet.py
@@ -115,8 +115,9 @@ class PlanetEntry(Object):
        def is_published(self):
                return self.status == "published"
 
-       def increase_view_counter(self):
-               self.db.execute("UPDATE planet SET views = views + 1 WHERE id = %s", self.id)
+       def count_view(self, referer=None, location=None):
+               self.db.execute("INSERT INTO planet_views(post_id, referer, location) \
+                       VALUES(%s, %s, %s)", self.id, referer, location)
 
 
 class Planet(Object):
@@ -196,6 +197,17 @@ class Planet(Object):
 
                return [PlanetEntry(self.backend, e) for e in entries]
 
+       def get_hot_entries(self, days=30, limit=8):
+               entries = self.db.query("WITH hottest AS (SELECT post_id, COUNT(post_id) AS count \
+                       FROM planet_views WHERE \"when\" >= NOW() - INTERVAL '%s days' \
+                       GROUP BY post_id ORDER BY count DESC) SELECT * FROM planet \
+                       LEFT JOIN hottest ON planet.id = hottest.post_id \
+                       WHERE hottest.count IS NOT NULL \
+                       ORDER BY hottest.count DESC LIMIT %s",
+                       days, limit)
+
+               return [PlanetEntry(self.backend, e) for e in entries]
+
        def render(self, text, limit=0):
                if limit and len(text) >= limit:
                        text = text[:limit] + "..."

diff --git a/webapp/handlers_planet.py b/webapp/handlers_planet.py
index cd8cf348e7a95b4027ce8280e04e2f1147887326..1a3ba7654ee4a09522f51c453eb099cde400abcc 100644 (file)
--- a/webapp/handlers_planet.py
+++ b/webapp/handlers_planet.py
@@ -20,6 +20,19 @@ class PlanetMainHandler(PlanetBaseHandler):
                self.render("planet/index.html", entries=entries, offset=offset + limit, limit=limit)
 
 
+class PlanetHotEntriesHandler(PlanetBaseHandler):
+       def get(self):
+               days = self.get_argument("days", None)
+               try:
+                       days = int(days)
+               except (TypeError, ValueError):
+                       days = 30
+
+               entries = self.planet.get_hot_entries(days, limit=25)
+
+               self.render("planet/hottest.html", entries=entries)
+
+
 class PlanetUserHandler(PlanetBaseHandler):
        def get(self, author):
                author = self.accounts.get_by_uid(author)
@@ -38,16 +51,24 @@ class PlanetUserHandler(PlanetBaseHandler):
 
 class PlanetPostingHandler(PlanetBaseHandler):
        def get(self, slug):
-               entry = self.planet.get_entry_by_slug(slug)
+               self.entry = self.planet.get_entry_by_slug(slug)
 
-               if not entry:
+               if not self.entry:
                        raise tornado.web.HTTPError(404)
 
-               # Update the view counter
-               entry.increase_view_counter()
-
                self.render("planet/posting.html",
-                       author=entry.author, entry=entry)
+                       author=self.entry.author, entry=self.entry)
+
+       def on_finish(self):
+               assert self.entry
+
+               # Get the referer and location for statistical purposes
+               referer = self.request.headers.get("Referer", None)
+               location = self.get_remote_location()
+               if location:
+                       location = location.country
+
+               self.entry.count_view(referer=referer, location=location)
 
 
 class PlanetSearchHandler(PlanetBaseHandler):

diff --git a/webapp/ui_modules.py b/webapp/ui_modules.py
index b85fac47fcd6b6e91908a65e009fe5f7129818ad..454557cf8bf915e397f5fb276d56e805053ce332 100644 (file)
--- a/webapp/ui_modules.py
+++ b/webapp/ui_modules.py
@@ -303,6 +303,11 @@ class DownloadButtonModule(UIModule):
                        release=release, image=best_image)
 
 
+class PlanetAuthorBoxModule(UIModule):
+       def render(self, author):
+               return self.render_string("planet/modules/author-box.html", author=author)
+
+
 class PlanetEntryModule(UIModule):
        def render(self, entry, show_avatar=True):
                return self.render_string("modules/planet-entry.html",