showing marchtml on details page

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8290 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 39bb922..84164ab 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/controllers/acq.py
+++ b/Open-ILS/web/oilsweb/oilsweb/controllers/acq.py
@@ -97,7 +97,7 @@ class AcqController(BaseController):
         rec = self._find_cached_record(results, rec_id)
         if rec:
             r.ctx.acq.record = rec
-            #r.ctx.acq.record_html = oilsweb.lib.bib.marc_to_html(rec['marcxml'])
+            r.ctx.acq.record_html = oilsweb.lib.bib.marc_to_html(rec['marcxml'])
             return r.render('acq/rdetails.html')
         return 'exception -> no record'
 

diff --git a/Open-ILS/web/oilsweb/oilsweb/lib/bib.py b/Open-ILS/web/oilsweb/oilsweb/lib/bib.py
index 381a10e..a9cc127 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/lib/bib.py
+++ b/Open-ILS/web/oilsweb/oilsweb/lib/bib.py
@@ -6,9 +6,8 @@ import oilsweb.lib.util
 
 def marc_to_html(marcxml):
     # create a path building utility function ....
-    xslFile = os.path.join(os.getcwd(), pylons.config['oils_xsl_prefix'], pylons.config['oils_xsl_marc2html'])
+    xslFile = os.path.join(pylons.config['oils_xsl_prefix'], pylons.config['oils_xsl_marc2html'])
     html = oilsweb.lib.util.apply_xsl(marcxml, xslFile)
-    # XXX encoding problems need resolving...
     return html
 
 def scrub_isbn(isbn):

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 314db1f..1c77de3 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
@@ -25,4 +25,4 @@ body { margin-top: 0px; padding-top: 0px;}
 .oils-base-sub-navigate-block { text-align: center; padding: 3px; margin-bottom: 10px;}
 .oils-base-sub-navigate-block span { padding: 3px; }
 
-
+.label { margin: 1px; }

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
index da08dbe..bf58d66 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
@@ -31,7 +31,9 @@
 .oils-acq-record_list-records-author-row td { padding-left: 30px; }
 .oils-acq-record_list-records-phys_desc-row td { padding-left: 30px; }
 .oils-acq-record_list-records-phys_desc-row {}
-#oils-acq-rdetail-marc-block { margin-top: 10px; padding: 10px; }
+
+#oils-acq-rdetail-marc-block { margin-top: 0px; padding: 6px; }
+#oils-acq-rdetail-summary-block { margin-top: 0px; padding: 6px; }
 
 
 #oils-acq-picklist-table { width: 100%; }

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default.css
index 636a4d9..04599af 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default.css
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default.css
@@ -18,3 +18,4 @@ body { font-size: 80%; }
 .oils-base-sub-navigate-block a { color: #000000; }
 .oils-base-sub-navigate-block span:hover { background: #6BA160; }
 
+.label { font-weight: bold; }

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css
index 468f675..ffb25c1 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css
@@ -19,4 +19,5 @@
 #oils-acq-pl_builder-picklist-submit { text-align: right; }
 
 
-#oils-acq-rdetail-marc-block { border-top: 1px solid #808080; }
+#oils-acq-rdetail-marc-block { border: 1px solid #6BA160; }
+#oils-acq-rdetail-summary-block { border: 1px solid #6BA160; }

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/xsl/oilsMARC21slim2HTML.xsl b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/xsl/oilsMARC21slim2HTML.xsl
index f41b110..ea0ae3f 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/xsl/oilsMARC21slim2HTML.xsl
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/xsl/oilsMARC21slim2HTML.xsl
@@ -21,11 +21,8 @@
                                        }
 
                                </style>
-
-                               <link href='/css/opac_marc.css' rel='stylesheet' type='text/css'></link>
                        </head>
                        <body>
-                               <div><button onclick='window.print();'>Print Page</button></div>
                                <xsl:apply-templates/>
                        </body>
                </html>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/rdetails.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/rdetails.html
index 58dcb75..d149041 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/rdetails.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/rdetails.html
@@ -1,18 +1,22 @@
 <%inherit file='base.html'/>
 <%def name="block_title()">${_('Evergreen ACQ Details')}</%def>
 <%def name="block_content()">
-    <table>
-        % for key,val in c.oils.acq.record['extracts'].iteritems():
-            <tr>
-               <td>${key}</td>
-               <td>${val}</td>
-            </tr>
-        % endfor
-    </table>
-    <!--
+    <div class='label'>Summary</div>
+    <div id='oils-acq-rdetail-summary-block'>
+        <table>
+            % for key,val in c.oils.acq.record['extracts'].iteritems():
+                <tr>
+                <td>${key}</td>
+                <td>${val}</td>
+                </tr>
+            % endfor
+        </table>
+    </div>
+    <div class='label'>MARC Record</div>
     <div id='oils-acq-rdetail-marc-block'>
-        {c.oils.acq.record_html} 
+        <div id='oils-acq-rdetail-marc'>
+            ${unicode(c.oils.acq.record_html, 'utf-8')} 
+        </div>
     </div>
-    -->
 </%def>