[open-ils-commits] r8290 - in
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb:
controllers lib public/oils/media/css/skin
public/oils/media/css/skin/default public/oils/media/css/theme
public/oils/media/css/theme/default public/oils/media/xsl
templates/oils/default/acq
svn at svn.open-ils.org
svn at svn.open-ils.org
Fri Dec 28 16:26:19 EST 2007
Author: erickson
Date: 2007-12-28 16:03:22 -0500 (Fri, 28 Dec 2007)
New Revision: 8290
Modified:
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq.py
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/bib.py
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default.css
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/xsl/oilsMARC21slim2HTML.xsl
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/rdetails.html
Log:
showing marchtml on details page
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq.py 2007-12-28 18:22:43 UTC (rev 8289)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/controllers/acq.py 2007-12-28 21:03:22 UTC (rev 8290)
@@ -97,7 +97,7 @@
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'
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/bib.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/bib.py 2007-12-28 18:22:43 UTC (rev 8289)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/bib.py 2007-12-28 21:03:22 UTC (rev 8290)
@@ -6,9 +6,8 @@
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):
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css 2007-12-28 18:22:43 UTC (rev 8289)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css 2007-12-28 21:03:22 UTC (rev 8290)
@@ -31,9 +31,11 @@
.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%; }
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css 2007-12-28 18:22:43 UTC (rev 8289)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default.css 2007-12-28 21:03:22 UTC (rev 8290)
@@ -25,4 +25,4 @@
.oils-base-sub-navigate-block { text-align: center; padding: 3px; margin-bottom: 10px;}
.oils-base-sub-navigate-block span { padding: 3px; }
-
+.label { margin: 1px; }
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css 2007-12-28 18:22:43 UTC (rev 8289)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default/acq.css 2007-12-28 21:03:22 UTC (rev 8290)
@@ -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; }
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default.css
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default.css 2007-12-28 18:22:43 UTC (rev 8289)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/theme/default.css 2007-12-28 21:03:22 UTC (rev 8290)
@@ -18,3 +18,4 @@
.oils-base-sub-navigate-block a { color: #000000; }
.oils-base-sub-navigate-block span:hover { background: #6BA160; }
+.label { font-weight: bold; }
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/xsl/oilsMARC21slim2HTML.xsl
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/xsl/oilsMARC21slim2HTML.xsl 2007-12-28 18:22:43 UTC (rev 8289)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/public/oils/media/xsl/oilsMARC21slim2HTML.xsl 2007-12-28 21:03:22 UTC (rev 8290)
@@ -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>
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/rdetails.html
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/rdetails.html 2007-12-28 18:22:43 UTC (rev 8289)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/rdetails.html 2007-12-28 21:03:22 UTC (rev 8290)
@@ -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>
More information about the open-ils-commits
mailing list