From 786e573a0a145a4adb45a3d0e9b1a0a5655d65b9 Mon Sep 17 00:00:00 2001
From: Ydmir <joakim.u.strandberg@gmail.com>
Date: Fri, 15 Jan 2016 09:23:40 +0100
Subject: [PATCH 01/23] Added initial corputils functionality, for auditing
 members in corporation mode.

---
 .idea/allianceauth.iml                    |  11 +-
 alliance_auth/urls.py                     |   9 +-
 corputils/__init__.py                     |   0
 corputils/admin.py                        |   0
 corputils/models.py                       |   0
 corputils/tests.py                        |   0
 corputils/views.py                        |  52 ++++
 eveonline/views.py                        |   1 +
 hrapplications/views.py                   | 344 +++++++++++-----------
 services/managers/eve_api_manager.py      |  25 +-
 stock/templates/public/base.html          |   9 +-
 stock/templates/registered/corputils.html | 102 +++++++
 12 files changed, 367 insertions(+), 186 deletions(-)
 create mode 100644 corputils/__init__.py
 create mode 100644 corputils/admin.py
 create mode 100644 corputils/models.py
 create mode 100644 corputils/tests.py
 create mode 100644 corputils/views.py
 create mode 100644 stock/templates/registered/corputils.html

diff --git a/.idea/allianceauth.iml b/.idea/allianceauth.iml
index 199266bc..a89267e9 100755
--- a/.idea/allianceauth.iml
+++ b/.idea/allianceauth.iml
@@ -6,21 +6,16 @@
         <option name="rootFolder" value="$MODULE_DIR$" />
         <option name="settingsModule" value="settings.py" />
         <option name="manageScript" value="manage.py" />
+        <option name="environment" value="&lt;map/&gt;" />
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Python 2.7.6 (/usr/bin/python2.7)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TemplatesService">
     <option name="TEMPLATE_CONFIGURATION" value="Django" />
-    <option name="TEMPLATE_FOLDERS">
-      <list>
-        <option value="$MODULE_DIR$/templates" />
-      </list>
-    </option>
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/alliance_auth/urls.py b/alliance_auth/urls.py
index 5db17229..4d065330 100755
--- a/alliance_auth/urls.py
+++ b/alliance_auth/urls.py
@@ -162,7 +162,10 @@ urlpatterns = patterns('',
                        url(r'srp_request_reject/(\w+)', 'srp.views.srp_request_reject', name='auth_srp_request_reject'),
                        url(r'srp_request_amount_update/(\w+)', 'srp.views.srp_request_update_amount_view',
                            name="auth_srp_request_update_amount_view"),
-                       
-			# FLEET FITTINGS
-			url(r'^fits/$', 'services.views.fleet_fits', name='auth_fleet_fits'),
+
+                       #corputils
+                       url(r'^corp_utils/$', 'corputils.views.corp_member_view', name='auth_corp_member_view'),
+
+                       # FLEET FITTINGS
+                       url(r'^fits/$', 'services.views.fleet_fits', name='auth_fleet_fits'),
 )
diff --git a/corputils/__init__.py b/corputils/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/corputils/admin.py b/corputils/admin.py
new file mode 100644
index 00000000..e69de29b
diff --git a/corputils/models.py b/corputils/models.py
new file mode 100644
index 00000000..e69de29b
diff --git a/corputils/tests.py b/corputils/tests.py
new file mode 100644
index 00000000..e69de29b
diff --git a/corputils/views.py b/corputils/views.py
new file mode 100644
index 00000000..f75bb780
--- /dev/null
+++ b/corputils/views.py
@@ -0,0 +1,52 @@
+from django.conf import settings
+from django.shortcuts import render_to_response
+from django.template import RequestContext
+from django.contrib.auth.decorators import login_required
+from django.contrib.auth.decorators import permission_required
+
+from authentication.managers import AuthServicesInfoManager
+from services.managers.eve_api_manager import EveApiManager
+from eveonline.models import EveCorporationInfo
+from eveonline.models import EveCharacter
+from authentication.models import AuthServicesInfo
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+# Because corp-api only exist for the executor corp, this function will only be available in corporation mode.
+@login_required
+@permission_required('auth.corp_stats')
+def corp_member_view(request):
+    logger.debug("corp_member_view called by user %s" % request.user)
+    # Get the corp the member is in
+    auth_info = AuthServicesInfo.objects.get(user=request.user)
+    logger.debug("Got user %s authservicesinfo model %s" % (request.user, auth_info))
+
+    if settings.IS_CORP:
+        corp = EveCorporationInfo.objects.get(corporation_id=settings.CORP_ID)
+
+        member_list = EveApiManager.get_corp_membertracking()
+        characters_with_api = {}
+        characters_without_api = {}
+        for char_id, member_data in member_list.iteritems():
+            try:
+                char = EveCharacter.objects.get(character_id=char_id)
+                user = char.user
+                mainid = int(AuthServicesInfoManager.get_auth_service_info(user=user).main_char_id)
+                characters_with_api.setdefault(mainid,{}).update({char_id:char.character_name})
+            except EveCharacter.DoesNotExist:
+                mainid = char_id
+                characters_without_api.setdefault(mainid,{}).update({char_id:member_data["name"]})
+
+
+        context = {"corp": corp,
+                   "characters_with_api": characters_with_api,
+                   "characters_without_api": characters_without_api}
+
+        return render_to_response('registered/corputils.html',context, context_instance=RequestContext(request) )
+    else:
+        logger.error("Not running in corporation mode. Cannot provide corp member tracking data." % (request.user, auth_info.main_char_id))
+    return render_to_response('registered/corputils.html', None, context_instance=RequestContext(request))
+
diff --git a/eveonline/views.py b/eveonline/views.py
index fc9ed613..fb04fff9 100755
--- a/eveonline/views.py
+++ b/eveonline/views.py
@@ -25,6 +25,7 @@ import logging
 
 logger = logging.getLogger(__name__)
 
+
 def disable_member(user, char_id):
     logger.debug("Disabling user %s with character id %s" % (user, char_id))
     remove_member_permission(user, 'member')
diff --git a/hrapplications/views.py b/hrapplications/views.py
index 8398b95c..903121c9 100755
--- a/hrapplications/views.py
+++ b/hrapplications/views.py
@@ -22,236 +22,236 @@ logger = logging.getLogger(__name__)
 
 @login_required
 def hr_application_management_view(request):
-	logger.debug("hr_application_management_view called by user %s" % request.user)
-	personal_app = None
-	corp_applications = None
+    logger.debug("hr_application_management_view called by user %s" % request.user)
+    personal_app = None
+    corp_applications = None
 
-	if request.user.is_superuser:
-		logger.debug("User %s is superuser: returning all applications." % request.user)
-		corp_applications = HRApplication.objects.all()
-	else:
-		# Get the corp the member is in
-		auth_info = AuthServicesInfo.objects.get(user=request.user)
-		if auth_info.main_char_id != "":
-			try:
-				main_corp_id = EveManager.get_charater_corporation_id_by_id(auth_info.main_char_id)
-        	                main_alliance_id = EveManager.get_charater_alliance_id_by_id(auth_info.main_char_id)
-				if (settings.IS_CORP and main_corp_id == settings.CORP_ID) or (not settings.IS_CORP and main_alliance_id == settings.ALLIANCE_ID):
-					main_char = EveCharacter.objects.get(character_id=auth_info.main_char_id)
-					if EveCorporationInfo.objects.filter(corporation_id=main_char.corporation_id).exists():
-	                                    corp = EveCorporationInfo.objects.get(corporation_id=main_char.corporation_id)
-        	                            corp_applications = HRApplication.objects.filter(corp=corp).filter(approved_denied=None)
-                	                else:
-                        	            corp_applications = None
-				else:
-					corp_applications = None
-			except:
-				logger.error("Unable to determine user %s main character id %s corp. Returning no corp hrapplications." % (request.user, auth_info.main_char_id))
-				corp_applications = None
-	context = {'personal_apps': HRApplication.objects.all().filter(user=request.user),
-			   'applications': corp_applications,
-			   'search_form': HRApplicationSearchForm()}
+    if request.user.is_superuser:
+        logger.debug("User %s is superuser: returning all applications." % request.user)
+        corp_applications = HRApplication.objects.all()
+    else:
+        # Get the corp the member is in
+        auth_info = AuthServicesInfo.objects.get(user=request.user)
+        if auth_info.main_char_id != "":
+            try:
+                main_corp_id = EveManager.get_charater_corporation_id_by_id(auth_info.main_char_id)
+                main_alliance_id = EveManager.get_charater_alliance_id_by_id(auth_info.main_char_id)
+                if (settings.IS_CORP and main_corp_id == settings.CORP_ID) or (not settings.IS_CORP and main_alliance_id == settings.ALLIANCE_ID):
+                    main_char = EveCharacter.objects.get(character_id=auth_info.main_char_id)
+                    if EveCorporationInfo.objects.filter(corporation_id=main_char.corporation_id).exists():
+                        corp = EveCorporationInfo.objects.get(corporation_id=main_char.corporation_id)
+                        corp_applications = HRApplication.objects.filter(corp=corp).filter(approved_denied=None)
+                    else:
+                        corp_applications = None
+                else:
+                    corp_applications = None
+            except:
+                logger.error("Unable to determine user %s main character id %s corp. Returning no corp hrapplications." % (request.user, auth_info.main_char_id))
+                corp_applications = None
+    context = {'personal_apps': HRApplication.objects.all().filter(user=request.user),
+               'applications': corp_applications,
+               'search_form': HRApplicationSearchForm()}
 
-	return render_to_response('registered/hrapplicationmanagement.html',
-							  context, context_instance=RequestContext(request))
+    return render_to_response('registered/hrapplicationmanagement.html',
+                              context, context_instance=RequestContext(request))
 
 
 @login_required
 def hr_application_create_view(request):
-	logger.debug("hr_application_create_view called by user %s" % request.user)
-	success = False
+    logger.debug("hr_application_create_view called by user %s" % request.user)
+    success = False
 
-	if request.method == 'POST':
-		form = HRApplicationForm(request.POST)
-		logger.debug("Request type POST with form valid: %s" % form.is_valid())
-		if form.is_valid():
-			application = HRApplication()
-			application.user = request.user
-			application.character_name = form.cleaned_data['character_name']
-			application.full_api_id = form.cleaned_data['full_api_id']
-			application.full_api_key = form.cleaned_data['full_api_key']
-			application.corp = EveCorporationInfo.objects.get(corporation_id=form.cleaned_data['corp'])
-			application.is_a_spi = form.cleaned_data['is_a_spi']
-			application.about = form.cleaned_data['about']
-			application.extra = form.cleaned_data['extra']
-			application.save()
-			success = True
-			logger.info("Created HRApplication for user %s to corp %s" % (request.user, application.corp))
-	else:
-		logger.debug("Providing empty form.")
-		form = HRApplicationForm()
+    if request.method == 'POST':
+        form = HRApplicationForm(request.POST)
+        logger.debug("Request type POST with form valid: %s" % form.is_valid())
+        if form.is_valid():
+            application = HRApplication()
+            application.user = request.user
+            application.character_name = form.cleaned_data['character_name']
+            application.full_api_id = form.cleaned_data['full_api_id']
+            application.full_api_key = form.cleaned_data['full_api_key']
+            application.corp = EveCorporationInfo.objects.get(corporation_id=form.cleaned_data['corp'])
+            application.is_a_spi = form.cleaned_data['is_a_spi']
+            application.about = form.cleaned_data['about']
+            application.extra = form.cleaned_data['extra']
+            application.save()
+            success = True
+            logger.info("Created HRApplication for user %s to corp %s" % (request.user, application.corp))
+    else:
+        logger.debug("Providing empty form.")
+        form = HRApplicationForm()
 
-	context = {'form': form, 'success': success}
-	return render_to_response('registered/hrcreateapplication.html',
-							  context, context_instance=RequestContext(request))
+    context = {'form': form, 'success': success}
+    return render_to_response('registered/hrcreateapplication.html',
+                              context, context_instance=RequestContext(request))
 
 
 @login_required
 def hr_application_personal_view(request, app_id):
-	logger.debug("hr_application_personal_view called by user %s for app id %s" % (request.user, app_id))
-	if HRApplication.objects.filter(id=app_id).exists():
-		application = HRApplication.objects.get(id=app_id)
-		logger.debug("Got application id %s: %s" % (app_id, application))
-		if application.user != request.user:
-			logger.warn("HRApplication id %s user %s does not match request user %s - returning blank application." % (app_id, application.user, request.user))
-			application = HRApplication()
-	else:
-		logger.error("Unable to locate HRApplication matching id %s - returning blank application to user %s" % (app_id, request.user))
-		application = HRApplication()
-	context = {'application': application}
+    logger.debug("hr_application_personal_view called by user %s for app id %s" % (request.user, app_id))
+    if HRApplication.objects.filter(id=app_id).exists():
+        application = HRApplication.objects.get(id=app_id)
+        logger.debug("Got application id %s: %s" % (app_id, application))
+        if application.user != request.user:
+            logger.warn("HRApplication id %s user %s does not match request user %s - returning blank application." % (app_id, application.user, request.user))
+            application = HRApplication()
+    else:
+        logger.error("Unable to locate HRApplication matching id %s - returning blank application to user %s" % (app_id, request.user))
+        application = HRApplication()
+    context = {'application': application}
 
-	return render_to_response('registered/hrapplicationview.html',
-							  context, context_instance=RequestContext(request))
+    return render_to_response('registered/hrapplicationview.html',
+                              context, context_instance=RequestContext(request))
 
 
 @login_required
 def hr_application_personal_removal(request, app_id):
-	logger.debug("hr_application_personal_removal called by user %s for app id %s" % (request.user, app_id))
-	if HRApplication.objects.filter(id=app_id).exists():
-		application = HRApplication.objects.get(id=app_id)
-		if application.user == request.user:
-			application.delete()
-			logger.info("Deleted HRApplication with id %s for user %s to corp %s" % (app_id, request.user, application.corp))
-		else:
-			logger.error("HRapplication id %s user %s does not match request user %s - refusing to delete." % (app_id, application.user, request.user))
-	return HttpResponseRedirect("/hr_application_management/")
+    logger.debug("hr_application_personal_removal called by user %s for app id %s" % (request.user, app_id))
+    if HRApplication.objects.filter(id=app_id).exists():
+        application = HRApplication.objects.get(id=app_id)
+        if application.user == request.user:
+            application.delete()
+            logger.info("Deleted HRApplication with id %s for user %s to corp %s" % (app_id, request.user, application.corp))
+        else:
+            logger.error("HRapplication id %s user %s does not match request user %s - refusing to delete." % (app_id, application.user, request.user))
+    return HttpResponseRedirect("/hr_application_management/")
 
 
 @login_required
 @permission_required('auth.human_resources')
 def hr_application_view(request, app_id):
-	logger.debug("hr_application_view called by user %s for app id %s" % (request.user, app_id))
-	if request.method == 'POST':
-		form = HRApplicationCommentForm(request.POST)
-		logger.debug("Request type POST contains form valid: %s" % form.is_valid())
-		if form.is_valid():
-			auth_info = AuthServicesInfo.objects.get(user=request.user)
+    logger.debug("hr_application_view called by user %s for app id %s" % (request.user, app_id))
+    if request.method == 'POST':
+        form = HRApplicationCommentForm(request.POST)
+        logger.debug("Request type POST contains form valid: %s" % form.is_valid())
+        if form.is_valid():
+            auth_info = AuthServicesInfo.objects.get(user=request.user)
 
-			comment = HRApplicationComment()
-			comment.application = HRApplication.objects.get(id=int(form.cleaned_data['app_id']))
-			comment.commenter_user = request.user
-			comment.commenter_character = EveCharacter.objects.get(character_id=auth_info.main_char_id)
-			comment.comment = form.cleaned_data['comment']
-			comment.save()
-			logger.info("Saved comment by user %s to hrapplication %s" % (request.user, comment.application))
+            comment = HRApplicationComment()
+            comment.application = HRApplication.objects.get(id=int(form.cleaned_data['app_id']))
+            comment.commenter_user = request.user
+            comment.commenter_character = EveCharacter.objects.get(character_id=auth_info.main_char_id)
+            comment.comment = form.cleaned_data['comment']
+            comment.save()
+            logger.info("Saved comment by user %s to hrapplication %s" % (request.user, comment.application))
 
-	else:
-		logger.debug("Returning blank HRApplication comment form.")
-		form = HRApplicationCommentForm()
+    else:
+        logger.debug("Returning blank HRApplication comment form.")
+        form = HRApplicationCommentForm()
 
-	if HRApplication.objects.filter(id=app_id).exists():
-		application = HRApplication.objects.get(id=app_id)
-		comments = HRApplicationComment.objects.all().filter(application=application)
-		logger.debug("Retrieved hrpplication id %s on behalf of user %s with comments %s" % (app_id, request.user, len(comments)))
-	else:
-		application = HRApplication()
-		comments = []
-		logger.error("HRAppllication with id %s not found - returning blank applicatin to user %s" % request.user)
+    if HRApplication.objects.filter(id=app_id).exists():
+        application = HRApplication.objects.get(id=app_id)
+        comments = HRApplicationComment.objects.all().filter(application=application)
+        logger.debug("Retrieved hrpplication id %s on behalf of user %s with comments %s" % (app_id, request.user, len(comments)))
+    else:
+        application = HRApplication()
+        comments = []
+        logger.error("HRAppllication with id %s not found - returning blank applicatin to user %s" % request.user)
 
-	context = {'application': application, 'comments': comments, 'comment_form': form}
+    context = {'application': application, 'comments': comments, 'comment_form': form}
 
-	return render_to_response('registered/hrapplicationview.html',
-							  context, context_instance=RequestContext(request))
+    return render_to_response('registered/hrapplicationview.html',
+                              context, context_instance=RequestContext(request))
 
 
 @login_required
 @permission_required('auth.human_resources')
 def hr_application_remove(request, app_id):
-	logger.debug("hr_application_remove called by user %s for app id %s" % (request.user, app_id))
-	if HRApplication.objects.filter(id=app_id).exists():
-		application = HRApplication.objects.get(id=app_id)
-		if application:
-			logger.info("Deleted HRApplication id %s on behalf of user %s" % (app_id, request.user))
-			application.delete()
-		else:
+    logger.debug("hr_application_remove called by user %s for app id %s" % (request.user, app_id))
+    if HRApplication.objects.filter(id=app_id).exists():
+        application = HRApplication.objects.get(id=app_id)
+        if application:
+            logger.info("Deleted HRApplication id %s on behalf of user %s" % (app_id, request.user))
+            application.delete()
+        else:
                     logger.error("Unable to delete HRApplication with id %s on behalf of user %s: application is NoneType" % (app_id, request.user))
-	else:
-		logger.error("Unable to delete HRApplication with id %s on behalf of user %s: application not found." % (app_id, request.user))
+    else:
+        logger.error("Unable to delete HRApplication with id %s on behalf of user %s: application not found." % (app_id, request.user))
 
-	return HttpResponseRedirect("/hr_application_management/")
+    return HttpResponseRedirect("/hr_application_management/")
 
 
 @login_required
 @permission_required('auth.human_resources')
 def hr_application_approve(request, app_id):
-	logger.debug("hr_application_approve called by user %s for app id %s" % (request.user, app_id))
-	if HRApplication.objects.filter(id=app_id).exists():
-		auth_info = AuthServicesInfo.objects.get(user=request.user)
-		application = HRApplication.objects.get(id=app_id)
-		application.approved_denied = True
-		application.reviewer_user = request.user
-		application.reviewer_character = EveCharacter.objects.get(character_id=auth_info.main_char_id)
-		application.save()
-		logger.info("HRApplication for user %s to corp %s approved by %s" % (application.user, application.corp, request.user))
-	else:
-		logger.error("User %s unable to approve HRApplication id %s - hrapplication with that id not found." % (request.user, app_id))
+    logger.debug("hr_application_approve called by user %s for app id %s" % (request.user, app_id))
+    if HRApplication.objects.filter(id=app_id).exists():
+        auth_info = AuthServicesInfo.objects.get(user=request.user)
+        application = HRApplication.objects.get(id=app_id)
+        application.approved_denied = True
+        application.reviewer_user = request.user
+        application.reviewer_character = EveCharacter.objects.get(character_id=auth_info.main_char_id)
+        application.save()
+        logger.info("HRApplication for user %s to corp %s approved by %s" % (application.user, application.corp, request.user))
+    else:
+        logger.error("User %s unable to approve HRApplication id %s - hrapplication with that id not found." % (request.user, app_id))
 
-	return HttpResponseRedirect("/hr_application_management/")
+    return HttpResponseRedirect("/hr_application_management/")
 
 
 @login_required
 @permission_required('auth.human_resources')
 def hr_application_reject(request, app_id):
-	logger.debug("hr_application_reject called by user %s for app id %s" % (request.user, app_id))
-	if HRApplication.objects.filter(id=app_id).exists():
-		auth_info = AuthServicesInfo.objects.get(user=request.user)
-		application = HRApplication.objects.get(id=app_id)
-		application.approved_denied = False
-		application.reviewer_user = request.user
-		application.reviewer_character = EveCharacter.objects.get(character_id=auth_info.main_char_id)
-		application.save()
-		logger.info("HRApplication for user %s to corp %s rejected by %s" % (application.user, application.corp, request.user))
-	else:
-		logger.error("User %s unable to reject HRApplication id %s - hrapplication with that id not found." % (request.user, app_id))
+    logger.debug("hr_application_reject called by user %s for app id %s" % (request.user, app_id))
+    if HRApplication.objects.filter(id=app_id).exists():
+        auth_info = AuthServicesInfo.objects.get(user=request.user)
+        application = HRApplication.objects.get(id=app_id)
+        application.approved_denied = False
+        application.reviewer_user = request.user
+        application.reviewer_character = EveCharacter.objects.get(character_id=auth_info.main_char_id)
+        application.save()
+        logger.info("HRApplication for user %s to corp %s rejected by %s" % (application.user, application.corp, request.user))
+    else:
+        logger.error("User %s unable to reject HRApplication id %s - hrapplication with that id not found." % (request.user, app_id))
 
-	return HttpResponseRedirect("/hr_application_management/")
+    return HttpResponseRedirect("/hr_application_management/")
 
 
 @login_required
 @permission_required('auth.human_resources')
 def hr_application_search(request):
-	logger.debug("hr_application_search called by user %s" % request.user)
-	if request.method == 'POST':
-		form = HRApplicationSearchForm(request.POST)
-		logger.debug("Request type POST contains form valid: %s" % form.is_valid())
-		if form.is_valid():
-			# Really dumb search and only checks character name
-			# This can be improved but it does the job for now
-			searchstring = form.cleaned_data['search_string']
-			applications = []
-			logger.debug("Searching for application with character name %s for user %s" % (searchstring, request.user))
+    logger.debug("hr_application_search called by user %s" % request.user)
+    if request.method == 'POST':
+        form = HRApplicationSearchForm(request.POST)
+        logger.debug("Request type POST contains form valid: %s" % form.is_valid())
+        if form.is_valid():
+            # Really dumb search and only checks character name
+            # This can be improved but it does the job for now
+            searchstring = form.cleaned_data['search_string']
+            applications = []
+            logger.debug("Searching for application with character name %s for user %s" % (searchstring, request.user))
 
-			for application in HRApplication.objects.all():
-				if searchstring in application.character_name:
-					applications.append(application)
-			logger.info("Found %s HRApplications for user %s matching search string %s" % (len(applications), request.user, searchstring))
+            for application in HRApplication.objects.all():
+                if searchstring in application.character_name:
+                    applications.append(application)
+            logger.info("Found %s HRApplications for user %s matching search string %s" % (len(applications), request.user, searchstring))
 
-			context = {'applications': applications, 'search_form': HRApplicationSearchForm()}
+            context = {'applications': applications, 'search_form': HRApplicationSearchForm()}
 
-			return render_to_response('registered/hrapplicationsearchview.html',
-									  context, context_instance=RequestContext(request))
-		else:
-			logger.debug("Form invalid - returning for user %s to retry." % request.user)
-			context = {'applications': None, 'search_form': form}
-			return render_to_response('registered/hrapplicationsearchview.html',
+            return render_to_response('registered/hrapplicationsearchview.html',
+                                      context, context_instance=RequestContext(request))
+        else:
+            logger.debug("Form invalid - returning for user %s to retry." % request.user)
+            context = {'applications': None, 'search_form': form}
+            return render_to_response('registered/hrapplicationsearchview.html',
                                                                           context, context_instance=RequestContext(request))
-	
-	else:
-		logger.debug("Returning empty search form for user %s" % request.user)
-		return HttpResponseRedirect("/hr_application_management/")
+
+    else:
+        logger.debug("Returning empty search form for user %s" % request.user)
+        return HttpResponseRedirect("/hr_application_management/")
 
 
 @login_required
 @permission_required('auth.human_resources')
 def hr_application_mark_in_progress(request, app_id):
-	logger.debug("hr_application_mark_in_progress called by user %s for app id %s" % (request.user, app_id))
-	if HRApplication.objects.filter(id=app_id).exists():
-		auth_info = AuthServicesInfo.objects.get(user=request.user)
-		application = HRApplication.objects.get(id=app_id)
-		application.reviewer_inprogress_character = EveCharacter.objects.get(character_id=auth_info.main_char_id)
-		application.save()
-		logger.info("Marked HRApplication for user %s to corp %s in progress by user %s" % (application.user, application.corp, request.user))
-	else:
-		logger.error("Unable to mark HRApplication id %s in progress by user %s - hrapplication matching id not found." % (app_id, request.user))
+    logger.debug("hr_application_mark_in_progress called by user %s for app id %s" % (request.user, app_id))
+    if HRApplication.objects.filter(id=app_id).exists():
+        auth_info = AuthServicesInfo.objects.get(user=request.user)
+        application = HRApplication.objects.get(id=app_id)
+        application.reviewer_inprogress_character = EveCharacter.objects.get(character_id=auth_info.main_char_id)
+        application.save()
+        logger.info("Marked HRApplication for user %s to corp %s in progress by user %s" % (application.user, application.corp, request.user))
+    else:
+        logger.error("Unable to mark HRApplication id %s in progress by user %s - hrapplication matching id not found." % (app_id, request.user))
 
-	return HttpResponseRedirect("/hr_application_view/" + str(app_id))
+    return HttpResponseRedirect("/hr_application_view/" + str(app_id))
diff --git a/services/managers/eve_api_manager.py b/services/managers/eve_api_manager.py
index 8df6f6f7..e646d19d 100644
--- a/services/managers/eve_api_manager.py
+++ b/services/managers/eve_api_manager.py
@@ -185,7 +185,7 @@ class EveApiManager():
                 api = evelink.api.API(api_key=(settings.CORP_API_ID, settings.CORP_API_VCODE))
                 corp = evelink.corp.Corp(api=api)
                 corpinfo = corp.contacts()
-                results = corpinfo[0]
+                results = corpinfo.result
                 logger.debug("Got corp standings from settings: %s" % results)
                 return results
             except evelink.api.APIError as error:
@@ -194,6 +194,27 @@ class EveApiManager():
             logger.error("No corp API key supplied in settings. Unable to get standings.")
         return {}
 
+    @staticmethod
+    def get_corp_membertracking():
+        if settings.IS_CORP:
+            if settings.CORP_API_ID and settings.CORP_API_VCODE:
+                try:
+                    logger.debug("Getting corp membertracking with api id %s" % settings.CORP_API_ID)
+                    api = evelink.api.API(api_key=(settings.CORP_API_ID, settings.CORP_API_VCODE))
+                    corp = evelink.corp.Corp(api=api)
+                    membertracking = corp.members()
+                    results = membertracking.result
+                    logger.debug("Got corp membertracking from settings: %s" % results)
+                    return results
+                except evelink.api.APIError as error:
+                    logger.exception("Unhandled APIError occured.", exc_info=True)
+            else:
+                logger.error("No corp API key supplied in settings. Unable to get standings.")
+        else:
+            logger.error("Membertracking function only works in corporation mode.")
+        return {}
+
+
     @staticmethod
     def check_if_id_is_alliance(alliance_id):
         logger.debug("Checking if id %s is an alliance." % alliance_id)
@@ -201,7 +222,7 @@ class EveApiManager():
             api = evelink.api.API()
             eve = evelink.eve.EVE(api=api)
             alliance = eve.alliances()
-            results = alliance[0][int(alliance_id)]
+            results = alliance.result[int(alliance_id)]
             if results:
                 logger.debug("Confirmed id %s is an alliance." % alliance_id)
                 return True
diff --git a/stock/templates/public/base.html b/stock/templates/public/base.html
index 279743d0..f0279c7d 100755
--- a/stock/templates/public/base.html
+++ b/stock/templates/public/base.html
@@ -117,10 +117,17 @@
 
                         {% if perms.auth.corp_stats %}
                             <li>
-                                <a {% ifequal request.path "/corporation_stats" %} class="active" {% endifequal %}
+                                <a {% ifequal request.path "/corporation_stats/" %} class="active" {% endifequal %}
                                                                                    href="{% url 'auth_corp_stats' %}"><i
                                         class="fa fa-share-alt fa-fw grayiconecolor"></i> Corporation Stats</a>
                             </li>
+                            {% if IS_CORP %}
+                                <li>
+                                    <a {% ifequal request.path "/corp_utils/" %} class="active" {% endifequal %}
+                                                                                       href="{% url 'auth_corp_stats' %}"><i
+                                            class="fa fa-chain fa-fw grayiconecolor"></i> Corporation Stats</a>
+                                </li>
+                            {% endif  %}
                         {% endif %}
 
                         {% if perms.auth.group_management %}
diff --git a/stock/templates/registered/corputils.html b/stock/templates/registered/corputils.html
new file mode 100644
index 00000000..eea074e6
--- /dev/null
+++ b/stock/templates/registered/corputils.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>{% extends "public/base.html" %}
+{% block title %}Alliance Auth{% endblock %}
+{% block page_title %}Corporation Stats{% endblock page_title %}
+{% load corputils_extras %}
+
+{% block content %}
+
+    <div class="col-lg-12">
+        <h1 class="page-header text-center">Corporation Member Data</h1>
+        {% if perms.auth.member %}
+            <div class="col-lg-12 container" id="example">
+            {% if corp %}
+                <div class="row">
+                    <div class="col-lg-12">
+                        <div class="panel panel-default">
+                            <div class="panel-heading">Corporation</div>
+
+                            <div class="panel-body">
+                                <div class="col-lg-5 col-sm-2"><img class=
+                                                                            "ra-avatar img-responsive" src=
+                                                                            "https://image.eveonline.com/Corporation/{{ corp.corporation_id }}_128.png">
+                                </div>
+
+                                <div class="col-lg-7 col-sm-2">
+                                    <h4 class="">Name: {{ corp.corporation_name }}</h4>
+
+                                    <p>Ticker: {{ corp.corporation_ticker }}</p>
+
+                                    <p>Member: {{ corp.member_count }}</p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+
+                    <div class="col-lg-12">
+                        <div class="panel panel-default">
+                            <div class="panel-heading">Registered Characters</div>
+                            <div class="panel-body">
+                                <div style="overflow:auto;overflow-y:auto;">
+                                    <table class="table table-condensed">
+                                        <tr>
+                                            <th class="text-center">Main character</th>
+                                            <th class="text-center">Character list</th>
+                                        </tr>
+                                        {% for mainid, alts in characters_with_api.items %}
+                                            <tr>
+                                                <td class="text-center">
+                                                    <p class="">{{ alts|get_dict_item:mainid }}</p>
+                                                </td>
+                                                <td class="text-center">
+                                                    {% for charid, name in alts.items %}
+                                                        <p class="">{{ name}}</p>
+                                                    {% endfor %}
+                                                </td>
+                                            </tr>
+                                        {% endfor %}
+                                        {% for mainid, alts in characters_without_api.items %}
+                                            <tr bgcolor="#DD5500">
+                                                <td class="text-center">
+                                                    <p class="">{{ alts|get_dict_item:mainid }}</p>
+                                                </td>
+                                                <td class="text-center">
+                                                    <p class="">No API registered!</p>
+                                                </td>
+                                            </tr>
+                                        {% endfor %}
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                {% else %}
+                    <div class="container-fluid">
+                        <div class="col-md-4 col-md-offset-4">
+                            <div class="row">
+                                <div class="alert alert-danger text-center" role="alert">No corporation model found. Contact your admin.</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            {% endif %}
+            </div>
+        {% else %}
+            {% if IS_CORP %}
+                <div class="alert alert-danger" role="alert">You are not in the corporation.</div>
+            {% else %}
+                <div class="alert alert-danger" role="alert">You are not in the alliance.</div>
+            {% endif %}
+        {% endif %}
+    </div>
+{% endblock content %}
+</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file

From d0c5e40bc8077fae2e02f65b5e081523d7b66acb Mon Sep 17 00:00:00 2001
From: Ydmir <joakim.u.strandberg@gmail.com>
Date: Fri, 15 Jan 2016 09:27:14 +0100
Subject: [PATCH 02/23] Also added the new app corputils to installed apps in
 settings.py.example

---
 alliance_auth/settings.py.example | 1 +
 1 file changed, 1 insertion(+)

diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example
index 8eb5e13e..91d7bb5b 100755
--- a/alliance_auth/settings.py.example
+++ b/alliance_auth/settings.py.example
@@ -58,6 +58,7 @@ INSTALLED_APPS = (
     'hrapplications',
     'timerboard',
     'srp',
+    'corputils',
 )
 
 MIDDLEWARE_CLASSES = (

From 93c3d450af0ca17f898d1c0733eeafd2430616c8 Mon Sep 17 00:00:00 2001
From: Ydmir <joakim.u.strandberg@gmail.com>
Date: Fri, 15 Jan 2016 11:09:17 +0100
Subject: [PATCH 03/23] Fixed a reference bug.

---
 stock/templates/public/base.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stock/templates/public/base.html b/stock/templates/public/base.html
index f0279c7d..c2067ca1 100755
--- a/stock/templates/public/base.html
+++ b/stock/templates/public/base.html
@@ -124,8 +124,8 @@
                             {% if IS_CORP %}
                                 <li>
                                     <a {% ifequal request.path "/corp_utils/" %} class="active" {% endifequal %}
-                                                                                       href="{% url 'auth_corp_stats' %}"><i
-                                            class="fa fa-chain fa-fw grayiconecolor"></i> Corporation Stats</a>
+                                                                                       href="{% url 'auth_corp_member_view' %}"><i
+                                            class="fa fa-chain fa-fw grayiconecolor"></i> Member Tracking</a>
                                 </li>
                             {% endif  %}
                         {% endif %}

From cc3d1765338750868bea4362e23bbdcde878639e Mon Sep 17 00:00:00 2001
From: Ydmir <joakim@jstrandberg.se>
Date: Fri, 15 Jan 2016 14:23:17 +0100
Subject: [PATCH 04/23] Now characters are listed in sorted order.

---
 corputils/views.py                        | 10 ++++----
 stock/templates/registered/corputils.html | 30 +++++++++--------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/corputils/views.py b/corputils/views.py
index f75bb780..0bbd083b 100644
--- a/corputils/views.py
+++ b/corputils/views.py
@@ -35,15 +35,15 @@ def corp_member_view(request):
                 char = EveCharacter.objects.get(character_id=char_id)
                 user = char.user
                 mainid = int(AuthServicesInfoManager.get_auth_service_info(user=user).main_char_id)
-                characters_with_api.setdefault(mainid,{}).update({char_id:char.character_name})
+                mainname = EveCharacter.objects.get(character_id=mainid).character_name
+                characters_with_api.setdefault(mainname,[]).append(char.character_name)
             except EveCharacter.DoesNotExist:
-                mainid = char_id
-                characters_without_api.setdefault(mainid,{}).update({char_id:member_data["name"]})
+                characters_without_api.setdefault(member_data["name"],[]).append(member_data["name"])
 
 
         context = {"corp": corp,
-                   "characters_with_api": characters_with_api,
-                   "characters_without_api": characters_without_api}
+                   "characters_with_api": sorted(characters_with_api.items()),
+                   "characters_without_api": sorted(characters_without_api.items())}
 
         return render_to_response('registered/corputils.html',context, context_instance=RequestContext(request) )
     else:
diff --git a/stock/templates/registered/corputils.html b/stock/templates/registered/corputils.html
index eea074e6..507d6f6b 100644
--- a/stock/templates/registered/corputils.html
+++ b/stock/templates/registered/corputils.html
@@ -1,8 +1,4 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>{% extends "public/base.html" %}
+{% extends "public/base.html" %}
 {% block title %}Alliance Auth{% endblock %}
 {% block page_title %}Corporation Stats{% endblock page_title %}
 {% load corputils_extras %}
@@ -30,7 +26,11 @@
 
                                     <p>Ticker: {{ corp.corporation_ticker }}</p>
 
-                                    <p>Member: {{ corp.member_count }}</p>
+                                    <p>Member count: {{ corp.member_count }}</p>
+
+                                    <p>Player count: {{characters_with_api|length}}</p>
+
+                                    <p>Unregistered characters: {{characters_without_api|length}}</p>
                                 </div>
                             </div>
                         </div>
@@ -47,22 +47,22 @@
                                             <th class="text-center">Main character</th>
                                             <th class="text-center">Character list</th>
                                         </tr>
-                                        {% for mainid, alts in characters_with_api.items %}
+                                        {% for main, alts in characters_with_api %}
                                             <tr>
                                                 <td class="text-center">
-                                                    <p class="">{{ alts|get_dict_item:mainid }}</p>
+                                                    <p class="">{{ main }}</p>
                                                 </td>
                                                 <td class="text-center">
-                                                    {% for charid, name in alts.items %}
+                                                    {% for name in alts %}
                                                         <p class="">{{ name}}</p>
                                                     {% endfor %}
                                                 </td>
                                             </tr>
                                         {% endfor %}
-                                        {% for mainid, alts in characters_without_api.items %}
+                                        {% for main, value in characters_without_api %}
                                             <tr bgcolor="#DD5500">
                                                 <td class="text-center">
-                                                    <p class="">{{ alts|get_dict_item:mainid }}</p>
+                                                    <p class="">{{ main }}</p>
                                                 </td>
                                                 <td class="text-center">
                                                     <p class="">No API registered!</p>
@@ -93,10 +93,4 @@
             {% endif %}
         {% endif %}
     </div>
-{% endblock content %}
-</title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file
+{% endblock content %}
\ No newline at end of file

From 030a0e9a8c4dc5b465bc5667c0619bf2cced4cbd Mon Sep 17 00:00:00 2001
From: Ydmir <joakim.u.strandberg@gmail.com>
Date: Fri, 15 Jan 2016 22:54:53 +0100
Subject: [PATCH 05/23] Added search functionality to member list.

---
 alliance_auth/urls.py                         |  4 +-
 corputils/forms.py                            |  5 ++
 corputils/views.py                            | 58 ++++++++++++++-
 stock/templates/public/base.html              |  2 +-
 stock/templates/registered/corputils.html     | 42 ++++++++++-
 .../registered/corputilssearchview.html       | 71 +++++++++++++++++++
 6 files changed, 175 insertions(+), 7 deletions(-)
 create mode 100644 corputils/forms.py
 create mode 100644 stock/templates/registered/corputilssearchview.html

diff --git a/alliance_auth/urls.py b/alliance_auth/urls.py
index 4d065330..e1b562ad 100755
--- a/alliance_auth/urls.py
+++ b/alliance_auth/urls.py
@@ -164,7 +164,9 @@ urlpatterns = patterns('',
                            name="auth_srp_request_update_amount_view"),
 
                        #corputils
-                       url(r'^corp_utils/$', 'corputils.views.corp_member_view', name='auth_corp_member_view'),
+                       url(r'^corputils/$', 'corputils.views.corp_member_view', name='auth_corp_member_view'),
+                       url(r'corputils_search/', 'corputils.views.corputils_search',
+                           name="auth_corputils_search"),
 
                        # FLEET FITTINGS
                        url(r'^fits/$', 'services.views.fleet_fits', name='auth_fleet_fits'),
diff --git a/corputils/forms.py b/corputils/forms.py
new file mode 100644
index 00000000..1d1ba9a2
--- /dev/null
+++ b/corputils/forms.py
@@ -0,0 +1,5 @@
+from django import forms
+
+
+class CorputilsSearchForm(forms.Form):
+    search_string = forms.CharField(max_length=254, required=True, label="Search String")
diff --git a/corputils/views.py b/corputils/views.py
index 0bbd083b..a148bc38 100644
--- a/corputils/views.py
+++ b/corputils/views.py
@@ -3,12 +3,16 @@ from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.decorators import permission_required
+from django.shortcuts import HttpResponseRedirect
+
+from collections import namedtuple
 
 from authentication.managers import AuthServicesInfoManager
 from services.managers.eve_api_manager import EveApiManager
 from eveonline.models import EveCorporationInfo
 from eveonline.models import EveCharacter
 from authentication.models import AuthServicesInfo
+from forms import CorputilsSearchForm
 
 import logging
 
@@ -30,7 +34,7 @@ def corp_member_view(request):
         member_list = EveApiManager.get_corp_membertracking()
         characters_with_api = {}
         characters_without_api = {}
-        for char_id, member_data in member_list.iteritems():
+        for char_id, member_data in member_list.items():
             try:
                 char = EveCharacter.objects.get(character_id=char_id)
                 user = char.user
@@ -43,10 +47,60 @@ def corp_member_view(request):
 
         context = {"corp": corp,
                    "characters_with_api": sorted(characters_with_api.items()),
-                   "characters_without_api": sorted(characters_without_api.items())}
+                   "characters_without_api": sorted(characters_without_api.items()),
+                   "search_form": CorputilsSearchForm()}
 
         return render_to_response('registered/corputils.html',context, context_instance=RequestContext(request) )
     else:
         logger.error("Not running in corporation mode. Cannot provide corp member tracking data." % (request.user, auth_info.main_char_id))
     return render_to_response('registered/corputils.html', None, context_instance=RequestContext(request))
 
+
+@login_required
+@permission_required('auth.corp_stats')
+def corputils_search(request):
+    logger.debug("corputils_search called by user %s" % request.user)
+    if request.method == 'POST':
+        form = CorputilsSearchForm(request.POST)
+        logger.debug("Request type POST contains form valid: %s" % form.is_valid())
+        if form.is_valid():
+            # Really dumb search and only checks character name
+            # This can be improved but it does the job for now
+            searchstring = form.cleaned_data['search_string']
+            logger.debug("Searching for player with character name %s for user %s" % (searchstring, request.user))
+
+            member_list = EveApiManager.get_corp_membertracking()
+
+            Member = namedtuple('Member', ['name', 'main', 'api_registered'])
+
+            members = []
+            for memberid, member_data in member_list.items():
+                if searchstring.lower() in member_data["name"].lower():
+                    try:
+                        char = EveCharacter.objects.get(character_name=member_data["name"])
+                        user = char.user
+                        mainid = int(AuthServicesInfoManager.get_auth_service_info(user=user).main_char_id)
+                        mainname = EveCharacter.objects.get(character_id=mainid).character_name
+                        api_registered = True
+                    except EveCharacter.DoesNotExist:
+                        api_registered = False
+                        mainname = ""
+                    members.append(Member(name=member_data["name"], main=mainname, api_registered=api_registered))
+
+
+            logger.info("Found %s members for user %s matching search string %s" % (len(members), request.user, searchstring))
+
+            context = {'members': members, 'search_form': CorputilsSearchForm()}
+
+            return render_to_response('registered/corputilssearchview.html',
+                                      context, context_instance=RequestContext(request))
+        else:
+            logger.debug("Form invalid - returning for user %s to retry." % request.user)
+            context = {'applications': None, 'search_form': form}
+            return render_to_response('registered/corputilssearchview.html',
+                                      context, context_instance=RequestContext(request))
+
+    else:
+        logger.debug("Returning empty search form for user %s" % request.user)
+        return HttpResponseRedirect("/corputils/")
+
diff --git a/stock/templates/public/base.html b/stock/templates/public/base.html
index c2067ca1..f015fcf8 100755
--- a/stock/templates/public/base.html
+++ b/stock/templates/public/base.html
@@ -123,7 +123,7 @@
                             </li>
                             {% if IS_CORP %}
                                 <li>
-                                    <a {% ifequal request.path "/corp_utils/" %} class="active" {% endifequal %}
+                                    <a {% ifequal request.path "/corputils/" %} class="active" {% endifequal %}
                                                                                        href="{% url 'auth_corp_member_view' %}"><i
                                             class="fa fa-chain fa-fw grayiconecolor"></i> Member Tracking</a>
                                 </li>
diff --git a/stock/templates/registered/corputils.html b/stock/templates/registered/corputils.html
index 507d6f6b..04b4ee92 100644
--- a/stock/templates/registered/corputils.html
+++ b/stock/templates/registered/corputils.html
@@ -1,13 +1,15 @@
 {% extends "public/base.html" %}
-{% block title %}Alliance Auth{% endblock %}
-{% block page_title %}Corporation Stats{% endblock page_title %}
+{% load bootstrap %}
 {% load corputils_extras %}
 
+{% block title %}Alliance Auth{% endblock %}
+{% block page_title %}Corporation Member Tracking{% endblock page_title %}
+
 {% block content %}
 
     <div class="col-lg-12">
         <h1 class="page-header text-center">Corporation Member Data</h1>
-        {% if perms.auth.member %}
+        {% if perms.auth.corp_stats %}
             <div class="col-lg-12 container" id="example">
             {% if corp %}
                 <div class="row">
@@ -32,6 +34,13 @@
 
                                     <p>Unregistered characters: {{characters_without_api|length}}</p>
                                 </div>
+
+                                <div class="text-right">
+                                    <!-- Button trigger modal -->
+                                    <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal">
+                                        Search Members
+                                    </button>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -93,4 +102,31 @@
             {% endif %}
         {% endif %}
     </div>
+
+    {% if perms.auth.corp_stats %}
+        <!-- Modal -->
+        <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+             aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
+                                class="sr-only">Close</span></button>
+                        <h4 class="modal-title" id="myModalLabel">Member Search</h4>
+                    </div>
+                    <div class="modal-body">
+                        <form class="form-signin" role="form"
+                              action={% url 'auth_corputils_search' %} method="POST">
+                            {% csrf_token %}
+                            {{ search_form|bootstrap }}
+                            <br/>
+                            <button class="btn btn-lg btn-primary btn-block" type="submit">Search</button>
+                        </form>
+                    </div>
+                    <div class="modal-footer">
+                    </div>
+                </div>
+            </div>
+        </div>
+    {% endif %}
 {% endblock content %}
\ No newline at end of file
diff --git a/stock/templates/registered/corputilssearchview.html b/stock/templates/registered/corputilssearchview.html
new file mode 100644
index 00000000..3ffce71f
--- /dev/null
+++ b/stock/templates/registered/corputilssearchview.html
@@ -0,0 +1,71 @@
+{% extends "public/base.html" %}
+{% load bootstrap %}
+{% load staticfiles %}
+{% load corputils_extras %}
+
+{% block title %}Alliance Auth{% endblock %}
+
+{% block page_title %}Corporation Member Tracking{% endblock page_title %}
+{% block extra_css %}{% endblock extra_css %}
+
+{% block content %}
+    <div class="col-lg-12">
+        {% if perms.auth.corp_stats %}
+            <h1 class="page-header text-center">Member Search Results
+                <div class="text-right">
+                    <!-- Button trigger modal -->
+                    <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal">
+                        Search Members
+                    </button>
+                </div>
+            </h1>
+            <div class="container-fluid">
+                <table class="table table-bordered">
+                    <tr>
+                        <th class="text-center">Character</th>
+                        <th class="text-center">Main Character</th>
+                    </tr>
+                    {% for member in members %}
+                        <tr {% if  not member.api_registered%} bgcolor="#DD5500" {% endif %} >
+                            <td class="text-center">{{ member.name }}</td>
+                            <td class="text-center">
+                            {% if  member.api_registered%}
+                                {{ member.main }}
+                            {% else %}
+                                No API registered!
+                            {% endif %}
+                            </td>
+                        </tr>
+                    {% endfor %}
+                </table>
+            </div>
+        {% endif %}
+    </div>
+
+    {% if perms.auth.corp_stats %}
+        <!-- Modal -->
+        <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+             aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
+                                class="sr-only">Close</span></button>
+                        <h4 class="modal-title" id="myModalLabel">Member Search</h4>
+                    </div>
+                    <div class="modal-body">
+                        <form class="form-signin" role="form"
+                              action={% url 'auth_corputils_search' %} method="POST">
+                            {% csrf_token %}
+                            {{ search_form|bootstrap }}
+                            <br/>
+                            <button class="btn btn-lg btn-primary btn-block" type="submit">Search</button>
+                        </form>
+                    </div>
+                    <div class="modal-footer">
+                    </div>
+                </div>
+            </div>
+        </div>
+    {% endif %}
+{% endblock content %}

