Added more stuff and multiple api keys

This commit is contained in:
Raynaldo Rivera
2014-10-06 02:31:23 -07:00
parent 7521d9fc4d
commit eacb3d03b8
15 changed files with 176 additions and 147 deletions

View File

@@ -48,8 +48,8 @@
<div class="container-fluid">
<div class="row">
{% if user.is_authenticated %}
{% if user.is_authenticated %}
<div class="col-sm-3 col-md-2 sidebar">
<ul class="nav nav-sidebar">
<li><a href="{% url 'auth_dashboard' %}">Overview</a></li>
@@ -59,11 +59,11 @@
<li><a href="#">Help</a></li>
</ul>
</div>
{% endif %}
{% block content %}
{% endblock content %}
</div>
{% endif %}
{% block content %}
{% endblock content %}
</div>
</div>
<!-- Bootstrap core JavaScript

View File

@@ -1,26 +1,24 @@
{% extends "public/base.html" %}
{% load bootstrap %}
{% block title %}Alliance Auth{% endblock %}
{% block page_title %}Login Page{% endblock page_title %}
{% block content %}
<div class="container">
<div class="row-fluid">
<div class="center-block" style="center">
<p>
{% if error %}
<div class="alert alert-danger" role="alert">Username/Password Invalid</div>
{% endif %}
<form class="form-signin" role="form" action="{% url 'auth_login_user' %}" method="POST">
{% csrf_token %}
<h2 class="form-signin-heading">Please sign in</h2>
{{form.as_p}}
<button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
</form>
<p><a href="{% url 'auth_register' %}">Register Here</a>
</p>
</div>
</div>
<div class="row">
<div class="col-md-4"></div>
<div class="col-md-4">
{% if error %}
<div class="alert alert-danger" role="alert">Username/Password Invalid</div>
{% endif %}
<form class="form-signin" role="form" action="{% url 'auth_login_user' %}" method="POST">
{% csrf_token %}
<h2 class="form-signin-heading">Please sign in</h2>
{{form|bootstrap}}
<button class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
</form>
<p><a href="{% url 'auth_register' %}">Register Here</a></p>
</div>
</div>
{% endblock content %}

View File

@@ -1,36 +1,22 @@
{% extends "public/base.html" %}
{% load bootstrap %}
{% block title %}Alliance Auth{% endblock %}
{% block page_title %}Register Page{% endblock page_title %}
{% block content %}
<div class="container">
<div class="row-fluid">
<div class="center-block" style="center">
<p>
{% if error %}
<div class="alert alert-danger" role="alert">Username Already Registered</div>
{% endif %}
<form action="{% url 'auth_register' %}" method="POST">
{% csrf_token %}
<h2 class="form-signin-heading">Register Account</h2>
<p>
Username:<br/>
{{form.username.errors}}
{{form.username}}<br/> Email:<br/>
{{form.email.errors}}
{{form.email}}<br/> Password:<br/>
{{form.password.errors}}
{{form.password}}<br/>Api ID: <br/>
{{form.api_id.errors}}
{{form.api_id}}<br/>Api Key: <br/>
{{form.api_key.errors}}
{{form.api_key}}<br/>
</p>
<input type="submit" value="submit" />
</form>
</p>
<div class="row">
<div class="col-md-4"></div>
<div class="col-md-4">
{% if error %}
<div class="alert alert-danger" role="alert">Username Already Registered</div>
{% endif %}
<form action="{% url 'auth_register' %}" method="POST">
{% csrf_token %}
<h2 class="form-signin-heading">Register Account</h2>
{{ form|bootstrap }}
<button class="btn btn-lg btn-primary btn-block" type="submit">Register</button>
</form>
</div>
</div>
</div>