people: Drop remaining handlers and add legacy redirection

[ipfire.org.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index de50a9a7d9bddaec11b8664a73b50ae6d7d10a7e..68d1928bde315330e58379cb12ed09a887c358f9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -97,8 +97,7 @@ web_PYTHON = \
        src/web/people.py \
        src/web/ui_modules.py \
        src/web/users.py \
-       src/web/voip.py \
-       src/web/wiki.py
+       src/web/voip.py
 
 webdir = $(backenddir)/web
 
@@ -139,18 +138,21 @@ templates_auth_messages_DATA = \
 
 templates_auth_messagesdir = $(templates_authdir)/messages
 
+templates_auth_modules_DATA = \
+       src/templates/auth/modules/password.html \
+       src/templates/auth/modules/password.js
+
+templates_auth_modulesdir = $(templates_authdir)/modules
+
 templates_blog_DATA = \
-       src/templates/blog/author.html \
-       src/templates/blog/base.html \
-       src/templates/blog/compose.html \
        src/templates/blog/delete.html \
        src/templates/blog/drafts.html \
        src/templates/blog/feed.xml \
        src/templates/blog/index.html \
        src/templates/blog/post.html \
        src/templates/blog/publish.html \
-       src/templates/blog/search-results.html \
        src/templates/blog/tag.html \
+       src/templates/blog/write.html \
        src/templates/blog/year.html
 
 templates_blogdir = $(templatesdir)/blog
@@ -192,13 +194,31 @@ templates_donate_messages_DATA = \
 templates_donate_messagesdir = $(templates_donatedir)/messages
 
 templates_docs_DATA = \
+       src/templates/docs/404.html \
        src/templates/docs/base.html \
-       src/templates/docs/page.html
+       src/templates/docs/confirm-delete.html \
+       src/templates/docs/confirm-restore.html \
+       src/templates/docs/diff.html \
+       src/templates/docs/edit.html \
+       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/tree.html \
+       src/templates/docs/watchlist.html
 
 templates_docsdir = $(templatesdir)/docs
 
+templates_docs_files_DATA = \
+       src/templates/docs/files/detail.html \
+       src/templates/docs/files/index.html
+
+templates_docs_filesdir = $(templates_docsdir)/files
+
 templates_docs_modules_DATA = \
-       src/templates/docs/modules/header.html
+       src/templates/docs/modules/diff.html \
+       src/templates/docs/modules/header.html \
+       src/templates/docs/modules/list.html
 
 templates_docs_modulesdir = $(templates_docsdir)/modules
 
@@ -272,26 +292,11 @@ templates_nopaste_modules_DATA = \
 
 templates_nopaste_modulesdir = $(templates_nopastedir)/modules
 
-templates_people_DATA = \
-       src/templates/people/conferences.html \
-       src/templates/people/index.html \
-       src/templates/people/subscribed.html \
-       src/templates/people/unsubscribe.html \
-       src/templates/people/unsubscribed.html
-
-templates_peopledir = $(templatesdir)/people
-
 templates_people_messages_DATA = \
        src/templates/people/messages/new-account.txt
 
 templates_people_messagesdir = $(templates_peopledir)/messages
 
-templates_people_modules_DATA = \
-       src/templates/people/modules/password.html \
-       src/templates/people/modules/password.js
-
-templates_people_modulesdir = $(templates_peopledir)/modules
-
 templates_static_DATA = \
        src/templates/static/about.html \
        src/templates/static/legal.html \
@@ -305,7 +310,11 @@ templates_users_DATA = \
        src/templates/users/edit.html \
        src/templates/users/index.html \
        src/templates/users/passwd.html \
-       src/templates/users/show.html
+       src/templates/users/show.html \
+       src/templates/users/subscribe.html \
+       src/templates/users/subscribed.html \
+       src/templates/users/unsubscribe.html \
+       src/templates/users/unsubscribed.html
 
 templates_usersdir = $(templatesdir)/users
 
@@ -326,43 +335,20 @@ templates_voip_DATA = \
 templates_voipdir = $(templatesdir)/voip
 
 templates_voip_modules_DATA = \
+       src/templates/voip/modules/conferences.html \
        src/templates/voip/modules/outbound-registrations.html \
        src/templates/voip/modules/queues.html \
        src/templates/voip/modules/registrations.html
 
 templates_voip_modulesdir = $(templates_voipdir)/modules
 
-templates_wiki_DATA = \
-       src/templates/wiki/404.html \
-       src/templates/wiki/confirm-delete.html \
-       src/templates/wiki/confirm-restore.html \
-       src/templates/wiki/diff.html \
-       src/templates/wiki/edit.html \
-       src/templates/wiki/recent-changes.html \
-       src/templates/wiki/revisions.html \
-       src/templates/wiki/search-results.html \
-       src/templates/wiki/tree.html \
-       src/templates/wiki/watchlist.html
-
 templates_wikidir = $(templatesdir)/wiki
 
-templates_wiki_files_DATA = \
-       src/templates/wiki/files/detail.html \
-       src/templates/wiki/files/index.html
-
-templates_wiki_filesdir = $(templates_wikidir)/files
-
 templates_wiki_messages_DATA = \
        src/templates/wiki/messages/page-changed.txt
 
 templates_wiki_messagesdir = $(templates_wikidir)/messages
 
-templates_wiki_modules_DATA = \
-       src/templates/wiki/modules/diff.html \
-       src/templates/wiki/modules/list.html
-
-templates_wiki_modulesdir = $(templates_wikidir)/modules
-
 # ------------------------------------------------------------------------------
 
 SASS_FILES = \