intermediary commit before loading Art's changes

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

diff --git a/conifer/locale/conifer-syrup.pot b/conifer/locale/conifer-syrup.pot
index 9b39a74..9ce61c5 100644 (file)
--- a/conifer/locale/conifer-syrup.pot
+++ b/conifer/locale/conifer-syrup.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2008-11-16 22:13-0500\n"
+"POT-Creation-Date: 2008-11-18 21:24-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,30 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.4\n"
 
-#: templates/index.xhtml:12 templates/tabbar.xhtml:6
-msgid "My Courses"
-msgstr ""
-
-#: templates/index.xhtml:19
-msgid "You are not part of any courses at this time."
-msgstr ""
-
-#: templates/login.xhtml:10
-msgid "$(function() {$('#userid').focus();});"
-msgstr ""
-
-#: templates/login.xhtml:15
-msgid "Please log in."
-msgstr ""
-
-#: templates/login.xhtml:20
-msgid "User ID:"
-msgstr ""
-
-#: templates/login.xhtml:24
-msgid "Password:"
-msgstr ""
-
 #: templates/master.xhtml:26
 msgid "Welcome,"
 msgstr ""
@@ -49,7 +25,7 @@ msgstr ""
 msgid "Log Out"
 msgstr ""
 
-#: templates/master.xhtml:28 templates/tabbar.xhtml:9
+#: templates/master.xhtml:28 templates/tabbar.xhtml:10
 msgid "Preferences"
 msgstr ""
 
@@ -65,11 +41,51 @@ msgstr ""
 msgid "Project Conifer"
 msgstr ""
 
-#: templates/tabbar.xhtml:7
-msgid "Add a Reserve"
+#: templates/my_courses.xhtml:12 templates/tabbar.xhtml:7
+msgid "My Courses"
+msgstr ""
+
+#: templates/my_courses.xhtml:19
+msgid "You are not part of any courses at this time."
+msgstr ""
+
+#: templates/tabbar.xhtml:6
+msgid "Home"
 msgstr ""
 
 #: templates/tabbar.xhtml:8
+msgid "Add a Reserve"
+msgstr ""
+
+#: templates/tabbar.xhtml:9
 msgid "Manage Users"
 msgstr ""
 
+#: templates/welcome.xhtml:13
+msgid "Log in"
+msgstr ""
+
+#: templates/welcome.xhtml:14
+msgid "Search the Reserves"
+msgstr ""
+
+#: templates/welcome.xhtml:16
+msgid "News"
+msgstr ""
+
+#: templates/auth/login.xhtml:10
+msgid "$(function() {$('#userid').focus();});"
+msgstr ""
+
+#: templates/auth/login.xhtml:15
+msgid "Please log in."
+msgstr ""
+
+#: templates/auth/login.xhtml:20
+msgid "User ID:"
+msgstr ""
+
+#: templates/auth/login.xhtml:24
+msgid "Password:"
+msgstr ""
+

diff --git a/conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po b/conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po
index 39f6d61..786a06d 100644 (file)
--- a/conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po
+++ b/conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2008-11-15 20:37+0500\n"
-"PO-Revision-Date: 2008-11-16 22:13-0500\n"
+"PO-Revision-Date: 2008-11-18 21:24-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en_US <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -17,30 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.4\n"
 
-#: templates/index.xhtml:12 templates/tabbar.xhtml:6
-msgid "My Courses"
-msgstr ""
-
-#: templates/index.xhtml:19
-msgid "You are not part of any courses at this time."
-msgstr ""
-
-#: templates/login.xhtml:10
-msgid "$(function() {$('#userid').focus();});"
-msgstr ""
-
-#: templates/login.xhtml:15
-msgid "Please log in."
-msgstr ""
-
-#: templates/login.xhtml:20
-msgid "User ID:"
-msgstr ""
-
-#: templates/login.xhtml:24
-msgid "Password:"
-msgstr ""
-
 #: templates/master.xhtml:26
 msgid "Welcome,"
 msgstr ""
@@ -49,7 +25,7 @@ msgstr ""
 msgid "Log Out"
 msgstr ""
 
-#: templates/master.xhtml:28 templates/tabbar.xhtml:9
+#: templates/master.xhtml:28 templates/tabbar.xhtml:10
 msgid "Preferences"
 msgstr ""
 
@@ -65,14 +41,51 @@ msgstr ""
 msgid "Project Conifer"
 msgstr ""
 
-#: templates/tabbar.xhtml:7
-msgid "Add a Reserve"
+#: templates/my_courses.xhtml:12 templates/tabbar.xhtml:7
+msgid "My Courses"
+msgstr ""
+
+#: templates/my_courses.xhtml:19
+msgid "You are not part of any courses at this time."
+msgstr ""
+
+#: templates/tabbar.xhtml:6
+msgid "Home"
 msgstr ""
 
 #: templates/tabbar.xhtml:8
+msgid "Add a Reserve"
+msgstr ""
+
+#: templates/tabbar.xhtml:9
 msgid "Manage Users"
 msgstr ""
 
