bugfixes, might just run now.

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

diff --git a/conifer/locale/conifer-syrup.pot b/conifer/locale/conifer-syrup.pot
index 9732e0b..9b39a74 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 20:37-0500\n"
+"POT-Creation-Date: 2008-11-16 22:13-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,38 +17,54 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.4\n"
 
-#: templates/master.xhtml:25
-msgid "Welcome,"
+#: 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 ""
+
+#: templates/master.xhtml:27
 msgid "Log Out"
 msgstr ""
 
-#: templates/master.xhtml:27 templates/tabbar.xhtml:9
+#: templates/master.xhtml:28 templates/tabbar.xhtml:9
 msgid "Preferences"
 msgstr ""
 
-#: templates/master.xhtml:28
+#: templates/master.xhtml:29
 msgid "Admin UI"
 msgstr ""
 
-#: templates/master.xhtml:31
-msgid "Welcome!"
-msgstr ""
-
 #: templates/master.xhtml:32
-msgid "Log In"
+msgid "Welcome!"
 msgstr ""
 
 #: templates/master.xhtml:39
 msgid "Project Conifer"
 msgstr ""
 
-#: templates/tabbar.xhtml:6 templates/test.xhtml:12
-msgid "My Courses"
-msgstr ""
-
 #: templates/tabbar.xhtml:7
 msgid "Add a Reserve"
 msgstr ""
@@ -57,7 +73,3 @@ msgstr ""
 msgid "Manage Users"
 msgstr ""
 
-#: templates/test.xhtml:19
-msgid "You are not part of any courses at this time."
-msgstr ""
-

diff --git a/conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po b/conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po
index bdf4af5..39f6d61 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 20:37-0500\n"
+"PO-Revision-Date: 2008-11-16 22:13-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,38 +17,54 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.4\n"
 
-#: templates/master.xhtml:25
-msgid "Welcome,"
+#: 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 ""
+
+#: templates/master.xhtml:27
 msgid "Log Out"
 msgstr ""
 
-#: templates/master.xhtml:27 templates/tabbar.xhtml:9
+#: templates/master.xhtml:28 templates/tabbar.xhtml:9
 msgid "Preferences"
 msgstr ""
 
-#: templates/master.xhtml:28
+#: templates/master.xhtml:29
 msgid "Admin UI"
 msgstr ""
 
-#: templates/master.xhtml:31
-msgid "Welcome!"
-msgstr ""
-
 #: templates/master.xhtml:32
-msgid "Log In"
+msgid "Welcome!"
 msgstr ""
 
 #: templates/master.xhtml:39
 msgid "Project Conifer"
 msgstr ""
 
-#: templates/tabbar.xhtml:6 templates/test.xhtml:12
-msgid "My Courses"
-msgstr ""
-
 #: templates/tabbar.xhtml:7
 msgid "Add a Reserve"
 msgstr ""
@@ -57,10 +73,6 @@ msgstr ""
 msgid "Manage Users"
 msgstr ""
 
-#: templates/test.xhtml:19
-msgid "You are not part of any courses at this time."
-msgstr ""
-
-#~ msgid "Welcome to this test!"
+#~ msgid "Log In"
 #~ msgstr ""
 

diff --git a/conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po b/conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po
index 3d84211..9247320 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 20:37-0500\n"
+"PO-Revision-Date: 2008-11-16 22:13-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,38 +18,54 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.4\n"
 
-#: templates/master.xhtml:25
-msgid "Welcome,"
+#: 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 ""
+
+#: templates/master.xhtml:27
 msgid "Log Out"
 msgstr ""
 
-#: templates/master.xhtml:27 templates/tabbar.xhtml:9
+#: templates/master.xhtml:28 templates/tabbar.xhtml:9
 msgid "Preferences"
 msgstr ""
 
-#: templates/master.xhtml:28
+#: templates/master.xhtml:29
 msgid "Admin UI"
 msgstr ""
 
-#: templates/master.xhtml:31
-msgid "Welcome!"
-msgstr ""
-
 #: templates/master.xhtml:32
-msgid "Log In"
+msgid "Welcome!"
 msgstr ""
 
 #: templates/master.xhtml:39
 msgid "Project Conifer"
 msgstr ""
 
-#: templates/tabbar.xhtml:6 templates/test.xhtml:12
-msgid "My Courses"
-msgstr ""
-
 #: templates/tabbar.xhtml:7
 msgid "Add a Reserve"
 msgstr ""
@@ -58,10 +74,6 @@ msgstr ""
 msgid "Manage Users"
 msgstr ""
 
-#: templates/test.xhtml:19
-msgid "You are not part of any courses at this time."
-msgstr ""
-
-#~ msgid "Welcome to this test!"
+#~ msgid "Log In"
 #~ msgstr ""
 

diff --git a/conifer/static/institution-logo.png b/conifer/static/institution-logo.png
new file mode 100644 (file)
index 0000000..80f20ab
Binary files /dev/null and b/conifer/static/institution-logo.png differ

diff --git a/conifer/syrup/views.py b/conifer/syrup/views.py
index 1907a59..ad04cd4 100644 (file)
--- a/conifer/syrup/views.py
+++ b/conifer/syrup/views.py
@@ -7,7 +7,7 @@ from conifer.syrup import models
 
 @login_required
 def index(request):
-    return g.render('test.xhtml')
+    return g.render('index.xhtml')
 
 @login_required
 def course_index(request, course_id):