From: artunit Date: Mon, 5 Jan 2009 01:47:18 +0000 (+0000) Subject: git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@92 6d9bc8c9-1ec2-4278... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e6de4faa960a508e5a6f09e109092383852cb40e;p=syrup%2Fmasslnc.git git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@92 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- diff --git a/conifer/syrup/urls.py b/conifer/syrup/urls.py index 45c6e40..0d4dbbe 100644 --- a/conifer/syrup/urls.py +++ b/conifer/syrup/urls.py @@ -9,8 +9,10 @@ ITEM_PREFIX = r'^course/(?P\d+)/item/(?P\d+)/' urlpatterns = patterns('conifer.syrup.views', (r'^$', 'welcome'), (r'^course/$', 'my_courses'), - (r'^opencourse/$', 'open_courses'), + (r'^browse/$', 'browse_courses'), + (r'^browse/(?P.*)/$', 'browse_courses'), (r'^join/$', 'join_course'), + (r'^opencourse/$', 'open_courses'), (r'^search/$', 'search'), (r'^instructors/$', 'instructors'), (r'^course/(?P\d+)/$', 'course_detail'), diff --git a/conifer/syrup/views.py b/conifer/syrup/views.py index beeb5e8..6db0546 100644 --- a/conifer/syrup/views.py +++ b/conifer/syrup/views.py @@ -65,6 +65,9 @@ def instructors(request): def join_course(request): return g.render('join_course.xhtml') +def browse_courses(request, browse_option=''): + return g.render('browse_courses.xhtml') + @login_required def my_courses(request): return g.render('my_courses.xhtml') diff --git a/conifer/templates/welcome.xhtml b/conifer/templates/welcome.xhtml index 3726961..b91869b 100644 --- a/conifer/templates/welcome.xhtml +++ b/conifer/templates/welcome.xhtml @@ -11,11 +11,10 @@ title = 'Welcome!'

News

${news.subject}

${news.body}