Skip to content
Snippets Groups Projects
Commit 573ed49d authored by frekk's avatar frekk
Browse files

updated templates

parent 7fd07f8f
Branches
No related merge requests found
......@@ -31,7 +31,13 @@ body {
border-style: 2px solid #8fc;
border-radius: 5px;
padding: 20px;
margin: 40px;
margin: 10px;
}
.form-container .tips {
margin: 10px 10px 20px 10px;
color: #555;
text-align: center;
}
fieldset {
......@@ -55,7 +61,8 @@ fieldset {
/* style text boxes */
.form-row input[type="text"],
.form-row input[type="email"] {
.form-row input[type="email"],
.form-row input[type="password"] {
display: block;
padding: 4px;
font-size: 14px;
......@@ -63,12 +70,19 @@ fieldset {
width: 100%;
}
.form-row input[type=checkbox] {
.form-row input[type=checkbox],
.form-row.readonly .text {
display: inline;
font-size: 14px;
line-height: 20px;
}
.form-row.readonly .text {
font-size: 16px;
padding-left: 10px;
color: #444;
}
.help {
margin: 0 40px;
}
......
......@@ -40,11 +40,7 @@
<div id="content">
{% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %}
{% block content %}
{% block object-tools %}{% endblock %}
{{ content }}
{% endblock %}
{% block sidebar %}{% endblock %}
<br class="clear">
</div>
<!-- END Content -->
......
......@@ -6,7 +6,7 @@
{% if member_list %}
<ul>
{% for m in member_list %}
<li><a href="{% url 'memberdb:info' m.username %}"><strong>[{{ m.username }}]</strong> {{ m.display_name }}</a></li>
<li><a href="#"><strong>[{{ m.username }}]</strong> {{ m.display_name }}</a></li>
{% endfor %}
</ul>
{% else %}
......
{% extends "base.html" %}
{% block title %}Register a New Gumby into the System{% endblock %}
{% block title %}UCC Registration{% endblock %}
{% block content_title %}<h1>Register as a new member</h1>{% endblock %}
{% block content %}
<div class="form-container">
<form action="{% url 'memberdb:register' %}" method="post">
<form action="{% block action_url %}{% url 'memberdb:register' %}{% endblock %}" method="post">
<p 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 %}
</p>
{% csrf_token %}
{% if form.non_field_errors|length > 0 %}
......@@ -14,6 +22,8 @@
{{ form.non_field_errors }}
{% endif %}
{% block extra_preform %}{% endblock %}
{% for field in form %}
<div class="form-row">
{{ field.errors }}
......@@ -27,7 +37,7 @@
</div>
{% endfor %}
<div class="submit-row">
<input type="submit" class="default" value="Register">
<input type="submit" class="default" value="{% block action_text %}Register{% endblock %}">
</div>
</form>
</div>
......
<h1>Renew membership for {{ m.username }}</h1>
{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
<form action="{% url 'memberdb:renew' m.username %}" method="post">
{% csrf_token %}
{% for choice in question.choice_set.all %}
<input type="radio" name="choice" id="choice{{ forloop.counter }}" value="{{ choice.id }}">
<label for="choice{{ forloop.counter }}">{{ choice.choice_text }}</label><br>
{% endfor %}
<input type="submit" value="Vote">
</form>
\ No newline at end of file
{% extends "register.html" %}
{% block title %}UCC Membership Renewal{% endblock %}
{% block content_title %}
<h1>Renew your membership</h1>
{% endblock %}
{% block tips %}
{% if is_new %}
<b>Your account exists already but no membership information has yet been recorded in this system.</b>
<br>Please update/correct the details below as necessary.
{% else %}
Please confirm that the details below have not changed since your last registration or membership renewal.
{% endif %}
{% endblock %}
{% block extra_preform %}
<div class="form-row readonly">
<label for="id_username">Username:</label>
<span class="text" id="id_username">{{ request.user.username }}</span>
</div>
{% endblock %}
{% block action_url %}{% url 'memberdb:renew' %}{% endblock %}
{% block action_text %}Renew{% endblock %}
\ No newline at end of file
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