Commit 8eaa86da authored by Daniel W Bond's avatar Daniel W Bond

changed template variable names for form to reflect elimination of get_context_data in views

parent 3b2966cc
Pipeline #1358 passed with stage
in 3 minutes and 31 seconds
...@@ -44,9 +44,9 @@ ...@@ -44,9 +44,9 @@
email address to <a href="https://en.gravatar.com/">Gravatar</a>. email address to <a href="https://en.gravatar.com/">Gravatar</a>.
</p> </p>
<hr /> <hr />
{% if my_form.non_field_errors %} {% if form.non_field_errors %}
<ul class="text-center"> <ul class="text-center">
{% for error in my_form.non_field_errors %} {% for error in form.non_field_errors %}
<li class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</li> <li class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</li>
{% endfor %} {% endfor %}
</ul> </ul>
...@@ -67,23 +67,23 @@ ...@@ -67,23 +67,23 @@
{% endif %} {% endif %}
<div class="form-group"> <div class="form-group">
<div class="col-sm-6"> <div class="col-sm-6">
<label for="{{ my_form.first_name.id_for_label }}">First Name</label> <label for="{{ form.first_name.id_for_label }}">First Name</label>
{% if not my_form.first_name.errors %} {% if not form.first_name.errors %}
{{ my_form.first_name }} {{ form.first_name }}
{% else %} {% else %}
<div class="has-error"> <div class="has-error">
{{ my_form.first_name }} {{ form.first_name }}
<p>{{ form.first_name.errors }}</p> <p>{{ form.first_name.errors }}</p>
</div> </div>
{% endif %} {% endif %}
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<label for="{{ my_form.last_name.id_for_label }}">Last Name</label> <label for="{{ form.last_name.id_for_label }}">Last Name</label>
{% if not my_form.last_name.errors %} {% if not form.last_name.errors %}
{{ my_form.last_name }} {{ form.last_name }}
{% else %} {% else %}
<div class="has-error"> <div class="has-error">
{{ my_form.last_name }} {{ form.last_name }}
<p>{{ form.last_name.errors }}</p> <p>{{ form.last_name.errors }}</p>
</div> </div>
{% endif %} {% endif %}
...@@ -95,11 +95,11 @@ ...@@ -95,11 +95,11 @@
{% endfor %} {% endfor %}
{% endif %} {% endif %}
<div class="form-group"> <div class="form-group">
<label for="{{ my_form.gender.id_for_label }}" class="col-xs-12"> <label for="{{ form.gender.id_for_label }}" class="col-xs-12">
Gender Identity Gender Identity
<p class="help-block">(choose all that apply)</p> <p class="help-block">(choose all that apply)</p>
</label> </label>
{% for checkbox in my_form.gender %} {% for checkbox in form.gender %}
<div class="checkbox col-md-3 col-sm-3 col-sm-offset-1 col-xs-5 col-xs-offset-1"> <div class="checkbox col-md-3 col-sm-3 col-sm-offset-1 col-xs-5 col-xs-offset-1">
<label for="{{ checkbox.id_for_label }}"> <label for="{{ checkbox.id_for_label }}">
{{ checkbox.choice_label|gender_icon }} {{ checkbox.choice_label|gender_icon }}
...@@ -115,26 +115,26 @@ ...@@ -115,26 +115,26 @@
{% endif %} {% endif %}
<div class="form-group"> <div class="form-group">
<div class="col-md-4"> <div class="col-md-4">
<label for="{{ my_form.show_gender.id_for_label }}"> <label for="{{ form.show_gender.id_for_label }}">
Show Gender on Profile? Show Gender on Profile?
</label><br /> </label><br />
{% for option in my_form.show_gender %} {% for option in form.show_gender %}
<label class="radio-inline">{{ option.choice_label }}{{ option.tag }}</label> <label class="radio-inline">{{ option.choice_label }}{{ option.tag }}</label>
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
<hr /> <hr />
{% if my_form.major.errors %} {% if form.major.errors %}
{% for error in my_form.major.errors %} {% for error in form.major.errors %}
<p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p> <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
<div class="form-group"> <div class="form-group">
<div class="col-lg-9"> <div class="col-lg-9">
<label for="{{ my_form.major.id_for_label }}"> <label for="{{ form.major.id_for_label }}">
Major(s) Major(s)
</label><br /> </label><br />
{{ my_form.major }} {{ form.major }}
</div> </div>
</div> </div>
{% if form.graduating_year.errors %} {% if form.graduating_year.errors %}
...@@ -144,10 +144,10 @@ ...@@ -144,10 +144,10 @@
{% endif %} {% endif %}
<div class="form-group"> <div class="form-group">
<div class="col-lg-3 col-md-3 col-sm-4 col-xs-6"> <div class="col-lg-3 col-md-3 col-sm-4 col-xs-6">
<label for="{{ my_form.graduating_year.id_for_label }}"> <label for="{{ form.graduating_year.id_for_label }}">
Graduating Year Graduating Year
</label> </label>
{{ my_form.graduating_year }} {{ form.graduating_year }}
</div> </div>
</div> </div>
{% if not request.user.student.recent_changes > 2 %} {% if not request.user.student.recent_changes > 2 %}
...@@ -163,10 +163,10 @@ ...@@ -163,10 +163,10 @@
{% endif %} {% endif %}
<div class="form-group"> <div class="form-group">
<div class="col-md-4"> <div class="col-md-4">
<label for="{{ my_form.on_campus.id_for_label }}"> <label for="{{ form.on_campus.id_for_label }}">
Do You Live on Campus? Do You Live on Campus?
</label><br/> </label><br/>
{% for option in my_form.on_campus %} {% for option in form.on_campus %}
<label class="radio-inline">{{ option.choice_label }}{{ option.tag }}</label> <label class="radio-inline">{{ option.choice_label }}{{ option.tag }}</label>
{% endfor %} {% endfor %}
</div> </div>
...@@ -182,43 +182,44 @@ ...@@ -182,43 +182,44 @@
{% endfor %} {% endfor %}
{% endif %} {% endif %}
<div class="form-group"> <div class="form-group">
{{ my_form.room }} {{ form.room }}
</div> </div>
<p class="help-block"> </div>
Your privacy settings affect the visibility of both your room and your social media accounts. {% endif %}
</p> <hr />
{% if form.privacy.errors %} <p class="help-block">
{% for error in form.privacy.errors %} Your privacy settings affect the visibility of both your room and your social media accounts.
<p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p> </p>
{% endfor %} {% if form.privacy.errors %}
{% endif %} {% for error in form.privacy.errors %}
<div class="form-group"> <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
<div class="col-md-3 col-sm-6"> {% endfor %}
<label for="{{ my_form.privacy.id_for_label }}"> {% endif %}
Privacy <div class="form-group">
</label><br/> <div class="col-md-3 col-sm-6">
{{ my_form.privacy }} <label for="{{ form.privacy.id_for_label }}">
</div> Privacy
</label><br/>
{{ form.privacy }}
</div> </div>
</div> </div>
<hr /> <hr />
<p class="help-block"> <p class="help-block">
You will not be able to see these students, and they will not be able to see you. You will not be able to see these students, and they will not be able to see you.
</p> </p>
{% if form.blocked_kids.errors %} {% if form.blocked_kids.errors %}
{% for error in form.blocked_kids.errors %} {% for error in form.blocked_kids.errors %}
<p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p> <p class="text-danger"><i class="fa fa-exclamation-triangle fa-fw"></i> {{ error }}</p>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
<div class="form-group"> <div class="form-group">
<div class="col-xs-12"> <div class="col-xs-12">
<label for="{{ my_form.blocked_kids.id_for_label }}"> <label for="{{ form.blocked_kids.id_for_label }}">
Blocked Students Blocked Students
</label> </label>
{{ my_form.blocked_kids }} {{ form.blocked_kids }}
</div> </div>
</div> </div>
{% endif %}
<hr /> <hr />
<input type="submit" value="Save" class="btn btn-primary"/> <input type="submit" value="Save" class="btn btn-primary"/>
</fieldset> </fieldset>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment