{% block sidebar %}
<h4>{{ _("Options") }}</h4>
- <ul>
- <li><a href="/accounts">{{ _("Accounts") }}</a></li>
- <li><a href="/mirrors">{{ _("Mirrors") }}</a></li>
+ <ul class="list">
+ <!-- <li><a href="/accounts">{{ _("Accounts") }}</a></li> -->
+ <!-- <li><a href="/mirrors">{{ _("Mirrors") }}</a></li> -->
<li><a href="/planet">{{ _("Planet") }}</a></li>
</ul>
{% end %}
<script src="{{ static_url("js/correctpng.js") }}" type="text/javascript"></script>
<![endif]-->
- <!-- RSS -->
- <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.ipfire.org/{{ lang }}/news.rss" />
+ {% if rss_url %}
+ <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ rss_url }}" />
+ {% end %}
</head>
<body>
<div id="header">
-{% extends "base.html" %}
+{% extends "base-2.html" %}
{% block title %}{{ author.cn }}{% end block %}
</p>
<h3>{{ _("%s recently announced...") % author.cn }}</h3>
- <ul class="news_author_latest_news">
+ <ul class="list news_author_latest_news">
{% for news in latest_news %}
<li>{{ modules.NewsLine(news) }}</li>
{% end %}
{% block sidebar %}
<h4>other options</h4>
- <ul>
+ <ul class="list">
<li><a href="/news">{{ _("Show all news") }}</a></li>
</ul>
{% end block %}
<pubDate>Thu, 8 Nov 2007 00:00:00 +0200</pubDate>
{% for item in items %}
<item>
- <title>{{ item.subject }}</title>
- <link>http://www.ipfire.org/{{ lang }}/news</link>
- <author>{{ item.mail }} ({{ item.author }})</author>
- <guid>http://www.ipfire.org/{{ lang }}/news#{{ item.id }}</guid>
+ <title>{{ item.title }}</title>
+ <link>http://www.ipfire.org/news/{{ item.slug }}</link>
+ <author>{{ item.author.email }} ({{ item.author.cn }})</author>
+ <guid>{{ item.uuid }}</guid>
<pubDate>{{ item.date }}</pubDate>
<description>
<![CDATA[
- {{ item.content }}
+ {{ item.text }}
]]>
</description>
</item>
(r"/index\.?(s?html?)?", RootHandler),
# Handle news items
- #(r"/news/(.*)", NewsRedirectHandler),
(r"/news", NewsIndexHandler),
(r"/news/(.*)", NewsItemHandler),
(r"/author/(.*)", NewsAuthorHandler),
# Download sites
(r"/downloads?", DownloadHandler),
-# # RSS feed
-# (r"/([A-Za-z]{2})/news.rss", RSSHandler),
-# (r"/data/feeds/main-([A-Za-z]{2}).rss", RSSHandler),
+ # RSS feed
+ (r"/news.rss", RSSHandler),
+
+ # Redirection for bookmarks, etc.
(r"/(de|en)/(.*)", LangCompatHandler)
] + static_handlers + [
(r"/(.*)", StaticHandler),
])
- # news.ipfire.org
- #self.add_handlers(r"news\.ipfire\.org", [
- # (r"/", NewsIndexHandler),
- # (r"/news/(.*)", NewsItemHandler),
- # (r"/author/(.*)", NewsAuthorHandler),
- #] + static_handlers)
-
# downloads.ipfire.org
self.add_handlers(r"downloads?\.ipfire\.org", [
(r"/", DownloadsIndexHandler),
def run(self, port=8001):
logging.debug("Going to background")
-
- # All requests should be done after 30 seconds or they will be killed.
- self.ioloop.set_blocking_log_threshold(30)
http_server = tornado.httpserver.HTTPServer(self, xheaders=True)
http_server.start(num_processes=4)
else:
http_server.listen(port)
+
+ # All requests should be done after 30 seconds or they will be killed.
+ self.ioloop.set_blocking_log_threshold(30)
self.ioloop.start()
return self.db.get("SELECT * FROM news WHERE slug=%s", slug)
def get_latest(self, author=None, locale=None, limit=1, offset=0):
- # XXX find a better way to do offset
-
- if offset:
- limit += offset
-
query = "SELECT * FROM news WHERE published='Y'"
if author:
query += " ORDER BY date DESC"
if limit:
- query += " LIMIT %d" % limit
+ if offset:
+ query += " LIMIT %d,%d" % (offset, limit)
+ else:
+ query += " LIMIT %d" % limit
news = self.db.query(query)
- # XXX can the database do this?
- if offset:
- news = news[offset:]
-
return news
if __name__ == "__main__":
from handlers_mirrors import *
from handlers_news import *
from handlers_planet import *
+from handlers_rss import *
from handlers_stasy import *
from handlers_tracker import *
class IndexHandler(BaseHandler):
+ rss_url = "/news.rss"
+
"""
This handler displays the welcome page.
"""
import backend
class BaseHandler(tornado.web.RequestHandler):
+ rss_url = None
+
def get_account(self, uid):
# Find the name of the author
return self.accounts.find(uid)
return {
"hostname" : self.request.host,
"lang" : self.locale.code[:2],
+ "rss_url" : self.rss_url,
"year" : time.strftime("%Y"),
}
from handlers_base import *
-class NewsRedirectHandler(BaseHandler):
- """
- This handler redirects (with a given slug) to news.ipfire.org.
-
- We do not show full news items on the main page and so need a simple
- way to redirect. Here it is.
- """
- def get(self, slug):
- self.redirect("http://news.ipfire.org/news/%s" % slug)
-
-
class NewsIndexHandler(BaseHandler):
+ rss_url = "/news.rss"
+
"""
This handler fetches the content that is show on the news portal.
"""
class NewsItemHandler(BaseHandler):
+ rss_url = "/news.rss"
+
"""
This handler displays a whole page full of a single news item.
"""
raise tornado.web.HTTPError(404)
latest_news = self.news.get_latest(author=author.uid,
- locale=self.locale, limit=3)
+ locale=self.locale, limit=10)
self.render("news-author.html",
author=author, latest_news=latest_news)
from __future__ import division
+import hashlib
import logging
import operator
import socket
def banners(self):
return self.handler.banners
+ @property
+ def memcached(self):
+ return self.handler.memcached
+
@property
def releases(self):
return self.handler.releases
item.text = item.text[:400] + "..."
# Render text
- item.text = textile.textile(item.text)
+ text_id = "news-%s" % hashlib.md5(item.text.encode("utf-8")).hexdigest()
+
+ text = self.memcached.get(text_id)
+ if not text:
+ text = textile.textile(item.text)
+ self.memcached.set(text_id, text, 60)
+
+ item.text = text
return self.render_string("modules/news-item.html", item=item, uncut=uncut)
projects / people / shoehn / ipfire.org.git / commitdiff
