From 88fd947e16d750f6d48f8f2618f09f78cfe19a40 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 1 Sep 2011 10:58:03 -0400 Subject: [PATCH] Remove /default/ from template paths The original goal of having a /default/ component to the template path was to support alternate skins. However, Template Toolkit supports alternate skins through a more elegant mechanism of providing template overlays via template path configuration. In other words, skin files will be differentiated by the location of their root path and not because they live in a different skin directory inside the main template root. Because of this, the /default/ component in the template path serves no purpose and generally just gets in the way. As a part of this, EGWeb.pm no longer inserts the skin name into the template file path. Signed-off-by: Bill Erickson --- Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm | 7 ++-- .../{default => }/acq/common/claim_dialog.tt2 | 0 .../acq/common/final_claim_dialog.tt2 | 0 .../templates/{default => }/acq/common/info.tt2 | 0 .../{default => }/acq/common/inv_dialog.tt2 | 0 .../templates/{default => }/acq/common/jubgrid.tt2 | 0 .../{default => }/acq/common/li_table.tt2 | 10 +++--- .../{default => }/acq/common/li_table_pager.tt2 | 0 .../templates/{default => }/acq/common/notes.tt2 | 0 .../{default => }/acq/financial/claim_eligible.tt2 | 4 +-- .../acq/financial/list_currency_types.tt2 | 2 +- .../acq/financial/list_funding_sources.tt2 | 2 +- .../{default => }/acq/financial/list_funds.tt2 | 2 +- .../{default => }/acq/financial/view_fund.tt2 | 2 +- .../acq/financial/view_funding_source.tt2 | 2 +- .../{default => }/acq/financial/view_provider.tt2 | 2 +- .../templates/{default => }/acq/invoice/view.tt2 | 2 +- .../{default => }/acq/lineitem/findbib.tt2 | 2 +- .../{default => }/acq/lineitem/history.tt2 | 2 +- .../{default => }/acq/lineitem/related.tt2 | 6 ++-- .../{default => }/acq/lineitem/search.tt2 | 4 +-- .../{default => }/acq/lineitem/worksheet.tt2 | 2 +- .../{default => }/acq/picklist/bib_search.tt2 | 4 +-- .../{default => }/acq/picklist/brief_record.tt2 | 2 +- .../{default => }/acq/picklist/from_bib.tt2 | 6 ++-- .../templates/{default => }/acq/picklist/list.tt2 | 2 +- .../{default => }/acq/picklist/upload.tt2 | 2 +- .../{default => }/acq/picklist/user_request.tt2 | 2 +- .../templates/{default => }/acq/picklist/view.tt2 | 4 +-- .../src/templates/{default => }/acq/po/create.tt2 | 2 +- .../{default => }/acq/po/edi_messages.tt2 | 2 +- .../src/templates/{default => }/acq/po/events.tt2 | 2 +- .../src/templates/{default => }/acq/po/history.tt2 | 2 +- .../templates/{default => }/acq/po/item_table.tt2 | 0 .../src/templates/{default => }/acq/po/search.tt2 | 4 +-- .../src/templates/{default => }/acq/po/view.tt2 | 10 +++--- .../{default => }/acq/receiving/process.tt2 | 4 +-- .../templates/{default => }/acq/search/unified.tt2 | 6 ++-- .../{default => }/acq/settings/li_attr.tt2 | 2 +- .../{default => }/actor/user/register.tt2 | 4 +-- .../{default => }/actor/user/register_table.tt2 | 0 .../{default => }/actor/user/trigger_events.tt2 | 2 +- Open-ILS/src/templates/base.tt2 | 28 +++++++++++----- .../templates/{default => }/booking/capture.tt2 | 2 +- .../src/templates/{default => }/booking/pickup.tt2 | 2 +- .../templates/{default => }/booking/pull_list.tt2 | 2 +- .../{default => }/booking/reservation.tt2 | 2 +- .../src/templates/{default => }/booking/return.tt2 | 2 +- .../templates/{default => }/cat/authority/list.tt2 | 2 +- .../{default => }/circ/selfcheck/audio_config.tt2 | 0 .../{default => }/circ/selfcheck/banner.tt2 | 0 .../{default => }/circ/selfcheck/circ_page.tt2 | 0 .../{default => }/circ/selfcheck/fines.tt2 | 0 .../{default => }/circ/selfcheck/holds_page.tt2 | 0 .../{default => }/circ/selfcheck/main.tt2 | 16 ++++----- .../{default => }/circ/selfcheck/patron_login.tt2 | 0 .../{default => }/circ/selfcheck/payment.tt2 | 0 .../{default => }/circ/selfcheck/summary.tt2 | 0 .../conify/global/acq/cancel_reason.tt2 | 2 +- .../conify/global/acq/claim_event_type.tt2 | 2 +- .../conify/global/acq/claim_policy.tt2 | 2 +- .../conify/global/acq/claim_policy_action.tt2 | 2 +- .../{default => }/conify/global/acq/claim_type.tt2 | 2 +- .../conify/global/acq/distribution_formula.tt2 | 2 +- .../conify/global/acq/edi_account.tt2 | 2 +- .../conify/global/acq/exchange_rate.tt2 | 2 +- .../{default => }/conify/global/acq/fund_tag.tt2 | 2 +- .../conify/global/acq/invoice_item_type.tt2 | 2 +- .../conify/global/acq/invoice_payment_method.tt2 | 2 +- .../conify/global/acq/lineitem_alert.tt2 | 2 +- .../conify/global/acq/lineitem_marc_attr_def.tt2 | 2 +- .../{default => }/conify/global/acq/provider.tt2 | 2 +- .../{default => }/conify/global/action/survey.tt2 | 2 +- .../conify/global/action/survey/edit.tt2 | 2 +- .../global/action_trigger/event_definition.tt2 | 2 +- .../action_trigger/event_definition_data.tt2 | 2 +- .../conify/global/asset/copy_location_order.tt2 | 2 +- .../conify/global/asset/copy_template.tt2 | 2 +- .../conify/global/biblio/monograph_part.tt2 | 2 +- .../conify/global/booking/resource.tt2 | 2 +- .../conify/global/booking/resource_attr.tt2 | 2 +- .../conify/global/booking/resource_attr_map.tt2 | 2 +- .../conify/global/booking/resource_attr_value.tt2 | 2 +- .../conify/global/booking/resource_type.tt2 | 2 +- .../conify/global/cat/authority/browse_axis.tt2 | 2 +- .../authority/browse_axis_authority_field_map.tt2 | 2 +- .../conify/global/cat/authority/control_set.tt2 | 2 +- .../cat/authority/control_set_authority_field.tt2 | 2 +- .../global/cat/authority/control_set_bib_field.tt2 | 2 +- .../conify/global/cat/authority/thesaurus.tt2 | 2 +- .../conify/global/config/acn_prefix.tt2 | 2 +- .../conify/global/config/acn_suffix.tt2 | 2 +- .../conify/global/config/actor_sip_fields.tt2 | 2 +- .../conify/global/config/asset_sip_fields.tt2 | 2 +- .../conify/global/config/barcode_completion.tt2 | 2 +- .../conify/global/config/billing_type.tt2 | 2 +- .../global/config/circ_matrix_matchpoint.tt2 | 2 +- .../conify/global/config/circ_matrix_weights.tt2 | 2 +- .../conify/global/config/circ_modifier.tt2 | 2 +- .../conify/global/config/coded_value_map.tt2 | 2 +- .../conify/global/config/global_flag.tt2 | 2 +- .../conify/global/config/hard_due_date.tt2 | 2 +- .../conify/global/config/hard_due_date_values.tt2 | 2 +- .../global/config/hold_matrix_matchpoint.tt2 | 2 +- .../conify/global/config/hold_matrix_weights.tt2 | 2 +- .../conify/global/config/idl_field_doc.tt2 | 2 +- .../conify/global/config/metabib_field.tt2 | 2 +- .../conify/global/config/org_unit_setting_type.tt2 | 2 +- .../global/config/record_attr_definition.tt2 | 2 +- .../conify/global/config/rule_age_hold_protect.tt2 | 2 +- .../conify/global/config/rule_circ_duration.tt2 | 2 +- .../conify/global/config/rule_max_fine.tt2 | 2 +- .../conify/global/config/rule_recurring_fine.tt2 | 2 +- .../conify/global/config/standing_penalty.tt2 | 2 +- .../conify/global/config/usr_setting_type.tt2 | 2 +- .../conify/global/config/weight_assoc.tt2 | 2 +- .../conify/global/config/z3950_source.tt2 | 2 +- .../global/permission/grp_penalty_threshold.tt2 | 2 +- .../conify/global/vandelay/match_set.tt2 | 2 +- .../conify/global/vandelay/match_set_tree.tt2 | 2 +- Open-ILS/src/templates/default/base.tt2 | 39 ---------------------- Open-ILS/src/templates/default/opac/home.tt2 | 16 --------- Open-ILS/src/templates/default/opac/place_hold.tt2 | 20 ----------- Open-ILS/src/templates/default/opac/record.tt2 | 16 --------- Open-ILS/src/templates/{default => }/footer.tt2 | 0 Open-ILS/src/templates/{default => }/header.tt2 | 0 Open-ILS/src/templates/{default => }/menu.tt2 | 0 .../src/templates/{default => }/opac/advanced.tt2 | 14 ++++---- .../src/templates/{default => }/opac/cnbrowse.tt2 | 14 ++++---- Open-ILS/src/templates/opac/home.tt2 | 16 +++++++++ .../src/templates/{default => }/opac/login.tt2 | 12 +++---- .../src/templates/{default => }/opac/mylist.tt2 | 14 ++++---- .../{default => }/opac/myopac/circ_history.tt2 | 6 ++-- .../templates/{default => }/opac/myopac/circs.tt2 | 6 ++-- .../{default => }/opac/myopac/hold_history.tt2 | 6 ++-- .../templates/{default => }/opac/myopac/holds.tt2 | 6 ++-- .../{default => }/opac/myopac/holds/edit.tt2 | 9 +++-- .../templates/{default => }/opac/myopac/lists.tt2 | 8 ++--- .../templates/{default => }/opac/myopac/main.tt2 | 6 ++-- .../{default => }/opac/myopac/main_pay.tt2 | 6 ++-- .../opac/myopac/main_payment_form.tt2 | 8 ++--- .../{default => }/opac/myopac/main_payments.tt2 | 6 ++-- .../templates/{default => }/opac/myopac/prefs.tt2 | 4 +-- .../{default => }/opac/myopac/prefs_notify.tt2 | 4 +-- .../{default => }/opac/myopac/prefs_settings.tt2 | 6 ++-- .../{default => }/opac/myopac/receipt_email.tt2 | 6 ++-- .../{default => }/opac/myopac/receipt_print.tt2 | 0 .../{default => }/opac/myopac/update_email.tt2 | 6 ++-- .../{default => }/opac/myopac/update_password.tt2 | 6 ++-- .../{default => }/opac/myopac/update_username.tt2 | 6 ++-- .../{default => }/opac/parts/advanced/expert.tt2 | 0 .../opac/parts/advanced/global_row.tt2 | 2 +- .../{default => }/opac/parts/advanced/numeric.tt2 | 0 .../{default => }/opac/parts/advanced/search.tt2 | 12 +++---- .../{default => }/opac/parts/anon_list.tt2 | 0 .../templates/{default => }/opac/parts/base.tt2 | 6 ++-- .../{default => }/opac/parts/chilifresh.tt2 | 0 .../opac/parts/coded_value_selector.tt2 | 0 .../templates/{default => }/opac/parts/config.tt2 | 0 .../{default => }/opac/parts/filtersort.tt2 | 0 .../templates/{default => }/opac/parts/footer.tt2 | 0 .../templates/{default => }/opac/parts/header.tt2 | 0 .../opac/parts/hold_error_messages.tt2 | 0 .../{default => }/opac/parts/homesearch.tt2 | 0 .../src/templates/{default => }/opac/parts/js.tt2 | 2 +- .../{default => }/opac/parts/login/form.tt2 | 4 +-- .../{default => }/opac/parts/login/help.tt2 | 0 .../opac/parts/login/password_hint.tt2 | 0 .../{default => }/opac/parts/misc_util.tt2 | 0 .../{default => }/opac/parts/myopac/base.tt2 | 8 ++--- .../{default => }/opac/parts/myopac/main_base.tt2 | 6 ++-- .../opac/parts/myopac/main_refund_policy.tt2 | 0 .../{default => }/opac/parts/myopac/prefs_base.tt2 | 4 +-- .../opac/parts/myopac/prefs_hints.tt2 | 0 .../{default => }/opac/parts/org_selector.tt2 | 0 .../{default => }/opac/parts/place_hold.tt2 | 6 ++-- .../{default => }/opac/parts/place_hold_result.tt2 | 4 +-- .../{default => }/opac/parts/printnav.tt2 | 0 .../{default => }/opac/parts/qtype_selector.tt2 | 0 .../{default => }/opac/parts/record/authors.tt2 | 0 .../{default => }/opac/parts/record/awards.tt2 | 0 .../{default => }/opac/parts/record/body.tt2 | 6 ++-- .../{default => }/opac/parts/record/cnbrowse.tt2 | 0 .../{default => }/opac/parts/record/extras.tt2 | 2 +- .../{default => }/opac/parts/record/issues.tt2 | 0 .../{default => }/opac/parts/record/refworks.tt2 | 0 .../{default => }/opac/parts/record/series.tt2 | 0 .../{default => }/opac/parts/record/subjects.tt2 | 0 .../{default => }/opac/parts/record/summary.tt2 | 4 +-- .../opac/parts/record/summaryplus.tt2 | 0 .../{default => }/opac/parts/result/lowhits.tt2 | 2 +- .../opac/parts/result/lowhits_purchase.tt2 | 0 .../{default => }/opac/parts/result/paginate.tt2 | 0 .../{default => }/opac/parts/result/table.tt2 | 4 +-- .../{default => }/opac/parts/searchbar.tt2 | 6 ++-- .../templates/{default => }/opac/parts/tips.tt2 | 0 .../templates/{default => }/opac/parts/topnav.tt2 | 4 +-- .../{default => }/opac/parts/topnav_links.tt2 | 0 .../{default => }/opac/parts/topnav_logo.tt2 | 0 Open-ILS/src/templates/opac/place_hold.tt2 | 20 +++++++++++ Open-ILS/src/templates/opac/record.tt2 | 16 +++++++++ .../src/templates/{default => }/opac/results.tt2 | 14 ++++---- .../templates/{default => }/serial/list_item.tt2 | 2 +- .../templates/{default => }/serial/list_stream.tt2 | 2 +- .../{default => }/serial/list_subscription.tt2 | 2 +- .../serial/print_routing_list_users.tt2 | 2 +- .../{default => }/serial/subscription.tt2 | 8 ++--- .../serial/subscription/caption_and_pattern.tt2 | 0 .../serial/subscription/distribution.tt2 | 0 .../{default => }/serial/subscription/issuance.tt2 | 0 .../templates/{default => }/vandelay/inc/attrs.tt2 | 0 .../{default => }/vandelay/inc/export.tt2 | 0 .../{default => }/vandelay/inc/import_errors.tt2 | 0 .../{default => }/vandelay/inc/item_attrs.tt2 | 0 .../{default => }/vandelay/inc/marchtml.tt2 | 0 .../{default => }/vandelay/inc/matches.tt2 | 0 .../{default => }/vandelay/inc/profiles.tt2 | 0 .../{default => }/vandelay/inc/progress.tt2 | 0 .../templates/{default => }/vandelay/inc/queue.tt2 | 0 .../{default => }/vandelay/inc/queueselect.tt2 | 0 .../{default => }/vandelay/inc/toolbar.tt2 | 0 .../{default => }/vandelay/inc/upload.tt2 | 0 .../templates/{default => }/vandelay/vandelay.tt2 | 26 +++++++-------- 223 files changed, 351 insertions(+), 382 deletions(-) rename Open-ILS/src/templates/{default => }/acq/common/claim_dialog.tt2 (100%) rename Open-ILS/src/templates/{default => }/acq/common/final_claim_dialog.tt2 (100%) rename Open-ILS/src/templates/{default => }/acq/common/info.tt2 (100%) rename Open-ILS/src/templates/{default => }/acq/common/inv_dialog.tt2 (100%) rename Open-ILS/src/templates/{default => }/acq/common/jubgrid.tt2 (100%) rename Open-ILS/src/templates/{default => }/acq/common/li_table.tt2 (98%) rename Open-ILS/src/templates/{default => }/acq/common/li_table_pager.tt2 (100%) rename Open-ILS/src/templates/{default => }/acq/common/notes.tt2 (100%) rename Open-ILS/src/templates/{default => }/acq/financial/claim_eligible.tt2 (95%) rename Open-ILS/src/templates/{default => }/acq/financial/list_currency_types.tt2 (97%) rename Open-ILS/src/templates/{default => }/acq/financial/list_funding_sources.tt2 (98%) rename Open-ILS/src/templates/{default => }/acq/financial/list_funds.tt2 (99%) rename Open-ILS/src/templates/{default => }/acq/financial/view_fund.tt2 (99%) rename Open-ILS/src/templates/{default => }/acq/financial/view_funding_source.tt2 (99%) rename Open-ILS/src/templates/{default => }/acq/financial/view_provider.tt2 (99%) rename Open-ILS/src/templates/{default => }/acq/invoice/view.tt2 (99%) rename Open-ILS/src/templates/{default => }/acq/lineitem/findbib.tt2 (98%) rename Open-ILS/src/templates/{default => }/acq/lineitem/history.tt2 (96%) rename Open-ILS/src/templates/{default => }/acq/lineitem/related.tt2 (94%) rename Open-ILS/src/templates/{default => }/acq/lineitem/search.tt2 (98%) rename Open-ILS/src/templates/{default => }/acq/lineitem/worksheet.tt2 (93%) rename Open-ILS/src/templates/{default => }/acq/picklist/bib_search.tt2 (97%) rename Open-ILS/src/templates/{default => }/acq/picklist/brief_record.tt2 (97%) rename Open-ILS/src/templates/{default => }/acq/picklist/from_bib.tt2 (86%) rename Open-ILS/src/templates/{default => }/acq/picklist/list.tt2 (99%) rename Open-ILS/src/templates/{default => }/acq/picklist/upload.tt2 (99%) rename Open-ILS/src/templates/{default => }/acq/picklist/user_request.tt2 (99%) rename Open-ILS/src/templates/{default => }/acq/picklist/view.tt2 (91%) rename Open-ILS/src/templates/{default => }/acq/po/create.tt2 (85%) rename Open-ILS/src/templates/{default => }/acq/po/edi_messages.tt2 (98%) rename Open-ILS/src/templates/{default => }/acq/po/events.tt2 (98%) rename Open-ILS/src/templates/{default => }/acq/po/history.tt2 (96%) rename Open-ILS/src/templates/{default => }/acq/po/item_table.tt2 (100%) rename Open-ILS/src/templates/{default => }/acq/po/search.tt2 (98%) rename Open-ILS/src/templates/{default => }/acq/po/view.tt2 (95%) rename Open-ILS/src/templates/{default => }/acq/receiving/process.tt2 (95%) rename Open-ILS/src/templates/{default => }/acq/search/unified.tt2 (98%) rename Open-ILS/src/templates/{default => }/acq/settings/li_attr.tt2 (99%) rename Open-ILS/src/templates/{default => }/actor/user/register.tt2 (97%) rename Open-ILS/src/templates/{default => }/actor/user/register_table.tt2 (100%) rename Open-ILS/src/templates/{default => }/actor/user/trigger_events.tt2 (97%) rename Open-ILS/src/templates/{default => }/booking/capture.tt2 (97%) rename Open-ILS/src/templates/{default => }/booking/pickup.tt2 (99%) rename Open-ILS/src/templates/{default => }/booking/pull_list.tt2 (98%) rename Open-ILS/src/templates/{default => }/booking/reservation.tt2 (99%) rename Open-ILS/src/templates/{default => }/booking/return.tt2 (99%) rename Open-ILS/src/templates/{default => }/cat/authority/list.tt2 (99%) rename Open-ILS/src/templates/{default => }/circ/selfcheck/audio_config.tt2 (100%) rename Open-ILS/src/templates/{default => }/circ/selfcheck/banner.tt2 (100%) rename Open-ILS/src/templates/{default => }/circ/selfcheck/circ_page.tt2 (100%) rename Open-ILS/src/templates/{default => }/circ/selfcheck/fines.tt2 (100%) rename Open-ILS/src/templates/{default => }/circ/selfcheck/holds_page.tt2 (100%) rename Open-ILS/src/templates/{default => }/circ/selfcheck/main.tt2 (82%) rename Open-ILS/src/templates/{default => }/circ/selfcheck/patron_login.tt2 (100%) rename Open-ILS/src/templates/{default => }/circ/selfcheck/payment.tt2 (100%) rename Open-ILS/src/templates/{default => }/circ/selfcheck/summary.tt2 (100%) rename Open-ILS/src/templates/{default => }/conify/global/acq/cancel_reason.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/acq/claim_event_type.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/acq/claim_policy.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/acq/claim_policy_action.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/acq/claim_type.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/acq/distribution_formula.tt2 (99%) rename Open-ILS/src/templates/{default => }/conify/global/acq/edi_account.tt2 (99%) rename Open-ILS/src/templates/{default => }/conify/global/acq/exchange_rate.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/acq/fund_tag.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/acq/invoice_item_type.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/acq/invoice_payment_method.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/acq/lineitem_alert.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/acq/lineitem_marc_attr_def.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/acq/provider.tt2 (99%) rename Open-ILS/src/templates/{default => }/conify/global/action/survey.tt2 (99%) rename Open-ILS/src/templates/{default => }/conify/global/action/survey/edit.tt2 (95%) rename Open-ILS/src/templates/{default => }/conify/global/action_trigger/event_definition.tt2 (99%) rename Open-ILS/src/templates/{default => }/conify/global/action_trigger/event_definition_data.tt2 (99%) rename Open-ILS/src/templates/{default => }/conify/global/asset/copy_location_order.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/asset/copy_template.tt2 (98%) rename Open-ILS/src/templates/{default => }/conify/global/biblio/monograph_part.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/booking/resource.tt2 (98%) rename Open-ILS/src/templates/{default => }/conify/global/booking/resource_attr.tt2 (98%) rename Open-ILS/src/templates/{default => }/conify/global/booking/resource_attr_map.tt2 (98%) rename Open-ILS/src/templates/{default => }/conify/global/booking/resource_attr_value.tt2 (98%) rename Open-ILS/src/templates/{default => }/conify/global/booking/resource_type.tt2 (98%) rename Open-ILS/src/templates/{default => }/conify/global/cat/authority/browse_axis.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/cat/authority/browse_axis_authority_field_map.tt2 (98%) rename Open-ILS/src/templates/{default => }/conify/global/cat/authority/control_set.tt2 (99%) rename Open-ILS/src/templates/{default => }/conify/global/cat/authority/control_set_authority_field.tt2 (99%) rename Open-ILS/src/templates/{default => }/conify/global/cat/authority/control_set_bib_field.tt2 (98%) rename Open-ILS/src/templates/{default => }/conify/global/cat/authority/thesaurus.tt2 (99%) rename Open-ILS/src/templates/{default => }/conify/global/config/acn_prefix.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/config/acn_suffix.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/config/actor_sip_fields.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/config/asset_sip_fields.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/config/barcode_completion.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/config/billing_type.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/config/circ_matrix_matchpoint.tt2 (99%) rename Open-ILS/src/templates/{default => }/conify/global/config/circ_matrix_weights.tt2 (96%) rename Open-ILS/src/templates/{default => }/conify/global/config/circ_modifier.tt2 (98%) rename Open-ILS/src/templates/{default => }/conify/global/config/coded_value_map.tt2 (98%) rename Open-ILS/src/templates/{default => }/conify/global/config/global_flag.tt2 (96%) rename Open-ILS/src/templates/{default => }/conify/global/config/hard_due_date.tt2 (98%) rename Open-ILS/src/templates/{default => }/conify/global/config/hard_due_date_values.tt2 (98%) rename Open-ILS/src/templates/{default => }/conify/global/config/hold_matrix_matchpoint.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/config/hold_matrix_weights.tt2 (96%) rename Open-ILS/src/templates/{default => }/conify/global/config/idl_field_doc.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/config/metabib_field.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/config/org_unit_setting_type.tt2 (98%) rename Open-ILS/src/templates/{default => }/conify/global/config/record_attr_definition.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/config/rule_age_hold_protect.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/config/rule_circ_duration.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/config/rule_max_fine.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/config/rule_recurring_fine.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/config/standing_penalty.tt2 (98%) rename Open-ILS/src/templates/{default => }/conify/global/config/usr_setting_type.tt2 (98%) rename Open-ILS/src/templates/{default => }/conify/global/config/weight_assoc.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/config/z3950_source.tt2 (96%) rename Open-ILS/src/templates/{default => }/conify/global/permission/grp_penalty_threshold.tt2 (97%) rename Open-ILS/src/templates/{default => }/conify/global/vandelay/match_set.tt2 (99%) rename Open-ILS/src/templates/{default => }/conify/global/vandelay/match_set_tree.tt2 (99%) delete mode 100644 Open-ILS/src/templates/default/base.tt2 delete mode 100644 Open-ILS/src/templates/default/opac/home.tt2 delete mode 100644 Open-ILS/src/templates/default/opac/place_hold.tt2 delete mode 100644 Open-ILS/src/templates/default/opac/record.tt2 rename Open-ILS/src/templates/{default => }/footer.tt2 (100%) rename Open-ILS/src/templates/{default => }/header.tt2 (100%) rename Open-ILS/src/templates/{default => }/menu.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/advanced.tt2 (72%) rename Open-ILS/src/templates/{default => }/opac/cnbrowse.tt2 (55%) create mode 100644 Open-ILS/src/templates/opac/home.tt2 rename Open-ILS/src/templates/{default => }/opac/login.tt2 (70%) rename Open-ILS/src/templates/{default => }/opac/mylist.tt2 (54%) rename Open-ILS/src/templates/{default => }/opac/myopac/circ_history.tt2 (97%) rename Open-ILS/src/templates/{default => }/opac/myopac/circs.tt2 (98%) rename Open-ILS/src/templates/{default => }/opac/myopac/hold_history.tt2 (97%) rename Open-ILS/src/templates/{default => }/opac/myopac/holds.tt2 (98%) rename Open-ILS/src/templates/{default => }/opac/myopac/holds/edit.tt2 (95%) rename Open-ILS/src/templates/{default => }/opac/myopac/lists.tt2 (97%) rename Open-ILS/src/templates/{default => }/opac/myopac/main.tt2 (98%) rename Open-ILS/src/templates/{default => }/opac/myopac/main_pay.tt2 (93%) rename Open-ILS/src/templates/{default => }/opac/myopac/main_payment_form.tt2 (97%) rename Open-ILS/src/templates/{default => }/opac/myopac/main_payments.tt2 (94%) rename Open-ILS/src/templates/{default => }/opac/myopac/prefs.tt2 (99%) rename Open-ILS/src/templates/{default => }/opac/myopac/prefs_notify.tt2 (97%) rename Open-ILS/src/templates/{default => }/opac/myopac/prefs_settings.tt2 (95%) rename Open-ILS/src/templates/{default => }/opac/myopac/receipt_email.tt2 (80%) rename Open-ILS/src/templates/{default => }/opac/myopac/receipt_print.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/myopac/update_email.tt2 (85%) rename Open-ILS/src/templates/{default => }/opac/myopac/update_password.tt2 (88%) rename Open-ILS/src/templates/{default => }/opac/myopac/update_username.tt2 (87%) rename Open-ILS/src/templates/{default => }/opac/parts/advanced/expert.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/advanced/global_row.tt2 (96%) rename Open-ILS/src/templates/{default => }/opac/parts/advanced/numeric.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/advanced/search.tt2 (93%) rename Open-ILS/src/templates/{default => }/opac/parts/anon_list.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/base.tt2 (84%) rename Open-ILS/src/templates/{default => }/opac/parts/chilifresh.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/coded_value_selector.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/config.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/filtersort.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/footer.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/header.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/hold_error_messages.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/homesearch.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/js.tt2 (95%) rename Open-ILS/src/templates/{default => }/opac/parts/login/form.tt2 (97%) rename Open-ILS/src/templates/{default => }/opac/parts/login/help.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/login/password_hint.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/misc_util.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/myopac/base.tt2 (84%) rename Open-ILS/src/templates/{default => }/opac/parts/myopac/main_base.tt2 (96%) rename Open-ILS/src/templates/{default => }/opac/parts/myopac/main_refund_policy.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/myopac/prefs_base.tt2 (95%) rename Open-ILS/src/templates/{default => }/opac/parts/myopac/prefs_hints.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/org_selector.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/place_hold.tt2 (95%) rename Open-ILS/src/templates/{default => }/opac/parts/place_hold_result.tt2 (97%) rename Open-ILS/src/templates/{default => }/opac/parts/printnav.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/qtype_selector.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/record/authors.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/record/awards.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/record/body.tt2 (93%) rename Open-ILS/src/templates/{default => }/opac/parts/record/cnbrowse.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/record/extras.tt2 (97%) rename Open-ILS/src/templates/{default => }/opac/parts/record/issues.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/record/refworks.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/record/series.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/record/subjects.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/record/summary.tt2 (99%) rename Open-ILS/src/templates/{default => }/opac/parts/record/summaryplus.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/result/lowhits.tt2 (98%) rename Open-ILS/src/templates/{default => }/opac/parts/result/lowhits_purchase.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/result/paginate.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/result/table.tt2 (99%) rename Open-ILS/src/templates/{default => }/opac/parts/searchbar.tt2 (93%) rename Open-ILS/src/templates/{default => }/opac/parts/tips.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/topnav.tt2 (98%) rename Open-ILS/src/templates/{default => }/opac/parts/topnav_links.tt2 (100%) rename Open-ILS/src/templates/{default => }/opac/parts/topnav_logo.tt2 (100%) create mode 100644 Open-ILS/src/templates/opac/place_hold.tt2 create mode 100644 Open-ILS/src/templates/opac/record.tt2 rename Open-ILS/src/templates/{default => }/opac/results.tt2 (89%) rename Open-ILS/src/templates/{default => }/serial/list_item.tt2 (99%) rename Open-ILS/src/templates/{default => }/serial/list_stream.tt2 (99%) rename Open-ILS/src/templates/{default => }/serial/list_subscription.tt2 (98%) rename Open-ILS/src/templates/{default => }/serial/print_routing_list_users.tt2 (98%) rename Open-ILS/src/templates/{default => }/serial/subscription.tt2 (96%) rename Open-ILS/src/templates/{default => }/serial/subscription/caption_and_pattern.tt2 (100%) rename Open-ILS/src/templates/{default => }/serial/subscription/distribution.tt2 (100%) rename Open-ILS/src/templates/{default => }/serial/subscription/issuance.tt2 (100%) rename Open-ILS/src/templates/{default => }/vandelay/inc/attrs.tt2 (100%) rename Open-ILS/src/templates/{default => }/vandelay/inc/export.tt2 (100%) rename Open-ILS/src/templates/{default => }/vandelay/inc/import_errors.tt2 (100%) rename Open-ILS/src/templates/{default => }/vandelay/inc/item_attrs.tt2 (100%) rename Open-ILS/src/templates/{default => }/vandelay/inc/marchtml.tt2 (100%) rename Open-ILS/src/templates/{default => }/vandelay/inc/matches.tt2 (100%) rename Open-ILS/src/templates/{default => }/vandelay/inc/profiles.tt2 (100%) rename Open-ILS/src/templates/{default => }/vandelay/inc/progress.tt2 (100%) rename Open-ILS/src/templates/{default => }/vandelay/inc/queue.tt2 (100%) rename Open-ILS/src/templates/{default => }/vandelay/inc/queueselect.tt2 (100%) rename Open-ILS/src/templates/{default => }/vandelay/inc/toolbar.tt2 (100%) rename Open-ILS/src/templates/{default => }/vandelay/inc/upload.tt2 (100%) rename Open-ILS/src/templates/{default => }/vandelay/vandelay.tt2 (74%) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm index 8226be799b..156d8715e3 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm @@ -46,8 +46,6 @@ sub handler { return $stat unless $stat == Apache2::Const::OK; return Apache2::Const::DECLINED unless $template; - $template = $ctx->{skin} . "/$template"; - my $text_handler = set_text_handler($ctx, $r); my $tt = Template->new({ @@ -187,9 +185,8 @@ sub find_template { my $r = shift; my $base = shift; my $ctx = shift; - my $skin = $ctx->{skin}; my $path = $r->uri; - $path =~ s/$base//og; + $path =~ s/$base\/?//og; my @parts = split('/', $path); my $template = ''; my $page_args = []; @@ -221,7 +218,7 @@ sub find_template { while(@parts) { last unless $localpath; for my $tpath (@{$ctx->{template_paths}}) { - my $fpath = "$tpath/$skin/$localpath.$ext"; + my $fpath = "$tpath/$localpath.$ext"; $r->log->debug("egweb: looking at possible template $fpath"); if(-r $fpath) { $template = "$localpath.$ext"; diff --git a/Open-ILS/src/templates/default/acq/common/claim_dialog.tt2 b/Open-ILS/src/templates/acq/common/claim_dialog.tt2 similarity index 100% rename from Open-ILS/src/templates/default/acq/common/claim_dialog.tt2 rename to Open-ILS/src/templates/acq/common/claim_dialog.tt2 diff --git a/Open-ILS/src/templates/default/acq/common/final_claim_dialog.tt2 b/Open-ILS/src/templates/acq/common/final_claim_dialog.tt2 similarity index 100% rename from Open-ILS/src/templates/default/acq/common/final_claim_dialog.tt2 rename to Open-ILS/src/templates/acq/common/final_claim_dialog.tt2 diff --git a/Open-ILS/src/templates/default/acq/common/info.tt2 b/Open-ILS/src/templates/acq/common/info.tt2 similarity index 100% rename from Open-ILS/src/templates/default/acq/common/info.tt2 rename to Open-ILS/src/templates/acq/common/info.tt2 diff --git a/Open-ILS/src/templates/default/acq/common/inv_dialog.tt2 b/Open-ILS/src/templates/acq/common/inv_dialog.tt2 similarity index 100% rename from Open-ILS/src/templates/default/acq/common/inv_dialog.tt2 rename to Open-ILS/src/templates/acq/common/inv_dialog.tt2 diff --git a/Open-ILS/src/templates/default/acq/common/jubgrid.tt2 b/Open-ILS/src/templates/acq/common/jubgrid.tt2 similarity index 100% rename from Open-ILS/src/templates/default/acq/common/jubgrid.tt2 rename to Open-ILS/src/templates/acq/common/jubgrid.tt2 diff --git a/Open-ILS/src/templates/default/acq/common/li_table.tt2 b/Open-ILS/src/templates/acq/common/li_table.tt2 similarity index 98% rename from Open-ILS/src/templates/default/acq/common/li_table.tt2 rename to Open-ILS/src/templates/acq/common/li_table.tt2 index 1851833182..268e9873ad 100644 --- a/Open-ILS/src/templates/default/acq/common/li_table.tt2 +++ b/Open-ILS/src/templates/acq/common/li_table.tt2 @@ -137,10 +137,10 @@ - [% INCLUDE "default/acq/common/info.tt2" which = "Lit" %] + [% INCLUDE "acq/common/info.tt2" which = "Lit" %] - [% INCLUDE "default/acq/common/notes.tt2" which = "Lit" %] + [% INCLUDE "acq/common/notes.tt2" which = "Lit" %]
- [% INCLUDE "default/acq/common/claim_dialog.tt2" %] + [% INCLUDE "acq/common/claim_dialog.tt2" %]
- [% INCLUDE "default/acq/common/final_claim_dialog.tt2" %] + [% INCLUDE "acq/common/final_claim_dialog.tt2" %]
diff --git a/Open-ILS/src/templates/default/acq/common/li_table_pager.tt2 b/Open-ILS/src/templates/acq/common/li_table_pager.tt2 similarity index 100% rename from Open-ILS/src/templates/default/acq/common/li_table_pager.tt2 rename to Open-ILS/src/templates/acq/common/li_table_pager.tt2 diff --git a/Open-ILS/src/templates/default/acq/common/notes.tt2 b/Open-ILS/src/templates/acq/common/notes.tt2 similarity index 100% rename from Open-ILS/src/templates/default/acq/common/notes.tt2 rename to Open-ILS/src/templates/acq/common/notes.tt2 diff --git a/Open-ILS/src/templates/default/acq/financial/claim_eligible.tt2 b/Open-ILS/src/templates/acq/financial/claim_eligible.tt2 similarity index 95% rename from Open-ILS/src/templates/default/acq/financial/claim_eligible.tt2 rename to Open-ILS/src/templates/acq/financial/claim_eligible.tt2 index 6df7fcaeea..fc8784259d 100644 --- a/Open-ILS/src/templates/default/acq/financial/claim_eligible.tt2 +++ b/Open-ILS/src/templates/acq/financial/claim_eligible.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER "default/base.tt2" %] +[% WRAPPER "base.tt2" %] [% ctx.page_title = "Items Eligible For Claiming" %]
@@ -49,7 +49,7 @@
diff --git a/Open-ILS/src/templates/default/acq/financial/list_currency_types.tt2 b/Open-ILS/src/templates/acq/financial/list_currency_types.tt2 similarity index 97% rename from Open-ILS/src/templates/default/acq/financial/list_currency_types.tt2 rename to Open-ILS/src/templates/acq/financial/list_currency_types.tt2 index 2b00688386..dfa5d2d4d5 100644 --- a/Open-ILS/src/templates/default/acq/financial/list_currency_types.tt2 +++ b/Open-ILS/src/templates/acq/financial/list_currency_types.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER default/base.tt2 %] +[% WRAPPER base.tt2 %]
Currency Type
diff --git a/Open-ILS/src/templates/default/acq/financial/list_funding_sources.tt2 b/Open-ILS/src/templates/acq/financial/list_funding_sources.tt2 similarity index 98% rename from Open-ILS/src/templates/default/acq/financial/list_funding_sources.tt2 rename to Open-ILS/src/templates/acq/financial/list_funding_sources.tt2 index 2a5d91d4a8..432c471ecb 100644 --- a/Open-ILS/src/templates/default/acq/financial/list_funding_sources.tt2 +++ b/Open-ILS/src/templates/acq/financial/list_funding_sources.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER 'default/base.tt2' %] +[% WRAPPER 'base.tt2' %]
diff --git a/Open-ILS/src/templates/default/acq/financial/view_funding_source.tt2 b/Open-ILS/src/templates/acq/financial/view_funding_source.tt2 similarity index 99% rename from Open-ILS/src/templates/default/acq/financial/view_funding_source.tt2 rename to Open-ILS/src/templates/acq/financial/view_funding_source.tt2 index 55a372df16..6ab579480d 100644 --- a/Open-ILS/src/templates/default/acq/financial/view_funding_source.tt2 +++ b/Open-ILS/src/templates/acq/financial/view_funding_source.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER 'default/base.tt2' %] +[% WRAPPER 'base.tt2' %]
diff --git a/Open-ILS/src/templates/default/acq/financial/view_provider.tt2 b/Open-ILS/src/templates/acq/financial/view_provider.tt2 similarity index 99% rename from Open-ILS/src/templates/default/acq/financial/view_provider.tt2 rename to Open-ILS/src/templates/acq/financial/view_provider.tt2 index f37911eda6..6fdc4256e1 100644 --- a/Open-ILS/src/templates/default/acq/financial/view_provider.tt2 +++ b/Open-ILS/src/templates/acq/financial/view_provider.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER default/base.tt2 %] +[% WRAPPER base.tt2 %]
diff --git a/Open-ILS/src/templates/default/acq/invoice/view.tt2 b/Open-ILS/src/templates/acq/invoice/view.tt2 similarity index 99% rename from Open-ILS/src/templates/default/acq/invoice/view.tt2 rename to Open-ILS/src/templates/acq/invoice/view.tt2 index 05920f5aa8..0ddca258d1 100644 --- a/Open-ILS/src/templates/default/acq/invoice/view.tt2 +++ b/Open-ILS/src/templates/acq/invoice/view.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER 'default/base.tt2' %] +[% WRAPPER 'base.tt2' %] [% ctx.page_title = 'Invoicing' %]
diff --git a/Open-ILS/src/templates/default/acq/lineitem/findbib.tt2 b/Open-ILS/src/templates/acq/lineitem/findbib.tt2 similarity index 98% rename from Open-ILS/src/templates/default/acq/lineitem/findbib.tt2 rename to Open-ILS/src/templates/acq/lineitem/findbib.tt2 index c2269c1c7f..7eedc44d77 100644 --- a/Open-ILS/src/templates/default/acq/lineitem/findbib.tt2 +++ b/Open-ILS/src/templates/acq/lineitem/findbib.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER "default/base.tt2" %] +[% WRAPPER "base.tt2" %] [% ctx.page_title = "Locate Bib Record" %]

