nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-14 14:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Final cleanup, formset was actually supposed to be fieldset.

Browse Source
This commit is contained in:
Andrew Williams
2011-12-04 19:23:25 +00:00
parent 8ad4634fe7
commit e2223f6702
21 changed files with 97 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/eve_api/templates/eve_api/add.html
View File

@@ -11,7 +11,7 @@
<form action="{% url eve_api.views.eveapi_add %}" method="post"> <form action="{% url eve_api.views.eveapi_add %}" method="post">
<formset> <fieldset>
{% include "formtools/formfield.html" with field=form.api_user_id %} {% include "formtools/formfield.html" with field=form.api_user_id %}
{% include "formtools/formfield.html" with field=form.api_key class="xxlarge"%} {% include "formtools/formfield.html" with field=form.api_key class="xxlarge"%}
@@ -19,7 +19,7 @@
{% csrf_token %} {% csrf_token %}
<input type="submit" value="Add API Key" class="btn primary"/> <input type="submit" value="Add API Key" class="btn primary"/>
</formset> </fieldset>
</form> </form>
{% endblock %} {% endblock %}

4
app/eve_api/templates/eve_api/update.html
View File

@@ -10,7 +10,7 @@
<p>Please update your API key as provided on the <a href="http://eve-online.com/api">EVE Online API page</a> and a optional description.</p> <p>Please update your API key as provided on the <a href="http://eve-online.com/api">EVE Online API page</a> and a optional description.</p>
<form action="{% url eveapi-update acc.api_user_id %}" method="post"> <form action="{% url eveapi-update acc.api_user_id %}" method="post">
<formset> <fieldset>
{% include "formtools/formfield.html" with field=form.api_user_id %} {% include "formtools/formfield.html" with field=form.api_user_id %}
{% include "formtools/formfield.html" with field=form.api_key class="xxlarge" %} {% include "formtools/formfield.html" with field=form.api_key class="xxlarge" %}
@@ -18,7 +18,7 @@
{% csrf_token %} {% csrf_token %}
<input type="submit" value="Add API Key" class="btn primary"/> <input type="submit" value="Add API Key" class="btn primary"/>
</formset> </fieldset>
</form> </form>
{% endblock %} {% endblock %}

4
app/groups/templates/groups/create_request.html
View File

@@ -10,10 +10,10 @@
<p>Please fill in a reason why you like to be a member of this group and any supporting evidence as requested by the group adminship</p> <p>Please fill in a reason why you like to be a member of this group and any supporting evidence as requested by the group adminship</p>
<form action="{% url groups.views.create_request groupid %}" method="post"> <form action="{% url groups.views.create_request groupid %}" method="post">
<formset> <fieldset>
{% include "formtools/formfield.html" with field=form.reason class="xxlarge" %} {% include "formtools/formfield.html" with field=form.reason class="xxlarge" %}
{% csrf_token %} {% csrf_token %}
<input type="submit" value="Create Request" class="btn primary" /> <input type="submit" value="Create Request" class="btn primary" />
</formset> </fieldset>
</form> </form>
{% endblock %} {% endblock %}

41
app/groups/templates/groups/group_list.html
View File

