Commit graph

214 commits

Author SHA1 Message Date
Sachi King
55cc3e43a4 Exit with error if we don't have xmlsec1. This is a critical tool 2017-04-29 20:04:32 +10:00
Sachi King
85ee108a1f Use full imports not .
And tox to py3.6
2017-04-29 14:28:48 +10:00
Sachi King
c6c76e98d3 Remove excess CSS and fonts
print wont work for us now.  Will need to be recreated.

Fonts, I don't even know where they came from, so I can't keep them
2017-04-26 22:14:11 +10:00
Sachi King
e562b61521 Template cleanup of base dir templates 2017-04-25 15:59:35 +10:00
Sachi King
8e8f46276f _styles.html is not loaded anywhere
Not in use, remove it.

Hym, might be able to remove this CSS now too.
2017-04-25 15:39:10 +10:00
Sachi King
3ffbc9855f cleanup sym/sched/base.html 2017-04-25 15:38:24 +10:00
Sachi King
61d1416b06 Convert to bootstrap tab configuration
This was broken due to being something not bootstrap for tabs.

Convert to tab layout, just like reviewers page already is.
2017-04-25 15:32:02 +10:00
Sachi King
a0d0750b88 Reformat proposal_detail.html 2017-04-25 15:13:47 +10:00
Sachi King
4adbf0ee46 This script isn't loaded - remove it
This isn't loaded, doesn't seem to be for 2017 or PyCon, so I'll chuck
it.
2017-04-25 14:54:37 +10:00
Sachi King
9babbd0c43 We don't run modernizer.js
Remove the "no-js" class, that could be expected to change to "js" if
one doesn't know we don't have javascript that does that running.
2017-04-25 10:24:29 +10:00
Sachi King
8c60dd206d We don't maintain this manifest, drop it
We don't use this currently.  Removal.
2017-04-25 10:24:28 +10:00
Sachi King
10cc96b726 Remove metron
Not used - old/depricated name
2017-04-25 01:31:08 +10:00
Sachi King
f0e7a58226 Asset cleanup
Remove in-app stale resources and their branching of different cons.
Remove dist and move everyting into static/src.
Remove unused stale resouces such as less and hbs, etc.
2017-04-25 01:31:01 +10:00
Sachi King
8d77023aec Remove AceEditor
I cannot find the benifit to this over the base editor.

Tabs work, but that's pretty minimal.  And tabs don't work on GitLab or
GitHub, so I don't feel not having that is substantual to functionality.
2017-04-25 01:27:04 +10:00
Sachi King
8fa8fc4012 Add ' *' required markers back
The bootstrap renderer did not do anything to signify required rows.  We
can do this by adding a class for CSS to work on, and add this field in
a more simplified manner.

label-required == append ' *'
2017-04-25 01:27:04 +10:00
Sachi King
b3ac11a66b Simplify django form rendering
Remove my hack to get bootstrap forms.

Remove the insane render-row-at-a-time forms that then only render
default django forms.
2017-04-25 01:26:59 +10:00
Sachi King
7b74d3829f Disable SAML debug
We don't need this and it prints a lot of information.
2017-04-25 01:25:54 +10:00
Sachi King
b0b9ea89f7 Environtment the settings
And finally, dev settings converge with commited settings.
2017-04-25 01:25:54 +10:00
Sachi King
2d7a5aa35a Useless comment 2017-04-25 01:25:54 +10:00
Sachi King
895cab2c1c Signal rejections and standby talks.
Go green for Accepted

Go Red for Rejected

Go yellow for Standby
2017-04-25 01:25:47 +10:00
Sachi King
dfd1da01be Remove unicode(), we're all unicode
Py3
2017-04-23 18:32:52 +10:00
Sachi King
b9510fed67 Remove state select box
I'm not against putting this back, however, it doesn't work quite as one
would expect, so I'm removing it as its functionality is more confusing
that working.

Is this really the best way to address this?

If you unselect AU, then it never comes back.  It leaves its value in
the textbox pre-filled if it ever got a value, leaving the field
pre-filled with an Aus state even if the person is New Zealand.

