diff --git a/corputils/templates/corputils/base.html b/corputils/templates/corputils/base.html index bbc5ef1a..1140e4f3 100644 --- a/corputils/templates/corputils/base.html +++ b/corputils/templates/corputils/base.html @@ -10,8 +10,8 @@
@@ -35,5 +35,4 @@ {% block member_data %}{% endblock %} -{% endblock %} - +{% endblock %} \ No newline at end of file diff --git a/corputils/templates/corputils/corpstats.html b/corputils/templates/corputils/corpstats.html index c982cd1c..6a50734c 100644 --- a/corputils/templates/corputils/corpstats.html +++ b/corputils/templates/corputils/corpstats.html @@ -1,7 +1,6 @@ {% extends 'corputils/base.html' %} {% load i18n %} {% load humanize %} -{% load bootstrap_pagination %} {% block member_data %} {% if corpstats %}
@@ -58,104 +57,117 @@
{% if mains %} -
{% bootstrap_paginate mains range=10 %}
- - {% for main in mains %} +
+ - - + + - {% endfor %} + + + {% for main in mains %} + + + + + {% endfor %} +
-
- -
- {{ main }} -
-
- 		- - {% for alt in main.alts %} - {% if forloop.first %} - - - - - - - {% endif %} - - - - - - - {% endfor %} -
{% trans "Character" %}{% trans "Corporation" %}{% trans "Alliance" %}
{{ alt.character_name }}{{ alt.corporation_name }}{{ alt.alliance_name }} - - {% trans "Killboard" %} - -
-
+
+ +
+ {{ main }} +
+
+ 		+ + {% for alt in main.alts %} + {% if forloop.first %} + + + + + + + {% endif %} + + + + + + + {% endfor %} +
{% trans "Character" %}{% trans "Corporation" %}{% trans "Alliance" %}
{{ alt.character_name }}{{ alt.corporation_name }}{{ alt.alliance_name }} + + {% trans "Killboard" %} + +
+
{% endif %}
{% if members %} -
{% bootstrap_paginate members range=10 %}
- - - - - - - - - - {% for member in members %} - - - - - - - +
{% trans "Character" %}{% trans "Main Character" %}{% trans "Main Corporation" %}{% trans "Main Alliance" %}
{{ member.character_name }}{% trans "Killboard" %}{{ member.main_character.character_name }}{{ member.main_character.corporation_name }}{{ member.main_character.alliance_name }}
+ + + + + + + + - {% endfor %} + + + {% for member in members %} + + + + + + + + + {% endfor %} +
{% trans "Character" %}{% trans "Main Character" %}{% trans "Main Corporation" %}{% trans "Main Alliance" %}
{{ member.character_name }}{% trans "Killboard" %}{{ member.main_character.character_name }}{{ member.main_character.corporation_name }}{{ member.main_character.alliance_name }}
{% endif %}
{% if unregistered %} -
{% bootstrap_paginate unregistered range=10 %}
- - - - - - - {% for member in unregistered %} - - - - +
{% trans "Character" %}
{{ member.character_name }} - - {% trans "Killboard" %} - -
+ + + + + - {% endfor %} + + + {% for member in unregistered %} + + + + + + {% endfor %} +
{% trans "Character" %}
{{ member.character_name }} + + {% trans "Killboard" %} + +
{% endif %} @@ -167,3 +179,17 @@
{% endif %} {% endblock %} +{% block extra_javascript %} + + +{% endblock %} +{% block extra_css %} + +{% endblock %} diff --git a/corputils/templates/corputils/search.html b/corputils/templates/corputils/search.html index dfe65418..e812705b 100644 --- a/corputils/templates/corputils/search.html +++ b/corputils/templates/corputils/search.html @@ -1,38 +1,50 @@ {% extends "corputils/base.html" %} {% load i18n %} {% load bootstrap_pagination %} -{% load eveonline_extras %} {% block member_data %}
{% trans "Search Results" %}
-
- {% bootstrap_paginate results range=10 %} -
- - - - - - - - - - - {% for result in results %} - - - - - - - - +
{% trans "Character" %}{% trans "Corporation" %}{% trans "zKillboard" %}{% trans "Main Character" %}{% trans "Main Corporation" %}{% trans "Main Alliance" %}
{{ result.1.character_name }}{{ result.0.corp.corporation_name }}{% trans "Killboard" %}{{ result.1.main_character.character_name }}{{ result.1.main_character.corporation_name }}{{ result.1.main_character.alliance_name }}
+ + + + + + + + + - {% endfor %} + + + {% for result in results %} + + + + + + + + + + {% endfor %} +
{% endblock %} +{% block extra_javascript %} + + +{% endblock %} +{% block extra_css %} + +{% endblock %} \ No newline at end of file diff --git a/corputils/views.py b/corputils/views.py index 3a222956..62d1b54c 100644 --- a/corputils/views.py +++ b/corputils/views.py @@ -4,28 +4,13 @@ from django.shortcuts import render, redirect, get_object_or_404 from django.contrib import messages from django.core.exceptions import PermissionDenied from django.db import IntegrityError -from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.utils.translation import ugettext_lazy as _ -from django.conf import settings from eveonline.models import EveCharacter, EveCorporationInfo from eveonline.managers import EveManager from corputils.models import CorpStats from esi.decorators import token_required from bravado.exception import HTTPError -MEMBERS_PER_PAGE = int(getattr(settings, 'CORPSTATS_MEMBERS_PER_PAGE', 20)) - - -def get_page(model_list, page_num): - p = Paginator(model_list, MEMBERS_PER_PAGE) - try: - members = p.page(page_num) - except PageNotAnInteger: - members = p.page(1) - except EmptyPage: - members = p.page(p.num_pages) - return members - def access_corpstats_test(user): return user.has_perm('corputils.view_corp_corpstats') or user.has_perm( @@ -94,17 +79,10 @@ def corpstats_view(request, corp_id=None): 'available': available, } - # paginate - members = [] - mains = [] - unregistered = [] - if corpstats: - page = request.GET.get('page', 1) - members = get_page(corpstats.members.all(), page) - mains = get_page(corpstats.mains.all(), page) - unregistered = get_page(corpstats.unregistered_members.all(), page) - if corpstats: + members = corpstats.members.all() + mains = corpstats.mains.all() + unregistered = corpstats.unregistered_members.all() context.update({ 'corpstats': corpstats, 'members': members, @@ -142,12 +120,10 @@ def corpstats_search(request): similar = corpstats.members.filter(character_name__icontains=search_string) for s in similar: results.append((corpstats, s)) - page = request.GET.get('page', 1) results = sorted(results, key=lambda x: x[1].character_name) - results_page = get_page(results, page) context = { 'available': CorpStats.objects.visible_to(request.user), - 'results': results_page, + 'results': results, 'search_string': search_string, } return render(request, 'corputils/search.html', context=context)