Related Lineitems

@@ -65,7 +65,7 @@
-[% INCLUDE "default/acq/common/info.tt2" which = "Related" %] -[% INCLUDE "default/acq/common/li_table.tt2" %] +[% INCLUDE "acq/common/info.tt2" which = "Related" %] +[% INCLUDE "acq/common/li_table.tt2" %] [% END %] diff --git a/Open-ILS/src/templates/default/acq/lineitem/search.tt2 b/Open-ILS/src/templates/acq/lineitem/search.tt2 similarity index 98% rename from Open-ILS/src/templates/default/acq/lineitem/search.tt2 rename to Open-ILS/src/templates/acq/lineitem/search.tt2 index f2cf8ad5ed..730f91022d 100644 --- a/Open-ILS/src/templates/default/acq/lineitem/search.tt2 +++ b/Open-ILS/src/templates/acq/lineitem/search.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER 'default/base.tt2' %] +[% WRAPPER 'base.tt2' %] [% ctx.page_title = 'Lineitem Search' %]
-[% INCLUDE 'default/acq/common/li_table.tt2' %] +[% INCLUDE 'acq/common/li_table.tt2' %] [% END %] diff --git a/Open-ILS/src/templates/default/acq/lineitem/worksheet.tt2 b/Open-ILS/src/templates/acq/lineitem/worksheet.tt2 similarity index 93% rename from Open-ILS/src/templates/default/acq/lineitem/worksheet.tt2 rename to Open-ILS/src/templates/acq/lineitem/worksheet.tt2 index 1882237bdb..58548f62eb 100644 --- a/Open-ILS/src/templates/default/acq/lineitem/worksheet.tt2 +++ b/Open-ILS/src/templates/acq/lineitem/worksheet.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER "default/base.tt2" %] +[% WRAPPER "base.tt2" %] [% ctx.page_title = "Lineitem Worksheet" %]

