Commit graph

43 commits

Author SHA1 Message Date
Tobias Schulmann
1f04ec0cea Add django-crispy-forms for BS4 support
TODO: Remove django-bootstrap-form dependency, left to avoid breaking
other parts.
2018-06-24 01:07:10 +00:00
James Polley
837ecc33b5 Update requirements to latest bleach and pytz 2018-06-06 12:22:00 +10:00
James Polley
ddae8d91f6 Improved handling of static/build and css generation
When the container is mounted, the local contents of . obscure
/app/symposion_app in the image.

Generally speaking, this is handy for development, as it means that
local changes are detected and used immediately without needing to
restart the container.

However, it breaks in the specific case of the sass->css
generation. Prior to this change, the css is generated only after the
first time a page is hit. The generated file is placed in
static/build; however, due to the obscuration, this generated file
isn't visible to the running process.

The next time the container is built, the pre-existing static/build
directory is copied into the container as it's being built; then,
later, that version is what gets served.

This change adds the needed libraries to pre-generate the css as part
of the image build, and runs compilescss to do this, prior to the
collectstatic step.

It also adds a second collectstatic into the make_dev_container
script, so that the visible static/build directory should ahve the
same contents as the obscured static/build directory. It also expands
the .dockerignore file to make sure these files aren't copied into the
image in future.

