Move builders templates to own directory.

diff --git a/data/templates/builder-delete.html b/data/templates/builders/delete.html
similarity index 97%
rename from data/templates/builder-delete.html
rename to data/templates/builders/delete.html
index 2f5e154a50204108e25e842ad0b2ed8efb4746d8..940dd61fe55c0166fecabd3d4eb4b8486e959bc2 100644 (file)
--- a/data/templates/builder-delete.html
+++ b/data/templates/builders/delete.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Delete builder %s") % builder.name }}{% end block %}
 

diff --git a/data/templates/builder-detail.html b/data/templates/builders/detail.html
similarity index 99%
rename from data/templates/builder-detail.html
rename to data/templates/builders/detail.html
index 18b29a2a0f0b2f651134cafa436fba16d3fdd1dc..675604c7d0d43efb77a496cb665e0028d36ba905 100644 (file)
--- a/data/templates/builder-detail.html
+++ b/data/templates/builders/detail.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Builder") }}: {{ builder.name }}{% end block %}
 

diff --git a/data/templates/builder-edit.html b/data/templates/builders/edit.html
similarity index 99%
rename from data/templates/builder-edit.html
rename to data/templates/builders/edit.html
index 9ffc447e3c5415e7f15520085efd2a43cece96e8..b008971b4365508c85ebb7d803d6ce7f1dd8c69d 100644 (file)
--- a/data/templates/builder-edit.html
+++ b/data/templates/builders/edit.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Manage builder %s") % builder.hostname }}{% end block %}
 

diff --git a/data/templates/builder-list.html b/data/templates/builders/list.html
similarity index 98%
rename from data/templates/builder-list.html
rename to data/templates/builders/list.html
index 0106c583ebfcb43ef6bc2feea0db2e10448acc99..5265ce80d5dcbd457e1665ff10d78807b0b80c44 100644 (file)
--- a/data/templates/builder-list.html
+++ b/data/templates/builders/list.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Builders") }}{% end block %}
 

diff --git a/data/templates/builder-new.html b/data/templates/builders/new.html
similarity index 97%
rename from data/templates/builder-new.html
rename to data/templates/builders/new.html
index 0401070014496dcef58b0665eceecb893de4a9d5..89f4d1048e871ea6fd700c1c91ff69ba73cb62c4 100644 (file)
--- a/data/templates/builder-new.html
+++ b/data/templates/builders/new.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Create new builder") }}{% end block %}
 

diff --git a/data/templates/builder-pass.html b/data/templates/builders/pass.html
similarity index 97%
rename from data/templates/builder-pass.html
rename to data/templates/builders/pass.html
index 201b6bfaa818bd375063580ea5657a83a93f37e0..8c7c24e1015a0ad2a06fb05ecd30f33ef88aaaab 100644 (file)
--- a/data/templates/builder-pass.html
+++ b/data/templates/builders/pass.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block body %}
        <ul class="breadcrumb">

diff --git a/web/handlers_builders.py b/web/handlers_builders.py
index 029f15415d99d96f65df660248a1d2ce74a3e8d2..a4bd4714deda9f1b7d653bae0a0f50d15b99da57 100644 (file)
--- a/web/handlers_builders.py
+++ b/web/handlers_builders.py
@@ -10,7 +10,7 @@ class BuilderListHandler(BaseHandler):
        def get(self):
                builders = self.pakfire.builders.get_all()
 
-               self.render("builder-list.html", builders=builders)
+               self.render("builders/list.html", builders=builders)
 
 
 class BuilderDetailHandler(BaseHandler):
@@ -24,7 +24,7 @@ class BuilderDetailHandler(BaseHandler):
                # Get log.
                log = builder.get_history(limit=5)
 
-               self.render("builder-detail.html", builder=builder, jobs=jobs, log=log)
+               self.render("builders/detail.html", builder=builder, jobs=jobs, log=log)
 
        @tornado.web.authenticated
        def post(self, hostname):
@@ -41,7 +41,7 @@ class BuilderDetailHandler(BaseHandler):
 
 class BuilderNewHandler(BaseHandler):
        def get(self):
-               self.render("builder-new.html")
+               self.render("builders/new.html")
 
        @tornado.web.authenticated
        def post(self):
@@ -54,7 +54,7 @@ class BuilderNewHandler(BaseHandler):
                builder, passphrase = \
                        backend.builders.Builder.create(self.pakfire, name, user=self.current_user)
 
-               self.render("builder-pass.html", action="new", builder=builder,
+               self.render("builders/pass.html", action="new", builder=builder,
                        passphrase=passphrase)
 
 
@@ -65,7 +65,7 @@ class BuilderEditHandler(BaseHandler):
                if not builder:
                        raise tornado.web.HTTPError(404, "Builder not found")
 
-               self.render("builder-edit.html", builder=builder)
+               self.render("builders/edit.html", builder=builder)
 
        @tornado.web.authenticated
        def post(self, hostname):
@@ -114,7 +114,7 @@ class BuilderRenewPassphraseHandler(BaseHandler):
 
                passphrase = builder.regenerate_passphrase()
 
-               self.render("builder-pass.html", action="update", builder=builder,
+               self.render("builders/pass.html", action="update", builder=builder,
                        passphrase=passphrase)
 
 
@@ -136,7 +136,7 @@ class BuilderDeleteHandler(BaseHandler):
                        self.redirect("/builders")
                        return
 
-               self.render("builder-delete.html", builder=builder)
+               self.render("builders/delete.html", builder=builder)
 
 
 class BuilderStatusChangeHandler(BaseHandler):