[open-ils-commits] r19 - in servres/trunk/conifer: locale locale/en_US/LC_MESSAGES locale/fr_CA/LC_MESSAGES static syrup
svn at svn.open-ils.org
svn at svn.open-ils.org
Sun Nov 16 22:19:11 EST 2008
Author: gfawcett
Date: 2008-11-16 22:19:10 -0500 (Sun, 16 Nov 2008)
New Revision: 19
Added:
servres/trunk/conifer/static/institution-logo.png
Modified:
servres/trunk/conifer/locale/conifer-syrup.pot
servres/trunk/conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po
servres/trunk/conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po
servres/trunk/conifer/syrup/views.py
Log:
bugfixes, might just run now.
Modified: servres/trunk/conifer/locale/conifer-syrup.pot
===================================================================
--- servres/trunk/conifer/locale/conifer-syrup.pot 2008-11-17 03:12:41 UTC (rev 18)
+++ servres/trunk/conifer/locale/conifer-syrup.pot 2008-11-17 03:19:10 UTC (rev 19)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL at 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 at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,38 +17,54 @@
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.4\n"
-#: templates/master.xhtml:25
+#: 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:26
+#: 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
+#: templates/master.xhtml:32
msgid "Welcome!"
msgstr ""
-#: templates/master.xhtml:32
-msgid "Log In"
-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 @@
msgid "Manage Users"
msgstr ""
-#: templates/test.xhtml:19
-msgid "You are not part of any courses at this time."
-msgstr ""
-
Modified: servres/trunk/conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po
===================================================================
--- servres/trunk/conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po 2008-11-17 03:12:41 UTC (rev 18)
+++ servres/trunk/conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po 2008-11-17 03:19:10 UTC (rev 19)
@@ -8,7 +8,7 @@
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL at 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 at ADDRESS>\n"
"Language-Team: en_US <LL at li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -17,38 +17,54 @@
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.4\n"
-#: templates/master.xhtml:25
+#: 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:26
+#: 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
+#: templates/master.xhtml:32
msgid "Welcome!"
msgstr ""
-#: templates/master.xhtml:32
-msgid "Log In"
-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 @@
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 ""
Modified: servres/trunk/conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po
===================================================================
--- servres/trunk/conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po 2008-11-17 03:12:41 UTC (rev 18)
+++ servres/trunk/conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po 2008-11-17 03:19:10 UTC (rev 19)
@@ -9,7 +9,7 @@
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL at 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 at ADDRESS>\n"
"Language-Team: fr_CA <LL at li.org>\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
@@ -18,38 +18,54 @@
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 0.9.4\n"
-#: templates/master.xhtml:25
+#: 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:26
+#: 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
+#: templates/master.xhtml:32
msgid "Welcome!"
msgstr ""
-#: templates/master.xhtml:32
-msgid "Log In"
-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 @@
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 ""
Added: servres/trunk/conifer/static/institution-logo.png
===================================================================
(Binary files differ)
Property changes on: servres/trunk/conifer/static/institution-logo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: servres/trunk/conifer/syrup/views.py
===================================================================
--- servres/trunk/conifer/syrup/views.py 2008-11-17 03:12:41 UTC (rev 18)
+++ servres/trunk/conifer/syrup/views.py 2008-11-17 03:19:10 UTC (rev 19)
@@ -7,7 +7,7 @@
@login_required
def index(request):
- return g.render('test.xhtml')
+ return g.render('index.xhtml')
@login_required
def course_index(request, course_id):
More information about the open-ils-commits
mailing list