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

allianceauth/settings.py

@@ -128,7 +128,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.contrib.messages.context_processors.messages',
     'django.core.context_processors.request',
     'util.context_processors.alliance_id',
-    'util.context_processors.alliance_name'
+    'util.context_processors.alliance_name',
+    'util.context_processors.jabber_url'
 )
 
 ########## USER CONFIGURATION
@@ -151,12 +152,13 @@ STATICFILES_DIRS = (
 STATIC_URL = '/static/'
 
 # ALLIANCE INFO
-ALLIANCE_ID = '99001336'
-ALLIANCE_NAME = 'The 99 Percent'
+ALLIANCE_ID = '0'
+ALLIANCE_NAME = 'some alliance'
 
 # Jabber Prosody Info
-OPENFIRE_ADDRESS = "http://the99eve.com:9090/"
-OPENFIRE_SECRET_KEY = "SrJ35I36"
+JABBER_URL = "@someurl.com"
+OPENFIRE_ADDRESS = "http://someurl.com:9090/"
+OPENFIRE_SECRET_KEY = "somekey"
 
 # Mumble settings
 MUMBLE_SERVER_ID = 1

allianceauth/urls.py

@@ -7,10 +7,13 @@ urlpatterns = patterns('',
 
     # Main Views
     url(r'^$', 'portal.views.index_view', name='auth_index'),
+
+    # Registered Views
     url(r'^dashboard/$', 'portal.views.dashboard_view', name='auth_dashboard'),
     url(r'^characters/', 'portal.views.characters_view', name='auth_characters'),
     url(r'^api_key_management/', 'portal.views.api_key_management_view', name='auth_api_key_management'),
     url(r'^services/', 'portal.views.services_view', name='auth_services'),
+    url(r'^help/', 'portal.views.help_view', name='auth_help'),
 
     # Register
     url(r'^register/', 'registration.views.register', name='auth_register'),
@@ -21,8 +24,21 @@ urlpatterns = patterns('',
 
     # None views
     url(r'^main_character_change/(\w+)/$', 'portal.views.main_character_change', name='auth_main_character_change'),
+    url(r'^delete_api_pair/(\w+)/$', 'portal.views.api_key_removal', name='auth_api_key_removal'),
+
+    # Forum Service Control
     url(r'^activate_forum/$', 'portal.views.activate_forum', name='auth_activate_forum'),
+    url(r'^deactivate_forum/$', 'portal.views.deactivate_forum', name='auth_deactivate_forum'),
+    url(r'reset_forum_password/$', 'portal.views.reset_forum_password', name='auth_reset_forum_password'),
+
+    # Jabber Service Control
     url(r'^activate_jabber/$', 'portal.views.activate_jabber', name='auth_activate_jabber'),
+    url(r'^deactivate_jabber/$', 'portal.views.deactivate_jabber', name='auth_deactivate_jabber'),
+    url(r'^reset_jabber_password/$', 'portal.views.reset_jabber_password', name='auth_reset_jabber_password'),
+
+    # Mumble service contraol
     url(r'^activate_mumble/$', 'portal.views.activate_mumble', name='auth_activate_mumble'),
-    url(r'^delete_api_pair/(\w+)/$', 'portal.views.api_key_removal', name='auth_api_key_removal')
+    url(r'deactivate_mumble/$', 'portal.views.deactivate_mumble', name='auth_deactivate_mumble'),
+    url(r'reset_mumble_password/$', 'portal.views.reset_mumble_password', name='auth_reset_mumble_password'),
+
 )

authentication/models.py

@@ -49,7 +49,7 @@ class AllianceUserManager(BaseUserManager):
     def check_if_user_exist_by_name(self, user_name):
         return AllianceUser.objects.filter(username=user_name).exists()
 
-    def update_user_form_info(self, username, password, user_id):
+    def update_user_forum_info(self, username, password, user_id):
         if AllianceUser.objects.filter(id=user_id).exists():
             user = AllianceUser.objects.get(id=user_id)
             user.forum_username = username
@@ -86,7 +86,7 @@ class AllianceUserManager(BaseUserManager):
                                                       content_type=ct, name='Alliance Member')
         if AllianceUser.objects.filter(id=user_id).exists():
             user = AllianceUser.objects.get(id=user_id)
-            if user.has_perm('authentication.alliance_member'):
+            if user.has_perm('alliance_member'):
                 user.user_permissions.remove(permission)
                 user.save()
 
@@ -100,12 +100,12 @@ class AllianceUser(AbstractBaseUser, PermissionsMixin):
     main_char_id = models.CharField(max_length=64, default="")
 
     # Login information stuff
-    forum_username = models.CharField(max_length=64)
-    forum_password = models.CharField(max_length=64)
-    jabber_username = models.CharField(max_length=64)
-    jabber_password = models.CharField(max_length=64)
-    mumble_username = models.CharField(max_length=64)
-    mumble_password = models.CharField(max_length=64)
+    forum_username = models.CharField(max_length=254)
+    forum_password = models.CharField(max_length=254)
+    jabber_username = models.CharField(max_length=254)
+    jabber_password = models.CharField(max_length=254)
+    mumble_username = models.CharField(max_length=254)
+    mumble_password = models.CharField(max_length=254)
 
     objects = AllianceUserManager()
 

portal/views.py

@@ -3,7 +3,6 @@ from django.conf import settings
 from django.template import RequestContext
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.decorators import permission_required
-from django.contrib.auth.models import Permission
 
 from services.eveapi_manager import EveApiManager
 from evespecific.managers import EveManager
@@ -80,6 +79,11 @@ def services_view(request):
     return render_to_response('registered/services.html', None, context_instance=RequestContext(request))
 
 
+@login_required
+def help_view(request):
+    return render_to_response('registered/help.html', None, context_instance=RequestContext(request))
+
+
 @login_required
 def main_character_change(request, char_id):
     usermanager = AllianceUserManager()
@@ -98,51 +102,162 @@ def main_character_change(request, char_id):
 
 
 @login_required
-@permission_required('auth.alliance_member')
+@permission_required('authentication.alliance_member')
 def activate_forum(request):
-    userManager = AllianceUserManager()
-    forumManager = Phpbb3Manager()
+    usermanager = AllianceUserManager()
+    forummanager = Phpbb3Manager()
 
-    if userManager.check_if_user_exist(request.user.id):
+    if usermanager.check_if_user_exist_by_id(request.user.id):
         # Valid now we get the main characters
-        characterManager = EveManager()
-        character = characterManager.get_character_by_id(request.user.main_char_id)
+        charactermanager = EveManager()
+        character = charactermanager.get_character_by_id(request.user.main_char_id)
+
+        result = forummanager.add_user(character.character_name, request.user.email, ['REGISTERED'])
+
+        # if empty we failed
+        if result[0] != "":
+            usermanager.update_user_forum_info(result[0], result[1], request.user.id)
 
-        if forumManager.check_user(character.character_name) == False:
-            forumManager.add_user(character.character_name, "test", request.user.email, ['REGISTERED'])
         return HttpResponseRedirect("/services/")
 
-    return HttpResponseRedirect("/")
-
+    return HttpResponseRedirect("/dashboard")
 
 @login_required
-@permission_required('auth.alliance_member')
+@permission_required('authentication.alliance_member')
+def deactivate_forum(request):
+    usermanager = AllianceUserManager()
+    forummanager = Phpbb3Manager()
+
+    if usermanager.check_if_user_exist_by_id(request.user.id):
+
+        result = forummanager.disable_user(request.user.forum_username)
+
+        # false we failed
+        if result:
+            usermanager.update_user_forum_info("", "", request.user.id)
+            return HttpResponseRedirect("/services/")
+
+    return HttpResponseRedirect("/dashboard")
+
+@login_required
+@permission_required('authentication.alliance_member')
+def reset_forum_password(request):
+    usermanager = AllianceUserManager()
+    forummanager = Phpbb3Manager()
+
+    if usermanager.check_if_user_exist_by_id(request.user.id):
+
+        result = forummanager.update_user_password(request.user.forum_username)
+
+        # false we failed
+        if result != "":
+            usermanager.update_user_forum_info(request.user.forum_username, result, request.user.id)
+            return HttpResponseRedirect("/services/")
+
+    return HttpResponseRedirect("/dashboard")
+
+@login_required
+@permission_required('authentication.alliance_member')
 def activate_jabber(request):
-    userManager = AllianceUserManager()
-    jabberManager = JabberManager()
-    if userManager.check_if_user_exist(request.user.id):
-        characterManager = EveManager()
-        character = characterManager.get_character_by_id(request.user.main_char_id)
+    usermanager = AllianceUserManager()
+    jabbermanager = JabberManager()
+    if usermanager.check_if_user_exist_by_id(request.user.id):
+        charactermanager = EveManager()
+        character = charactermanager.get_character_by_id(request.user.main_char_id)
     
-        jabberManager.add_user(character.character_name,"test")
+        info = jabbermanager.add_user(character.character_name)
 
+        # If our username is blank means we already had a user
+        if info[0] is not "":
+            usermanager.update_user_jabber_info(info[0], info[1], request.user.id)
         return HttpResponseRedirect("/services/")
     
-    return HttpResponseRedirect("/")
+    return HttpResponseRedirect("/dashboard")
 
 
 @login_required
-@permission_required('auth.alliance_member')
+@permission_required('authentication.alliance_member')
+def deactivate_jabber(request):
+    usermanager = AllianceUserManager()
+    jabbermanager = JabberManager()
+    if usermanager.check_if_user_exist_by_id(request.user.id):
+        result = jabbermanager.delete_user(request.user.jabber_username)
+        # If our username is blank means we failed
+        if result:
+            usermanager.update_user_jabber_info("", "", request.user.id)
+
+        return HttpResponseRedirect("/services/")
+
+    return HttpResponseRedirect("/dashboard")
+
+@login_required
+@permission_required('authentication.alliance_member')
+def reset_jabber_password(request):
+    usermanager = AllianceUserManager()
+    jabbermanager = JabberManager()
+    if usermanager.check_if_user_exist_by_id(request.user.id):
+        result = jabbermanager.update_user_pass(request.user.jabber_username)
+        # If our username is blank means we failed
+        if result != "":
+            usermanager.update_user_jabber_info(request.user.jabber_username, result, request.user.id)
+
+        return HttpResponseRedirect("/services/")
+
+    return HttpResponseRedirect("/dashboard")
+
+
+@login_required
+@permission_required('authentication.alliance_member')
 def activate_mumble(request):
-    userManager = AllianceUserManager()
-    characterManager = EveManager()
-    mumbleManager = MumbleManager()
+    usermanager = AllianceUserManager()
+    charactermanager = EveManager()
+    mumblemanager = MumbleManager()
 
-    if userManager.check_if_user_exist(request.user.id):
-        characterManager = EveManager()
-        character = characterManager.get_character_by_id(request.user.main_char_id)
+    if usermanager.check_if_user_exist_by_id(request.user.id):
+        character = charactermanager.get_character_by_id(request.user.main_char_id)
 
-        mumbleManager.create_user(character.character_name, "test")
+        result = mumblemanager.create_user(character.corporation_ticker, character.character_name)
+
+        # if its empty we failed
+        if result[0] is not "":
+            usermanager.update_user_mumble_info(result[0], result[1], request.user.id)
+
+            return HttpResponseRedirect("/services/")
+
+    return HttpResponseRedirect("/")
+
+@login_required
+@permission_required('authentication.alliance_member')
+def deactivate_mumble(request):
+    usermanager = AllianceUserManager()
+    mumblemanager = MumbleManager()
+
+    if usermanager.check_if_user_exist_by_id(request.user.id):
+
+        result = mumblemanager.delete_user(request.user.mumble_username)
+
+        # if false we failed
+        if result:
+            usermanager.update_user_mumble_info("", "", request.user.id)
+
+            return HttpResponseRedirect("/services/")
+
+    return HttpResponseRedirect("/")
+
+@login_required
+@permission_required('authentication.alliance_member')
+def reset_mumble_password(request):
+
+    usermanager = AllianceUserManager()
+    mumblemanager = MumbleManager()
+
+    if usermanager.check_if_user_exist_by_id(request.user.id):
+
+        result = mumblemanager.update_user_password(request.user.mumble_username)
+
+        # if blank we failed
+        if result != "":
+            usermanager.update_user_mumble_info(request.user.mumble_username, result, request.user.id)
 
             return HttpResponseRedirect("/services/")
 

services/jabber_manager.py

@@ -1,5 +1,8 @@
+import os
 from django.conf import settings
+from openfire import exception
 from openfire import UserService
+from urlparse import urlparse
 
 
 class JabberManager():
@@ -7,15 +10,39 @@ class JabberManager():
     def __init__(self):
         pass
 
-    def add_user(self, username, password):
+    def __add_address_to_username(self, username):
+        address = urlparse(settings.OPENFIRE_ADDRESS).netloc.split(":")[0]
+        completed_username = username + "@" + address
+        return completed_username
+
+    def __santatize_username(self, username):
+        sanatized = username.replace(" ", "_")
+        return sanatized.lower()
+
+    def __generate_random_pass(self):
+        return os.urandom(8).encode('hex')
+
+    def add_user(self, username):
+
+        try:
+            sanatized_username = self.__santatize_username(username)
+            password = self.__generate_random_pass()
             api = UserService(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY)
-        print str(username)
-        print str(password)
-        api.add_user(self.__santatize_username(username), str(password))
+            api.add_user(sanatized_username, password)
+
+        except exception.UserAlreadyExistsException:
+            # User exist
+            return "", ""
+
+        return sanatized_username, password
 
     def delete_user(self, username):
+        try:
             api = UserService(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY)
             api.delete_user(username)
+            return True
+        except exception.UserNotFoundException:
+            return False
 
     def lock_user(self, username):
         api = UserService(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY)
@@ -25,10 +52,11 @@ class JabberManager():
         api = UserService(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY)
         api.unlock_user(username)
 
-    def update_user_pass(self, username, password):
+    def update_user_pass(self, username):
+        try:
+            password = self.__generate_random_pass()
             api = UserService(settings.OPENFIRE_ADDRESS, settings.OPENFIRE_SECRET_KEY)
             api.update_user(username, password)
-
-    def __santatize_username(self, username):
-        sanatized = username.replace(" ", "_")
-        return sanatized.lower()
+            return password
+        except exception.UserNotFoundException:
+            return ""

services/mumble_manager.py

@@ -1,38 +1,61 @@
-import uuid
+import os
 import hashlib
-import random
 from django.db import connections
 from django.conf import settings
 
+
 class MumbleManager:
 
+    SQL_SELECT_MAX_ID = r"SELECT max(user_id)+1 as next_id from murmur_users"
+    SQL_CREATE_USER = r"INSERT INTO murmur_users (server_id, user_id, name, pw) VALUES (%s, %s, %s, %s)"
+    SQL_SELECT_GET_USER_ID_BY_NAME = r"SELECT user_id from murmur_users WHERE name = %s AND server_id = %s"
+    SQL_CHECK_USER_EXIST = r"SELECT name from murmur_users WHERE name = %s AND server_id = %s"
+    SQL_DELETE_USER = r"DELETE FROM murmur_users WHERE name = %s AND server_id = %s"
+    SQL_UPDATE_USER_PASSWORD = r"UPDATE murmur_users SET pw = %s WHERE name = %s AND server_id = %s"
+
     def __init__(self):
         self.dbcursor = connections['mumble'].cursor()
 
-    @staticmethod
-    def _gen_pwhash(password):
+    def __santatize_username(self, username):
+        sanatized = username.replace(" ", "_")
+        return sanatized
+
+    def __generate_random_pass(self):
+        return os.urandom(8).encode('hex')
+
+    def __generate_username(self, username, corp_ticker):
+        return "["+corp_ticker+"]"+username
+
+    def _gen_pwhash(self, password):
         return hashlib.sha1(password).hexdigest()
 
     def get_user_id_by_name(self, name):
-        self.dbcursor.execute(r"SELECT user_id from murmur_users WHERE name = %s AND server_id = %s",
-                              [name, settings.MUMBLE_SERVER_ID])
+        self.dbcursor.execute(self.SQL_SELECT_GET_USER_ID_BY_NAME, [name, settings.MUMBLE_SERVER_ID])
         row = self.dbcursor.fetchone()
         if row:
             return row[0]
 
-    def create_user(self, username, password):
-        """ Add a user """
-        self.dbcursor.execute(r"SELECT max(user_id)+1 as next_id from murmur_users")
+    def create_user(self, corp_ticker, username):
+
+        username_clean = self.__generate_username(self.__santatize_username(username),  corp_ticker)
+        password = self.__generate_random_pass()
+        pwhash = self._gen_pwhash(password)
+
+        try:
+            self.dbcursor.execute(self.SQL_SELECT_MAX_ID)
             user_id = self.dbcursor.fetchone()[0]
 
-        self.dbcursor.execute(r"INSERT INTO murmur_users (server_id, user_id, name, pw) VALUES (%s, %s, %s, %s)",
-                              [settings.MUMBLE_SERVER_ID, user_id, self.__santatize_username(username), self._gen_pwhash(password)])
+            self.dbcursor.execute(self.SQL_CREATE_USER,
+                                  [settings.MUMBLE_SERVER_ID, user_id, username_clean,
+                                   pwhash])
 
-        return {'username': username, 'password': password }
+            return username_clean, password
+        except:
+            return "", ""
 
     def check_user_exist(self, username):
-        """ Check if the username exists """
-        self.dbcursor.execute(r"SELECT name from murmur_users WHERE name = %s AND server_id = %s",
+
+        self.dbcursor.execute(self.SQL_CHECK_USER_EXIST,
                               [username, settings.MUMBLE_SERVER_ID])
 
         row = self.dbcursor.fetchone()
@@ -40,13 +63,31 @@ class MumbleManager:
             return True
         return False
 
-    def delete_user(self, uid):
-        """ Delete a user """
-        id = self.get_user_id_by_name(uid)
-        self.dbcursor.execute(r"DELETE FROM murmur_users WHERE user_id = %s AND server_id = %s",
-                              [id, settings.MUMBLE_SERVER_ID])
-        return True
+    def delete_user(self, username):
 
-    def __santatize_username(self, username):
-        sanatized = username.replace(" ","_")
-        return sanatized.lower()
+        if self.check_user_exist(username):
+            try:
+
+                self.dbcursor.execute(self.SQL_DELETE_USER,
+                                      [username, settings.MUMBLE_SERVER_ID])
+                return True
+            except:
+                return False
+
+        return False
+
+    def update_user_password(self, username):
+
+        password = self.__generate_random_pass()
+        pwhash = self._gen_pwhash(password)
+
+        if self.check_user_exist(username):
+            try:
+
+                self.dbcursor.execute(self.SQL_UPDATE_USER_PASSWORD,
+                                      [pwhash, username, settings.MUMBLE_SERVER_ID])
+                return password
+            except:
+                return ""
+
+        return ""

services/phpbb3_manager.py

@@ -1,4 +1,5 @@
-import random
+import os
+import sys
 from passlib.apps import phpbb3_context
 from django.db import connections
 
@@ -9,8 +10,9 @@ class Phpbb3Manager():
                    r"user_password, user_email, group_id , user_permissions, " \
                    r"user_sig, user_occ, user_interests) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s)"
 
-    SQL_DIS_USER = r"DELETE FROM phpbb_user_groups where user_id = " \
-                   r"(SELECT user_id FROM phpbb_users WHERE username = %s)"
+    SQL_DEL_USER = r"DELETE FROM phpbb_users where username = %s"
+
+    SQL_DIS_USER = r"UPDATE phpbb_users SET user_email= %s, user_password=%s WHERE username = %s"
 
     SQL_CHECK_USER = r"SELECT user_id from phpbb_users WHERE username = %s"
 
@@ -20,48 +22,90 @@ class Phpbb3Manager():
 
     SQL_ADD_GROUP = r"INSERT INTO phpbb_groups (group_name) VALUES (%s)"
 
+    SQL_UPDATE_USER_PASSWORD = r"UPDATE phpbb_users SET user_password = %s WHERE username = %s"
+
     def __init__(self):
-        pass
+        self.cursor = connections['phpbb3'].cursor()
 
-    def _gen_salt(self):
-        return "%x" % random.randint(0, 2147483647)
+    def __generate_random_pass(self):
+        return os.urandom(8).encode('hex')
 
-    def _gen_hash(self, password):
+    def __gen_hash(self, password):
         return phpbb3_context.encrypt(password)
 
-    def add_user(self, username, password, email, groups):
+    def __santatize_username(self, username):
+        sanatized = username.replace(" ", "_")
+        return sanatized.lower()
 
-        cursor = connections['phpbb3'].cursor()
+    def add_user(self, username, email, groups):
+        username_clean = self.__santatize_username(username)
+        password = self.__generate_random_pass()
+        pwhash = self.__gen_hash(password)
 
-        """ Add a user """
-        username_clean = username.lower()
-        pwhash = self._gen_hash(password)
-        cursor.execute(self.SQL_ADD_USER, [username, username_clean, pwhash, email, 2, "", "","", ""])
-        self.update_groups(username,groups)
-        return { 'username': username, 'password': password }
+        # check if the username was simply revoked
+        if self.check_user(username_clean):
+            self.__update_user_info(username_clean, email, pwhash)
+        else:
+            try:
+                self.cursor.execute(self.SQL_ADD_USER, [username_clean, username_clean, pwhash, email, 2, "", "", "", ""])
+                self.update_groups(username_clean, groups)
+            except:
+                pass
+
+        return username_clean, password
+
+    def disable_user(self, username):
+        password = self.__gen_hash(self.__generate_random_pass())
+        revoke_email = "revoked@the99eve.com"
+        try:
+            pwhash = self.__gen_hash(password)
+            self.cursor.execute(self.SQL_DIS_USER, [revoke_email, pwhash, username])
+            return True
+        except TypeError as e:
+            print e
+            return False
+
+    def delete_user(self, username):
+        if self.check_user(username):
+            self.cursor.execute(self.SQL_DEL_USER, [username])
+            return True
+        return False
 
     def update_groups(self, username, groups):
-        cursor = connections['phpbb3'].cursor()
-
-        cursor.execute(self.SQL_CHECK_USER, [username])
-        row = cursor.fetchone()
+        self.cursor.execute(self.SQL_CHECK_USER, [username])
+        row = self.cursor.fetchone()
         userid = row[0]
         for group in groups:
-            cursor.execute(self.SQL_GET_GROUP, [group])
-            row = cursor.fetchone()
+            self.cursor.execute(self.SQL_GET_GROUP, [group])
+            row = self.cursor.fetchone()
             print row
             if not row:
-                cursor.execute(self.SQL_ADD_GROUP, [group])
-                cursor.execute(self.SQL_GET_GROUP, [group])
-                row = cursor.fetchone()
+                self.cursor.execute(self.SQL_ADD_GROUP, [group])
+                self.cursor.execute(self.SQL_GET_GROUP, [group])
+                row = self.cursor.fetchone()
 
-            cursor.execute(self.SQL_ADD_USER_GROUP, [row[0], userid,0])
+            self.cursor.execute(self.SQL_ADD_USER_GROUP, [row[0], userid,0])
     
     def check_user(self, username):
         cursor = connections['phpbb3'].cursor()
         """ Check if the username exists """
-        cursor.execute(self.SQL_CHECK_USER, [username])
+        cursor.execute(self.SQL_CHECK_USER, [self.__santatize_username(username)])
         row = cursor.fetchone()
         if row:
             return True        
         return False
+
+    def update_user_password(self, username):
+        password = self.__generate_random_pass()
+        if self.check_user(username):
+            pwhash = self.__gen_hash(password)
+            self.cursor.execute(self.SQL_UPDATE_USER_PASSWORD, [pwhash, username])
+            return password
+
+        return ""
+
+    def __update_user_info(self, username, email, password):
+        try:
+            self.cursor.execute(self.SQL_DIS_USER, [email, password, username])
+        except:
+            pass

static/css/updatecards.css

@@ -79,3 +79,7 @@ span.tags
     margin-left: -10px;
     z-index: 10;
     }
+
+.fixed_button_width {
+    width: 78px !important;
+}

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,14 +7,16 @@
 {% 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">
+<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 well-sm profile">
+         <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>
@@ -25,10 +27,7 @@
                 <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">
-                    </figure>
-                </div>
-            </div>
-            <div class="col-md-offset-8">
+                         <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>
@@ -36,6 +35,11 @@
                                 <button type="button" class="btn btn-primary">Make Primary</button>
                             {% endifequal %}
                         </a>
+                    </figure>
+                </div>
+            </div>
+            <div class="col-xs-offset-8 col-sm-4 text-center">
+
             </div>
          </div>
          {% endfor %}

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>

util/context_processors.py

@@ -2,8 +2,12 @@ from django.conf import settings
 
 
 def alliance_id(request):
-    return {'ALLIANCE_ID': settings.ALLIANCE_ID}
+    return {'ALLIANCE_ID': settings.ALLIANCE_ID }
 
 
 def alliance_name(request):
-    return {'ALLIANCE_NAME': settings.ALLIANCE_NAME}
+    return {'ALLIANCE_NAME': settings.ALLIANCE_NAME }
+
+
+def jabber_url(request):
+    return {'JABBER_URL': settings.JABBER_URL }