docs: Move recent changes

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

diff --git a/Makefile.am b/Makefile.am
index af5143f76b4451427e5bc32d76fe99755c0687c6..55e17005ea668fac6b090d77fc34dfb680fe6cc5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -203,6 +203,7 @@ templates_docs_DATA = \
        src/templates/docs/confirm-restore.html \
        src/templates/docs/diff.html \
        src/templates/docs/page.html \
+       src/templates/docs/recent-changes.html \
        src/templates/docs/revisions.html \
        src/templates/docs/search-results.html
 
@@ -346,7 +347,6 @@ templates_voip_modulesdir = $(templates_voipdir)/modules
 templates_wiki_DATA = \
        src/templates/wiki/confirm-delete.html \
        src/templates/wiki/edit.html \
-       src/templates/wiki/recent-changes.html \
        src/templates/wiki/tree.html \
        src/templates/wiki/watchlist.html
 

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

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

diff --git a/src/web/docs.py b/src/web/docs.py
index 02f854ea2ee291f1bea12963a16548297104f649..9c00d40bfbced83cb9ec450e586a674f994b5061 100644 (file)
--- a/src/web/docs.py
+++ b/src/web/docs.py
@@ -150,6 +150,13 @@ class SearchHandler(base.BaseHandler):
                self.render("docs/search-results.html", q=q, pages=pages)
 
 
+class RecentChangesHandler(base.BaseHandler):
+       def get(self):
+               recent_changes = self.backend.wiki.get_recent_changes(self.current_user, limit=50)
+
+               self.render("docs/recent-changes.html", recent_changes=recent_changes)
+
+
 class HeaderModule(ui_modules.UIModule):
        @property
        def page(self):

diff --git a/src/web/wiki.py b/src/web/wiki.py
index ff82df2ae0df15a9200918f72a300ffa93efffc8..5a0d781356aae1339c0f3c89173a756b6b22ef77 100644 (file)
--- a/src/web/wiki.py
+++ b/src/web/wiki.py
@@ -210,13 +210,6 @@ class FilesHandler(base.BaseHandler):
                self.render("wiki/files/index.html", path=path, files=files)
 
 
-class RecentChangesHandler(base.BaseHandler):
-       def get(self):
-               recent_changes = self.backend.wiki.get_recent_changes(self.current_user, limit=50)
-
-               self.render("wiki/recent-changes.html", recent_changes=recent_changes)
-
-
 class TreeHandler(base.BaseHandler):
        def get(self):
                self.render("wiki/tree.html", pages=self.backend.wiki)