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

Cleanup of templates to use {% url %} for locations, instead of using hardcoded locations

Browse Source
This commit is contained in:
Andrew Williams
2010-04-23 15:34:58 +01:00
parent c4631f3dbb
commit daaee6cc3c
22 changed files with 41 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
templates/404.html
View File

@@ -1,34 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html lang="en">
<head>
<title>404</title>
<link rel="stylesheet" href="/static/css/style.css" type="text/css" media="screen">
</head>
<body>
<div id="container">
<div id="header">
<h1>
Dreddit Auth Gateway - 404
</h1>
</div>
<div id="navigation">
<ul>
<li><a href="/">Home</a></li>
{% if request.user %}
<li><a href="/profile">Profile</a></li>
<li><a href="/logout">Logout</a></li>
{% else %}
<li><a href="/login">Login</a></li>
{% endif %}
</ul>
</div>
<div id="content">
<h1>404 - Derp not found</h1>
</div>
<div id="footer">
&nbsp;
</div>
</div>
</body>
</html>

14
templates/base.html
View File

@@ -16,20 +16,20 @@
</div>
<div id="navigation">
<ul>
<li><a href="/">Home</a></li>
<li><a href="{% url sso.views.index %}">Home</a></li>
{% if request.user %}
<li><a href="/profile">Profile</a></li>
<li><a href="{% url sso.views.profile %}">Profile</a></li>
{% if "hr"|installed %}
<li><a href="/hr/">HR</a></li>
<li><a href="{% url hr.views.index %}">HR</a></li>
{% endif %}
<li><a href="/profile/characters">Characters</a></li>
<li><a href="{% url sso.views.characters %}">Characters</a></li>
{% if request.user.is_staff %}
<li><a href="/users">Lookup User</a></li>
<li><a href="{% url sso.views.user_lookup %}">Lookup User</a></li>
<li><a href="/admin">Admin</a></li>
{% endif %}
<li><a href="/logout">Logout</a></li>
<li><a href="{% url django.contrib.auth.views.logout %}">Logout</a></li>
{% else %}
<li><a href="/login">Login</a></li>
<li><a href="{% url django.contrib.auth.views.login %}">Login</a></li>
{% endif %}
</ul>
</div>

2
templates/hr/applications/add.html
View File

@@ -7,7 +7,7 @@
The person you are recommending needs to have created their application before you can add a recommendation.</p>
<form action="/hr/add/application/" method="post">
<form action="{% url hr.views.add_application %}" method="post">
<table>
{{ form.as_table }}
</table>

2
templates/hr/applications/admin/view_list.html
View File

@@ -8,7 +8,7 @@
<table>
<tr><th>Application ID</th><th>Character</th><th>Corporation</th><th>Application Status</th></tr>
{% for app in apps %}
<tr><td><a href="/hr/applications/{{ app.id }}/">{{ app.id }}</a></td>
<tr><td><a href="{% url hr.views.view_application app.id %}">{{ app.id }}</a></td>
<td>{{ app.character }}</td>
<td>{{ app.corporation }}</td>
<td>{{ app.status_description }}</td>

8
templates/hr/applications/view.html
View File

@@ -8,13 +8,13 @@
<h3>Application Details</h3>
<ul>
<li>Applying Auth User: <a href="/users/{{ app.user }}">{{ app.user }}</a></li>
<li>Applying Auth User: <a href="{% url sso.views.user_view app.user %}">{{ app.user }}</a></li>
<li>Applying Character: {{ app.character }} <button type="button" onclick="CCPEVE.showInfo('1377//{{ app.character.id }}')">Show In Eve</button></li>
<li>Application Status: <b>{{ app.status_description }}</b></li>
</ul>
{% if form %}
<form action="/hr/applications/{{ app.id }}/update/" method="post">
<form action="{% url hr.views.update_application app.id %}" method="post">
<table>
{{ form.as_table }}
</table>
@@ -26,7 +26,7 @@
<h3>Recommendations</h3>
<ul>
{% for rec in recs %}
<li><a href="/users/{{ rec.user }}/">{{ rec.user }}</a> / {{ rec.user_character }} - {{ rec.user_character.corporation }}</li>
<li><a href="{% url sso.views.user_view rec.user %}">{{ rec.user }}</a> / {{ rec.user_character }} - {{ rec.user_character.corporation }}</li>
{% endfor %}
</ul>
{% endif %}
@@ -36,7 +36,7 @@
<ul>
{% for acc in eveacc %}
{% for char in acc.characters.all %}
<li><a href="/profile/characters/{{ char.id }}/">{{ char.name }}</a> - {{ char.corporation }} / {{ char.corporation.alliance }} - {{ char.balance|intcomma }} ISK, {{ char.total_sp|intcomma }} SP <button type="button" onclick="CCPEVE.showInfo('1377//{{ char.id }}')">Show In Eve</button></li>
<li><a href="{% url sso.views.characters char.id %}">{{ char.name }}</a> - {{ char.corporation }} / {{ char.corporation.alliance }} - {{ char.balance|intcomma }} ISK, {{ char.total_sp|intcomma }} SP <button type="button" onclick="CCPEVE.showInfo('1377//{{ char.id }}')">Show In Eve</button></li>
{% endfor %}
{% endfor %}
</ul>

