Skip to content

Changes to vj25 playerform #104

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.

Sign up for GitHub

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

Merged
jiisloth merged 2 commits into from
Jan 25, 2025
Merged

Changes to vj25 playerform #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfdb46d
Added changes for 24 submit form
jiisloth Jan 24, 2025
c5ebc6a
Merge pull request #103 from Vauhtijuoksu/trunk
jiisloth Jan 24, 2025
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
2 changes: 1 addition & 1 deletion marathon/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Meta:


class SubmissionForm(forms.ModelForm):
gdpr = forms.BooleanField(required=True, label=_('Hyväksyn henkilötietojeni käsittelyn tietosuojaselosteen mukaisesti'))
gdpr = forms.BooleanField(required=True, label=_('Hyväksyn henkilötietojeni käsittelyn tietosuojaselosteen mukaisesti ja sitoudun noudattamaan turvallisen tilan periaatteita.'))

def clean_estimate(self):

Expand Down
15 changes: 15 additions & 0 deletions static/genericSideViuhti/css/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,21 @@ h1, h2, h3, h4, h5, h6{
max-width: 74%;
}
}
#player-form, #game-form{
input, textarea{
background-color: $viuhti-green;
border-color: $viuhti-dark;
color: $viuhti-dark;
}
input::placeholder, textarea::placeholder{
color: #748f94;
opacity: 1;
}
.form-text{
color: #0f2225 !important;
}
}


.side-page-layout {
display: flex;
Expand Down
4 changes: 3 additions & 1 deletion templates/marathon/plugins/submission_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@
<!-- Player forms -->
<div id="player-form">
{% bootstrap_field player_form.nickname placeholder="Nimimerkki pelaajalistaukseen" layout="horizontal" form_group_class="mb-1" %}
{% bootstrap_field player_form.discord placeholder="Nick#1337" layout="horizontal" form_group_class="mb-1" %}
{% bootstrap_field player_form.discord placeholder="Nick" layout="horizontal" form_group_class="mb-1" %}
{% bootstrap_field player_form.gmail placeholder="etu.suku@gmail.com" layout="horizontal" form_group_class="mb-1" %}
{% bootstrap_field player_form.twitch placeholder="nimi_merkki" layout="horizontal" form_group_class="mb-1" %}
{% comment %}
{% bootstrap_field player_form.allergies placeholder="Tapahtuman aikaista ruokahuoltoa varten" layout="horizontal" form_group_class="mb-1" %}
{% endcomment %}
</div>
<!-- Submission form -->
<div id="game-form" class="mt-3">
Expand Down
Loading