From: Michael Tremer Date: Tue, 17 Jul 2018 12:52:40 +0000 (+0100) Subject: Drop planet X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d4ce901c205dd8fb657bf72bb4a72993cb9b08d;p=ipfire.org.git Drop planet Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index d4a247e8..6bbb4840 100644 --- a/Makefile.am +++ b/Makefile.am @@ -88,7 +88,6 @@ web_PYTHON = \ src/web/handlers_mirrors.py \ src/web/handlers_news.py \ src/web/handlers_nopaste.py \ - src/web/handlers_planet.py \ src/web/handlers_rss.py \ src/web/handlers_talk.py \ src/web/ui_modules.py diff --git a/src/templates/modules/planet-entry.html b/src/templates/modules/planet-entry.html deleted file mode 100644 index c0760a1e..00000000 --- a/src/templates/modules/planet-entry.html +++ /dev/null @@ -1,36 +0,0 @@ -
-
- {% if entry.is_draft() %} -
- - {{ _("Heads up!") }} {{ _("This post is a draft and has not been published, yet.") }} -
- {% end %} - -
-
-

- {{ entry.title }} -

- - {% raw entry.text %} -
- - {% if show_avatar %} -
-
- - {{ _("by") }} {{ entry.author.name }}, - {{ locale.format_date(entry.published, shorter=True) }} - -
-
- - {{ entry.author.name }} - -
-
- {% end %} -
-
-
\ No newline at end of file diff --git a/src/templates/planet/base.html b/src/templates/planet/base.html deleted file mode 100644 index d108a0c0..00000000 --- a/src/templates/planet/base.html +++ /dev/null @@ -1 +0,0 @@ -{% extends "../base.html" %} diff --git a/src/templates/planet/hottest.html b/src/templates/planet/hottest.html deleted file mode 100644 index 6edacffd..00000000 --- a/src/templates/planet/hottest.html +++ /dev/null @@ -1,26 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _("Hottest posts") }}{% end block %} - -{% block container %} -
-

{{ _("The hottest posts of the last month") }}

- -
-
- {% for entry in entries %} -
- {{ entry.author.name }} -

{{ entry.title }}

-
-
- {{ _("by") }} {{ entry.author.name }}, - {{ locale.format_date(entry.published, relative=True, shorter=True) }} -
- -
- {% end %} -
-
-
-{% end block %} diff --git a/src/templates/planet/index.html b/src/templates/planet/index.html deleted file mode 100644 index dc3fb453..00000000 --- a/src/templates/planet/index.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _("IPFire Planet") }}{% end block %} - -{% block container %} -
-

The Blog of the IPFire Team

- - {% for entry in entries %} - {% module PlanetEntry(entry) %} - {% end %} - -
-
- ← {{ _("Older posts") }} - {{ _("Newer posts") }} → -
-
- -
-
- - - {% for y in range(year, 2010, -1) %} - - {% end %} -
-
-
-{% end block %} diff --git a/src/templates/planet/list.html b/src/templates/planet/list.html deleted file mode 100644 index 082c2296..00000000 --- a/src/templates/planet/list.html +++ /dev/null @@ -1,58 +0,0 @@ -{% extends "../base.html" %} - -{% block title %}{{ _("IPFire Planet") }} - {% if author %}{{ _("%s's posts") % author.name }}{% elif year %}{{ _("Posts from %s") % year }}{% end %}{% end block %} - -{% block body %} -
-
-
- {% block bodyA %} -
-

- {% if author %} - {{ _("%s's posts") % author.name }} - {% elif year %} - {{ _("Posts from %s") % year }} - {% end %} -

-
- - {% if entries %} - {% for (y, m), posts in entries %} -

- {% if not year %}{{ y }},{% end %} - {{ format_month_name(m) }} -

- -
- {% for p in posts %} -
{{ locale.format_date(p.published, shorter=True) }}
-
- {% if not author %} - - {{ p.author.name }} - - {{ p.author.name }} - {% end %} - {{ p.title }} -
- {% end %} - {% end %} -
- {% else %} - {% if author %} -

{{ _("%s did not write any posts, yet.") % author.name }}

- {% end %} - {% end %} - {% end block %} -
- - {% if author %} -
- {% module PlanetAuthorBox(author) %} -
- {% end %} -
-
-{% end block %} diff --git a/src/templates/planet/modules/author-box.html b/src/templates/planet/modules/author-box.html deleted file mode 100644 index ed9de653..00000000 --- a/src/templates/planet/modules/author-box.html +++ /dev/null @@ -1,26 +0,0 @@ -
- {{ author.name }} - -

- {{ author.name }} -

- -
- -
    -
  • - - - -
    • - - {% if author.is_talk_enabled() %} -
  • - - - -
    • - {% end %} -
