From a301370463b1d3e0d6984f0821491ca8b548ea1c Mon Sep 17 00:00:00 2001 From: artunit Date: Sat, 18 Jul 2009 03:09:46 +0000 Subject: [PATCH] minor changes git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@591 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- conifer/settings.py | 242 +++++++++++------------ conifer/templates/item/item_add_cat_search.xhtml | 172 ++++++++-------- 2 files changed, 209 insertions(+), 205 deletions(-) diff --git a/conifer/settings.py b/conifer/settings.py index dc13638..38101f3 100644 --- a/conifer/settings.py +++ b/conifer/settings.py @@ -1,121 +1,121 @@ -# Django settings for conifer project. - -import os - -os.environ['PYTHON_EGG_CACHE'] = '/tmp/eggs' - -BASE_DIRECTORY = os.path.abspath(os.path.dirname(__file__)) -HERE = lambda s: os.path.join(BASE_DIRECTORY, s) - -DEBUG = True -TEMPLATE_DEBUG = DEBUG - -ADMINS = ( - # ('Your Name', 'your_email@domain.com'), -) - -MANAGERS = ADMINS - -DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. -DATABASE_NAME = HERE('syrup.sqlite') # Or path to database file if using sqlite3. -DATABASE_USER = '' # Not used with sqlite3. -DATABASE_PASSWORD = '' # Not used with sqlite3. -DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. -DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. - -# Local time zone for this installation. Choices can be found here: -# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name -# although not all choices may be available on all operating systems. -# If running in a Windows environment this must be set to the same as your -# system time zone. -TIME_ZONE = 'America/Detroit' - -# Language code for this installation. All choices can be found here: -# http://www.i18nguy.com/unicode/language-identifiers.html -LANGUAGE_CODE = 'en_US' - -# Please only include languages here for which we have a locale in our -# locale/ directory. -LANGUAGES = [("en-us", "English"), - ("fr-ca", "Canadian French"), - ] - -SITE_ID = 1 - -# If you set this to False, Django will make some optimizations so as not -# to load the internationalization machinery. -USE_I18N = True - -# Absolute path to the directory that holds media. -# Example: "/home/media/media.lawrence.com/" -MEDIA_ROOT = HERE('static') - -# URL that handles the media served from MEDIA_ROOT. Make sure to use a -# trailing slash if there is a path component (optional in other cases). -# Examples: "http://media.lawrence.com", "http://example.com/media/" -MEDIA_URL = '' - -# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a -# trailing slash. -# Examples: "http://foo.com/media/", "/media/". -ADMIN_MEDIA_PREFIX = '/syrup/djmedia/' - -# Make this unique, and don't share it with anybody. -SECRET_KEY = 'j$dnxqbi3iih+(@il3m@vv(tuvt2+yu2r-$dxs$s7=iqjz_s!&' - -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.load_template_source', - 'django.template.loaders.app_directories.load_template_source', -# 'django.template.loaders.eggs.load_template_source', -) - -MIDDLEWARE_CLASSES = ( - 'django.middleware.common.CommonMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'conifer.middleware.genshi_locals.ThreadLocals', - 'django.middleware.locale.LocaleMiddleware', - 'babeldjango.middleware.LocaleMiddleware', - # TransactionMiddleware should be last... - 'django.middleware.transaction.TransactionMiddleware', -) - -ROOT_URLCONF = 'conifer.urls' - -TEMPLATE_DIRS = [] - -INSTALLED_APPS = ( - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.sites', - 'django.contrib.admin', - 'conifer.syrup', -) - -AUTH_PROFILE_MODULE = 'syrup.UserProfile' - - -AUTHENTICATION_BACKENDS = ( - 'django.contrib.auth.backends.ModelBackend', - # uncomment for EG authentication: - #'conifer.custom.auth_evergreen.EvergreenAuthBackend', -) - - -EVERGREEN_GATEWAY_SERVER = 'www.concat.ca' -Z3950_CONFIG = ('zed.concat.ca:210', 'OWA') #OWA,OSUL,CONIFER -SIP_HOST = ('dwarf.cs.uoguelph.ca', 8080) - -try: - from private_local_settings import SIP_CREDENTIALS -except: - # stuff that I really ought not check into svn... - #SIP_CREDENTIALS = ('userid', 'password', 'location') - pass - - -#CACHE_BACKEND = 'memcached://127.0.0.1:11211/' -#CACHE_BACKEND = 'db://test_cache_table' -#CACHE_BACKEND = 'locmem:///' +# Django settings for conifer project. + +import os + +os.environ['PYTHON_EGG_CACHE'] = '/tmp/eggs' + +BASE_DIRECTORY = os.path.abspath(os.path.dirname(__file__)) +HERE = lambda s: os.path.join(BASE_DIRECTORY, s) + +DEBUG = True +TEMPLATE_DEBUG = DEBUG + +ADMINS = ( + # ('Your Name', 'your_email@domain.com'), +) + +MANAGERS = ADMINS + +DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. +DATABASE_NAME = HERE('syrup.sqlite') # Or path to database file if using sqlite3. +DATABASE_USER = '' # Not used with sqlite3. +DATABASE_PASSWORD = '' # Not used with sqlite3. +DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. +DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. + +# Local time zone for this installation. Choices can be found here: +# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name +# although not all choices may be available on all operating systems. +# If running in a Windows environment this must be set to the same as your +# system time zone. +TIME_ZONE = 'America/Detroit' + +# Language code for this installation. All choices can be found here: +# http://www.i18nguy.com/unicode/language-identifiers.html +LANGUAGE_CODE = 'en_US' + +# Please only include languages here for which we have a locale in our +# locale/ directory. +LANGUAGES = [("en-us", "English"), + ("fr-ca", "Canadian French"), + ] + +SITE_ID = 1 + +# If you set this to False, Django will make some optimizations so as not +# to load the internationalization machinery. +USE_I18N = True + +# Absolute path to the directory that holds media. +# Example: "/home/media/media.lawrence.com/" +MEDIA_ROOT = HERE('static') + +# URL that handles the media served from MEDIA_ROOT. Make sure to use a +# trailing slash if there is a path component (optional in other cases). +# Examples: "http://media.lawrence.com", "http://example.com/media/" +MEDIA_URL = '' + +# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a +# trailing slash. +# Examples: "http://foo.com/media/", "/media/". +ADMIN_MEDIA_PREFIX = '/syrup/djmedia/' + +# Make this unique, and don't share it with anybody. +SECRET_KEY = 'j$dnxqbi3iih+(@il3m@vv(tuvt2+yu2r-$dxs$s7=iqjz_s!&' + +# List of callables that know how to import templates from various sources. +TEMPLATE_LOADERS = ( + 'django.template.loaders.filesystem.load_template_source', + 'django.template.loaders.app_directories.load_template_source', +# 'django.template.loaders.eggs.load_template_source', +) + +MIDDLEWARE_CLASSES = ( + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'conifer.middleware.genshi_locals.ThreadLocals', + 'django.middleware.locale.LocaleMiddleware', + 'babeldjango.middleware.LocaleMiddleware', + # TransactionMiddleware should be last... + 'django.middleware.transaction.TransactionMiddleware', +) + +ROOT_URLCONF = 'conifer.urls' + +TEMPLATE_DIRS = [] + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.sites', + 'django.contrib.admin', + 'conifer.syrup', +) + +AUTH_PROFILE_MODULE = 'syrup.UserProfile' + + +AUTHENTICATION_BACKENDS = ( + 'django.contrib.auth.backends.ModelBackend', + # uncomment for EG authentication: + #'conifer.custom.auth_evergreen.EvergreenAuthBackend', +) + + +EVERGREEN_GATEWAY_SERVER = 'www.concat.ca' +Z3950_CONFIG = ('zed.concat.ca:210', 'OWA') #OWA,OSUL,CONIFER +SIP_HOST = ('comet.cs.uoguelph.ca', 8080) + +try: + from private_local_settings import SIP_CREDENTIALS +except: + # stuff that I really ought not check into svn... + #SIP_CREDENTIALS = ('userid', 'password', 'location') + pass + + +#CACHE_BACKEND = 'memcached://127.0.0.1:11211/' +#CACHE_BACKEND = 'db://test_cache_table' +#CACHE_BACKEND = 'locmem:///' diff --git a/conifer/templates/item/item_add_cat_search.xhtml b/conifer/templates/item/item_add_cat_search.xhtml index bc24896..c1e8e92 100644 --- a/conifer/templates/item/item_add_cat_search.xhtml +++ b/conifer/templates/item/item_add_cat_search.xhtml @@ -1,84 +1,88 @@ - - - - - - - ${title} - - - - - ${course_banner(course)} - ${nested_title(parent_item)} -

${title}

-
- - - ${go_back_link()} - -
-
-

- ${start}–${min(numhits, start+limit-1)} of ${numhits} results. - - Previous ${limit} - • - - - Next ${limit} - -

-
- ${page_control()} - - - - - - - - - - - - - - - -
#TitleAuthorPublisherPubDate
${resultnum+start}. - ${dc.get('dc:title', '???')} - details -

- Electronic resource. view -

- 		${dc.get(k) or '—'} -
- - -
-
- ${page_control()} - - + + + + + + + ${title} + + + + + ${course_banner(course)} + ${nested_title(parent_item)} + + Sorry, catalogue searching is not enabled yet +

${title}

+ +
+

+ ${start}–${min(numhits, start+limit-1)} of ${numhits} results. + + Previous ${limit} + • + + + Next ${limit} + +

+
+ ${page_control()} + + + + + + + + + + + + + + + +
#TitleAuthorPublisherPubDate
${resultnum+start}. + ${dc.get('dc:title', '???')} + details +

+ Electronic resource. view +

+ 		${dc.get(k) or '—'} +
+ + +
+
+ ${page_control()} + + -- 2.11.0