Lineitem Worksheet

diff --git a/Open-ILS/src/templates/default/acq/picklist/bib_search.tt2 b/Open-ILS/src/templates/acq/picklist/bib_search.tt2 similarity index 97% rename from Open-ILS/src/templates/default/acq/picklist/bib_search.tt2 rename to Open-ILS/src/templates/acq/picklist/bib_search.tt2 index f80d9789c3..dd7e83cc2e 100644 --- a/Open-ILS/src/templates/default/acq/picklist/bib_search.tt2 +++ b/Open-ILS/src/templates/acq/picklist/bib_search.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER 'default/base.tt2' %] +[% WRAPPER 'base.tt2' %] @@ -60,7 +60,7 @@
- [% INCLUDE 'default/acq/common/li_table.tt2' %] + [% INCLUDE 'acq/common/li_table.tt2' %]
diff --git a/Open-ILS/src/templates/default/acq/picklist/brief_record.tt2 b/Open-ILS/src/templates/acq/picklist/brief_record.tt2 similarity index 97% rename from Open-ILS/src/templates/default/acq/picklist/brief_record.tt2 rename to Open-ILS/src/templates/acq/picklist/brief_record.tt2 index 4f8156bb95..9e10102133 100644 --- a/Open-ILS/src/templates/default/acq/picklist/brief_record.tt2 +++ b/Open-ILS/src/templates/acq/picklist/brief_record.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER 'default/base.tt2' %] +[% WRAPPER 'base.tt2' %]

