]> git.ipfire.org Git - ipfire.org.git/blobdiff - Makefile.am
Merge remote-tracking branch 'rico/new-design' into new-design
[ipfire.org.git] / Makefile.am
index 12cf7e16e9b7b1851d390d863f1b0d2012b9f3b5..a95a0344660bb0fc6f6726e885ffe1b387dce45d 100644 (file)
@@ -51,11 +51,11 @@ backend_PYTHON = \
        src/backend/accounts.py \
        src/backend/base.py \
        src/backend/blog.py \
+       src/backend/campaigns.py \
        src/backend/countries.py \
        src/backend/database.py \
        src/backend/decorators.py \
        src/backend/fireinfo.py \
-       src/backend/geoip.py \
        src/backend/hwdata.py \
        src/backend/iuse.py \
        src/backend/memcached.py \
@@ -66,6 +66,7 @@ backend_PYTHON = \
        src/backend/nopaste.py \
        src/backend/ratelimit.py \
        src/backend/releases.py \
+       src/backend/resolver.py \
        src/backend/settings.py \
        src/backend/talk.py \
        src/backend/tweets.py \
@@ -84,16 +85,15 @@ 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 \
        src/web/location.py \
-       src/web/mirrors.py \
-       src/web/newsletter.py \
        src/web/nopaste.py \
        src/web/people.py \
        src/web/ui_modules.py \
+       src/web/users.py \
        src/web/wiki.py
 
 webdir = $(backenddir)/web
@@ -113,12 +113,25 @@ templates_auth_DATA = \
        src/templates/auth/activate.html \
        src/templates/auth/activated.html \
        src/templates/auth/login.html \
+       src/templates/auth/password-reset.html \
+       src/templates/auth/password-reset-initiation.html \
+       src/templates/auth/password-reset-successful.html \
        src/templates/auth/register.html \
+       src/templates/auth/register-spam.html \
        src/templates/auth/register-success.html
 
 templates_authdir = $(templatesdir)/auth
 
 templates_auth_messages_DATA = \
+       src/templates/auth/messages/donation-reminder.html \
+       src/templates/auth/messages/donation-reminder.txt \
+       src/templates/auth/messages/password-reset.html \
+       src/templates/auth/messages/password-reset.txt \
+       src/templates/auth/messages/profile-setup.html \
+       src/templates/auth/messages/profile-setup.txt \
+       src/templates/auth/messages/profile-setup-2.html \
+       src/templates/auth/messages/profile-setup-2.txt \
+       src/templates/auth/messages/register.html \
        src/templates/auth/messages/register.txt
 
 templates_auth_messagesdir = $(templates_authdir)/messages
@@ -139,11 +152,16 @@ templates_blog_DATA = \
 
 templates_blogdir = $(templatesdir)/blog
 
+templates_blog_messages_DATA = \
+       src/templates/blog/messages/announcement.html \
+       src/templates/blog/messages/announcement.txt
+
+templates_blog_messagesdir = $(templates_blogdir)/messages
+
 templates_blog_modules_DATA = \
        src/templates/blog/modules/history-navigation.html \
        src/templates/blog/modules/list.html \
-       src/templates/blog/modules/post.html \
-       src/templates/blog/modules/posts.html
+       src/templates/blog/modules/post.html
 
 templates_blog_modulesdir = $(templates_blogdir)/modules
 
@@ -154,12 +172,31 @@ templates_donate_DATA = \
 
 templates_donatedir = $(templatesdir)/donate
 
