Updated templates

This commit is contained in:
2011-03-15 12:02:34 +00:00
parent 114413ba80
commit e1e28e4306
19 changed files with 128 additions and 96 deletions

View File

@@ -63,7 +63,11 @@
{% for group in skill_group %}
<tr class="skill_heading"><th colspan=3>{{ group.grouper }}</th</tr>
{% for skill in group.list %}
{% if skill.in_training %}
<tr style="display:none;" class="intraining"><td>{{ skill.skill.name }} - Training to Level {{ skill.in_training }}</td><td><img src="/static/img/skills/level{{ skill.level }}.gif" alt="Level {{ skill.level }}" /></td><td>{{ skill.skillpoints|intcomma }} SP</td></tr>
{% else %}
<tr style="display:none;"><td>{{ skill.skill.name }} </td><td><img src="/static/img/skills/level{{ skill.level }}.gif" alt="Level {{ skill.level }}" /></td><td>{{ skill.skillpoints|intcomma }} SP</td></tr>
{% endif %}
{% endfor %}
{% endfor %}
<tr><th colspan=2>Total SP</th><th>{{ character.total_sp|intcomma }} SP</th></tr>

View File

@@ -3,19 +3,6 @@
{% block title %}Blacklist User{% endblock %}
{% block content %}
<script type="text/javascript">
<!--
function confirmPost()
{
var agree=confirm("Are you sure you want to blacklist {{ u.username }}?");
if (agree)
return true ;
else
return false ;
}
// -->
</script>
<p>This form will blacklist the listed user below. It'll process all entries for the user and blacklist the following:</p>
<ul>
<li>EVE API Keys</li>
@@ -24,12 +11,12 @@ return false ;
<li>Reddit Accounts</li>
</ul>
<form action="" method="post">
<form action="{% url hr.views.blacklist_user u.id %}" method="post">
<table>
<tr><th><label>User:</label></th><td>{{ u.username }}</td></tr>
{{ form.as_table }}
</table>
{% csrf_token %}
<input type="submit" value="Blacklist" onClick="return confirmPost()" />
<input type="submit" value="Blacklist" />
</form>
{% endblock %}

View File

@@ -10,7 +10,7 @@
<body>
<div id="container">
<div id="header">
<h1>TEST Auth Gateway - {% block title %}{% endblock %}</h1>
<h1>TEST Auth - {% block title %}{% endblock %}</h1>
</div>
<div id="navigation">
<ul>

View File

@@ -1,19 +1,10 @@
{% extends "base.html" %}
{% load i18n %}
{% extends "registration/registration_base.html" %}
{% block title %}{% if account %}Activation complete{% else %}Activation problem{% endif %}{% endblock %}
{% block content %}
{% if account %}
<p>{% with account.username as username %}
Thank you for registering!<br />
From now on, you can login with your username ({{ username }}).<br/>
<br/>
<a href="{% url sso.views.profile %}">Back</a>
{% endwith %}
</p>
<p>Thanks {{ account }}, activation complete! You may now <a href='{% url auth_login %}'>login</a> using the username and password you set at registration.</p>
{% else %}
<p>Either the link was invalid, or you didn't activate your account within {{ expiration_days }} days after the registration. Please register again.</p>
<p>Oops &ndash; it seems that your activation key is invalid. Please check the url again.</p>
{% endif %}
{% endblock %}

View File

@@ -0,0 +1,7 @@
{% extends "registration/registration_base.html" %}
{% block title %}Activation complete{% endblock %}
{% block content %}
<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 %}

View File

@@ -1,13 +1,11 @@
{% load i18n %}
Hello,
You (or someone pretending to be you) have asked to register an account at
{{ site.name }}. If this wasn't you, please ignore this email
and your address will be removed from our records.
someone registered to {{ site }} and specified this EMail address. If this is correct, please follow this link to activate the account:
To activate this account, please click the following link within the next
{{ expiration_days }} days:
https://{{ site|slice:":-1" }}{% url registration_activate activation_key=activation_key %}
http://{{site.domain}}/activate/{{ activation_key }}
In case you didn't register, please ignore this Mail. The account will be deleted in {{ expiration_days }} days and you will not receive any more mail from us.
Regards,
Matalok
Auth Gateway Admin
Sincerely,
{{ site.name }} Management

View File

@@ -1 +1 @@
Dreddit Auth Gateway Account Validation
Account registration for {{ site.name }}

View File