New Brief Record


[% END %] diff --git a/Open-ILS/src/templates/default/acq/picklist/list.tt2 b/Open-ILS/src/templates/acq/picklist/list.tt2 similarity index 99% rename from Open-ILS/src/templates/default/acq/picklist/list.tt2 rename to Open-ILS/src/templates/acq/picklist/list.tt2 index 217cbb6c62..1fd98a6f9a 100644 --- a/Open-ILS/src/templates/default/acq/picklist/list.tt2 +++ b/Open-ILS/src/templates/acq/picklist/list.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER 'default/base.tt2' %] +[% WRAPPER 'base.tt2' %] [% ctx.page_title = 'Selection Lists' %]
diff --git a/Open-ILS/src/templates/default/acq/picklist/upload.tt2 b/Open-ILS/src/templates/acq/picklist/upload.tt2 similarity index 99% rename from Open-ILS/src/templates/default/acq/picklist/upload.tt2 rename to Open-ILS/src/templates/acq/picklist/upload.tt2 index b05ddc08be..31b76204d9 100644 --- a/Open-ILS/src/templates/default/acq/picklist/upload.tt2 +++ b/Open-ILS/src/templates/acq/picklist/upload.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER 'default/base.tt2' %] +[% WRAPPER 'base.tt2' %]

