From de0100c93c93d7a003cf90d1ceda6faa1a94cd4d Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Sat, 15 Apr 2023 15:39:53 +1000 Subject: [PATCH] Apply FOSSY/Conservancy branding --- fixtures/conference.json | 8 ++--- fixtures/sites.json | 4 +-- fixtures/sitetree.json | 2 +- pinaxcon/registrasion/models.py | 2 +- pinaxcon/settings.py | 8 ++--- pinaxcon/templates/site_base.html | 25 +++++--------- static/src/img/conservancy_logo.svg | 53 +++++++++++++++++++++++++++++ 7 files changed, 74 insertions(+), 28 deletions(-) create mode 100644 static/src/img/conservancy_logo.svg diff --git a/fixtures/conference.json b/fixtures/conference.json index be80a147..253dee12 100644 --- a/fixtures/conference.json +++ b/fixtures/conference.json @@ -3,10 +3,10 @@ "model": "symposion_conference.conference", "pk": 1, "fields": { - "title": "Everything Open 2023", - "start_date": "2023-03-14", - "end_date": "2023-03-16", - "timezone": "Australia/Melbourne" + "title": "FOSSY 2023", + "start_date": "2023-07-13", + "end_date": "2023-07-16", + "timezone": "US/Pacific" } } ] diff --git a/fixtures/sites.json b/fixtures/sites.json index 3b6f3e08..d4f86fb6 100644 --- a/fixtures/sites.json +++ b/fixtures/sites.json @@ -3,8 +3,8 @@ "model": "sites.site", "pk": 1, "fields": { - "domain": "2023.everythingopen.au", - "name": "Everything Open 2023" + "domain": "2023.fossy.us", + "name": "FOSSY 2023" } } ] diff --git a/fixtures/sitetree.json b/fixtures/sitetree.json index 48a9cf54..da3239dc 100644 --- a/fixtures/sitetree.json +++ b/fixtures/sitetree.json @@ -131,7 +131,7 @@ "model": "sitetree.treeitem", "pk": 6, "fields": { - "title": "About Everything Open", + "title": "About FOSSY", "hint": "", "url": "/about/", "urlaspattern": false, diff --git a/pinaxcon/registrasion/models.py b/pinaxcon/registrasion/models.py index 80d7e30f..e10c59d5 100644 --- a/pinaxcon/registrasion/models.py +++ b/pinaxcon/registrasion/models.py @@ -171,7 +171,7 @@ class AttendeeProfile(rego.AttendeeProfileBase): children = models.CharField( verbose_name="Child Ages and Information", max_length=256, - help_text="Everything Open is a family friendly conference and provides " + help_text="This is a family friendly conference and provides " "free child-care for pre-school children from 6 months up to 5 years. We " "hope to also provide a programme for older children and will let you " "know closer to the conference. If you're wanting to bring your children, " diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 2e806ccc..4620908b 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -515,12 +515,12 @@ class PenguinDinnerCat(Category): return t -CONFERENCE_NAME = os.environ.get('CONFERENCE_NAME', 'Everything Open') -CONFERENCE_NAME_SHORT = os.environ.get('CONFERENCE_NAME_SHORT', 'EO') +CONFERENCE_NAME = os.environ.get('CONFERENCE_NAME', 'FOSSY') +CONFERENCE_NAME_SHORT = os.environ.get('CONFERENCE_NAME_SHORT', 'FOSSY') CONFERENCE_EMAIL = os.environ.get('CONFERENCE_EMAIL', DEFAULT_FROM_EMAIL) CONF_TZINFO = pytz.timezone(TIME_ZONE) -CONF_START = CONF_TZINFO.localize(datetime(2023, 3, 14)) -CONF_END = CONF_TZINFO.localize(datetime(2023, 3, 16)) +CONF_START = CONF_TZINFO.localize(datetime(2023, 7, 13)) +CONF_END = CONF_TZINFO.localize(datetime(2023, 7, 16)) CONF_MINICONF_END = CONF_TZINFO.localize(datetime(2023, 3, 14, 23, 59)) EARLY_BIRD_DEADLINE = CONF_TZINFO.localize(datetime(2023, 1, 28)) PENGUIN_DINNER_TICKET_DATE = date(2023, 3, 15) diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html index cc8b364d..96d5c7f7 100644 --- a/pinaxcon/templates/site_base.html +++ b/pinaxcon/templates/site_base.html @@ -21,7 +21,7 @@ - + @@ -122,28 +122,21 @@
- Everything Open 2023
- March 14-16 2023
- Naarm (Melbourne), Australia
- Timezone: AEDT - UTC+11
-      - + FOSSY 2023
+ July 13-16 2023
+ Portland, OR
+ Timezone: PDT - UTC-7
       + href="https://twitter.com/conservancy" alt="Twitter">  
- Linux Australia logo + Software Freedom Conservancy logo
Back to top
- © 2022 Everything Open and Linux Australia
- Linux is a registered trademark of Linus Torvalds
- Colophon + © 2023 Software Freedom Conservancy
diff --git a/static/src/img/conservancy_logo.svg b/static/src/img/conservancy_logo.svg new file mode 100644 index 00000000..5b85e5b3 --- /dev/null +++ b/static/src/img/conservancy_logo.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file