Sync up OSUL skin with base templates
authorDan Scott <dscott@laurentian.ca>
Mon, 24 Nov 2014 20:53:06 +0000 (15:53 -0500)
committerDan Scott <dscott@laurentian.ca>
Mon, 24 Nov 2014 20:53:06 +0000 (15:53 -0500)
Looks like, in many cases, the base skin now has what we were
carrying along as customizations. Sweet!

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Open-ILS/src/templates_laurentian/opac/myopac/lists.tt2 [deleted file]
Open-ILS/src/templates_laurentian/opac/parts/anon_list.tt2 [deleted file]
Open-ILS/src/templates_laurentian/opac/parts/base.tt2 [deleted file]
Open-ILS/src/templates_laurentian/opac/parts/config.tt2
Open-ILS/src/templates_laurentian/opac/parts/css/colors.tt2
Open-ILS/src/templates_laurentian/opac/parts/footer.tt2
Open-ILS/src/templates_laurentian/opac/parts/homesearch.tt2
Open-ILS/src/templates_laurentian/opac/parts/login/form.tt2
Open-ILS/src/templates_laurentian/opac/parts/record/copy_counts.tt2 [new file with mode: 0644]
Open-ILS/src/templates_laurentian/opac/parts/record/subjects.tt2

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 (file)
index eba5521..0000000
+++ /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;
-%]
-<div id='myopac_bookbag_div' style="padding:5px;">
-
-    <!-- new list creation -->
-    <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="POST" id="create_form">
-        <h1>[% l('Create new list') %]</h1><a name="createnewlist"></a>
-        <table cellpadding="0" border="0" id="list_create_table">
-            <tr>
-                <td>
-                    <label for="list_create_name">[% l('Enter the name of the new list:') %]</label>
-                </td>
-                <td>
-                    [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                    <input id="list_create_name" type="text" name="name" />
-                    <input type="hidden" name="action" value="create" />
-                    [% IF ctx.add_rec %]
-                    <input type="hidden" name="add_rec" value="[% ctx.add_rec %]" />
-                    [% END %]
-                    [% IF ctx.where_from %]
-                    <input type="hidden" name="where_from" value="[% ctx.where_from %]" />
-                    [% END %]
-                </td>
-                <td>
-                    <label for="list_create_shared">[% l('Share this list?') %]</label>
-                    <select name="shared" id="list_create_shared">
-                        <option value="0">[% l('No') %]
-                        <option value="1">[% l('Yes') %]
-                    </select>
-                    <a href="javascript:void(0);" onclick="alert(document.getElementById('bb_publish_text').innerHTML);"><img alt="[% l('Sharing Help') %]"
-                        src="[% ctx.media_prefix %]/images/question-mark.png" /></a>
-                </td>
-                <td class="list-create-table-buttons">
-                    <input type="submit"
-                        value="[% l('Submit') %]"
-                        alt="[% l('Submit') %]"
-                        class="opac-button"/>
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    <input type="reset"
-                        value="[% l('Cancel') %]"
-                        alt="[% l('Cancel') %]"
-                        class="opac-button" />
-                </td>
-            </tr>
-            <tr>
-                <td class="text-right-top">
-                    <label for="list_description">[% l("List description (optional):") %]</label>
-                </td>
-                <td colspan="3">
-                    <textarea cols="40" rows="3" name="description"
-                        id="list_description"></textarea>
-                </td>
-        </table>
-    </form>
-
-    <h1>[% l("Your existing lists") %]</h1>
-    [% INCLUDE "opac/parts/anon_list.tt2" %]
-    [% IF ctx.bookbags.size %]
-    <div class="header_middle">
-        <span class="float-left">[% l('Saved Lists') %]</span>
-        [% IF limit < ctx.bookbag_count; %]
-        <span class='float-left' style='padding-left: 10px;'>
-            [%- IF offset > 0 -%]
-                <a href='[% mkurl(ctx.opac_root _ '/myopac/lists', {
-                    limit => limit, offset => (offset - limit)
-                }) %]'><span class="nav_arrow_fix">&#9668;</span>[% l('Previous') %]</a>
-            [%- END; -%]
-            [%- IF (ctx.bookbag_count - offset) > limit; -%] 
-                <a href='[% mkurl(ctx.opac_root _ '/myopac/lists', {
-                    limit => limit, offset => (offset + limit)
-                }) %]'>[% l('Next') %]<span class="nav_arrow_fix">&#9658;</span></a>
-            </span>
-            [%- END; -%]
-        [% END %]
-    </div>
-    <div class="clear-both"></div>
-
-    <div id='acct_lists_prime'>
-        [% FOR bbag IN ctx.bookbags %]
-        <div class="bookbag-controls-holder">
-            <div class="bookbag-controls most">
-                [% 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 %]
-                <h2 class="bookbag-name"><a title="[% ltitle %]" href="[% url %]">[% bbag.name | html %]</a></h2>
-                [% IF bbag.description %]<div class="bookbag-description">[% bbag.description | html %]</div>[% END %]
-            </div>
-            [% IF ctx.add_rec %]
-            <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update', {}, 1) %]" method="POST">
-                <div class="bookbag-controls">
-                    <input type="hidden" name="action" value="add_rec" />
-                    <input type="hidden" name="list" value="[% bbag.id %]" />
-                    <input type="hidden" name="add_rec" value="[% ctx.add_rec %]" />
-                    [% IF ctx.where_from %]
-                    <input type="hidden" name="where_from" value="[% ctx.where_from %]" />
-                    [% END %]
-                    <input class="fixed" type="submit" value="[% l('Add to this list') %]" />
-                </div>
-            </form>
-            [% END %]
-            <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="POST">
-                <div class="bookbag-share">
-                    <input type="hidden" name="list" value="[% bbag.id %]" />
-                    [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                    [% IF bbag.pub != 't' %]
-                    <input type="hidden" name="action" value="show" />
-                    <input class="fixed" type="submit" value="[% l('Share') %]" />
-                    [% ELSE %]
-                    <input type="hidden" name="action" value="hide" />
-                    <input class="fixed" type="submit" value="[% l('Hide') %]" />
-                    [% END %]
-                </div>
-            </form>
-            <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="POST">
-                <div class="bookbag-controls">
-                    <input type="hidden" name="list" value="[% bbag.id %]" />
-                    <input type="hidden" name="action" value="delete" />
-                    [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                    <input type="submit" value="[% l('Delete List') %]" />
-                </div>
-            </form>
-            <form action="[% mkurl(ctx.opac_root _ '/myopac/list/print') %]" method="POST">
-                <div class="bookbag-controls">
-                    <input type="hidden" name="list" value="[% bbag.id %]" />
-                    <input type="hidden" name="sort" value="[% CGI.param('sort') | html %]" />
-                    [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                    <input type="submit" value="[% l('Download CSV') %]" />
-                </div>
-            </form>
-            [% setting = 'opac.default_list'; %]
-            <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="POST">
-                <div class="bookbag-controls">
-                    <input type="hidden" name="list" value="[% bbag.id %]" />
-                    [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                    [% IF ctx.user_setting_map.$setting == bbag.id %]
-                    <input type="hidden" name="action" value="remove_default" />
-                    <input type="submit" value="[% l('Remove Default List') %]" />
-                    [% ELSE %]
-                    <input type="hidden" name="action" value="make_default" />
-                    <input type="submit" value="[% l('Make Default List') %]" />
-                    [% END %]
-                </div>
-            </form>
-            <div class="bookbag-controls">
-                [% IF bbag.pub == 't'; %]
-                <a target='_blank' href='/opac/extras/feed/bookbag/rss2-full/[% bbag.id %]'><img
-                    alt="[% l('RSS Feed') %]" border="0"
-                    src="[% ctx.media_prefix %]/images/small-rss.png"/></a>
-                [% END %]
-            </div>
-            <div class="bookbag-controls">
-                [% IF bbag.pub == 't'; %]
-                <a href='[%-
-                    mkurl(
-                        ctx.opac_root _ '/results',
-                        {page => '0', bookbag => bbag.id, depth => 0, locg => ctx.search_ou},
-                        1
-                    )
-                -%]'>[% l('HTML View') %]</a>
-                [% END %]
-            </div>
-            <div class="clear-both pad-bottom-five"></div>
-        </div>
-        [% IF CGI.param("bbid") == bbag.id %]
-        <div class="bookbag-specific">
-            <div class="sort">
-                <form method="GET">
-                    <label for="opac.result.sort">[% l("Sort list items by: ") %]</label>
-                    [%- INCLUDE "opac/parts/preserve_params.tt2" params=['loc', 'query', 'qtype']; %]
-                    [% INCLUDE "opac/parts/filtersort.tt2"
-                        value=CGI.param('sort') mode='bookbag' %]
-                    <input type="hidden" name="bbid"
-                        value="[% CGI.param('bbid') | html %]" />
-                    <input type="submit" value="[% l('Sort') %]" />
-                </form>
-            </div>
-            <div class="meta">
-                <form method="POST">
-                    <input type="hidden" name="bbid" value="[% bbag.id %]" />
-                    <input type="hidden" name="action" value="editmeta" />
-                    <input type="hidden" name="limit" value="[% limit %]" />
-                    <input type="hidden" name="offset" value="[% offset %]" />
-                    [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                    <table id="bbag-name-desc-form">
-                        <tr>
-                            <th>
-                                <label for="bbag-edit-name">[% l('Name:') %]</label>
-                            </th>
-                            <td>
-                                <input name="name" type="text"
-                                    value="[% bbag.name | html %]"
-                                    id="bbag-edit-name" />
-                            </td>
-                            <td rowspan="2" class="saver">
-                                [% l("Save changes to name or description?") %]<br />
-                                <input type="submit" value="[% l('Save') %]" />
-                            </td>
-                        </tr>
-                        <tr>
-                            <th><label for="bbag-edit-description">[% l('Description:') %]</label></th>
-                            <td>
-                                <textarea name="description"
-                                    id="bbag-edit-description">[% bbag.description | html %]</textarea>
-                            </td>
-                        </tr>
-                    </table>
-                </form>
-            </div>
-        </div>
-        <br class="clear-both" />
-        <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="POST">
-        <input type="hidden" name="list" value="[% bbag.id %]" />
-        <input type="hidden" name="sort" value="[% CGI.param('sort') | uri %]" />
-        <table class="bookbag-specific" cellpadding='0' cellspacing='0' border='0'>
-            <thead id="acct_list_header">
-                <tr>
-                    <td class="list_checkbox">
-                    <input type="checkbox" onclick="
-                        var inputs=document.getElementsByTagName('input'); 
-                        for (i = 0; i < inputs.length; i++) { 
-                            if (inputs[i].name == 'selected_item' && !inputs[i].disabled && inputs[i].getAttribute('bbag') == [% bbag.id %]) 
-                                inputs[i].checked = this.checked;}"/>
-
-                    </td>
-                    <td class="list_entry">
-                        <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {sort=> (CGI.param('sort') == 'titlesort' ? 'titlesort.descending' : 'titlesort')}) %]">[% l('Title') %]</a>
-                    </td>
-                    <td class="list_entry">
-                        <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {sort=>(CGI.param('sort') == 'authorsort' ? 'authorsort.descending' : 'authorsort')}) %]">[% l('Author(s)') %]</a>
-                    </td>
-                    <td class="list_entry">
-                        <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {sort=>(CGI.param('sort') == 'pubdate' ? 'pubdate.descending' : 'pubdate')}) %]">[% l('Publication Date') %]</a>
-                    </td>
-                    <td class="list_entry">
-                         [% l('Format') %]
-                    </td>
-                    <td class="list_entry">
-                        [% l('Notes') %]
-                        [% IF CGI.param("edit_notes") != bbag.id %]
-                        | <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {edit_notes=> bbag.id}) %]">[% l('Edit') %]</a>
-                        [% END %]
-                    </td>
-                    <td class="list_actions">
-                        <select name="action">
-                            <option disabled="disabled">[% l('-- Actions for these items --') %]</option>
-                            <option value="del_item">[% l('Remove from list') %]</option>
-                        </select>
-                        [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                        <input type="submit" value="[% l('Go') %]" />
-                    </td>
-                </tr>
-            </thead>
-            <tbody>
-                [% UNLESS bbag.items.size %]
-                <tr><td colspan="6" class="list_is_empty">
-                    [% l("This list contains no items.") %]
-                </td></tr>
-                [% 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 %]
-                <tr class="bookbag-item-row">
-                    <td class="list_checkbox">
-                        <input type="checkbox" name="selected_item" value="[% item.id %]" bbag='[% bbag.id %]'/>
-                    </td>
-                    <td class="list_entry">
-                        <a href="[% mkurl(ctx.opac_root _ '/record/' _ rec_id, {}, ['edit_notes', 'bbid']) %]">[% attrs.title | html %]</a>
-                    </td>
-                    <td class="list_entry">
-                        <a href="[%- 
-                            authorquery = attrs.author | replace('[,\.:;]', '');
-                            mkurl(ctx.opac_root _ '/results', {qtype => 'author', query => authorquery}, ['page', 'bbid', 'edit_notes'])
-                            -%]">[% attrs.author | html %]</a>
-                    </td>
-                    <td class="list_entry">
-                          [% attrs.pubdate | html %]
-                    </td>
-                    <td class="list_entry">
-                          [% attrs.format_label | html %]
-                    </td>
-                    [% IF CGI.param("edit_notes") == bbag.id %]
-                    <td class="list_entry">
-                        [% FOR note IN item.notes %]
-                        <input type="text" name="note-[% note.id %]" value="[% note.note | html %]" />
-                        [% END %]
-                        <input type="text" name="item-[% item.id %]" />
-                    </td>
-                    [% ELSE %]
-                    <td class="list_entry">
-                        [% FOR note IN item.notes %]
-                        <div>[% note.note | html %]</div>
-                        [% END %]
-                    </td>
-                    [% END %]
-                </tr>
-                [% END %]
-                [% IF CGI.param("edit_notes") == bbag.id %]
-                <tr>
-                    <td colspan="3"><!-- All space left of notes column --></td>
-                    <td class="save-notes">
-                        [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                        <input type="hidden" name="bbid" value="[% CGI.param('bbid') | html %]" />
-                        <input type="submit" name="save_notes" value="[% l('Save Notes') %]" />
-                    </td>
-                </tr>
-                [% END %]
-            </tbody>
-        </table>
-        </form>
-        [% END %]
-        [% END %]
-    </div>
-    [% END %]
-
-    <span id='bb_publish_text' class='hide_me'>
-[% |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 %]
-    </span>
-</div>
-[% 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 (file)
index b075e83..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-        [% IF ctx.mylist.size %]
-        <div class="bookbag-specific">
-            <form method="GET">
-                <label for="anonsort">[% l("Sort list items by: ") %]</label>
-                [% INCLUDE "opac/parts/filtersort.tt2" mode='bookbag'
-                    id="anonsort" name="anonsort" value=CGI.param("anonsort") %]
-                <input type="hidden" name="id"
-                    value="[% CGI.param('id') | html %]" />
-                [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                <input type="submit" value="[% l('Sort') %]" />
-            </form>
-        </div>
-
-        <form action="[% mkurl(ctx.opac_root _ '/mylist/move') %]" method="GET">
-        <div>
-            <p class="big-strong">[% l('Temporary List') %]</p>
-            <table cellpadding='0' cellspacing='0' border='0'>
-                <thead id="acct_list_header_anon">
-                    <tr>
-                        <td width="1%" style="padding-left:10px;">
-                            <input type="checkbox" onclick="
-                                var inputs=document.getElementsByTagName('input'); 
-                                for (i = 0; i < inputs.length; i++) { 
-                                    if (inputs[i].name == 'record' && !inputs[i].disabled) inputs[i].checked = this.checked;}"/>
-                        </td>
-                        <td width="49%" class="opac-auto-108"><a href="[% mkurl('', {anonsort=>(CGI.param('anonsort') == 'titlesort' ? 'titlesort.descending' : 'titlesort')}) %]">[% l('Title') %]</a></td>
-                        <td width="49%" class="opac-auto-108"><a href="[% mkurl('', {anonsort=>(CGI.param('anonsort') == 'authorsort' ? 'authorsort.descending' : 'authorsort')}) %]">[% l('Author(s)') %]</a% l('Author(s)') %]</td>
-                        <td width="1%" class="nowrap">
-                            <select name="action">
-                                <option>[% l('-- Actions for these items --') %]</option>
-                                <option value="delete">[% l('Remove from list') %]</option>
-                                [% IF ctx.user AND ctx.bookbags.size %]
-                                <optgroup label="[% l('Move selected items to bookbag:') %]">
-                                    [% FOR bbag IN ctx.bookbags %]]
-                                    <option value="[% bbag.id %]" class="selector_actions_for_list_inner_option">[% bbag.name | html %]</option>
-                                    [% END %]
-                                </optgroup>
-                                [% END %]
-                            </select>
-                            [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                            <input type="submit" value="[% l('Go') %]" />
-                        </td>
-                    </tr>
-                </thead>
-                <tbody>
-                    [% FOR item IN ctx.mylist;
-                        attrs = {marc_xml => ctx.mylist_marc_xml.$item};
-                        PROCESS get_marc_attrs args=attrs %]
-                    <tr>
-                        <td class="item_list_padding" style="padding-left: 10px;">
-                            <input type="checkbox" name="record" value="[% item %]" />
-                        </td>
-                        <td class="item_list_padding" style="padding-left: 5px;"><a href="[% mkurl(ctx.opac_root _ '/record/' _ item, {}, ['edit_notes', 'id']) %]">[% attrs.title | html %]</a></td>
-                        <td class="item_list_padding" style="padding-left: 5px;"><a href="[%- 
-                            authorquery = attrs.author | replace('[,\.:;]', '');
-                            mkurl(
-                                ctx.opac_root _ '/results',
-                                {qtype => 'author', query => authorquery},
-                                ['page', 'id', 'edit_notes']
-                            )
-                        -%]">[% attrs.author | html %]</a></td>
-                    </tr>
-                    [% END %]
-                </tbody>
-            </table>
-            <br /><br />
-        </div>
-        </form>
-        [% 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 (file)
index 30882d1..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' lang='[% ctx.locale %]' xml:lang='[% ctx.locale %]'>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-        [% IF ctx.refresh %]
-        <meta http-equiv="refresh" content="[% ctx.refresh %]">
-        [% ELSIF ctx.authtime %]
-        <meta http-equiv="refresh" content="[% ctx.authtime %]; url=[% ctx.logout_page %]">
-        [% END %]
-        <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/default/opac/semiauto.css" />
-        <link rel="stylesheet" type="text/css" href="[% ctx.opac_root %]/css/style.css" />
-        <link rel="stylesheet" type="text/css" href="[% ctx.opac_root %]/css/style_overrides.css" />
-        <title>[% l('Catalog - [_1]', ctx.page_title) %]</title>
-        <link rel="unapi-server" type="application/xml" title="unAPI" href="/opac/extras/unapi" />
-        [% IF want_dojo %]
-        <style type="text/css">
-            @import "[% ctx.media_prefix %]/js/dojo/dijit/themes/tundra/tundra.css";
-        </style>
-        [% END %]
-        [% INCLUDE 'opac/parts/goog_analytics.tt2' %]
-    </head>
-    <body[% IF want_dojo; ' class="tundra"'; END %]>
-        [% content %] 
-        [% INCLUDE 'opac/parts/footer.tt2' %]
-        [% INCLUDE 'opac/parts/js.tt2' %]
-        [%- IF ENV.OILS_CHILIFRESH_ACCOUNT %]
-            [%- INCLUDE 'opac/parts/chilifresh.tt2' %]
-        [%- END %]
-    </body>
-</html>
index 1f93e97..555e262 100644 (file)
@@ -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
+##############################################################################
+
 %]
index db3dd3b..ddd26dd 100644 (file)
@@ -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
     };
     
 %]
