From: artunit <artunit@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Date: Tue, 16 Dec 2008 21:47:17 +0000 (+0000)
Subject: git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@85 6d9bc8c9-1ec2-4278... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1b617fcc386d5c6449a61a31afc4f54bb6d88a12;p=Syrup.git

git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@85 6d9bc8c9-1ec2-4278-b937-99fde70a366f
---

diff --git a/conifer/static/main.css b/conifer/static/main.css
index 6d4366a..78a7907 100644
--- a/conifer/static/main.css
+++ b/conifer/static/main.css
@@ -77,3 +77,14 @@ a:hover {  text-decoration: underline;  }
 .metalinks { padding-left: 12; color: gray; }
 .metalinks a { color: navy; }
 .metalinks { position: absolute; left: 300; }
+
+.instructors {
+  border: 1px solid #ccc;
+  float: left;
+  width: 50%;
+  padding: 2px 2px 2px 2px;
+  font-size: 1em;
+  line-height: 1em;
+  text-align: left;
+  margin-right: 5px;
+}
diff --git a/conifer/templates/search_results.xhtml b/conifer/templates/search_results.xhtml
index 5713af5..a167513 100644
--- a/conifer/templates/search_results.xhtml
+++ b/conifer/templates/search_results.xhtml
@@ -1,6 +1,7 @@
 <?python
 title = 'Search Results'
 instructors = instructor_list
+courses = course_list
 ?>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -21,18 +22,39 @@ instructors = instructor_list
     You searched: <i>${query_string}</i>
 </h3>
 
-    <p style="font-size: large;">
-        No. of instructors: <i> ${instr_len}</i>
-    </p>
-    <p py:for="foo in instructors" style="font-size: large;">
-        <!--
-        there are a couple of options here
-        ${foo.instr_name()}<br/>
-        ${foo.user.last_name}<br/>
-        -->
-    
-        ${Markup(foo.instr_name_hl(norm_query))}<br/>
-    </p>
+<!-- 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>
+        <tr>
+        <th>Last Name</th><th>First Name</th>
+        </tr>
+        <tr py:for="instructor in instructors">
+            <td>${Markup(instructor.instr_name_hl(norm_query))}</td>
+            <td>foo</td>
+        </tr>
+        </table>
+        </td>
+
+        <!-- courses -->
+        <td py:if="courses" valign="top">
+        <table>
+        <tr>
+        <th>Course</th>
+        </tr>
+        <tr py:for="course in courses">
+            <!-- will highlight this, probably pull in dept info -->
+            <td>${course.title}</td>
+        </tr>
+        </table>
+        </td>
+    </tr>
+</table>
   
     <tr py:def="pageheader()">
         <th>Author</th><th>Title</th>
