From: Michael Tremer Date: Tue, 23 May 2023 16:28:28 +0000 (+0000) Subject: builds: Rename detail page to show.html X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9103c44dd062559f830023967f9549463b82d354;p=pbs.git builds: Rename detail page to show.html Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index 5f0c1133..7b14904a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -167,10 +167,10 @@ templates_bugs_modulesdir = $(templates_bugsdir)/modules dist_templates_builders_DATA = \ src/templates/builders/delete.html \ - src/templates/builders/detail.html \ src/templates/builders/edit.html \ src/templates/builders/index.html \ - src/templates/builders/new.html + src/templates/builders/new.html \ + src/templates/builders/show.html templates_buildersdir = $(templatesdir)/builders diff --git a/src/templates/builders/detail.html b/src/templates/builders/detail.html deleted file mode 100644 index 40679f7b..00000000 --- a/src/templates/builders/detail.html +++ /dev/null @@ -1,113 +0,0 @@ -{% extends "../base.html" %} - -{% block title %}{{ _("Builders") }} - {{ builder.name }}{% end block %} - -{% block body %} -
-
- - -

{{ builder }}

- - {% if builder.cpu_model %} -

- {{ builder.cpu_model or _("Unknown CPU Model") }} - {% if builder.cpu_count > 1 %} - × {{ builder.cpu_count }} - {% end %} - - - {{ builder.arch }} - -

- {% end %} - -
-
-
- -
- - {# Builder Stats #} - {% if builder.is_online() %} -
- {% module BuilderStats(builder) %} -
- {% end %} - - {% if builder.description %} - {% module Text(builder.description) %} - {% end %} -
-
- - {% if builder.has_perm(current_user) %} -
- - {{ _("Edit") }} - -
- {% end %} -
-
- - {% if builder.jobs %} -
-
-
{{ _("Running Jobs") }}
- - {% module JobsList(builder.jobs) %} -
-
- {% end %} - -
-
-
{{ _("Log") }}
- - {% module EventsList(builder=builder, show_builder=False, limit=10) %} -
-
-{% end block %} diff --git a/src/templates/builders/show.html b/src/templates/builders/show.html new file mode 100644 index 00000000..aee7dd86 --- /dev/null +++ b/src/templates/builders/show.html @@ -0,0 +1,111 @@ +{% extends "../base.html" %} + +{% block title %}{{ _("Builders") }} - {{ builder.name }}{% end block %} + +{% block body %} +
+
+
+ + +

{{ builder }}

+ + {% if builder.cpu_model %} +

+ {{ builder.cpu_model or _("Unknown CPU Model") }} + {% if builder.cpu_count > 1 %} + × {{ builder.cpu_count }} + {% end %} + + + {{ builder.arch }} + +

+ {% end %} + +
+ {% if builder.os_name %} +
+
+

{{ _("Operating System") }}

+

+ {{ builder.os_name }} +

+
+
+ {% end %} + + {% if builder.pakfire_version %} +
+
+

{{ _("Pakfire Version") }}

+

+ {{ builder.pakfire_version }} +

+
+
+ {% end %} + + {% if builder.total_build_time %} +
+
+

{{ _("Total Build Time") }}

+

+ {{ format_time(builder.total_build_time) }} +

+
+
+ {% end %} +
+ + {# Builder Stats #} + {% if builder.is_online() %} +
+ {% module BuilderStats(builder) %} +
+ {% end %} + + {% if builder.description %} + {% module Text(builder.description) %} + {% end %} +
+
+
+ + {% if builder.has_perm(current_user) %} +
+
+ + {{ _("Edit") }} + +
+
+ {% end %} + + {% if builder.jobs %} +
+
+
{{ _("Running Jobs") }}
+ + {% module JobsList(builder.jobs) %} +
+
+ {% end %} + +
+
+
{{ _("Log") }}
+ + {% module EventsList(builder=builder, show_builder=False, limit=10) %} +
+
+{% end block %} diff --git a/src/web/__init__.py b/src/web/__init__.py index 221769b7..a5332e9f 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -179,9 +179,9 @@ class Application(tornado.web.Application): # Builders (r"/builders", builders.IndexHandler), (r"/builders/new", builders.BuilderNewHandler), + (r"/builders/([A-Za-z0-9\-\.]+)", builders.ShowHandler), (r"/builders/([A-Za-z0-9\-\.]+)/delete", builders.BuilderDeleteHandler), (r"/builders/([A-Za-z0-9\-\.]+)/edit", builders.BuilderEditHandler), - (r"/builders/([A-Za-z0-9\-\.]+)", builders.BuilderDetailHandler), (r"/builders/([A-Za-z0-9\-\.]+)/stats", builders.StatsHandler), (r"/api/v1/builders/control", builders.APIv1ControlHandler), diff --git a/src/web/builders.py b/src/web/builders.py index 3cd940e7..df0d149a 100644 --- a/src/web/builders.py +++ b/src/web/builders.py @@ -79,13 +79,13 @@ class IndexHandler(base.BaseHandler): self.render("builders/index.html", builders=self.backend.builders) -class BuilderDetailHandler(base.BaseHandler): +class ShowHandler(base.BaseHandler): def get(self, hostname): builder = self.backend.builders.get_by_name(hostname) if not builder: raise tornado.web.HTTPError(404, "Could not find builder %s" % hostname) - self.render("builders/detail.html", builder=builder) + self.render("builders/show.html", builder=builder) class BuilderNewHandler(base.BaseHandler):