-templates_download_DATA = \
-       src/templates/download/release.html
-
-templates_downloaddir = $(templatesdir)/download
+templates_donate_messages_DATA = \
+       src/templates/donate/messages/ask-again.html \
+       src/templates/donate/messages/ask-again.txt \
+       src/templates/donate/messages/christmas-1.html \
+       src/templates/donate/messages/christmas-1.txt \
+       src/templates/donate/messages/christmas-2.html \
+       src/templates/donate/messages/christmas-2.txt \
+       src/templates/donate/messages/christmas-3.html \
+       src/templates/donate/messages/christmas-3.txt \
+       src/templates/donate/messages/christmas-4.html \
+       src/templates/donate/messages/christmas-4.txt \
+       src/templates/donate/messages/convert-to-monthly.html \
+       src/templates/donate/messages/convert-to-monthly.txt
+
+templates_donate_messagesdir = $(templates_donatedir)/messages
+
+templates_downloads_DATA = \
+       src/templates/downloads/mirrors.html \
+       src/templates/downloads/release.html \
+       src/templates/downloads/thank-you.html
+
+templates_downloadsdir = $(templatesdir)/downloads
 
 templates_fireinfo_DATA = \
+       src/templates/fireinfo/admin.html \
        src/templates/fireinfo/driver.html \
        src/templates/fireinfo/index.html \
        src/templates/fireinfo/i-use-1.png \
@@ -180,17 +217,22 @@ templates_fireinfo_modulesdir = $(templates_fireinfodir)/modules
 templates_location_DATA = \
        src/templates/location/base.html \
        src/templates/location/blacklists.html \
+       src/templates/location/download.html \
+       src/templates/location/how-to-use.html \
+       src/templates/location/index.html \
        src/templates/location/lookup.html
 
 templates_locationdir = $(templatesdir)/location
 
-templates_mirrors_DATA = \
-       src/templates/mirrors/index.html \
-       src/templates/mirrors/mirror.html
+templates_messages_DATA = \
+       src/templates/messages/base.html \
+       src/templates/messages/base-promo.html \
+       src/templates/messages/main.css
 
-templates_mirrorsdir = $(templatesdir)/mirrors
+templates_messagesdir = $(templatesdir)/messages
 
 templates_modules_DATA = \
+       src/templates/modules/christmas-banner.html \
        src/templates/modules/map.html \
        src/templates/modules/progress-bar.html
 
@@ -205,11 +247,6 @@ templates_netboot_DATA = \
 
 templates_netbootdir = $(templatesdir)/netboot
 
-templates_newsletter_DATA = \
-       src/templates/newsletter/subscribed.html
-
-templates_newsletterdir = $(templatesdir)/newsletter
-
 templates_nopaste_DATA = \
        src/templates/nopaste/create.html \
        src/templates/nopaste/view.html
@@ -222,59 +259,71 @@ templates_nopaste_modules_DATA = \
 templates_nopaste_modulesdir = $(templates_nopastedir)/modules
 
 templates_people_DATA = \
-       src/templates/people/base.html \
        src/templates/people/conferences.html \
        src/templates/people/call.html \
        src/templates/people/calls.html \
        src/templates/people/index.html \
        src/templates/people/passwd.html \
-       src/templates/people/search.html \
        src/templates/people/sip.html \
-       src/templates/people/user.html \
-       src/templates/people/user-edit.html \
-       src/templates/people/users.html
+       src/templates/people/subscribed.html \
+       src/templates/people/unsubscribe.html \
+       src/templates/people/unsubscribed.html \
+       src/templates/people/user-edit.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/accounts-list.html \
+       src/templates/people/modules/agent.html \
        src/templates/people/modules/cdr.html \
        src/templates/people/modules/channels.html \
        src/templates/people/modules/mos.html \
        src/templates/people/modules/password.html \
        src/templates/people/modules/password.js \
-       src/templates/people/modules/registrations.html \
-       src/templates/people/modules/sip-status.html
+       src/templates/people/modules/registrations.html
 
 templates_people_modulesdir = $(templates_peopledir)/modules
 
-templates_people_ssh_keys_DATA = \
-       src/templates/people/ssh-keys/delete.html \
-       src/templates/people/ssh-keys/error.html \
-       src/templates/people/ssh-keys/error-invalid-key.html \
-       src/templates/people/ssh-keys/index.html \
-       src/templates/people/ssh-keys/upload.html
-
-templates_people_ssh_keysdir = $(templates_peopledir)/ssh-keys
-
 templates_static_DATA = \
