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

2022 cfp #1053

Merged
merged 25 commits into from
Feb 28, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
ed84718
feat(core/models.py): Add new fields in EventInfo
setmao Feb 20, 2022
bdf6695
feat(proposals/forms): Add new fields in proposal froms
setmao Feb 20, 2022
d0a5e24
feat(django.po): Update i18n
setmao Feb 20, 2022
05b3611
feat(all): Add 2022 config
setmao Feb 26, 2022
37e1313
style(css): Update style
setmao Feb 27, 2022
51aa33b
fix(proposals.py): Fix typo
setmao Feb 27, 2022
bfe7a52
feat(proposals): Remove remoting_policy
setmao Feb 27, 2022
f42c6a4
feat(core/models.py): Add talk_language
setmao Feb 27, 2022
a8c02b7
refactor(proposals/forms.py): Update text
setmao Feb 27, 2022
a23e2db
feat(migrations): Add migrations
setmao Feb 27, 2022
17ca233
feat(django.po): Update po
setmao Feb 27, 2022
a7d46ee
refactor(django.po): Update po
setmao Feb 27, 2022
02e0fcf
build(docker-compose.yml): Update container name to 2022
setmao Feb 27, 2022
4775794
build(docker-compose.yml): Update to 2022
setmao Feb 27, 2022
5e67b97
style(_proposals.scss): Fix background image
setmao Feb 27, 2022
9985ba9
style(nav_base.html): Fix nav bar
setmao Feb 27, 2022
52c33f5
feat(forms/proposals.py): Let talk language is not required
setmao Feb 28, 2022
7bcdc2d
style(_proposals.scss): Fix css
setmao Feb 28, 2022
009e816
feat(proposals/): Refine pre_recorded_policy
setmao Feb 28, 2022
108ea47
feat(django.po): Update po
setmao Feb 28, 2022
51bd4ad
fix(django.po): Update po
setmao Feb 28, 2022
4fe67e7
Merge branch 'master' of github.com:pycontw/pycon.tw into 2022_cfp
setmao Feb 28, 2022
d75d78a
fix(migrations/): Fix migrations
setmao Feb 28, 2022
9b0d299
test(tests/): Fix test
setmao Feb 28, 2022
e0fd6a1
test(tests/): Fix test
setmao Feb 28, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(proposals/): Refine pre_recorded_policy
  • Loading branch information
setmao committed Feb 28, 2022
commit 009e81687c506b12ffeaf423334f6618146778e9
33 changes: 28 additions & 5 deletions src/proposals/forms/mixins.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class Meta:
'detailed_description': SimpleMDEWidget(),
'outline': SimpleMDEWidget(),
'supplementary': SimpleMDEWidget(),
'pre_recorded_policy': forms.CheckboxInput(),
}
help_texts = {
'abstract': _(
Expand Down Expand Up @@ -75,9 +76,11 @@ class Meta:
"target='_blank' rel='noopener'>Markdown</a>."
),
'recording_policy': format_html_lazy(
_("Whether you agree to give permission to PyCon Taiwan to "
"record, edit, and release audio and video of your "
"presentation. More information can be found at "
_("PyCon Taiwan will do post-processing to all the presentation "
"videos, including but not limited to applying video template, "
"banners of sponsors’ logos. Do you agree to give permission to "
"PyCon Taiwan to release audio and video of your presentation "
"after the conference? More information can be found at "
"<a href='{frontend_host}/en-us/speaking/recording' target='_blank'>"
"Recording Release</a> page."),
frontend_host=f"{settings.FRONTEND_HOST}"
Expand Down Expand Up @@ -139,11 +142,14 @@ class Meta:
"After your proposal is accepted, a pre-recording of the presentation "
"will be provided to the PyCon APAC 2022 organizing team prior to the "
"conference.<br>"
"<strong>Bonus for living in Taiwan</strong>"
"<strong>Bonus for living in Taiwan</strong><br>"
"For speakers who reside in Taiwan, we will offer a slot and assist you "
"to record the presentation in a professional video studio in Taipei "
"(travel expenses covered)."
)
),
'talk_language': _(
"If your previous option is not English, please enter your speaking language"
),
}


Expand All @@ -158,6 +164,7 @@ class Meta:
'detailed_description': SimpleMDEWidget(),
'outline': SimpleMDEWidget(),
'supplementary': SimpleMDEWidget(),
'pre_recorded_policy': forms.CheckboxInput(),
}
help_texts = {
'duration': _(
Expand Down Expand Up @@ -238,4 +245,20 @@ class Meta:
"only for the remote attendees to watch ? (we will not release "
"audio and video of your presentation)"
),
'pre_recorded_policy': _(
"Due to the ongoing global pandemic, <strong>PyCon APAC 2022 will "
"be held fully remote. All online talks this year will be pre-recorded "
"</strong> so we can broadcast your presentation to the audience "
"without the network troubles and the time zone differences.<br>"
"After your proposal is accepted, a pre-recording of the presentation "
"will be provided to the PyCon APAC 2022 organizing team prior to the "
"conference.<br>"
"<strong>Bonus for living in Taiwan</strong><br>"
"For speakers who reside in Taiwan, we will offer a slot and assist you "
"to record the presentation in a professional video studio in Taipei "
"(travel expenses covered)."
),
'talk_language': _(
"If your previous option is not English, please enter your speaking language"
),
}
4 changes: 2 additions & 2 deletions src/proposals/forms/proposals.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ class Meta(TalkProposalMixin.Meta):
'first_time_speaker',
'referring_policy',
'prefer_time',
'pre_recorded_policy',
'living_in_taiwan',
'pre_recorded_policy',
]


Expand Down Expand Up @@ -79,8 +79,8 @@ class Meta(TutorialProposalMixin.Meta):
'recording_policy',
'live_stream_policy',
'prefer_time',
'living_in_taiwan',
'pre_recorded_policy',
'living_in_taiwan',
]


Expand Down
12 changes: 12 additions & 0 deletions src/static/js/proposals/proposal_form.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,16 @@
}
});

if (!$('#id_pre_recorded_policy').is(':checked')) {
$('button.btn-primary:submit').prop('disabled', true);
}

$('#id_pre_recorded_policy').change(function() {
if (this.checked) {
$('button.btn-primary:submit').prop('disabled', false);
} else {
$('button.btn-primary:submit').prop('disabled', true);
}
});

})(jQuery);