@@ -8,6 +8,26 @@
<p>This is the list of your current groups, and groups you can request to be a member of.</p> <p>This is the list of your current groups, and groups you can request to be a member of.</p>
{% if group_list %}
<table class="zebra-striped" id="groups">
<thead>
<tr><th>Group Name</th><th>Description</th><th>Status</th><th>Actions</th></tr>
</thead>
<tbody>
{% for id, group, description, status, requestable, fixed, pending, moderated in group_list %}
<tr><td>{{ group }}</td>
<td>{{ description }}</td>
<td>{% if pending %}Request Pending{% else %}{% if status %}{{ status }}{% endif %}{% endif %}</td>
<td>{% ifequal status None %}{% if requestable %}<a href="{% url groups.views.create_request id %}">{% if moderated %}Request Membership{% else %}Join{% endif %}</a>{% endif %}{% endifequal %}
{% if not fixed and status %}<a href="{% url groups.views.kick_member id request.user.id %}">Leave</a>&nbsp;{% endif %}
{% if status == 'Admin' or request.user.is_superuser %}{% if not fixed %}<a href="{% url groups.views.admin_group id %}">Admin</a>{% endif %}{% endif %}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<b>No groups are available.</b>
{% endif %}
<script src="{{ STATIC_URL }}js/jquery.tablesorter.min.js"></script> <script src="{{ STATIC_URL }}js/jquery.tablesorter.min.js"></script>
<script > <script >
@@ -16,25 +36,4 @@
}); });
</script> </script>
<table class="zebra-striped" id="groups">
{% if group_list %}
<thead>
<tr><th>Group Name</th><th>Description</th><th>Status</th><th>Actions</th></tr>
</thead>
<tbody>
{% for id, group, description, status, requestable, fixed, pending, moderated in group_list %}
<tr><td>{{ group }}</td>
<td>{{ description }}</td>
<td>{% if pending %}Request Pending{% else %}{% if status %}{{ status }}{% endif %}{% endif %}</td>
<td>{% ifequal status None %}{% if requestable %}<a href="{% url groups.views.create_request id %}">{% if moderated %}Request Membership{% else %}Join{% endif %}</a>{% endif %}{% endifequal %}
{% if not fixed and status %}<a href="{% url groups.views.kick_member id request.user.id %}">Leave</a>&nbsp;{% endif %}
{% if status == 'Admin' or request.user.is_superuser %}{% if not fixed %}<a href="{% url groups.views.admin_group id %}">Admin</a>{% endif %}{% endif %}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<b>No groups are available.</b>
{% endif %}
{% endblock %} {% endblock %}

4
app/hr/templates/hr/applications/accept.html
View File

@@ -10,12 +10,12 @@
<p>Fill in a note you want to send to the user.</p> <p>Fill in a note you want to send to the user.</p>
<form action="{% url hr-acceptapplication application.id %}" method="post"> <form action="{% url hr-acceptapplication application.id %}" method="post">
<formset> <fieldset>
{% include "formtools/formfield.html" with field=form.text class="xxlarge" %} {% include "formtools/formfield.html" with field=form.text class="xxlarge" %}
{% include "formtools/formfield.html" with field=form.template %} {% include "formtools/formfield.html" with field=form.template %}
{% csrf_token %} {% csrf_token %}
<input type="submit" value="Add" class="btn primary"/> <input type="submit" value="Add" class="btn primary"/>
</formset> </fieldset>
</form> </form>
{% endblock %} {% endblock %}

4
app/hr/templates/hr/applications/add.html
View File

@@ -11,12 +11,12 @@
<p>Select the character you wish to apply with, then the corporation you wish to apply for.</p> <p>Select the character you wish to apply with, then the corporation you wish to apply for.</p>
<form action="{% url hr-addapplication %}" method="post"> <form action="{% url hr-addapplication %}" method="post">
<formset> <fieldset>
{% include "formtools/formfield.html" with field=form.character %} {% include "formtools/formfield.html" with field=form.character %}
{% include "formtools/formfield.html" with field=form.corporation %} {% include "formtools/formfield.html" with field=form.corporation %}
{% csrf_token %} {% csrf_token %}
<input type="submit" value="Create Application" class="btn primary"/> <input type="submit" value="Create Application" class="btn primary"/>
</formset> </fieldset>
</form> </form>
{% endblock %} {% endblock %}

5
app/hr/templates/hr/applications/add_message.html
View File

@@ -8,12 +8,11 @@
</div> </div>
<form action="{% url hr-addmessage application.id %}" method="post"> <form action="{% url hr-addmessage application.id %}" method="post">
<fieldset>
<formset>
{% include "formtools/formfield.html" with field=form.text class="xxlarge" %} {% include "formtools/formfield.html" with field=form.text class="xxlarge" %}
{% if form.template %}{% include "formtools/formfield.html" with field=form.template %}{% endif %} {% if form.template %}{% include "formtools/formfield.html" with field=form.template %}{% endif %}
{% csrf_token %} {% csrf_token %}
<input type="submit" value="Add" class="btn primary"/> <input type="submit" value="Add" class="btn primary"/>
</formset> </fieldset>
</form> </form>
{% endblock %} {% endblock %}

