Merge remote-tracking branch 'rico/new-design' into new-design

[ipfire.org.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e08d4b5d916a4aff7229e5e2bb552eb890fd5cc3..a95a0344660bb0fc6f6726e885ffe1b387dce45d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,7 +85,7 @@ web_PYTHON = \
        src/web/blog.py \
        src/web/boot.py \
        src/web/donate.py \
-       src/web/download.py \
+       src/web/downloads.py \
        src/web/fireinfo.py \
        src/web/handlers.py \
        src/web/iuse.py \
@@ -103,7 +103,6 @@ webdir = $(backenddir)/web
 # TODO install the base for now and add all other templates later
 
 templates_DATA = \
-       src/templates/about.html \
        src/templates/base.html \
        src/templates/error.html \
        src/templates/index.html
@@ -189,12 +188,12 @@ templates_donate_messages_DATA = \
 
 templates_donate_messagesdir = $(templates_donatedir)/messages
 
-templates_download_DATA = \
-       src/templates/download/mirrors.html \
-       src/templates/download/release.html \
-       src/templates/download/thank-you.html
+templates_downloads_DATA = \
+       src/templates/downloads/mirrors.html \
+       src/templates/downloads/release.html \
+       src/templates/downloads/thank-you.html
 
-templates_downloaddir = $(templatesdir)/download
+templates_downloadsdir = $(templatesdir)/downloads
 
 templates_fireinfo_DATA = \
        src/templates/fireinfo/admin.html \
@@ -263,18 +262,13 @@ templates_people_DATA = \
        src/templates/people/conferences.html \
        src/templates/people/call.html \
        src/templates/people/calls.html \
-       src/templates/people/group.html \
-       src/templates/people/groups.html \
        src/templates/people/index.html \
        src/templates/people/passwd.html \
-       src/templates/people/search.html \
        src/templates/people/sip.html \
-       src/templates/people/stats.html \
        src/templates/people/subscribed.html \
        src/templates/people/unsubscribe.html \
        src/templates/people/unsubscribed.html \
-       src/templates/people/user-edit.html \
-       src/templates/people/users.html
+       src/templates/people/user-edit.html
 
 templates_peopledir = $(templatesdir)/people
 
@@ -284,8 +278,6 @@ templates_people_messages_DATA = \
 templates_people_messagesdir = $(templates_peopledir)/messages
 
 templates_people_modules_DATA = \
-       src/templates/people/modules/accounts-list.html \
-       src/templates/people/modules/accounts-new.html \
        src/templates/people/modules/agent.html \
        src/templates/people/modules/cdr.html \
        src/templates/people/modules/channels.html \
@@ -297,17 +289,29 @@ templates_people_modules_DATA = \
 templates_people_modulesdir = $(templates_peopledir)/modules
 
 templates_static_DATA = \
-       src/templates/static/features.html \
+       src/templates/static/about.html \
        src/templates/static/legal.html \
        src/templates/static/help.html
 
 templates_staticdir = $(templatesdir)/static
 
 templates_users_DATA = \
+       src/templates/users/index.html \
        src/templates/users/show.html
 
 templates_usersdir = $(templatesdir)/users
 
+templates_users_groups_DATA = \
+       src/templates/users/groups/index.html \
+       src/templates/users/groups/show.html
+
+templates_users_groupsdir = $(templates_usersdir)/groups
+
+templates_users_modules_DATA = \
+       src/templates/users/modules/list.html
+
+templates_users_modulesdir = $(templates_usersdir)/modules
+
 templates_wiki_DATA = \
        src/templates/wiki/404.html \
        src/templates/wiki/base.html \