[open-ils-commits] r92 - in servres/trunk/conifer: syrup templates

Sun Jan 4 20:47:19 EST 2009

Author: artunit
Date: 2009-01-04 20:47:18 -0500 (Sun, 04 Jan 2009)
New Revision: 92

Modified:
   servres/trunk/conifer/syrup/urls.py
   servres/trunk/conifer/syrup/views.py
   servres/trunk/conifer/templates/welcome.xhtml
Log:


Modified: servres/trunk/conifer/syrup/urls.py
===================================================================

--- servres/trunk/conifer/syrup/urls.py	2009-01-04 02:47:10 UTC (rev 91)
+++ servres/trunk/conifer/syrup/urls.py	2009-01-05 01:47:18 UTC (rev 92)
@@ -9,8 +9,10 @@
 urlpatterns = patterns('conifer.syrup.views',
     (r'^$', 'welcome'),                       
     (r'^course/$', 'my_courses'),
+    (r'^browse/$', 'browse_courses'),
+    (r'^browse/(?P<browse_option>.*)/$', 'browse_courses'),
+    (r'^join/$', 'join_course'),
     (r'^opencourse/$', 'open_courses'),
-    (r'^join/$', 'join_course'),
     (r'^search/$', 'search'),
     (r'^instructors/$', 'instructors'),
     (r'^course/(?P<course_id>\d+)/$', 'course_detail'),

Modified: servres/trunk/conifer/syrup/views.py
===================================================================
--- servres/trunk/conifer/syrup/views.py	2009-01-04 02:47:10 UTC (rev 91)
+++ servres/trunk/conifer/syrup/views.py	2009-01-05 01:47:18 UTC (rev 92)
@@ -65,6 +65,9 @@
 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')

Modified: servres/trunk/conifer/templates/welcome.xhtml
===================================================================
--- servres/trunk/conifer/templates/welcome.xhtml	2009-01-04 02:47:10 UTC (rev 91)
+++ servres/trunk/conifer/templates/welcome.xhtml	2009-01-05 01:47:18 UTC (rev 92)
@@ -11,11 +11,10 @@
 <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>

