From: Michael Tremer Date: Tue, 21 Jun 2022 09:52:38 +0000 (+0000) Subject: packages: Somewhat refactor detail page X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f3b3d11c682c8d7a893ce8e36dcedbdf00ad7f1;p=pbs.git packages: Somewhat refactor detail page Signed-off-by: Michael Tremer --- diff --git a/src/templates/package-detail-list.html b/src/templates/package-detail-list.html index 6b3104c6..43332a02 100644 --- a/src/templates/package-detail-list.html +++ b/src/templates/package-detail-list.html @@ -1,53 +1,61 @@ {% extends "base.html" %} -{% block title %}{{ _("Package") }} {{ pkg.name }}{% end block %} +{% block title %}{{ _("Package") }} - {{ pkg.name }}{% end block %} -{% block body %} -
-
- -
-
-
-
-

- {{ pkg.name }}
- {{ pkg.summary }} -

-
-
-
+ {% end %} + {% if pkg.maintainer %} +
  • + {% module LinkToUser(pkg.maintainer) %} +
    • + {% end %} + +
    -
    - {% module PackageHeader(pkg) %} -
    -
    {% module Changelog(builds=builds) %} diff --git a/src/web/__init__.py b/src/web/__init__.py index d12726a0..d3e66422 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -4,6 +4,7 @@ import logging import tornado.locale import tornado.web +import urllib.parse from .. import Backend from ..constants import * @@ -86,6 +87,7 @@ class Application(tornado.web.Application): "SelectTimezone" : ui_modules.SelectTimezoneModule, }, ui_methods = { + "extract_hostname" : self.extract_hostname, "format_time" : self.format_time, }, xsrf_cookies = True, @@ -117,7 +119,7 @@ class Application(tornado.web.Application): (r"/package/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", packages.PackageDetailHandler), (r"/package/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/download(.*)", packages.PackageFileDownloadHandler), (r"/package/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/view(.*)", packages.PackageFileViewHandler), - (r"/package/([\w\-\+]+)", packages.PackageNameHandler), + (r"/packages/([\w\-\+]+)", packages.PackageNameHandler), (r"/package/([\w\-\+]+)/builds/scratch", packages.PackageScratchBuildsHandler), (r"/package/([\w\-\+]+)/builds/times", packages.PackageBuildsTimesHandler), (r"/package/([\w\-\+]+)/changelog", packages.PackageChangelogHandler), @@ -216,6 +218,11 @@ class Application(tornado.web.Application): ## UI methods + def extract_hostname(self, handler, url): + url = urllib.parse.urlparse(url) + + return url.hostname + def format_time(self, handler, s, shorter=False): _ = handler.locale.translate diff --git a/src/web/packages.py b/src/web/packages.py index 9f820b38..0deb5009 100644 --- a/src/web/packages.py +++ b/src/web/packages.py @@ -47,7 +47,7 @@ class PackageNameHandler(base.BaseHandler): bugs = self.backend.bugzilla.get_bugs_from_component(name) self.render("package-detail-list.html", name=name, builds=builds, - latest_build=latest_build, pkg=latest_build.pkg, bugs=bugs) + latest_build=latest_build, package=latest_build.pkg, pkg=latest_build.pkg, bugs=bugs) class PackageScratchBuildsHandler(base.BaseHandler):