-       src/templates/static/blocked.html \
-       src/templates/static/chat.html \
-       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 \
+       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/page.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
@@ -299,16 +348,15 @@ templates_wiki_modulesdir = $(templates_wikidir)/modules
 
 # ------------------------------------------------------------------------------
 
-SCSS_FILES = \
-       src/scss/style.scss \
-       src/scss/_code-highlighting.scss \
-       src/scss/_fonts.scss \
-       src/scss/_icons.scss \
-       src/scss/_variables.scss
+SASS_FILES = \
+       src/sass/main.sass \
+       src/sass/_code-highlighting.sass \
+       src/sass/_fonts.sass \
+       src/sass/_icons.sass
 
 EXTRA_DIST += \
-       src/scss/listing.scss \
-       src/templates/messages/main.scss
+       src/sass/listing.sass \
+       src/templates/messages/main.sass
 
 CLEANFILES += \
        src/templates/messages/main.css
@@ -316,21 +364,21 @@ CLEANFILES += \
 static_DATA = \
        src/static/favicon.ico \
        src/static/robots.txt \
-       src/scss/fonts.css \
-       src/scss/listing.css \
-       src/scss/main.css
+       src/sass/listing.css \
+       src/sass/main.css
 
 CLEANFILES += \
-       src/scss/fonts.css \
-       src/scss/listing.css \
-       src/scss/main.css
+       src/sass/listing.css \
+       src/sass/main.css
 
 EXTRA_DIST += \
-       $(SCSS_FILES)
+       $(SASS_FILES)
 
 staticdir = $(datadir)/static
 
 static_css_DATA = \
+       src/static/css/Control.Geocoder.css \
+       src/static/css/leaflet.css \
        src/static/css/prettify.css
 
 static_cssdir = $(staticdir)/css
@@ -860,29 +908,31 @@ static_flags_4x3_DATA = \
 static_flags_4x3dir = $(static_flagsdir)/4x3
 
 static_fonts_DATA = \
-       src/fonts/ofl/mukta/Mukta-Bold.ttf \
-       src/fonts/ofl/mukta/Mukta-ExtraBold.ttf \
-       src/fonts/ofl/mukta/Mukta-ExtraLight.ttf \
-       src/fonts/ofl/mukta/Mukta-Light.ttf \
-       src/fonts/ofl/mukta/Mukta-Medium.ttf \
-       src/fonts/ofl/mukta/Mukta-Regular.ttf \
-       src/fonts/ofl/mukta/Mukta-SemiBold.ttf \
+       src/fonts/ofl/prompt/Prompt-BlackItalic.ttf \
+       src/fonts/ofl/prompt/Prompt-Black.ttf \
+       src/fonts/ofl/prompt/Prompt-BoldItalic.ttf \
+       src/fonts/ofl/prompt/Prompt-Bold.ttf \
+       src/fonts/ofl/prompt/Prompt-ExtraBoldItalic.ttf \
+       src/fonts/ofl/prompt/Prompt-ExtraBold.ttf \
+       src/fonts/ofl/prompt/Prompt-ExtraLightItalic.ttf \
+       src/fonts/ofl/prompt/Prompt-ExtraLight.ttf \
+       src/fonts/ofl/prompt/Prompt-Italic.ttf \
+       src/fonts/ofl/prompt/Prompt-LightItalic.ttf \
+       src/fonts/ofl/prompt/Prompt-Light.ttf \
+       src/fonts/ofl/prompt/Prompt-MediumItalic.ttf \
+       src/fonts/ofl/prompt/Prompt-Medium.ttf \
+       src/fonts/ofl/prompt/Prompt-Regular.ttf \
+       src/fonts/ofl/prompt/Prompt-SemiBoldItalic.ttf \
+       src/fonts/ofl/prompt/Prompt-SemiBold.ttf \
+       src/fonts/ofl/prompt/Prompt-ThinItalic.ttf \
+       src/fonts/ofl/prompt/Prompt-Thin.ttf \
        \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.eot \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.svg \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.ttf \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.woff \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.woff2 \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.eot \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.svg \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.ttf \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.woff \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.woff2 \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.eot \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.svg \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.ttf \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.woff \
