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

diff --git a/conifer/syrup/urls.py b/conifer/syrup/urls.py
index 60ad310..912a58d 100644 (file)
--- a/conifer/syrup/urls.py
+++ b/conifer/syrup/urls.py
@@ -5,5 +5,6 @@ urlpatterns = patterns('conifer.syrup.views',
     (r'^course/$', 'my_courses'),
     (r'^opencourse/$', 'open_courses'),
     (r'^join/$', 'join_course'),
+    (r'^instructors/$', 'instructors'),
     (r'^course/(?P<course_id>\d+)/$', 'course_detail'),
 )

diff --git a/conifer/syrup/views.py b/conifer/syrup/views.py
index 733cf93..a7fde8d 100644 (file)
--- a/conifer/syrup/views.py
+++ b/conifer/syrup/views.py
@@ -41,8 +41,25 @@ def open_courses(request):
                     page_num=page_num,
                     count=count)
 
+#
+#
+def instructors(request):
+    page_num = int(request.GET.get('page', 1))
+    count = int(request.GET.get('count', 5))
+    action = request.GET.get('action', 'browse')
+    if action == 'join':
+        paginator = Paginator(models.Course.objects.filter(moderated=False), count)
+    elif action == 'drop':
+        paginator = Paginator(models.Course.objects.filter(moderated=False), count)
+    else:
+        paginator = Paginator(models.Course.objects.filter(moderated=False), count)
+        
+    return g.render('instructors.xhtml', paginator=paginator,
+                    page_num=page_num,
+                    count=count)
+
 def join_course(request):
-    return g.render('welcome.xhtml')
+    return g.render('join_course.xhtml')
 
 @login_required
 def my_courses(request):

diff --git a/conifer/templates/tabbar.xhtml b/conifer/templates/tabbar.xhtml
index 9e178a5..281efc2 100644 (file)
--- a/conifer/templates/tabbar.xhtml
+++ b/conifer/templates/tabbar.xhtml
@@ -2,10 +2,15 @@
       xmlns:py="http://genshi.edgewall.org/"
       xmlns:xi="http://www.w3.org/2001/XInclude"
       py:strip="">
+<!--
+    eventually these should be customized based on user level
+    use one for now
+-->
 <ul id="tabbar">
   <li><a href="/syrup/">Home</a></li>
   <li class="active"><a href="/syrup/course/">My Courses</a></li>
   <li><a href="/syrup">Add a Reserve</a></li>
+  <li><a href="/syrup/join/">Join Course</a></li>
   <li><a href="/syrup">Manage Users</a></li>
   <li><a href="/syrup">Preferences</a></li>
 </ul>