Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-13 06:20:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Modified appearance somewhat and fixed search.

Browse Source
This commit is contained in:
Ydmir 2016-01-27 22:35:35 +01:00
parent 36b7bf7167
commit 24a4412038
4 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
corputils/views.py
View File

@ -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))

18
stock/static/css/bootstrap.min.css vendored
View File

@ -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;
}

22
stock/templates/registered/corputils.html
View File

@ -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>

2
stock/templates/registered/corputilssearchview.html
View File

@ -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 }}