[open-ils-commits] r923 - in servres/trunk/conifer: syrup syrup/views templates/item (gfawcett)

Wed Jul 14 20:56:02 EDT 2010

Author: gfawcett
Date: 2010-07-14 20:56:01 -0400 (Wed, 14 Jul 2010)
New Revision: 923

Modified:
   servres/trunk/conifer/syrup/models.py
   servres/trunk/conifer/syrup/views/genshi_namespace.py
   servres/trunk/conifer/templates/item/item_add_cat_search.xhtml
Log:
tweaks

Modified: servres/trunk/conifer/syrup/models.py
===================================================================

--- servres/trunk/conifer/syrup/models.py	2010-07-15 00:55:56 UTC (rev 922)
+++ servres/trunk/conifer/syrup/models.py	2010-07-15 00:56:01 UTC (rev 923)
@@ -160,13 +160,13 @@
     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'.

Modified: servres/trunk/conifer/syrup/views/genshi_namespace.py
===================================================================
--- servres/trunk/conifer/syrup/views/genshi_namespace.py	2010-07-15 00:55:56 UTC (rev 922)
+++ servres/trunk/conifer/syrup/views/genshi_namespace.py	2010-07-15 00:56:01 UTC (rev 923)
@@ -9,6 +9,7 @@
 
 import django.forms
 import itertools
+import urllib
 
 from conifer.integration.hooksystem import gethook, callhook
 from conifer.syrup                  import models

Modified: servres/trunk/conifer/templates/item/item_add_cat_search.xhtml
===================================================================
--- servres/trunk/conifer/templates/item/item_add_cat_search.xhtml	2010-07-15 00:55:56 UTC (rev 922)
+++ servres/trunk/conifer/templates/item/item_add_cat_search.xhtml	2010-07-15 00:56:01 UTC (rev 923)
@@ -4,7 +4,8 @@
 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']
 ?>
 <html xmlns="http://www.w3.org/1999/xhtml"
@@ -29,6 +30,7 @@
     <h2>${title}</h2>
     <div class="helptext">
     ${helptext}
+    <a href=".?query=${urllib.quote(example)}">${example}</a>
     </div>
 
     <form method="GET" action=".">