Upload


diff --git a/Open-ILS/src/templates/default/acq/picklist/user_request.tt2 b/Open-ILS/src/templates/acq/picklist/user_request.tt2 similarity index 99% rename from Open-ILS/src/templates/default/acq/picklist/user_request.tt2 rename to Open-ILS/src/templates/acq/picklist/user_request.tt2 index 02e3683fbc..3622a60bee 100644 --- a/Open-ILS/src/templates/default/acq/picklist/user_request.tt2 +++ b/Open-ILS/src/templates/acq/picklist/user_request.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER 'default/base.tt2' %] +[% WRAPPER 'base.tt2' %] [% ctx.page_title = 'Patron Requests' %] diff --git a/Open-ILS/src/templates/default/acq/picklist/view.tt2 b/Open-ILS/src/templates/acq/picklist/view.tt2 similarity index 91% rename from Open-ILS/src/templates/default/acq/picklist/view.tt2 rename to Open-ILS/src/templates/acq/picklist/view.tt2 index dcb693d39f..a209c3eda7 100644 --- a/Open-ILS/src/templates/default/acq/picklist/view.tt2 +++ b/Open-ILS/src/templates/acq/picklist/view.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER 'default/base.tt2' %] +[% WRAPPER 'base.tt2' %] [% ctx.page_title = 'Selection List' %]
@@ -13,7 +13,7 @@
- [% INCLUDE 'default/acq/common/li_table.tt2' %] + [% INCLUDE 'acq/common/li_table.tt2' %]
[% END %] diff --git a/Open-ILS/src/templates/default/acq/po/create.tt2 b/Open-ILS/src/templates/acq/po/create.tt2 similarity index 85% rename from Open-ILS/src/templates/default/acq/po/create.tt2 rename to Open-ILS/src/templates/acq/po/create.tt2 index 5dde8509a6..01473d2310 100644 --- a/Open-ILS/src/templates/default/acq/po/create.tt2 +++ b/Open-ILS/src/templates/acq/po/create.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER "default/base.tt2" %] +[% WRAPPER "base.tt2" %] [% ctx.page_title = "Create Purchase Order" %]

