X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile.am;h=1424e8247b1e78cd93cc5eb09416db77c307c289;hb=baa693a315619ac723273106c9642fe9f1f86624;hp=9a2ac226f2e3db6ef4ffd7097a9e31739258a3e9;hpb=616bd6a5cb34e140d4437c5f0e30a477906856fe;p=ipfire.org.git

diff --git a/Makefile.am b/Makefile.am
index 9a2ac226..1424e824 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,20 +49,18 @@ CLEANFILES += \
 backend_PYTHON = \
 	src/backend/__init__.py \
 	src/backend/accounts.py \
-	src/backend/ads.py \
 	src/backend/base.py \
+	src/backend/blog.py \
 	src/backend/countries.py \
 	src/backend/database.py \
+	src/backend/decorators.py \
 	src/backend/fireinfo.py \
 	src/backend/geoip.py \
 	src/backend/iuse.py \
-	src/backend/memcached.py \
 	src/backend/mirrors.py \
 	src/backend/misc.py \
 	src/backend/netboot.py \
-	src/backend/news.py \
 	src/backend/nopaste.py \
-	src/backend/planet.py \
 	src/backend/releases.py \
 	src/backend/settings.py \
 	src/backend/talk.py \
@@ -76,20 +74,19 @@ backenddir = $(pythondir)/ipfire
 
 web_PYTHON = \
 	src/web/__init__.py \
+	src/web/auth.py \
+	src/web/blog.py \
+	src/web/download.py \
 	src/web/handlers.py \
-	src/web/handlers_accounts.py \
-	src/web/handlers_admin.py \
 	src/web/handlers_base.py \
 	src/web/handlers_boot.py \
-	src/web/handlers_download.py \
 	src/web/handlers_fireinfo.py \
 	src/web/handlers_iuse.py \
 	src/web/handlers_mirrors.py \
-	src/web/handlers_news.py \
 	src/web/handlers_nopaste.py \
-	src/web/handlers_planet.py \
-	src/web/handlers_rss.py \
-	src/web/handlers_talk.py \
+	src/web/location.py \
+	src/web/newsletter.py \
+	src/web/people.py \
 	src/web/ui_modules.py
 
 webdir = $(backenddir)/web
@@ -100,28 +97,101 @@ webdir = $(backenddir)/web
 
 templates_DATA = \
 	src/templates/base.html \
-	src/templates/base-1.html \
+	src/templates/donate.html \
 	src/templates/error.html \
-	src/templates/error-404.html \
-	src/templates/error-500.html \
 	src/templates/index.html
 
 templatesdir = $(datadir)/templates
 
+templates_auth_DATA = \
+	src/templates/auth/login.html
+
+templates_authdir = $(templatesdir)/auth
+
+templates_blog_DATA = \
+	src/templates/blog/author.html \
+	src/templates/blog/base.html \
+	src/templates/blog/compose.html \
+	src/templates/blog/drafts.html \
+	src/templates/blog/feed.xml \
+	src/templates/blog/index.html \
+	src/templates/blog/post.html \
+	src/templates/blog/search-results.html \
+	src/templates/blog/tag.html \
+	src/templates/blog/year.html
+
+templates_blogdir = $(templatesdir)/blog
+
+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
+
+templates_blog_modulesdir = $(templates_blogdir)/modules
+
+templates_download_DATA = \
+	src/templates/download/base.html \
+	src/templates/download/release.html
+
+templates_downloaddir = $(templatesdir)/download
+
+templates_location_DATA = \
+	src/templates/location/lookup.html
+
+templates_locationdir = $(templatesdir)/location
+
 templates_modules_DATA = \
-	src/templates/modules/menu.html
+	src/templates/modules/map.html
 
 templates_modulesdir = $(templatesdir)/modules
 