@@ -1,37 +1,27 @@
{% extends "base.html" %}
{% extends "registration/registration_base.html" %}
{% block title %}Login{% endblock %}
{% block content %}
{% load i18n %}
{% block HeadTag %}
<script type="text/javascript">
Ext.onReady( function(){
Ext.fly("id_username").focus();
} );
</script>
{% endblock %}
{% block Content %}
<h2>Login</h2>
{% if form.errors %}
<p>Username or password don't exist or are not correct. Please try again.</p>
<p>Your username and password didn't match. Please try again.</p>
{% endif %}
<form method="post" action=".">
<form method="post" action="{% url django.contrib.auth.views.login %}">
<table>
<tr><td>{{ form.username.label_tag }}</td><td>{{ form.username }}</td></tr>
<tr><td>{{ form.password.label_tag }}</td><td>{{ form.password }}</td></tr>
<tr>
<td>{{ form.username.label_tag }}</td>
<td>{{ form.username }}</td>
</tr>
<tr>
<td>{{ form.password.label_tag }}</td>
<td>{{ form.password }}</td>
</tr>
</table>
<br />
{% csrf_token %}
<p><a href="{% url auth_password_reset %}">Forgot</a> your password? <a href="{% url registration_register %}">Need an account</a>?</p>
<input type="submit" value="login" />
<input type="hidden" name="next" value="{{ next }}" />
{% csrf_token %}
</form>
<ul>
<li>No Login? You can <a href="{% url registration.views.register %}">sign up!</a></li>
<li>Forgot the password? You can <a href="{% url django.contrib.auth.views.password_reset %}">reset it!</a></li>
</ul>
{% endblock %}
{% endblock %}

View File

@@ -1,11 +1,5 @@
{% extends "base.html" %}
{% load i18n %}
{% extends "registration/registration_base.html" %}
{% block title %}Logged out{% endblock %}
{% block content %}
<h3>You have been logged out.</h3>
<p>Thank you for visiting.
</p>
<p>Successfully logged out!</p>
{% endblock %}

View File

@@ -0,0 +1,6 @@
{% extends "registration/registration_base.html" %}
{% block title %}Password changed{% endblock %}
{% block content %}
<p>Password successfully changed!</p>
{% endblock %}

View File

@@ -0,0 +1,11 @@
{% extends "registration/registration_base.html" %}
{% block title %}Change password{% endblock %}
{% block content %}
<form method='post' action=''>
<table>
{{ form }}
</table>
<input type='submit' value="Change password" />
{% csrf_token %}
</form>
{% endblock %}

View File

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

View File

@@ -0,0 +1,12 @@
{% extends "registration/registration_base.html" %}
{% block title %}Confirm password reset{% endblock %}
{% block content %}
<p>Enter your new password below to reset your password:</p>
<form method="post" action="">
<table>
{{ form.as_table }}
</table>
<input type='submit' value="Set password" />
{% csrf_token %}
</form>
{% endblock %}

View File

@@ -0,0 +1,8 @@
{% extends "registration/registration_base.html" %}
{% block title %}Password reset{% endblock %}
{% block content %}
<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 %}

View File

@@ -0,0 +1,13 @@
Greetings {{ user }},
You are receiving this email because you (or someone pretending to be you)
requested that your password be reset on {{ site.name }}. If you do not
wish to reset your password, please ignore this message.
To reset your password, please click the following link, or copy and paste it
into your web browser:
{{ protocol }}://{{ domain }}{% url auth_password_reset_confirm uid token %}
Best regards,
{{ site_name }} Management

View File

@@ -0,0 +1,13 @@
{% extends "registration/registration_base.html" %}
{% block title %}Reset password{% endblock %}
{% block content %}
<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=''>
<table>
{{ form }}
</table>
<input type='submit' value="Reset password" />
{% csrf_token %}
</form>
{% endblock %}

View File

@@ -0,0 +1 @@
{% extends "base.html" %}

View File

@@ -1,10 +1,6 @@
{% extends "base.html" %}
{% load i18n %}
{% extends "registration/registration_base.html" %}
{% block title %}Activation email sent{% endblock %}
{% block content %}
<p>Thank you for registering.
In order to prohibit misuse, you need to activate your account before you can use it. We sent an EMail with further instructions to the address you specified, please follow the link in that email to activate your account.
</p>
<p>An activation email has been sent. Please check your email and click on the link to activate your account.</p>
{% endblock %}

View File

@@ -1,19 +1,15 @@
{% extends "base.html" %}
{% load i18n %}
{% block title %}Create Account{% endblock %}
{% extends "registration/registration_base.html" %}
{% block title %}Register for an account{% endblock %}
{% block content %}
<h2>Create Account</h2>
<p>Please fill in the following form.</p>
<form method="post" action=".">
<table>
{{ form }}
{% csrf_token %}
</table>
<br />
<input type="submit" value="{% trans "Create Account" %}" />
<h3>Registration</h3>
<p>Please complete this form to register for a new Auth account, please be aware that you are required to confirm your email account so please use a valid address.</p>
<h3>Problematic Providers</h3>
<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=''>
<table>
{{ form }}
</table>
{% csrf_token %}
<input type="submit" value="Send activation email" />
</form>
{% endblock %}