From d2c08c0efec04f80ac470ca19761ad0d99cfc262 Mon Sep 17 00:00:00 2001 From: frekk <frekk@ucc.asn.au> Date: Fri, 25 Jan 2019 09:18:04 +0800 Subject: [PATCH] refactor templates to use base_form.html --- src/memberdb/templates/base_form.html | 46 ++++++++++++++++++++++++ src/memberdb/templates/home.html | 2 +- src/memberdb/templates/register.html | 50 ++++----------------------- src/memberdb/templates/renew.html | 4 +-- 4 files changed, 56 insertions(+), 46 deletions(-) create mode 100644 src/memberdb/templates/base_form.html diff --git a/src/memberdb/templates/base_form.html b/src/memberdb/templates/base_form.html new file mode 100644 index 0000000..76d12e8 --- /dev/null +++ b/src/memberdb/templates/base_form.html @@ -0,0 +1,46 @@ +{% extends "base.html" %} + +{% block content_title %}<h1>Enter your details</h1>{% endblock %} + +{% block content %} +<div class="form-container"> + <div class="form-header"> + <span class="tips"> + {% block tips %} + Enter your details into the fields below, then click the button to save. + {% endblock %} + </span> + </div> + {% block form %} + <form action="{% block action_url %}{% url 'memberdb:register' %}{% endblock %}" method="post"> + + {% csrf_token %} + + {% if form.non_field_errors|length > 0 %} + <p class="errornote"> + Please correct the errors below. + </p> + {{ form.non_field_errors }} + {% endif %} + + {% block extra_preform %}{% endblock %} + + {% for field in form %} + <div class="form-row"> + {{ field.errors }} + {{ field.label_tag }} + {{ field }} + {% if field.field.help_text %} + <p class="help"> + {{ field.field.help_text|safe }} + </p> + {% endif %} + </div> + {% endfor %} + <div class="submit-row"> + <input type="submit" class="default" value="{% block action_text %}Register{% endblock %}"> + </div> + </form> + {% endblock %} +</div> +{% endblock %} diff --git a/src/memberdb/templates/home.html b/src/memberdb/templates/home.html index 0070e90..0901a2d 100644 --- a/src/memberdb/templates/home.html +++ b/src/memberdb/templates/home.html @@ -1,4 +1,4 @@ -{% extends "register.html" %} +{% extends "base_form.html" %} {% block title %}UCC Member Home{% endblock %} {% block content_title %} <h1>Member home</h1> diff --git a/src/memberdb/templates/register.html b/src/memberdb/templates/register.html index 1aa7b76..3a318e0 100644 --- a/src/memberdb/templates/register.html +++ b/src/memberdb/templates/register.html @@ -1,49 +1,13 @@ -{% extends "base.html" %} +{% extends "base_form.html" %} {% block title %}UCC Registration{% endblock %} {% block content_title %}<h1>Register as a new member</h1>{% endblock %} -{% block content %} -<div class="form-container"> - <div class="form-header"> - <span class="tips"> - {% block tips %} - Enter your details, and press "Register" when you are done.<br> - Once your membership has been approved, you will receive an email with further instructions to activate your account. - {% endblock %} - </span> - </div> - {% block form %} - <form action="{% block action_url %}{% url 'memberdb:register' %}{% endblock %}" method="post"> +{% block tips %} + Enter your details, and press "Register" when you are done.<br> + Once your membership has been approved, you will receive an email with further instructions to activate your account. +{% endblock %} - {% csrf_token %} - - {% if form.non_field_errors|length > 0 %} - <p class="errornote"> - Please correct the errors below. - </p> - {{ form.non_field_errors }} - {% endif %} - - {% block extra_preform %}{% endblock %} - - {% for field in form %} - <div class="form-row"> - {{ field.errors }} - {{ field.label_tag }} - {{ field }} - {% if field.field.help_text %} - <p class="help"> - {{ field.field.help_text|safe }} - </p> - {% endif %} - </div> - {% endfor %} - <div class="submit-row"> - <input type="submit" class="default" value="{% block action_text %}Register{% endblock %}"> - </div> - </form> - {% endblock %} -</div> -{% endblock %} \ No newline at end of file +{% block action_url %}{% url 'memberdb:register' %}{% endblock %} +{% block action_text %}Register{% endblock %} diff --git a/src/memberdb/templates/renew.html b/src/memberdb/templates/renew.html index 8767da4..6fc5842 100644 --- a/src/memberdb/templates/renew.html +++ b/src/memberdb/templates/renew.html @@ -1,4 +1,4 @@ -{% extends "register.html" %} +{% extends "base_form.html" %} {% block title %}UCC Membership Renewal{% endblock %} {% block content_title %} <h1>Renew your membership</h1> @@ -22,4 +22,4 @@ Please confirm that the details below have not changed since your last registrat {% block action_url %}{% url 'memberdb:renew' %}{% endblock %} -{% block action_text %}Renew{% endblock %} \ No newline at end of file +{% block action_text %}Renew{% endblock %} -- GitLab