Most of our attendees are from but a few countries, we should make these
equal effort to fill in.
2017-04-23 17:32:38 +10:00
Sachi King
18fcfddad6 Errors should be big red boxes 2017-04-23 17:21:19 +10:00
Sachi King
079f87b1d2 Use a selectbox for of_legal_age
To me, this registeres to a user as a required field better than a
radio-button.

As well, we now signal it as "required = True"
2017-04-23 17:19:38 +10:00
Sachi King
1886323d74 Bootstrapification
Boot custom CSS, and put some base, standard css in its place.
Shame I did not start with fresh Bootstrap4, but oh well.

Some more templates could be made to make this less messy, which would
be good.
2017-04-16 16:30:45 +10:00
Sachi King
6d864e8ce5 Cleanout conf-specific proposals.
We don't have these mini-confs (yet).
We don't want these files.
We're not going to rename the release in 0010 and drop all the extra
tables in 0011, we're going to toss them on the cutting room floor and
call it good.

They're in git, we can look at this commit and past ones on how to
recreate these for new proposal additions going forward.
2017-04-16 16:30:45 +10:00
Sachi King
1ba1a97c45 move templates out of vendor specific locations
Lets not kid ourselves.  The whole apps templates are client specific.
Lets just remove that and not think it isn't.
2017-04-16 16:30:45 +10:00
Sachi King
0aa48837cf Template simplication: remove site_base_wagtail.html 2017-04-16 16:30:45 +10:00
Sachi King
2642c03115 Sneak 2017 into the list of previous years 2017-04-16 16:30:45 +10:00
Sachi King
e86a811f38 Bootstrapification: SiteTree Nav Bar
Make sitetree a bootstrap navbar.

Remove mobile menu, bootstrap provides this.
2017-04-16 16:29:19 +10:00
Sachi King
4dedd88225 Remove the blue header and clean up padding 2017-04-09 17:14:50 +10:00
Sachi King
8698e416fa Remove DJDT template view
This causes template rendering to blow out of proportion on certain
views.  I don't care enough about this feature to spend time fixing it.
It has not provided me any value to this point.

One such view is ^/tickets/profile$ however there are others where I saw
this, yet do not remember which ones they were.
2017-04-09 15:58:29 +10:00
Sachi King
88bcd5fe65 Switch to LCA2017 templates
This fixes proposal details.
2017-04-08 20:13:28 +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
cfa9a60f11 Move secrets values to the top
Probably not the best way to do it, but it'll do.

We should add some logic to bail if certain values are unset.
Logic in settings, *gross*, I know.
2017-03-31 15:30:40 +11:00
Sachi King
dc532cc4f8 Use env vars for GCS_BUCKET 2017-03-31 12:09:41 +11:00
Sachi King
a0ee642cc3 Cleanup templates
Unused tags
Unused templates
Leftovers pinax-pages templates
2017-03-31 11:54:47 +11: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
823f89a0ed Remove sponsorship for now
Simplify for CFP.

Sponsorship needs some thought.
2017-03-31 11:54:47 +11:00
Sachi King
2fe3bbfbdd Ask file provider for URL
Don't reason the URL from implmentation specific magic.
2017-03-31 11:54:47 +11:00
Sachi King
8db0e47107 Cleanup pages for readability
This removes images, and giant headers, and makes the text - not white.
The next layer down in CSS is blue, so that's it for now.

This helps understand what's on the page visually, so this, at the
least, make testing easier for now.
2017-03-31 11:54:46 +11:00
Sachi King
d658f8fb74 Store user files in GCS - Ephemeral Disks
Issue #2
2017-03-31 11:54:46 +11:00
Sachi King
0fddbf9f9b flake8 again 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
f9c406e5f7 Remove 500 patch. 1.7.0 upgrade.
While 1.7.0 exhibits a similar issue, we would need to re-verify and
re-patch this library with a new 1.7.0 monkeypatch.

This is ultimately only an annoyance.  It only occours when we've
already 500'd, and this just means we get a second 500.  As such it's
not critical.
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
187d900d81 This seems to make it work. NFI
Works in prod mode, dies in dev with a warning/error