-#~ msgid "Log In"
-#~ msgstr ""
+#: templates/welcome.xhtml:13
+msgid "Log in"
+msgstr ""
+
+#: templates/welcome.xhtml:14
+msgid "Search the Reserves"
+msgstr ""
+
+#: templates/welcome.xhtml:16
+msgid "News"
+msgstr ""
+
+#: templates/auth/login.xhtml:10
+msgid "$(function() {$('#userid').focus();});"
+msgstr ""
+
+#: templates/auth/login.xhtml:15
+msgid "Please log in."
+msgstr ""
+
+#: templates/auth/login.xhtml:20
+msgid "User ID:"
+msgstr ""
+
+#: templates/auth/login.xhtml:24
+msgid "Password:"
+msgstr ""
 

diff --git a/conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po b/conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po
index 9247320..b7cf5c8 100644 (file)
--- a/conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po
+++ b/conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2008-11-15 20:37+0500\n"
-"PO-Revision-Date: 2008-11-16 22:13-0500\n"
+"PO-Revision-Date: 2008-11-18 21:24-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: fr_CA <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
@@ -18,30 +18,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.4\n"
 
-#: templates/index.xhtml:12 templates/tabbar.xhtml:6
-msgid "My Courses"
-msgstr ""
-
-#: templates/index.xhtml:19
-msgid "You are not part of any courses at this time."
-msgstr ""
-
-#: templates/login.xhtml:10
-msgid "$(function() {$('#userid').focus();});"
-msgstr ""
-
-#: templates/login.xhtml:15
-msgid "Please log in."
-msgstr ""
-
-#: templates/login.xhtml:20
-msgid "User ID:"
-msgstr ""
-
-#: templates/login.xhtml:24
-msgid "Password:"
-msgstr ""
-
 #: templates/master.xhtml:26
 msgid "Welcome,"
 msgstr ""
@@ -50,7 +26,7 @@ msgstr ""
 msgid "Log Out"
 msgstr ""
 
-#: templates/master.xhtml:28 templates/tabbar.xhtml:9
+#: templates/master.xhtml:28 templates/tabbar.xhtml:10
 msgid "Preferences"
 msgstr ""
 
@@ -66,14 +42,51 @@ msgstr ""
 msgid "Project Conifer"
 msgstr ""
 
-#: templates/tabbar.xhtml:7
-msgid "Add a Reserve"
+#: templates/my_courses.xhtml:12 templates/tabbar.xhtml:7
+msgid "My Courses"
+msgstr ""
+
+#: templates/my_courses.xhtml:19
+msgid "You are not part of any courses at this time."
+msgstr ""
+
+#: templates/tabbar.xhtml:6
+msgid "Home"
 msgstr ""
 
 #: templates/tabbar.xhtml:8
+msgid "Add a Reserve"
+msgstr ""
+
+#: templates/tabbar.xhtml:9
 msgid "Manage Users"
 msgstr ""
 
-#~ msgid "Log In"
-#~ msgstr ""
+#: templates/welcome.xhtml:13
+msgid "Log in"
+msgstr ""
+
+#: templates/welcome.xhtml:14
+msgid "Search the Reserves"
+msgstr ""
+
+#: templates/welcome.xhtml:16
+msgid "News"
+msgstr ""
+
+#: templates/auth/login.xhtml:10
+msgid "$(function() {$('#userid').focus();});"
+msgstr ""
+
+#: templates/auth/login.xhtml:15
+msgid "Please log in."
+msgstr ""
+
+#: templates/auth/login.xhtml:20
+msgid "User ID:"
+msgstr ""
+
+#: templates/auth/login.xhtml:24
+msgid "Password:"
+msgstr ""
 

diff --git a/conifer/syrup/models.py b/conifer/syrup/models.py
index 687bee8..0c203d8 100644 (file)
--- a/conifer/syrup/models.py
+++ b/conifer/syrup/models.py
@@ -26,7 +26,13 @@ class UserProfile(m.Model):
     user         = m.ForeignKey(User, unique=True)
     home_phone   = m.CharField(max_length=100, blank=True)
     home_address = m.TextField(blank=True)
-
+    ils_userid   = m.TextField("Alternate userid in the ILS, if any",
+                               max_length=50, blank=True)
+    access_level = m.CharField(max_length=5, blank=True, null=True,
+                               default=None,
+                               choices=(('CUST', 'custodian'),
+                                        ('STAFF', 'staff'),
+                                        ('ADMIN', 'system administrator')))
     def __unicode__(self):
         return 'UserProfile(%s)' % self.user
 
@@ -78,13 +84,14 @@ class Course(m.Model):
     department = m.ForeignKey(Department)
     term = m.ForeignKey(Term)
     title = m.CharField(max_length=1024)
-    # Enrol-codes are used for SIS integration.
+    active       = m.BooleanField(default=True)
+    moderated    = m.BooleanField('This is a moderated (non-public) course',
+                                  default=False)
+
+    # Enrol-codes are used for SIS integration (graham's idea-in-progress)
     enrol_codes  = m.CharField('Registrar keys for class lists, pipe-separated',
                                max_length=4098, 
                                blank=True, null=True)
-    active       = m.BooleanField(default=True)
-    moderated    = m.BooleanField(default=False)
-
     def __unicode__(self):
         return self.code or self.title