docs: Move tree

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

diff --git a/Makefile.am b/Makefile.am
index 55e17005ea668fac6b090d77fc34dfb680fe6cc5..29f551d594b0b9026eec35528d7488aaa0b6eef9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -205,7 +205,8 @@ templates_docs_DATA = \
        src/templates/docs/page.html \
        src/templates/docs/recent-changes.html \
        src/templates/docs/revisions.html \
-       src/templates/docs/search-results.html
+       src/templates/docs/search-results.html \
+       src/templates/docs/tree.html
 
 templates_docsdir = $(templatesdir)/docs
 
@@ -347,7 +348,6 @@ templates_voip_modulesdir = $(templates_voipdir)/modules
 templates_wiki_DATA = \
        src/templates/wiki/confirm-delete.html \
        src/templates/wiki/edit.html \
-       src/templates/wiki/tree.html \
        src/templates/wiki/watchlist.html
 
 templates_wikidir = $(templatesdir)/wiki

diff --git a/src/templates/wiki/tree.html b/src/templates/docs/tree.html
similarity index 100%
rename from src/templates/wiki/tree.html
rename to src/templates/docs/tree.html

diff --git a/src/web/__init__.py b/src/web/__init__.py
index c8caa6be0f7d340e31e83b03b63d67a234787cef..0b9c59a8a81fab093b33cc2fc4e2c631477aec6b 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -144,6 +144,7 @@ class Application(tornado.web.Application):
                        # Docs
                        (r"/docs/recent\-changes", docs.RecentChangesHandler),
                        (r"/docs/search", docs.SearchHandler),
+                       (r"/docs/tree", docs.TreeHandler),
                        (r"/docs((?:[A-Za-z0-9\-_\/]+)?(?:.*)\.(?:\w+))$", docs.FileHandler),
                        (r"/docs([A-Za-z0-9\-_\/]+)?", docs.PageHandler),
 
@@ -352,7 +353,6 @@ class Application(tornado.web.Application):
                        (r"/actions/upload", wiki.ActionUploadHandler),
 
                        # Handlers
-                       (r"/tree", wiki.TreeHandler),
                        (r"/watchlist", wiki.WatchlistHandler),
 
                        # Media

diff --git a/src/web/docs.py b/src/web/docs.py
index 9c00d40bfbced83cb9ec450e586a674f994b5061..e56ee4743ea0863bfb52c5f548ce48d5a87b5752 100644 (file)
--- a/src/web/docs.py
+++ b/src/web/docs.py
@@ -157,6 +157,11 @@ class RecentChangesHandler(base.BaseHandler):
                self.render("docs/recent-changes.html", recent_changes=recent_changes)
 
 
+class TreeHandler(base.BaseHandler):
+       def get(self):
+               self.render("docs/tree.html", pages=self.backend.wiki)
+
+
 class HeaderModule(ui_modules.UIModule):
        @property
        def page(self):

diff --git a/src/web/wiki.py b/src/web/wiki.py
index 5a0d781356aae1339c0f3c89173a756b6b22ef77..b25e1507bc0bfe0d87ea28504f48a84ec537b53b 100644 (file)
--- a/src/web/wiki.py
+++ b/src/web/wiki.py
@@ -210,11 +210,6 @@ class FilesHandler(base.BaseHandler):
                self.render("wiki/files/index.html", path=path, files=files)
 
 
-class TreeHandler(base.BaseHandler):
-       def get(self):
-               self.render("wiki/tree.html", pages=self.backend.wiki)
-
-
 class WatchlistHandler(base.BaseHandler):
        @tornado.web.authenticated
        def get(self):