-       src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.woff2 \
+       src/font-awesome/webfonts/fa-brands-400.ttf \
+       src/font-awesome/webfonts/fa-brands-400.woff2 \
+       src/font-awesome/webfonts/fa-regular-400.ttf \
+       src/font-awesome/webfonts/fa-regular-400.woff2 \
+       src/font-awesome/webfonts/fa-solid-900.ttf \
+       src/font-awesome/webfonts/fa-solid-900.woff2 \
        \
        src/payment-font/fonts/paymentfont-webfont.eot \
        src/payment-font/fonts/paymentfont-webfont.svg \
@@ -891,7 +941,7 @@ static_fonts_DATA = \
 
 static_fontsdir = $(staticdir)/fonts
 
-static_images_DATA = \
+static_img_DATA = \
        src/static/img/apple-touch-icon-192x192-precomposed.png \
        src/static/img/apple-touch-icon-180x180-precomposed.png \
        src/static/img/apple-touch-icon-152x152-precomposed.png \
@@ -900,12 +950,17 @@ static_images_DATA = \
        src/static/img/apple-touch-icon-76x76-precomposed.png \
        src/static/img/apple-touch-icon-72x72-precomposed.png \
        src/static/img/apple-touch-icon-60x60-precomposed.png \
+       src/static/img/bash-logo.svg \
+       src/static/img/bg-img.jpg \
+       src/static/img/debian-logo.svg \
        src/static/img/default-avatar.jpg \
        src/static/img/ipfire-tux.png \
        src/static/img/iuse-not-found.png \
-       src/static/img/lightningwirelabs-logo.svg
+       src/static/img/lightningwirelabs-logo.svg \
+       src/static/img/python-logo.svg \
+       src/static/img/tor.svg
 
-static_imagesdir = $(staticdir)/img
+static_imgdir = $(staticdir)/img
 
 static_images_tux_DATA = \
        src/static/img/tux/ipfire_tux_16x16.png \
@@ -918,16 +973,23 @@ static_images_tux_DATA = \
        src/static/img/tux/ipfire_tux_420x420.png \
        src/static/img/tux/ipfire_tux_512x512.png
 
-static_images_tuxdir = $(static_imagesdir)/tux
+static_images_tuxdir = $(static_imgdir)/tux
+
+static_images_DATA = \
+       src/static/images/marker-icon.png \
+       src/static/images/marker-icon-2x.png \
+       src/static/images/marker-shadow.png
+
+static_imagesdir = $(staticdir)/images
 
 static_js_DATA = \
-       src/bootstrap/dist/js/bootstrap.min.js \
-       src/bootstrap/dist/js/bootstrap.min.js.map \
-       \
-       src/static/js/jquery-3.3.1.min.js \
-       src/static/js/popper.min.js \
-       src/static/js/popper.min.js.map \
+       src/static/js/Control.Geocoder.min.js \
+       src/static/js/editor.js \
+       src/static/js/jquery-3.6.0.min.js \
+       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
@@ -989,15 +1051,11 @@ 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 $< > $@
 
-src/scss/main.css: $(SCSS_FILES) Makefile
+src/sass/main.css: $(SASS_FILES) Makefile
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
                $(SASSC) --style compressed $< > $@
 
@@ -1013,7 +1071,6 @@ src/static/img/apple-touch-icon-%-precomposed.png: src/static/img/ipfire-tux.png
                -extent $(patsubst src/static/img/apple-touch-icon-%-precomposed.png,%,$@)x$(patsubst src/static/img/apple-touch-icon-%-precomposed.png,%,$@) \
                $< $@
 
-# Docker
-.PHONY: docker
-docker: Dockerfile
-       docker build -t "ipfire/webapp:$(PACKAGE_VERSION)" .
+.PHONY: update
+update:
+       for i in src/systemd/ipfire.org-webapp-*.service; do systemctl restart $$(basename $${i}) && sleep 5; done