-
diff --git a/src/templates/planet/posting.html b/src/templates/planet/posting.html deleted file mode 100644 index ede692ec..00000000 --- a/src/templates/planet/posting.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "../base.html" %} - -{% block title %}{{ entry.title }}{% end block %} - -{% block container %} - {% module PlanetEntry(entry) %} - -
-
- - {{ _("Posted:") }} {{ locale.format_date(entry.published, shorter=True, relative=False) }} - - • - - {{ _("One view", "%(views)s views", entry.views) % { "views" : entry.views } }} - -
-
-{% end block %} diff --git a/src/templates/planet/search.html b/src/templates/planet/search.html deleted file mode 100644 index b150d822..00000000 --- a/src/templates/planet/search.html +++ /dev/null @@ -1,23 +0,0 @@ -{% extends "base.html" %} - -{% block title %}{{ _("IPFire Planet") }}{% end block %} - -{% block container %} -
-

{{ _("Search results for '%s'") % query }}

-
- -
- {% module PlanetSearchBox(query=query) %} -
- - {% if entries %} - {% for entry in entries %} - {% module PlanetEntry(entry) %} - {% end %} - {% else %} -

- {{ _("No results found for '%s'") % query }} -

- {% end %} -{% end block %} diff --git a/src/web/__init__.py b/src/web/__init__.py index b6bfab19..4c1b3068 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -60,9 +60,6 @@ class Application(tornado.web.Application): "NewsLine" : NewsLineModule, "NewsTable" : NewsTableModule, "NewsYearNavigation" : NewsYearNavigationModule, - "PlanetAuthorBox" : PlanetAuthorBoxModule, - "PlanetEntry" : PlanetEntryModule, - "PlanetSearchBox" : PlanetSearchBoxModule, "ProgressBar" : ProgressBarModule, "ReleaseItem" : ReleaseItemModule, "SidebarBanner" : SidebarBannerModule, @@ -154,17 +151,14 @@ 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), - (r"/year/(\d+)", PlanetYearHandler), + (r"/", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/" }), + (r"/post/([A-Za-z0-9_-]+)", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/posts/{1}" }), + (r"/user/([a-z0-9_-]+)", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/authors/{1}" }), # RSS - (r"/rss", RSSPlanetAllHandler), - (r"/user/([a-z0-9_-]+)/rss", RSSPlanetUserHandler), - (r"/news.rss", tornado.web.RedirectHandler, { "url" : "/rss" }), + (r"/rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.rss" }), + (r"/user/([a-z0-9_-]+)/rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/authors/{1}.rss" }), + (r"/news.rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.rss" }), ]) # fireinfo.ipfire.org diff --git a/src/web/handlers_planet.py b/src/web/handlers_planet.py deleted file mode 100644 index 3eb15996..00000000 --- a/src/web/handlers_planet.py +++ /dev/null @@ -1,101 +0,0 @@ -#!/usr/bin/python - -import tornado.web - -from handlers_base import * - -class PlanetBaseHandler(BaseHandler): - def group_entries_by_month(self, entries): - months = {} - - for entry in entries: - key = (entry.published.year, entry.published.month) - - try: - months[key].append(entry) - except KeyError: - months[key] = [entry] - - months = months.items() - months.sort(reverse=True) - - return months - - -class PlanetMainHandler(PlanetBaseHandler): - rss_url = "/rss" - - def get(self): - offset = int(self.get_argument("offset", 0)) - limit = int(self.get_argument("limit", 4)) - - entries = self.planet.get_entries(offset=offset, limit=limit) - - 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) - if not author: - raise tornado.web.HTTPError(404, "User is unknown") - - entries = self.planet.get_entries_by_author(author.uid) - entries = self.group_entries_by_month(entries) - - self.render("planet/list.html", author=author, year=None, - entries=entries, rss_url="/user/%s/rss" % author.uid) - - -class PlanetPostingHandler(PlanetBaseHandler): - def get(self, slug): - entry = self.planet.get_entry_by_slug(slug) - if not entry: - raise tornado.web.HTTPError(404) - - # 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 - - # Log the request - with self.db.transaction(): - entry.count_view(referer=referer, location=location) - - self.render("planet/posting.html", - author=entry.author, entry=entry) - - -class PlanetSearchHandler(PlanetBaseHandler): - def get(self): - query = self.get_argument("q", "") - - if query: - entries = self.planet.search(query) - else: - entries = [] - - self.render("planet/search.html", entries=entries, query=query) - - -class PlanetYearHandler(PlanetBaseHandler): - def get(self, year): - entries = self.planet.get_entries_by_year(year) - entries = self.group_entries_by_month(entries) - - self.render("planet/list.html", author=None, year=year, - entries=entries) diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py index 67a4d75a..c9ef546e 100644 --- a/src/web/ui_modules.py +++ b/src/web/ui_modules.py @@ -44,10 +44,6 @@ class UIModule(tornado.web.UIModule): def news(self): return self.handler.news - @property - def planet(self): - return self.handler.planet - @property def talk(self): return self.handler.talk @@ -242,11 +238,6 @@ class NewsYearNavigationModule(UIModule): active=active, years=self.news.years) -class PlanetSearchBoxModule(UIModule): - def render(self, query=None): - return self.render_string("modules/planet/search-box.html", query=query) - - class SidebarItemModule(UIModule): def render(self): return self.render_string("modules/sidebar-item.html") @@ -305,17 +296,6 @@ 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", - entry=entry, show_avatar=show_avatar) - - class ProgressBarModule(UIModule): def render(self, value, colour=None): value *= 100