builds: Rename detail page to show.html

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 5f0c1133e1f1190dad3ec6bd4cdceaeeae0851e7..7b14904a2b8b18dba4a92cdc2a2ca0c809f5a018 100644 (file)
--- 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 (file)
index 40679f7..0000000
--- a/src/templates/builders/detail.html
+++ /dev/null
@@ -1,113 +0,0 @@
-{% extends "../base.html" %}
-
-{% block title %}{{ _("Builders") }} - {{ builder.name }}{% end block %}
-
-{% block body %}
-       <section class="section">
-               <div class="container">
-                       <nav class="breadcrumb" aria-label="breadcrumbs">
-                               <ul>
-                                       <li>
-                                               <a href="/builders">{{ _("Builders") }}</a>
-                                       </li>
-                                       <li class="is-active">
-                                               <a href="#" aria-current="page">{{ builder }}</a>
-                                       </li>
-                               </ul>
-                       </nav>
-
-                       <h1 class="title is-1">{{ builder }}</h1>
-
-                       {% if builder.cpu_model %}
-                               <h4 class="subtitle is-4">
-                                       {{ builder.cpu_model or _("Unknown CPU Model") }}
-                                       {% if builder.cpu_count > 1 %}
-                                               &times; {{ builder.cpu_count }}
-                                       {% end %}
-
-                                       <span class="tag">
-                                               {{ builder.arch }}
-                                       </span>
-                               </h4>
-                       {% end %}
-
-                       <div class="block">
-                               <div class="box">
-                                       <div class="block">
-                                               <nav class="level">
-                                                       {% if builder.total_build_time %}
-                                                               <div class="level-item has-text-centered">
-                                                                       <div>
-                                                                               <p class="heading">{{ _("Total Build Time") }}</p>
-                                                                               <p class="title">
-                                                                                       {{ format_time(builder.total_build_time) }}
-                                                                               </p>
-                                                                       </div>
-                                                               </div>
-                                                       {% end %}
-
-                                                       {% if builder.pakfire_version %}
-                                                               <div class="level-item has-text-centered">
-                                                                       <div>
-                                                                               <p class="heading">{{ _("Pakfire Version") }}</p>
-                                                                               <p class="title">
-                                                                                       {{ builder.pakfire_version }}
-                                                                               </p>
-                                                                       </div>
-                                                               </div>
-                                                       {% end %}
-
-                                                       {% if builder.os_name %}
-                                                               <div class="level-item has-text-centered">
-                                                                       <div>
-                                                                               <p class="heading">{{ _("Operating System") }}</p>
-                                                                               <p class="title">
-                                                                                       {{ builder.os_name }}
-                                                                               </p>
-                                                                       </div>
-                                                               </div>
-                                                       {% end %}
-                                               </nav>
-                                       </div>
-
-                                       {# Builder Stats #}
-                                       {% if builder.is_online() %}
-                                               <div class="block">
-                                                       {% module BuilderStats(builder) %}
-                                               </div>
-                                       {% end %}
-
-                                       {% if builder.description %}
-                                               {% module Text(builder.description) %}
-                                       {% end %}
-                               </div>
-                       </div>
-
-                       {% if builder.has_perm(current_user) %}
-                               <div class="block">
-                                       <a class="button is-warning" href="/builders/{{ builder.hostname }}/edit">
-                                               {{ _("Edit") }}
-                                       </a>
-                               </div>
-                       {% end %}
-               </div>
-       </section>
-
-       {% if builder.jobs %}
-               <section class="section">
-                       <div class="container">
-                               <h5 class="subtitle is-5">{{ _("Running Jobs") }}</h5>
-
-                               {% module JobsList(builder.jobs) %}
-                       </div>
-               </section>
-       {% end %}
-
-       <section class="section">
-               <div class="container">
-                       <h5 class="title is-5">{{ _("Log") }}</h5>
-
-                       {% module EventsList(builder=builder, show_builder=False, limit=10) %}
-               </div>
-       </section>
-{% end block %}

diff --git a/src/templates/builders/show.html b/src/templates/builders/show.html
new file mode 100644 (file)
index 0000000..aee7dd8
--- /dev/null
+++ b/src/templates/builders/show.html
@@ -0,0 +1,111 @@
+{% extends "../base.html" %}
+
+{% block title %}{{ _("Builders") }} - {{ builder.name }}{% end block %}
+
+{% block body %}
+       <section class="hero is-light">
+               <div class="hero-body">
+                       <div class="container">
+                               <nav class="breadcrumb" aria-label="breadcrumbs">
+                                       <ul>
+                                               <li>
+                                                       <a href="/builders">{{ _("Builders") }}</a>
+                                               </li>
+                                               <li class="is-active">
+                                                       <a href="#" aria-current="page">{{ builder }}</a>
+                                               </li>
+                                       </ul>
+                               </nav>
+
+                               <h1 class="title is-1">{{ builder }}</h1>
+
+                               {% if builder.cpu_model %}
+                                       <h4 class="subtitle is-4">
+                                               {{ builder.cpu_model or _("Unknown CPU Model") }}
+                                               {% if builder.cpu_count > 1 %}
+                                                       &times; {{ builder.cpu_count }}
+                                               {% end %}
+
+                                               <span class="tag">
+                                                       {{ builder.arch }}
+                                               </span>
+                                       </h4>
+                               {% end %}
+
+                               <div class="level">
+                                       {% if builder.os_name %}
+                                               <div class="level-item has-text-centered">
+                                                       <div>
+                                                               <p class="heading">{{ _("Operating System") }}</p>
+                                                               <p>
+                                                                       {{ builder.os_name }}
+                                                               </p>
+                                                       </div>
+                                               </div>
+                                       {% end %}
+
+                                       {% if builder.pakfire_version %}
+                                               <div class="level-item has-text-centered">
+                                                       <div>
+                                                               <p class="heading">{{ _("Pakfire Version") }}</p>
+                                                               <p>
+                                                                       {{ builder.pakfire_version }}
+                                                               </p>
+                                                       </div>
+                                               </div>
+                                       {% end %}
+
+                                       {% if builder.total_build_time %}
+                                               <div class="level-item has-text-centered">
+                                                       <div>
+                                                               <p class="heading">{{ _("Total Build Time") }}</p>
+                                                               <p>
+                                                                       {{ format_time(builder.total_build_time) }}
+                                                               </p>
+                                                       </div>
+                                               </div>
+                                       {% end %}
+                               </div>
+
+                               {# Builder Stats #}
+                               {% if builder.is_online() %}
+                                       <div class="block">
+                                               {% module BuilderStats(builder) %}
+                                       </div>
+                               {% end %}
+
+                               {% if builder.description %}
+                                       {% module Text(builder.description) %}
+                               {% end %}
+                       </div>
+               </div>
+       </section>
+
+       {% if builder.has_perm(current_user) %}
+               <section class="section">
+                       <div class="container">
+                               <a class="button is-warning" href="/builders/{{ builder.hostname }}/edit">
+                                       {{ _("Edit") }}
+                               </a>
+                       </div>
+               </section>
+       {% end %}
+
+       {% if builder.jobs %}
+               <section class="section">
+                       <div class="container">
+                               <h5 class="subtitle is-5">{{ _("Running Jobs") }}</h5>
+
+                               {% module JobsList(builder.jobs) %}
+                       </div>
+               </section>
+       {% end %}
+
+       <section class="section">
+               <div class="container">
+                       <h5 class="title is-5">{{ _("Log") }}</h5>
+
+                       {% module EventsList(builder=builder, show_builder=False, limit=10) %}
+               </div>
+       </section>
+{% end block %}

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 221769b7be6ecddb0d46537a4472d4bdab3cab47..a5332e9ffe4c368ea31b7b8c0cfbe79b58b40f0e 100644 (file)
--- 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 3cd940e745e0c6a54784a5181fa87625cb45704c..df0d149a51feb285f31b8148dfef6b60b77f42ce 100644 (file)
--- 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):