From bcff984e19747222eb4c18484514637e2454f8f8 Mon Sep 17 00:00:00 2001 From: gfawcett Date: Mon, 17 Nov 2008 03:19:10 +0000 Subject: [PATCH] bugfixes, might just run now. git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@19 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- conifer/locale/conifer-syrup.pot | 48 +++++++++++++-------- conifer/locale/en_US/LC_MESSAGES/conifer-syrup.po | 50 ++++++++++++++-------- conifer/locale/fr_CA/LC_MESSAGES/conifer-syrup.po | 50 ++++++++++++++-------- conifer/static/institution-logo.png | Bin 0 -> 3741 bytes conifer/syrup/views.py | 2 +- 5 files changed, 93 insertions(+), 57 deletions(-) create mode 100644 conifer/static/institution-logo.png diff --git a/conifer/locale/conifer-syrup.pot b/conifer/locale/conifer-syrup.pot index 9732e0b..9b39a74 100644 --- 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 \n" "Language-Team: LANGUAGE \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 --- 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 \n" "Language-Team: en_US \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 --- 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 \n" "Language-Team: fr_CA \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 index 0000000000000000000000000000000000000000..80f20ab4d2caafe5fcd8d823eb17030688014e66 GIT binary patch literal 3741 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