Commit graph

223 commits

Author SHA1 Message Date
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
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
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
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
ec71df90c8 Enable adding voucher from the review screen 2017-10-02 00:44:01 +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
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
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
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
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
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
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
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
473bc8efed {{ dashboard_url ]} fixup 2017-08-04 14:17:44 +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
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
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
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
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
18fcfddad6 Errors should be big red boxes 2017-04-23 17:21:19 +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
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
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
88bcd5fe65 Switch to LCA2017 templates
This fixes proposal details.
2017-04-08 20:13:28 +10:00
Sachi King
a0ee642cc3 Cleanup templates
Unused tags
Unused templates
Leftovers pinax-pages templates
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
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
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
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