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

diff --git a/conifer/genshi_namespace.py b/conifer/genshi_namespace.py
index bb003e5..46cc013 100644 (file)
--- a/conifer/genshi_namespace.py
+++ b/conifer/genshi_namespace.py
@@ -11,6 +11,10 @@ import django.forms
 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.

diff --git a/conifer/syrup/urls.py b/conifer/syrup/urls.py
index 720f02e..8b659d4 100644 (file)
--- a/conifer/syrup/urls.py
+++ b/conifer/syrup/urls.py
@@ -19,6 +19,7 @@ urlpatterns = patterns('conifer.syrup.views',
     (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'),

diff --git a/conifer/templates/browse_courses.xhtml b/conifer/templates/browse_courses.xhtml
index cca8b5d..95d40c4 100644 (file)
--- a/conifer/templates/browse_courses.xhtml
+++ b/conifer/templates/browse_courses.xhtml
@@ -15,10 +15,10 @@ title = _('Browse the Reserves')
     <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>