Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Three forms project #1525

wants to merge 146 commits into
base: develop


Copy link

commented Aug 29, 2019

This PR contains changes made to AMY in regards to latest big project - three-way forms (workshop request form, workshop inquiry form and self-organized submission form).

Workshops: add InfoSource model
This model will be used for asking people where did they hear about
The Carpentries.  It will be used by WorkshopRequest and WorkshopInquiry
Workshops: extend Curriculum model with more fields
These fields will help with display of curricula items, or with
sorting / aggregating by carpentry type (SWC / DC / LC).
Fake radio select multiple: for Django to think this field can return…
… multiple choices

This is useful eg. in the form where we'd need to scale down from M2M
to FK.
MOVE BEFORE "Workshop Req form: update accordingly"
This displays not one, but two (or more) underlying "Other" fields.
It's used by extreq forms to display other institution name and URL
Update forms according to feedback
Changes include:
* no default options for some radioselects
* <HR>s moved around
* fields moved around
* changed widgets
* updated labels and help_texts

Changes were reflected in included migrations.
Update field.html template
Change position of help_texts and errors for all form fields.
Additionally move around (add margins and what-not) to subfields.
Adjust workshop landing page
Bigger text, bigger buttons (not a list anymore).
Fix landing page links (they were swapped)
And distribute buttons centrally within their columns.
Form templates improvements
1. logo is now included from an "includes/" template
2. logo has bottom padding to better separate visually text below it
3. the whole page (logo + lead text + form) has even spacing on left and
   right hand sides. Previously the lead text had no spacing and the
   form had one column more on the right than on the left.
Use wiser <hr> in forms
This commit changes the way hardcoded <hr> appears in forms.
Add new Academic level ("staff") and Info Source ("part of TC communi…

Change sorting in Academic level: "Don't know yet" must go last.

@pbanaszkiewicz pbanaszkiewicz force-pushed the pbanaszkiewicz:three-form-project branch from 2970656 to 5ebd339 Sep 13, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.