diff --git a/scha/urls.py b/scha/urls.py index 611715b..cbc4b40 100644 --- a/scha/urls.py +++ b/scha/urls.py @@ -23,7 +23,7 @@ from django.conf import settings from schasite.views import stripe_cancelled, stripe_success, stripe_webhook urlpatterns = [ - path("schasite/", include("schasite.urls")), + path("", include("schasite.urls")), path("success/", stripe_success), path("cancelled/", stripe_cancelled), path("webhook/", stripe_webhook), diff --git a/schasite/templates/schasite/base2.html b/schasite/templates/schasite/base2.html index 7dbe5c8..da72ca4 100644 --- a/schasite/templates/schasite/base2.html +++ b/schasite/templates/schasite/base2.html @@ -12,6 +12,8 @@ + + @@ -76,7 +78,7 @@
- diff --git a/schasite/templates/schasite/dues_cancelled.html b/schasite/templates/schasite/dues_cancelled.html index 95b32ab..5697a30 100644 --- a/schasite/templates/schasite/dues_cancelled.html +++ b/schasite/templates/schasite/dues_cancelled.html @@ -1,4 +1,4 @@ -{% extends 'schasite/base.html' %} +{% extends 'schasite/base2.html' %} {% load static %} {% block pagetitle %} diff --git a/schasite/templates/schasite/dues_success.html b/schasite/templates/schasite/dues_success.html index c6e74b6..a8891d9 100644 --- a/schasite/templates/schasite/dues_success.html +++ b/schasite/templates/schasite/dues_success.html @@ -1,4 +1,4 @@ -{% extends 'schasite/base.html' %} +{% extends 'schasite/base2.html' %} {% load static %} {% block pagetitle %} diff --git a/schasite/templates/schasite/membership_form2.html b/schasite/templates/schasite/membership_form2.html index 1ebc5ed..2f88864 100644 --- a/schasite/templates/schasite/membership_form2.html +++ b/schasite/templates/schasite/membership_form2.html @@ -339,19 +339,6 @@
- -
-
- - -
- You must agree before submitting. -
-
-
-
{% if captchaForm %} {{ captchaForm }} @@ -367,35 +354,6 @@
- - - {% endblock %} diff --git a/schasite/urls.py b/schasite/urls.py index 62df619..a8f84d9 100644 --- a/schasite/urls.py +++ b/schasite/urls.py @@ -3,23 +3,23 @@ from django.urls import path from . import views urlpatterns = [ - path("", views.index, name="index"), - path("useful_links", views.useful_links, name="useful_links"), - path("about_us", views.about_us, name="about_us"), - path("calendar", views.calendar, name="calendar"), - path("newsletters", views.newsletters, name="newsletters"), - path("dues", views.dues, name="dues"), - path("membership_form", views.membership_form, name="membership_form"), - path("scha_board", views.scha_board, name="scha_board"), + # path("", views.index, name="index"), + # path("useful_links", views.useful_links, name="useful_links"), + # path("about_us", views.about_us, name="about_us"), + # path("calendar", views.calendar, name="calendar"), + # path("newsletters", views.newsletters, name="newsletters"), + # path("dues", views.dues, name="dues"), + # path("membership_form", views.membership_form, name="membership_form"), + # path("scha_board", views.scha_board, name="scha_board"), # updated UI urls - path("index2", views.index2, name="index2"), - path("about_us2", views.about_us2, name="about_us2"), - path("calendar2", views.calendar2, name="calendar2"), - path("newsletters2", views.newsletters2, name="newsletters2"), - path("dues2", views.dues2, name="dues2"), - path("membership_form2", views.membership_form2, name="membership_form2"), - path("scha_board2", views.scha_board2, name="scha_board2"), - path("useful_links2", views.useful_links2, name="useful_links2"), + path("", views.index2, name="index2"), + path("about_us", views.about_us2, name="about_us2"), + path("calendar", views.calendar2, name="calendar2"), + path("newsletters", views.newsletters2, name="newsletters2"), + path("dues", views.dues2, name="dues2"), + path("membership_form", views.membership_form2, name="membership_form2"), + path("scha_board", views.scha_board2, name="scha_board2"), + path("useful_links", views.useful_links2, name="useful_links2"), # stripe specific urls below path("config/", views.stripe_config), path("create-checkout-session/", views.create_checkout_session),