builders: Rename list page to index for consistency

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

diff --git a/Makefile.am b/Makefile.am
index 9974a933ae1d5a5a63d8c656ebae414743fbc614..5f0c1133e1f1190dad3ec6bd4cdceaeeae0851e7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -169,7 +169,7 @@ dist_templates_builders_DATA = \
        src/templates/builders/delete.html \
        src/templates/builders/detail.html \
        src/templates/builders/edit.html \
-       src/templates/builders/list.html \
+       src/templates/builders/index.html \
        src/templates/builders/new.html
 
 templates_buildersdir = $(templatesdir)/builders

diff --git a/src/templates/builders/list.html b/src/templates/builders/index.html
similarity index 78%
rename from src/templates/builders/list.html
rename to src/templates/builders/index.html
index 74c78b6eee73c428e3a7208399cef5f2f6788af7..fa101b6c6723f7aab88d2d2b5b44fd332c9d1e52 100644 (file)
--- a/src/templates/builders/list.html
+++ b/src/templates/builders/index.html
@@ -3,26 +3,24 @@
 {% block title %}{{ _("Builders") }}{% end block %}
 
 {% block body %}
-       <section class="section">
-               <div class="container">
-                       <nav class="breadcrumb" aria-label="breadcrumbs">
-                               <ul>
-                                       <li class="is-active">
-                                               <a href="#" aria-current="page">{{ _("Builders") }}</a>
-                                       </li>
-                               </ul>
-                       </nav>
-
-                       <h1 class="title is-1">{{ _("Builders") }}</h1>
+       <section class="hero is-light">
+               <div class="hero-body">
+                       <div class="container">
+                               <nav class="breadcrumb" aria-label="breadcrumbs">
+                                       <ul>
+                                               <li class="is-active">
+                                                       <a href="#" aria-current="page">{{ _("Builders") }}</a>
+                                               </li>
+                                       </ul>
+                               </nav>
 
-                       {% if current_user and current_user.is_admin() %}
-                               <div class="block">
-                                       <a class="button is-success" href="/builders/new">
-                                               {{ _("Create Builder") }}
-                                       </a>
-                               </div>
-                       {% end %}
+                               <h1 class="title is-1">{{ _("Builders") }}</h1>
+                       </div>
+               </div>
+       </section>
 
+       <section class="section">
+               <div class="container">
                        {% for builder in builders %}
                                <div class="block">
                                        <div class="box">
@@ -45,6 +43,12 @@
                                        </div>
                                </div>
                        {% end %}
+
+                       {% if current_user and current_user.is_admin() %}
+                               <a class="button is-success" href="/builders/new">
+                                       {{ _("Create Builder") }}
+                               </a>
+                       {% end %}
                </div>
        </section>
 

diff --git a/src/web/__init__.py b/src/web/__init__.py
index e82dfb822d96f1f905f2c868ebf2502f5496e5a4..221769b7be6ecddb0d46537a4472d4bdab3cab47 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -177,7 +177,7 @@ class Application(tornado.web.Application):
                                jobs.APIv1LogStreamHandler),
 
                        # Builders
-                       (r"/builders", builders.BuilderListHandler),
+                       (r"/builders", builders.IndexHandler),
                        (r"/builders/new", builders.BuilderNewHandler),
                        (r"/builders/([A-Za-z0-9\-\.]+)/delete", builders.BuilderDeleteHandler),
                        (r"/builders/([A-Za-z0-9\-\.]+)/edit", builders.BuilderEditHandler),

diff --git a/src/web/builders.py b/src/web/builders.py
index 11f6b55e2cfbfbc072c6d1b8a238baa2a0c81945..3cd940e745e0c6a54784a5181fa87625cb45704c 100644 (file)
--- a/src/web/builders.py
+++ b/src/web/builders.py
@@ -74,10 +74,9 @@ class StatsHandler(base.BackendMixin, tornado.websocket.WebSocketHandler):
                })
 
 
-
-class BuilderListHandler(base.BaseHandler):
+class IndexHandler(base.BaseHandler):
        def get(self):
-               self.render("builders/list.html", builders=self.backend.builders)
+               self.render("builders/index.html", builders=self.backend.builders)
 
 
 class BuilderDetailHandler(base.BaseHandler):