From: Bill Erickson Date: Thu, 1 Sep 2011 14:58:03 +0000 (-0400) Subject: Remove /default/ from template paths X-Git-Tag: sprint4-merge-nov22~5128^2~29 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=88fd947e16d750f6d48f8f2618f09f78cfe19a40;p=working%2FEvergreen.git 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 --- 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/acq/common/claim_dialog.tt2 b/Open-ILS/src/templates/acq/common/claim_dialog.tt2 new file mode 100644 index 0000000000..741a8a6366 --- /dev/null +++ b/Open-ILS/src/templates/acq/common/claim_dialog.tt2 @@ -0,0 +1,60 @@ +
+ +
Claims
+
Against item: + + () +
+ + +
diff --git a/Open-ILS/src/templates/acq/common/final_claim_dialog.tt2 b/Open-ILS/src/templates/acq/common/final_claim_dialog.tt2 new file mode 100644 index 0000000000..882741cb6d --- /dev/null +++ b/Open-ILS/src/templates/acq/common/final_claim_dialog.tt2 @@ -0,0 +1,8 @@ +
+ + + + + +
+ diff --git a/Open-ILS/src/templates/acq/common/info.tt2 b/Open-ILS/src/templates/acq/common/info.tt2 new file mode 100644 index 0000000000..6fc5456339 --- /dev/null +++ b/Open-ILS/src/templates/acq/common/info.tt2 @@ -0,0 +1,24 @@ +[% which_lc = which | lower %] + diff --git a/Open-ILS/src/templates/acq/common/inv_dialog.tt2 b/Open-ILS/src/templates/acq/common/inv_dialog.tt2 new file mode 100644 index 0000000000..3bec75cf9a --- /dev/null +++ b/Open-ILS/src/templates/acq/common/inv_dialog.tt2 @@ -0,0 +1,30 @@ + +Choose invoice + + + + + + + + + + + + +
+ + + +
+ + + +
+ +
diff --git a/Open-ILS/src/templates/acq/common/jubgrid.tt2 b/Open-ILS/src/templates/acq/common/jubgrid.tt2 new file mode 100644 index 0000000000..ce13d56449 --- /dev/null +++ b/Open-ILS/src/templates/acq/common/jubgrid.tt2 @@ -0,0 +1,209 @@ +[%#- +This template creates a split screen Dojo layout. The top frame +of the screen holds a list of of JUBs, or titles. Clicking on a +title in the top frame will load the purchase details for all the +copies on order for that title into the bottom frame. + +To create a display for a set of JUBs, create a Dojo store and +model for the set of JUBs, then place the following lines in your +HTML where you want the display to appear: + + <%namespace file='/oils/default/common/jubgrid.html' name='jubgrid'/> + ${jubgrid.jubgrid('dom_prefix', 'grid_jsid')} + +where 'dom_prefix' is a string that will be used as the prefix +for the DOM notes that are created by this template, and +'grid_jsid' is a valid JavaScript identifier that will name the +DOM node to which the list of JUBs will be attached. For example + + ${jubgrid.jubgrid('oils-acq-picklist', 'pickListGrid', hideDetails)} + +will create a Dojo grid with the DOM id of + + 'oils-acq-picklist-JUB-grid' + +and a jsid of + + pickListGrid + +To fill the grid with data, call the javascript function + + JUBGrid.populate(grid_jsid, model) + +'grid_jsid' is the same javascript id that was used to +instantiate the template, and model is a javascript variable +pointing to the JUB model (and store) that you have created. +-#%] + +[% UNLESS hide_details %] +
+[% END %] + + + + + + + +[% UNLESS hide_details %] + + +
+
+ + +
+
+
+[% ELSE %] +
+[% END %] +
+
+
+[% UNLESS hide_details %] + +
+
+
+ New Copy +
+ + + + + + + + + + + + + +
+ +
+
+ +
+
+
+ + +
+
+ + +
+
+
+
+
+
+
+[% END %] diff --git a/Open-ILS/src/templates/acq/common/li_table.tt2 b/Open-ILS/src/templates/acq/common/li_table.tt2 new file mode 100644 index 0000000000..268e9873ad --- /dev/null +++ b/Open-ILS/src/templates/acq/common/li_table.tt2 @@ -0,0 +1,473 @@ + + + +
+ + + + [% INCLUDE "acq/common/info.tt2" which = "Lit" %] + + + [% INCLUDE "acq/common/notes.tt2" which = "Lit" %] + + + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + +
+ + +
+
+ + + + +
+ diff --git a/Open-ILS/src/templates/acq/common/li_table_pager.tt2 b/Open-ILS/src/templates/acq/common/li_table_pager.tt2 new file mode 100644 index 0000000000..bdae5b2761 --- /dev/null +++ b/Open-ILS/src/templates/acq/common/li_table_pager.tt2 @@ -0,0 +1,17 @@ + +
+ + + +
diff --git a/Open-ILS/src/templates/acq/common/notes.tt2 b/Open-ILS/src/templates/acq/common/notes.tt2 new file mode 100644 index 0000000000..609cf6c812 --- /dev/null +++ b/Open-ILS/src/templates/acq/common/notes.tt2 @@ -0,0 +1,62 @@ +[% which_lc = which | lower %] + diff --git a/Open-ILS/src/templates/acq/financial/claim_eligible.tt2 b/Open-ILS/src/templates/acq/financial/claim_eligible.tt2 new file mode 100644 index 0000000000..fc8784259d --- /dev/null +++ b/Open-ILS/src/templates/acq/financial/claim_eligible.tt2 @@ -0,0 +1,57 @@ +[% WRAPPER "base.tt2" %] +[% ctx.page_title = "Items Eligible For Claiming" %] + +
+

Items Eligible For Claiming

+
+ Show items ready to claim for: + + +
+
+ +
+ + + + + + + + + + + + + + + + +
Items
+ + +
+ +
+ There were no items matching your search. +
+
+ +
+
+ + + +[% END %] diff --git a/Open-ILS/src/templates/acq/financial/list_currency_types.tt2 b/Open-ILS/src/templates/acq/financial/list_currency_types.tt2 new file mode 100644 index 0000000000..dfa5d2d4d5 --- /dev/null +++ b/Open-ILS/src/templates/acq/financial/list_currency_types.tt2 @@ -0,0 +1,35 @@ +[% WRAPPER base.tt2 %] +
+
Currency Type
+
+ + +
+
+
+ +
+
+ + + +[% END %] + + diff --git a/Open-ILS/src/templates/acq/financial/list_funding_sources.tt2 b/Open-ILS/src/templates/acq/financial/list_funding_sources.tt2 new file mode 100644 index 0000000000..432c471ecb --- /dev/null +++ b/Open-ILS/src/templates/acq/financial/list_funding_sources.tt2 @@ -0,0 +1,51 @@ +[% WRAPPER 'base.tt2' %] + + + + +
+ +
+
Funding Sources
+
+ + +
+
+ + + + + + +
+ + +
+
+ + + + +[% END %] diff --git a/Open-ILS/src/templates/acq/financial/list_funds.tt2 b/Open-ILS/src/templates/acq/financial/list_funds.tt2 new file mode 100644 index 0000000000..dca2a0ac0d --- /dev/null +++ b/Open-ILS/src/templates/acq/financial/list_funds.tt2 @@ -0,0 +1,162 @@ +[% WRAPPER 'base.tt2' %] +[% ctx.page_title = 'Funds' %] + + + + + + + + + + +
Funds + + + + +
+ Fund Propagation & Rollover +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ Propagation creates new funds for the subsequent fiscal year based on the + funds for the selected fiscal year. Only funds with the propagate setting + enabled will be affected. No money or encumbrances are altered + during this process. +
+
+ +
+
+ The year end close out operation moves encumbrances from the selected fiscal + year to the analogous funds in the subsequent fiscal year and it deactivates + funds for the selected fiscal year. Additionally, for all funds that have + the "Rollover" setting enabled, this process will move all unspent money to + the analogous fund in the subsequent fiscal year. +
+
Context Org Unit:
Include Funds for Descendant Org Units:
+ +
+
+ When Dry Run is selected, the system will generate a summary of + the changes that would occur during the selected operation(s). + No data will be changed. +
+
+ +
+
+
+
+ +
+ Context Org Unit + + + Year + + +
Refresh
+
+ +
+
+ +
+
+ +
+ + + + + + + +
+
+
+ +[% END %] diff --git a/Open-ILS/src/templates/acq/financial/view_fund.tt2 b/Open-ILS/src/templates/acq/financial/view_fund.tt2 new file mode 100644 index 0000000000..7eb63e3c91 --- /dev/null +++ b/Open-ILS/src/templates/acq/financial/view_fund.tt2 @@ -0,0 +1,257 @@ +[% WRAPPER 'base.tt2' %] + + +
+
Fund Details
+
+ +
+ +
+ Create Allocation +
+ + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
+ +
+ +
+
+
+
+ Transfer Money +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ +
+
+
+
+ + +
+
+ + +
+ +
+
+ + + + + + + + + + + + + + + + +
IDNameCodeCurrency TypeOwnerBalanceTotal AllocatedSpent BalanceTotal DebitsTotal SpentTotal Encumbered
+
+
+
+ + +
+ + +
+
+ + + + + + + +
+
+
+
+
+ + +
+ + +
+ +
+ + +
+
+
+
+ +
+ +
+
+
+ Add Tag +
+ + +
+
+
+
+
+
+ + + + + +[% END %] diff --git a/Open-ILS/src/templates/acq/financial/view_funding_source.tt2 b/Open-ILS/src/templates/acq/financial/view_funding_source.tt2 new file mode 100644 index 0000000000..6ab579480d --- /dev/null +++ b/Open-ILS/src/templates/acq/financial/view_funding_source.tt2 @@ -0,0 +1,173 @@ +[% WRAPPER 'base.tt2' %] + + +
+
Funding Source Details
+
+ +
+ + +
+ Apply Credit +
+ + + + + + + + + + + + +
+ +
+ +
+ +
+
+
+
+ Allocate to Fund +
+ + + + + + + + + + + + + + + + + + +
+ + +
+ +
+ +
+ +
+
+
+
+ +
+
+ +
+ + +
+
+ + + + + + + + + + + + + +
IDNameCodeBalanceTotal CreditsTotal DebitsCurrency TypeOwner
+
+
+
+ +
+ + +
+
+ + +
+
+
+
+ + +
+ + +
+
+ + + + + + + +
+
+
+
+
+ +
+
+ + + + +[% END %] + diff --git a/Open-ILS/src/templates/acq/financial/view_provider.tt2 b/Open-ILS/src/templates/acq/financial/view_provider.tt2 new file mode 100644 index 0000000000..6fdc4256e1 --- /dev/null +++ b/Open-ILS/src/templates/acq/financial/view_provider.tt2 @@ -0,0 +1,118 @@ +[% WRAPPER base.tt2 %] + + +
+
+ +
+
+
+ + + + + + + + + + +
IDNameCodeOwnerCurrency Type
+
+
+
+ +
+ +
+ + +
+ Create Order Record Field +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+
+
+ + + +
+ + +
+
+ + + + + + + + + + + +
IDCodeDescriptionTagSubfieldXPath
+
+
+
+ +[% END %] + diff --git a/Open-ILS/src/templates/acq/invoice/view.tt2 b/Open-ILS/src/templates/acq/invoice/view.tt2 new file mode 100644 index 0000000000..0ddca258d1 --- /dev/null +++ b/Open-ILS/src/templates/acq/invoice/view.tt2 @@ -0,0 +1,137 @@ +[% WRAPPER 'base.tt2' %] +[% ctx.page_title = 'Invoicing' %] + +
+ +
+
Invoice
+
+
+ +
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Direct Charges, Taxes, Fees, etc.

+
Charge TypeFundTitle/DescriptionBilledPaidDelete
Delete
+ Add Charge... +
+

+
+ TotalTotalBalance
+ + + + +
+
+
+
+
+
+
+
+ Select a fund for the new items:
+

+

+ + + + +
+
+ + +[% END %] diff --git a/Open-ILS/src/templates/acq/lineitem/findbib.tt2 b/Open-ILS/src/templates/acq/lineitem/findbib.tt2 new file mode 100644 index 0000000000..7eedc44d77 --- /dev/null +++ b/Open-ILS/src/templates/acq/lineitem/findbib.tt2 @@ -0,0 +1,73 @@ +[% WRAPPER "base.tt2" %] +[% ctx.page_title = "Locate Bib Record" %] + + + + +
+
+
+
+ +
+
+
+
+
+ +
+
+
+ View MARC + Select + + + + + + + + + + +
+
+
+
+ + + +