4
app/hr/templates/hr/applications/add_note.html
View File

@@ -8,10 +8,10 @@
</div> </div>
<form action="{% url hr-addnote application.id %}" method="post"> <form action="{% url hr-addnote application.id %}" method="post">
<formset> <fieldset>
{% include "formtools/formfield.html" with field=form.text class="xxlarge" %} {% include "formtools/formfield.html" with field=form.text class="xxlarge" %}
{% csrf_token %} {% csrf_token %}
<input type="submit" value="Add" class="btn primary"/> <input type="submit" value="Add" class="btn primary"/>
</formset> </fieldset>
</form> </form>
{% endblock %} {% endblock %}

4
app/hr/templates/hr/applications/reject.html
View File

@@ -10,12 +10,12 @@
<p>Fill in the rejection reason below, please note, this will be sent out to the user.</p> <p>Fill in the rejection reason below, please note, this will be sent out to the user.</p>
<form action="{% url hr-rejectapplication application.id %}" method="post"> <form action="{% url hr-rejectapplication application.id %}" method="post">
<formset> <fieldset>
{% include "formtools/formfield.html" with field=form.text class="xxlarge" %} {% include "formtools/formfield.html" with field=form.text class="xxlarge" %}
{% include "formtools/formfield.html" with field=form.template %} {% include "formtools/formfield.html" with field=form.template %}
{% csrf_token %} {% csrf_token %}
<input type="submit" value="Reject" class="btn error"/> <input type="submit" value="Reject" class="btn error"/>
</formset> </fieldset>
</form> </form>

4
app/hr/templates/hr/blacklist_add.html
View File

@@ -7,7 +7,7 @@
</div> </div>
<form action="{% url hr-blacklist-add %}" method="post"> <form action="{% url hr-blacklist-add %}" method="post">
<formset> <fieldset>
{% include "formtools/formfield.html" with field=form.type %} {% include "formtools/formfield.html" with field=form.type %}
{% include "formtools/formfield.html" with field=form.value class="xxlarge" %} {% include "formtools/formfield.html" with field=form.value class="xxlarge" %}
{% include "formtools/formfield.html" with field=form.reason class="xxlarge" %} {% include "formtools/formfield.html" with field=form.reason class="xxlarge" %}
@@ -15,7 +15,7 @@
{% csrf_token %} {% csrf_token %}
<input type="submit" value="Add Blacklist" class="btn primary"/> <input type="submit" value="Add Blacklist" class="btn primary"/>
</formset> </fieldset>
</form> </form>
{% endblock %} {% endblock %}

4
app/hr/templates/hr/recommendations/add.html
View File

@@ -13,11 +13,11 @@
The person you are recommending needs to have created their application before you can add a recommendation.</p> The person you are recommending needs to have created their application before you can add a recommendation.</p>
<form action="{% url hr-addrecommendation %}" method="post"> <form action="{% url hr-addrecommendation %}" method="post">
<formset> <fieldset>
{% include "formtools/formfield.html" with field=form.character %} {% include "formtools/formfield.html" with field=form.character %}
{% include "formtools/formfield.html" with field=form.application %} {% include "formtools/formfield.html" with field=form.application %}
{% csrf_token %} {% csrf_token %}
<input type="submit" value="Add Recommendation" class="btn primary"/> <input type="submit" value="Add Recommendation" class="btn primary"/>
</formset> </fieldset>
</form> </form>
{% endblock %} {% endblock %}

4
app/reddit/templates/reddit/add.html
View File

