From: Dan Scott Date: Mon, 24 Nov 2014 20:53:06 +0000 (-0500) Subject: Sync up OSUL skin with base templates X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=da986ae2b1b0788cc73be3dde48ed1c4d25aa217;p=contrib%2FConifer.git Sync up OSUL skin with base templates Looks like, in many cases, the base skin now has what we were carrying along as customizations. Sweet! Signed-off-by: Dan Scott --- diff --git a/Open-ILS/src/templates_laurentian/opac/myopac/lists.tt2 b/Open-ILS/src/templates_laurentian/opac/myopac/lists.tt2 deleted file mode 100644 index eba5521278..0000000000 --- a/Open-ILS/src/templates_laurentian/opac/myopac/lists.tt2 +++ /dev/null @@ -1,333 +0,0 @@ -[% PROCESS "opac/parts/header.tt2"; - PROCESS "opac/parts/misc_util.tt2"; - WRAPPER "opac/parts/myopac/base.tt2"; - myopac_page = "lists" - limit = ctx.bookbags_limit; - offset = ctx.bookbags_offset; -%] -
- - -
-

[% l('Create new list') %]

- - - - - - - - - - -
- - - [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - - - [% IF ctx.add_rec %] - - [% END %] - [% IF ctx.where_from %] - - [% END %] - - - - [% l('Sharing Help') %] - - -       - -
- - - -
-
- -

[% l("Your existing lists") %]

- [% INCLUDE "opac/parts/anon_list.tt2" %] - [% IF ctx.bookbags.size %] -
- [% l('Saved Lists') %] - [% IF limit < ctx.bookbag_count; %] - - [%- IF offset > 0 -%] - limit, offset => (offset - limit) - }) %]'>◄[% l('Previous') %] - [%- END; -%] - [%- IF (ctx.bookbag_count - offset) > limit; -%] - limit, offset => (offset + limit) - }) %]'>[% l('Next') %]► - - [%- END; -%] - [% END %] -
-
- -
- [% FOR bbag IN ctx.bookbags %] -
-
- [% baseurl = ctx.opac_root _ '/myopac/lists'; - IF bbag.id != CGI.param("bbid"); - url = mkurl(baseurl,{bbid => bbag.id},['edit_notes','sort']); - ltitle = l("Show items in list"); - ELSE; - url = mkurl(baseurl, {}, ['bbid', 'edit_notes', 'sort']); - ltitle = l("Hide items in list"); - END %] -

[% bbag.name | html %]

- [% IF bbag.description %]
[% bbag.description | html %]
[% END %] -
- [% IF ctx.add_rec %] -
-
- - - - [% IF ctx.where_from %] - - [% END %] - -
-
- [% END %] -
-
- - [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - [% IF bbag.pub != 't' %] - - - [% ELSE %] - - - [% END %] -
-
-
-
- - - [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - -
-
-
-
- - - [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - -
-
- [% setting = 'opac.default_list'; %] -
-
- - [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - [% IF ctx.user_setting_map.$setting == bbag.id %] - - - [% ELSE %] - - - [% END %] -
-
-
- [% IF bbag.pub == 't'; %] - [% l('RSS Feed') %] - [% END %] -
-
- [% IF bbag.pub == 't'; %] - '0', bookbag => bbag.id, depth => 0, locg => ctx.search_ou}, - 1 - ) - -%]'>[% l('HTML View') %] - [% END %] -
-
-
- [% IF CGI.param("bbid") == bbag.id %] -
-
-
- - [%- INCLUDE "opac/parts/preserve_params.tt2" params=['loc', 'query', 'qtype']; %] - [% INCLUDE "opac/parts/filtersort.tt2" - value=CGI.param('sort') mode='bookbag' %] - - -
-
-
-
- - - - - [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - - - - - - - - - - -
- - - - - [% l("Save changes to name or description?") %]
- -
- -
-
-
-
-
-
- - - - - - - - - - - - - - - - [% UNLESS bbag.items.size %] - - [% END %] - [% FOR item IN bbag.items; - rec_id = item.target_biblio_record_entry.id; - attrs = {marc_xml => ctx.bookbags_marc_xml.$rec_id}; - PROCESS get_marc_attrs args=attrs %] - - - - - - - [% IF CGI.param("edit_notes") == bbag.id %] - - [% ELSE %] - - [% END %] - - [% END %] - [% IF CGI.param("edit_notes") == bbag.id %] - - - - - [% END %] - -
- - - - [% l('Title') %] - - [% l('Author(s)') %] - - [% l('Publication Date') %] - - [% l('Format') %] - - [% l('Notes') %] - [% IF CGI.param("edit_notes") != bbag.id %] - | [% l('Edit') %] - [% END %] - - - [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - -
- [% l("This list contains no items.") %] -
- - - [% attrs.title | html %] - - [% attrs.author | html %] - - [% attrs.pubdate | html %] - - [% attrs.format_label | html %] - - [% FOR note IN item.notes %] - - [% END %] - - - [% FOR note IN item.notes %] -
[% note.note | html %]
- [% END %] -
- [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - - -
-
- [% END %] - [% END %] -
- [% END %] - - -[% |l %]Sharing a Bookbag means that the contents -of the Bookbag will be visible to others. -To see the public view of a shared Bookbag, -click on the Bookbag's name in the Bookbag list.[% END %] - -
-[% END %] diff --git a/Open-ILS/src/templates_laurentian/opac/parts/anon_list.tt2 b/Open-ILS/src/templates_laurentian/opac/parts/anon_list.tt2 deleted file mode 100644 index b075e83398..0000000000 --- a/Open-ILS/src/templates_laurentian/opac/parts/anon_list.tt2 +++ /dev/null @@ -1,69 +0,0 @@ - [% IF ctx.mylist.size %] -
-
- - [% INCLUDE "opac/parts/filtersort.tt2" mode='bookbag' - id="anonsort" name="anonsort" value=CGI.param("anonsort") %] - - [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - -
-
- -
-
-

[% l('Temporary List') %]

- - - - - - - - - - [% FOR item IN ctx.mylist; - attrs = {marc_xml => ctx.mylist_marc_xml.$item}; - PROCESS get_marc_attrs args=attrs %] - - - - - - [% END %] - -
- - [% l('Title') %][% l('Author(s)') %] - - - [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - -
- - [% attrs.title | html %][% attrs.author | html %]
-

-
-
- [% END %] diff --git a/Open-ILS/src/templates_laurentian/opac/parts/base.tt2 b/Open-ILS/src/templates_laurentian/opac/parts/base.tt2 deleted file mode 100644 index 30882d1388..0000000000 --- a/Open-ILS/src/templates_laurentian/opac/parts/base.tt2 +++ /dev/null @@ -1,30 +0,0 @@ - - - - - [% IF ctx.refresh %] - - [% ELSIF ctx.authtime %] - - [% END %] - - - - [% l('Catalog - [_1]', ctx.page_title) %] - - [% IF want_dojo %] - - [% END %] - [% INCLUDE 'opac/parts/goog_analytics.tt2' %] - - - [% content %] - [% INCLUDE 'opac/parts/footer.tt2' %] - [% INCLUDE 'opac/parts/js.tt2' %] - [%- IF ENV.OILS_CHILIFRESH_ACCOUNT %] - [%- INCLUDE 'opac/parts/chilifresh.tt2' %] - [%- END %] - - diff --git a/Open-ILS/src/templates_laurentian/opac/parts/config.tt2 b/Open-ILS/src/templates_laurentian/opac/parts/config.tt2 index 1f93e971b5..555e262ff4 100644 --- a/Open-ILS/src/templates_laurentian/opac/parts/config.tt2 +++ b/Open-ILS/src/templates_laurentian/opac/parts/config.tt2 @@ -8,7 +8,10 @@ ############################################################################## # Holds blocking ############################################################################## -# Block the ability to place holds if item is available +# Prevent the "Place hold" link from being displayed if a copy is available. +# This is not perfect, given the umpteen different types of holds that are +# possible, but addresses the major use case for libraries that don't want +# to fetch copies from the shelves. ctx.holds_block.enabled = 'true'; ############################################################################## @@ -99,29 +102,40 @@ facet.display = [ ############################################################################## # Define the advanced search limiters and labels. +# Each entry is put into a table cell. # adv_label is the (translated) label for the limiter # adv_attr is an array of possible limiters, the first one that has any # values will be used +# adv_filter is the same as adv_attr, but for search filter groups +# adv_size lets you set the height of the adv_attr or adv_filter select box. +# if adv_size < 1, the box height is set to the number of options in it. # adv_break will end the current row. If specified with a label/attr it # will do so *after* that limiter. # adv_special will drop in a special entry: # lib_selector will put the search library box (with limit to available) # pub_year will put the publication year box # sort_selector will put the sort results selector +# id DOM id used for linking labels to form controls. They are pinned +# here instead of auto-generated (from the attr type, for example) +# for consistency. search.adv_config = [ - {adv_label => l("Item Type"), adv_attr => ["mattype", "item_type"]}, - {adv_label => l("Item Form"), adv_attr => "item_form"}, - {adv_label => l("Language"), adv_attr => "item_lang"}, - {adv_label => l("Audience"), adv_attr => ["audience_group", "audience"], adv_break => 1}, - {adv_label => l("Video Format"), adv_attr => "vr_format"}, - {adv_label => l("Bib Level"), adv_attr => "bib_level"}, - {adv_label => l("Literary Form"), adv_attr => "lit_form", adv_break => 1}, - {adv_label => l("Search Library"), adv_special => "lib_selector"}, - {adv_label => l("Publication Year"), adv_special => "pub_year"}, - {adv_label => l("Sort Results"), adv_special => "sort_selector"}, + {adv_label => l("Item Type"), adv_attr => ["mattype", "item_type"], id => 'adv_selector_item_type'}, + {adv_label => l("Item Form"), adv_attr => "item_form", id => 'adv_selector_item_form'}, + {adv_label => l("Language"), adv_attr => "item_lang", id => 'adv_selector_item_lang'}, + {adv_label => l("Audience"), adv_attr => ["audience_group", "audience"], id => 'adv_selector_audience', adv_break => 1}, + {adv_label => l("Video Format"), adv_attr => "vr_format", id => 'adv_selector_video_format'}, + {adv_label => l("Bib Level"), adv_attr => "bib_level", id => 'adv_selector_bib_level'}, + {adv_label => l("Literary Form"), adv_attr => "lit_form", id => 'adv_selector_lit_form'}, + {adv_label => l("Shelving Location"), adv_special => "copy_location", id => 'adv_copy_location_selector', js_only => 1, adv_break => 1}, + {adv_label => l("Search Library"), adv_special => "lib_selector", id => 'adv_org_selector'}, + {adv_label => l("Publication Year"), adv_special => "pub_year", id => 'adv_selector_pub_year'}, + {adv_label => l("Sort Results"), adv_special => "sort_selector", id => 'adv_selector_sort_results'}, ]; +# Set the default height of the select boxes. Defaults to 4. +#search.default_adv_select_height = 4; + ############################################################################## # For each search box the default "query type" value can be specified here # This is the actual backend value, not the label @@ -141,7 +155,7 @@ search.default_qtypes = ['keyword','title','author']; search.basic_config = { type => 'attr', - group => ['mattype','item_type'], + group => [ctx.get_cgf('opac.format_selector.attr').value, 'item_type'], none_label => l("All Formats"), }; @@ -150,4 +164,29 @@ search.basic_config = { # Set to 1 or 'true' to enable ctx.google_books_preview = 1; +############################################################################## + +# Set a maintenance message to display in the catalogue +# +# ctx.maintenance_message = "The system will not be available February 29, 2104."; + + +############################################################################## +# Metarecords configuration +# metarecords.disabled = 1; # disable all metarecord access points +############################################################################## + +############################################################################## +# Local date format (uses POSIX strftime() formatting) +# See http://www.template-toolkit.org/docs/modules/Template/Plugin/Date.html +# DATE_FORMAT = '%Y-%m-%d'; # for 2014-06-31 format +############################################################################## + +############################################################################## +# Local time format (uses POSIX strftime() formatting) +# See http://www.template-toolkit.org/docs/modules/Template/Plugin/Date.html +# TIME_FORMAT = '%H:%M:%S'; # for 16:32:32 (24 hour) format +# TIME_FORMAT = '%H:%M'; # for 16:32 (24 hour) format +############################################################################## + %] diff --git a/Open-ILS/src/templates_laurentian/opac/parts/css/colors.tt2 b/Open-ILS/src/templates_laurentian/opac/parts/css/colors.tt2 index db3dd3b770..ddd26dd9bd 100644 --- a/Open-ILS/src/templates_laurentian/opac/parts/css/colors.tt2 +++ b/Open-ILS/src/templates_laurentian/opac/parts/css/colors.tt2 @@ -31,6 +31,7 @@ button_text = "#fbf9f9", # off-white button_text_shadow = "#555555", # medium grey table_heading = "#d8d8d8", # grey-blue + mobile_header_text = "#fff", # white }; %] diff --git a/Open-ILS/src/templates_laurentian/opac/parts/footer.tt2 b/Open-ILS/src/templates_laurentian/opac/parts/footer.tt2 index 3a2b5c59fb..eaa8d5a0a0 100644 --- a/Open-ILS/src/templates_laurentian/opac/parts/footer.tt2 +++ b/Open-ILS/src/templates_laurentian/opac/parts/footer.tt2 @@ -1,6 +1,12 @@