From 1d0d5e1d102dc7b7a4016bf8dc9690f7017d4558 2023-04-24 03:16:39 From: Ben Sturmfels Date: 2023-04-24 03:16:39 Subject: [PATCH] Move remaining Pelican pages into Django --- diff --git a/deploy/nginx.conf b/deploy/nginx.conf index 6d86d99193bb5820f320249f004c85371f17bf59..299a11bbf066f7d874571dba8f6409b26598b2ee 100644 --- a/deploy/nginx.conf +++ b/deploy/nginx.conf @@ -13,7 +13,6 @@ server { listen 443 ssl http2; server_name {{ env.domain }}; client_max_body_size 50M; - root /var/www/fossy; ssl_certificate /etc/letsencrypt/live/{{ env.domain }}/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/{{ env.domain }}/privkey.pem; @@ -27,7 +26,7 @@ server { # Advise browser to only load external content from these sites. add_header Content-Security-Policy "script-src 'self' 'unsafe-inline' 'unsafe-eval' https://code.jquery.com/jquery-3.5.1.min.js https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js https://js.stripe.com/v3/ https://r.stripe.com/0"; - location @app { + location / { # Django web application including static files (via WhiteNoise). uwsgi_pass symposion_django_wsgi; include uwsgi_params; @@ -39,10 +38,6 @@ server { gzip off; } - location / { - try_files $uri $uri/index.html $uri.html @app; - } - location /media/ { # User-uploaded files and generated reports. alias {{ project_dir }}/media/; diff --git a/pinaxcon/templates/homepage.html b/pinaxcon/templates/homepage.html index f7764a148feeb9182d43f55c331141fe68c929d8..2e7222e6ca097523332cf926f96c7745a4a29ba8 100644 --- a/pinaxcon/templates/homepage.html +++ b/pinaxcon/templates/homepage.html @@ -1,11 +1,43 @@ {% extends "site_base.html" %} - -{% load i18n %} +{% load i18n static %} {% block head_title %}{% trans "Welcome" %}{% endblock %} {% block body_class %}home{% endblock %} -{% block body %} - {{ page.body }} -{% endblock %} +{% block content %} +
+
+
+

FOSSY 2023

+

July 13-16th 2023 — Portland, OR

+

The first Free and Open Source Software Yearly conference

+
+
Software Freedom Conservancy
+
+
+ +
+
+ +
+

FOSS is back in Portland, OR at the Oregon Convention Center!

+
+
+

Software Freedom Conservancy is so proud to announce that we are hosting a community oriented conference this coming summer. FOSSY (Free and Open Source Yearly) is focused on the creation and impact of free and open source software, uplifting contributors of all experience.

+ +

We are mindful of having a safe environment for all. In this new time of conferences, we will be focused on COVID safety and making sure all attendees feel safe participating as much as they feel comfortable (we will have a detailed policy published in the coming weeks).

+ +

As this is the first year we are running a conference of this scale, we plan to have 15 tracks for talks over 4 days. With tracks for community building, development and legal and licensing issues, our conference will provide ample learning and networking opportunities for contributors of all levels of experience. We also plan to involve significant community participation in the content of our tracks.

+ +

As we look to the future of conferences, we are excited to focus on using free software to run a conference and will seek to help reduce the amount of proprietary software that is treated as default.

+
+
+
+ Aerial photograph of the Oregon Convention Center +
Oregon Convention Center (CC-BY 2.0)
+
+
+
+
+ {% endblock content %} diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 4eb7c2ef1956ccae08d3132b3bd887796048f6e5..2f1cb29f3b351a055d6b96304c3237a0e24a0624 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -12,6 +12,8 @@ import symposion.views urlpatterns = [ + path('', TemplateView.as_view(template_name="homepage.html")), + path('saml2/', include('djangosaml2.urls')), path('admin/', admin.site.urls), diff --git a/static/src/img/conservancy_logo_tall_mono.svg b/static/src/img/conservancy_logo_tall_mono.svg new file mode 100644 index 0000000000000000000000000000000000000000..bedc351e9d9c7ecb0e4d1ffdabcf2151397631e2 --- /dev/null +++ b/static/src/img/conservancy_logo_tall_mono.svg @@ -0,0 +1,136 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +