minor changes

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

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

diff --git a/conifer/templates/item/item_add_cat_search.xhtml b/conifer/templates/item/item_add_cat_search.xhtml
index bc24896..c1e8e92 100644 (file)
--- a/conifer/templates/item/item_add_cat_search.xhtml
+++ b/conifer/templates/item/item_add_cat_search.xhtml
@@ -1,84 +1,88 @@
-<?python
-from django.utils.simplejson import dumps
-from conifer.libsystems.z3950.marcxml import marcxml_dictionary_to_dc as to_dublin
-title = _('Add physical or electronic item, by catalogue search')
-dc_keys = ['dc:title', 'dc:creator', 'dc:publisher', 'dc:date']
-?>
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:py="http://genshi.edgewall.org/">
-<xi:include href="../master.xhtml"/>
-<xi:include href="../paginate.xhtml"/>
-<xi:include href="../components/course.xhtml"/>
-<head>
-  <title>${title}</title>
-  <script type="text/javascript">
-    <!-- !This ought to be in paginate.xhtml, not here. how to do? -->
-    $(function() { $('.pagetable').tablesorter(); });
-  </script>
-  <script py:if="not 'query' in request.GET">                 <!-- !focus on query box if nothing to scroll. -->
-    $(function() { $('#query').focus(); });
-  </script>
-</head>
-<body>
-    ${course_banner(course)}
-    ${nested_title(parent_item)}
-    <h2>${title}</h2>
-    <form method="GET" action=".">
-      <input type="text" id="query" name="query" value="${query}" 
-            style="font-size: larger; width: 600px;"/>
-      <input type="submit" value="Search"/>
-       ${go_back_link()}
-
-    </form>
-    <div py:def="page_control" py:if="results">
-      <p>
-       ${start}&ndash;${min(numhits, start+limit-1)} of ${numhits} results.
-       <span py:if="start-limit&gt;0">
-         <a href=".?query=${query}&amp;start=${start-limit}&amp;limit=${limit}">Previous ${limit}</a>
-         &bull;
-       </span>
-       <span py:if="start+limit&lt;numhits">
-         <a href=".?query=${query}&amp;start=${start+limit}&amp;limit=${limit}">Next ${limit}</a>
-       </span>
-      </p>
-    </div>
-    ${page_control()}
-    <table class="pagetable" py:if="'query' in request.GET">
-      <thead>
-       <tr><th>#</th><th>Title</th><th>Author</th><th>Publisher</th><th>PubDate</th></tr>
-      </thead>
-      <tbody py:for="resultnum, res in enumerate(results)"
-            py:with="dc=to_dublin(res)">
-       <tr>
-         <td>${resultnum+start}.</td>
-         <td>
-           ${dc.get('dc:title', '???')}
-           <a href="javascript:$('#full_${resultnum}').toggle(); void(0);">details</a>
-           <p py:if="res.get('8569')" style="margin: 8px 0; font-size: 90%; color: darkred;">
-             Electronic resource. <a href="${res.get('856u')}">view</a>
-           </p>
-         </td>
-         <td py:for="k in dc_keys[1:]">${dc.get(k) or '&mdash;'}</td>
-         <td>
-           <form action="." method="POST">
-             <input type="hidden" name="pickitem" value="${dumps(res)}"/>
-             <input type="submit" value="Pick this item"/>
-           </form>
-         </td>
-       </tr>
-       <tr id="full_${resultnum}" style="display: none;">
-         <td colspan="4" style="padding-left: 36;">
-           <table class="metadata_table">
-             <?python allkeys = res.keys(); allkeys.sort(); ?>
-             <tr py:for="k in allkeys">
-               <th>${k}</th><td>${res[k]}</td>
-             </tr>
-           </table>
-         </td>
-       </tr>
-      </tbody>
-    </table>
-    ${page_control()}
- </body>
-</html>
+<?python\r
+from django.utils.simplejson import dumps\r
+from conifer.libsystems.z3950.marcxml import marcxml_dictionary_to_dc as to_dublin\r
+title = _('Add physical or electronic item, by catalogue search')\r
+dc_keys = ['dc:title', 'dc:creator', 'dc:publisher', 'dc:date']\r
+?>\r
+<html xmlns="http://www.w3.org/1999/xhtml"\r
+      xmlns:xi="http://www.w3.org/2001/XInclude"\r
+      xmlns:py="http://genshi.edgewall.org/">\r
+<xi:include href="../master.xhtml"/>\r
+<xi:include href="../paginate.xhtml"/>\r
+<xi:include href="../components/course.xhtml"/>\r
+<head>\r
+  <title>${title}</title>\r
+  <script type="text/javascript">\r
+    <!-- !This ought to be in paginate.xhtml, not here. how to do? -->\r
+    $(function() { $('.pagetable').tablesorter(); });\r
+  </script>\r
+  <script py:if="not 'query' in request.GET">                 <!-- !focus on query box if nothing to scroll. -->\r
+    $(function() { $('#query').focus(); });\r
+  </script>\r
+</head>\r
+<body>\r
+    ${course_banner(course)}\r
+    ${nested_title(parent_item)}\r
+    <!-- ugly hack so art can go away next week -->\r
+    <i>Sorry, catalogue searching is not enabled yet</i>\r
+    <h2>${title}</h2>\r
+    <!--\r
+    <form method="GET" action=".">\r
+      <input type="text" id="query" name="query" value="${query}" \r
+            style="font-size: larger; width: 600px;"/>\r
+      <input type="submit" value="Search"/>\r
+       ${go_back_link()}\r
+\r
+    </form>\r
+    -->\r
+    <div py:def="page_control" py:if="results">\r
+      <p>\r
+       ${start}&ndash;${min(numhits, start+limit-1)} of ${numhits} results.\r
+       <span py:if="start-limit&gt;0">\r
+         <a href=".?query=${query}&amp;start=${start-limit}&amp;limit=${limit}">Previous ${limit}</a>\r
+         &bull;\r
+       </span>\r
+       <span py:if="start+limit&lt;numhits">\r
+         <a href=".?query=${query}&amp;start=${start+limit}&amp;limit=${limit}">Next ${limit}</a>\r
+       </span>\r
+      </p>\r
+    </div>\r
+    ${page_control()}\r
+    <table class="pagetable" py:if="'query' in request.GET">\r
+      <thead>\r
+       <tr><th>#</th><th>Title</th><th>Author</th><th>Publisher</th><th>PubDate</th></tr>\r
+      </thead>\r
+      <tbody py:for="resultnum, res in enumerate(results)"\r
+            py:with="dc=to_dublin(res)">\r
+       <tr>\r
+         <td>${resultnum+start}.</td>\r
+         <td>\r
+           ${dc.get('dc:title', '???')}\r
+           <a href="javascript:$('#full_${resultnum}').toggle(); void(0);">details</a>\r
+           <p py:if="res.get('8569')" style="margin: 8px 0; font-size: 90%; color: darkred;">\r
+             Electronic resource. <a href="${res.get('856u')}">view</a>\r
+           </p>\r
+         </td>\r
+         <td py:for="k in dc_keys[1:]">${dc.get(k) or '&mdash;'}</td>\r
+         <td>\r
+           <form action="." method="POST">\r
+             <input type="hidden" name="pickitem" value="${dumps(res)}"/>\r
+             <input type="submit" value="Pick this item"/>\r
+           </form>\r
+         </td>\r
+       </tr>\r
+       <tr id="full_${resultnum}" style="display: none;">\r
+         <td colspan="4" style="padding-left: 36;">\r
+           <table class="metadata_table">\r
+             <?python allkeys = res.keys(); allkeys.sort(); ?>\r
+             <tr py:for="k in allkeys">\r
+               <th>${k}</th><td>${res[k]}</td>\r
+             </tr>\r
+           </table>\r
+         </td>\r
+       </tr>\r
+      </tbody>\r
+    </table>\r
+    ${page_control()}\r
+ </body>\r
+</html>\r