Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Further update branding and organisation details

Browse source
This commit is contained in:
Ben Sturmfels 2023-04-15 16:47:41 +10:00
parent de0100c93c
commit 830da54d29
Signed by: bsturmfels
GPG key ID: 023C05E2C9C068F0
6 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pinaxcon/proposals/models.py
View file

@ -68,7 +68,7 @@ class Proposal(ProposalBase):
recording_release = models.BooleanField( recording_release = models.BooleanField(
default=True, default=True,
help_text="I allow Linux Australia to release any recordings of " help_text="I allow Software Freedom Conservancy to release any recordings of "
"presentations covered by this proposal, on YouTube under the " "presentations covered by this proposal, on YouTube under the "
"standard YouTube licence, and on other platforms under the " "standard YouTube licence, and on other platforms under the "
"Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International " "Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International "

6
pinaxcon/settings.py
View file

@ -125,9 +125,9 @@ else:
ALLOWED_HOSTS = ['127.0.0.1', 'localhost', '*'] ALLOWED_HOSTS = ['127.0.0.1', 'localhost', '*']
TIME_ZONE = "Australia/Sydney" TIME_ZONE = "US/Pacific"
DATE_FORMAT = "j F Y" DATE_FORMAT = "F j Y"
LANGUAGE_CODE = "en-au" LANGUAGE_CODE = "en-us"
SITE_ID = int(os.environ.get("SITE_ID", 1)) SITE_ID = int(os.environ.get("SITE_ID", 1))
USE_I18N = True USE_I18N = True

13
pinaxcon/templates/registrasion/_invoice_details.html
View file

@ -2,8 +2,8 @@
{% load lca2018_tags %} {% load lca2018_tags %}
<h2>Tax Invoice/Statement</h2> <h2>Tax Invoice/Statement</h2>
<h3>Linux Australia</h3> <h3>Software Freedom Conservancy</h3>
<h4>ABN 56 987 117 479</h4> {# <h4>ABN 56 987 117 479</h4> #}
<p> <p>
Enquiries: please e-mail <a href="mailto:{{ settings.CONFERENCE_EMAIL }}">{{ settings.CONFERENCE_EMAIL }}</a> Enquiries: please e-mail <a href="mailto:{{ settings.CONFERENCE_EMAIL }}">{{ settings.CONFERENCE_EMAIL }}</a>
@ -80,11 +80,10 @@
<hr /> <hr />
<p>{% conference_name %} is a project of Linux Australia, Inc.</p> <p>{% conference_name %} is a project of Software Freedom Conservancy Inc.</p>
<p> <p>
GPO Box 4788 <br /> 137 MONTAGUE ST STE 380 <br />
Sydney NSW 2001 <br /> Brooklyn, NY 11201-3548 <br />
Australia <br /> {# ABN 56 987 117 479 <br /> #}
ABN 56 987 117 479 <br />
<p> <p>

2
pinaxcon/templates/registrasion/emails/invoice_created/subject.txt
View file

@ -1 +1 @@
{% load i18n %}Invoice {{ invoice.id }} from Linux Australia {% load i18n %}Invoice {{ invoice.id }} from Software Freedom Conservancy

2
pinaxcon/templates/registrasion/emails/invoice_updated/subject.txt
View file

@ -1 +1 @@
{% load i18n %}{{ invoice.get_status_display }} -- Invoice {{ invoice.id }} from Linux Australia {% load i18n %}{{ invoice.get_status_display }} -- Invoice {{ invoice.id }} from Software Freedom Conservancy

5
pinaxcon/templates/registrasion/stripe/credit_card_payment.html
View file

@ -70,9 +70,8 @@
<p>Pay your invoice with your Visa, Mastercard, or American Express credit or debit card. Card payments are processed by <a href="https://stripe.com">Stripe</a>.</p> <p>Pay your invoice with your Visa, Mastercard, or American Express credit or debit card. Card payments are processed by <a href="https://stripe.com">Stripe</a>.</p>
<p> <p>
No data on this form is retained by {% conference_name %}, rather it is No data or credit card details on this form are retained by {% conference_name %}, rather it is
sent to Stripe. In particular, credit card details are not sent sent directly to Stripe. You must allow JavaScript from <code>js.stripe.com</code> and <code>stripe.network</code> to complete payment.
to Linux Australia. You must allow JavaScript from <code>js.stripe.com</code> and <code>stripe.network</code> to complete payment.
</p> </p>
<p>You have <strong>${{ invoice.balance_due }}</strong> remaining to pay on this invoice.</p> <p>You have <strong>${{ invoice.balance_due }}</strong> remaining to pay on this invoice.</p>