projects / Syrup.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 928fbad)
git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@117 6d9bc8c9-1ec2-4278...
authorartunit <artunit@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Sun, 25 Jan 2009 21:25:49 +0000 (21:25 +0000)
committerartunit <artunit@6d9bc8c9-1ec2-4278-b937-99fde70a366f>
Sun, 25 Jan 2009 21:25:49 +0000 (21:25 +0000)
conifer/syrup/models.py patch | blob | history
conifer/templates/browse_courses.xhtml patch | blob | history
conifer/templates/master.xhtml patch | blob | history
conifer/templates/tabbar.xhtml patch | blob | history

diff --git a/conifer/syrup/models.py b/conifer/syrup/models.py
index a6ffc62..8642479 100644 (file)
--- a/conifer/syrup/models.py
+++ b/conifer/syrup/models.py
@@ -243,6 +243,7 @@ class Item(m.Model):
     volume_edition = m.CharField(max_length=255, blank=True, null=True) 
     pages_times = m.CharField(max_length=255, blank=True, null=True) 
     performer = m.CharField(max_length=255,db_index=True, blank=True, null=True) 
+    year = m.CharField(max_length=10,db_index=True, blank=True, null=True) 
 
     local_control_key = m.CharField(max_length=30, blank=True, null=True) 
 
diff --git a/conifer/templates/browse_courses.xhtml b/conifer/templates/browse_courses.xhtml
index a128fca..021f1d6 100644 (file)
--- a/conifer/templates/browse_courses.xhtml
+++ b/conifer/templates/browse_courses.xhtml
@@ -1,5 +1,5 @@
 <?python
-title = 'Browse Courses'
+title = 'Welcome to Syrup E-Reserves!'
 ?>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -9,20 +9,14 @@ title = 'Browse Courses'
   <title>${title}</title>
 </head>
 <body>
-  <h1>${title}</h1>
-  <p class="todo">What does the RD browse interface look like? Drill down by dept?</p>
-  <h2>All courses</h2>
-  <table class="pagetable">
-    <thead>
-      <tr><th py:for="h in ['Code','Title','Term']">${h}</th></tr>
-    </thead>
-    <tbody>
-      <tr py:for="c in models.Course.objects.all().order_by('code')">
-       <td>${c.code}</td>
-       <td><a href="${course_url(c)}">${c.title}</a></td>
-       <td>${c.term}</td>
-      </tr>
-    </tbody>
-  </table>
+  <h2>Browse</h2> (Note: some course materials may require you
+    to <a href="/accounts/login/?next=/syrup/">log in</a>)
+    <h3>Choose from one of the options below:</h3>
+    <ul>
+        <li><a href="instructors">Browse by Instructor</a></li>
+        <li><a href="departments">Browse by Department</a></li>
+        <li><a href="courses">Browse by Course Name</a></li>
+    </ul>
+  <div class="gap"/>
 </body>
 </html>
diff --git a/conifer/templates/master.xhtml b/conifer/templates/master.xhtml
index 962e535..74f0ec4 100644 (file)
--- a/conifer/templates/master.xhtml
+++ b/conifer/templates/master.xhtml
@@ -64,7 +64,7 @@ app_name = 'Syrup E-Reserve System'
     <span py:if="not user.is_authenticated() and not request.META.PATH_INFO == '/syrup/'">
         <a href="/syrup">Start Over</a>  -
     </span>
-    Syrup is a subproject of <a href="http://conifer.mcmaster.ca/">Project Conifer</a> &copy; 2008
+    Syrup is a subproject of <a href="http://conifer.mcmaster.ca/">Project Conifer</a> &copy; 2009
     </div>
       </div>
     </body>
diff --git a/conifer/templates/tabbar.xhtml b/conifer/templates/tabbar.xhtml
index abcdfc6..f1d48c6 100644 (file)
--- a/conifer/templates/tabbar.xhtml
+++ b/conifer/templates/tabbar.xhtml
@@ -10,7 +10,14 @@
   <li><a href="/syrup/">Home</a></li>
   <li><a href="/syrup/browse/">Browse</a></li>
   <li class="active"><a href="/syrup/course/">My Courses</a></li>
-  <li><a href="/syrup/join/">Join a Course</a></li>
+    <!--
+        RD had a concept of "joining" which i am
+        suppressing for now, our staff is definitely
+        not keen on the idea and my small focus group
+        think it's way too much too expect for this
+        library function.
+    -->
+  <!-- <li><a href="/syrup/join/">Join a Course</a></li> -->
   <!-- <li><a href="/syrup">Add a Reserve</a></li> -->
   <!-- <li><a href="/syrup">Manage Users</a></li> -->
 </ul>
Syrup