Create Purchase Order

diff --git a/Open-ILS/src/templates/default/acq/po/edi_messages.tt2 b/Open-ILS/src/templates/acq/po/edi_messages.tt2 similarity index 98% rename from Open-ILS/src/templates/default/acq/po/edi_messages.tt2 rename to Open-ILS/src/templates/acq/po/edi_messages.tt2 index 76c2101eec..c936616bb2 100644 --- a/Open-ILS/src/templates/default/acq/po/edi_messages.tt2 +++ b/Open-ILS/src/templates/acq/po/edi_messages.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER "default/base.tt2" %] +[% WRAPPER "base.tt2" %] [% ctx.page_title = "EDI Messages" %] [% IF ctx.page_args.0 %]

EDI Messages (Purchase Order [% ctx.page_args.0 %])

diff --git a/Open-ILS/src/templates/default/acq/po/events.tt2 b/Open-ILS/src/templates/acq/po/events.tt2 similarity index 98% rename from Open-ILS/src/templates/default/acq/po/events.tt2 rename to Open-ILS/src/templates/acq/po/events.tt2 index a06fc8908c..03c183e609 100644 --- a/Open-ILS/src/templates/default/acq/po/events.tt2 +++ b/Open-ILS/src/templates/acq/po/events.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER default/base.tt2 %] +[% WRAPPER base.tt2 %] diff --git a/Open-ILS/src/templates/default/acq/po/history.tt2 b/Open-ILS/src/templates/acq/po/history.tt2 similarity index 96% rename from Open-ILS/src/templates/default/acq/po/history.tt2 rename to Open-ILS/src/templates/acq/po/history.tt2 index 2b3c5d0924..ad9200794a 100644 --- a/Open-ILS/src/templates/default/acq/po/history.tt2 +++ b/Open-ILS/src/templates/acq/po/history.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER "default/base.tt2" %] +[% WRAPPER "base.tt2" %] [% ctx.page_title = "PO History" %]

Purchase Order History


diff --git a/Open-ILS/src/templates/default/acq/po/item_table.tt2 b/Open-ILS/src/templates/acq/po/item_table.tt2 similarity index 100% rename from Open-ILS/src/templates/default/acq/po/item_table.tt2 rename to Open-ILS/src/templates/acq/po/item_table.tt2 diff --git a/Open-ILS/src/templates/default/acq/po/search.tt2 b/Open-ILS/src/templates/acq/po/search.tt2 similarity index 98% rename from Open-ILS/src/templates/default/acq/po/search.tt2 rename to Open-ILS/src/templates/acq/po/search.tt2 index de8bd1dd87..ff3a1c1c92 100644 --- a/Open-ILS/src/templates/default/acq/po/search.tt2 +++ b/Open-ILS/src/templates/acq/po/search.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER default/base.tt2 %] +[% WRAPPER base.tt2 %] [% ctx.page_title = 'Purchase Orders' %] diff --git a/Open-ILS/src/templates/default/acq/po/view.tt2 b/Open-ILS/src/templates/acq/po/view.tt2 similarity index 95% rename from Open-ILS/src/templates/default/acq/po/view.tt2 rename to Open-ILS/src/templates/acq/po/view.tt2 index bfbc776dc4..55f66797f8 100644 --- a/Open-ILS/src/templates/default/acq/po/view.tt2 +++ b/Open-ILS/src/templates/acq/po/view.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER 'default/base.tt2' %] +[% WRAPPER 'base.tt2' %] [% ctx.page_title = "Purchase Order" %]
@@ -76,7 +76,7 @@ ); } - [% INCLUDE "default/acq/common/inv_dialog.tt2" + [% INCLUDE "acq/common/inv_dialog.tt2" which = "po" %]
@@ -126,13 +126,13 @@ liFocus = null; } - [% INCLUDE 'default/acq/common/li_table.tt2' %] - [% INCLUDE "default/acq/common/notes.tt2" which = "Po" %] + [% INCLUDE 'acq/common/li_table.tt2' %] + [% INCLUDE "acq/common/notes.tt2" which = "Po" %] - [% INCLUDE "default/acq/po/item_table.tt2" %] + [% INCLUDE "acq/po/item_table.tt2" %]
[% END %] diff --git a/Open-ILS/src/templates/default/acq/receiving/process.tt2 b/Open-ILS/src/templates/acq/receiving/process.tt2 similarity index 95% rename from Open-ILS/src/templates/default/acq/receiving/process.tt2 rename to Open-ILS/src/templates/acq/receiving/process.tt2 index 2604d7c365..17ff83cc25 100644 --- a/Open-ILS/src/templates/default/acq/receiving/process.tt2 +++ b/Open-ILS/src/templates/acq/receiving/process.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER default/base.tt2 %] +[% WRAPPER base.tt2 %]

