From 24a441203889e78e4f27f7a1da1f70409c41deac Mon Sep 17 00:00:00 2001 From: Ydmir Date: Wed, 27 Jan 2016 22:35:35 +0100 Subject: [PATCH] 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 @@ @@ -126,7 +126,7 @@ {% else %} {% endif %} @@ -162,7 +162,7 @@ {% else %} {% endif %} 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 @@