@@ -13,10 +13,10 @@ corporation</p>
on from time to time</p> on from time to time</p>
<form action="{% url reddit-addaccount %}" method="post"> <form action="{% url reddit-addaccount %}" method="post">
<formset> <fieldset>
{% include "formtools/formfield.html" with field=form.username %} {% include "formtools/formfield.html" with field=form.username %}
{% csrf_token %} {% csrf_token %}
<input type="submit" value="Add Account" /> <input type="submit" value="Add Account" />
</formset> </fieldset>
</form> </form>
{% endblock %} {% endblock %}

4
app/sso/templates/sso/apipassword.html
View File

@@ -12,11 +12,11 @@
password below.</p> password below.</p>
<form action="{% url sso.views.set_apipasswd %}" method="post"> <form action="{% url sso.views.set_apipasswd %}" method="post">
<formset> <fieldset>
{% include "formtools/formfield.html" with field=form.password %} {% include "formtools/formfield.html" with field=form.password %}
{% csrf_token %} {% csrf_token %}
<input type="submit" value="Reset Account" class="btn primary" /> <input type="submit" value="Reset Account" class="btn primary" />
</formset> </fieldset>
</form> </form>
{% endblock %} {% endblock %}

4
app/sso/templates/sso/lookup/userlookup.html
View File

@@ -10,7 +10,7 @@
<p> <p>
<form action="{% url sso.views.user_lookup %}" method="post"> <form action="{% url sso.views.user_lookup %}" method="post">
<formset> <fieldset>
{% csrf_token %} {% csrf_token %}
<div class="clearfix"> <div class="clearfix">
{{ form.type.label_tag }} {{ form.type.label_tag }}
@@ -25,7 +25,7 @@
</div> </div>
</div> </div>
<input type="submit" value="Lookup" class="btn primary"/> <input type="submit" value="Lookup" class="btn primary"/>
</formset> </fieldset>
</form> </form>
</p> </p>
{% endblock %} {% endblock %}

3
app/templates/registration/activation_complete.html
View File

@@ -1,6 +1,9 @@
{% extends "registration/registration_base.html" %} {% extends "registration/registration_base.html" %}
{% block title %}Activation complete{% endblock %} {% block title %}Activation complete{% endblock %}
{% block content %} {% block content %}
<div class="page-header">
<h1>Activation Complete</h1>
</div>
<p>Thanks, activation complete! You may now <a href='{% url auth_login %}'>login</a> using the username and password you set at registration.</p> <p>Thanks, activation complete! You may now <a href='{% url auth_login %}'>login</a> using the username and password you set at registration.</p>
{% endblock %} {% endblock %}

34
app/templates/registration/login.html
View File

@@ -15,30 +15,20 @@
<form method="post" action="{% url django.contrib.auth.views.login %}"> <form method="post" action="{% url django.contrib.auth.views.login %}">
<fieldset> <fieldset>
<div class="clearfix"> {% include "formtools/formfield.html" with field=form.username %}
{{ form.username.label_tag }} {% include "formtools/formfield.html" with field=form.password %}
<div class="input">
{{ form.username }}
</div>
</div>
<div class="clearfix">
{{ form.password.label_tag }}
<div class="input">
{{ form.password }}
</div>
</div>
<div class="row"> <div class="row">
<div class="span10"> <div class="span10">
<a href="{% url auth_password_reset %}" class="btn">Forgotten Password</a> <a href="{% url auth_password_reset %}" class="btn">Forgotten Password</a>
<a href="{% url registration_register %}" class="btn success">Create Account</a> <a href="{% url registration_register %}" class="btn success">Create Account</a>
</div>
<div class="span6">
<input type="submit" value="Login" class="btn primary pull-right"/>
</div>
</div> </div>
<input type="hidden" name="next" value="{{ next }}" /> <div class="span6">
{% csrf_token %} <input type="submit" value="Login" class="btn primary pull-right"/>
</div>
</div>
<input type="hidden" name="next" value="{{ next }}" />
{% csrf_token %}
</fieldset> </fieldset>
</form> </form>

16
app/templates/registration/password_change_form.html
View File