Receiving Processing


@@ -30,7 +30,7 @@
[% grid_jsid = 'liGrid'; domprefix = 'oils-acq-recv' %] - [% INCLUDE 'default/acq/common/jubgrid.tt2' %] + [% INCLUDE 'acq/common/jubgrid.tt2' %]
diff --git a/Open-ILS/src/templates/default/acq/search/unified.tt2 b/Open-ILS/src/templates/acq/search/unified.tt2 similarity index 98% rename from Open-ILS/src/templates/default/acq/search/unified.tt2 rename to Open-ILS/src/templates/acq/search/unified.tt2 index 1d3f36936e..68e7dcdb2f 100644 --- a/Open-ILS/src/templates/default/acq/search/unified.tt2 +++ b/Open-ILS/src/templates/acq/search/unified.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER "default/base.tt2" %] +[% WRAPPER "base.tt2" %] [% ctx.page_title = "Acquisitions Search" %] @@ -238,8 +238,8 @@ There are no results from your search.
diff --git a/Open-ILS/src/templates/default/acq/settings/li_attr.tt2 b/Open-ILS/src/templates/acq/settings/li_attr.tt2 similarity index 99% rename from Open-ILS/src/templates/default/acq/settings/li_attr.tt2 rename to Open-ILS/src/templates/acq/settings/li_attr.tt2 index 357a0476d2..d096f9662e 100644 --- a/Open-ILS/src/templates/default/acq/settings/li_attr.tt2 +++ b/Open-ILS/src/templates/acq/settings/li_attr.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER default/base.tt2 %] +[% WRAPPER base.tt2 %]
diff --git a/Open-ILS/src/templates/default/actor/user/register.tt2 b/Open-ILS/src/templates/actor/user/register.tt2 similarity index 97% rename from Open-ILS/src/templates/default/actor/user/register.tt2 rename to Open-ILS/src/templates/actor/user/register.tt2 index a82102064e..71f0f4e7a9 100644 --- a/Open-ILS/src/templates/default/actor/user/register.tt2 +++ b/Open-ILS/src/templates/actor/user/register.tt2 @@ -1,5 +1,5 @@ [% ctx.page_title = 'User Editor' %] -[% WRAPPER default/base.tt2 %] +[% WRAPPER base.tt2 %] @@ -10,7 +10,7 @@ return false; - [% INCLUDE default/actor/user/register_table.tt2 %] + [% INCLUDE actor/user/register_table.tt2 %]
diff --git a/Open-ILS/src/templates/default/actor/user/register_table.tt2 b/Open-ILS/src/templates/actor/user/register_table.tt2 similarity index 100% rename from Open-ILS/src/templates/default/actor/user/register_table.tt2 rename to Open-ILS/src/templates/actor/user/register_table.tt2 diff --git a/Open-ILS/src/templates/default/actor/user/trigger_events.tt2 b/Open-ILS/src/templates/actor/user/trigger_events.tt2 similarity index 97% rename from Open-ILS/src/templates/default/actor/user/trigger_events.tt2 rename to Open-ILS/src/templates/actor/user/trigger_events.tt2 index d17cfac7eb..ec0c2f4c59 100644 --- a/Open-ILS/src/templates/default/actor/user/trigger_events.tt2 +++ b/Open-ILS/src/templates/actor/user/trigger_events.tt2 @@ -1,5 +1,5 @@ [% ctx.page_title = 'Events' %] -[% WRAPPER default/base.tt2 %] +[% WRAPPER base.tt2 %] diff --git a/Open-ILS/src/templates/base.tt2 b/Open-ILS/src/templates/base.tt2 index d4f4ebbebe..8a7d682ebf 100644 --- a/Open-ILS/src/templates/base.tt2 +++ b/Open-ILS/src/templates/base.tt2 @@ -1,27 +1,39 @@ [%- ctx.final_dtd = - '' -%] +'' -%] [%- IF !ctx.dtd; ctx.dtd = ctx.final_dtd; END -%] [% ctx.dtd %] + [% ctx.page_title %] - - + + + + - [% INCLUDE login.tt2 %] - [% content %] +
+
+
+ [% INCLUDE header.tt2 %] +
+
+
+
+ [% content %] +
+
+
diff --git a/Open-ILS/src/templates/default/booking/capture.tt2 b/Open-ILS/src/templates/booking/capture.tt2 similarity index 97% rename from Open-ILS/src/templates/default/booking/capture.tt2 rename to Open-ILS/src/templates/booking/capture.tt2 index 79d7e4ea56..2e02d9c6bd 100644 --- a/Open-ILS/src/templates/default/booking/capture.tt2 +++ b/Open-ILS/src/templates/booking/capture.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER "default/base.tt2" %] +[% WRAPPER "base.tt2" %] diff --git a/Open-ILS/src/templates/default/booking/pickup.tt2 b/Open-ILS/src/templates/booking/pickup.tt2 similarity index 99% rename from Open-ILS/src/templates/default/booking/pickup.tt2 rename to Open-ILS/src/templates/booking/pickup.tt2 index 8cff3fa138..d8784c9a52 100644 --- a/Open-ILS/src/templates/default/booking/pickup.tt2 +++ b/Open-ILS/src/templates/booking/pickup.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER "default/base.tt2" %] +[% WRAPPER "base.tt2" %]

diff --git a/Open-ILS/src/templates/default/booking/pull_list.tt2 b/Open-ILS/src/templates/booking/pull_list.tt2 similarity index 98% rename from Open-ILS/src/templates/default/booking/pull_list.tt2 rename to Open-ILS/src/templates/booking/pull_list.tt2 index d4f6765382..002855f0b2 100644 --- a/Open-ILS/src/templates/default/booking/pull_list.tt2 +++ b/Open-ILS/src/templates/booking/pull_list.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER "default/base.tt2" %] +[% WRAPPER "base.tt2" %] diff --git a/Open-ILS/src/templates/default/booking/reservation.tt2 b/Open-ILS/src/templates/booking/reservation.tt2 similarity index 99% rename from Open-ILS/src/templates/default/booking/reservation.tt2 rename to Open-ILS/src/templates/booking/reservation.tt2 index 5eb4a1d398..58880497e9 100644 --- a/Open-ILS/src/templates/default/booking/reservation.tt2 +++ b/Open-ILS/src/templates/booking/reservation.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER "default/base.tt2" %] +[% WRAPPER "base.tt2" %]
diff --git a/Open-ILS/src/templates/default/booking/return.tt2 b/Open-ILS/src/templates/booking/return.tt2 similarity index 99% rename from Open-ILS/src/templates/default/booking/return.tt2 rename to Open-ILS/src/templates/booking/return.tt2 index a2f61c7da7..40e1a32fc9 100644 --- a/Open-ILS/src/templates/default/booking/return.tt2 +++ b/Open-ILS/src/templates/booking/return.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER "default/base.tt2" %] +[% WRAPPER "base.tt2" %]

