From 436b5eb365072df9f74a76e9e76ea842be299af1 Mon Sep 17 00:00:00 2001 From: gfawcett Date: Thu, 15 Jul 2010 00:56:01 +0000 Subject: [PATCH] tweaks git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@923 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- conifer/syrup/models.py | 4 ++-- conifer/syrup/views/genshi_namespace.py | 1 + conifer/templates/item/item_add_cat_search.xhtml | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/conifer/syrup/models.py b/conifer/syrup/models.py index 98b0529..afdffe0 100644 --- a/conifer/syrup/models.py +++ b/conifer/syrup/models.py @@ -160,13 +160,13 @@ class Site(BaseModel): service_desk = m.ForeignKey(ServiceDesk) access = m.CharField(max_length=5, - default='CLOSE', + default='LOGIN', choices = [ ('ANON', _('World-accessible')), ('LOGIN', _('Accessible to all logged-in users')), ('STUDT', _('Accessible to course students (by section)')), ('INVIT', _('Accessible to course students (by invitation code)')), - ('CLOSE', _('Accessible only to course owners'))]) + ('CLOSE', _('Accessible only to course-site owners'))]) # For sites that use a passkey as an invitation (INVIT access). # Note: only set this value using 'generate_new_passkey'. diff --git a/conifer/syrup/views/genshi_namespace.py b/conifer/syrup/views/genshi_namespace.py index 728cbd6..0e30570 100644 --- a/conifer/syrup/views/genshi_namespace.py +++ b/conifer/syrup/views/genshi_namespace.py @@ -9,6 +9,7 @@ import django.forms import itertools +import urllib from conifer.integration.hooksystem import gethook, callhook from conifer.syrup import models diff --git a/conifer/templates/item/item_add_cat_search.xhtml b/conifer/templates/item/item_add_cat_search.xhtml index abb9a73..2cc791f 100644 --- a/conifer/templates/item/item_add_cat_search.xhtml +++ b/conifer/templates/item/item_add_cat_search.xhtml @@ -4,7 +4,8 @@ from xml.etree import ElementTree as ET from conifer.libsystems.marcxml import record_to_dictionary from conifer.libsystems.marcxml import marcxml_dictionary_to_dc as to_dublin title = _('Add physical or electronic item, by catalogue search') -helptext = _('Use keywords or CCL syntax for searching, for example: ti="detroit river" and au="wilgus"') +helptext = _('Use keywords or CCL syntax for searching, for example:') +example = 'ti="detroit river" and au="wilgus"' dc_keys = ['dc:title', 'dc:creator', 'dc:publisher', 'dc:date'] ?> ${title}
${helptext} + ${example}
-- 2.11.0