subcontexts can now register functions to be passed into the template. added a new...

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8278 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/oilsweb/oilsweb/controllers/acq.py b/Open-ILS/web/oilsweb/oilsweb/controllers/acq.py
index ef33ce9..b6ef26e 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/controllers/acq.py
+++ b/Open-ILS/web/oilsweb/oilsweb/controllers/acq.py
@@ -22,6 +22,7 @@ class AcqContext(SubContext):
         self.record_id = ContextItem(cgi_name='acq.r')
         self.record = ContextItem(cgi_name='acq.r')
         self.picklist_item = ContextItem(cgi_name='acq.pi', multi=True)
+        self.extract_bib_field = ContextItem(default_value=oilsweb.lib.acq.search.extract_bib_field)
 Context.applySubContext('acq', AcqContext)
 
 
@@ -53,9 +54,6 @@ class AcqController(BaseController):
 
         if ctx.acq.search_source:
             c.oils_acq_records, ctx.acq.search_cache_key = self._build_z39_search(ctx)
-
-        ctx.scrub_isbn = oilsweb.lib.bib.scrub_isbn  # XXX add more generically to the context object
-        ctx.acq.extract_bib_field = oilsweb.lib.acq.search.extract_bib_field
         c.oils = ctx
         return render('oils/%s/acq/pl_builder.html' % ctx.core.skin)
 
@@ -109,13 +107,9 @@ class AcqController(BaseController):
             records.append(rec)
 
         c.oils_acq_records = records
-        ctx.scrub_isbn = oilsweb.lib.bib.scrub_isbn  # XXX add more generically to the context object
-        ctx.acq.extract_bib_field = oilsweb.lib.acq.search.extract_bib_field
         c.oils = ctx
         return render('oils/%s/acq/picklist.html' % c.oils.core.skin)
 
-        return "PL"
-
     def _find_cached_record(self, results, cache_id):
         for res in results:
             for rec in res['records']:

diff --git a/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py b/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py
index 4c56ca4..440936e 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py
+++ b/Open-ILS/web/oilsweb/oilsweb/lib/__init__.py
@@ -48,3 +48,12 @@ class CoreContext(SubContext):
         
 Context.applySubContext('core', CoreContext)
 
+
+class UtilContext(SubContext):
+    ''' The UtilContext maintains a set of general use functions '''
+    def __init__(self):
+        import oilsweb.lib.bib
+        self.scrub_isbn = ContextItem(default_value=oilsweb.lib.bib.scrub_isbn)
+
+Context.applySubContext('util', UtilContext)
+

diff --git a/Open-ILS/web/oilsweb/oilsweb/lib/context.py b/Open-ILS/web/oilsweb/oilsweb/lib/context.py
index 84d5182..9294e27 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/lib/context.py
+++ b/Open-ILS/web/oilsweb/oilsweb/lib/context.py
@@ -19,7 +19,6 @@ class SubContext(object):
     def _fields(self):
         ''' Returns all public fields for this subcontext '''
         return [ f for f in dir(self) if f[0:1] != '_' and 
-            getattr(self, f).__class__.__name__.find('function') < 0  and
             getattr(self, f).__class__.__name__.find('method') < 0 ]
 
     def postinit(self):

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/acq_default.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/acq_default.css
index a97d5a9..0a5dc70 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/acq_default.css
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/acq_default.css
@@ -16,8 +16,9 @@
 .oils-acq-search-subsources-label { margin-top: 5px; }
 #oils-acq-search-sources-label { margin-bottom: 10px; }
 #oils-acq-search-fields-label { margin-bottom: 10px; }
+#oils-acq-search-fields-submit-block { margin: 5px; text-align: center;}
 
-#oils-acq-pl_builder-table td {}
+#oils-acq-pl_builder-table { width: 100%; }
 .oils-acq-record_list-records-jacket { width: 42px; height: 54px; padding-left: 10px; }
 .oils-acq-record_list-records-title-row {}
 .oils-acq-record_list-records-author-row td { padding-left: 30px; }
@@ -25,4 +26,5 @@
 .oils-acq-record_list-records-phys_desc-row {}
 #oils-acq-rdetail-marc-block { margin-top: 10px; padding: 10px; }
 
-#oils-acq-search-fields-submit-block { margin: 5px; text-align: center;}
+
+#oils-acq-picklist-table { width: 100%; }

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css
index 03f46fc..ef498ee 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css
@@ -17,7 +17,7 @@ body { margin-top: 0px; padding-top: 0px;}
 #oils-base-navigate-table { width: 100%; }
 #oils-base-navigate-table td { width: 100%; }
 