diff --git a/Open-ILS/src/templates/default/cat/authority/list.tt2 b/Open-ILS/src/templates/cat/authority/list.tt2 similarity index 99% rename from Open-ILS/src/templates/default/cat/authority/list.tt2 rename to Open-ILS/src/templates/cat/authority/list.tt2 index cfc341f34a..c58040b4a7 100644 --- a/Open-ILS/src/templates/default/cat/authority/list.tt2 +++ b/Open-ILS/src/templates/cat/authority/list.tt2 @@ -1,5 +1,5 @@ [% ctx.page_title = 'Authority record list' %] -[% WRAPPER default/base.tt2 %] +[% WRAPPER base.tt2 %] diff --git a/Open-ILS/src/templates/default/circ/selfcheck/audio_config.tt2 b/Open-ILS/src/templates/circ/selfcheck/audio_config.tt2 similarity index 100% rename from Open-ILS/src/templates/default/circ/selfcheck/audio_config.tt2 rename to Open-ILS/src/templates/circ/selfcheck/audio_config.tt2 diff --git a/Open-ILS/src/templates/default/circ/selfcheck/banner.tt2 b/Open-ILS/src/templates/circ/selfcheck/banner.tt2 similarity index 100% rename from Open-ILS/src/templates/default/circ/selfcheck/banner.tt2 rename to Open-ILS/src/templates/circ/selfcheck/banner.tt2 diff --git a/Open-ILS/src/templates/default/circ/selfcheck/circ_page.tt2 b/Open-ILS/src/templates/circ/selfcheck/circ_page.tt2 similarity index 100% rename from Open-ILS/src/templates/default/circ/selfcheck/circ_page.tt2 rename to Open-ILS/src/templates/circ/selfcheck/circ_page.tt2 diff --git a/Open-ILS/src/templates/default/circ/selfcheck/fines.tt2 b/Open-ILS/src/templates/circ/selfcheck/fines.tt2 similarity index 100% rename from Open-ILS/src/templates/default/circ/selfcheck/fines.tt2 rename to Open-ILS/src/templates/circ/selfcheck/fines.tt2 diff --git a/Open-ILS/src/templates/default/circ/selfcheck/holds_page.tt2 b/Open-ILS/src/templates/circ/selfcheck/holds_page.tt2 similarity index 100% rename from Open-ILS/src/templates/default/circ/selfcheck/holds_page.tt2 rename to Open-ILS/src/templates/circ/selfcheck/holds_page.tt2 diff --git a/Open-ILS/src/templates/default/circ/selfcheck/main.tt2 b/Open-ILS/src/templates/circ/selfcheck/main.tt2 similarity index 82% rename from Open-ILS/src/templates/default/circ/selfcheck/main.tt2 rename to Open-ILS/src/templates/circ/selfcheck/main.tt2 index 888ff4c669..3c2be14f88 100644 --- a/Open-ILS/src/templates/default/circ/selfcheck/main.tt2 +++ b/Open-ILS/src/templates/circ/selfcheck/main.tt2 @@ -1,12 +1,12 @@ [% ctx.page_title = 'Self Checkout' %] -[% WRAPPER default/base.tt2 %] +[% WRAPPER base.tt2 %] -[% INCLUDE 'default/circ/selfcheck/audio_config.tt2' %] +[% INCLUDE 'circ/selfcheck/audio_config.tt2' %]
- [% INCLUDE 'default/circ/selfcheck/banner.tt2' %] + [% INCLUDE 'circ/selfcheck/banner.tt2' %]
@@ -15,23 +15,23 @@
- [% INCLUDE 'default/circ/selfcheck/summary.tt2' %] + [% INCLUDE 'circ/selfcheck/summary.tt2' %]
diff --git a/Open-ILS/src/templates/default/circ/selfcheck/patron_login.tt2 b/Open-ILS/src/templates/circ/selfcheck/patron_login.tt2 similarity index 100% rename from Open-ILS/src/templates/default/circ/selfcheck/patron_login.tt2 rename to Open-ILS/src/templates/circ/selfcheck/patron_login.tt2 diff --git a/Open-ILS/src/templates/default/circ/selfcheck/payment.tt2 b/Open-ILS/src/templates/circ/selfcheck/payment.tt2 similarity index 100% rename from Open-ILS/src/templates/default/circ/selfcheck/payment.tt2 rename to Open-ILS/src/templates/circ/selfcheck/payment.tt2 diff --git a/Open-ILS/src/templates/default/circ/selfcheck/summary.tt2 b/Open-ILS/src/templates/circ/selfcheck/summary.tt2 similarity index 100% rename from Open-ILS/src/templates/default/circ/selfcheck/summary.tt2 rename to Open-ILS/src/templates/circ/selfcheck/summary.tt2 diff --git a/Open-ILS/src/templates/default/conify/global/acq/cancel_reason.tt2 b/Open-ILS/src/templates/conify/global/acq/cancel_reason.tt2 similarity index 97% rename from Open-ILS/src/templates/default/conify/global/acq/cancel_reason.tt2 rename to Open-ILS/src/templates/conify/global/acq/cancel_reason.tt2 index 4595ab6f40..63597a614b 100644 --- a/Open-ILS/src/templates/default/conify/global/acq/cancel_reason.tt2 +++ b/Open-ILS/src/templates/conify/global/acq/cancel_reason.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER default/base.tt2 %] +[% WRAPPER base.tt2 %] [% ctx.page_title = 'Cancel Reasons' %] diff --git a/Open-ILS/src/templates/default/conify/global/acq/claim_event_type.tt2 b/Open-ILS/src/templates/conify/global/acq/claim_event_type.tt2 similarity index 97% rename from Open-ILS/src/templates/default/conify/global/acq/claim_event_type.tt2 rename to Open-ILS/src/templates/conify/global/acq/claim_event_type.tt2 index ab91d7800a..6931809db5 100644 --- a/Open-ILS/src/templates/default/conify/global/acq/claim_event_type.tt2 +++ b/Open-ILS/src/templates/conify/global/acq/claim_event_type.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER default/base.tt2 %] +[% WRAPPER base.tt2 %] [% ctx.page_title = 'Claim Event Types' %]
diff --git a/Open-ILS/src/templates/default/conify/global/acq/claim_policy_action.tt2 b/Open-ILS/src/templates/conify/global/acq/claim_policy_action.tt2 similarity index 97% rename from Open-ILS/src/templates/default/conify/global/acq/claim_policy_action.tt2 rename to Open-ILS/src/templates/conify/global/acq/claim_policy_action.tt2 index 603b543b45..a50c0ddc1e 100644 --- a/Open-ILS/src/templates/default/conify/global/acq/claim_policy_action.tt2 +++ b/Open-ILS/src/templates/conify/global/acq/claim_policy_action.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER default/base.tt2 %] +[% WRAPPER base.tt2 %] [% ctx.page_title = 'Claim Policy Actions' %]
diff --git a/Open-ILS/src/templates/default/conify/global/acq/claim_type.tt2 b/Open-ILS/src/templates/conify/global/acq/claim_type.tt2 similarity index 97% rename from Open-ILS/src/templates/default/conify/global/acq/claim_type.tt2 rename to Open-ILS/src/templates/conify/global/acq/claim_type.tt2 index 7f0fbc3cb0..e9fc2eec41 100644 --- a/Open-ILS/src/templates/default/conify/global/acq/claim_type.tt2 +++ b/Open-ILS/src/templates/conify/global/acq/claim_type.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER default/base.tt2 %] +[% WRAPPER base.tt2 %] [% ctx.page_title = 'Claim Types' %]
diff --git a/Open-ILS/src/templates/default/conify/global/acq/distribution_formula.tt2 b/Open-ILS/src/templates/conify/global/acq/distribution_formula.tt2 similarity index 99% rename from Open-ILS/src/templates/default/conify/global/acq/distribution_formula.tt2 rename to Open-ILS/src/templates/conify/global/acq/distribution_formula.tt2 index 13b8647546..a877a0817c 100644 --- a/Open-ILS/src/templates/default/conify/global/acq/distribution_formula.tt2 +++ b/Open-ILS/src/templates/conify/global/acq/distribution_formula.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER default/base.tt2 %] +[% WRAPPER base.tt2 %] [% ctx.page_title = 'Distribution Formulas' %]
diff --git a/Open-ILS/src/templates/default/conify/global/acq/edi_account.tt2 b/Open-ILS/src/templates/conify/global/acq/edi_account.tt2 similarity index 99% rename from Open-ILS/src/templates/default/conify/global/acq/edi_account.tt2 rename to Open-ILS/src/templates/conify/global/acq/edi_account.tt2 index eebadd411c..12e9acb358 100644 --- a/Open-ILS/src/templates/default/conify/global/acq/edi_account.tt2 +++ b/Open-ILS/src/templates/conify/global/acq/edi_account.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER default/base.tt2 %] +[% WRAPPER base.tt2 %] [% ctx.page_title = 'EDI Accounts' %] diff --git a/Open-ILS/src/templates/default/conify/global/config/usr_setting_type.tt2 b/Open-ILS/src/templates/conify/global/config/usr_setting_type.tt2 similarity index 98% rename from Open-ILS/src/templates/default/conify/global/config/usr_setting_type.tt2 rename to Open-ILS/src/templates/conify/global/config/usr_setting_type.tt2 index 2b477a29ff..4c213ed088 100644 --- a/Open-ILS/src/templates/default/conify/global/config/usr_setting_type.tt2 +++ b/Open-ILS/src/templates/conify/global/config/usr_setting_type.tt2 @@ -1,4 +1,4 @@ -[% WRAPPER default/base.tt2 %] +[% WRAPPER base.tt2 %] [% ctx.page_title = 'User Setting Types' %]