Commit graph

601 commits

Author SHA1 Message Date
Tobias
d9ae9e4b22 Add HelpTextField widget 2018-10-06 08:43:40 +13:00
Tobias
dd30906971 Add proposal type for docs miniconf 2018-10-03 21:19:22 +13:00
Sam Bailey
bc29fd49bf fix dates to match the day of the week
this assumes that the date was wrong and day of week correct originally
2018-10-03 10:59:24 +10:00
Sam Bailey
ba2f7b9291 update t-shirt artwork description to current year 2018-10-03 10:57:09 +10:00
Sam Bailey
46b546fadf update link to direct to current lca website 2018-10-03 10:54:54 +10:00
Tobias
aff75a66eb Print improvements 2018-10-01 20:44:25 +13:00
Tobias
b038ce1d94 Add empty accommodation page 2018-10-01 20:44:19 +13:00
Tobias
91747a64ee Fix forms import again 2018-10-01 15:22:38 +13:00
Tobias
be35d21102 fix forms imports 2018-10-01 15:09:33 +13:00
Tobias
62158ac3dc Quick fix for report view 2018-10-01 13:32:56 +13:00
Tobias
bbaaf75d9d Quick fix for presentation detail 2018-10-01 11:15:52 +13:00
Tobias
530be28407 Add half chest measurement to men's shirts 2018-10-01 10:44:28 +13:00
Tobias
fe86e0cbfe Update GST tag 2018-10-01 10:11:36 +13:00
Tobias
918f4ab6f9 Various small/typo fixes 2018-10-01 09:37:08 +13:00
Tobias
2db0d95426 Make discount heading even smaller 2018-09-30 18:58:47 +13:00
Tobias
380bbcf567 Add women's 20 shirt 2018-09-30 17:35:09 +13:00
Tobias
035a7b060f Improve miniconf forms 2018-09-30 17:04:28 +13:00
Tobias
ed7ae7e3e5 Shirt order and link fixes 2018-09-30 17:00:38 +13:00
Tobias
0aaea184e5 Final shirt changes 2018-09-30 17:00:17 +13:00
Tobias
77115814f0 Update for shirts 2018-09-30 17:00:17 +13:00
Tobias
84d2931921 Change invoice details for NZ 2018-09-30 17:00:17 +13:00
James Polley
455f721b98 Don't show T&Cs on the additional products page 2018-09-30 13:53:55 +10:00
Tobias
b54d4bc04a Fix ticket typos 2018-09-30 12:08:15 +13:00
Tobias
bcdc6a864a Minor tweaks before testing 2018-09-30 08:56:30 +13:00
Tobias
c47c22d617 Add pricing page 2018-09-29 21:19:25 +12:00
Tobias
43f48c7c36 Fix dashboard look 2018-09-29 18:34:47 +12:00
Tobias
27996c1960 Remove unused proposal types, (fixes #137) 2018-09-29 17:56:44 +12:00
Tobias
86de4ba961 Fix register link layout 2018-09-29 17:33:01 +12:00
Tobias
ebbf8f079c Change models for 2019, closes #135 2018-09-29 17:31:16 +12:00
Tobias
a1d57ad1db Add children to profile (fixes #136) 2018-09-29 17:14:21 +12:00
Tobias
8954be06c5 Remove badge preview button (fixes #138) 2018-09-29 17:14:21 +12:00
Tobias
804dc2508c Add inventory and schedule fixtures 2018-09-29 17:14:21 +12:00
Tobias
c42f2686cf Update profile form 2018-09-29 17:14:21 +12:00
Tobias
8bffe45d54 Further template tweaks 2018-09-29 17:14:21 +12:00
Tobias
123de1a15d Further FE improvements for checkout process 2018-09-29 17:14:21 +12:00
Tobias
a26f9a6f18 Fix for required-fields tag 2018-09-29 17:14:21 +12:00
Tobias
74dc779999 WIP for rego form, 2 2018-09-29 17:14:21 +12:00
Tobias
d651776016 WIP for rego form 2018-09-29 17:14:21 +12:00
Tobias
7977403957 Add schedule calendar (no mobile yet) 2018-09-29 17:14:21 +12:00
Tobias
5c05887d3a Miniconf draft 2018-09-29 17:14:21 +12:00
Tobias
6365ef9333 Schedule overview page 2018-09-29 17:14:21 +12:00
Tobias
a75acac56f Basic template changes 2018-09-29 17:14:21 +12:00
James Polley
ec19e2f78e Add required flag libraries to _categories snippet 2018-09-29 10:39:57 +10:00
Tobias
0864ded2e5 Add proposal section to dashboard 2018-09-24 17:19:31 +12:00
Tobias
ad5954acf6 Add proposal section to dashboard 2018-09-24 16:55:09 +12:00
Tobias
4a0ba2ebe4 CSS tidy-up 2018-09-15 13:08:40 +12:00
James Polley
b7aa0a4687 Attempt to rework the review screen to be more useful
Fix indenting and whitespace

because it was the only way to track down the errors..
2018-08-03 01:59:08 +10:00
James Polley
5a48a017ce Hide columns by default 2018-08-02 21:27:52 +10:00
James Polley
172602566d Update jquery version to the full version
datatables uses the fade effect
2018-08-02 21:27:51 +10:00
James Polley
5d029c2c06 Restore buttons to review tables
- Switch from dataTable (returns a jquery object) to
  DataTable (returns a DataTables API object)
- Update versions of libraries

Doesn't quite work, needs the full version of jquery rather than the
slim version.
2018-08-02 21:26:11 +10:00
Tobias
494d9a6db0 Remove CfP from the page (again) 2018-08-01 16:54:53 +12:00
Tobias
fcb287d246 Remove CfP from the page 2018-08-01 15:07:59 +12:00
James Polley
0b6d23dc33 Add a container for buttons 2018-08-01 02:33:14 +00:00
James Polley
26520868e0 Restore the missing <script> tag 2018-07-31 13:15:36 +00:00
James Polley
c0577b21b0 Update pinaxcon/templates/symposion/reviews/_review_table.html 2018-07-31 12:54:30 +00:00
James Polley
6d76bdbd64 Update pinaxcon/templates/symposion/reviews/base.html 2018-07-31 12:54:03 +00:00
James Polley
247f7ef62c Add some of the extra bits of Datatables back in 2018-07-31 10:43:12 +00:00
James Polley
29222d99be Add a "Withdrawn?" column to proposal lists 2018-07-31 10:37:19 +00:00
James Polley
df13617f8f Replace label- with badge- for bootstrap4 2018-07-31 10:34:17 +00:00
Tobias Schulmann
296bdd82d5 Fix og:image tag, fixes #95 2018-07-15 11:53:11 +12:00
Tobias Schulmann
8759f3b098 Add conf dates to footer, fixes #99 2018-07-15 11:36:39 +12:00
Tobias Schulmann
d3b6c310f6 Add better og image 2018-07-15 11:34:11 +12:00
James Polley
3555c152e4 Update proposals.html 2018-07-13 06:09:38 +00:00
James Polley
d690bfb88b Add a custom saml_config_loader
* Makes the assumption that we only have one set of keys, and only one
  IDP
* If any of the SAML2 variables use relatives paths, these will be
  replaced with absolute paths under the current requests's hostname,
  port, and scheme
2018-07-13 14:15:49 +10:00
Tobias Schulmann
e0e8bdc9a8 Fix twitter handle 2018-07-12 13:28:51 +12:00
Tobias Schulmann
8c4917db6b Add location section to proposals 2018-07-12 12:40:23 +12:00
Tobias Schulmann
1865ba8674 Add contact details to footer 2018-07-12 12:35:23 +12:00
Tobias Schulmann
4e8296e235 Change team@ to contact@ 2018-07-07 16:35:17 +12:00
Tobias S
f6c76323d8 Update ToC 2018-07-07 00:51:11 +00:00
Tobias S
14489d3882 Fix wrong emails on sponsorship page 2018-07-05 22:07:04 +00:00
James Polley
a8091f97b1 Update invite email to make it clear a button needs to be pressed 2018-07-04 03:40:21 +00:00
James Polley
3844bcefa9 Update site_base.html 2018-07-02 09:33:45 +00:00
James Polley
13bdc73cf0 Sketch an opengraph stanza 2018-07-02 09:23:42 +00:00
Tobias Schulmann
9851cbb1a0 Fix typo on homepage 2018-07-02 18:53:46 +12:00
Tobias Schulmann
f944776f73 Fix typo 2018-07-02 15:28:10 +12:00
Tobias Schulmann
690c4495ad Fix typos in CfP links 2018-07-02 09:23:11 +12:00
Tobias Schulmann
092f58ddaa Fix dashboard link on CfP page 2018-07-02 09:21:53 +12:00
Tobias Schulmann
b6cae50102 Add CfP page and fixtures 2018-07-02 08:40:06 +12:00
James Polley
3f7773c687 Switch to specifying an SSL flavor
- This helps to ensure that only one is ever set
- But also, because of the way the values are passed in, it's always
  going to be evaluated as a string, which is always True. So we can't
  just pass in a bool directly
2018-07-02 03:28:57 +10:00
James Polley
3810f02904 Allow EMAIL_USE_SSL to be turned on
LA's mailhost uses implicit-SSL rather than explicit-SSL (STARTTLS) so
we need this available as an option
2018-07-02 00:39:58 +10:00
Tobias Schulmann
3c31249759 Fix typo on ToC page, fixes #92 2018-07-01 16:43:32 +12:00
Alistair
d32a609def Add animated hero according to design spec, fixes #78 2018-07-01 14:35:45 +12:00
Tobias Schulmann
99c74f1ccc Spacing tweaks 2018-06-30 16:42:03 +12:00
William Hughes
88ca6d819f Update smoke-free copy 2018-06-30 04:24:53 +00:00
William Hughes
b64999677a Clean up copresenter stuff a bit 2018-06-30 03:52:18 +00:00
Tobias Schulmann
6e63465fea Basic styling for review section 2018-06-30 03:40:16 +00:00
William Hughes
27ae211e39 Fix co-presenter invites styling 2018-06-30 03:32:18 +00:00
William Hughes
c2524da650 Align styling for team list on dashboard with rest of dashboard page
Fix #91
2018-06-30 03:31:38 +00:00
William Hughes
cde5f93555 Replace reference to 'Federal Police' with 'New Zealand Police' 2018-06-30 15:29:05 +12:00
James Polley
20c6da375e If ANALYTICS_KEY in the environment, enable gAnalytics 2018-06-30 12:33:34 +10:00
William Hughes
b39b748eee Use local file storage for uploads in dev mode
Suplementary file upload already exists if you edit a proposal

Fix #85
2018-06-30 02:27:00 +00:00
Tobias Schulmann
499b3b6769 Fix proposal detail and edit pages 2018-06-30 14:03:58 +12:00
William Hughes
77ce0021ef Fix notification styling
Fixes #88
2018-06-30 00:53:17 +00:00
William Hughes
a6d16f59c7 Fix TypeError when rendering CSRF failure view
Fix #86
2018-06-30 00:11:23 +00:00
Tobias Schulmann
00fc35492b Disabled mousewheel scroll on map 2018-06-30 00:02:14 +00:00
Tobias Schulmann
37a4c59a24 Added analytics 2018-06-30 00:01:56 +00:00
Tobias Schulmann
8c28ca0f79 Fixed proposal views in dashboard 2018-06-30 10:56:52 +12:00
Tobias Schulmann
6a18824aa3 Link fixes on static pages 2018-06-28 02:25:59 +00:00
James Polley
227df66dba Allow non-managers to submit review feedback 2018-06-27 19:13:00 +10:00
James Polley
bdc976d77b Try a different way to edit the urlconf 2018-06-24 23:23:23 +10:00
James Polley
dc6c8077ad Move dev-mode setting to before urls are loaded 2018-06-24 22:22:19 +10:00
Tobias Schulmann
2d5443be89 Hide green row when no reviews available 2018-06-24 13:21:52 +12:00
Tobias Schulmann
5256aeeda3 Started dashboard design 2018-06-24 01:07:10 +00:00
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
Tobias Schulmann
70138d0433 Favicon update 2018-06-23 17:23:48 +12:00
Tobias Schulmann
fc7bb77214 Use all 4 homepage pictures 2018-06-17 19:40:13 +12:00
Tobias S
19a5bbf929 Dev/tobi/responsive 2018-06-17 04:18:04 +00:00
Tobias Schulmann
66965e0297 Initial sponsors page draft 2018-06-16 13:07:59 +12:00
Tobias Schulmann
4d15cbf85c Add first 2019 design attempts 2018-06-04 20:54:51 +12:00
Tobias Schulmann
c9449f619d Make homepage the default route 2018-06-04 20:54:10 +12:00
Tobias Schulmann
3daf623360 Add sass processor 2018-06-04 20:52:51 +12:00
Sachi King
ce32fd69b6 Show chair for session on main overview page
Plus keep it a link so opt out is not impossible.
2018-01-24 15:27:37 +11:00
James Polley
a8551e999c Add in actually badge overlay 2018-01-21 00:50:51 +11:00
Sachi King
763f69cb61 Add overlay badge support
Support so print can print only important text.

SVG modified to use display:inline/none based on overlay True/False and
a symlink to make it easy to change to a completely seperate svg if that
is not optimal.

SVG added layers to split text and graphic so graphics can be easily
hidden and printed.

Closes: #38
2018-01-20 12:36:09 +11:00
James Polley
28d10ff9fc Remove the personalised bits of session chair display
- The schedule grid page is ridculously database-query heavy and hence
  terribly lacking in perfmantitude.
- Caching can help with this, but the caching implemention at present
  is not user-aware. If one user looks at the page, they'll get a
  "YOU" in all the places they're chair and something else everywhere
  else - and then everyone will see that for the next 600 seconds,
  then YOU will become someone else
- to avoid this, remove the request.user-specific bit of the template
2018-01-17 00:53:53 +11:00
James Polley
89570b2e60 Use the LocMemCache backend 2018-01-17 00:34:35 +11:00
James Polley
7d18387670 If no boardingpass, make one
- Use the first template in the system
 - If there's no template, use /tickets/review as it at least gives
 - people an overview of what they've paid for and warns them of
   missing categories
2018-01-16 23:11:14 +11:00
James Polley
0bb2f8c25d Gracefully handle users with no ticket 2018-01-15 09:10:48 +11:00
James Polley
55ed2dc319 Display room name on presentation_detail 2018-01-15 06:36:05 +11:00
James Polley
1a2b4f4688 Company isn't shown for hobbyists/students/day tickets 2018-01-15 02:52:11 +11:00
James Polley
79085a798a Create /boardingpass 2018-01-15 02:05:29 +11:00
James Polley
9abea97625 Apply usual styling to session volunteering buttons 2018-01-15 02:05:28 +11:00
James Polley
39669055ef Update badge rendering to reflect actual render
* Switch to showing the PNG version by default, as this reflects what
  will actually be rendered and sent to the printer
* Include the greyscale filter
* Include the twemoji font we'll use for rendering the badges
2018-01-15 00:30:30 +11:00
James Polley
ffe0f64182 Make narrow-screen schedule details more distinct
In the narrow view, lots of details that aren't in the normal view
appear to compensate for not having clear row/column headers any more.

However, all the detail can look very same-same; this tweak makes rooms and end times more distinct.

Session chair info is made always italic, and a label is added to make
it clear that this person is not the speaker.
2018-01-13 00:26:49 +11:00
James Polley
54f53cd2c6 Add a waffle, for flipping and switching 2018-01-11 03:04:32 +11:00
James Polley
cb1355120a Make the per-day tabs work 2018-01-11 02:04:16 +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
c15848bfce Fix off-by-one errors in ticket categories 2018-01-09 04:29:00 +00:00
James Polley
0831a4aa76 Add support for a "ready for boarding" group
This allows for the boarding functionality to be safely tested with
just a subset of users first. Once you're ready to go live Fur Reals,
just delete the group and all users will become eligible.
2018-01-07 22:27:15 +11:00
James Polley
c478fb8454 Update badge template 2018-01-07 17:45:33 +11:00
James Polley
e726ff21a8 Create regidesk app
Shows summary of all attendees with a paid ticket, including
boarding_pass status.

Currently, regidesk allows staff with the requisite permission the
ability to view the checkin status of attendees, and email the user
their boarding pass email.

Included is a view for the user to retrieve their own QR code (in case
they got the plain-text version of the email, they can use this to
download an image to their phone for faster checkin)
2018-01-06 11:38:06 +11:00
James Polley
79743b711d More consistent color-coding for talk status buttons
- there's no btn-default, switch that to btn-primary
 - consistently use info for standby, primary for undecided, success
   for accept and warn for rejected
2018-01-06 11:38:04 +11:00
James Polley
2465f2645e urlize abstracts
I've looked through the database and I can't find any accepted
proposals that actually contain anything to linkify - but I've had
several requests from people that I think are reasonable, things like
being able to link to their project (we ask them to provide a project
url but we don't use that link)

This seems like a reasonably fast way to let those people add a
link. We still have to manually accept changes to their proposal so we
have a chance to look at the content of the url if we want.

The urlize filter adds rel=nofollow to the link automatically.
2018-01-04 21:31:00 +11:00
James Polley
eac35f3604 Add a button class so that the button gets drawn 2017-12-31 17:23:54 +11:00
James Polley
d4ca04bada * Fix categories for badge icons, company names
* Company names had a misspelled filter and weren't being displayed
* Add some conditional logic so that company names don't get shown for
  hobbyists or students
2017-12-27 02:51:57 +11:00
James Polley
f675580d6b Add support for badge PDFs also
* Add a greyscale filter to text for more accurate preview
* Always default to SVG preview as it's the most accurate (cairo
  doesn't do a great job of handling custom fonts when it converts to
  png/pdf)
* Always use roboto font.
2017-12-26 23:55:09 +11:00
James Polley
469e6f1ad9 Add a butotn so users can preview their own badge 2017-12-26 21:05:03 +11:00
James Polley
d14048bcb8 Further changes to support badge generation for lca2018
* Undo some of the debugging done early in this series of patches
* Add ability for a user to preview their own badge
* Add a template for the LCA2018 badge
2017-12-26 21:01:40 +11:00
Sachi King
9ab075e51c Badges work by copy-pasting lca2017/pyconau2017 code around
WIP - Push for share
2017-12-26 04:24:20 +00:00
James Polley
f69e7ac52d Add a box to point people at account management 2017-12-25 17:08:11 +11:00
James Polley
f07246f9d5 Display Room for everything that's not break
Talks, tutorials, plenaries, miniconfs - everythign except breaks please.
2017-12-24 14:50:59 +11:00
James Polley
cabad1c7d5 Change "Apply voucher" button into a link
I can't find the form that should be displayed here, so the simplest
thing I can do at 11pm is to make this a link. That's unsatisfying but
hopefully works.
2017-12-23 23:05:56 +11:00
James Polley
98fe425867 Tidy presentation of discounts list 2017-12-23 21:52:58 +11:00
James Polley
2aae2af55d Disable client-side validation on credit_note forms
* HTML5 browsers have some clevers to do client-side validation of
  forms
* Django activates this by default for certain field types
* However, in this case, there are three forms on this page. We rely
  on two of them being invalid in order to figure out what processing
  to do.
* So we need to disable the client-side validation.
2017-12-23 13:13:43 +11:00
James Polley
d19e34280a Enhance proposal fields display
* Display the "withdrawn" status
* Display extra information about exhibitions for art+tech
2017-12-13 12:03:12 +11:00
Joel Addison
9f0bb9178f Improved menu styling
Update menu to use same style as static site,
with slight adjustments for Bootstrap 3.
2017-12-10 17:26:38 +10:00
Joel Addison
00ea909d05 Update fonts
Use the same fonts as the static site, as per the LCA2018 branding guide.
Shrink headings on the Dashboard to suit new fonts.
2017-12-10 17:26:38 +10:00
Joel Addison
bd25446f6e JavaScript fixes 2017-12-10 17:26:38 +10:00
Sachi King
cb51a2abd8 Tell django to use MB4 2017-12-10 14:31:48 +11:00
James Polley
c7e29b3cb1 Don't try to initialise dataTable twice
Old code was initialising the dataTable twice - once in the parent
block and once in the child. This doesn't actually work and just
caused errors.

Switch to only initializing it once. Unfortunately this creates
copy-pasta :(
2017-12-03 17:30:43 +11:00
James Polley
cfc19f309f If there are no track names for today, don't show the row
If there are track names today, show the row for track names. If there aren't, don't show an empty row.
2017-12-03 15:36:06 +11:00
James Polley
bc3edb80d9 Point static urls to the build dir rather than src dir 2017-12-03 14:49:37 +11:00
James Polley
4f37556db0 Only copy visible columns on attendee reports
Also, add the ability to choose which columns are visible.
2017-12-01 12:22:42 +11:00
James Polley
a0610972fc Improve display of abstract and presenter bio
Relocate buttons to be beside the presenter's name.

Format abstract and bio in monospace hack as intended.
2017-11-22 18:26:06 +11:00
James Polley
a96207fcdf Restore buttons referenced in current templates
Partial revert of 271d9e05 - these are two of the many files removed then. Looks like these are the only two still used.
2017-11-22 16:53:46 +11:00
James Polley
8d15a6cbeb Make talk audience and format visible to reviewers
* Audience is visible on review details, but not the list. Perhaps
  useful for cases where reviwer wishes to only review for a
  particular audience. This change adds audience to the list view.

* Format is not visible anywhere. This changes adds it to list and
  detail views for the reviewers.

This change also adds some buttons to control visibility of the new
columns.
2017-11-12 14:05:43 +11:00
James Polley
2af7eaea7f Supply a default value for target_audience for the ART+TECH miniconf
* The base model requires a value here
* But we aren't using one; so there's none on the form
* This change supplies a custom enumeration that's specific for this
  particular model, which has one value, which is a default value,
  which simply says that the field is N/A
* This does mean that when viewing or reviewing the proposal one sees
  the Target Audience field, but it will say N/A.

* Testing has shown that this does not affect the other types which
  descend from the base Proposal class; they still use the default
  enumeration.
2017-10-23 21:18:17 +11:00
James Polley
c133f88832 Add the page title into the well 2017-10-16 21:59:19 +11:00
James Polley
bfa94b8c5e Enable flatpages 2017-10-16 21:53:18 +11:00
James Polley
bb42d098fd Update fields for arttech miniconf 2017-10-15 22:42:27 +11:00
James Polley
8ded9ff4fc Remove reference to analytics.html
Don't know what it was, but it currently doesn't exist.
2017-10-15 14:29:33 +10:00
James Polley
493306bfff update favico 2017-10-14 16:47:17 +11:00
James Polley
e18cfc4704 Rework navbar to have a consistent look with the static site. 2017-10-14 16:47:06 +11:00
James Polley
5832745148 Add missing </div> so that available teams is properly positioned 2017-10-13 18:35:32 +11:00
James Polley
c9223aeef0 Restore datatables to review lists 2017-10-13 13:07:05 +11:00
James Polley
3334469d30 Tweak invoice templates so that header text is hidden on print 2017-10-11 21:57:04 +11:00
James Polley
d0f4b1c455 Update datatables libraries
This fixes some display issues and adds functionality.
2017-10-08 16:14:28 +11:00
James Polley
8aa1148f7a Make datatable work for each table on the page, not just the first 2017-10-05 00:55:30 +11:00
James Polley
f6b629bd60 Remove debugging line left on profile form. 2017-10-04 23:49:16 +11:00
James Polley
45512e815a Add datatables tools to ticket reports 2017-10-04 20:43:00 +11:00
James Polley
3c6c98021d Clarify function of buttons on profile form
* "return to dashboard" throws away changes, so change the label to
  "cancel" to make this more clear.
* "Save profile" is probably the button you're looking for, so flag it
  as btn-success to make this clear.
2017-10-04 18:06:23 +11:00
James Polley
dd5f789ef3 speakers_dinner_ticket requires acceptance of T&Cs 2017-10-02 09:13:05 +11:00
James Polley
ec71df90c8 Enable adding voucher from the review screen 2017-10-02 00:44:01 +11:00
James Polley
abe4f5ad7a Fix some rules that were overly generous 2017-10-02 00:05:21 +11:00
James Polley
b0de856255 Clarify wording about complimentary products 2017-10-01 22:56:20 +11:00
James Polley
b8dcbd89b7 Draw more attention to the need to select complimentary items
A big complaint from 2017 was that people overlooked things like
shirts and dinner tickets as those are complimentary, so they assumed
they didn't need to choose them.

This change adds some labels and some explanatory text to try to make
this more clear.
2017-10-01 20:02:58 +11:00
James Polley
e325454fab Move agreement to terms to a Category
- Remove field from attendee model
 - Create the category instead
 - Add a product as well
2017-10-01 20:02:45 +11:00
James Polley
348e1c5c82 Javascript hack to make it more clear that postcode is mandatory
On the two pages that display the profile form, add some javascript to
flag the postcode as required whenever the Country is AU
2017-10-01 18:45:29 +11:00
James Polley
38a99f7ae5 And "discount" to EB discount descriptions 2017-10-01 14:50:53 +11:00
James Polley
3f4050d96f Use a YesNo field for T&C/CoC agreement
Using a checkbox doesn't make it obvious that this is required.
2017-10-01 14:48:59 +11:00
James Polley
ac0ef79b73 "Create" an attendee profile 2017-10-01 14:46:50 +11:00
James Polley
7965ac4111 De-dupe discount header/text
The version with the header was better, so let's use that in both
places by moving it inside the template.
2017-10-01 14:44:41 +11:00
James Polley
73964cd820 Update shirt details to match plans 2017-09-30 23:40:46 +10:00
James Polley
68b6fe8f1e Offset polution with correct spelling. 2017-09-30 23:40:16 +10:00
James Polley
e51ad76384 Add a "Back" button to the guided_registration stages
"Next" is green, indicating that it's the default path, the way
forward. "Back" is available but blue.

For extra consistency, the initial "Get ticket" button is now also a btn-success
2017-09-30 18:45:57 +10:00
James Polley
4605ee0d98 Require attendees to agree to Code of Conduct 2017-09-30 18:45:50 +10:00
James Polley
9d7be5f6df Update YesNoField coercion
I am not sure if this is related to a py2/py3 change, or if it's
because django 1.11 changed the way it handles booleans; but either
way, this works.
2017-09-30 18:11:05 +10:00
James Polley
50145c03fe Copy stripe js template into pinaxcon
Shouldnt be neccessary, template loader should be finding the template provided by the installed app.

but it's not, and I want rego to go live today, so here we go.

One day when things are nice this commit can be reverted and I will be crying a little less on the inside.
2017-09-30 10:51:43 +10:00
James Polley
105e6988e5 Merge migrations with upstream
Find urlencode, wherever it may hide

Further work to using latest upstream registrasion
2017-09-30 00:44:21 +10:00
James Polley
5409d4974a The 2018ificiation
I think this removes most references to "hobart", "pycon", and "2017"

There are still some references to some images that we don't have a
replacement for.
2017-09-30 00:44:13 +10:00
James Polley
54fceededa Just one void invoices button is sufficient thanks
And yes, this is changing it back to a button; having it as a link
isn't quite what we want.
2017-09-30 00:44:13 +10:00
James Polley
ed2753d284 Update inventory for 2018 2017-09-24 19:30:40 +10:00
James Polley
bd1031e2cd Neaten "void invoices" button
Only want to show this once - not once per invoice.
It's not something most people will need to use so it doesn't need to
be a button. Restyle it to be a link
2017-09-24 17:53:53 +10:00
James Polley
18047f7549 Show paid/cancelled invoices
An errant ``{% if pending %}`` meant that we were only showing paid
and cancelled invoices - and the ability to buy new products - if
there was currently a pending invoice.

This change remove the errant check and allows for anyone with a paid
invoice to inspect it; or to add products.
2017-09-24 17:53:53 +10:00
James Polley
ba98c36868 Add admin links to review sections that the user can manager 2017-09-22 22:46:21 +10:00
James Polley
1e20731e32 Fix list of teams 2017-09-22 22:46:21 +10:00
James Polley
750902c5c3 Restore messages to site_base template 2017-09-22 22:46:08 +10:00
James Polley
d22f8e8e35 expand proposal admin 2017-09-22 20:13:48 +10:00
James Polley
9b0d830538 Finish adding models/forms/admin for new miniconfs
NB: all the proposal sections for the miniconfs here are set to open
on 2017-11-01. To make them available sooner, visit
/admin/symposion_proposals/proposalsection and change the start date.
2017-09-22 16:45:02 +10:00
James Polley
2a882678db (re)create miniconf proposals
This is a partial revert of  6d864e8ce5
- plucking out the bits we want to re-use
2017-09-22 16:45:02 +10:00
James Polley
7c273cdc3d Fix display of teams on dashboard 2017-09-22 16:19:04 +10:00
James Polley
f058ed7d71 Enable multi-level site-tree
* Remove the outdated compiled javascript once again
* Update the sitetree_header template to use more detail.

The extra detail here is taken from the menu_bootstrap3.html template
distributed with django-sitetree
2017-09-17 20:17:45 +10:00
James Polley
b6a7b8b120 Set review-table class to get goodness on notification page
Flagging this as a review table means we get sorting, pagination, and
search. Much awesome, esp when we want to do this like "show me all
the ones that haven't been notified yet"
2017-09-17 13:16:06 +10:00
James Polley
ecd4bc97bc Expand bulk_accept to generic bulk_update
Allows for bulk rejection/undecided/standby in addition to bulk accept.
2017-09-17 13:15:56 +10:00
James Polley
fa18ef68fb Merge branch 'no-history' into 'master'
Remove jquery.history.js reference

See merge request LCA2018/symposion_app!28
2017-09-16 12:27:11 +00:00
James Polley
b89e6e9b56 Merge branch 'remove-stale-js' into 'master'
Fix review buttons by removing stale compiled JS; also some styling

See merge request LCA2018/symposion_app!27
2017-09-16 12:26:47 +00:00
James Polley
6e17b6d13d Remove jquery.history.js reference
* This reference was added in the very distant past
* But jquery.history.js itself has never been in the repo
* pyconau-2017 team resolved the dilemma but dropping
  jquery.history.js into the repo
* But as near as I can tell, this does nothing except in obsolete
  older browsers. The fact that it's been broken ever since it was
  "added" is highly suggestive of it never having ever been used or
  needed
* So, trim the fat. It's possible that this might break an older
  browser that needs the functionality jquery.history.js provides -
  except that such a browser would *already* be broken because
  jquery.history.js has never actually been around to be used.
* If we ever do need this functionality, we can revert this
  change.. and then we'd have to drop in jquery.history.js. In that
  circumstance,
  https://github.com/pyconau2017/symposion/commit/34bc7c0 may be of interest.
2017-09-16 21:21:12 +10:00
James Polley
5a84a57420 Fix review buttons by removing stale compiled JS; also some styling
Essentially cognate with 0673e35 from the pyconau-2017 fork.
2017-09-16 20:55:10 +10:00
James Polley
8962a1f66d Correct list of tags available in notification templates. 2017-09-14 20:50:54 +10:00
James Polley
d0755eadf6 restore extra_script
This fell out of the template at some point, but is needed for some
javascripty things to work.
2017-09-13 23:10:30 +10:00
James Polley
37fb435e18 Add devmode_settings.py for local dev
* Adds an env variable to .env to turn on dev mode
* Uses the inbuilt django auth rather than saml when in dev mode
* For laziness, re-uses the admin login form for the non-admin login

make_dev_container now comes up ready to be logged into by any
user. No non-admin users are preconfigured; but you can add one at
http://localhost:28000/admin/auth/user/add/, log out, and then hit
http://localhost:28000/ to log in as the new user.
2017-08-28 17:12:05 +10:00
Sachi King
ade44d6a1b Merge branch 'fix_speaker_Addittion_Template' into 'master'
{{ dashboard_url ]} fixup

See merge request !19
2017-08-07 01:53:24 +00:00
Sachi King
75c82aad37 Fix miniconf editing - No attribute issue
Editing a miniconf, on save, the code looks in settings for
ADMIN_USERNAMES, and as it does not exist, we stack-trace and 502 to the
user.

Add the attribute to settings.py
2017-08-04 15:19:32 +10:00
James Polley
473bc8efed {{ dashboard_url ]} fixup 2017-08-04 14:17:44 +10:00
Sachi King
e668bf03c2 Merge branch 'addfavicon' into 'master'
Change favicon to an LCA-appropriate favicon.

See merge request !14
2017-07-04 09:13:37 +00:00
Sachi King
7e5fbc27ea Syntax: How'd that get there 2017-07-03 21:29:16 +10:00
Sachi King
b85ab46ed4 Configure a production email server 2017-07-03 21:18:57 +10:00
James Polley
db328d9354 Change favicon to an LCA-appropriate favicon.
This isn't the same one we're using for the static site - but honestly I think this one is probably better.
2017-07-03 17:36:39 +10:00
James Polley
13bed8999c Merge branch 'other-migrations' into 'master'
Other suggested django migrations

See merge request !12
2017-07-02 12:43:38 +00:00
Jamie Lennox
59207eb0c9 Other suggested django migrations
So django keeps strict synchronization between its code and migrations
so that it can help generating new migrations. These are the additional
suggested migrations. A lot of these are a null effect, some are things
like transforming an unsigned integer to a signed integer. So not super
urgent on a small scale, but worth doing to keep django happy.
2017-07-02 22:38:38 +10:00
Jamie Lennox
10b6358b92 Add release materials check boxes to miniconf proposal
We need to have people who are submitting a miniconf proposal agree to
releasing the material. The easiest way to do this is to just make it a
proposal like the other two types. We don't have audience type for
miniconf, instead of deleting it just have a default - it's easier.

WARNING: This requires a real migration to be performed before use.
2017-07-02 22:31:56 +10:00
Jamie Lennox
4847f13de0 Use Linux Australia for release and not pycon
Update the recording and materials release to say Linux Australia, not
Pycon Australia. This generates a migration because the model text has
change - but also because in the 0001_initial migration it appears that
this help text is stored as a byte string.

This is a bit weird, but realistically running this migration is not
going to cause us any problems so just add it so we don't end up
fighting django along the way.
2017-07-02 22:11:18 +10:00
Sachi King
db3e6bbffe This is why we can't have nice things 2017-06-26 22:46:11 +10:00
Sachi King
e52dbd9c54 Missed an import 2017-06-26 22:43:58 +10:00
Sachi King
22680dd663 dashboard at / 2017-06-26 22:20:20 +10:00
Sachi King
1a54b0f9d6 Collect Static so admin works
Thanks tchaypo and jammielennox

Closes #11
2017-06-26 21:11:15 +10:00
Sachi King
ed81eb3e88 Is a dict 2017-06-24 17:01:25 +10:00
Sachi King
f07b20aebd DATABASE_URL as ENV_VAR 2017-06-24 15:59:46 +10:00
Sachi King
d106efb6ce Fix static content serving
What?  Why did this stop working?
2017-06-10 13:19:40 +10:00
Jamie Lennox
2eb2383b6c Display failure messages when environment variables missing
Running migrate initially as specified from README leads to a cryptic
"CONFIG ERROR" failure message. Print out what variables are actually
missing.
2017-06-10 12:00:31 +10:00
Sachi King
0c73ad13f0 Add our vendor path to our path
I guess this is as good a method as any to get or vendored packages in.
2017-05-27 20:48:24 +10:00
Sachi King
8cf348acb5 Make proposal-detail more friendly to read 2017-05-07 16:15:41 +10:00
Sachi King
c73a7e3ff9 Use monospace font, hack, and not markdown.
Font should be made local and not remote loaded.
2017-05-07 13:18:42 +10:00
Sachi King
781921e022 Use app.css not inlined css
Simpler for us.
2017-05-07 13:11:33 +10:00
Sachi King
f8a9416600 Remove unused "hooks"
This isn't used, drop it.
2017-05-07 13:08:52 +10:00
Sachi King
bb573ebee4 settings - DEBUG hardening
DEBUG is something that should never be turned in on prod.  As such,
lets be extremely specific on what we expect to process.

As we'll be taking this in from the environment, it's ensured we will
get a string.  So we'll always get and only handle this in string
form.  If it's anything else, it's an operational error and we bail.

(Note: bool('0') is truthy, so we make sure we leverge our string -> int
-> bool every time, so corectness can be noticed if it is not)
2017-04-30 12:10:56 +10:00
Sachi King
46b85fa778 settings saml2_contact type is wrong.
We had List[Dict[str, str]], but this was passed without question from
djangosaml2 to pysaml2 no questions asked, which expects Dict[str, str].
2017-04-30 11:38:26 +10:00
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