From e7ee00b616a34976ff03951d54e3fb4fc99db3aa Mon Sep 17 00:00:00 2001 From: erickson Date: Fri, 8 May 2009 20:44:38 +0000 Subject: [PATCH] base_uri as a misnomer. changed to base_path. added support for overrideing the initially parsed dtd to support xml dtd entity munging git-svn-id: svn://svn.open-ils.org/ILS/trunk@13110 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/templates/base.tt2 | 7 ++- .../templates/default/acq/common/jubgrid.tt2 | 2 +- .../acq/financial/list_funding_sources.tt2 | 2 +- .../default/acq/financial/list_funds.tt2 | 4 +- .../default/acq/financial/list_providers.tt2 | 2 +- .../default/acq/financial/view_fund.tt2 | 2 +- .../acq/financial/view_funding_source.tt2 | 2 +- .../templates/default/acq/picklist/list.tt2 | 2 +- .../web/templates/default/acq/po/search.tt2 | 2 +- .../default/conify/global/action/survey.tt2 | 2 +- Open-ILS/web/templates/default/menu.tt2 | 44 +++++++++---------- 11 files changed, 37 insertions(+), 34 deletions(-) diff --git a/Open-ILS/web/templates/base.tt2 b/Open-ILS/web/templates/base.tt2 index 2909880c3b..77c4811cdc 100644 --- a/Open-ILS/web/templates/base.tt2 +++ b/Open-ILS/web/templates/base.tt2 @@ -1,4 +1,7 @@ - +[%- ctx.final_dtd = + '' -%] +[%- IF !ctx.dtd; ctx.dtd = ctx.final_dtd; END -%] +[% ctx.dtd %] [% ctx.page_title %] @@ -10,7 +13,7 @@ djConfig="parseOnLoad: true, isDebug:true"> diff --git a/Open-ILS/web/templates/default/acq/common/jubgrid.tt2 b/Open-ILS/web/templates/default/acq/common/jubgrid.tt2 index 94bc3748f2..e2f657cd45 100644 --- a/Open-ILS/web/templates/default/acq/common/jubgrid.tt2 +++ b/Open-ILS/web/templates/default/acq/common/jubgrid.tt2 @@ -49,7 +49,7 @@ pointing to the JUB model (and store) that you have created. JUBGrid.getPO = function(rowIndex) { var data = JUBGrid.jubGrid.model.getRow(rowIndex); if (!(data && data.purchase_order)) return ''; - return ""+data.purchase_order+""; + return ""+data.purchase_order+""; } JUBGrid.jubGridLayout = [{ //noscroll: true, diff --git a/Open-ILS/web/templates/default/acq/financial/list_funding_sources.tt2 b/Open-ILS/web/templates/default/acq/financial/list_funding_sources.tt2 index 0e1b7137d5..d96ecc3c9c 100644 --- a/Open-ILS/web/templates/default/acq/financial/list_funding_sources.tt2 +++ b/Open-ILS/web/templates/default/acq/financial/list_funding_sources.tt2 @@ -9,7 +9,7 @@ if(!item) return ''; var name = this.grid.store.getValue(item, 'name'); var id = this.grid.store.getValue(item, 'id'); - return ''+name+''; + return ''+name+''; } diff --git a/Open-ILS/web/templates/default/acq/financial/list_funds.tt2 b/Open-ILS/web/templates/default/acq/financial/list_funds.tt2 index af84f9dc98..2b3c9c2c94 100644 --- a/Open-ILS/web/templates/default/acq/financial/list_funds.tt2 +++ b/Open-ILS/web/templates/default/acq/financial/list_funds.tt2 @@ -15,7 +15,7 @@ return; } else { location.href = /* go to the details page for this fund */ - '[% ctx.base_uri %]/acq/fund/view/'+fundId; + '[% ctx.base_path %]/acq/fund/view/'+fundId; } } ); @@ -28,7 +28,7 @@ if(!item) return; var name = this.grid.store.getValue(item, 'name'); var id = this.grid.store.getValue(item, 'id'); - return ''+name+''; + return ''+name+''; } diff --git a/Open-ILS/web/templates/default/acq/financial/list_providers.tt2 b/Open-ILS/web/templates/default/acq/financial/list_providers.tt2 index 5fea2b9dfc..e4bc7127c4 100644 --- a/Open-ILS/web/templates/default/acq/financial/list_providers.tt2 +++ b/Open-ILS/web/templates/default/acq/financial/list_providers.tt2 @@ -58,7 +58,7 @@ if(!item) return; var name = this.grid.store.getValue(item, 'name'); var id = this.grid.store.getValue(item, 'id'); - return ''+name+''; + return ''+name+''; }
diff --git a/Open-ILS/web/templates/default/acq/financial/view_fund.tt2 b/Open-ILS/web/templates/default/acq/financial/view_fund.tt2 index 8435604f65..fc97851945 100644 --- a/Open-ILS/web/templates/default/acq/financial/view_fund.tt2 +++ b/Open-ILS/web/templates/default/acq/financial/view_fund.tt2 @@ -5,7 +5,7 @@ if(!item) return ''; var fs_id = this.grid.store.getValue(item, 'funding_source'); var fs = openils.acq.FundingSource.retrieve(fs_id); - return ''+fs.name()+''; + return ''+fs.name()+''; } diff --git a/Open-ILS/web/templates/default/acq/financial/view_funding_source.tt2 b/Open-ILS/web/templates/default/acq/financial/view_funding_source.tt2 index b7be6ba3fe..27518142e8 100644 --- a/Open-ILS/web/templates/default/acq/financial/view_funding_source.tt2 +++ b/Open-ILS/web/templates/default/acq/financial/view_funding_source.tt2 @@ -5,7 +5,7 @@ data = fsAllocationGrid.model.getRow(rowIndex); if(data) { var fund = openils.acq.Fund.retrieve(data.fund); - return ''+fund.code()+''; + return ''+fund.code()+''; } } diff --git a/Open-ILS/web/templates/default/acq/picklist/list.tt2 b/Open-ILS/web/templates/default/acq/picklist/list.tt2 index a79f72fa9c..1d78691282 100644 --- a/Open-ILS/web/templates/default/acq/picklist/list.tt2 +++ b/Open-ILS/web/templates/default/acq/picklist/list.tt2 @@ -26,7 +26,7 @@ var pl = plCache[i]; var id = pl.id(); if (inDatum == pl.name()){ - return ''+inDatum+''; + return ''+inDatum+''; } } } diff --git a/Open-ILS/web/templates/default/acq/po/search.tt2 b/Open-ILS/web/templates/default/acq/po/search.tt2 index 4945db1927..0db56b355d 100644 --- a/Open-ILS/web/templates/default/acq/po/search.tt2 +++ b/Open-ILS/web/templates/default/acq/po/search.tt2 @@ -10,7 +10,7 @@ function getId(rowIndex, item) { if(!item) return; var data = this.grid.store.getValue(item, 'id'); - return ''+data; + return ''+data; } diff --git a/Open-ILS/web/templates/default/conify/global/action/survey.tt2 b/Open-ILS/web/templates/default/conify/global/action/survey.tt2 index fb96083f80..9b0b796b67 100644 --- a/Open-ILS/web/templates/default/conify/global/action/survey.tt2 +++ b/Open-ILS/web/templates/default/conify/global/action/survey.tt2 @@ -8,7 +8,7 @@ var sv = svCache[i]; var id = sv.id(); if (inDatum == sv.name()){ - return ''+inDatum+''; + return ''+inDatum+''; } } } diff --git a/Open-ILS/web/templates/default/menu.tt2 b/Open-ILS/web/templates/default/menu.tt2 index 588e152a52..1812770783 100644 --- a/Open-ILS/web/templates/default/menu.tt2 +++ b/Open-ILS/web/templates/default/menu.tt2 @@ -18,19 +18,19 @@ Selection Lists
+ onClick="location.href = '[% ctx.base_path %]/acq/picklist/list';"> My Selection Lists
+ onClick="location.href = '[% ctx.base_path %]/acq/picklist/bib_search';"> Title Search
+ onClick="location.href = '[% ctx.base_path %]/acq/picklist/upload';"> Load Records
+ onClick="location.href = '[% ctx.base_path %]/acq/picklist/brief_record';"> New Brief Record
@@ -43,16 +43,16 @@ Purchase Orders
+ onClick="location.href = '[% ctx.base_path %]/acq/po/search';"> PO Search
+ onClick="location.href = '[% ctx.base_path %]/acq/po/li_search';"> Lineitem Search
@@ -65,7 +65,7 @@ Receiving
+ onClick="location.href = '[% ctx.base_path %]/acq/receiving/process';"> Receiving
@@ -80,39 +80,39 @@ Acquisitions
Funds
+ onClick="location.href = '[% ctx.base_path %]/acq/fund/list';">Funds
Funding Sources
+ onClick="location.href = '[% ctx.base_path %]/acq/funding_source/list';">Funding Sources
Providers
+ onClick="location.href = '[% ctx.base_path %]/conify/global/acq/provider';">Providers
Currency Types
+ onClick="location.href = '[% ctx.base_path %]/acq/currency_type/list';">Currency Types
Exchange Rates
+ onClick="location.href = '[% ctx.base_path %]/conify/global/acq/exchange_rate';">Exchange Rates
Distribution Formulas
+ onClick="location.href = '[% ctx.base_path %]/conify/global/acq/distribution_formula';">Distribution Formulas
Config
Billing Types
+ onClick="location.href = '[% ctx.base_path %]/conify/global/config/billing_type';">Billing Types
Standing Penalties
+ onClick="location.href = '[% ctx.base_path %]/conify/global/config/standing_penalty';">Standing Penalties
+ onClick="location.href = '[% ctx.base_path %]/conify/global/permission/grp_penalty_threshold';"> Group Penalty Thresholds
Field Documentation
+ onClick="location.href = '[% ctx.base_path %]/conify/global/config/idl_field_doc';">Field Documentation
Z39.50 Sources
+ onClick="location.href = '[% ctx.base_path %]/conify/global/config/z3950_source';">Z39.50 Sources
Circulation Modifiers
+ onClick="location.href = '[% ctx.base_path %]/conify/global/config/circ_modifier';">Circulation Modifiers
Action Trigger
+ onClick="location.href = '[% ctx.base_path %]/conify/global/action_trigger/event_definition';">Action Trigger
Surveys
+ onClick="location.href = '[% ctx.base_path %]/conify/global/action/survey';">Surveys -- 2.43.2