+templates_newsletter_DATA = \
+	src/templates/newsletter/subscribed.html
+
+templates_newsletterdir = $(templatesdir)/newsletter
+
+templates_people_DATA = \
+	src/templates/people/base.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-base.html \
+	src/templates/people/user-edit.html \
+	src/templates/people/users.html
+
+templates_peopledir = $(templatesdir)/people
+
+templates_people_modules_DATA = \
+	src/templates/people/modules/accounts-list.html \
+	src/templates/people/modules/cdr.html \
+	src/templates/people/modules/channels.html \
+	src/templates/people/modules/mos.html \
+	src/templates/people/modules/registrations.html \
+	src/templates/people/modules/sip-status.html
+
+templates_people_modulesdir = $(templates_peopledir)/modules
+
+templates_people_ssh_keys_DATA = \
+	src/templates/people/ssh-keys/base.html \
+	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/artwork.html \
+	src/templates/static/blocked.html \
 	src/templates/static/chat.html \
 	src/templates/static/features.html \
-	src/templates/static/get-involved.html \
-	src/templates/static/get-started.html \
-	src/templates/static/get-support.html \
-	src/templates/static/hardware.html \
-	src/templates/static/legal.html
+	src/templates/static/legal.html \
+	src/templates/static/support.html
 
 templates_staticdir = $(templatesdir)/static
 
@@ -129,7 +199,6 @@ templates_staticdir = $(templatesdir)/static
 
 SCSS_FILES = \
 	src/scss/style.scss \
-	src/scss/_donation.scss \
 	src/scss/_fonts.scss \
 	src/scss/_icons.scss \
 	src/scss/_variables.scss
@@ -141,6 +210,8 @@ CLEANFILES += \
 	src/templates/messages/main.css
 
 static_DATA = \
+	src/static/favicon.ico \
+	src/static/robots.txt \
 	src/scss/main.css
 
 CLEANFILES += \
@@ -152,15 +223,49 @@ EXTRA_DIST += \
 staticdir = $(datadir)/static
 
 static_fonts_DATA = \
-	src/fonts/ofl/karla/Karla-Bold.ttf \
-	src/fonts/ofl/karla/Karla-Regular.ttf
+	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/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
 
 static_fontsdir = $(staticdir)/fonts
 
 static_images_DATA = \
+	src/static/img/amex.png \
+	src/static/img/amex@2x.png \
+	src/static/img/amex@3x.png \
 	src/static/img/appliance-pro.png \
-	src/static/img/header-background.jpg \
-	src/static/img/ipfire-tux.png
+	src/static/img/default-avatar.jpg \
+	src/static/img/ipfire-tux.png \
+	src/static/img/lightningwirelabs-logo.svg \
+	src/static/img/mastercard.png \
+	src/static/img/mastercard@2x.png \
+	src/static/img/mastercard@3x.png \
+	src/static/img/paypal.png \
+	src/static/img/paypal@2x.png \
+	src/static/img/paypal@3x.png \
+	src/static/img/visa.png \
+	src/static/img/visa@2x.png \
+	src/static/img/visa@3x.png
 
 static_imagesdir = $(staticdir)/img
 
@@ -175,13 +280,25 @@ static_images_screenshots_DATA = \
 
 static_images_screenshotsdir = $(static_imagesdir)/screenshots
 
+static_images_tux_DATA = \
+	src/static/img/tux/ipfire_tux_16x16.png \
+	src/static/img/tux/ipfire_tux_20x20.png \
+	src/static/img/tux/ipfire_tux_32x32.png \
+	src/static/img/tux/ipfire_tux_48x48.png \
+	src/static/img/tux/ipfire_tux_64x64.png \
+	src/static/img/tux/ipfire_tux_128x128.png \
+	src/static/img/tux/ipfire_tux_256x256.png \
+	src/static/img/tux/ipfire_tux_420x420.png \
+	src/static/img/tux/ipfire_tux_512x512.png
+
+static_images_tuxdir = $(static_imagesdir)/tux
+
 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/site.js
+	src/static/js/popper.min.js
 
 static_jsdir = $(staticdir)/js
 
@@ -217,6 +334,7 @@ EXTRA_DIST += \
 substitutions = \
 	'|PACKAGE_NAME=$(PACKAGE_NAME)|' \
 	'|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
+	'|PYTHON=$(PYTHON)|' \
 	'|configsdir=$(configsdir)|' \
 	'|bindir=$(bindir)|' \
 	'|datadir=$(datadir)|'