2
templates/hr/applications/view_list.html
View File

@@ -8,7 +8,7 @@
<table>
<tr><th>Application ID</th><th>Character</th><th>Corporation</th><th>Application Status</th></tr>
{% for app in apps %}
<tr><td><a href="/hr/applications/{{ app.id }}/">{{ app.id }}</a></td>
<tr><td><a href="{% url hr.views.view_application app.id %}">{{ app.id }}</a></td>
<td>{{ app.character }}</td>
<td>{{ app.corporation }}</td>
<td>{{ app.status_description }}</td>

10
templates/hr/index.html
View File

@@ -4,18 +4,18 @@
{% block content %}
<h3>Applications</h3>
<p><a href="/hr/applications/">View your current open applications</a><br/>
<a href="/hr/add/application/">Create a application</a><br/></p>
<p><a href="{% url hr.views.view_applications %}">View your current open applications</a><br/>
<a href="{% url hr.views.add_application %}">Create a application</a><br/></p>
<h3>Recommendations</h3>
<p>
<a href="/hr/recommendations/">View your current open recommendations</a><br/>
<a href="/hr/add/recommendation/">Add a recommendation</a><br/>
<a href="{% url hr.views.view_recommendations %}">View your current open recommendations</a><br/>
<a href="{% url hr.views.add_recommendation %}">Add a recommendation</a><br/>
</p>
{% if hrstaff %}
<h3>HR Admin</h3>
<p>
<a href="/hr/admin/applications/">View applications</a><br/>
<a href="{% url hr.views.admin_applications %}">View applications</a><br/>
</p>
{% endif %}

2
templates/hr/recommendations/add.html
View File

@@ -7,7 +7,7 @@
The person you are recommending needs to have created their application before you can add a recommendation.</p>
<form action="/hr/add/recommendation/" method="post">
<form action="{% url hr.views.add_recommendation %}" method="post">
<table>
{{ form.as_table }}
</table>

2
templates/sso/characterlist.html
View File

@@ -8,7 +8,7 @@
<table>
<tr><th>Character Name</th><th>Corp</th></tr>
{% for char in characters %}
<tr><td><a href="/profile/characters/{{ char.id }}/">{{ char.name }}</a></td>
<tr><td><a href="{% url sso.views.characters char.id %}">{{ char.name }}</a></td>
<td>{{ char.corp }}</td>
</tr>
{% endfor %}

2
templates/sso/eveapi.html
View File

@@ -7,7 +7,7 @@
href="http://eve-online.com/api">EVE Online API
page</a> and a optional description.</p>
<form action="/profile/add/eveapi" method="post">
<form action="{% url sso.views.eveapi_add %}" method="post">
<table>
{{ form.as_table }}
</table>

2
templates/sso/index.html
View File

@@ -3,6 +3,6 @@
<body bgcolor="#2F383D" link="#ffffff" vlink="#ffffff">
<center><img src="/static/img/dreddit_logo.jpg"><br/>
<a color="white" href="/login">Login</a></center>
<a color="white" href="{% url registration.auth_login %}">Login</a></center>
</body>
</html>

2
templates/sso/lookup/lookuplist.html
View File

@@ -8,7 +8,7 @@
<ul>
{% for user in users %}
<li><a href="/users/{{ user.name }}/">{{ user.name }}</a></li>
<li><a href="{% url sso.views.view_user user.name %}/">{{ user.name }}</a></li>
{% endfor %}
</ul>

2
templates/sso/lookup/user.html
View File

@@ -40,7 +40,7 @@
<table>
<tr><th>Character Name</th><th>Corp</th></tr>
{% for char in characters %}
<tr><td><a href="/profile/characters/{{ char.id }}/">{{ char.name }}</a></td>
<tr><td><a href="{% url sso.views.view_characters char.id %}/">{{ char.name }}</a></td>
<td>{{ char.corp }}</td>
</tr>
{% endfor %}

2
templates/sso/lookup/userlookup.html
View File

@@ -3,7 +3,7 @@
{% block title %}User Lookup{% endblock %}
{% block content %}
<form action="/users/" method="post">
<form action="{% url sso.views.user_lookup %}" method="post">
<table>
{{ form.as_table }}
</table>

16
templates/sso/profile.html
View File

