projects / syrup / masslnc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1b617fc)
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@86 6d9bc8c9-1ec2-4278...
authorartunit <artunit@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Tue, 23 Dec 2008 03:11:17 +0000 (03:11 +0000)
committerartunit <artunit@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Tue, 23 Dec 2008 03:11:17 +0000 (03:11 +0000)
conifer/static/main.css patch | blob | history
conifer/syrup/views.py patch | blob | history
conifer/templates/search_results.xhtml patch | blob | history

diff --git a/conifer/static/main.css b/conifer/static/main.css
index 78a7907..f82e52c 100644 (file)
--- 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 (file)
--- 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 (file)
--- a/conifer/templates/search_results.xhtml
+++ b/conifer/templates/search_results.xhtml
@@ -16,21 +16,21 @@ courses = course_list
   </script>
 </head>
 <body>
-<h1>${title}</h1>
+    <h1>${title}</h1>
     
-<h3 py:if="query_string">
-    You searched: <i>${query_string}</i>
-</h3>
+    <h3 py:if="query_string">
+        You searched: <i>${query_string}</i>
+    </h3>
 
-<!-- not sure if this is the best way to do this -->
-<!-- 
-    probably need a simple css option to hide instructors and course info
--->
-<table py:if="instructors or courses">
-    <tr>
+    <!-- not sure if this is the best way to do this -->
+    <!-- 
+        probably need a simple css option to hide instructors and course info
+    -->
+    <table py:if="instructors or courses">
+        <tr>
         <!-- instructors -->
-        <td py:if="instructors" valign="top">
-        <table>
+        <td py:if="instructors" valign="top" class="topbox">
+        <table class="topheading">
         <tr>
         <th>Last Name</th><th>First Name</th>
         </tr>
@@ -42,7 +42,7 @@ courses = course_list
         </td>
 
         <!-- courses -->
-        <td py:if="courses" valign="top">
+        <td py:if="courses" valign="top" class="topbox">
         <table>
         <tr>
         <th>Course</th>
@@ -53,10 +53,10 @@ courses = course_list
         </tr>
         </table>
         </td>
-    </tr>
-</table>
+        </tr>
+    </table>
   
-    <tr py:def="pageheader()">
+    <tr py:if="results_len > 0" py:def="pageheader()">
         <th>Author</th><th>Title</th>
     </tr>
   
Syrup working repo (MassLNC)