diff --git a/corputils/forms.py b/corputils/forms.py index ebca58ad..aebdc2ba 100644 --- a/corputils/forms.py +++ b/corputils/forms.py @@ -5,4 +5,4 @@ from eveonline.models import EveCorporationInfo from eveonline.models import EveAllianceInfo 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...'})) 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 d368d7be..6822b5b8 100644 --- a/stock/static/css/bootstrap.min.css +++ b/stock/static/css/bootstrap.min.css @@ -3402,7 +3402,7 @@ tbody.collapse.in { } .dropdown-menu.scrollable { - overflow: auto; + overflow: scroll; max-height: 450px; } @@ -6668,4 +6668,4 @@ button.close { .hidden-print { display: none !important } -} \ No newline at end of file +} 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 +} diff --git a/stock/templates/registered/corputils.html b/stock/templates/registered/corputils.html index b8678029..0ed7da5a 100644 --- a/stock/templates/registered/corputils.html +++ b/stock/templates/registered/corputils.html @@ -12,118 +12,172 @@ {% if perms.auth.corputils %}
{% if corp %} -
Corporation
-
-
-
+
+
+ +
+
+

{{ corp.corporation_name }}

-
-

Name: {{ corp.corporation_name }}

+

Ticker: {{ corp.corporation_ticker }}

-

Ticker: {{ corp.corporation_ticker }}

+

Member count: {{ corp.member_count }}

-

Member count: {{ corp.member_count }}

+

Player count: {{characters_with_api|length}}

-

Player count: {{characters_with_api|length}}

- -

Unregistered characters: {{characters_without_api|length}}

-
-
- - {% if membercorp_list %} - - {% endif %} - - +

Unregistered characters: {{characters_without_api|length}}

+
+
+ API Index: +
+
+ {{characters_with_api|length}}/{{ corp.member_count }} +
+
+
- - -
-
-
Registered Characters
+ + +
+
+ {% if characters_with_api %}
-
- +
+
- - - - + + + + + {% for maincharname, player in characters_with_api %} - - - - - - - {% endfor %} - {% for character_name, character_id in characters_without_api %} - - - - - - + + + + + + + {% endfor %}
Main characterMain corporationCharacter listMain characterKillboardMain corporationCharacter list
- - -

{{ maincharname }}

- 		-

{{ player.maincorp }}

- 		- {% for char in player.altlist %} -

{{ char.character_name }}

- {% endfor %} -
- - -

{{ character_name }}

- 		-

- 		-

No API registered!

-
+ + +

{{ maincharname }}

+ 		+ Killboard + + {% if not corp.corporation_name == player.maincorp%} + + {{ player.maincorp }} + + {% else %} + + {{ player.maincorp }} + + {% endif %} + + {% for char in player.altlist %} +

{{ char.character_name }}

+ {% endfor %} +
+ {% else %} + + {% endif %} +
+
+ {% if characters_without_api %} +
+
+ + + + + + + + {% for character_name, character_id in characters_without_api %} + + + + + + + {% endfor %} +
CharacterKillboardAPI
+ + +

{{ character_name }}

+ 		+ Killboard + + No API registered! +
+
+
+ {% else %} + + {% endif %}
- {% else %} -
-
-
- -
+ {% else %} +
+
+
+
- {% endif %}
+ {% endif %} +
{% else %} {% if IS_CORP %} @@ -132,31 +186,4 @@ {% endif %} {% endif %}
- - {% if perms.auth.corputils %} - - - {% endif %} -{% endblock content %} \ No newline at end of file +{% endblock content %} diff --git a/stock/templates/registered/corputilssearchview.html b/stock/templates/registered/corputilssearchview.html index 42d882e8..9796f89e 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 %} -
+
{% if perms.auth.corputils %} -

Member Search Results -
- - -
-

-
- - - - - - {% for member in members %} - - - - - {% endfor %} -
CharacterMain Character
{{ member.name }} - {% if member.api_registered%} - {{ member.main }} - {% else %} - No API registered! - {% endif %} -
+ +
+
+

Search Results

- {% endif %} -
- - {% if perms.auth.corputils %} - - {% endblock content %}