From: dbs Date: Thu, 19 Mar 2009 05:59:47 +0000 (+0000) Subject: Now that we have localized org trees, let our tools pull them in X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4c21d2a925993bc54f9c4bb741242acd1416bc98;p=evergreen%2Fbjwebb.git Now that we have localized org trees, let our tools pull them in Note that for now I've cheated on the staff client chrome and book bags and forced them to en-US git-svn-id: svn://svn.open-ils.org/ILS/trunk@12600 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf index 0d8deef05..18f91c4d7 100644 --- a/Open-ILS/examples/apache/eg_vhost.conf +++ b/Open-ILS/examples/apache/eg_vhost.conf @@ -91,6 +91,10 @@ RewriteRule - - [E=locale:%1] [L] + # Force to en-US for now to satisfy bbags.xml + SetEnv locale en-US + Options +Includes + AddOutputFilter INCLUDES .xml AddType application/xhtml+xml .xml @@ -121,7 +125,7 @@ RewriteCond %{ENV:locale} ^$ [OR] RewriteCond %{ENV:locale} ^en$ RewriteRule - - [E=locale:en-US] [L] - + Options +Includes XMLEntEscapeScript "no" XMLEntStripComments "yes" @@ -129,6 +133,7 @@ RewriteRule - - [E=locale:en-US] [L] XMLEntStripDoctype "yes" XMLEntContentType "text/html; charset=utf-8" AddOutputFilter INCLUDES;XMLENT .xhtml + AddOutputFilter INCLUDES;XMLENT .html allow from all diff --git a/Open-ILS/web/opac/extras/bbags.xml b/Open-ILS/web/opac/extras/bbags.xml index e701f2901..9e7ebe3ad 100644 --- a/Open-ILS/web/opac/extras/bbags.xml +++ b/Open-ILS/web/opac/extras/bbags.xml @@ -1,4 +1,4 @@ - + - + diff --git a/Open-ILS/web/opac/skin/default/js/rdetail.js b/Open-ILS/web/opac/skin/default/js/rdetail.js index b9732675d..1d1811fc4 100644 --- a/Open-ILS/web/opac/skin/default/js/rdetail.js +++ b/Open-ILS/web/opac/skin/default/js/rdetail.js @@ -349,6 +349,7 @@ function rdetailShowExtra(type, args) { hideMe($('rdetail_reviews_div')); hideMe($('rdetail_toc_div')); hideMe($('rdetail_anotes_div')); + hideMe($('rdetail_performer_notes_div')); hideMe($('rdetail_excerpt_div')); hideMe($('rdetail_preview_div')); hideMe($('rdetail_marc_div')); @@ -363,6 +364,7 @@ function rdetailShowExtra(type, args) { removeCSSClass($('rdetail_excerpt_link'), 'rdetail_extras_selected'); removeCSSClass($('rdetail_preview_link'), 'rdetail_extras_selected'); removeCSSClass($('rdetail_anotes_link'), 'rdetail_extras_selected'); + removeCSSClass($('rdetail_performer_notes_link'), 'rdetail_extras_selected'); removeCSSClass($('rdetail_annotation_link'), 'rdetail_extras_selected'); removeCSSClass($('rdetail_viewmarc_link'), 'rdetail_extras_selected'); @@ -394,6 +396,11 @@ function rdetailShowExtra(type, args) { unHideMe($('rdetail_anotes_div')); break; + case "performer_notes": + addCSSClass($('rdetail_performer_notes_link'), 'rdetail_extras_selected'); + unHideMe($('rdetail_performer_notes_div')); + break; + case "toc": addCSSClass($('rdetail_toc_link'), 'rdetail_extras_selected'); unHideMe($('rdetail_toc_div')); @@ -485,6 +492,9 @@ function rdetailhandleAC(data) { if( data.toc.html ) { $('rdetail_toc_div').innerHTML = data.toc.html; unHideMe($('rdetail_toc_link')); + } else if( record.toc() ) { + $('rdetail_toc_div').innerHTML = record.toc(); + unHideMe($('rdetail_toc_link')); } if( data.excerpt.html ) { @@ -496,6 +506,11 @@ function rdetailhandleAC(data) { $('rdetail_anotes_div').innerHTML = data.anotes.html; unHideMe($('rdetail_anotes_link')); } + + if( record.performer_notes() ) { + $('rdetail_performer_notes_div').innerHTML = record.performer_notes(); + unHideMe($('rdetail_performer_notes_link')); + } } function rdetailShowReviews(r) { diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml index 7b38f9aba..5fb679bc9 100644 --- a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml +++ b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml @@ -46,6 +46,12 @@ class='classic_link'>&rdetail.extras.author.notes; + + &rdetail.extras.performer.notes; + + @@ -87,6 +93,8 @@
+
+
diff --git a/Open-ILS/web/reports/oils_rpt_common.xhtml b/Open-ILS/web/reports/oils_rpt_common.xhtml index 3f3c82587..9666f1f15 100644 --- a/Open-ILS/web/reports/oils_rpt_common.xhtml +++ b/Open-ILS/web/reports/oils_rpt_common.xhtml @@ -29,7 +29,7 @@ - + diff --git a/Open-ILS/web/reports/xul/template_builder.xul b/Open-ILS/web/reports/xul/template_builder.xul index 688ea8e06..6bd874d06 100644 --- a/Open-ILS/web/reports/xul/template_builder.xul +++ b/Open-ILS/web/reports/xul/template_builder.xul @@ -1,4 +1,4 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml index fb1fa07c6..7b7113306 100644 --- a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml +++ b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml @@ -20,7 +20,7 @@ - + diff --git a/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml b/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml index 72906c90f..c6cb676c5 100644 --- a/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml +++ b/Open-ILS/xul/staff_client/server/admin/copy_locations.xhtml @@ -20,7 +20,7 @@ - + diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml index 540e44d84..78f81afc9 100644 --- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml +++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list.xhtml @@ -22,7 +22,7 @@ - + diff --git a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml index 48fd2d300..3e76c1fde 100644 --- a/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml +++ b/Open-ILS/xul/staff_client/server/admin/hold_pull_list_classic.xhtml @@ -21,7 +21,7 @@ - + diff --git a/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml b/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml index c2e07dabe..15bf4c8b0 100644 --- a/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml +++ b/Open-ILS/xul/staff_client/server/admin/non_cat_types.xhtml @@ -20,7 +20,7 @@ - + diff --git a/Open-ILS/xul/staff_client/server/admin/printer_settings.html b/Open-ILS/xul/staff_client/server/admin/printer_settings.html index c64694cab..e9a2b0226 100644 --- a/Open-ILS/xul/staff_client/server/admin/printer_settings.html +++ b/Open-ILS/xul/staff_client/server/admin/printer_settings.html @@ -7,7 +7,7 @@ - + diff --git a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml index 92461ec18..bfa76d69d 100644 --- a/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml +++ b/Open-ILS/xul/staff_client/server/admin/stat_cat_editor.xhtml @@ -20,7 +20,7 @@ - + diff --git a/Open-ILS/xul/staff_client/server/main/ws_info.xul b/Open-ILS/xul/staff_client/server/main/ws_info.xul index 5761a0c15..6fe0a1600 100644 --- a/Open-ILS/xul/staff_client/server/main/ws_info.xul +++ b/Open-ILS/xul/staff_client/server/main/ws_info.xul @@ -34,7 +34,7 @@ - - + diff --git a/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml b/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml index 14de9b8d4..06975e00c 100644 --- a/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml +++ b/Open-ILS/xul/staff_client/server/patron/user_edit.xhtml @@ -20,7 +20,7 @@ - +