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

[ipfire.org.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4a9789fc26ebaf296e71c96a43b325ef8636a234..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 \
@@ -93,6 +93,7 @@ web_PYTHON = \
        src/web/nopaste.py \
        src/web/people.py \
        src/web/ui_modules.py \
+       src/web/users.py \
        src/web/wiki.py
 
 webdir = $(backenddir)/web
@@ -102,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
@@ -188,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 \
@@ -262,19 +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.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,12 +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/support.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 \
@@ -341,14 +350,13 @@ templates_wiki_modulesdir = $(templates_wikidir)/modules
 
 SASS_FILES = \
        src/sass/main.sass \
-       src/sass/_code-highlighting.scss \
+       src/sass/_code-highlighting.sass \
        src/sass/_fonts.sass \
-       src/sass/_icons.scss \
-       src/sass/_variables.scss
+       src/sass/_icons.sass
 
 EXTRA_DIST += \
-       src/sass/listing.scss \
-       src/templates/messages/main.scss
+       src/sass/listing.sass \
+       src/templates/messages/main.sass
 
 CLEANFILES += \
        src/templates/messages/main.css
@@ -919,20 +927,11 @@ static_fonts_DATA = \
        src/fonts/ofl/prompt/Prompt-ThinItalic.ttf \
        src/fonts/ofl/prompt/Prompt-Thin.ttf \
        \
-       src/font-awesome/webfonts/fa-brands-400.eot \
-       src/font-awesome/webfonts/fa-brands-400.svg \
        src/font-awesome/webfonts/fa-brands-400.ttf \
-       src/font-awesome/webfonts/fa-brands-400.woff \
        src/font-awesome/webfonts/fa-brands-400.woff2 \
-       src/font-awesome/webfonts/fa-regular-400.eot \
-       src/font-awesome/webfonts/fa-regular-400.svg \
        src/font-awesome/webfonts/fa-regular-400.ttf \
-       src/font-awesome/webfonts/fa-regular-400.woff \
        src/font-awesome/webfonts/fa-regular-400.woff2 \
-       src/font-awesome/webfonts/fa-solid-900.eot \
-       src/font-awesome/webfonts/fa-solid-900.svg \
        src/font-awesome/webfonts/fa-solid-900.ttf \
-       src/font-awesome/webfonts/fa-solid-900.woff \
        src/font-awesome/webfonts/fa-solid-900.woff2 \
        \
        src/payment-font/fonts/paymentfont-webfont.eot \
@@ -990,6 +989,7 @@ static_js_DATA = \
        src/static/js/leaflet.min.js \
        src/static/js/maps.js \
        src/static/js/prettify.js \
+       src/static/js/site.js \
        \
        src/static/js/zxcvbn/dist/zxcvbn.js \
        src/static/js/zxcvbn/dist/zxcvbn.js.map
@@ -1051,11 +1051,7 @@ SED_PROCESS = \
 %: %.in Makefile
        $(SED_PROCESS)
 
-%.css: _%.scss Makefile
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-               $(SASSC) --style compressed $< > $@
-
-%.css: %.scss Makefile
+%.css: %.sass Makefile
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
                $(SASSC) --style compressed $< > $@