Skip to content

Commit

Permalink
* Add better form validation error messages to all the forms.
Browse files Browse the repository at this point in the history
  • Loading branch information
@bgroff
bgroff committed Jun 28, 2018
1 parent bcc6743 commit f496e7b
Show file tree
Hide file tree
Showing 13 changed files with 289 additions and 69 deletions.
7 changes: 6 additions & 1 deletion django_kala/auth/templates/accounts/settings/avatar.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,16 @@
</div>
</div>
<div class="twelve wide column">
<form class="ui form" method="post" enctype="multipart/form-data">
<form class="ui form {% if form.errors %}error{% endif %}" enctype="multipart/form-data" method="post">
{% csrf_token %}
<div class="field">
<label>{{ form.avatar.label }}</label>
{{ form.avatar }}
{% if form.avatar.errors %}
<div class="ui error message">
{{ form.avatar.errors }}
</div>
{% endif %}
</div>
<button class="ui button primary" type="submit">Update avatar</button>
</form>
Expand Down
37 changes: 36 additions & 1 deletion django_kala/auth/templates/accounts/settings/details.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,35 +57,70 @@
</div>
</div>
<div class="twelve wide column">
<form class="ui form" method="post">
<form class="ui form {% if form.errors %}error{% endif %}" method="post">
{% csrf_token %}
<div class="field">
<label>{{ form.email.label }}</label>
{{ form.email }}
{% if form.email.errors %}
<div class="ui error message">
{{ form.email.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.first_name.label }}</label>
{{ form.first_name }}
{% if form.first_name.errors %}
<div class="ui error message">
{{ form.first_name.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.last_name.label }}</label>
{{ form.last_name }}
{% if form.last_name.errors %}
<div class="ui error message">
{{ form.last_name.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.title.label }}</label>
{{ form.title }}
{% if form.title.errors %}
<div class="ui error message">
{{ form.title.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.timezone.label }}</label>
{{ form.timezone }}
{% if form.timezone.errors %}
<div class="ui error message">
{{ form.timezone.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.mobile.label }}</label>
{{ form.mobile }}
{% if form.mobile.errors %}
<div class="ui error message">
{{ form.mobile.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.office.label }}</label>
{{ form.office }}
{% if form.office.errors %}
<div class="ui error message">
{{ form.office.errors }}
</div>
{% endif %}
</div>
<button class="ui button primary" type="submit">Update details</button>
</form>
Expand Down
49 changes: 34 additions & 15 deletions django_kala/organizations/templates/organizations/invite_user.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,46 @@ <h2 class="active section">Invite User
</div>
<div class="ui divider"></div>
</div>
{{ form.errors }}
<div class="ui one column grid container">
<div class="twelve wide column">
<form class="ui form" method="post" enctype="multipart/form-data">
{% csrf_token %}
<div class="field">
<label>{{ form.email.label }}</label>
{{ form.email }}
<form class="ui form {% if form.errors %}error{% endif %}" method="post">
{% csrf_token %}
<div class="field">
<label>{{ form.email.label }}</label>
{{ form.email }}
{% if form.email.errors %}
<div class="ui error message">
{{ form.email.errors }}
</div>
<div class="field">
<label>{{ form.first_name.label }}</label>
{{ form.first_name }}
{% endif %}
</div>
<div class="field">
<label>{{ form.first_name.label }}</label>
{{ form.first_name }}
{% if form.first_name.errors %}
<div class="ui error message">
{{ form.first_name.errors }}
</div>
<div class="field">
<label>{{ form.last_name.label }}</label>
{{ form.last_name }}
{% endif %}
</div>
<div class="field">
<label>{{ form.last_name.label }}</label>
{{ form.last_name }}
{% if form.last_name.errors %}
<div class="ui error message">
{{ form.last_name.errors }}
</div>
<div class="field">
<label>{{ form.user_type.label }}</label>
{{ form.user_type }}
{% endif %}
</div>
<div class="field">
<label>{{ form.user_type.label }}</label>
{{ form.user_type }}
{% if form.user_type.errors %}
<div class="ui error message">
{{ form.user_type.errors }}
</div>
{% endif %}
</div>
<button id="submit-button" class="ui button primary" type="submit">Invite user</button>
</form>
</div>
Expand Down
47 changes: 46 additions & 1 deletion django_kala/organizations/templates/organizations/new_organization.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,43 +15,88 @@ <h2 class="active section">New Organization</h2>