From f4eac57b0f68751cad4dddd64c0dd5eb184aaffe Mon Sep 17 00:00:00 2001
From: Ydmir <joakim.u.strandberg@gmail.com>
Date: Fri, 22 Jan 2016 21:25:30 +0100
Subject: [PATCH 06/23] Users without a selected main character is not a
 problem anymore. Main will be listed as "User: [username]" and will be
 highlighted. Also added a row showing corp of main character.

---
 corputils/views.py                            | 25 ++++++++++++++-----
 stock/templates/registered/corputils.html     | 24 +++++++++++-------
 .../registered/corputilssearchview.html       |  5 ++--
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/corputils/views.py b/corputils/views.py
index a148bc38..729f72f1 100644
--- a/corputils/views.py
+++ b/corputils/views.py
@@ -31,23 +31,36 @@ def corp_member_view(request):
     if settings.IS_CORP:
         corp = EveCorporationInfo.objects.get(corporation_id=settings.CORP_ID)
 
+        Player = namedtuple("Player", ["main", "maincorp", "altlist"])
+
         member_list = EveApiManager.get_corp_membertracking()
         characters_with_api = {}
-        characters_without_api = {}
+        characters_without_api = []
+
         for char_id, member_data in member_list.items():
             try:
                 char = EveCharacter.objects.get(character_id=char_id)
                 user = char.user
-                mainid = int(AuthServicesInfoManager.get_auth_service_info(user=user).main_char_id)
-                mainname = EveCharacter.objects.get(character_id=mainid).character_name
-                characters_with_api.setdefault(mainname,[]).append(char.character_name)
+                try:
+                    mainid = int(AuthServicesInfoManager.get_auth_service_info(user=user).main_char_id)
+                    mainchar = EveCharacter.objects.get(character_id=mainid)
+                    mainname = mainchar.character_name
+                    maincorp = mainchar.corporation_name
+                except ValueError:
+                    mainname = "User: " + user.username
+                    maincorp = None
+                characters_with_api.setdefault(mainname, Player(main=mainname,
+                                                                maincorp=maincorp,
+                                                                altlist=[])
+                                               ).altlist.append(char.character_name)
+
             except EveCharacter.DoesNotExist:
-                characters_without_api.setdefault(member_data["name"],[]).append(member_data["name"])
+                characters_without_api.append(member_data["name"])
 
 
         context = {"corp": corp,
                    "characters_with_api": sorted(characters_with_api.items()),
-                   "characters_without_api": sorted(characters_without_api.items()),
+                   "characters_without_api": sorted(characters_without_api),
                    "search_form": CorputilsSearchForm()}
 
         return render_to_response('registered/corputils.html',context, context_instance=RequestContext(request) )
diff --git a/stock/templates/registered/corputils.html b/stock/templates/registered/corputils.html
index 04b4ee92..359b1dc3 100644
--- a/stock/templates/registered/corputils.html
+++ b/stock/templates/registered/corputils.html
@@ -1,6 +1,5 @@
 {% extends "public/base.html" %}
 {% load bootstrap %}
-{% load corputils_extras %}
 
 {% block title %}Alliance Auth{% endblock %}
 {% block page_title %}Corporation Member Tracking{% endblock page_title %}
@@ -54,24 +53,31 @@
                                     <table class="table table-condensed">
                                         <tr>
                                             <th class="text-center">Main character</th>
+                                            <th class="text-center">Main corporation</th>
                                             <th class="text-center">Character list</th>
                                         </tr>
-                                        {% for main, alts in characters_with_api %}
-                                            <tr>
+                                        {% for mainchar, player  in characters_with_api %}
+                                            <tr >
                                                 <td class="text-center">
-                                                    <p class="">{{ main }}</p>
+                                                    <p class="">{{ mainchar }}</p>
+                                                </td>
+                                                <td class="text-center" {% if not corp.corporation_name ==  player.maincorp%} bgcolor="#FF99AA" {% endif %} >
+                                                    <p class="">{{ player.maincorp }}</p>
                                                 </td>
                                                 <td class="text-center">
-                                                    {% for name in alts %}
-                                                        <p class="">{{ name}}</p>
+                                                    {% for charname in player.altlist %}
+                                                        <p class="">{{ charname }}</p>
                                                     {% endfor %}
                                                 </td>
                                             </tr>
                                         {% endfor %}
-                                        {% for main, value in characters_without_api %}
-                                            <tr bgcolor="#DD5500">
+                                        {% for charname in characters_without_api %}
+                                            <tr bgcolor="#DD8822">
                                                 <td class="text-center">
-                                                    <p class="">{{ main }}</p>
+                                                    <p class="">{{ charname }}</p>
+                                                </td>
+                                                <td class="text-center">
+                                                    <p class=""></p>
                                                 </td>
                                                 <td class="text-center">
                                                     <p class="">No API registered!</p>
diff --git a/stock/templates/registered/corputilssearchview.html b/stock/templates/registered/corputilssearchview.html
index 3ffce71f..42d882e8 100644
--- a/stock/templates/registered/corputilssearchview.html
+++ b/stock/templates/registered/corputilssearchview.html
@@ -1,7 +1,6 @@
 {% extends "public/base.html" %}
 {% load bootstrap %}
 {% load staticfiles %}
-{% load corputils_extras %}
 
 {% block title %}Alliance Auth{% endblock %}
 
@@ -10,7 +9,7 @@
 
 {% block content %}
     <div class="col-lg-12">
-        {% if perms.auth.corp_stats %}
+        {% if perms.auth.corputils %}
             <h1 class="page-header text-center">Member Search Results
                 <div class="text-right">
                     <!-- Button trigger modal -->
@@ -42,7 +41,7 @@
         {% endif %}
     </div>
 
-    {% if perms.auth.corp_stats %}
+    {% if perms.auth.corputils %}
         <!-- Modal -->
         <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
              aria-hidden="true">

From 39a77829db648df152ab868fafaf9099ad5e137e Mon Sep 17 00:00:00 2001
From: Ydmir <joakim.u.strandberg@gmail.com>
Date: Sat, 23 Jan 2016 01:11:10 +0100
Subject: [PATCH 07/23] Added new permission.

---
 README.md                                 | 1 +
 corputils/views.py                        | 4 ++--
 stock/templates/registered/corputils.html | 5 +++--
 util/__init__.py                          | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9bdae977..d925fd20 100755
--- a/README.md
+++ b/README.md
@@ -69,6 +69,7 @@ Special Permissions In Admin:
     auth | user | timer_management ( Access to create and remove timers)
     auth | user | timer_view ( Access to timerboard to view timers)
     auth | user | srp_management ( Allows for an individual to create and remove srp fleets and fleet data)
+    auth | user | corputils ( Allows to look at what character belongs to which user and more. )
 
 Active Developers
 
diff --git a/corputils/views.py b/corputils/views.py
index 729f72f1..2e909029 100644
--- a/corputils/views.py
+++ b/corputils/views.py
@@ -21,7 +21,7 @@ logger = logging.getLogger(__name__)
 
 # Because corp-api only exist for the executor corp, this function will only be available in corporation mode.
 @login_required
-@permission_required('auth.corp_stats')
+@permission_required('auth.corputils')
 def corp_member_view(request):
     logger.debug("corp_member_view called by user %s" % request.user)
     # Get the corp the member is in
@@ -70,7 +70,7 @@ def corp_member_view(request):
 
 
 @login_required
-@permission_required('auth.corp_stats')
+@permission_required('auth.corputils')
 def corputils_search(request):
     logger.debug("corputils_search called by user %s" % request.user)
     if request.method == 'POST':
diff --git a/stock/templates/registered/corputils.html b/stock/templates/registered/corputils.html
index 359b1dc3..c8185ed3 100644
--- a/stock/templates/registered/corputils.html
+++ b/stock/templates/registered/corputils.html
@@ -8,9 +8,10 @@
 
     <div class="col-lg-12">
         <h1 class="page-header text-center">Corporation Member Data</h1>
-        {% if perms.auth.corp_stats %}
+        {% if perms.auth.corputils %}
             <div class="col-lg-12 container" id="example">
             {% if corp %}
+
                 <div class="row">
                     <div class="col-lg-12">
                         <div class="panel panel-default">
@@ -109,7 +110,7 @@
         {% endif %}
     </div>
 
-    {% if perms.auth.corp_stats %}
+    {% if perms.auth.corputils %}
         <!-- Modal -->
         <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
              aria-hidden="true">
diff --git a/util/__init__.py b/util/__init__.py
index 1d4a35e1..4abc669b 100755
--- a/util/__init__.py
+++ b/util/__init__.py
@@ -19,6 +19,7 @@ def bootstrap_permissions():
     Permission.objects.get_or_create(codename="human_resources", content_type=ct, name="human_resources")
     Permission.objects.get_or_create(codename="blue_member", content_type=ct, name="blue_member")
     Permission.objects.get_or_create(codename="corp_stats", content_type=ct, name="corp_stats")
+    Permission.objects.get_or_create(codename="corputils", content_type=ct, name="corputils")
     Permission.objects.get_or_create(codename="timer_management", content_type=ct, name="timer_management")
     Permission.objects.get_or_create(codename="timer_view", content_type=ct, name="timer_view")
     Permission.objects.get_or_create(codename="srp_management", content_type=ct, name="srp_management")

From 25b89fdecb7c5998c255859495e98977b2dbc546 Mon Sep 17 00:00:00 2001
From: Ydmir <joakim.u.strandberg@gmail.com>
Date: Sun, 24 Jan 2016 00:13:58 +0100
Subject: [PATCH 08/23] Expanded functionality to full alliance support. The
 design may leave some things to wish for...

---
 alliance_auth/urls.py                     |  3 +-
 corputils/forms.py                        | 10 +++
 corputils/views.py                        | 80 ++++++++++++++---------
 requirements.txt                          |  1 +
 services/managers/eve_api_manager.py      | 28 ++++----
 services/managers/evewho_manager.py       | 19 ++++++
 stock/templates/public/base.html          | 14 ++--
 stock/templates/registered/corputils.html | 17 ++++-
 8 files changed, 113 insertions(+), 59 deletions(-)
 create mode 100644 services/managers/evewho_manager.py