@@ -1,11 +1,17 @@
{% extends "registration/registration_base.html" %} {% extends "registration/registration_base.html" %}
{% block title %}Change password{% endblock %} {% block title %}Change password{% endblock %}
{% block content %} {% block content %}
<div class="page-header">
<h1>Change Password</h1>
</div>
<form method='post' action=''> <form method='post' action=''>
<table> <fieldset>
{{ form }} {% include "formtools/formfield.html" with field=form.old_password %}
</table> {% include "formtools/formfield.html" with field=form.new_password1 %}
<input type='submit' value="Change password" /> {% include "formtools/formfield.html" with field=form.new_password2 %}
{% csrf_token %} {% csrf_token %}
<input type='submit' value="Change password" class="btn primary"/>
</fieldset>
</form> </form>
{% endblock %} {% endblock %}

3
app/templates/registration/password_reset_complete.html
View File

@@ -1,5 +1,8 @@
{% extends "registration/registration_base.html" %} {% extends "registration/registration_base.html" %}
{% block title %}Password reset complete{% endblock %} {% block title %}Password reset complete{% endblock %}
{% block content %} {% block content %}
<div class="page-header">
<h1>Password Reset Complete</h1>
</div>
<p>Your password has been reset! You may now <a href="{{ login_url }}">log in</a>.</p> <p>Your password has been reset! You may now <a href="{{ login_url }}">log in</a>.</p>
{% endblock %} {% endblock %}

8
app/templates/registration/password_reset_done.html
View File

@@ -1,8 +1,8 @@
{% extends "registration/registration_base.html" %} {% extends "registration/registration_base.html" %}
{% block title %}Password reset{% endblock %} {% block title %}Password reset{% endblock %}
{% block content %} {% block content %}
<p> <div class="page-header">
We have sent you an email with a link to reset your password. Please check <h1>Password Reset</h1>
your email and click the link to continue. </div>
</p> <p>We have sent you an email with a link to reset your password. Please check your email and click the link to continue.</p>
{% endblock %} {% endblock %}

18
app/templates/registration/password_reset_form.html
View File

@@ -1,13 +1,15 @@
{% extends "registration/registration_base.html" %} {% extends "registration/registration_base.html" %}
{% block title %}Reset password{% endblock %} {% block title %}Forgotten password{% endblock %}
{% block content %} {% block content %}
<p>Forgot your password? Enter your email in the form below and we'll send you <div class="page-header">
instructions for creating a new one.</p> <h1>Forgotten Password</h1>
</div>
<p>Forgot your password? Enter your email in the form below and we'll send you instructions for creating a new one.</p>
<form method='post' action=''> <form method='post' action=''>
<table> <fieldset>
{{ form }} {% include "formtools/formfield.html" with field=form.email %}
</table> {% csrf_token %}
<input type='submit' value="Reset password" /> <input type='submit' value="Reset password" class="btn primary"/>
{% csrf_token %} </fieldset>
</form> </form>
{% endblock %} {% endblock %}

13
app/templates/registration/registration_form.html
View File

@@ -13,10 +13,13 @@
<p>In addition, some providers maybe blocked form auth due to their draconian spam detection routines, which has flagged this server numerous times for no reason. These include AT&T services, Cox, and a few other mainland US ISPs. If you have a Google Mail account please consider using that instead of your ISP email account.</p> <p>In addition, some providers maybe blocked form auth due to their draconian spam detection routines, which has flagged this server numerous times for no reason. These include AT&T services, Cox, and a few other mainland US ISPs. If you have a Google Mail account please consider using that instead of your ISP email account.</p>
<form method='post' action=''> <form method='post' action=''>
<table> <fieldset>
{{ form }} {% include "formtools/formfield.html" with field=form.username %}
</table> {% include "formtools/formfield.html" with field=form.email %}
{% csrf_token %} {% include "formtools/formfield.html" with field=form.password1 %}
<input type="submit" value="Send activation email" class="btn primary"/> {% include "formtools/formfield.html" with field=form.password2 %}
{% csrf_token %}
<input type="submit" value="Send activation email" class="btn primary"/>
</fieldset>
</form> </form>
{% endblock %} {% endblock %}