<div class="ui one column grid container">
<div class="twelve wide column">
<form class="ui form" method="post">
<form class="ui form {% if form.errors %}error{% endif %}" method="post">
{% csrf_token %}
<div class="field">
<label>{{ form.name.label }}</label>
{{ form.name }}
{% if form.name.errors %}
<div class="ui error message">
{{ form.name.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.address.label }}</label>
{{ form.address }}
{% if form.address.errors %}
<div class="ui error message">
{{ form.address.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.address1.label }}</label>
{{ form.address1 }}
{% if form.address1.errors %}
<div class="ui error message">
{{ form.address1.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.city.label }}</label>
{{ form.city }}
{% if form.city.errors %}
<div class="ui error message">
{{ form.city.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.state.label }}</label>
{{ form.state }}
{% if form.state.errors %}
<div class="ui error message">
{{ form.state.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.zip.label }}</label>
{{ form.zip }}
{% if form.zip.errors %}
<div class="ui error message">
{{ form.zip.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.country.label }}</label>
{{ form.country }}
{% if form.country.errors %}
<div class="ui error message">
{{ form.country.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.phone.label }}</label>
{{ form.phone }}
{% if form.phone.errors %}
<div class="ui error message">
{{ form.phone.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.website.label }}</label>
{{ form.website }}
{% if form.phone.errors %}
<div class="ui error message">
{{ form.website.errors }}
</div>
{% endif %}
</div>
<button class="ui button primary" type="submit">Create ogranization</button>
</form>
Expand Down
65 changes: 55 additions & 10 deletions django_kala/organizations/templates/organizations/settings/details.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,43 +44,88 @@
</div>
</div>
<div class="twelve wide column">
<form class="ui form" method="post">
<form class="ui form {% if form.errors %}error{% endif %}" method="post">
{% csrf_token %}
<div class="field">
<label>{{ form.name.label }}</label>
<input id={{ form.name.auto_id }} type="text" name="{{ form.name.name }}" placeholder="Project Name" value="{{ form.name.value }}" maxlength="{{ form.fields.name.max_length }} required">
{{ form.name }}
{% if form.name.errors %}
<div class="ui error message">
{{ form.name.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.address.label }}</label>
<input id={{ form.address.auto_id }} type="text" name="{{ form.address.name }}" placeholder="Address" value="{{ form.address.value }}" maxlength="{{ form.fields.address.max_length }} required">
{{ form.address }}
{% if form.address.errors %}
<div class="ui error message">
{{ form.address.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.address1.label }}</label>
<input id={{ form.address1.auto_id }} type="text" name="{{ form.address1.name }}" placeholder="Address additional" value="{{ form.address1.value }}" maxlength="{{ form.fields.address1.max_length }} required">
{{ form.address1 }}
{% if form.address1.errors %}
<div class="ui error message">
{{ form.address1.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.city.label }}</label>
<input id={{ form.city.auto_id }} type="text" name="{{ form.city.name }}" placeholder="City" value="{{ form.city.value }}" maxlength="{{ form.fields.city.max_length }} required">
{{ form.city }}
{% if form.city.errors %}
<div class="ui error message">
{{ form.city.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.state.label }}</label>
<input id={{ form.state.auto_id }} type="text" name="{{ form.state.name }}" placeholder="State" value="{{ form.state.value }}" maxlength="{{ form.fields.state.max_length }} required">
{{ form.state }}
{% if form.state.errors %}
<div class="ui error message">
{{ form.state.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.zip.label }}</label>
<input id={{ form.zip.auto_id }} type="text" name="{{ form.zip.name }}" placeholder="Zip code" value="{{ form.zip.value }}" maxlength="{{ form.fields.zip.max_length }} required">
{{ form.zip }}
{% if form.zip.errors %}
<div class="ui error message">
{{ form.zip.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.country.label }}</label>
<input id={{ form.country.auto_id }} type="text" name="{{ form.country.name }}" placeholder="Country" value="{{ form.country.value }}" maxlength="{{ form.fields.country.max_length }} required">
{{ form.country }}
{% if form.country.errors %}
<div class="ui error message">
{{ form.country.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.phone.label }}</label>
<input id={{ form.phone.auto_id }} type="text" name="{{ form.phone.name }}" placeholder="Phone number" value="{{ form.phone.value }}" maxlength="{{ form.fields.phone.max_length }} required">
{{ form.phone }}
{% if form.phone.errors %}
<div class="ui error message">
{{ form.phone.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.website.label }}</label>
<input id={{ form.website.auto_id }} type="text" name="{{ form.website.name }}" placeholder="Website" value="{{ form.website.value }}" maxlength="{{ form.fields.website.max_length }} required">
{{ form.website }}
{% if form.phone.errors %}
<div class="ui error message">
{{ form.website.errors }}
</div>
{% endif %}
</div>
<button class="ui button primary" type="submit">Update details</button>
</form>
Expand Down
22 changes: 21 additions & 1 deletion django_kala/projects/templates/documents/new_document.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,43 @@

<div class="ui one column grid container">
<div class="twelve wide column">
<form class="ui form" method="post" enctype="multipart/form-data">
<form class="ui form {% if form.errors or version_form.errors %}error{% endif %}" enctype="multipart/form-data" method="post">
{% csrf_token %}
<div class="field">
<label>{{ version_form.file.label }}</label>
{{ version_form.file }}
{% if version_form.file.errors %}
<div class="ui error message">
{{ version_form.file.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ version_form.description.label }}</label>
{{ version_form.description }}
{% if version_form.description.errors %}
<div class="ui error message">
{{ version_form.description.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.category.label }}</label>
{{ form.category }}
{% if form.category.errors %}
<div class="ui error message">
{{ form.category.errors }}
</div>
{% endif %}
</div>
<div class="field">
<label>{{ form.tags.label }}</label>
{{ form.tags }}
{% if form.tags.errors %}
<div class="ui error message">
{{ form.tags.errors }}
</div>
{% endif %}
</div>
<button id="submit-button" class="ui button primary" type="submit">Create document</button>
</form>
Expand Down

0 comments on commit f496e7b

Please sign in to comment.