wiki: Correctly implement comparing and sorting pages

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

diff --git a/src/backend/wiki.py b/src/backend/wiki.py
index c8a8ff8d44a8fffa045ed71bfcb62f8032f95fc0..722bf13df924b7aed1ce5226b14487e77073fb01 100644 (file)
--- a/src/backend/wiki.py
+++ b/src/backend/wiki.py
@@ -266,6 +266,8 @@ class Page(misc.Object):
                if isinstance(other, self.__class__):
                        return self.id == other.id
 
+               return NotImplemented
+
        def __lt__(self, other):
                if isinstance(other, self.__class__):
                        if self.page == other.page:
@@ -273,6 +275,8 @@ class Page(misc.Object):
 
                        return self.page < other.page
 
+               return NotImplemented
+
        @staticmethod
        def sanitise_page_name(page):
                if not page:

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

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

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