Added full services working, refresh, create, delete, updated look

templates/public/base.html

@@ -28,14 +28,10 @@
         <!-- Navigation -->
 
         <nav class="navbar navbar-inverse navbar-static-top" role="navigation" style="margin-bottom: 0">
+
             <div class="navbar-header">
-                <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-                    <span class="sr-only">Toggle navigation</span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                    <span class="icon-bar"></span>
-                </button>
-                <a class="navbar-brand" href="index.html">{{ ALLIANCE_NAME }}</a>
+                <a class="navbar-brand" href="{% url 'auth_dashboard' %}">{{ ALLIANCE_NAME }}</a>
+
             </div>
             <!-- /.navbar-header -->
 
@@ -63,19 +59,19 @@
                             <!-- /input-group -->
                         </li>
                         <li>
-                            <a class="active" href="{% url 'auth_dashboard' %}"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a>
+                            <a {% ifequal request.path "/dashboard/" %} class="active" {% endifequal %} href="{% url 'auth_dashboard' %}"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a>
                         </li>
                         <li>
-                            <a href="{% url 'auth_characters' %}"><i class="fa fa-users fa-fw"></i> Characters</a>
+                            <a {% ifequal request.path "/characters/" %} class="active" {% endifequal %} href="{% url 'auth_characters' %}"><i class="fa fa-users fa-fw"></i> Characters</a>
                         </li>
                         <li>
-                            <a href="{% url 'auth_api_key_management' %}"><i class="fa fa-key fa-fw"></i> Api Keys</a>
+                            <a {% ifequal request.path "/api_key_management/" %} class="active" {% endifequal %} href="{% url 'auth_api_key_management' %}"><i class="fa fa-key fa-fw"></i> Api Keys</a>
                         </li>
                         <li>
-                            <a href="{% url 'auth_services' %}"><i class="fa fa-cogs fa-fw"></i> Services</a>
+                            <a {% ifequal request.path "/services/" %} class="active" {% endifequal %} href="{% url 'auth_services' %}"><i class="fa fa-cogs fa-fw"></i> Services</a>
                         </li>
                         <li>
-                            <a href="#"><i class="fa fa-question fa-fw"></i> Help</a>
+                            <a {% ifequal request.path "/help/" %} class="active" {% endifequal %} href="{% url 'auth_help' %}"><i class="fa fa-question fa-fw"></i> Help</a>
                         </li>
                     </ul>
                 </div>

templates/registered/apikeymanagment.html

@@ -8,7 +8,7 @@
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
-<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
+<div class="col-lg-12">
     <div class="row">
         {% if apikeypairs %}
         {% else %}

templates/registered/characters.html

@@ -7,38 +7,42 @@
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
-<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
-    <div class="row">
-    {% if request.user.main_char_id %}
-    {% else %}
-        <div class="alert alert-danger" role="alert">No primary character set</div>
-    {% endif %}
-    {% for character in characters %}
-         <div class="well well-sm profile">
+<div class="col-lg-12">
+    <h1 class="page-header text-center">Characters</h1>
+    <div class="container-fluid">
+
+        {% if request.user.main_char_id %}
+        {% else %}
+            <div class="alert alert-danger" role="alert">No primary character set</div>
+        {% endif %}
+        {% for character in characters %}
+         <div class="well profile col-md-6 center-block">
             <div class="col-sm-12">
                 <div class="col-xs-12 col-sm-8">
                     <h3>{{character.character_name}}</h3>
                     <p><strong>Alliance: </strong> {{character.alliance_name}} </p>
                     <p><strong>Corporation: </strong>{{character.corporation_name}}</p>
                     <p><strong>Corporation Ticker: </strong> {{character.corporation_ticker}} </p>
-                </div>             
+                </div>
                 <div class="col-xs-8 col-sm-4 text-center">
                     <figure>
-                        <img src="https://image.eveonline.com/Character/{{character.character_id}}_128.jpg" alt="" class="img-responsive">
+                         <img src="https://image.eveonline.com/Character/{{character.character_id}}_128.jpg" alt="" class="img-responsive">
+                         <br>
+                         <a href="/main_character_change/{{character.character_id}}">
+                            {% ifequal character.character_id request.user.main_char_id %}
+                                <button type="button" class="btn btn-disable" disabled>Make Primary</button>
+                            {% else %}
+                                <button type="button" class="btn btn-primary">Make Primary</button>
+                            {% endifequal %}
+                        </a>
                     </figure>
                 </div>
             </div>