index 3a2b5c5..eaa8d5a 100644 (file)
@@ -1,6 +1,12 @@
 <div id="footer-wrap">
 <div id="footer">
+    [% IF ctx.get_org_setting(
+        ctx.physical_loc || ctx.aou_tree.id, 'opac.allow_pending_user') %]
+    <a href="[% mkurl(ctx.opac_root _ '/register') %]">[% 
+        l('Request Library Card') %]</a> &nbsp;|&nbsp;
+    [% ELSE %]
     <a href="[% l('http://laurentian.ca/library') %]">[% l('Library Home') %]</a> |
+    [% END %]
     <a href="[% l('http://sfx.scholarsportal.info/laurentian/az') %]">[% l('Electronic Journals (A-Z)') %]</a> |
     <a href="[% l('http://biblio.laurentian.ca/research/guides') %]">[% l('Databases') %]</a> |
     <a href="[% l('http://biblio.laurentian.ca/research/guides/archives') %]">[% l('Archives') %]</a> |
index 1e1135e..69b23cb 100644 (file)
@@ -1,3 +1,4 @@
 <div id="homesearch_main_logo">
-    <strong><center><img src="[% ctx.media_prefix %]/images/lul_logo.png" /></center></strong>
+    <img src="[% ctx.media_prefix %]/images/lul_logo.png"
+        [% img_alt(l('Laurentian University Logo')) %]/>
 </div>
