Added more stuff and multiple api keys

templates/public/base.html

@@ -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

templates/public/login.html

@@ -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 %}

templates/public/register.html

@@ -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>

templates/registered/apikeymanagment.html

@@ -1,4 +1,5 @@
 {% extends "public/base.html" %}
+{% load bootstrap %}
 {% load staticfiles %}
 
 {% block title %}Alliance Auth{% endblock %}
@@ -8,25 +9,34 @@
 
 {% block content %}
 <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
-    <p> ONE API KEY ONLY ONE SERIOUSLY ONE! BECUASE ONE</p>
-    <div class="row-fluid">
-        <div class="center-block" style="center">
-            <p>
-                <form action="{% url 'auth_api_key_management' %}" method="POST">
-                    {% csrf_token %}
-                    <h2 class="form-signin-heading">Update Api:</h2>
-                    <p>
-                        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" class="btn btn-default"/>
-                    <button type="button" class="btn btn-primary">Refresh</button>
-                </form>
-            </p>
-        </div>
+    <div class="row">
+        <h1 class="page-header text-center">API Key Management</h1>
+        <table class="table table-bordered">
+            <tr>
+                <th class="text-center">API ID</th>
+                <th class="text-center">API Key</th>
+                <th class="text-center">Action</th>
+            </tr>
+            {% for pair in apikeypairs %}
+            <tr>
+                <td class="text-center">{{ pair.api_id }}</td>
+                <td class="text-center">{{ pair.api_key }}</td>
+                <td class="text-center">
+                <a href="/delete_api_pair/{{ pair.api_id }}">
+                    <button type="button" class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span></button>
+                </a>
+                <a href="{% url 'auth_activate_forum' %}">
+                    <button type="button" class="btn btn-primary"><span class="glyphicon glyphicon-refresh"></span></button>
+                </a>
+                </td>
+            </tr>
+            {% endfor %}
+        </table>
+         <form class="form-signin" role="form" action="{% url 'auth_api_key_management' %}" method="POST">
+            {% csrf_token %}
+            {{ form|bootstrap_horizontal }}
+            <button class="btn btn-lg btn-primary btn-block" type="submit">Create Key</button>
+        </form>
     </div>
 </div>
 

templates/registered/characters.html

@@ -8,9 +8,8 @@
 
 {% block content %}
 <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
-    {% for character in characters %}
     <div class="row">
-        <div class="col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6">
+    {% for character in characters %}
          <div class="well well-sm profile">
             <div class="col-sm-12">
                 <div class="col-xs-12 col-sm-8">
@@ -25,13 +24,12 @@
                     </figure>
                 </div>
             </div>
-             <div class="col-md-offset-8">
+            <div class="col-md-offset-8">
                 <a href="/main_character_change/{{character.character_id}}"><button type="button" class="btn btn-primary">Make Primary</button></a>
-             </div>
-          </div>                 
+            </div>
         </div>
+    {% endfor %}
     </div>
-        {% endfor %}
 </div>
 
 {% endblock content %}