-            <div class="col-md-offset-8">
-                <a href="/main_character_change/{{character.character_id}}">
-                    {% ifequal character.character_id request.user.main_char_id %}
-                        <button type="button" class="btn btn-disable" disabled>Make Primary</button>
-                    {% else %}
-                        <button type="button" class="btn btn-primary">Make Primary</button>
-                    {% endifequal %}
-                </a>
+            <div class="col-xs-offset-8 col-sm-4 text-center">
+
             </div>
-        </div>
-    {% endfor %}
+         </div>
+         {% endfor %}
     </div>
 </div>
 

templates/registered/dashboard.html

@@ -5,9 +5,9 @@
 {% block page_title %}Something something here{% endblock page_title %}
 
 {% block content %}
-<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
+<div class="col-lg-12">
 
-    <h1 class="page-header">Dashboard</h1>
+    <h1 class="page-header text-center">Dashboard</h1>
     <div class="container">
     <p>WAT</p>
     </div>

templates/registered/help.html

@@ -0,0 +1,15 @@
+{% extends "public/base.html" %}
+
+{% block title %}Alliance Auth{% endblock %}
+
+{% block page_title %}Something something here{% endblock page_title %}
+
+{% block content %}
+<div class="col-lg-12">
+
+    <h1 class="page-header text-center">Help</h1>
+    <div class="container">
+    <p>WAT</p>
+    </div>
+</div>
+{% endblock content %}

templates/registered/services.html

@@ -7,7 +7,7 @@
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
-<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
+<div class="col-lg-12">
     <h1 class="page-header text-center">Available Services</h1>
     {% if perms.authentication.alliance_member %}
     <table class="table table-bordered">
@@ -22,46 +22,57 @@
             <td class="text-center">{{ user.forum_username }}</td>
             <td class="text-center">{{ user.forum_password }}</td>
             <td class="text-center">
+                {% ifequal user.forum_username "" %}
                 <a href="{% url 'auth_activate_forum' %}">
                     <button type="button" class="btn btn-success"><span class="glyphicon glyphicon-ok"></span></button>
                 </a>
-                <a href="{% url 'auth_activate_forum' %}">
-                    <button type="button" class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span></button>
-                </a>
-                <a href="{% url 'auth_activate_forum' %}">
+                {% else %}
+                <a href="{% url 'auth_reset_forum_password' %}">
                     <button type="button" class="btn btn-primary"><span class="glyphicon glyphicon-refresh"></span></button>
                 </a>
+                <a href="{% url 'auth_deactivate_forum' %}">
+                    <button type="button" class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span></button>
+                </a>
+                {% endifequal %}
             </td>
         </tr>
         <tr>
             <td class="text-center">Jabber</td>
-            <td class="text-center">{{ user.jabber_username }}</td>
+            <td class="text-center">
+                {{ user.jabber_username }}{% if user.jabber_username != "" %}{{ JABBER_URL }}{% endif %}
+            </td>
             <td class="text-center">{{ user.jabber_password }}</td>
             <td class="text-center">
+                {% ifequal user.jabber_username "" %}
                 <a href="{% url 'auth_activate_jabber' %}">
                     <button type="button" class="btn btn-success"><span class="glyphicon glyphicon-ok"></span></button>
                 </a>
-                <a href="{% url 'auth_activate_jabber' %}">
-                    <button type="button" class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span></button>
-                </a>
-                <a href="{% url 'auth_activate_jabber' %}">
+                {% else %}
+                <a href="{% url 'auth_reset_jabber_password' %}">
                     <button type="button" class="btn btn-primary"><span class="glyphicon glyphicon-refresh"></span></button>
                 </a>
+                <a href="{% url 'auth_deactivate_jabber' %}">
+                    <button type="button" class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span></button>
+                </a>
+                {% endifequal %}
             </td>
         <tr>
             <td class="text-center">Mumble</td>
             <td class="text-center">{{ user.mumble_username }}</td>
             <td class="text-center">{{ user.mumble_password }}</td>
             <td class="text-center">
+                {% ifequal user.mumble_username "" %}
                 <a href="{% url 'auth_activate_mumble' %}">
                     <button type="button" class="btn btn-success"><span class="glyphicon glyphicon-ok"></span></button>
                 </a>
-                <a href="{% url 'auth_activate_mumble' %}">
-                    <button type="button" class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span></button>
-                </a>
-                <a href="{% url 'auth_activate_mumble' %}">
+                {% else %}
+                <a href="{% url 'auth_reset_mumble_password' %}">
                     <button type="button" class="btn btn-primary"><span class="glyphicon glyphicon-refresh"></span></button>
                 </a>
+                <a href="{% url 'auth_deactivate_mumble' %}">
+                    <button type="button" class="btn btn-danger"><span class="glyphicon glyphicon-remove"></span></button>
+                </a>
+                {% endifequal %}
             </td>
         </tr>
     </table>