Move mirror templates into own subdirectory

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

diff --git a/Makefile.am b/Makefile.am
index d7384c270cfe832d8b31948251c2646339214471..8e6fd052e7fe4f45b3f295122dab828edaf6beff 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -187,11 +187,6 @@ dist_templates_DATA = \
        src/templates/keys-list.html \
        src/templates/log.html \
        src/templates/login.html \
-       src/templates/mirrors-delete.html \
-       src/templates/mirrors-detail.html \
-       src/templates/mirrors-edit.html \
-       src/templates/mirrors-list.html \
-       src/templates/mirrors-new.html \
        src/templates/package-detail.html \
        src/templates/package-detail-list.html \
        src/templates/package-properties.html \
@@ -246,6 +241,15 @@ dist_templates_errors_DATA = \
 
 templates_errorsdir = $(templatesdir)/errors
 
+dist_templates_mirrors_DATA = \
+       src/templates/mirrors/delete.html \
+       src/templates/mirrors/detail.html \
+       src/templates/mirrors/edit.html \
+       src/templates/mirrors/list.html \
+       src/templates/mirrors/new.html
+
+templates_mirrorsdir = $(templatesdir)/mirrors
+
 dist_templates_modules_DATA = \
        src/templates/modules/bugs-table.html \
        src/templates/modules/build-headline.html \

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 44486a58eea23deb37f3dceff236b1514e2eaef3..f644886ae38c5230b463ddfefa518ad71695cc90 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -78,11 +78,11 @@ src/templates/keys-import.html
 src/templates/keys-list.html
 src/templates/log.html
 src/templates/login.html
-src/templates/mirrors-delete.html
-src/templates/mirrors-detail.html
-src/templates/mirrors-edit.html
-src/templates/mirrors-list.html
-src/templates/mirrors-new.html
+src/templates/mirrors/delete.html
+src/templates/mirrors/detail.html
+src/templates/mirrors/edit.html
+src/templates/mirrors/list.html
+src/templates/mirrors/new.html
 src/templates/modules/bugs-table.html
 src/templates/modules/builders/load.html
 src/templates/modules/build-headline.html

diff --git a/src/templates/mirrors-delete.html b/src/templates/mirrors/delete.html
similarity index 97%
rename from src/templates/mirrors-delete.html
rename to src/templates/mirrors/delete.html
index c1c1ef31728b0cdaa32e3c20b28eab04fe28a7ce..2ad999377114eb4e7379ae1cdf09fbbe0c680e58 100644 (file)
--- a/src/templates/mirrors-delete.html
+++ b/src/templates/mirrors/delete.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Delete mirror %s") % mirror.hostname }}{% end block %}
 

diff --git a/src/templates/mirrors-detail.html b/src/templates/mirrors/detail.html
similarity index 99%
rename from src/templates/mirrors-detail.html
rename to src/templates/mirrors/detail.html
index 4b9ac38ef06991ed6d9cae5eb6e5e1752295564f..fffa71ca703891867b12e4971b491fd58f61cfe5 100644 (file)
--- a/src/templates/mirrors-detail.html
+++ b/src/templates/mirrors/detail.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Mirror: %s") % mirror.hostname }}{% end block %}
 

diff --git a/src/templates/mirrors-edit.html b/src/templates/mirrors/edit.html
similarity index 98%
rename from src/templates/mirrors-edit.html
rename to src/templates/mirrors/edit.html
index 2e3b3c3ff9b63da8a3c0895a87c14fa1d5d64c1a..4be0bac40a7686676b0053eee4be43b298bd729a 100644 (file)
--- a/src/templates/mirrors-edit.html
+++ b/src/templates/mirrors/edit.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Manage mirror %s") % mirror.hostname }}{% end block %}
 

diff --git a/src/templates/mirrors-list.html b/src/templates/mirrors/list.html
similarity index 98%
rename from src/templates/mirrors-list.html
rename to src/templates/mirrors/list.html
index bbf03f1d2ffc5b5943857659bf38a5d8cd32e517..670a260b72b78004118f34a798a3cc4de9d57000 100644 (file)
--- a/src/templates/mirrors-list.html
+++ b/src/templates/mirrors/list.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Mirrors") }}{% end block %}
 

diff --git a/src/templates/mirrors-new.html b/src/templates/mirrors/new.html
similarity index 98%
rename from src/templates/mirrors-new.html
rename to src/templates/mirrors/new.html
index 67ee96b7ad0f9ec7368e221e129b5e970dfac093..2e5a9ab731d25492aa748513363583ae2651217e 100644 (file)
--- a/src/templates/mirrors-new.html
+++ b/src/templates/mirrors/new.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Add new mirror") }}{% end block %}
 

diff --git a/src/web/handlers_mirrors.py b/src/web/handlers_mirrors.py
index fa32e43a63e1038c44761317d46d4bfce8bcb9fa..43822ef32fc95f9a60251d73e695edeecc8df60e 100644 (file)
--- a/src/web/handlers_mirrors.py
+++ b/src/web/handlers_mirrors.py
@@ -27,7 +27,7 @@ class MirrorListHandler(BaseHandler):
                # Get recent log messages.
                kwargs["log"] = self.pakfire.mirrors.get_history(limit=5)
 
-               self.render("mirrors-list.html", **kwargs)
+               self.render("mirrors/list.html", **kwargs)
 
 
 class MirrorDetailHandler(BaseHandler):
@@ -38,7 +38,7 @@ class MirrorDetailHandler(BaseHandler):
 
                log = self.pakfire.mirrors.get_history(mirror=mirror, limit=10)
 
-               self.render("mirrors-detail.html", mirror=mirror, log=log)
+               self.render("mirrors/detail.html", mirror=mirror, log=log)
 
 
 class MirrorActionHandler(BaseHandler):
@@ -55,7 +55,7 @@ class MirrorActionHandler(BaseHandler):
 class MirrorNewHandler(MirrorActionHandler):
        @tornado.web.authenticated
        def get(self, hostname="", path="", hostname_missing=False, path_invalid=False):
-               self.render("mirrors-new.html", _hostname=hostname, path=path,
+               self.render("mirrors/new.html", _hostname=hostname, path=path,
                        hostname_missing=hostname_missing, path_invalid=path_invalid)
 
        @tornado.web.authenticated
@@ -91,7 +91,7 @@ class MirrorEditHandler(MirrorActionHandler):
                if not mirror:
                        raise tornado.web.HTTPError(404, "Could not find mirror: %s" % hostname)
 
-               self.render("mirrors-edit.html", mirror=mirror)
+               self.render("mirrors/edit.html", mirror=mirror)
 
        @tornado.web.authenticated
        def post(self, hostname):
@@ -123,4 +123,4 @@ class MirrorDeleteHandler(MirrorActionHandler):
                        self.redirect("/mirrors")
                        return
 
-               self.render("mirrors-delete.html", mirror=mirror)
+               self.render("mirrors/delete.html", mirror=mirror)