@@ -28,11 +28,11 @@ create a login for a service click the Add Service link</p>
<td>{{ acc.service_uid }}</td>
<td><a href="{{ acc.service.url }}">{{ acc.service.url }}</a></td>
<td>{% if acc.active %}Yes{% else %}No{% endif %}</td>
<td><a href="/profile/del/service/{{ acc.id }}/">Delete</a>
<td><a href="{% url sso.views.service_del acc.id %}/">Delete</a>
{% if acc.active %}
&nbsp;/&nbsp;<a href="/profile/reset/service/{{ acc.id }}/">Reset</a>
&nbsp;/&nbsp;<a href="{% url sso.views.service_reset acc.id %}/">Reset</a>
{% if acc.service.provide_login %}
&nbsp;/&nbsp;<a href="/profile/login/service/{{ acc.id }}/">Login</a>
&nbsp;/&nbsp;<a href="{% url sso.views.service_login acc.id %}/">Login</a>
{% endif %}
{% endif %}
</td>
@@ -43,7 +43,7 @@ create a login for a service click the Add Service link</p>
{% endif %}
<p>
<a href="/profile/add/service">Add Service</a>
<a href="{% url sso.views.service_add %}">Add Service</a>
</p>
<br/>
@@ -67,15 +67,15 @@ setup.</p>
<td>{{ acc.description }}</td>
<td>{{ acc.api_status_description }}</td>
<td>{{ acc.api_last_updated|naturaltimediff }}</td>
<td><a href="/profile/refresh/eveapi/{{ acc.api_user_id }}/">Refresh</a>,&nbsp;
<a href="/profile/del/eveapi/{{ acc.api_user_id }}/">Delete</a></td>
<td><a href="{% url sso.views.eveapi_refresh acc.api_user_id %}">Refresh</a>,&nbsp;
<a href="{% url sso.views.eveapi_del acc.api_user_id %}">Delete</a></td>
</tr>
</tbody>
{% endfor %}
</table>
{% endif %}
<p>
<a href="/profile/add/eveapi">Add a Eve API key</a>
<a href="{% url sso.views.eveapi_add %}">Add a Eve API key</a>
</p>
<br/>
@@ -99,7 +99,7 @@ setup.</p>
</table>
{% endif %}
<p>
<a href="/profile/add/reddit">Add a Reddit account</a>
<a href="{% url sso.views.reddit_add %}">Add a Reddit account</a>
</p>
<p>If you encounter any errors during using this service, copy the massive

2
templates/sso/redditaccount.html
View File

@@ -7,7 +7,7 @@
corporation</p>
<p>Please note, you will be forever tied to this account and posts and comments made on this account will be checked
on from time to time</p>
<form action="/profile/add/reddit" method="post">
<form action="{% url sso.views.reddit_add %}" method="post">
<table>
{{ form.as_table }}
</table>

2
templates/sso/serviceaccount/created.html
View File

@@ -18,7 +18,7 @@ this is incorrect please raise a bug on the tracker.
<tr><td>Password:</td><td>{{ acc.password }}</td></tr>
</table>
<p><a href="/profile">Return to your profile page</a></p>
<p><a href="{% url sso.views.profile %}">Return to your profile page</a></p>
{% endif %}
{% endblock %}

2
templates/sso/serviceaccount/deleteconfirm.html
View File

@@ -8,7 +8,7 @@ create a new account until fixed by a Sysop. If you are having issues logging in
<p>If you are sure, then please click confirm</p>
<form action="/profile/del/service/{{ acc.id }}/" method="post">
<form action="{% url sso.views.service_del acc.id %}/" method="post">
<input name="confirm-delete" type="hidden" value="1"/>
<input type="submit" value="Confirm Delete" />
</form>

2
templates/sso/serviceaccount/index.html
View File

@@ -8,7 +8,7 @@ then provide select a username you wish to use create the account for<br/>
<br/>
For details on how to connect to each service, please consult the <a
href="http://wiki.dredd.it">wiki</a></p>
<form action="/profile/add/service" method="post">
<form action="{% url sso.views.service_add %}" method="post">
<table>
{{ form.as_table }}
</table>

2
templates/sso/serviceaccount/noneavailable.html
View File

@@ -5,5 +5,5 @@
{% block content %}
<p>You have no services available to add to your account</p>
<p><a href="/profile">Return to your Profile</a></p>
<p><a href="{% url sso.views.profile %}">Return to your Profile</a></p>
{% endblock %}

2
templates/sso/serviceaccount/reset.html
View File

@@ -7,7 +7,7 @@
<p>This service will reset your password for account {{ acc.service_uid }} on {{ acc.service }}. If you wish to continue please click the link
below.</p>
<form action="/profile/reset/service/{{ serviceid }}/" method="post">
<form action="{% url sso.views.service_reset serviceid %}/" method="post">
<table>
{{ form.as_table }}
</table>

2
templates/sso/serviceaccount/resetcomplete.html
View File

@@ -15,7 +15,7 @@
<tr><td>Password:</td><td>{{ passwd }}</td></tr>
</table>
<p><a href="/profile">Return to your profile page</a></p>
<p><a href="{% url sso.views.profile %}">Return to your profile page</a></p>
{% endif %}
{% endblock %}