projects / syrup / masslnc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a1f55fa)
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@92 6d9bc8c9-1ec2-4278...
authorartunit <artunit@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Mon, 5 Jan 2009 01:47:18 +0000 (01:47 +0000)
committerartunit <artunit@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Mon, 5 Jan 2009 01:47:18 +0000 (01:47 +0000)
conifer/syrup/urls.py patch | blob | history
conifer/syrup/views.py patch | blob | history
conifer/templates/welcome.xhtml patch | blob | history

diff --git a/conifer/syrup/urls.py b/conifer/syrup/urls.py
index 45c6e40..0d4dbbe 100644 (file)
--- a/conifer/syrup/urls.py
+++ b/conifer/syrup/urls.py
@@ -9,8 +9,10 @@ ITEM_PREFIX = r'^course/(?P<course_id>\d+)/item/(?P<item_id>\d+)/'
 urlpatterns = patterns('conifer.syrup.views',
     (r'^$', 'welcome'),                       
     (r'^course/$', 'my_courses'),
-    (r'^opencourse/$', 'open_courses'),
+    (r'^browse/$', 'browse_courses'),
+    (r'^browse/(?P<browse_option>.*)/$', 'browse_courses'),
     (r'^join/$', 'join_course'),
+    (r'^opencourse/$', 'open_courses'),
     (r'^search/$', 'search'),
     (r'^instructors/$', 'instructors'),
     (r'^course/(?P<course_id>\d+)/$', 'course_detail'),
diff --git a/conifer/syrup/views.py b/conifer/syrup/views.py
index beeb5e8..6db0546 100644 (file)
--- 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 (file)
--- a/conifer/templates/welcome.xhtml
+++ b/conifer/templates/welcome.xhtml
@@ -11,11 +11,10 @@ title = 'Welcome!'
 <body>
   <div style="float: right; margin: 0 24; background-color: #feb; padding: 24;">
     <p py:if="not user.is_authenticated()"><a href="/accounts/login/?next=/syrup/">Log in</a></p>
-    <p><a href="opencourse">Browse Open Courses</a></p>
-    <p><a href="/public/search">Search the Reserves</a></p>
+    <p><a href="browse">Browse</a></p> 
   </div>
   <h1>News</h1>
-  <div py:for="news in models.NewsItem.objects.all().order_by('-published')">
+  <div py:for="news in models.NewsItem.objects.all().order_by('-published')[0:5]">
     <h2>${news.subject}</h2>
     <div>${news.body}</div>
   </div>
Syrup working repo (MassLNC)