index e5ebeb0..c415ca8 100644 (file)
 
 <div id='login-form-box' class='login_boxes left_brain' style='float:left'>
     <h1>[% l('Log in to Your Account') %]</h1>
-    <form method='POST'>
-        <table>
-            <tr>
-                <td style="width: 20em; vertical-align: top; padding-top: 1.5em;" class='lbl1'>
-                    <label for='username_field'>[% l('Laurentian username') %]</label>
-                    <div class="lbl2">[% l('Your username and password are the same as your Groupwise and Desire2Learn account.') %]</div>
-                </td>
-                <td style="vertical-align: top; padding-top: 1.5em;">
-                    <div class="input_bg">
-                        <input type="text" id="username_field" name="username" autofocus />
-                        <div class="lbl2" style="padding-top: 1em;">[% l('Examples: jx_smith, jsmith') %]</div>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <td class="lbl1" style="width: 20em; vertical-align: top; padding-top: 1.5em">
-                    <label for="password_field">[% l('Password') %]</label>
-                </td>
-                <td  style="vertical-align: top; padding-top: 1.5em;">
-                    <div class="input_bg">
-                        <input id="password_field" name="password" type="password" />
-                    </div>
-                    <div>
-                        [%
-                            # If no redirect is offered or it's leading us back to the 
-                            # login form, redirect the user to My Account
-                            redirect = CGI.param('redirect_to') || ctx.referer;
-                            IF !redirect OR redirect.match(ctx.path_info _ '$');
-                                redirect = CGI.url('-full' => 1) _ '/opac/myopac/main';
-                            END;
-                            redirect = redirect  | replace('^http:', 'https:');
-                        %]
-                        <input type='hidden' name='ou_email_host' value='laurentian.ca'/>
-                        <input type='hidden' name='redirect_to' value='[% redirect %]'/>
-[%- # Disabled persistent login until we figure out how to make this work with LDAP auth -%]
-                    </div>
-                    <div style="padding-top: 1em; margin-right: 1em;">
-                        <input type="submit" value="[% l('Log in') %]" alt="[% l('Log in') %]" class="opac-button" />
-                        [% IF reset_password %]
-                        <a href='https://sspr.laurentian.ca/'>[% l('Forgot your password?') %]</a>
-                        [% END %]
-                    </div>
-                </td>
-            </tr>
-        </table>
+    [% l('Please enter the following information:') %]
+    <form method='post'>
+        <div style="float: left; padding-bottom: 10px; margin-right: 40px;">
+            <label for='username_field' class="lbl1" >[% l('Laurentian username') %]</label>
+            <div class="input_bg">
+                <input type='text' id="username_field" name="username" autofocus />
+            </div>
+            <div class="lbl2">[% l('Your username and password are the same as your Groupwise and Desire2Learn account.') %]</div>
+            <div class="lbl2" style="padding-top: 1em;">[% l('Examples: jx_smith, jsmith') %]</div>
+        </div>
+        <div style="float: left;">
+            <label for="password_field" class="lbl1" >[% l('Password') %]</label>
+            <div class="input_bg">
+                <input id="password_field" name="password" type="password" />
+            </div>
+            [% INCLUDE "opac/parts/login/password_hint.tt2" %]
+            [% IF reset_password %]
+            <a href='https://sspr.laurentian.ca/'>[% l('Forgot your password?') %]</a>
+            [% END %]
+        </div>
+        <div style="clear: both; padding-top: 15px;">
+        [%
+            redirect = CGI.param('redirect_to');
+            # Don't use referer unless we got here from elsewhere within the TPAC
+            IF !redirect AND ctx.referer.match('^https?://' _ ctx.hostname _ ctx.opac_root);
+                redirect = ctx.referer;
+            END;
+            # If no redirect is offered or it's leading us back to the
+            # login form, redirect the user to My Account
+            IF !redirect OR redirect.match(ctx.path_info _ '$');
+                redirect = CGI.url('-full' => 1) _ '/opac/myopac/main';
+            END;
+                redirect = redirect  | replace('^http:', 'https:');
+            %]
+            <input type='hidden' name='ou_email_host' value='laurentian.ca'/>
+            <input type='hidden' name='redirect_to' value='[% redirect %]'/>
+            <input type="checkbox" name="persist" id="login_persist" /><label for="login_persist"> [% l('Stay logged in?') %]</label>
+            <input type="submit" value="[% l('Log in') %]" alt="[% l('Log in') %]" class="opac-button" />
+        </div>
+
     </form>
 </div>
diff --git a/Open-ILS/src/templates_laurentian/opac/parts/record/copy_counts.tt2 b/Open-ILS/src/templates_laurentian/opac/parts/record/copy_counts.tt2
new file mode 100644 (file)
index 0000000..eaa0808
--- /dev/null
@@ -0,0 +1,50 @@
+<span id="rdetail_copy_counts">
+    <h2>[% l('Available copies') %]</h2>
+    <ul>
+    [%- depths = ctx.copy_summary.size;
+        depth = 1;
+        displayed_ous = {};
+        WHILE depth < depths;
+            ou_avail = ctx.copy_summary.$depth.available;
+            ou_id = ctx.copy_summary.$depth.org_unit;
+            cp_org_unit = ctx.get_aou(ou_id);
+            skip_me = !ou_hiding_disabled AND !ctx.org_within_hiding_scope(ou_id);
+            IF (cp_org_unit.opac_visible == 'f' AND !ctx.is_staff) OR skip_me;
+                depth = depth + 1;
+                NEXT;
+            END;
+            ou_name = cp_org_unit.name;
+            displayed_ous.$ou_name = 1;
+    %]
+    <li>
+    [% l('[quant,_1,copy,copies] at [_2].', ou_avail, ou_name) | html %]
+    [%- this_depth = ctx.get_aou(ou_id).ou_type.depth;
+        IF ou_avail > 0 && this_depth != ctx.copy_depth %]
+    <a href="[% mkurl('', {copy_depth => this_depth}, ['copy_offset']); %]"
+       title="[% l('Show copies at [_1]', ou_name); %]">
+       [%- l('(Show)'); %]</a>
+    [%- END; %]
+    </li>
+    [%- depth = depth + 1;
+        END;
+
+        depth = attrs.plib_copy_counts.size - 1;
+        ou_name = ctx.get_aou(attrs.plib_copy_counts.$depth.org_unit).name;
+        ou_id = attrs.plib_copy_counts.$depth.org_unit;
+        UNLESS depth < 0 || displayed_ous.exists(ou_name);
+    %]
+    [%- IF attrs.plib_copy_counts.$depth.count > 0; %]
+    <li class="preferred">
+    [%-
+        l('[_1] of [quant,_2,copy,copies] available at [_3].',
+            attrs.plib_copy_counts.$depth.available,
+            attrs.plib_copy_counts.$depth.count,
+            ou_name) | html
+    %] <a href="[% mkurl('', {locg => ou_id}, ['copy_offset']); %]"
+       title="[% l('Show copies at [_1]', ou_name); %]">[%
+       l('(Show preferred library)');
+    %]</a></li>
+    [%- END %]
+    [%- END %]
+    </ul>
+</span>
index ea70647..ba07a79 100644 (file)
@@ -47,7 +47,7 @@
                 all_terms.push(subfield.textContent.replace('\-', ' ').replace('[#"^$\+,\.:;&|\[\]()]', ''));
                 total_term = all_terms.join(" ").replace('\s+$', '');
             %]
-<a href="[% mkurl(ctx.opac_root _ '/results', {qtype=>'subject', query=>total_term}, stop_parms); %]">[% single_term %]</a>
+<a href="[% mkurl(ctx.opac_root _ '/results', {qtype=>'subject', query=>total_term}, stop_parms.merge(expert_search_parms, general_search_parms, browse_search_parms, facet_search_parms)) %]">[% single_term %]</a>
             [%- END;
             IF all_terms.size; "<br/>"; END;
             FOREACH link880 IN graphics;
@@ -68,7 +68,7 @@
             <tbody>
                 <tr>
                     <td class='rdetail_subject_type'>[% subj.label %]</td>
-                    <td class='rdetail_subject_value' itemprop='keywords'>[% content %]</td>
+                    <td class='rdetail_subject_value' property='keywords'>[% content %]</td>
                 </tr>
             </tbody>
         </table>