-#oils-base-header-block { width: 100%; text-align: right; margin-top: 0px;}
+#oils-base-header-block { width: 100%; text-align: right; margin-top: 0px; padding-bottom: 4px;}
 #oils-base-footer-block { width: 100%; text-align: center; vertical-align: bottom;}
 
 

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/acq_default.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/acq_default.css
index a48ca91..468f675 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/acq_default.css
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/acq_default.css
@@ -1,5 +1,6 @@
 
 #oils-acq-index-div { font-weight:bold; }
+
 #oils-acq-search-container { width:100%; }
 #oils-acq-search-sources-div { width:20%; float:left; }
 #oils-acq-search-form-div { width:80%; float:right; }
@@ -8,10 +9,14 @@
 #oils-acq-search-sources-label { font-weight: bold; border-bottom: 1px solid #6BA160;}
 #oils-acq-search-fields-label { font-weight: bold; border-bottom: 1px solid #6BA160;}
 #oils-acq-search-subsources-label { font-weight: bold; }
+#oils-acq-search-fields-submit-block { border: 2px solid #A1A1A1; }
+
 #oils-acq-pl_builder-table thead td { font-weight: bold; }
-#oils-acq-pl_builder-table td { border-bottom: 1px solid #808080;}
-#oils-acq-rdetail-marc-block { border-top: 1px solid #808080; }
-.oils-acq-record_list-picklist-td { background: #D0D0D0; } 
+/* #oils-acq-pl_builder-table tr { border-bottom: 1px solid #808080;} */
+.oils-acq-record_list-records-phys_desc-row { border-bottom: 1px solid #6BA160; }
+.oils-acq-record_list-picklist-td { border-style: solid; border-color: #A1A1A1; border-width: 0px 1px 0px 1px; } 
 .oils-acq-record_list-records-service-td { font-size: 85%; }
 #oils-acq-pl_builder-picklist-submit { text-align: right; }
-#oils-acq-search-fields-submit-block { border: 2px solid #A1A1A1; }
+
+
+#oils-acq-rdetail-marc-block { border-top: 1px solid #808080; }

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist.html
index 76607bb..3114ae0 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/picklist.html
@@ -1,13 +1,12 @@
 <%inherit file='../base.html'/>
 <%def name="block_title()">${_('Evergreen ACQ Picklist')}</%def>
 <%def name="block_content()">
-<div>Building picklist with...</div>
-<table>
+<table id='oils-acq-picklist-table'>
     % for rec in c.oils_acq_records:
     <tr class='oils-acq-record_list-records-title-row'>
         <td rowspan='3'>
             <img class='oils-acq-record_list-records-jacket'
-                src='${c.oils.core.ac_prefix}/jacket/small/${c.oils.scrub_isbn(c.oils.acq.extract_bib_field(rec,"isbns.isbn"))}'/>
+                src='${c.oils.core.ac_prefix}/jacket/small/${c.oils.util.scrub_isbn(c.oils.acq.extract_bib_field(rec,"isbns.isbn"))}'/>
         </td>
         <td>
             <a href='rdetails?${c.oils.make_query_string()}&${c.oils.acq.record_id_.cgi_name}=${rec["cache_id"]}&${c.oils.acq.search_cache_key_.cgi_name}=${c.oils.acq.search_cache_key}'>${c.oils.acq.extract_bib_field(rec, 'title')}</a>
@@ -21,7 +20,7 @@
     </tr>
     <tr class='oils-acq-record_list-records-phys_desc-row'>
         <td colspan='4'>
-            ${c.oils.scrub_isbn(c.oils.acq.extract_bib_field(rec, 'isbns.isbn'))} |
+            ${c.oils.util.scrub_isbn(c.oils.acq.extract_bib_field(rec, 'isbns.isbn'))} |
             ${c.oils.acq.extract_bib_field(rec, 'pubdate')} |
             ${c.oils.acq.extract_bib_field(rec, 'physicalSize')}
         </td>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/pl_builder.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/pl_builder.html
index 4b3d4f5..6cfbf03 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/pl_builder.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/pl_builder.html
@@ -6,39 +6,36 @@
     <input type='hidden' name='${c.oils.core.authtoken_.cgi_name}' value='${c.oils.core.authtoken}'/>
     <table id='oils-acq-pl_builder-table'>
         <tbody>
-        <%include file="record_list.html"/>
-        <!--
         % for res in c.oils_acq_records:
             % for rec in res['records']:
-                <tr class='oils-acq-pl_builder-records-title-row'>
+                <tr class='oils-acq-record_list-records-title-row'>
                     <td rowspan='3'>
-                        <img class='oils-acq-pl_builder-records-jacket'
-                            src='${c.oils.core.ac_prefix}/jacket/small/${c.oils.scrub_isbn(c.oils.acq.extract_bib_field(rec,"isbns.isbn"))}'/>
+                        <img class='oils-acq-record_list-records-jacket'
+                            src='${c.oils.core.ac_prefix}/jacket/small/${c.oils.util.scrub_isbn(c.oils.acq.extract_bib_field(rec,"isbns.isbn"))}'/>
                     </td>
                     <td>
                         <a href='rdetails?${c.oils.make_query_string()}&${c.oils.acq.record_id_.cgi_name}=${rec["cache_id"]}&${c.oils.acq.search_cache_key_.cgi_name}=${c.oils.acq.search_cache_key}'>${c.oils.acq.extract_bib_field(rec, 'title')}</a>
                     </td>
-                    <td class='oils-acq-pl_builder-records-service-td'>${res['service']}</td>
-                    <td rowspan='3' class='oils-acq-pl_builder-picklist-td' >
+                    <td rowspan='3' class='oils-acq-record_list-records-service-td'>${res['service']}</td>
+                    <td rowspan='3' class='oils-acq-record_list-picklist-td' >
                         <input type='checkbox' 
                             name='${c.oils.acq.picklist_item_.cgi_name}' 
-                            value='${rec["cache_id"]}:${c.oils.acq.search_cache_key}'/>
+                            value='${rec["cache_id"]}'/>
                 </tr>
 
                 </tr>
-                <tr class='oils-acq-pl_builder-records-author-row'>
+                <tr class='oils-acq-record_list-records-author-row'>
                     <td colspan='4'>${c.oils.acq.extract_bib_field(rec, 'author')}</td>
                 </tr>
-                <tr class='oils-acq-pl_builder-records-phys_desc-row'>
+                <tr class='oils-acq-record_list-records-phys_desc-row'>
                     <td colspan='4'>
-                        ${c.oils.scrub_isbn(c.oils.acq.extract_bib_field(rec, 'isbns.isbn'))} |
+                        ${c.oils.util.scrub_isbn(c.oils.acq.extract_bib_field(rec, 'isbns.isbn'))} |
                         ${c.oils.acq.extract_bib_field(rec, 'pubdate')} |
                         ${c.oils.acq.extract_bib_field(rec, 'physicalSize')}
                     </td>
                 </tr>
             % endfor
         % endfor
-        -->
             <tr>
                 <td colspan='4' id='oils-acq-pl_builder-picklist-submit'>
                     <input type='submit' value='${_("Add to Picklist")}'/>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/record_list.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/record_list.html
index 334b700..c4ecf1d 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/record_list.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/record_list.html
@@ -3,7 +3,7 @@
         <tr class='oils-acq-record_list-records-title-row'>
             <td rowspan='3'>
                 <img class='oils-acq-record_list-records-jacket'
-                    src='${c.oils.core.ac_prefix}/jacket/small/${c.oils.scrub_isbn(c.oils.acq.extract_bib_field(rec,"isbns.isbn"))}'/>
+                    src='${c.oils.core.ac_prefix}/jacket/small/${c.oils.util.scrub_isbn(c.oils.acq.extract_bib_field(rec,"isbns.isbn"))}'/>
             </td>
             <td>
                 <a href='rdetails?${c.oils.make_query_string()}&${c.oils.acq.record_id_.cgi_name}=${rec["cache_id"]}&${c.oils.acq.search_cache_key_.cgi_name}=${c.oils.acq.search_cache_key}'>${c.oils.acq.extract_bib_field(rec, 'title')}</a>
@@ -21,7 +21,7 @@
         </tr>
         <tr class='oils-acq-record_list-records-phys_desc-row'>
             <td colspan='4'>
-                ${c.oils.scrub_isbn(c.oils.acq.extract_bib_field(rec, 'isbns.isbn'))} |
+                ${c.oils.util.scrub_isbn(c.oils.acq.extract_bib_field(rec, 'isbns.isbn'))} |
                 ${c.oils.acq.extract_bib_field(rec, 'pubdate')} |
                 ${c.oils.acq.extract_bib_field(rec, 'physicalSize')}
             </td>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/header.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/header.html
index 17cd246..df49c55 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/header.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/header.html
@@ -1,3 +1,5 @@
 <div id='oils-base-header-content-div'>
-    ${c.oils.core.user.usrname()} / ${c.oils.core.workstation.name()}
+    <span id='oils-base-header-user-info'>
+        ${c.oils.core.user.usrname()} / ${c.oils.core.workstation.name()}
+    </span>
 </div>