I'm not sure if this is the right thing to do, as changes to this
directory will be ignored, which could be confusing. Perhaps never
being able to see these generated files is better?
2018-06-06 12:20:06 +10:00
Tobias Schulmann
3daf623360 Add sass processor 2018-06-04 20:52:51 +12:00
James Polley
54f53cd2c6 Add a waffle, for flipping and switching 2018-01-11 03:04:32 +11:00
James Polley
b6af9e27d4 Revert django-user-account, inadvertently added in 9a25ca1 2018-01-11 02:42:11 +11:00
Christopher Neugebauer
9a25ca1754 Chrisjrn/session chair (#94)
* Adds session_detail page

* Adds session chairing information to the schedule grid

* Adds session_list.html

* Nicer volunteer text

Conflicts:
	pinaxcon/templates/symposion/schedule/_grid.html

Conflict and migration performed by Sachi King <nakato@nakato.io>
Emoji changed, lca2017_tags to lca2018_tags, remove needless dependency
on django-user-account, use request instead like the remainder of the
calls n the template do anyways.

Remove blocktrans from a number of texts as they break {{ templating }}
and we don't translate anyways.

Modified-by: Sachi King <nakato@nakato.io>
2018-01-10 20:28:22 +11:00
James Polley
fcbacc82e6 Add views to allow for PNG rendering of badge 2017-12-26 23:10:21 +11:00
Sachi King
aec594c2f2 dj-gapc-storage fix for num_retries went upstream
Fix for an attribute error in this module has been merged upstream and
been released as 0.4.1

https://github.com/eldarion/django-gapc-storage/pull/17
2017-09-15 10:06:49 +10:00
Sachi King
ad08aabc21 Double requirement 2017-06-24 16:47:02 +10:00
Sachi King
f07b20aebd DATABASE_URL as ENV_VAR 2017-06-24 15:59:46 +10:00
Sachi King
a0d8fa43d9 Deps for registripe 2017-05-27 21:14:08 +10:00
Sachi King
3cdf284cd9 registration deps 2017-05-27 21:05:53 +10:00
Sachi King
3d3e01138a Update Requirements to reflect vendoring appropriately 2017-05-27 20:22:59 +10:00
Sachi King
3c5a14c97b require django-bootstrap-forms
While pinax-theme-bootstrap pulls this in, we use this directly too, so
we need to put this into our top level reqs too.
2017-05-07 14:18:52 +10:00
Sachi King
10cc96b726 Remove metron
Not used - old/depricated name
2017-04-25 01:31:08 +10:00
Sachi King
db4a56f7b2 Removing stale package - Raven 2017-04-25 01:31:08 +10:00
Sachi King
81272d5310 Update requirements for Django 1.11
This has long enough support to reach post conf + a fair bit.
2017-04-08 20:13:22 +10:00
Sachi King
6557e2983b Support Django 1.10
Few minor changes to support Django 1.10
2017-03-31 11:54:47 +11:00
Sachi King
d658f8fb74 Store user files in GCS - Ephemeral Disks
Issue #2
2017-03-31 11:54:46 +11:00
Sachi King
37a9b37499 Bind in djangosaml2
Our authn is provided via shibboleth
2017-03-31 11:54:46 +11:00
Sachi King
c37ed61036 Remove wagtail
This should eradicate wagtail from the project.

While wagtail may be nice, our goals are to keep all things public, and
having things locked behidn a DB is congruent to that plan.

All in all, the django project only leveraged a single wagtail feature,
"richtext" which has been hacikly removed and will result in bad display
of however it comes up.  But this is on homepage.html, which will be
removed and covered up with a static website, which means we should be
able remove homepage entirely from this project.

This reduction hopefully makes the monolith easier to understand,
maintain, and wield.
2017-03-31 11:54:46 +11:00
Sachi King
9e851c31fa Remove dj-user-accounts
That's a nice macro, but we don't need it.
dj-user-accounts stands in the way of using more generic AUTN_METHODS
2017-03-31 11:54:46 +11:00
Sachi King
48c28651b8 Remove boxes
Boxes takes content directly from the DB and drops it into the django
templates.  This is rather ugly and goes against keeping as much as we
can in static locations.  As such, this is being dropped.
2017-03-31 11:54:46 +11:00
Sachi King
cae05aeebc Drop the wiki
Whatever wiki is used, will be run as a standalone application that is
not part of the primary application.

Closes #4
2017-03-30 23:53:24 +11:00
Sachi King
cfbf547dd9 Revert "Switched to using posgresql for db."
Add MySQL deps
2017-03-30 23:53:24 +11:00
Sachi King
b244606636 Drop cruft from repository root 2017-03-30 23:53:01 +11:00
Nick Seidenman (N6)
ac7228ec50 Default content page and sponsor list is working, mostly.
TODO: get sponsor logos to show up instead of the names (text).
2017-02-17 18:36:58 +11:00
Nick Seidenman
12e936d08d Update requirements.txt
Added symposion to requirements.txt
2017-01-05 13:21:19 +11:00
Christopher Neugebauer
3a686ab1a8 Wiki with styling (#78)
* Adds Django wiki and integrates our template

* Makes the wiki use lca2017 styling (to a point, anyway)
2016-11-23 17:08:00 +11:00
Christopher Neugebauer
a3474fd9cd Adds registration to the website (#69)
* Updates settings and requirements

* First pass at attendee profile

* Imports the registration templates; defines attendee profile models etc.

* First pass at themeing the registration form.

* First page of the registration form: done!

* Makes form validation nicer

* Adds populate_inventory

* Improves the additional items page

* Allows for rendering of formsets.

* Adds support for formset extending.

* Removes formset delete buttons

* Review page is LCA-ified

* Fixes some formset behaviour

* Fixes urls.py

* LCA-ifies product_category.html

* Invoices

* Credit card payments

* s/register/tickets/

* Show registration features only whilst products are available (think about this better, later)

* Updates the attendee profile form page

* Form tidy-up

* Makes it so that address info is copied from attendee profile to the address details are autofilled in Stripe.

* Adds feature to offer Australians a dropdown list of states rather than free text.

* Allow toggling of void invoices.

* Adds backgrounds to the headers in the registration process

* Improves the review page

* Adds “Linux Australia” to invoice details.

* Do not show balance due on void/refunded invoices.

* More thumbing

* Adds a link back to reports on each report.

* Tokenisation language.

* Another bug in credit card processing.

* Adds stripe refunds to options

* Removes spurious dashboard button.

* Tidies up the presentation of discounts.

* Tidies up presentation of voucher form.

* Fixes sponsor logo appearance with adblock.

* Front page tweaks

* Lets us specify alternative URLs in homepage panels

* more

* Updates discount amounts.

* More website fixes

* Changes language on pay invoice button

* Adds contact details to the invoice template.

* Updates the currency message in the invoice template.

* Explicitly includes e-mail address, because theme_contact_email doesn’t propagate

* Changes payment text.

* s/registration/selections/

* Removes final face palm

* Fixes lack of speaker dinner tickets for actual presenters.

* Adjusts wording in invoice e-mails

* Invoice wording.

* (FIX)

* Fixes margins on lists and tables

* Improvements arising from those CSS fixes.

* Changes description tags.
2016-09-30 20:46:05 +10:00
Christopher Neugebauer
ff16f71df6 September website changes - Pre-registration (#66)
* Factors rendering of external links into its own template. Automagical!

* Adds wagtail templates for keynotes on the front page

* Migrates to Wagtail 1.6

* Migrates content pages to be a streamfield. Flexibility++.

* Fixes editing of ContentPage bodies

* Adds floating images to content pages

* Fixes the layout of floating images

* Adds anchor links to content pages.

* Adds presentation link to the keynote speaker block model

* LCA-ifies the schedule list

* Refactors cms_pages/content_page into a new base template

* cms_pages/content_page now derives from abstract_content_page

* news_index_page now derives from abstract_content_page

* news_page now derives from abstract_content_page.html

* utility_page now uses the content_page base template

* Factors out _right_floating_image.html

* Themes the presentation detail page

* Themes the speaker profile page.

* Themes the schedule list page.

* Minor work on schedule_conference.html

* Themes schedule_detail.html

* Replaces cradle.svg

* Adds a background image to the schedule pages

* Adds libravatar fallback for speaker profile images

* Adds new background images (must update colophon)

* Adds some magic so that we can have slightly different presentation backgrounds for different pages.

* Adds the sponsor block to the bottom of the page.

* Adds sponsor logos to footer.

* All migrations are now in this tree

* Fixes wagtail migrations

* Adjusts presentation_detail to allow for miniconfs (i.e. no target audience)

* Adds unpublishing to presentation detail

* Adds ScheduleHeaderParagraph, which allows us to add some text to the header of schedule pages.

* Adds NamedHeaderParagraph. It allows us to store header paragraphs in the CMS.

* Date formatting in the schedule

* First step for fixing images

* Allows us to automagically load the colophon

* Adds “publish changes” button.

* Can login with email address
2016-09-18 20:40:55 +10:00
Scott Bragg
fe31b1b7c4 All migrations are now in this tree 2016-09-17 15:50:46 +10:00
Christopher Neugebauer
fdfe3c7045 Wagtail integration (#17)
* Adds basic wagtail app to the website

* Renames lca_website to cms_pages for clarity; re-instates pinax-boxes until we remove them from the templates

* OOPS

* Just Enough Wagtail

* Removes the template view homepage from urls.py

* OOPS

* Makes the home page use a stream field

* Removes an irrelevant migration that I accidentally introduced.
2016-06-22 10:07:27 +10:00
Scott Bragg
6b7618cc54 Able to load local_settings for production environment. 2016-06-10 13:38:24 +10:00
Scott Bragg
bfcfb54d1b Update requirements on lca2017 branch so pip doesn't get confused with
different Django and Symposion versions
2016-06-10 11:25:46 +10:00
Christopher Neugebauer
ec882bdbdd Update requirements.txt
To point at registrasion 0.1.1 (which has a working Wheel file)
2016-05-10 11:41:44 -07:00
Christopher Neugebauer
998ae6e6be Points requirements.txt at the lca2017 fork of symposion 2016-05-10 11:00:13 -07:00
Christopher Neugebauer
c56c749870 Prepares registrasion-demo to match the 0.1 release of registrasion. 2016-04-26 19:11:06 +10:00
Christopher Neugebauer
6c94eb9e91 Adds Registrasion support to the templates and apps. 2016-04-12 20:15:50 +10:00
Patrick Altman
0b1da0e85e Upgrades 2016-02-27 16:55:59 -06:00
Patrick Altman
6d3d2de2b3 Add admin user: u: pinax, p: django 2015-10-16 19:15:20 -05:00
Patrick Altman
04f246d850 Initial commit of the PinaxCon demo site 2015-10-16 12:53:02 -05:00