From: artunit Date: Tue, 23 Dec 2008 03:11:17 +0000 (+0000) Subject: git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@86 6d9bc8c9-1ec2-4278... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0a7ae50cf3f97b7ab276ab13df350d3fd7decc21;p=syrup%2Fmasslnc.git git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@86 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- diff --git a/conifer/static/main.css b/conifer/static/main.css index 78a7907..f82e52c 100644 --- a/conifer/static/main.css +++ b/conifer/static/main.css @@ -88,3 +88,14 @@ a:hover { text-decoration: underline; } text-align: left; margin-right: 5px; } + +.topbox { + border: 1px solid #ccc; + width: 50%; + line-height: 1em; + text-align: left; +} + +.topheading th { + background-color: #ddf; +} diff --git a/conifer/syrup/views.py b/conifer/syrup/views.py index 8617788..2d01cd8 100644 --- a/conifer/syrup/views.py +++ b/conifer/syrup/views.py @@ -174,7 +174,9 @@ def search(request): #item search - this will be expanded item_query = get_query(query_string, ['title', 'author']) #need to think about sort order here, probably better by author (will make sortable at display level) - paginator = Paginator( models.Item.objects.filter(item_query).order_by('-date_created'), + results_list = models.Item.objects.filter(item_query).order_by('-date_created') + results_len = len(results_list) + paginator = Paginator( results_list, count) #course search @@ -189,7 +191,9 @@ def search(request): instructor_list = models.Member.objects.filter(instr_query).filter(role='INSTR').order_by('user__last_name')[0:5] instr_len = len(models.Member.objects.filter(instr_query).filter(role='INSTR')) else: - paginator = Paginator( models.Item.objects.order_by('-date_created'), + results_list = models.Item.objects.order_by('-date_created') + results_len = len(results_list) + paginator = Paginator( results_list, count) course_list = models.Course.objects.filter(active=True).order_by('title')[0:5] course_len = len(models.Course.objects.filter(active=True)) @@ -211,6 +215,7 @@ def search(request): course_list=course_list, instructor_list=instructor_list, norm_query=norm_query, + results_len=results_len, course_len=course_len, instr_len=instr_len) diff --git a/conifer/templates/search_results.xhtml b/conifer/templates/search_results.xhtml index a167513..99a4a77 100644 --- a/conifer/templates/search_results.xhtml +++ b/conifer/templates/search_results.xhtml @@ -16,21 +16,21 @@ courses = course_list -

${title}

- You searched: ${query_string} -

+ You searched: ${query_string} +

- - - - + + +

+ - +

- + +

+ @@ -42,7 +42,7 @@ courses = course_list - - -

Last Name

First Name

@@ -53,10 +53,10 @@ courses = course_list

Course

Author

Title