diff --git a/alliance_auth/urls.py b/alliance_auth/urls.py
index e1b562ad..4d8a9163 100755
--- a/alliance_auth/urls.py
+++ b/alliance_auth/urls.py
@@ -165,7 +165,8 @@ urlpatterns = patterns('',
 
                        #corputils
                        url(r'^corputils/$', 'corputils.views.corp_member_view', name='auth_corp_member_view'),
-                       url(r'corputils_search/', 'corputils.views.corputils_search',
+                       url(r'^corputils/(?P<corpid>[0-9]+)/$', 'corputils.views.corp_member_view', name='auth_corp_member_view'),
+                       url(r'^corputils/search/', 'corputils.views.corputils_search',
                            name="auth_corputils_search"),
 
                        # FLEET FITTINGS
diff --git a/corputils/forms.py b/corputils/forms.py
index 1d1ba9a2..969b5d24 100644
--- a/corputils/forms.py
+++ b/corputils/forms.py
@@ -1,5 +1,15 @@
 from django import forms
+from django.conf import settings
 
+from eveonline.models import EveCorporationInfo
+from eveonline.models import EveAllianceInfo
+
+class SelectCorpForm(forms.Form):
+    alliance = EveAllianceInfo.objects.get(alliance_id=settings.ALLIANCE_ID)
+    alliancecorps = EveCorporationInfo.objects.filter(alliance=alliance)
+    corpnamelist = [(int(corp.corporation_id), str(corp.corporation_name)) for corp in alliancecorps]
+    corpnamelist.sort(key=lambda tup: tup[1])
+    corpid = forms.ChoiceField(corpnamelist, required=True, label="Corporation")
 
 class CorputilsSearchForm(forms.Form):
     search_string = forms.CharField(max_length=254, required=True, label="Search String")
diff --git a/corputils/views.py b/corputils/views.py
index 2e909029..ab62cc8a 100644
--- a/corputils/views.py
+++ b/corputils/views.py
@@ -9,10 +9,13 @@ from collections import namedtuple
 
 from authentication.managers import AuthServicesInfoManager
 from services.managers.eve_api_manager import EveApiManager
+from services.managers.evewho_manager import EveWhoManager
 from eveonline.models import EveCorporationInfo
+from eveonline.models import EveAllianceInfo
 from eveonline.models import EveCharacter
 from authentication.models import AuthServicesInfo
 from forms import CorputilsSearchForm
+from forms import SelectCorpForm
 
 import logging
 
@@ -22,51 +25,64 @@ logger = logging.getLogger(__name__)
 # Because corp-api only exist for the executor corp, this function will only be available in corporation mode.
 @login_required
 @permission_required('auth.corputils')
-def corp_member_view(request):
+def corp_member_view(request, corpid = settings.CORP_ID):
     logger.debug("corp_member_view called by user %s" % request.user)
-    # Get the corp the member is in
-    auth_info = AuthServicesInfo.objects.get(user=request.user)
-    logger.debug("Got user %s authservicesinfo model %s" % (request.user, auth_info))
+
+    if request.method == 'POST':
+        form = SelectCorpForm(request.POST)
+        if form.is_valid():
+            return HttpResponseRedirect("/corputils/"+form.cleaned_data["corpid"])
+        else:
+            return HttpResponseRedirect("/corputils/")
+
+    corp = EveCorporationInfo.objects.get(corporation_id=corpid)
+    Player = namedtuple("Player", ["main", "maincorp", "altlist"])
 
     if settings.IS_CORP:
-        corp = EveCorporationInfo.objects.get(corporation_id=settings.CORP_ID)
+        member_list = EveApiManager.get_corp_membertracking(settings.CORP_API_ID, settings.CORP_API_VCODE)
+    else:
+        member_list = EveWhoManager.get_corporation_members(corpid)
 
-        Player = namedtuple("Player", ["main", "maincorp", "altlist"])
+    characters_with_api = {}
+    characters_without_api = []
 
-        member_list = EveApiManager.get_corp_membertracking()
-        characters_with_api = {}
-        characters_without_api = []
-
-        for char_id, member_data in member_list.items():
+    for char_id, member_data in member_list.items():
+        try:
+            char = EveCharacter.objects.get(character_id=char_id)
+            user = char.user
             try:
-                char = EveCharacter.objects.get(character_id=char_id)
-                user = char.user
-                try:
-                    mainid = int(AuthServicesInfoManager.get_auth_service_info(user=user).main_char_id)
-                    mainchar = EveCharacter.objects.get(character_id=mainid)
-                    mainname = mainchar.character_name
-                    maincorp = mainchar.corporation_name
-                except ValueError:
-                    mainname = "User: " + user.username
-                    maincorp = None
-                characters_with_api.setdefault(mainname, Player(main=mainname,
-                                                                maincorp=maincorp,
-                                                                altlist=[])
-                                               ).altlist.append(char.character_name)
+                mainid = int(AuthServicesInfoManager.get_auth_service_info(user=user).main_char_id)
+                mainchar = EveCharacter.objects.get(character_id=mainid)
+                mainname = mainchar.character_name
+                maincorp = mainchar.corporation_name
+            except ValueError:
+                mainname = "User: " + user.username
+                maincorp = None
+            characters_with_api.setdefault(mainname, Player(main=mainname,
+                                                            maincorp=maincorp,
+                                                            altlist=[])
+                                           ).altlist.append(char.character_name)
 
-            except EveCharacter.DoesNotExist:
-                characters_without_api.append(member_data["name"])
+        except EveCharacter.DoesNotExist:
+            characters_without_api.append(member_data["name"])
 
 
+    if not settings.IS_CORP:
+        form = SelectCorpForm()
+        context = {"form": form,
+                   "corp": corp,
+                   "characters_with_api": sorted(characters_with_api.items()),
+                   "characters_without_api": sorted(characters_without_api),
+                   "search_form": CorputilsSearchForm()}
+    else:
+        logger.debug("corp_member_view running in corportation mode")
         context = {"corp": corp,
                    "characters_with_api": sorted(characters_with_api.items()),
                    "characters_without_api": sorted(characters_without_api),
                    "search_form": CorputilsSearchForm()}
 
-        return render_to_response('registered/corputils.html',context, context_instance=RequestContext(request) )
-    else:
-        logger.error("Not running in corporation mode. Cannot provide corp member tracking data." % (request.user, auth_info.main_char_id))
-    return render_to_response('registered/corputils.html', None, context_instance=RequestContext(request))
+
+    return render_to_response('registered/corputils.html',context, context_instance=RequestContext(request) )
 
 
 @login_required
@@ -82,7 +98,7 @@ def corputils_search(request):
             searchstring = form.cleaned_data['search_string']
             logger.debug("Searching for player with character name %s for user %s" % (searchstring, request.user))
 
-            member_list = EveApiManager.get_corp_membertracking()
+            member_list = EveApiManager.get_corp_membertracking(settings.CORP_API_ID, settings.CORP_API_VCODE)
 
             Member = namedtuple('Member', ['name', 'main', 'api_registered'])
 
diff --git a/requirements.txt b/requirements.txt
index 66027f49..ce742155 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,7 @@ evelink
 dnspython
 passlib
 requests>=2.9.1
+json
 
 # Django Stuff #
 django==1.6.5
diff --git a/services/managers/eve_api_manager.py b/services/managers/eve_api_manager.py
index e646d19d..db8face6 100644
--- a/services/managers/eve_api_manager.py
+++ b/services/managers/eve_api_manager.py
@@ -195,23 +195,17 @@ class EveApiManager():
         return {}
 
     @staticmethod
-    def get_corp_membertracking():
-        if settings.IS_CORP:
-            if settings.CORP_API_ID and settings.CORP_API_VCODE:
-                try:
-                    logger.debug("Getting corp membertracking with api id %s" % settings.CORP_API_ID)
-                    api = evelink.api.API(api_key=(settings.CORP_API_ID, settings.CORP_API_VCODE))
-                    corp = evelink.corp.Corp(api=api)
-                    membertracking = corp.members()
-                    results = membertracking.result
-                    logger.debug("Got corp membertracking from settings: %s" % results)
-                    return results
-                except evelink.api.APIError as error:
-                    logger.exception("Unhandled APIError occured.", exc_info=True)
-            else:
-                logger.error("No corp API key supplied in settings. Unable to get standings.")
-        else:
-            logger.error("Membertracking function only works in corporation mode.")
+    def get_corp_membertracking(api, vcode):
+        try:
+            logger.debug("Getting corp membertracking with api id %s" % settings.CORP_API_ID)
+            api = evelink.api.API(api_key=(api, vcode))
+            corp = evelink.corp.Corp(api=api)
+            membertracking = corp.members()
+            results = membertracking.result
+            logger.debug("Got corp membertracking from settings: %s" % results)
+            return results
+        except evelink.api.APIError as error:
+            logger.exception("Unhandled APIError occured.", exc_info=True)
         return {}
 
 
diff --git a/services/managers/evewho_manager.py b/services/managers/evewho_manager.py
new file mode 100644
index 00000000..364c11f2
--- /dev/null
+++ b/services/managers/evewho_manager.py
@@ -0,0 +1,19 @@
+
+from django.conf import settings
+
+import logging
+import requests
+import json
+
+
+class EveWhoManager():
+    def __init__(self):
+        pass
+
+    @staticmethod
+    def get_corporation_members(corpid):
+        url = "http://evewho.com/api.php?type=corplist&id=%s" % corpid
+        jsondata = requests.get(url).content
+        data=json.loads(jsondata.decode())
+
+        return {row["character_id"]:{"name":row["name"]} for row in data["characters"]}
diff --git a/stock/templates/public/base.html b/stock/templates/public/base.html
index 746c7933..9769302c 100755
--- a/stock/templates/public/base.html
+++ b/stock/templates/public/base.html
@@ -121,13 +121,13 @@
                                                                                    href="{% url 'auth_corp_stats' %}"><i
                                         class="fa fa-share-alt fa-fw grayiconecolor"></i> Corporation Stats</a>
                             </li>
-                            {% if IS_CORP %}
-                                <li>
-                                    <a {% ifequal request.path "/corputils/" %} class="active" {% endifequal %}
-                                                                                       href="{% url 'auth_corp_member_view' %}"><i
-                                            class="fa fa-chain fa-fw grayiconecolor"></i> Member Tracking</a>
-                                </li>
-                            {% endif  %}
+                        {% endif %}
+                        {% if perms.auth.corputils %}
+                            <li>
+                                <a {% ifequal request.path "/corputils/" %} class="active" {% endifequal %}
+                                                                                   href="{% url 'auth_corp_member_view' %}"><i
+                                        class="fa fa-chain fa-fw grayiconecolor"></i> Member Tracking</a>
+                            </li>
                         {% endif %}
 
                         {% if perms.auth.group_management %}
diff --git a/stock/templates/registered/corputils.html b/stock/templates/registered/corputils.html
index c8185ed3..16c3884a 100644
--- a/stock/templates/registered/corputils.html
+++ b/stock/templates/registered/corputils.html
@@ -1,5 +1,6 @@
 {% extends "public/base.html" %}
 {% load bootstrap %}
+{% load staticfiles %}
 
 {% block title %}Alliance Auth{% endblock %}
 {% block page_title %}Corporation Member Tracking{% endblock page_title %}
@@ -16,7 +17,6 @@
                     <div class="col-lg-12">
                         <div class="panel panel-default">
                             <div class="panel-heading">Corporation</div>
-
                             <div class="panel-body">
                                 <div class="col-lg-5 col-sm-2"><img class=
                                                                             "ra-avatar img-responsive" src=
@@ -34,8 +34,21 @@
 
                                     <p>Unregistered characters: {{characters_without_api|length}}</p>
                                 </div>
-
                                 <div class="text-right">
+                                    {% if form %}
+                                    <div class="container-fluid">
+                                        <div class="col-md-4 col-md-offset-4">
+                                            <div class="row">
+                                                <form class="form-signin" role="form" action="" method="POST">
+                                                    {% csrf_token %}
+                                                    {{ form|bootstrap }}
+                                                    <br/>
+                                                    <button class="btn btn-lg btn-primary btn-block" type="submit">Select corp</button>
+                                                </form>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    {% endif %}
                                     <!-- Button trigger modal -->
                                     <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal">
                                         Search Members

From 986816fdc726d7cd424800488413363cddfb44fd Mon Sep 17 00:00:00 2001
From: Ydmir <joakim.u.strandberg@gmail.com>
Date: Sun, 24 Jan 2016 21:47:24 +0100
Subject: [PATCH 09/23] Now sending the character model to the rendering
 instead of the character names so more info is available.

---
 README.md                                 |  1 +
 corputils/views.py                        | 10 ++++++----
 stock/templates/registered/corputils.html |  4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 3456128a..b0c9b0fc 100755
--- a/README.md
+++ b/README.md
@@ -66,6 +66,7 @@ Special Permissions In Admin:
     auth | user | jabber_broadcast_all ( Can choose from all groups and the 'all' option when broadcasting)
     auth | user | blue_member ( Auto Added to people who register has a blue when adding api key)
     auth | user | corp_stats ( View basic corp auth stats *who is authed etc*)
+    auth | user | corputils ( View who has registered APIs, which alts belong to which main, and more. )
     auth | user | timer_management ( Access to create and remove timers)
     auth | user | timer_view ( Access to timerboard to view timers)
     auth | user | srp_management ( Allows for an individual to create and remove srp fleets and fleet data)
diff --git a/corputils/views.py b/corputils/views.py
index ab62cc8a..ba3f9ac7 100644
--- a/corputils/views.py
+++ b/corputils/views.py
@@ -36,7 +36,7 @@ def corp_member_view(request, corpid = settings.CORP_ID):
             return HttpResponseRedirect("/corputils/")
 
     corp = EveCorporationInfo.objects.get(corporation_id=corpid)
-    Player = namedtuple("Player", ["main", "maincorp", "altlist"])
+    Player = namedtuple("Player", ["main", "maincorp", "maincorpid", "altlist"])
 
     if settings.IS_CORP:
         member_list = EveApiManager.get_corp_membertracking(settings.CORP_API_ID, settings.CORP_API_VCODE)
@@ -55,13 +55,15 @@ def corp_member_view(request, corpid = settings.CORP_ID):
                 mainchar = EveCharacter.objects.get(character_id=mainid)
                 mainname = mainchar.character_name
                 maincorp = mainchar.corporation_name
-            except ValueError:
+                maincorpid = mainchar.corporation_id
+            except (ValueError, EveCharacter.DoesNotExist):
                 mainname = "User: " + user.username
                 maincorp = None
-            characters_with_api.setdefault(mainname, Player(main=mainname,
+            characters_with_api.setdefault(mainname, Player(main=mainchar,
                                                             maincorp=maincorp,
+                                                            maincorpid=maincorpid,
                                                             altlist=[])
-                                           ).altlist.append(char.character_name)
+                                           ).altlist.append(char)
 
         except EveCharacter.DoesNotExist:
             characters_without_api.append(member_data["name"])
diff --git a/stock/templates/registered/corputils.html b/stock/templates/registered/corputils.html
index 16c3884a..5482eb44 100644
--- a/stock/templates/registered/corputils.html
+++ b/stock/templates/registered/corputils.html
@@ -79,8 +79,8 @@
                                                     <p class="">{{ player.maincorp }}</p>
                                                 </td>
                                                 <td class="text-center">
-                                                    {% for charname in player.altlist %}
-                                                        <p class="">{{ charname }}</p>
+                                                    {% for char in player.altlist %}
+                                                        <p class="">{{ char.character_name }}</p>
                                                     {% endfor %}
                                                 </td>
                                             </tr>

From bd7bbc93397632d58272d664b79216236fd7a15b Mon Sep 17 00:00:00 2001
From: Ydmir <joakim.u.strandberg@gmail.com>
Date: Sun, 24 Jan 2016 22:32:54 +0100
Subject: [PATCH 10/23] Added portraits in the list, because why not.

---
 corputils/views.py                        | 12 +++++++-----
 services/managers/evewho_manager.py       |  2 +-
 stock/templates/registered/corputils.html | 17 +++++++++++++----
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/corputils/views.py b/corputils/views.py
index ba3f9ac7..bda698b1 100644
--- a/corputils/views.py
+++ b/corputils/views.py
@@ -44,7 +44,7 @@ def corp_member_view(request, corpid = settings.CORP_ID):
         member_list = EveWhoManager.get_corporation_members(corpid)
 
     characters_with_api = {}
-    characters_without_api = []
+    characters_without_api = {}
 
     for char_id, member_data in member_list.items():
         try:
@@ -58,7 +58,9 @@ def corp_member_view(request, corpid = settings.CORP_ID):
                 maincorpid = mainchar.corporation_id
             except (ValueError, EveCharacter.DoesNotExist):
                 mainname = "User: " + user.username
-                maincorp = None
+                mainchar = char
+                maincorp = mainchar.corporation_name
+                maincorpid = mainchar.corporation_id
             characters_with_api.setdefault(mainname, Player(main=mainchar,
                                                             maincorp=maincorp,
                                                             maincorpid=maincorpid,
@@ -66,7 +68,7 @@ def corp_member_view(request, corpid = settings.CORP_ID):
                                            ).altlist.append(char)
 
         except EveCharacter.DoesNotExist:
-            characters_without_api.append(member_data["name"])
+            characters_without_api.update({member_data["name"]: member_data["id"]})
 
 
     if not settings.IS_CORP:
@@ -74,13 +76,13 @@ def corp_member_view(request, corpid = settings.CORP_ID):
         context = {"form": form,
                    "corp": corp,
                    "characters_with_api": sorted(characters_with_api.items()),
-                   "characters_without_api": sorted(characters_without_api),
+                   "characters_without_api": sorted(characters_without_api.items()),
                    "search_form": CorputilsSearchForm()}
     else:
         logger.debug("corp_member_view running in corportation mode")
         context = {"corp": corp,
                    "characters_with_api": sorted(characters_with_api.items()),
-                   "characters_without_api": sorted(characters_without_api),
+                   "characters_without_api": sorted(characters_without_api.items()),
                    "search_form": CorputilsSearchForm()}
 
 
diff --git a/services/managers/evewho_manager.py b/services/managers/evewho_manager.py
index 364c11f2..35e0093c 100644
--- a/services/managers/evewho_manager.py
+++ b/services/managers/evewho_manager.py
@@ -16,4 +16,4 @@ class EveWhoManager():
         jsondata = requests.get(url).content
         data=json.loads(jsondata.decode())
 
-        return {row["character_id"]:{"name":row["name"]} for row in data["characters"]}
+        return {row["character_id"]:{"name":row["name"], "id":row["character_id"]} for row in data["characters"]}
diff --git a/stock/templates/registered/corputils.html b/stock/templates/registered/corputils.html
index 5482eb44..c84abe23 100644
--- a/stock/templates/registered/corputils.html
+++ b/stock/templates/registered/corputils.html
@@ -66,14 +66,19 @@
                                 <div style="overflow:auto;overflow-y:auto;">
                                     <table class="table table-condensed">
                                         <tr>
+                                            <th class="""></th>
                                             <th class="text-center">Main character</th>
                                             <th class="text-center">Main corporation</th>
                                             <th class="text-center">Character list</th>
                                         </tr>
-                                        {% for mainchar, player  in characters_with_api %}
+                                        {% for maincharname, player  in characters_with_api %}
                                             <tr >
+                                                <td>
+                                                    <img class="ra-avatar img-responsive"
+                                                            src="https://image.eveonline.com/Character/{{ player.main.character_id }}_64.jpg">
+                                                </td>
                                                 <td class="text-center">
-                                                    <p class="">{{ mainchar }}</p>
+                                                    <p class="">{{ maincharname }}</p>
                                                 </td>
                                                 <td class="text-center" {% if not corp.corporation_name ==  player.maincorp%} bgcolor="#FF99AA" {% endif %} >
                                                     <p class="">{{ player.maincorp }}</p>
@@ -85,10 +90,14 @@
                                                 </td>
                                             </tr>
                                         {% endfor %}
-                                        {% for charname in characters_without_api %}
+                                        {% for character_name, character_id in characters_without_api %}
                                             <tr bgcolor="#DD8822">
+                                                <td>
+                                                    <img class="ra-avatar img-responsive"
+                                                            src="https://image.eveonline.com/Character/{{ character_id }}_64.jpg">
+                                                </td>
                                                 <td class="text-center">
-                                                    <p class="">{{ charname }}</p>
+                                                    <p class="">{{ character_name }}</p>
                                                 </td>
                                                 <td class="text-center">
                                                     <p class=""></p>

From 29e5790ec7335dc9f0c695403150fd56689aece9 Mon Sep 17 00:00:00 2001
From: Ydmir <joakim.u.strandberg@gmail.com>
Date: Mon, 25 Jan 2016 23:19:28 +0100
Subject: [PATCH 11/23] Now the search function works in alliance mode as well,
 searching the corp that is currently active. Also, the select corporation is
 nicer now.

---
 alliance_auth/urls.py                     |  4 ++--
 corputils/views.py                        | 26 ++++++++++----------
 stock/static/css/bootstrap.min.css        |  5 ++++
 stock/templates/registered/corputils.html | 29 ++++++++++++-----------
 4 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/alliance_auth/urls.py b/alliance_auth/urls.py
index 4b0b37a4..2b865aaa 100755
--- a/alliance_auth/urls.py
+++ b/alliance_auth/urls.py
@@ -166,8 +166,8 @@ urlpatterns = patterns('',
                        #corputils
                        url(r'^corputils/$', 'corputils.views.corp_member_view', name='auth_corp_member_view'),
                        url(r'^corputils/(?P<corpid>[0-9]+)/$', 'corputils.views.corp_member_view', name='auth_corp_member_view'),
-                       url(r'^corputils/search/', 'corputils.views.corputils_search',
-                           name="auth_corputils_search"),
+                       url(r'^corputils/search/$', 'corputils.views.corputils_search', name="auth_corputils_search"),
+                       url(r'^corputils/search/(?P<corpid>[0-9]+)/$', 'corputils.views.corputils_search', name="auth_corputils_search"),
 
                        # FLEET FITTINGS
                        url(r'^fits/$', 'services.views.fleet_fits', name='auth_fleet_fits'),
diff --git a/corputils/views.py b/corputils/views.py
index bda698b1..aa8c0fbb 100644
--- a/corputils/views.py
+++ b/corputils/views.py
@@ -28,13 +28,6 @@ logger = logging.getLogger(__name__)
 def corp_member_view(request, corpid = settings.CORP_ID):
     logger.debug("corp_member_view called by user %s" % request.user)
 
-    if request.method == 'POST':
-        form = SelectCorpForm(request.POST)
-        if form.is_valid():
-            return HttpResponseRedirect("/corputils/"+form.cleaned_data["corpid"])
-        else:
-            return HttpResponseRedirect("/corputils/")
-
     corp = EveCorporationInfo.objects.get(corporation_id=corpid)
     Player = namedtuple("Player", ["main", "maincorp", "maincorpid", "altlist"])
 
@@ -59,8 +52,8 @@ def corp_member_view(request, corpid = settings.CORP_ID):
             except (ValueError, EveCharacter.DoesNotExist):
                 mainname = "User: " + user.username
                 mainchar = char
-                maincorp = mainchar.corporation_name
-                maincorpid = mainchar.corporation_id
+                maincorp = "Not set."
+                maincorpid = None
             characters_with_api.setdefault(mainname, Player(main=mainchar,
                                                             maincorp=maincorp,
                                                             maincorpid=maincorpid,
@@ -72,8 +65,12 @@ def corp_member_view(request, corpid = settings.CORP_ID):
 
 
     if not settings.IS_CORP:
-        form = SelectCorpForm()
-        context = {"form": form,
+        alliance = EveAllianceInfo.objects.get(alliance_id=settings.ALLIANCE_ID)
+        alliancecorps = EveCorporationInfo.objects.filter(alliance=alliance)
+        membercorp_list = [(int(membercorp.corporation_id), str(membercorp.corporation_name)) for membercorp in alliancecorps]
+        membercorp_list.sort(key=lambda tup: tup[1])
+
+        context = {"membercorp_list": membercorp_list,
                    "corp": corp,
                    "characters_with_api": sorted(characters_with_api.items()),
                    "characters_without_api": sorted(characters_without_api.items()),
@@ -91,7 +88,7 @@ def corp_member_view(request, corpid = settings.CORP_ID):
 
 @login_required
 @permission_required('auth.corputils')
-def corputils_search(request):
+def corputils_search(request, corpid=settings.CORP_ID):
     logger.debug("corputils_search called by user %s" % request.user)
     if request.method == 'POST':
         form = CorputilsSearchForm(request.POST)
@@ -102,7 +99,10 @@ def corputils_search(request):
             searchstring = form.cleaned_data['search_string']
             logger.debug("Searching for player with character name %s for user %s" % (searchstring, request.user))
 
-            member_list = EveApiManager.get_corp_membertracking(settings.CORP_API_ID, settings.CORP_API_VCODE)
+            if settings.IS_CORP:
+                member_list = EveApiManager.get_corp_membertracking(settings.CORP_API_ID, settings.CORP_API_VCODE)
+            else:
+                member_list = EveWhoManager.get_corporation_members(corpid)
 
             Member = namedtuple('Member', ['name', 'main', 'api_registered'])
 
diff --git a/stock/static/css/bootstrap.min.css b/stock/static/css/bootstrap.min.css
index ee15bd7a..d368d7be 100644
--- a/stock/static/css/bootstrap.min.css
+++ b/stock/static/css/bootstrap.min.css
@@ -3401,6 +3401,11 @@ tbody.collapse.in {
     box-shadow: 0 6px 12px rgba(0, 0, 0, .175)
 }
 
+.dropdown-menu.scrollable {
+    overflow: auto;
+    max-height: 450px;
+}
+
 .dropdown-menu.pull-right {
     right: 0;
     left: auto
diff --git a/stock/templates/registered/corputils.html b/stock/templates/registered/corputils.html
index c84abe23..b8678029 100644
--- a/stock/templates/registered/corputils.html
+++ b/stock/templates/registered/corputils.html
@@ -35,19 +35,20 @@
                                     <p>Unregistered characters: {{characters_without_api|length}}</p>
                                 </div>
                                 <div class="text-right">
-                                    {% if form %}
-                                    <div class="container-fluid">
-                                        <div class="col-md-4 col-md-offset-4">
-                                            <div class="row">
-                                                <form class="form-signin" role="form" action="" method="POST">
-                                                    {% csrf_token %}
-                                                    {{ form|bootstrap }}
-                                                    <br/>
-                                                    <button class="btn btn-lg btn-primary btn-block" type="submit">Select corp</button>
-                                                </form>
-                                            </div>
-                                        </div>
-                                    </div>
+
+                                    {% if membercorp_list %}
+                                    <ul class="nav navbar-nav">
+                                        <li class="dropdown">
+                                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Choose corporation <span class="caret"></span></a>
+                                            <ul class="dropdown-menu scrollable">
+                                                {% for membercorp_id, membercorp_name in membercorp_list %}
+                                                <li>
+                                                    <a href="/corputils/{{ membercorp_id }}">{{ membercorp_name }}</a>
+                                                </li>
+                                                {% endfor %}
+                                            </ul>
+                                        </li>
+                                    </ul>
                                     {% endif %}
                                     <!-- Button trigger modal -->
                                     <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal">
@@ -145,7 +146,7 @@
                     </div>
                     <div class="modal-body">
                         <form class="form-signin" role="form"
-                              action={% url 'auth_corputils_search' %} method="POST">
+                              action={% url 'auth_corputils_search' %}{{ corp.corporation_id }}/ method="POST">
                             {% csrf_token %}
                             {{ search_form|bootstrap }}
                             <br/>

From 9ce72f3cbb8e86d20f397d735e72272413024359 Mon Sep 17 00:00:00 2001
From: johanko <johan.kristian.olsen@gmail.com>
Date: Tue, 26 Jan 2016 23:39:06 +0100
Subject: [PATCH 12/23] Remove label, add placeholder

Removes label from search input and adds placeholder.
---
 corputils/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corputils/forms.py b/corputils/forms.py
index 969b5d24..dad21d09 100644
--- a/corputils/forms.py
+++ b/corputils/forms.py
@@ -12,4 +12,4 @@ class SelectCorpForm(forms.Form):
     corpid = forms.ChoiceField(corpnamelist, required=True, label="Corporation")
 
 class CorputilsSearchForm(forms.Form):
-    search_string = forms.CharField(max_length=254, required=True, label="Search String")
+    search_string = forms.CharField(max_length=254, required=True, label="", widget=forms.TextInput(attrs={'placeholder': 'Search characters...'}))

From 5635d82251e26e2c6500e3dfff545fe8cc3f2edc Mon Sep 17 00:00:00 2001
From: johanko <johan.kristian.olsen@gmail.com>
Date: Tue, 26 Jan 2016 23:41:21 +0100
Subject: [PATCH 13/23] Template changes

Check if progressbar has the "logic" we want.
---
 stock/templates/registered/corputils.html | 255 ++++++++++++----------
 1 file changed, 141 insertions(+), 114 deletions(-)

diff --git a/stock/templates/registered/corputils.html b/stock/templates/registered/corputils.html
index b8678029..46a589df 100644
--- a/stock/templates/registered/corputils.html
+++ b/stock/templates/registered/corputils.html
@@ -12,118 +12,172 @@
         {% if perms.auth.corputils %}
             <div class="col-lg-12 container" id="example">
             {% if corp %}
-
                 <div class="row">
                     <div class="col-lg-12">
                         <div class="panel panel-default">
                             <div class="panel-heading">Corporation</div>
-                            <div class="panel-body">
-                                <div class="col-lg-5 col-sm-2"><img class=
-                                                                            "ra-avatar img-responsive" src=
-                                                                            "https://image.eveonline.com/Corporation/{{ corp.corporation_id }}_128.png">
-                                </div>
+                                <div class="panel-body">
+                                    <div class="col-lg-5 col-sm-2">
+                                         <img class="ra-avatar img-responsive" src="https://image.eveonline.com/Corporation/{{ corp.corporation_id }}_128.png">
+                                    </div>
+                                    <div class="col-lg-7 col-sm-2">
+                                         <h4 class="">{{ corp.corporation_name }}</h4>
 
-                                <div class="col-lg-7 col-sm-2">
-                                    <h4 class="">Name: {{ corp.corporation_name }}</h4>
+                                         <p>Ticker: {{ corp.corporation_ticker }}</p>
 
-                                    <p>Ticker: {{ corp.corporation_ticker }}</p>
+                                         <p>Member count: {{ corp.member_count }}</p>
 
-                                    <p>Member count: {{ corp.member_count }}</p>
+                                         <p>Player count: {{characters_with_api|length}}</p>
 
-                                    <p>Player count: {{characters_with_api|length}}</p>
-
-                                    <p>Unregistered characters: {{characters_without_api|length}}</p>
-                                </div>
-                                <div class="text-right">
-
-                                    {% if membercorp_list %}
-                                    <ul class="nav navbar-nav">
-                                        <li class="dropdown">
-                                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Choose corporation <span class="caret"></span></a>
-                                            <ul class="dropdown-menu scrollable">
-                                                {% for membercorp_id, membercorp_name in membercorp_list %}
-                                                <li>
-                                                    <a href="/corputils/{{ membercorp_id }}">{{ membercorp_name }}</a>
-                                                </li>
-                                                {% endfor %}
-                                            </ul>
-                                        </li>
-                                    </ul>
-                                    {% endif %}
-                                    <!-- Button trigger modal -->
-                                    <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal">
-                                        Search Members
-                                    </button>
+                                         <p>Unregistered characters: {{characters_without_api|length}}</p>
+                                    </div>
+                                    <div class="col-lg-12 col-sm-5">
+                                        <b>API Index:</b>
+                                        <div class="progress">
+                                            <div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="{{characters_with_api|length}}" aria-valuemin="0" aria-valuemax="{{ corp.member_count }}" style="width: {% widthratio characters_with_api|length corp.member_count 100 %}%;">
+                                                {{characters_with_api|length}}/{{ corp.member_count }}
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-
-
-                    <div class="col-lg-12">
-                        <div class="panel panel-default">
-                            <div class="panel-heading">Registered Characters</div>
+                        <nav class="navbar navbar-default">
+                            <div class="container-fluid">
+                                <ul class="nav navbar-nav">
+                                    {% if membercorp_list %}
+                                    <li class="dropdown">
+                                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Choose corporation <span class="caret"></span></a>
+                                        <ul class="dropdown-menu columns">  
+                                            {% for membercorp_id, membercorp_name in membercorp_list %}
+                                            <li>
+                                                <a href="/corputils/{{ membercorp_id }}">{{ membercorp_name }}</a>
+                                            </li>
+                                            {% endfor %}
+                                        </ul>
+                                    </li>
+                                    {% endif %}
+                                    <li>
+                                        <form class="navbar-form navbar-left" role="search" action={% url 'auth_corputils_search' %} method="POST">
+                                            <div class="form-group">
+                                            {% csrf_token %}
+                                            {{ search_form.as_table }}
+                                            </div>
+                                            <button class="btn btn-default" type="submit">Search</button>
+                                        </form>
+                                    </li>
+                                    <li>
+                                        <p class="navbar-btn">
+                                            <a href="https://zkillboard.com/corporation/{{ corp.corporation_id }}/" class="btn btn-default" target="_blank">{{ corp.corporation_name }} Killboard</a>
+                                        </p>
+                                    </li>
+                                </ul> 
+                            </div>
+                        </nav>
+                        <ul class="nav nav-tabs">
+                            <li class="active"><a data-toggle="tab" href="#gotapi">Registered Main Characters <b>({{characters_with_api|length}})</b></a></li>
+                            <li><a data-toggle="tab" href="#noapi">Characters without API <b>({{characters_without_api|length}})</b></a></li>
+                        </ul>
+                    <div class="tab-content">
+                        <div id="gotapi" class="tab-pane fade in active">
+                            {% if characters_with_api %}
                             <div class="panel-body">
-                                <div style="overflow:auto;overflow-y:auto;">
-                                    <table class="table table-condensed">
+                                <div class="table-responsive">
+                                    <table class="table table-condensed table-hover table-striped">
                                         <tr>
-                                            <th class="""></th>
-                                            <th class="text-center">Main character</th>
-                                            <th class="text-center">Main corporation</th>
-                                            <th class="text-center">Character list</th>
+                                            <th class="col-md-1"></th>
+                                            <th class="col-md-2">Main character</th>
+                                            <th class="col-md-2">Killboard</th>
+                                            <th class="col-md-2">Main corporation</th>
+                                            <th class="col-md-5">Character list</th>
                                         </tr>
                                         {% for maincharname, player  in characters_with_api %}
-                                            <tr >
-                                                <td>
-                                                    <img class="ra-avatar img-responsive"
-                                                            src="https://image.eveonline.com/Character/{{ player.main.character_id }}_64.jpg">
-                                                </td>
-                                                <td class="text-center">
-                                                    <p class="">{{ maincharname }}</p>
-                                                </td>
-                                                <td class="text-center" {% if not corp.corporation_name ==  player.maincorp%} bgcolor="#FF99AA" {% endif %} >
-                                                    <p class="">{{ player.maincorp }}</p>
-                                                </td>
-                                                <td class="text-center">
-                                                    {% for char in player.altlist %}
-                                                        <p class="">{{ char.character_name }}</p>
-                                                    {% endfor %}
-                                                </td>
-                                            </tr>
-                                        {% endfor %}
-                                        {% for character_name, character_id in characters_without_api %}
-                                            <tr bgcolor="#DD8822">
-                                                <td>
-                                                    <img class="ra-avatar img-responsive"
-                                                            src="https://image.eveonline.com/Character/{{ character_id }}_64.jpg">
-                                                </td>
-                                                <td class="text-center">
-                                                    <p class="">{{ character_name }}</p>
-                                                </td>
-                                                <td class="text-center">
-                                                    <p class=""></p>
-                                                </td>
-                                                <td class="text-center">
-                                                    <p class="">No API registered!</p>
-                                                </td>
-                                            </tr>
+                                        <tr >
+                                            <td>
+                                                <img src="http://image.eveonline.com/Character/{{ player.main.character_id }}_32.jpg" class="img-circle">
+                                            </td>
+                                            <td>
+                                                <p>{{ maincharname }}</p>
+                                            </td>
+                                            <td>
+                                                <a href="https://zkillboard.com/character/{{ player.main.character_id }}/" class="label label-danger" target="_blank">Killboard</a>
+                                            </td>
+                                            <td>
+                                                {% if not corp.corporation_name ==  player.maincorp%}
+                                                <span class="label label-danger">
+                                                    {{ player.maincorp }}
+                                                </span>
+                                                {% else %}
+                                                <span class="label label-success">
+                                                    {{ player.maincorp }}
+                                                </span>
+                                                {% endif %}
+                                            </td>
+                                            <td>
+                                                {% for char in player.altlist %}
+                                                <p>{{ char.character_name }}</p>
+                                                {% endfor %}
+                                            </td>
+                                        </tr>
                                         {% endfor %}
                                     </table>
                                 </div>
                             </div>
+                            {% else %}
+                            <div class="alert alert-danger" role="alert">
+                                    <h3>Seems there's no characters in {{ corp.corporation_name }} tied to a registered API!</h3>
+                            </div>
+                            {% endif %}
+                        </div>
+                        <div id="noapi" class="tab-pane fade">
+                        {% if characters_without_api %}
+                            <div class="panel-body">
+                                <div class="table-responsive">    
+                                    <table class="table table-condensed table-hover table-striped">
+                                        <tr>
+                                            <th class="col-md-1"></th>
+                                            <th class="col-md-2">Character</th>
+                                            <th class="col-md-2">Killboard</th>
+                                            <th class="col-md-3">API</th>
+                                        </tr>
+                                        {% for character_name, character_id in characters_without_api %}
+                                        <tr>
+                                            <td>
+                                                <img src="http://image.eveonline.com/Character/{{ character_id }}_32.jpg" class="img-circle">
+                                            </td>
+                                            <td>
+                                                <p>{{ character_name }}</p>
+                                            </td>
+                                            <td>
+                                                <a href="https://zkillboard.com/character/{{ character_id }}/" class="label label-danger" target="_blank">Killboard</a>
+                                            </td>
+                                            <td>
+                                                <span class="label label-danger">No API registered!</span>
+                                            </td>
+                                        </tr>
+                                        {% endfor %}
+                                    </table>
+                                </div>
+                            </div>
+                        {% else %}
+                            <div class="alert alert-success" role="alert">
+                                <h3>Good job! Every char of {{ corp.corporation_name }} seems to be tied to an API!</h3>
+                            </div>
+                        {% endif %}
                         </div>
                     </div>
-                {% else %}
-                    <div class="container-fluid">
-                        <div class="col-md-4 col-md-offset-4">
-                            <div class="row">
-                                <div class="alert alert-danger text-center" role="alert">No corporation model found. Contact your admin.</div>
-                            </div>
+            {% else %}
+                <div class="container-fluid">
+                    <div class="col-md-4 col-md-offset-4">
+                        <div class="row">
+                            <div class="alert alert-danger text-center" role="alert">No corporation model found. Contact your admin.</div>
                         </div>
                     </div>
                 </div>
-            {% endif %}
             </div>
+            {% endif %}
+        </div>
         {% else %}
             {% if IS_CORP %}
                 <div class="alert alert-danger" role="alert">You are not in the corporation.</div>
@@ -132,31 +186,4 @@
             {% endif %}
         {% endif %}
     </div>
-
-    {% if perms.auth.corputils %}
-        <!-- Modal -->
-        <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-             aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
-                                class="sr-only">Close</span></button>
-                        <h4 class="modal-title" id="myModalLabel">Member Search</h4>
-                    </div>
-                    <div class="modal-body">
-                        <form class="form-signin" role="form"
-                              action={% url 'auth_corputils_search' %}{{ corp.corporation_id }}/ method="POST">
-                            {% csrf_token %}
-                            {{ search_form|bootstrap }}
-                            <br/>
-                            <button class="btn btn-lg btn-primary btn-block" type="submit">Search</button>
-                        </form>
-                    </div>
-                    <div class="modal-footer">
-                    </div>
-                </div>
-            </div>
-        </div>
-    {% endif %}
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}

From 0bb7cc9ae18faddfe429fda643f6b2a3340d6429 Mon Sep 17 00:00:00 2001
From: johanko <johan.kristian.olsen@gmail.com>
Date: Tue, 26 Jan 2016 23:45:55 +0100
Subject: [PATCH 14/23] Template changes

Moved searchform to navbar
---
 .../registered/corputilssearchview.html       | 95 ++++++++-----------
 1 file changed, 41 insertions(+), 54 deletions(-)

diff --git a/stock/templates/registered/corputilssearchview.html b/stock/templates/registered/corputilssearchview.html
index 42d882e8..78f2ec96 100644
--- a/stock/templates/registered/corputilssearchview.html
+++ b/stock/templates/registered/corputilssearchview.html
@@ -8,63 +8,50 @@
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
-    <div class="col-lg-12">
+    <div class="col-lg-8">
         {% if perms.auth.corputils %}
-            <h1 class="page-header text-center">Member Search Results
-                <div class="text-right">
-                    <!-- Button trigger modal -->
-                    <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal">
-                        Search Members
-                    </button>
-                </div>
-            </h1>
-            <div class="container-fluid">
-                <table class="table table-bordered">
-                    <tr>
-                        <th class="text-center">Character</th>
-                        <th class="text-center">Main Character</th>
-                    </tr>
-                    {% for member in members %}
-                        <tr {% if  not member.api_registered%} bgcolor="#DD5500" {% endif %} >
-                            <td class="text-center">{{ member.name }}</td>
-                            <td class="text-center">
-                            {% if  member.api_registered%}
-                                {{ member.main }}
-                            {% else %}
-                                No API registered!
-                            {% endif %}
-                            </td>
-                        </tr>
-                    {% endfor %}
-                </table>
+         
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h3 class="panel-title">Search Results</h3>
             </div>
-        {% endif %}
-    </div>
-
-    {% if perms.auth.corputils %}
-        <!-- Modal -->
-        <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-             aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
-                                class="sr-only">Close</span></button>
-                        <h4 class="modal-title" id="myModalLabel">Member Search</h4>
-                    </div>
-                    <div class="modal-body">
-                        <form class="form-signin" role="form"
-                              action={% url 'auth_corputils_search' %} method="POST">
-                            {% csrf_token %}
-                            {{ search_form|bootstrap }}
-                            <br/>
-                            <button class="btn btn-lg btn-primary btn-block" type="submit">Search</button>
-                        </form>
-                    </div>
-                    <div class="modal-footer">
-                    </div>
+            <nav class="navbar navbar-default">
+                <div class="container-fluid">
+                    <ul class="nav navbar-nav">
+                        <li>
+                            <form class="navbar-form navbar-left" role="search" action={% url 'auth_corputils_search' %} method="POST">
+                                <div class="form-group">
+                                {% csrf_token %}
+                                {{ search_form.as_table }}
+                                </div>
+                                <button class="btn btn-default" type="submit">Search</button>
+                            </form>
+                        </li>
+                    </ul>
+                </div>
+            </nav>
+                <div class="panel-body">
+                    <table class="table table-condensed table-hover table-striped">
+                        <tr>
+                            <th>Character</th>
+                            <th>Main Character</th>
+                        </tr>
+                        {% for member in members %}
+                            <tr {% if  not member.api_registered%} {% endif %} >
+                                <td>{{ member.name }}{{ member.id }}</td>
+                                <td>
+                                {% if  member.api_registered%}
+                                    {{ member.main }}
+                                {% else %}
+                                    <span class="label label-danger">No API registered!</span>
+                                {% endif %}
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </table>
                 </div>
             </div>
         </div>
-    {% endif %}
+        {% endif %}
+    </div>
 {% endblock content %}

From 8e7125f1b03f0c54e4590ab2ee2783584ed9639a Mon Sep 17 00:00:00 2001
From: johanko <johan.kristian.olsen@gmail.com>
Date: Tue, 26 Jan 2016 23:52:35 +0100
Subject: [PATCH 15/23] Added column class attribute

Column class attribute to use 2 columns on screensize, using this in navbar dropdown in corputils.html
---
 stock/static/css/bootstrap.min.css | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/stock/static/css/bootstrap.min.css b/stock/static/css/bootstrap.min.css
index d368d7be..7e5f6272 100644
--- a/stock/static/css/bootstrap.min.css
+++ b/stock/static/css/bootstrap.min.css
@@ -3401,6 +3401,22 @@ tbody.collapse.in {
     box-shadow: 0 6px 12px rgba(0, 0, 0, .175)
 }
 
+@media screen and (max-width: 991px){
+    .columns{
+        height: 200px;
+        overflow:scroll;
+    }
+}
+
+@media screen and (min-width: 992px){
+    .columns{
+        -moz-column-count:2; /* Firefox */
+        -webkit-column-count:2; /* Safari and Chrome */
+        column-count:2;
+        width: 500px;
+    }
+}
+
 .dropdown-menu.scrollable {
     overflow: auto;
     max-height: 450px;
@@ -6668,4 +6684,4 @@ button.close {
     .hidden-print {
         display: none !important
     }
-}
\ No newline at end of file
+}

From 995bbf7966dda3a630b27df234308b512d11a1cb Mon Sep 17 00:00:00 2001
From: johanko <johan.kristian.olsen@gmail.com>
Date: Tue, 26 Jan 2016 23:54:02 +0100
Subject: [PATCH 16/23] Change overflow for dropdown

If there's no content the page-wrapper cuts dropdown. This change fixes this.
---
 stock/static/css/sb-admin-2.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stock/static/css/sb-admin-2.css b/stock/static/css/sb-admin-2.css
index a3f23e6b..b1c36085 100755
--- a/stock/static/css/sb-admin-2.css
+++ b/stock/static/css/sb-admin-2.css
@@ -27,7 +27,7 @@ body {
         margin: 0 0 0 250px;
         padding: 0 30px;
         border-left: 1px solid #e7e7e7;
-        overflow: hidden;
+        overflow: visible;
     }
 }
 
@@ -346,4 +346,4 @@ table.dataTable thead .sorting:after {
 
 .panel-yellow a:hover {
     color: #df8a13;
-}
\ No newline at end of file
+}

From e401964a1c6ec8c8d31e93bb18ed78af7475a99c Mon Sep 17 00:00:00 2001
From: Ydmir <joakim.u.strandberg@gmail.com>
Date: Wed, 27 Jan 2016 19:57:46 +0100
Subject: [PATCH 17/23] Removed some legacy.

---
 corputils/forms.py | 7 -------
 corputils/views.py | 1 -
 2 files changed, 8 deletions(-)

diff --git a/corputils/forms.py b/corputils/forms.py
index 969b5d24..ebca58ad 100644
--- a/corputils/forms.py
+++ b/corputils/forms.py
@@ -4,12 +4,5 @@ from django.conf import settings
 from eveonline.models import EveCorporationInfo
 from eveonline.models import EveAllianceInfo
 
-class SelectCorpForm(forms.Form):
-    alliance = EveAllianceInfo.objects.get(alliance_id=settings.ALLIANCE_ID)
-    alliancecorps = EveCorporationInfo.objects.filter(alliance=alliance)
-    corpnamelist = [(int(corp.corporation_id), str(corp.corporation_name)) for corp in alliancecorps]
-    corpnamelist.sort(key=lambda tup: tup[1])
-    corpid = forms.ChoiceField(corpnamelist, required=True, label="Corporation")
-
 class CorputilsSearchForm(forms.Form):
     search_string = forms.CharField(max_length=254, required=True, label="Search String")
diff --git a/corputils/views.py b/corputils/views.py
index aa8c0fbb..7ffac84f 100644
--- a/corputils/views.py
+++ b/corputils/views.py
@@ -15,7 +15,6 @@ from eveonline.models import EveAllianceInfo
 from eveonline.models import EveCharacter
 from authentication.models import AuthServicesInfo
 from forms import CorputilsSearchForm
-from forms import SelectCorpForm
 
 import logging
 

From 24a441203889e78e4f27f7a1da1f70409c41deac Mon Sep 17 00:00:00 2001
From: Ydmir <joakim.u.strandberg@gmail.com>
Date: Wed, 27 Jan 2016 22:35:35 +0100
Subject: [PATCH 18/23] Modified appearance somewhat and fixed search.

---
 corputils/views.py                            |  7 ++++--
 stock/static/css/bootstrap.min.css            | 18 +--------------
 stock/templates/registered/corputils.html     | 22 +++++++++----------
 .../registered/corputilssearchview.html       |  2 +-
 4 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/corputils/views.py b/corputils/views.py
index 7ffac84f..96cc965a 100644
--- a/corputils/views.py
+++ b/corputils/views.py
@@ -89,6 +89,9 @@ def corp_member_view(request, corpid = settings.CORP_ID):
 @permission_required('auth.corputils')
 def corputils_search(request, corpid=settings.CORP_ID):
     logger.debug("corputils_search called by user %s" % request.user)
+
+    corp = EveCorporationInfo.objects.get(corporation_id=corpid)
+
     if request.method == 'POST':
         form = CorputilsSearchForm(request.POST)
         logger.debug("Request type POST contains form valid: %s" % form.is_valid())
@@ -122,13 +125,13 @@ def corputils_search(request, corpid=settings.CORP_ID):
 
             logger.info("Found %s members for user %s matching search string %s" % (len(members), request.user, searchstring))
 
-            context = {'members': members, 'search_form': CorputilsSearchForm()}
+            context = {'corp': corp, 'members': members, 'search_form': CorputilsSearchForm()}
 
             return render_to_response('registered/corputilssearchview.html',
                                       context, context_instance=RequestContext(request))
         else:
             logger.debug("Form invalid - returning for user %s to retry." % request.user)
-            context = {'applications': None, 'search_form': form}
+            context = {'corp': corp, 'members': None, 'search_form': CorputilsSearchForm()}
             return render_to_response('registered/corputilssearchview.html',
                                       context, context_instance=RequestContext(request))
 
diff --git a/stock/static/css/bootstrap.min.css b/stock/static/css/bootstrap.min.css
index 7e5f6272..6822b5b8 100644
--- a/stock/static/css/bootstrap.min.css
+++ b/stock/static/css/bootstrap.min.css
@@ -3401,24 +3401,8 @@ tbody.collapse.in {
     box-shadow: 0 6px 12px rgba(0, 0, 0, .175)
 }
 
-@media screen and (max-width: 991px){
-    .columns{
-        height: 200px;
-        overflow:scroll;
-    }
-}
-
-@media screen and (min-width: 992px){
-    .columns{
-        -moz-column-count:2; /* Firefox */
-        -webkit-column-count:2; /* Safari and Chrome */
-        column-count:2;
-        width: 500px;
-    }
-}
-
 .dropdown-menu.scrollable {
-    overflow: auto;
+    overflow: scroll;
     max-height: 450px;
 }
 
diff --git a/stock/templates/registered/corputils.html b/stock/templates/registered/corputils.html
index 46a589df..0ed7da5a 100644
--- a/stock/templates/registered/corputils.html
+++ b/stock/templates/registered/corputils.html
@@ -45,11 +45,11 @@
                     </div>
                         <nav class="navbar navbar-default">
                             <div class="container-fluid">
-                                <ul class="nav navbar-nav">
+                                <ul class="nav navbar-nav" style="width: 100%">
                                     {% if membercorp_list %}
                                     <li class="dropdown">
                                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Choose corporation <span class="caret"></span></a>
-                                        <ul class="dropdown-menu columns">  
+                                        <ul class="dropdown-menu scrollable">
                                             {% for membercorp_id, membercorp_name in membercorp_list %}
                                             <li>
                                                 <a href="/corputils/{{ membercorp_id }}">{{ membercorp_name }}</a>
@@ -58,8 +58,13 @@
                                         </ul>
                                     </li>
                                     {% endif %}
-                                    <li>
-                                        <form class="navbar-form navbar-left" role="search" action={% url 'auth_corputils_search' %} method="POST">
+                                    <li style="float: right">
+                                        <p class="navbar-btn">
+                                            <a href="https://zkillboard.com/corporation/{{ corp.corporation_id }}/" class="btn btn-default" target="_blank">{{ corp.corporation_name }} Killboard</a>
+                                        </p>
+                                    </li>
+                                    <li style="float: right">
+                                        <form class="navbar-form navbar-left" role="search" action={% url 'auth_corputils_search' %}{{ corp.corporation_id }}/ method="POST">
                                             <div class="form-group">
                                             {% csrf_token %}
                                             {{ search_form.as_table }}
@@ -67,11 +72,6 @@
                                             <button class="btn btn-default" type="submit">Search</button>
                                         </form>
                                     </li>
-                                    <li>
-                                        <p class="navbar-btn">
-                                            <a href="https://zkillboard.com/corporation/{{ corp.corporation_id }}/" class="btn btn-default" target="_blank">{{ corp.corporation_name }} Killboard</a>
-                                        </p>
-                                    </li>
                                 </ul> 
                             </div>
                         </nav>
@@ -126,7 +126,7 @@
                             </div>
                             {% else %}
                             <div class="alert alert-danger" role="alert">
-                                    <h3>Seems there's no characters in {{ corp.corporation_name }} tied to a registered API!</h3>
+                                    <h3>Seems there are no characters in {{ corp.corporation_name }} tied to a registered API!</h3>
                             </div>
                             {% endif %}
                         </div>
@@ -162,7 +162,7 @@
                             </div>
                         {% else %}
                             <div class="alert alert-success" role="alert">
-                                <h3>Good job! Every char of {{ corp.corporation_name }} seems to be tied to an API!</h3>
+                                <h3>Good job! Every character in {{ corp.corporation_name }} seem to be tied to an API!</h3>
                             </div>
                         {% endif %}
                         </div>
diff --git a/stock/templates/registered/corputilssearchview.html b/stock/templates/registered/corputilssearchview.html
index 78f2ec96..9796f89e 100644
--- a/stock/templates/registered/corputilssearchview.html
+++ b/stock/templates/registered/corputilssearchview.html
@@ -19,7 +19,7 @@
                 <div class="container-fluid">
                     <ul class="nav navbar-nav">
                         <li>
-                            <form class="navbar-form navbar-left" role="search" action={% url 'auth_corputils_search' %} method="POST">
+                            <form class="navbar-form navbar-left" role="search" action={% url 'auth_corputils_search' %}{{ corp.corporation_id }}/ method="POST">
                                 <div class="form-group">
                                 {% csrf_token %}
                                 {{ search_form.as_table }}

From 461e2c68ee49d255217deaf68dc484291de64ce7 Mon Sep 17 00:00:00 2001
From: Ydmir <joakim.u.strandberg@gmail.com>
Date: Thu, 28 Jan 2016 20:46:15 +0100
Subject: [PATCH 19/23] Now all characters should have its own killboard link.

---
 stock/templates/registered/corputils.html | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/stock/templates/registered/corputils.html b/stock/templates/registered/corputils.html
index 0ed7da5a..bbb67a93 100644
--- a/stock/templates/registered/corputils.html
+++ b/stock/templates/registered/corputils.html
@@ -88,9 +88,9 @@
                                         <tr>
                                             <th class="col-md-1"></th>
                                             <th class="col-md-2">Main character</th>
-                                            <th class="col-md-2">Killboard</th>
                                             <th class="col-md-2">Main corporation</th>
-                                            <th class="col-md-5">Character list</th>
+                                            <th class="col-md-2">Character list</th>
+                                            <th class="col-md-5">Killboard</th>
                                         </tr>
                                         {% for maincharname, player  in characters_with_api %}
                                         <tr >
@@ -100,9 +100,6 @@
                                             <td>
                                                 <p>{{ maincharname }}</p>
                                             </td>
-                                            <td>
-                                                <a href="https://zkillboard.com/character/{{ player.main.character_id }}/" class="label label-danger" target="_blank">Killboard</a>
-                                            </td>
                                             <td>
                                                 {% if not corp.corporation_name ==  player.maincorp%}
                                                 <span class="label label-danger">
@@ -119,6 +116,11 @@
                                                 <p>{{ char.character_name }}</p>
                                                 {% endfor %}
                                             </td>
+                                            <td>
+                                                {% for char in player.altlist %}
+                                                <p><a href="https://zkillboard.com/character/{{ char.character_id }}/" class="label label-danger" target="_blank">Killboard</a></p>
+                                                {% endfor %}
+                                            </td>
                                         </tr>
                                         {% endfor %}
                                     </table>
@@ -138,8 +140,7 @@
                                         <tr>
                                             <th class="col-md-1"></th>
                                             <th class="col-md-2">Character</th>
-                                            <th class="col-md-2">Killboard</th>
-                                            <th class="col-md-3">API</th>
+                                            <th class="col-md-5">Killboard</th>
                                         </tr>
                                         {% for character_name, character_id in characters_without_api %}
                                         <tr>
@@ -152,9 +153,6 @@
                                             <td>
                                                 <a href="https://zkillboard.com/character/{{ character_id }}/" class="label label-danger" target="_blank">Killboard</a>
                                             </td>
-                                            <td>
-                                                <span class="label label-danger">No API registered!</span>
-                                            </td>
                                         </tr>
                                         {% endfor %}
                                     </table>

From 2ce48c47966e65167d92c151f46d90e94d57ccfc Mon Sep 17 00:00:00 2001
From: Joakim Strandberg <joakim.u.strandberg@gmail.com>
Date: Thu, 28 Jan 2016 23:30:08 +0100
Subject: [PATCH 20/23] Fixed indentation.

---
 alliance_auth/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/alliance_auth/urls.py b/alliance_auth/urls.py
index 2b865aaa..40068575 100755
--- a/alliance_auth/urls.py
+++ b/alliance_auth/urls.py
@@ -175,7 +175,7 @@ urlpatterns = patterns('',
 			           # Sig Tracker
                        url(r'^sigtracker/$', 'sigtracker.views.sigtracker_view', name='auth_signature_view'),
                        url(r'^add_signature/$', 'sigtracker.views.add_signature_view', name='auth_add_signature_view'),
-                	   url(r'^remove_signature/(\w+)', 'sigtracker.views.remove_signature', name='auth_remove_signature'),
+		       url(r'^remove_signature/(\w+)', 'sigtracker.views.remove_signature', name='auth_remove_signature'),
 
                        # Fleet Operations Timers
                        url(r'^optimer/$', 'optimer.views.optimer_view', name='auth_optimer_view'),

From 1e86df3992e52cc5f5a72e0da0fe7eec2a92e7c3 Mon Sep 17 00:00:00 2001
From: Ydmir <joakim.u.strandberg@gmail.com>
Date: Fri, 29 Jan 2016 09:12:26 +0100
Subject: [PATCH 21/23] Fixed indentation for real...

---
 alliance_auth/settings.py.example | 12 ++++++++++++
 alliance_auth/urls.py             |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example
index a376f1dc..3a66bb3b 100755
--- a/alliance_auth/settings.py.example
+++ b/alliance_auth/settings.py.example
@@ -441,6 +441,18 @@ LOGGING = {
             'handlers': ['log_file', 'console'],
             'level': 'DEBUG',
         },
+        'sigtracker': {
+            'handlers': ['log_file', 'console'],
+            'level': 'DEBUG',
+        },
+        'optimer': {
+            'handlers': ['log_file', 'console'],
+            'level': 'DEBUG',
+        },
+        'corputil': {
+            'handlers': ['log_file', 'console'],
+            'level': 'DEBUG',
+        },
         'util': {
             'handlers': ['log_file', 'console'],
             'level': 'DEBUG',
diff --git a/alliance_auth/urls.py b/alliance_auth/urls.py
index 40068575..96c56fe7 100755
--- a/alliance_auth/urls.py
+++ b/alliance_auth/urls.py
@@ -172,10 +172,10 @@ urlpatterns = patterns('',
                        # FLEET FITTINGS
                        url(r'^fits/$', 'services.views.fleet_fits', name='auth_fleet_fits'),
 
-			           # Sig Tracker
+                       # Sig Tracker
                        url(r'^sigtracker/$', 'sigtracker.views.sigtracker_view', name='auth_signature_view'),
                        url(r'^add_signature/$', 'sigtracker.views.add_signature_view', name='auth_add_signature_view'),
-		       url(r'^remove_signature/(\w+)', 'sigtracker.views.remove_signature', name='auth_remove_signature'),
+                       url(r'^remove_signature/(\w+)', 'sigtracker.views.remove_signature', name='auth_remove_signature'),
 
                        # Fleet Operations Timers
                        url(r'^optimer/$', 'optimer.views.optimer_view', name='auth_optimer_view'),

From 185805ecc1a1a12e4c8b8d9d81a44347f004b59d Mon Sep 17 00:00:00 2001
From: Ydmir <joakim.u.strandberg@gmail.com>
Date: Sat, 30 Jan 2016 11:05:09 +0100
Subject: [PATCH 22/23] Added simple caching.

---
 requirements.txt                    | 1 +
 services/managers/evewho_manager.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index ce742155..ec35fc39 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,7 @@ evelink
 dnspython
 passlib
 requests>=2.9.1
+requests_cache
 json
 
 # Django Stuff #
diff --git a/services/managers/evewho_manager.py b/services/managers/evewho_manager.py
index 35e0093c..595efb46 100644
--- a/services/managers/evewho_manager.py
+++ b/services/managers/evewho_manager.py
@@ -1,10 +1,11 @@
-
 from django.conf import settings
 
 import logging
 import requests
+import requests_cache
 import json
 
+requests_cache.install_cache("evewhocache", backend="sqlite", expire_after=3600)
 
 class EveWhoManager():
     def __init__(self):

From 9041f0e7c7f8958f34622b4d010a2e09b40acf77 Mon Sep 17 00:00:00 2001
From: Ydmir <joakim.u.strandberg@gmail.com>
Date: Sun, 31 Jan 2016 11:29:54 +0100
Subject: [PATCH 23/23] Handling missing settings.CORP_ID in alliance mode, and
 api-scope error in corporation mode. Also fixing visual on the
 corputilsearchview.

---
 alliance_auth/settings.py.example             |  2 +-
 alliance_auth/urls.py                         |  4 +--
 corputils/views.py                            | 33 ++++++++++++++-----
 stock/static/css/bootstrap.min.css            |  4 +++
 stock/templates/registered/corputils.html     |  2 +-
 .../registered/corputilssearchview.html       | 15 +++++----
 6 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example
index 3a66bb3b..2664add0 100755
--- a/alliance_auth/settings.py.example
+++ b/alliance_auth/settings.py.example
@@ -449,7 +449,7 @@ LOGGING = {
             'handlers': ['log_file', 'console'],
             'level': 'DEBUG',
         },
-        'corputil': {
+        'corputils': {
             'handlers': ['log_file', 'console'],
             'level': 'DEBUG',
         },
diff --git a/alliance_auth/urls.py b/alliance_auth/urls.py
index 96c56fe7..12120190 100755
--- a/alliance_auth/urls.py
+++ b/alliance_auth/urls.py
@@ -165,9 +165,9 @@ urlpatterns = patterns('',
 
                        #corputils
                        url(r'^corputils/$', 'corputils.views.corp_member_view', name='auth_corp_member_view'),
-                       url(r'^corputils/(?P<corpid>[0-9]+)/$', 'corputils.views.corp_member_view', name='auth_corp_member_view'),
+                       url(r'^corputils/(?P<corpid>[0-9]+)/$', 'corputils.views.corp_member_view'),
                        url(r'^corputils/search/$', 'corputils.views.corputils_search', name="auth_corputils_search"),
-                       url(r'^corputils/search/(?P<corpid>[0-9]+)/$', 'corputils.views.corputils_search', name="auth_corputils_search"),
+                       url(r'^corputils/search/(?P<corpid>[0-9]+)/$', 'corputils.views.corputils_search'),
 
                        # FLEET FITTINGS
                        url(r'^fits/$', 'services.views.fleet_fits', name='auth_fleet_fits'),
diff --git a/corputils/views.py b/corputils/views.py
index 96cc965a..8498541c 100644
--- a/corputils/views.py
+++ b/corputils/views.py
@@ -15,6 +15,7 @@ from eveonline.models import EveAllianceInfo
 from eveonline.models import EveCharacter
 from authentication.models import AuthServicesInfo
 from forms import CorputilsSearchForm
+from evelink.api import APIError
 
 import logging
 
@@ -24,14 +25,31 @@ logger = logging.getLogger(__name__)
 # Because corp-api only exist for the executor corp, this function will only be available in corporation mode.
 @login_required
 @permission_required('auth.corputils')
-def corp_member_view(request, corpid = settings.CORP_ID):
+def corp_member_view(request, corpid = None):
     logger.debug("corp_member_view called by user %s" % request.user)
 
+    if not settings.IS_CORP:
+        alliance = EveAllianceInfo.objects.get(alliance_id=settings.ALLIANCE_ID)
+        alliancecorps = EveCorporationInfo.objects.filter(alliance=alliance)
+        membercorp_list = [(int(membercorp.corporation_id), str(membercorp.corporation_name)) for membercorp in alliancecorps]
+        membercorp_list.sort(key=lambda tup: tup[1])
+
+    if not corpid:
+        if(settings.CORP_ID):
+            corpid = settings.CORP_ID
+        else:
+            corpid = membercorp_list[0][0]
+
+
     corp = EveCorporationInfo.objects.get(corporation_id=corpid)
     Player = namedtuple("Player", ["main", "maincorp", "maincorpid", "altlist"])
 
     if settings.IS_CORP:
-        member_list = EveApiManager.get_corp_membertracking(settings.CORP_API_ID, settings.CORP_API_VCODE)
+        try:
+            member_list = EveApiManager.get_corp_membertracking(settings.CORP_API_ID, settings.CORP_API_VCODE)
+        except APIError:
+            logger.debug("Corp API does not have membertracking scope, using EveWho data instead.")
+            member_list = EveWhoManager.get_corporation_members(corpid)
     else:
         member_list = EveWhoManager.get_corporation_members(corpid)
 
@@ -64,11 +82,6 @@ def corp_member_view(request, corpid = settings.CORP_ID):
 
 
     if not settings.IS_CORP:
-        alliance = EveAllianceInfo.objects.get(alliance_id=settings.ALLIANCE_ID)
-        alliancecorps = EveCorporationInfo.objects.filter(alliance=alliance)
-        membercorp_list = [(int(membercorp.corporation_id), str(membercorp.corporation_name)) for membercorp in alliancecorps]
-        membercorp_list.sort(key=lambda tup: tup[1])
-
         context = {"membercorp_list": membercorp_list,
                    "corp": corp,
                    "characters_with_api": sorted(characters_with_api.items()),
@@ -102,7 +115,11 @@ def corputils_search(request, corpid=settings.CORP_ID):
             logger.debug("Searching for player with character name %s for user %s" % (searchstring, request.user))
 
             if settings.IS_CORP:
-                member_list = EveApiManager.get_corp_membertracking(settings.CORP_API_ID, settings.CORP_API_VCODE)
+                try:
+                    member_list = EveApiManager.get_corp_membertracking(settings.CORP_API_ID, settings.CORP_API_VCODE)
+                except APIError:
+                    logger.debug("Corp API does not have membertracking scope, using EveWho data instead.")
+                    member_list = EveWhoManager.get_corporation_members(corpid)
             else:
                 member_list = EveWhoManager.get_corporation_members(corpid)
 
diff --git a/stock/static/css/bootstrap.min.css b/stock/static/css/bootstrap.min.css
index 6822b5b8..ce8cda62 100644
--- a/stock/static/css/bootstrap.min.css
+++ b/stock/static/css/bootstrap.min.css
@@ -4240,6 +4240,10 @@ textarea.input-group-sm > .form-control, textarea.input-group-sm > .input-group-
     line-height: 20px
 }
 
+.navbar-wide {
+    width: 100%;
+}
+
 @media (max-width: 767px) {
     .navbar-nav .open .dropdown-menu {
         position: static;
diff --git a/stock/templates/registered/corputils.html b/stock/templates/registered/corputils.html
index bbb67a93..7529f890 100644
--- a/stock/templates/registered/corputils.html
+++ b/stock/templates/registered/corputils.html
@@ -45,7 +45,7 @@
                     </div>
                         <nav class="navbar navbar-default">
                             <div class="container-fluid">
-                                <ul class="nav navbar-nav" style="width: 100%">
+                                <ul class="nav navbar-nav navbar-wide">
                                     {% if membercorp_list %}
                                     <li class="dropdown">
                                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Choose corporation <span class="caret"></span></a>
diff --git a/stock/templates/registered/corputilssearchview.html b/stock/templates/registered/corputilssearchview.html
index 9796f89e..a68f513a 100644
--- a/stock/templates/registered/corputilssearchview.html
+++ b/stock/templates/registered/corputilssearchview.html
@@ -8,18 +8,19 @@
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
-    <div class="col-lg-8">
+    <div class="col-lg-12">
         {% if perms.auth.corputils %}
+            <h1 class="page-header text-center">Member Search Results
+            </h1>
+            <h2 class="text-center"><a href="{% url 'auth_corp_member_view' %}{{ corp.corporation_id }}">{{ corp.corporation_name }}</a></h2>
+            <div class="container-fluid">
          
         <div class="panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title">Search Results</h3>
-            </div>
             <nav class="navbar navbar-default">
                 <div class="container-fluid">
-                    <ul class="nav navbar-nav">
-                        <li>
-                            <form class="navbar-form navbar-left" role="search" action={% url 'auth_corputils_search' %}{{ corp.corporation_id }}/ method="POST">
+                    <ul class="nav navbar-nav navbar-wide">
+                        <li style="float: right">
+                            <form class="navbar-form navbar-right" role="search" action={% url 'auth_corputils_search' %}{{ corp.corporation_id }}/ method="POST">
                                 <div class="form-group">
                                 {% csrf_token %}
                                 {{ search_form.as_table }}