[open-ils-commits] r174 - in servres/trunk/conifer: . syrup templates (artunit)

[svn at svn.open-ils.org]

Author: artunit
Date: 2009-03-14 00:43:13 -0400 (Sat, 14 Mar 2009)
New Revision: 174

Modified:
   servres/trunk/conifer/genshi_namespace.py
   servres/trunk/conifer/syrup/urls.py
   servres/trunk/conifer/templates/browse_courses.xhtml
Log:


Modified: servres/trunk/conifer/genshi_namespace.py
===================================================================
--- servres/trunk/conifer/genshi_namespace.py	2009-03-13 20:28:32 UTC (rev 173)
+++ servres/trunk/conifer/genshi_namespace.py	2009-03-14 04:43:13 UTC (rev 174)
@@ -11,7 +11,11 @@
 def instructor_url(instructor, suffix=''):
     return '/syrup/instructor/%d/%s' % (instructor.id, suffix)
 
+# added to make department browse
+def department_url(department, suffix=''):
+    return '/syrup/department/%d/%s' % (department.id, suffix)
 
+
 def call_or_value(obj, dflt=None):
     # This is used by the generics templates.
     if callable(obj):

Modified: servres/trunk/conifer/syrup/urls.py
===================================================================
--- servres/trunk/conifer/syrup/urls.py	2009-03-13 20:28:32 UTC (rev 173)
+++ servres/trunk/conifer/syrup/urls.py	2009-03-14 04:43:13 UTC (rev 174)
@@ -19,6 +19,7 @@
     (r'^opencourse/$', 'open_courses'),
     (r'^search/$', 'search'),
     (r'^instructors/$', 'instructors'),
+    (r'^departments/$', 'departments'),
     (r'^course/(?P<course_id>\d+)/$', 'course_detail'),
     (r'^instructor/(?P<instructor_id>.*)/$', 'instructor_detail'),
     (r'^department/(?P<department_id>.*)/$', 'department_detail'),

Modified: servres/trunk/conifer/templates/browse_courses.xhtml
===================================================================
--- servres/trunk/conifer/templates/browse_courses.xhtml	2009-03-13 20:28:32 UTC (rev 173)
+++ servres/trunk/conifer/templates/browse_courses.xhtml	2009-03-14 04:43:13 UTC (rev 174)
@@ -15,10 +15,10 @@
     <h2>Choose from one of the options below:</h2>
     <ul>
         <li><a href="courses">Browse by Course Name</a></li>
-        <li><a style="text-decoration: line-through;"
-	       href="instructors">Browse by Instructor</a> (not working yet)</li>
-        <li><a  style="text-decoration: line-through;"
-		href="#departments">Browse by Department</a> (not working yet)</li>
+        <li><a 
+	       href="instructors">Browse by Instructor</a></li>
+        <li><a  
+		href="departments">Browse by Department</a></li>
     </ul>
   <div class="gap"/>
 </body>