Doco seems to suggest that mixing these directories together is an
error as it means user uploads mingle with site files.
2017-03-31 11:54:46 +11:00
Sachi King
befa544bec Use outbound mail provider for admin BCC
We can use our outbound provider to BCC any required administive
retention that is required.
2017-03-31 11:54:46 +11:00
Sachi King
39b556b7ac Mass style-check update
Seems okay.
2017-03-31 11:54:46 +11:00
Sachi King
a239d12e2d Config file cleanup
- remove a whole bunch of comments, they're useless

 - Update TimeZone to Sydney

 - Don't colocate MEDIA (user uploads), with STATIC in fact,
   how is this set, Django has a safety check for this and bails.

 - Do not store a default SECRET_KEY in git.
   We'll set a random one by default, so things "just work"
   It would also be acceptable to not set it and let DJ bail

 - We dont want to log to a file.  Our disks are ephemeral.

 - We likely will not overlay a production settings.py over this one.
   We need to implement something that is more container friendly in the
   future.  This will be env-vars or a config file.
2017-03-31 11:54:39 +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
Nick Seidenman
01c5292653 Better styling for dashboard now working. 2017-03-05 15:19:48 +11:00
Nick Seidenman (N6)
bc07865ac0 Starting to get Teams and Proposals (and Sponsors -- more ) working. 2017-03-05 15:18:01 +11:00
Nick Seidenman (N6)
5347a7efae News pages working.
Sponsorship ... getting there.
2017-03-05 15:17:47 +11:00
Nick Seidenman (N6)
e4679c7cb8 Merge branch 'develop'
Conflicts:
	2017.pycon-au.org.conf
2017-02-21 10:57:30 +11:00
Nick Seidenman (N6)
a07dbe58c1 Sponsor (vertical) area on basic page layout working with graphics. 2017-02-21 10:51:45 +11:00
Nick Seidenman (N6)
901c636a6b Made Intro field in content page optional. 2017-02-17 19:17:03 +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 (N6)
aa359400a2 Menu bar looking better. 2017-02-16 21:37:37 +11:00
Nick Seidenman (N6)
0aec9bd27c Switched to using posgresql for db. 2017-02-14 16:43:19 +11:00
Nick Seidenman (N6)
2f43a3b9e6 Merge branch 'develop' 2017-02-05 09:49:50 +11:00
Nick Seidenman (N6)
6fa996f183 Starting to mod pages for other content (e.g. proposals, calendar) 2017-02-05 09:48:38 +11:00
Nick Seidenman (N6)
a00fc7845e Added some css to make text visible on 404 and 404 pages.
Removed references to non-existent content—page-header-panel.html.
2017-02-05 09:45:12 +11:00
Nick Seidenman (N6)
8cf2714496 Merge branch 'prod' of github.com:pyconau2017/website into prod
Conflicts:
	pinaxcon/urls.py
2017-01-18 14:54:02 +11:00
Nick Seidenman (N6)
dd3110e125 Merge branch 'master' into prod
Conflicts:
	pinaxcon/settings.py
	pinaxcon/urls.py
2017-01-18 14:52:34 +11:00
Nick Seidenman (N6)
5f7e5ee1bd Merge branch 'master' into prod
Conflicts:
	fixtures/conference.json
	fixtures/sites.json
2017-01-17 12:03:16 +11:00
Nick Seidenman (N6)
448aa72558 Added favicon and special events pdf to bring this up to look/feel of wooden site.
Removed additional (and completely superfluous) styling in app.css that was otherwise making
our site look gluggy.

Mod'd fixtures (and updated db) to reflect PyCon rather than PinaxCon.
2017-01-17 11:42:13 +11:00
Nick Seidenman (N6)
1759a07630 A few mods to be able to use the runserver site for debugging. We'll back these out once the real
(via apache) site is up and running.
2017-01-16 18:24:21 +11:00
Nick Seidenman (N6)
bd4b61003a Merge branch 'master' into prod
Conflicts:
	pinaxcon/settings.py
	pinaxcon/urls.py
2017-01-16 16:26:17 +11:00
Nick Seidenman (N6)
646839fffa Disabled the splash page. Content is now being servied via CMS. 2017-01-16 16:22:14 +11:00
Nick Seidenman (N6)
fb7ffbc68e Finally have CMS-based homepage looking identical to the dummy spalsh page. 2017-01-16 15:55:42 +11:00
Nick Seidenman (N6)
6121ce79cc Getting the splash homepage to work via CMS.
Nearly there.  Much rubbish / cruft ripped out of  site_base.html and content_page.html.
Had to modify cms_pages/models.py to accommodate a "simple" layout option in the homepage
editor.
Still some stuff to do.  Styling not quite there yet, but want to checkpoint this.
2017-01-16 14:28:24 +11:00
Nick Seidenman (N6)
a8e6a5b6d9 Set up 'prod' branch and made appropriate changes thereto. 2017-01-12 09:01:49 +11:00
Nick Seidenman (N6)
3100047760 Changed 2017 Melbourne to Melbourne 2017, per req from Chris N. 2017-01-12 07:31:22 +11:00
Nick Seidenman (N6)
42ebbd06a1 Website is working behind apache2 / mod_wsgi in daemon mode.
Only the homepage loads correctly at the moment.  Need to get the
static files thing sorted, still.
2017-01-11 22:58:09 +11:00
Nick Seidenman (N6)
4e87b63c60 Pycon AU 2017 dummy site now working. (Identical to the one at the 2017.pycon-au.org URL now.) 2017-01-10 18:40:54 +11:00
Nick Seidenman (N6)
8d68cca01f Many changes, mostly from lca to pyconau. 2017-01-10 15:12:07 +11:00
Nick Seidenman (N6)
ce8e6b159e Mods to settins.py making this less lca, more pycon.
More to come.  Many more ...
2017-01-06 15:32:19 +11:00
Christopher Neugebauer
d6cf16cedb Tracks which page of the schedule is loaded at any given time (#90)
* Adds schedule fragment script

* removes spurious logging

* Displays the right tab on DOM load.

* Load today’s schedule if we’re during the conference.

* remove TODO
2017-01-02 21:58:24 +11:00
Scott Bragg
0eda616345 Rooms have optional track names, access schedule by day via URL (#87)
* Optional track name with room name on schedule, access schedule by day eg /schedule/?day=Monday

* Changed to using a Track model rather than a char field
2016-12-26 12:10:42 +11:00
Scott Bragg
fccf547e9f Migration for open hardware CFP (#86)
* Form for Open Hardware CFP

* Oops forgot the migration
2016-12-23 17:44:16 +11:00
Scott Bragg
b66db0a4a8 Form for Open Hardware CFP (#85) 2016-12-23 17:29:23 +11:00
Scott Bragg
8bf3948956 Loosen permissions on wiki editing. (#84) 2016-12-20 19:22:03 +11:00
Christopher Neugebauer
fa9bb1a9f9 Adds mobile-friendly schedule view and paged schedule view (#81)
* Adds responsive mobile CSS for schedule timetable

* Adds by-day schedule view

* Displays content_override in schedule

* Adds twitter/homepage links for speakers.
2016-12-10 17:11:40 +11:00
Christopher Neugebauer
9a21d2c781 Schedule tweaks etc (#80) 2016-12-08 19:56:43 +11:00
Christopher Neugebauer
1ba1cf1a24 Adds nag_unpaid template and credit_note template (#79) 2016-12-07 22:11:01 +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
Scott Bragg
857e8623d9 Style fixes to make the proposal selection modal display. 2016-11-03 23:46:03 +11:00
Scott Bragg
ebfd7aa192 Add ACE editor for reviews 2016-10-31 22:21:30 +11:00
Christopher Neugebauer
0cd7d47805 Template fixer-upper 2016-10-10 08:52:51 -07:00
Christopher Neugebauer
833eebc46d Fixes presentation of the 18+ question 2016-10-06 13:10:39 -07:00
Christopher Neugebauer
99ba4c1770 1) Fixes list display
2) Lets us put links in category descriptions
2016-10-05 10:25:44 -07:00
Christopher Neugebauer
42892ea3c8 Fixes payment behaviour. 2016-10-03 16:43:04 -07: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
Scott Bragg
882902d7a3 Add ADMIN_USERNAMES setting for selective proposal change notification 2016-09-27 19:18:40 +10:00
Scott Bragg
35bb710250 More cfps (#75)
* Law, Testing and Knowledge Miniconf CFP

* Admin registration for latest CFPs
2016-09-27 18:10:41 +10:00
Scott Bragg
52d443790f Last minute fixes to get miniconf cfp going (form fields missing) 2016-09-27 07:47:31 +10:00