Merge remote branch 'working/user/rri/ttopac' into template-toolkit-opac-master-merge
authorBill Erickson <berick@esilibrary.com>
Wed, 3 Aug 2011 14:50:04 +0000 (10:50 -0400)
committerBill Erickson <berick@esilibrary.com>
Wed, 3 Aug 2011 14:50:04 +0000 (10:50 -0400)
With some minor merge conflict repair

Signed-off-by: Bill Erickson <berick@esilibrary.com>
1  2 
Open-ILS/src/templates/default/opac/myopac/circ_history.tt2
Open-ILS/src/templates/default/opac/myopac/circs.tt2
Open-ILS/src/templates/default/opac/myopac/hold_history.tt2
Open-ILS/src/templates/default/opac/myopac/holds.tt2
Open-ILS/src/templates/default/opac/myopac/lists.tt2
Open-ILS/src/templates/default/opac/parts/advanced/global_row.tt2
Open-ILS/src/templates/default/opac/parts/advanced/search.tt2
Open-ILS/src/templates/default/opac/parts/anon_list.tt2
Open-ILS/src/templates/default/opac/parts/record/cn_details.tt2

index a095558,0000000..9d88fe8
mode 100644,000000..100644
--- /dev/null
@@@ -1,102 -1,0 +1,102 @@@
-     <div class="opac-auto-079">
 +[%  PROCESS "default/opac/parts/header.tt2";
 +    PROCESS "default/opac/parts/misc_util.tt2";
 +    WRAPPER "default/opac/parts/myopac/base.tt2";
 +    myopac_page = "circs"
 +    limit = ctx.circ_history_limit;
 +    offset = ctx.circ_history_offset;
 +%]
 +
 +<div style="padding:0px;">
 +    
 +    <div id="acct_checked_tabs" style="padding-bottom: 12px;color:#666;">
 +        <div class="align selected">
 +            <a href='circs'><img src="[% ctx.media_prefix %]/images/sub_checked_out_off.jpg"/></a>
 +        </div>
 +        <div class="align">
 +            <img src="[% ctx.media_prefix %]/images/sub_checked_hist_on.jpg"/>
 +        </div>
 +        <div class="clear-both"></div>
 +    </div>
 +
 +    <div class="header_middle">
 +        <span class="float-left">[% l('Previously Checked Out Items') %]</span>
 +        <span class='float-left' style='padding-left: 10px;'>
 +            <a href='circ_history?limit=[% limit %]&amp;offset=[% offset - limit %]'
 +                [% IF offset == 0 %] class='invisible' [% END %]><span class="nav_arrow_fix">&#9668;</span>[% l('Previous') %]</a>
 +            [%# TODO: get total to prevent paging off then end of the list.. %]
 +            <a href='circ_history?limit=[% limit %]&amp;offset=[% offset + limit %]'
 +               [% IF ctx.circs.size < limit %] class='invisible' [% END %] >[% l('Next') %]<span class="nav_arrow_fix">&#9658;</span></a>
 +        </span>
 +        <span class="float-right">
 +            <a class="hide_me" href="#">[% l('Export List') %]</a>
 +        </span>
 +    </div>
 +    <div class="clear-both"></div>
 +
 +    [% IF ctx.circs.size < 1 %]
++    <div class="warning_box">
 +        <big><strong>[% l('There are no items in your circulation history.') %]</strong></big>
 +    </div>
 +    [% ELSE %]
 +
 +    <div id='checked_main'>
 +        <table style='border-collapse:collapse;'>
 +            <thead id="acct_checked_main_header">
 +                <tr>
 +                    <td width="32%" style="padding-left:5px;">
 +                        <span title="Click to sort" class='pointer'>[% l('Title') %]</span> /
 +                        <span title="Click to sort" class='pointer'>[% l('Author') %]</span>
 +                    </td>
 +                    <td width="10%" style="padding-left:5px;">
 +                        <span title="Click to sort" class='pointer'>[% l('Checkout Date') %]</span>
 +                    </td>
 +                    <td width="10%" style="padding-left:5px;">
 +                        <span title="Click to sort" class='pointer'>[% l('Due Date') %]</span>
 +                    </td>
 +                    <td width="10%" style="padding-left:5px;">
 +                        <span title="Click to sort" class='pointer'>[% l('Date Returned') %]</span>
 +                    </td>
 +                    <td width="16%">
 +                        <span title="Click to sort" class='pointer'>[% l('Barcode') %]</span>
 +                    </td>
 +                    <td width="22%">
 +                        <span title="Click to sort" class='pointer'>[% l('Call Number') %]</span>
 +                    </td>
 +                </tr>
 +            </thead>
 +            <tbody>
 +                [% FOR circ IN ctx.circs;
 +                    attrs = {marc_xml => circ.marc_xml};
 +                    PROCESS get_marc_attrs args=attrs; %]
 +                    <tr>
 +                        <td style="padding-left:5px;padding-bottom:10px;">
 +                            <a href="[% ctx.opac_root %]/record/[% circ.circ.target_copy.call_number.record.id %]" 
 +                                name="[% l('Catalog record') %]">[% attrs.title %]</a>
 +                            [% IF attrs.author %] /
 +                            <a href="[% ctx.opac_root %]/results?qtype=author&amp;query=[% attrs.author | replace('[,\.:;]', '') | url %]">[% attrs.author %]</a>
 +                            [% END %]
 +                        </td>
 +                        <td style="padding-left:5px;">
 +                            [% date.format(ctx.parse_datetime(circ.circ.xact_start),DATE_FORMAT); %]
 +                        </td>
 +                        <td style="padding-left:5px;">
 +                            [% date.format(ctx.parse_datetime(circ.circ.due_date),DATE_FORMAT); %]
 +                        </td>
 +                        <td style="padding-left:5px;">
 +                            [% 
 +                                IF circ.circ.checkin_time; 
 +                                    date.format(ctx.parse_datetime(circ.circ.checkin_time),DATE_FORMAT); 
 +                                ELSE; %]
 +                                <span style='color:blue;'>*</span><!-- meh -->
 +                            [% END; %]
 +                        </td>
 +                        <td>[% circ.circ.target_copy.barcode %]</td>
 +                        <td>[% circ.circ.target_copy.call_number.label %]</td>
 +                    </tr>
 +                [% END %]
 +            </tbody>
 +        </table>
 +    </div>
 +    [% END %]
 +</div>
 +[% END %]
index 67f94b8,0000000..2275aff
mode 100644,000000..100644
--- /dev/null
@@@ -1,166 -1,0 +1,166 @@@
-     <div class="opac-auto-079">
 +[%  PROCESS "default/opac/parts/header.tt2";
 +    PROCESS "default/opac/parts/misc_util.tt2";
 +    WRAPPER "default/opac/parts/myopac/base.tt2";
 +    myopac_page = "circs"  %]
 +<div id='myopac_checked_div' style="padding:0px;">
 +
 +    <div id="acct_checked_tabs" style="padding-bottom: 12px;color:#666;">
 +        <div class="align selected">
 +            <img src="[% ctx.media_prefix %]/images/sub_checked_out_on.jpg" />
 +        </div>
 +        <div class="align">
 +            <a href="circ_history"><img
 +                src="[% ctx.media_prefix %]/images/sub_checked_hist_off.jpg" /></a>
 +        </div>
 +        <div class="clear-both"></div>
 +    </div>
 +
 +    <div class="header_middle">
 +        <span class="float-left">[% l('Current Items Checked Out') %]</span>
 +        <span class="float-right">
 +            <a class="hide_me" href="#">[% l('Export List') %]</a>
 +        </span>
 +    </div>
 +    <div class="clear-both"></div>
 +    [% IF ctx.circs.size < 1 %]
-         <table cellpadding='0' cellspacing='0' class="opac-auto-097b">
++    <div class="warning_box">
 +        <big><strong>[% l('You have no items checked out.') %]</strong></big>
 +    </div>
 +    [% ELSE %]
 +    [% IF ctx.success_renewals %]
 +    <div class="renew-summary">
 +        [% l("Successfully renewed [_1] item(s)", ctx.success_renewals) %]
 +    </div>
 +    [% END %]
 +    [% IF ctx.failed_renewals %]
 +    <div class="renew-summary red">
 +        [% l("Failed to renew [_1] item(s)", ctx.failed_renewals) %]
 +    </div>
 +    [% END %]
 +    <div id='checked_main'>
 +        <form method="POST" id="circ-form"
 +            onsubmit="return confirm('[% l("Are you sure you wish to renew the selected item(s)?") %]');">
++        <table cellpadding='0' cellspacing='0' class="item_list_padding">
 +            <tr>
 +                <td>
 +                    <select name="action">
 +                        <option value="renew">[% l('Renew Selected Titles') %]</option>
 +                    </select>
 +                </td>
 +                <td style="padding-left:9px;">
 +                    <input type="image"
 +                        alt="[% l('Go') %]" title="[% l('Go') %]"
 +                        src="[% ctx.media_prefix %]/images/go-btn.png" /></a>
 +                </td>
 +                <td style="padding-left:5px;">
 +                    <a href="#"><img alt="Renewing Help"
 +                        src="[% ctx.media_prefix %]/images/question-mark.png" /></a>
 +                </td>
 +            </tr>
 +        </table>
 +        <table id="acct_checked_main_header" cellpadding='0' cellspacing='0'
 +            border='0'>
 +            <tr>
 +                <td width="1%" style="padding-left:10px;">
 +                    <input type="checkbox" id="check_all_checked"
 +                        onclick="var inputs=document.getElementsByTagName('input'); for (i = 0; i < inputs.length; i++) { if (inputs[i].name == 'circ' && !inputs[i].disabled) inputs[i].checked = this.checked;}"
 +                    />
 +                </td>
 +                <td width="40%" style="padding-left:5px;">
 +                    <span title="Click to sort" class='pointer'>
 +                        Title
 +                    </span> /
 +                    <span title="Click to sort" class='pointer'>
 +                        Author
 +                    </span>
 +                </td>
 +                <td width="8%" style="padding-right:5px;" align="center">
 +                    <span title="Click to sort" class='pointer'>Renews<br />Left
 +                    </span>
 +                </td>
 +                <td width="13%" style="padding-left:5px;">
 +                    <span title="Click to sort" class='pointer'>Due Date</span>
 +                </td>
 +                <td width="16%">
 +                    <span title="Click to sort" class='pointer'>barcode</span>
 +                </td>
 +                <td width="22%">
 +                    <span title="Click to sort" class='pointer'>call number</span>
 +                </td>
 +            </tr>
 +        </table>
 +   
 +        <div id="checked_temp_parent">
 +            <div id="acct_checked_temp">
 +                <table cellpadding='0' cellspacing='0' border='0'
 +                    style="margin-top:5px;">
 +                    [% FOR circ IN ctx.circs;
 +                        attrs = {marc_xml => circ.marc_xml};
 +                        PROCESS get_marc_attrs args=attrs; %]
 +                    <tr>
 +                        <td width="1%" style="padding-left:10px;" valign="top">
 +                            <input type="checkbox" name="circ"
 +                                [% IF circ.circ.renewal_remaining < 1; l('disabled="disabled"'); END %]
 +                                value="[% circ.circ.id %]" />
 +                        </td>
 +                        <td width="40%"
 +                            style="padding-left:5px;padding-bottom:10px;"
 +                            name="author">
 +                            <a href="[% ctx.opac_root %]/record/[% circ.circ.target_copy.call_number.record.id %]" name="[% l('Catalog record') %]">[% attrs.title %]</a>
 +                            [% IF attrs.author %] /
 +                            <a href="[% ctx.opac_root %]/results?qtype=author&amp;query=[% attrs.author | replace('[,\.:;]', '') | url %]">[% attrs.author %]</a>
 +                            [% END %]
 +                        </td>
 +                        <td width="8%" name="renewals" align="center">
 +                            [% circ.circ.renewal_remaining %]
 +                        </td>
 +                        <td width="13%" style="padding-left:5px;"
 +                            name="due_date">
 +                            [% date.format(ctx.parse_datetime(circ.circ.due_date),DATE_FORMAT) %]
 +                        </td>
 +                        <td width="16%" name="barcode">
 +                            [% circ.circ.target_copy.barcode %]
 +                        </td>
 +                        <td width="22%" name="call_number">
 +                            [% circ.circ.target_copy.call_number.label %]
 +                        </td>
 +                    </tr>
 +                    [%  IF circ.renewal_response AND
 +                            circ.renewal_response.textcode != 'SUCCESS' %]
 +                    <tr>
 +                        <td colspan="6">[%# XXX colspan="0" does not work in IE %]
 +                            <span class="failure-text" title="[% circ.renewal_response.textcode %] / [% circ.renewal_response.payload.fail_part %]">
 +                                [% circ.renewal_response.desc || circ.renewal_response.payload.fail_part || circ.renewal_response.textcode %]
 +                            </span>
 +                        </td>
 +                    </tr>
 +                    [%  END;
 +                    END %]
 +                </table>
 +            </div>
 +        </div>
 +        </form>
 +    </div>
 +    [% END %]
 +    <div id='non_cat_circs_div' class='hide_me'>
 +        <br/>
 +        <div style='text-align: center'><b>[% l("Other Circulations") %]</b></div>
 +        <table class='data_grid' width='100%'>
 +            <thead>
 +                <tr>
 +                    <td>[% l("Circulating Library") %]</td>
 +                    <td>[% l("Circulation Type") %]</td>
 +                    <td>[% l("Please return by ...") %]</td>
 +                </tr>
 +            </thead>
 +            <tbody id='non_cat_circs_tbody'>
 +                <tr id='non_cat_circs_row'>
 +                    <td name='circ_lib'/>
 +                    <td name='item_type'/>
 +                    <td name='circ_time'/>
 +                </tr>
 +            </tbody>
 +        </table>
 +    </div>
 +</div>
 +[% END %]
index 43f3256,0000000..d3453d7
mode 100644,000000..100644
--- /dev/null
@@@ -1,127 -1,0 +1,127 @@@
-         <div class="opac-auto-079">
 +[%  PROCESS "default/opac/parts/header.tt2";
 +    PROCESS "default/opac/parts/misc_util.tt2";
 +    WRAPPER "default/opac/parts/myopac/base.tt2";
 +    myopac_page = "holds"  
 +    limit = ctx.hold_history_limit;
 +    offset = ctx.hold_history_offset;
 +%]
 +
 +<div id='myopac_holds_div'>
 +
 +    <div id="acct_holds_tabs" style="padding-bottom: 12px;color:#666;">
 +        <div class="align selected">
 +            <a href='holds'><img src="[% ctx.media_prefix %]/images/sub_holds_off.jpg"/></a>
 +        </div>
 +        <div class="align">
 +            <img src="[% ctx.media_prefix %]/images/sub_holds_hist_on.jpg"/>
 +        </div>
 +        <div class="clear-both"></div>
 +    </div>
 +
 +    <div class="header_middle">
 +        <span style="float:left;">[% l("Previously Held Items") %]</span>
 +        <span class='float-left' style='padding-left: 10px;'>
 +            <a href='hold_history?limit=[% limit %]&amp;offset=[% offset - limit %]'
 +                [% IF offset == 0 %] class='invisible' [% END %]><span class="nav_arrow_fix">&#9668;</span>[% l('Previous') %]</a>
 +            [%# TODO: get total to prevent paging off then end of the list.. %]
 +            <a href='hold_history?limit=[% limit %]&amp;offset=[% offset + limit %]'
 +               [% IF ctx.holds.size < limit %] class='invisible' [% END %] >[% l('Next') %]<span class="nav_arrow_fix">&#9658;</span></a>
 +        </span>
 +        <span style="float:right;">
 +            <a class="hide_me" href="#">Export List</a>
 +        </span>
 +    </div>
 +    <div class="clear-both"></div>
 +
 +    <div id='holds_main'>
 +        [% IF ctx.holds.size < 1 %]
++        <div class="warning_box">
 +            <big><strong>[% l('No holds found.') %]</strong></big>
 +        </div>
 +        [% ELSE %]
 +        <table style='border-collapse:collapse; width: 100%;'>
 +            <thead id='acct_holds_main_header'>
 +                <tr>
 +                    <td width="138"><span>[% l('Title') %]</span></td>
 +                    <td width="123"><span>[% l('Author') %]</span></td>
 +                    <td width="64"> <span>[% l('Format') %]</span></td>
 +                    <td width="136"><span>[% l('Pickup Location') %]</span> </td>
 +                    <td width="104">[% l('Active On') %]</td>
 +                    <td width="95">[% l('Active') %]</td>
 +                    <td width="106">[% l('Date Fulfilled') %]</td>
 +                    <td width="172"><span>[% l('Status') %]</span></td>
 +                </tr>
 +            </thead>
 +            <tbody>
 +                [% FOR hold IN ctx.holds;
 +                    attrs = {marc_xml => hold.marc_xml};
 +                    PROCESS get_marc_attrs args=attrs;
 +                    ahr = hold.hold.hold %]
 +
 +                <tr id="acct_holds_temp" name="acct_holds_temp" class="acct_holds_temp">
 +
 +                    <td width="138">
 +                        <div style="margin-top:10px;margin-bottom:10px;">
 +                            <a href="[% ctx.opac_root %]/record/[% hold.hold.bre.id %]">[% attrs.title | html %]</a>
 +                        </div>
 +                    </td>
 +                    <td width="123">
 +                        <div style="margin-top:10px;margin-bottom:10px;">
 +                            <a href="[% ctx.opac_root %]/results?qtype=author&amp;query=[% attrs.author | replace('[,\.:;]', '') | url %]">[% attrs.author | html %]</a>
 +                        </div>
 +                    </td>
 +                    <td width="64">
 +                        <div style="width:26px;height:23px;margin-top:6px;margin-bottom:6px;">
 +                            [% IF attrs.format_icon %]
 +                            <img src="[% ctx.media_prefix %]/images/[% attrs.form_icon %]"
 +                                title="[% attrs.format %]" alt="[% attrs.format %]" />
 +                            [% ELSE;
 +                                attrs.format;
 +                               END %]
 +                        </div>
 +                    </td>
 +                    <td width="136">
 +                        [% ctx.get_aou(ahr.pickup_lib).name %]
 +                    </td>
 +                    <td width="104">
 +                        [% IF ahr.frozen == 't' AND ahr.thaw_date;
 +                            date.format(ctx.parse_datetime(ahr.thaw_date), DATE_FORMAT);
 +                        END %]
 +                    </td>
 +                    <td width="95">
 +                        [% l(ahr.frozen == 'f' ? 'Active' : 'Suspended') %]
 +                    </td>
 +                    <td width="106">
 +                        [% IF ahr.fulfillment_time;
 +                            date.format(ctx.parse_datetime(ahr.fulfillment_time), DATE_FORMAT);
 +                        END %]
 +                    </td>
 +                    <td width="110">
 +                        <div name="acct_holds_status"
 +                            style="margin-top:10px;margin-bottom:10px;">
 +                            [%
 +                                IF hold.hold.status == 4;
 +                                    l("Available");
 +                                    IF ahr.shelf_expire_time;
 +                                        l('<br/>Expires [_1]', 
 +                                            date.format(ctx.parse_datetime(ahr.shelf_expire_time), DATE_FORMAT));
 +                                    END;
 +                                ELSIF hold.hold.estimated_wait AND hold.hold.estimated_wait > 0;
 +                                    # estimated wait is delivered as seconds.
 +                                    SET hwait = POSIX.ceil(hold.hold.estimated_wait / 86400);
 +                                    l("Estimated wait: [quant,_1,day,days]", hwait);
 +                                ELSIF hold.hold.status == 3;
 +                                    l("In Transit");
 +                                ELSIF hold.hold.status < 3;
 +                                    l("Waiting for copy");
 +                                END;
 +                            %]
 +                        </div>
 +                    </td>
 +                </tr>
 +                [% END %]
 +            </tbody>
 +        </table>
 +        [% END %]
 +    </div>
 +[% END %]
index a6bb670,0000000..442a1df
mode 100644,000000..100644
--- /dev/null
@@@ -1,228 -1,0 +1,228 @@@
-         <div class="opac-auto-079">
 +[%  PROCESS "default/opac/parts/header.tt2";
 +    PROCESS "default/opac/parts/misc_util.tt2";
 +    WRAPPER "default/opac/parts/myopac/base.tt2";
 +    myopac_page = "holds"  %]
 +<div id='myopac_holds_div'>
 +
 +    <div id="acct_holds_tabs" style="padding-bottom: 12px;color:#666;">
 +        <div class="align selected">
 +            <img src="[% ctx.media_prefix %]/images/sub_holds_on.jpg"/>
 +        </div>
 +        <div class="align">
 +            <a href='hold_history'><img src="[% ctx.media_prefix %]/images/sub_holds_hist_off.jpg"/></a>
 +        </div>
 +        <div class="clear-both"></div>
 +    </div>
 +
 +    <div class="header_middle">
 +        <span id="acct_holds_header" style="float:left;">
 +            [%  IF CGI.param("available");
 +                    l("Items Ready for Pickup");
 +                ELSE;
 +                    l("Current Items on Hold");
 +                END
 +            %]
 +        </span>
 +        <span style="float:right;">
 +            <a class="hide_me" href="#">Export List</a>
 +        </span>
 +    </div>
 +    <div class="clear-both"></div>
 +    <div id='holds_main'>
 +        <form method="POST">
 +        <table cellpadding='0' cellspacing='0' class="opac-auto-097">
 +            <tr>
 +                <td width="1">
 +                    <select name="action" id="acct_holds_actions">
 +                        <option id='myopac_holds_actions_none' value=''>
 +                        -- [% l("Actions for selected holds") %] --
 +                        </option>
 +                        <option value='suspend'>
 +                            [% l("Suspend") %]
 +                        </option>
 +                        <option value='activate'>
 +                            [% l("Activate") %]
 +                        </option>
 +                        <!-- XXX maybe later <option value='thaw_date'>
 +                            [% l("Set Active Date") %]
 +                        </option> -->
 +                        <option value='cancel'>
 +                            [% l("Cancel") %]
 +                        </option>
 +                    </select>
 +                </td>
 +                <td width="1" style="padding-left:9px;">
 +                    <input type="image"
 +                        alt="[% l('Go') %]" title="[% l('Go') %]"
 +                        src="[% ctx.media_prefix %]/images/go-btn.png" />
 +                </td>
 +                <td width="1" style="padding-left:5px;">
 +                    <a href="#"><img
 +                        alt="Holds Help"
 +                        src="[% ctx.media_prefix %]/images/question-mark.png" /></a>
 +                </td>
 +                <td align="right">
 +                    [% l("Show") %] &nbsp; &nbsp;
 +                    [% IF CGI.param("available") %]
 +                    <a href="holds">[% l('all') %]</a> |
 +                    <strong>[% l("only available") %]</strong>
 +                    [% ELSE %]
 +                    <strong>[% l("all") %]</strong> |
 +                    <a href="holds?available=1">[% l("only available") %]</a>
 +                    [% END %] &nbsp; &nbsp;
 +                    [% l("holds") %]
 +                    <select class="hide_me" id="holds_sort">
 +                        <option value="">-- Sort By --</option>
 +                        <option value="title">Title</option>
 +                        <option value="pickup">PickUp Location</option>
 +                        <option value="status">Status</option>
 +                    </select>
 +                </td>
 +            </tr>
 +        </table>
 +        [% IF ctx.holds.size < 1 %]
++        <div class="warning_box">
 +            <big><strong>[% l('No holds found.') %]</strong></big>
 +        </div>
 +        [% ELSE %]
 +        <table id="acct_holds_main_header" cellpadding='0' cellspacing='0'
 +            border='0' width="100%">
 +            <tr>
 +                <td width="36" align="center">
 +                    <input type="checkbox" id="check_all_holds" />
 +                </td>
 +                <td width="138">
 +                    <span title="Click to sort"
 +                        style="cursor:pointer;">
 +                        Title
 +                    </span>
 +                </td>
 +                <td width="123">
 +                    <span title="Click to sort" style="cursor:pointer;">Author</span>
 +                </td>
 +                <td width="64">
 +                    <span title="Click to sort"
 +                        style="cursor:pointer;">Format</span>
 +                </td>
 +                <td width="136">
 +                    <span title="Click to sort"
 +                        style="cursor:pointer;">Pickup Location</span>
 +                </td>
 +                <td width="104">Activate</td>
 +                <td width="106">Cancel if not<br />filled by</td>
 +                <td width="95">Active</td>
 +                <td width="172">
 +                    <span title="Click to sort"
 +                        style="cursor:pointer;">Status</span>
 +                </td>
 +            </tr>
 +        </table>
 +        <div class="hide_me">
 +            <select id="hold_pickup_lib_temp" name="hold_pickup_lib_sel"
 +                class="hide_me" style="width:125px;height:21px;"></select>
 +        </div>
 +
 +        <table cellpadding='0' cellspacing='0' border='0' width="100%">
 +            <tbody id="holds_temp_parent">
 +                [% FOR hold IN ctx.holds;
 +                    attrs = {marc_xml => hold.marc_xml};
 +                    PROCESS get_marc_attrs args=attrs;
 +                    ahr = hold.hold.hold %]
 +                <tr id="acct_holds_temp" name="acct_holds_temp"
 +                    class="acct_holds_temp">
 +                    <td width="36" align="center" style="text-align:center;">
 +                        <input type="checkbox" name="hold_id" value="[% ahr.id %]" />
 +                    </td>
 +                    <td width="138">
 +                        <div style="margin-top:10px;margin-bottom:10px;">
 +                            <a href="[% ctx.opac_root %]/record/[% hold.hold.bre.id %]">[% attrs.title | html %]</a>
 +                        </div>
 +                    </td>
 +                    <td width="123">
 +                        <div style="margin-top:10px;margin-bottom:10px;">
 +                            <a href="[% ctx.opac_root %]/results?qtype=author&amp;query=[% attrs.author | replace('[,\.:;]', '') | url %]">[% attrs.author | html %]</a>
 +                        </div>
 +                    </td>
 +                    <td width="64">
 +                        <div style="width:26px;height:23px;margin-top:6px;margin-bottom:6px;">
 +                            [% IF attrs.format_icon %]
 +                            <img src="[% ctx.media_prefix %]/images/[% attrs.form_icon %]"
 +                                title="[% attrs.format %]" alt="[% attrs.format %]" />
 +                            [% ELSE;
 +                                attrs.format;
 +                               END %]
 +                        </div>
 +                    </td>
 +                    <td width="136">
 +                        [% ctx.get_aou(ahr.pickup_lib).name %]
 +                    </td>
 +                    <td width="104">
 +                        <!-- <input
 +                            title="Enter a date (e.g. 10/21/2010)"
 +                            class="hide_me" style="width:91px;"
 +                            name="activate_box" type="text" /> -->
 +                        [% IF ahr.frozen == 't' AND
 +                                ahr.thaw_date;
 +                            date.format(ctx.parse_datetime(ahr.thaw_date), DATE_FORMAT);
 +                        END %]
 +                    </td>
 +                    <td width="106">
 +                        <!-- <input title="[% l('Enter a date (e.g. 10/21/2010)') %]"
 +                            class="hide_me" style="width:91px;"
 +                            name="hold_expires_box" type="text" />-->
 +                        [% IF ahr.expire_time;
 +                            date.format(ctx.parse_datetime(ahr.expire_time), DATE_FORMAT);
 +                        END %]
 +                    </td>
 +                    <td width="95">
 +                        <!-- <select name="hold_active_sel"
 +                            style="width:90px;" class="hide_me">
 +                            <option value="f">Active</option>
 +                            <option value="t">Suspended</option>
 +                        </select> -->
 +                        [% l(ahr.frozen == 'f' ? 'Active' : 'Suspended') %]
 +                    </td>
 +                    <td width="110">
 +                        <div name="acct_holds_status"
 +                            style="margin-top:10px;margin-bottom:10px;">
 +                            [% PROCESS get_hold_status hold=hold; %]
 +                        </div>
 +                    </td>
 +                    <td class="opac-auto-161">
 +                        <a href="[% ctx.opac_root %]/myopac/holds/edit?id=[% ahr.id %]">Edit</a>
 +                    </td>
 +                </tr>
 +                [% END %]
 +            </tbody>
 +        </table>
 +        [% END %]
 +        </form>
 +    </div>
 +
 +    <span id='myopac.holds.cancel.confirm' class='hide_me'>[% l("Are you sure you wish to cancel the selected holds?") %]</span>
 +    <span id='myopac.holds.freeze.confirm' class='hide_me'>[% l("Are you sure you wish to suspend the selected holds?  If an item has already been selected to fulfill the hold, it will not be suspended") %]</span>
 +    <span id='myopac.holds.thaw.confirm' class='hide_me'>[% l("Are you sure you wish to activate the selected holds?") %]</span>
 +    <span id='myopac.holds.thaw_date.confirm' class='hide_me'>[% l("Are you sure you wish to change the activate date for the selected holds?") %]</span>
 +    <span id='myopac.holds.freeze.select_thaw' class='hide_me'>[% l("Select an automatic activation date.  If no date is chosen, the holds will remain suspended until they are manually activated.") %]</span>
 +
 +    <table width='100%' id='myopac_holds_processing' class='hide_me'>
 +        <tr><td>[% l("Processing holds... This may take a moment.") %]</td></tr>
 +    </table>
 +   
 +    <span class='hide_me' id='myopac_holds_cancel_verify'>
 +      [% l("If you wish to cancel the selected hold, click OK, otherwise click Cancel.") %]
 +    </span>
 +</div>
 +<div id='myopac_holds_thaw_date_form' class='hide_me'>
 +    <div id='myopac_holds_freeze_select_thaw'>
 +        [% l("Select an automatic activation date.  If no date is chosen, the holds will remain suspended until they are manually activated.") %]
 +    </div>
 +    <p>
 +        <input size='10' maxlength='10'
 +            type='text' id='myopac_holds_thaw_date_input' />
 +    </p>
 +    <p>
 +        <button>[% l("Submit") %]</button>
 +    </p>
 +</div>
 +[% END %]
index ba8d556,0000000..c15a19f
mode 100644,000000..100644
--- /dev/null
@@@ -1,185 -1,0 +1,185 @@@
-                             <select class="opac-auto-179" name="action">
 +[%  PROCESS "default/opac/parts/header.tt2";
 +    PROCESS "default/opac/parts/misc_util.tt2";
 +    WRAPPER "default/opac/parts/myopac/base.tt2";
 +    myopac_page = "lists"  %]
 +<div id='myopac_bookbag_div' style="padding:5px;">
 +
 +    <!-- <div class="header_middle">
 +        <span id="acct_holds_header" style="float:left;">[% l('My Lists') %]</span>
 +        <span style="float:right;"><a class="hide_me" href="#">[% l('Export List') %]</a></span>
 +    </div>
 +    <div style="float:right;width:85px;">
 +        <div style="position:absolute">
 +            <div style="position:relative;top:13px;">
 +                <a href="#" style="position:relative;top:-3px;left:-5px;"><img alt="[% l('Saving Help') %]" 
 +                    src="[% ctx.media_prefix %]/images/question-mark.png" /></a>
 +                <a href="#"><img alt="[% l('Save') %]" src="[% ctx.media_prefix %]/images/save-btn.png"/></a>
 +            </div>
 +        </div>
 +    </div> -->
 +    <div id="temp_wrapper">
 +
 +
 +    <!-- new list creation -->
 +    <form action="[% ctx.opac_root %]/myopac/list/update" method="POST" id="create_form">
 +        <h2>[% l('Create new list') %]</h2><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>
 +                    <input id="list_create_name" type="text" name="name" />
 +                    <input type="hidden" name="action" value="create" />
 +                </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="image" alt="[% l('Submit') %]" src="[% ctx.media_prefix %]/images/btnSubmit.png"/>
 +                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 +                    <a href="javascript:void(0);"
 +                        onclick="document.getElementById('create_form').reset(); return false"><img
 +                        alt="[% l('Cancel') %]"
 +                        src="[% ctx.media_prefix %]/images/btnCancel.png" /></a>
 +                </td>
 +            </tr>
 +        </table>
 +    </form>
 +
 +    [% INCLUDE "default/opac/parts/anon_list.tt2" %]
 +    [% IF ctx.bookbags.size %]
 +    <div id='acct_lists_prime'>
 +        [% FOR bbag IN ctx.bookbags %]
 +        <div id='acct_list_template'>
 +            <div style="width:100%">
 +                <form action="[% ctx.opac_root %]/myopac/list/update" method="POST">
 +                    <div class="bookbag-share">
 +                        <input type="hidden" name="list" value="[% bbag.id %]" />
 +                        [% IF bbag.pub != 't' %]
 +                        <input type="hidden" name="action" value="show" />
 +                        <input type="submit" value="[% l('Share') %]" />
 +                        [% ELSE %]
 +                        <input type="hidden" name="action" value="hide" />
 +                        <input type="submit" value="[% l('Hide') %]" />
 +                        [% END %]
 +                    </div>
 +                </form>
 +                <form action="[% 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" />
 +                        <input type="submit" value="[% l('Delete List') %]" />
 +                    </div>
 +                </form>
 +                <div class="bookbag-controls">
 +                    <big><strong>
 +                    [% IF bbag.pub == 't' %]
 +                        [% url = 'http://' _ ctx.hostname _ '/opac/extras/feed/bookbag/html-full/' _ bbag.id %]
 +                        <a target='_blank' href='[% url %]'>[% bbag.name %]</a>
 +                    [% ELSE %]
 +                    [% bbag.name %]
 +                    [% END %]
 +                    </strong></big>
 +                </div>
 +                <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="clear-both pad-bottom-five"></div>
 +            </div>
 +            <form action="[% ctx.opac_root %]/myopac/list/update" method="POST">
 +            <input type="hidden" name="list" value="[% bbag.id %]" />
 +            <table cellpadding='0' cellspacing='0' border='0'>
 +                <thead id="acct_list_header">
 +                    <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 == 'del_item' && !inputs[i].disabled && inputs[i].getAttribute('bbag') == [% bbag.id %]) 
 +                                    inputs[i].checked = this.checked;}"/>
 +
 +                        </td>
 +                        <td width="49%" style="padding-left: 5px;">[% l('Title') %]</td>
 +                        <td width="49%">[% l('Author(s)') %]</td>
 +                        <td width="1%" class="nowrap">
-                         <td class="opac-auto-097b" style="padding-left: 10px;"><input type="checkbox" name="del_item" value="[% item.id %]" bbag='[% bbag.id %]'/></td>
-                         <td class="opac-auto-097b" style="padding-left: 5px;">[% attrs.title %]</td>
-                         <td class="opac-auto-097b">[% attrs.author %]</td>
++                            <select class="selector_actions_for_list" name="action">
 +                                <option>[% l('-- Actions for this list --') %]</option>
 +                                <!-- XXX not ready yet<option value="hold">[% l('Place Hold') %]</option> -->
 +                                <option value="del_item">[% l('Remove Items') %]</option>
 +                            </select>
 +                            <input type="submit" value="[% l('Go') %]" />
 +                        </td>
 +                    </tr>
 +                </thead>
 +                <tbody>
 +                    [% UNLESS bbag.items.size %]
 +                    <tr><td colspan="4" class="opac-auto-171 opac-auto-097">
 +                        [% l("This list contains no items.") %]
 +                    </td></tr>
 +                    [% END %]
 +                    [% FOR item IN bbag.items;
 +                        rec_id = item.target_biblio_record_entry;
 +                        attrs = {marc_xml => ctx.bookbags_marc_xml.$rec_id};
 +                        PROCESS get_marc_attrs args=attrs %]
 +                    <tr>
++                        <td class="item_list_padding" style="padding-left: 10px;"><input type="checkbox" name="del_item" value="[% item.id %]" bbag='[% bbag.id %]'/></td>
++                        <td class="item_list_padding" style="padding-left: 5px;">[% attrs.title %]</td>
++                        <td class="item_list_padding">[% attrs.author %]</td>
 +                    </tr>
 +                    [% END %]
 +                </tbody>
 +            </table>
 +            </form>
 +            <br /><br />
 +        </div>
 +        [% END %]
 +    </div>
 +    [% END %]
 +
 +    <div id='myopac_delete_bookbag_warn' class='hide_me'>
 +        [% l("This will remove the selected bookbag and all items contained within the bookbag.  Are you sure you wish to continue?") %]
 +    </div>
 +    <div style='text-align: center; font-weight: bold;' 
 +        class='hide_me' id='myopac_bookbags_none'>[% l("You have not created any bookbags") %]</div>
 +    <div style='width: 99%; text-align: center'>
 +        <b id='myopac_bookbag_items_name'> </b>
 +    </div>
 +    <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>
 +    <span id='myopac_remove_bb_item_confirm' class='hide_me'>
 +        [% l("Are you sure you wish to remove this bookbag item?") %]
 +    </span>
 +    <span id='myopac_make_published_confirm' class='hide_me'>
 +        [% l("Sharing this bookbag will allow the contents of the bookbag to be seen by others.  Are you sure you wish to share this bookbag?") %]
 +    </span>
 +    <span id='myopac_make_unpublished_confirm' class='hide_me'>
 +        [% l("Are you sure you wish to hide this bookbag?") %]
 +    </span>
 +    <span id='myopac_bb_update_success' class='hide_me'>
 +        [% l("The Bookbag was successfully updated.") %]
 +    </span>
 +    <span id='bb_create_warning' class='hide_me'>
 +        [% l("Warning: Adding items to a bookbag creates a link between you and the items in the database.  The contents of the bookbag are NOT publicly viewable unless the bookbag is shared. However, if you prefer not to have any link between your patron record and a particular item or items, we suggest that you do not place said items in a bookbag or that you avoid using bookbags all together.  Thank you.") %]
 +    </span>
 +    <span id='myopac_bb_what_are' class='hide_me'>
 +        [% l("Bookbags are...") %]
 +    </span>
 +    <span class='hide_me' id='bb_update_success'>
 +        [% l("Bookbag successfully updated") %]
 +    </span>
 +
 +</div>
 +[% END %]
index ddb4260,0000000..e523ec9
mode 100644,000000..100644
--- /dev/null
@@@ -1,44 -1,0 +1,44 @@@
-         <span class="opac-auto-078">
 +[%
 +    contains_options = [
 +        {value => 'contains', label => l('Contains')},
 +        {value => 'nocontains', label => l('Does not contain')},
 +        {value => 'phrase', label => l('Contains phrase')},
 +        {value => 'exact', label => l('Matches exactly')}
 +    ];
 +    contains = CGI.param('contains');
 +    queries = CGI.param('query');
 +    bools = CGI.param('bool') || ['and' x 3];
 +    qtypes = CGI.param('qtype') || ['keyword' x 3];
 +    FOR qtype IN qtypes;
 +        c = contains.shift;
 +        b = bools.shift;
 +        q = queries.shift; %]
 +
 +<!-- tag the second row so the bool column won't be hidden -->
 +<tr[% IF loop.index == 1 %] id="adv_global_row"[% END %]>
 +    <td align='left' width='100%' nowrap='nowrap'>
 +
 +        <!-- bool selector.  hide for first row.  safe to ignore first bool value in form submission -->
 +        <select name='bool' style='width: auto' [% IF loop.first %] class='invisible' [% END %]>
 +            <option value='and' [% b == 'and' ? 'selected="selected"' : '' %]>[% l('And') %]</option>
 +            <option value='or' [% b == 'or' ? 'selected="selected"' : '' %]>[% l('Or') %]</option>
 +        </select>
 +
 +        <!-- keyword, subject, etc. selector -->
++        <span class="qtype_selector_margin">
 +            [% INCLUDE "default/opac/parts/qtype_selector.tt2"
 +                query_type=qtype %]
 +        </span>
 +
 +        <select name='contains' style='margin-right: 7px;'>
 +            [% FOR o IN contains_options; -%]
 +            <option value="[% o.value %]" [% c == o.value ? ' selected="selected"' : '' %]>[% o.label %]</option>
 +            [% END %]
 +        </select>
 +        <input type='text' size='18' name='query' value="[% q | html %]" x-webkit-speech />
 +        <a href="javascript:;" class="row-remover"
 +            title="[% l('Remove row') %]" alt="[% l('Remove row') %]"
 +            onclick='return killRowIfAtLeast(2, this);'><img src="[% ctx.media_prefix %]/images/adv_row_close_btn.png" /></a>
 +    </td>
 +</tr>
 +[% END %]
index 5762ead,0000000..a6e9ad5
mode 100644,000000..100644
--- /dev/null
@@@ -1,204 -1,0 +1,204 @@@
-         <td valign='top' class='opac-auto-012'>
 +<form id="adv_search_form" action="[% ctx.opac_root %]/results" method="GET">
 +<table id='adv_global_search' class='data_grid data_grid_center' width='100%'>
 +    <tr style='border-bottom: none;'>
 +        <!-- Contains the user-addable(?) rows to define search class, containment and text -->
-               <table class='opac-auto-017'>
++        <td valign='top' class='adv_global_input_container'>
 +            <table width='100%' id='adv_global_input_table'>
 +                <thead>
 +                    <tr>
 +                        <td>
 +                            <div style="width:100%;" class="header_middle">
 +                                [% l("Search Input") %]
 +                            </div>
 +                        </td>
 +                    </tr>
 +                </thead>
 +                <tbody id='adv_global_tbody'>
 +                    [% INCLUDE "default/opac/parts/advanced/global_row.tt2" %]
 +                    <!-- add a new row -->
 +                    <tr id='adv_global_addrow'>
 +                        <td align='left' style="padding-top:7px;">
 +                            <a href="javascript:;" id="myopac_new_global_row" onclick='addSearchRow();'>[% l('Add Search Row') %]</a>
 +                        </td>
 +                    </tr>
 +                </tbody>
 +            </table>
 +        </td>
 +    </tr>
 +    <tr>
 +        <td align='top'>
 +          <div style="width:100%;" class="header_middle">[% l('Search Filters') %]</div>
 +          <table cellpadding='10' cellspacing='0' border='0'><tr>
 +            <td valign='top'>
 +                <strong>[% l("Item Type") %]</strong><br />
 +                [%  INCLUDE "default/opac/parts/coded_value_selector.tt2"
 +                        attr=["mattype", "item_type"] multiple="multiple" size="4"
 +                        id="adv_global_item_type_basic" %]
 +            </td>
 +            <td valign='top'>
 +                <strong>[% l("Language") %]</strong><br />
 +                [%  INCLUDE "default/opac/parts/coded_value_selector.tt2"
 +                        attr="item_lang" multiple="multiple" size="4" %]
 +            </td>
 +            <td valign='top'>
 +                <strong>[% l("Audience") %]</strong><br />
 +                    [% INCLUDE "default/opac/parts/coded_value_selector.tt2"
 +                        attr="audience" id="adv_global_audience_basic" 
 +                        multiple="multiple" size="4" %]
 +                </select>
 +                    <!--<a id='adv_global_audience_link_adv' class='classic_link adv_adv_link'
 +                        href='javascript:void(0);' onclick='
 +                        hideMe($("adv_global_audience_basic"));
 +                        unHideMe($("adv_global_audience"));
 +                        hideMe(this);
 +                        unHideMe($("adv_global_audience_link_basic"));
 +                        '>[% l("Advanced") %]</a>
 +                    <a id='adv_global_audience_link_basic' class='hide_me classic_link adv_adv_link'
 +                        href='javascript:void(0);' onclick='
 +                        unHideMe($("adv_global_audience_basic"));
 +                        hideMe($("adv_global_audience"));
 +                        unHideMe($("adv_global_audience_link_adv"));
 +                        hideMe(this);'>[% l("Basic") %]</a>-->
 +            </td>
 +            <td valign='top'>
 +            <strong>[% l("Sort Results") %]</strong>
++              <table class='adv_global_filter_sort'>
 +                <tr>
 +                    <td align='center' width='100%'>
 +                        [% INCLUDE "default/opac/parts/filtersort.tt2"
 +                            value=CGI.param('sort') %]
 +                    </td>
 +                </tr>
 +              </table>
 +            </td>
 +          </tr></table>
 +        </td>
 +    </tr>
 +    <tr>
 +        <td colspan="2">
 +            <table cellpadding='10' cellspacing='0' border='0'>
 +                <tbody>
 +                    <tr>
 +                        <td valign='top'>
 +                            <strong>[% l("Search Library") %]</strong><br />
 +                            [% PROCESS "default/opac/parts/org_selector.tt2";
 +                                PROCESS build_org_selector name='loc' value=loc %]
 +                            <div style="position:relative;top:7px;">
 +                                <input type='checkbox' name="modifier"
 +                                value="available"[% CGI.param('modifier').grep('available').size ? ' checked="checked"' : '' %]
 +                                    id='opac.result.limit2avail' />
 +                                <label style="position:relative;top:-2px;"
 +                                    for='opac.result.limit2avail'>
 +                                    [% l("Limit to Available") %]</label>
 +                            </div>
 +                        </td>
 +                        <td valign='top'>
 +                            <strong>[% l("Publication Year") %]</strong><br />
 +                            <select id='adv_global_pub_date_type' name='pubdate' onchange='
 +                                if(this.selectedIndex == 3)
 +                                    unHideMe($("adv_global_pub_date_2_span"));
 +                                else
 +                                    hideMe($("adv_global_pub_date_2_span"));'>
 +                                    [%  FOR opt IN [
 +                                            {"code" => "is", "label" => l("Is")},
 +                                            {"code" => "before", "label" => l("Before")},
 +                                            {"code" => "after", "label" => l("After")},
 +                                            {"code" => "between", "label" => l("Between")}
 +                                        ];
 +                                            |l(opt.code, opt.label) %]
 +                                        <option value="[_1]"[% CGI.param('pubdate') == opt.code ? ' selected="selected"' : '' %]>[_2]</option>
 +                                    [%  END; END %]
 +                            </select>    
 +                            <div style='margin-top:5px;'>
 +                                <input id='adv_global_pub_date_1' name='date1' type='text' size='4' maxlength='4' value="[% CGI.param('date1') | html %]" />
 +                                <span id='adv_global_pub_date_2_span' class='[% CGI.param("pubdate") == "between" ? "" : "hide_me" %]'>
 +                                   [% l("and") %] <input name='date2' id='adv_global_pub_date_2' type='text' size='4' maxlength='4' value="[% CGI.param('date2') | html %]" />
 +                                </span>
 +                            </div>
 +                        </td>
 +                    </tr>
 +                    <!-- copy location selector -->
 +                    <tr id='adv_copy_location_filter_row' class='hide_me'>
 +                        <td align='right'>[% l("Shelving Location") %]</td>
 +                        <td align='left' id='adv_copy_location_filter_td'>
 +                            <select size='3' id='adv_copy_location_filter_select' multiple='multiple'>
 +                            </select>
 +                        </td>
 +                    </tr>
 +                </tbody>
 +            </table>
 +        </td>
 +    </tr>
 +    <tr class='border_4_2'>
 +        <td align="left" colspan='2'>
 +            <input type="image" src="[% ctx.media_prefix %]/images/search_btn.gif"
 +            alt="[% l('Search') %]" class='pointer' />
 +            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 +            <a href="javascript:document.getElementById('adv_search_form').reset();"
 +                id="adv_reset">[% l('Reset Form') %]</a>
 +        </td>
 +    </tr>
 +</table>
 +<input type="hidden" name="_adv" value="1" />
 +</form>
 +<div id='adv_quick_search_sidebar' class='sidebar_chunk hide_me'> 
 +    <div id='adv_quick_search'>
 +        <div class='adv_quick_search color_4'><b>[% l("Quick Search") %]</b></div>
 +        <div style='margin-top: 8px;'>
 +            <table><tbody><tr>
 +                <td>
 +                    <select id='adv_quick_type'>
 +                        <option value='isbn'>[% l("ISBN") %]</option>
 +                        <option value='issn'>[% l("ISSN") %]</option>
 +                        <option value='cn'>[% l("Call Number") %]</option>
 +                        <option value='lccn'>[% l("LCCN") %]</option>
 +                        <option value='tcn'>[% l("TCN") %]</option>
 +                        <option value='barcode'>[% l("Item Barcode") %]</option>
 +                    </select>
 +                </td><td>
 +                    <input type='text' id='adv_quick_text' size='16' />
 +                </td>
 +            </tr></tbody></table>
 +        </div>
 +
 +        <div style='margin-top: 8px;' class='adv_quick_search_submit'>
 +            <!-- XXX TODO make a real form, and make a real submitter (quick
 +            submit, FKA advGenericSearch() -->
 +            <img src="[% ctx.media_prefix %]/images/search_btn.gif"
 +                alt="[% l('Search') %]" id="adv_quick_submit" class='pointer' />
 +        </div>
 +    </div>
 +</div>
 +
 +
 +<div id='adv_marc_search_sidebar' class='sidebar_chunk hide_me'
 +    style='width:400px; margin-top: 20px;'> 
 +    <div class='adv_quick_search color_4'><b>[% l("MARC Expert Search") %]</b></div>
 +    <table style='margin: 3px; width: 100%;' id='adv_sdbar_table'
 +        class='border_4_3'>
 +        <tbody>
 +            <tr>
 +                <td align="right">[% l("Tag:") %]</td>
 +                <td align="left"><input name='advanced.marc.tag' maxlength='3' size='3' /></td>
 +                <td align="right">[% l("Subfield:") %]</td>
 +                <td align="left"><input name='advanced.marc.subfield' maxlength='1' size='1' /></td>
 +            </tr>
 +            <tr>
 +                <td align="right">[% l("Value:") %]</td>
 +                <td colspan='3' align="left"><input name='advanced.marc.value' size='18' /></td>
 +            </tr>
 +            <tr name='crow' class='hide_me'>
 +                <td colspan='4' align='center'>
 +                    <a href='javascript:void(0);' class='classic_link'>[% l("close") %]</a>
 +                </td>
 +            </tr>
 +        </tbody>
 +    </table>
 +    <div id='adv_marc_submit' class='adv_quick_search_submit'>
 +        <a style='margin-right: 4px; position:relative;top:-10px;'
 +            class='classic_link' href='javascript:advAddMARC();'>[% l("Add Row") %]</a>
 +        <!-- XXX TODO make a real form, and make a real submitter (FKA
 +        advMARCRun()) -->
 +        <img alt="Search" src="[% ctx.media_prefix %]/images/search_btn.gif" class='pointer' />
 +    </div>
 +</div>
index 19a7440,0000000..7ffa997
mode 100644,000000..100644
--- /dev/null
@@@ -1,65 -1,0 +1,65 @@@
-                             <select class="opac-auto-179" name="action">
 +        [% IF ctx.mylist.size %]
 +        <form action="[% ctx.opac_root %]/mylist/move" method="POST">
 +        <div id='acct_list_template2'>
 +            <div style="width:100%">
 +                <table cellpadding="0" cellspacing="0" border="0">
 +                    <tr>
 +                        <td id='anon_list_name'>
 +                            [% l('Temporary List') %]
 +                        </td>
 +                        <td>
 +                            <!-- <a href="#"><img
 +                                alt="[% l('Anonymous List Help') %]"
 +                                src="[% ctx.media_prefix %]/images/question-mark.png" /></a>-->
 +                        </td>
 +                    </tr>
 +                </table>
 +                <div class="float-right"></div>
 +                <div class="clear-both pad-bottom-five"></div>
 +            </div>
 +            <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%" style="padding-left:5px;">[% l('Title') %]</td>
 +                        <td width="49%" style="padding-left:5px;">[% l('Author(s)') %]</td>
 +                        <td width="1%" class="nowrap">
-                                     <option value="[% bbag.id %]" class="opac-auto-179-inner-option">[% bbag.name %]</option>
++                            <select class="selector_actions_for_list" name="action">
 +                                <option>[% l('-- Actions for this list --') %]</option>
 +                                <!-- XXX not ready <option value="hold">[% l('Place Hold') %]</option> -->
 +                                <option value="delete">[% l('Remove Items') %]</option>
 +                                [% IF ctx.user AND ctx.bookbags.size %]
 +                                <optgroup label="Move selected items to">
 +                                    [% FOR bbag IN ctx.bookbags %]]
-                         <td class="opac-auto-097b" style="padding-left: 10px;">
++                                    <option value="[% bbag.id %]" class="selector_actions_for_list_inner_option">[% bbag.name %]</option>
 +                                    [% END %]
 +                                </optgroup>
 +                                [% END %]
 +                            </select>
 +                            <input type="submit" value="[% l('Go') %]" />
 +                        </td>
 +                    </tr>
 +                </thead>
 +                <tbody id='anon_list_tbody'>
 +                    [% FOR item IN ctx.mylist;
 +                        attrs = {marc_xml => ctx.mylist_marc_xml.$item};
 +                        PROCESS get_marc_attrs args=attrs %]
 +                    <tr>
-                         <td class="opac-auto-097b" style="padding-left: 5px;">[% attrs.title %]</td>
-                         <td class="opac-auto-097b" style="padding-left: 5px;">[% attrs.author %]</td>
++                        <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;">[% attrs.title %]</td>
++                        <td class="item_list_padding" style="padding-left: 5px;">[% attrs.author %]</td>
 +                    </tr>
 +                    [% END %]
 +                </tbody>
 +            </table>
 +            <br /><br />
 +        </div>
 +        </form>
 +        [% END %]
index 2865026,0000000..ea48f3e
mode 100644,000000..100644
--- /dev/null
@@@ -1,91 -1,0 +1,91 @@@
-                         <td colspan='3' class='opac-auto-004'> </td>
 +<table class="hide_me">
 +    <tbody>
 +        <tr class='opac-auto-009' id='rdetail_volume_details_row' templateRow='1'>
 +            <td colspan='10'>
 +                <div style='text-align: center; margin-top: 6px; margin-bottom: 6px'>
 +                    <a name='print' href='#' class='classic_link'>[% l("print these details") %]</a>
 +                    <table class='data_grid data_grid_center' style='width: 100%'>
 +                        <tbody name='copies_tbody' class='copy_details_table' width='100%'>
 +
 +                                <!-- XXX keeping for now for reference...
 +                                <td>
 +                                    <span name='barcode'> </span>
 +                                    <a class='hide_me classic_link copy_more_info'
 +                                        name='details_link'>[% l("more info...") %]</a>
 +                                    <a class='hide_me classic_link copy_more_info'
 +                                        name='less_details_link'>[% l("less info") %]</a>
 +                                    <a class='hide_me classic_link copy_more_info'
 +                                        name='copy_hold_link' href='#'>[% l("place hold") %]</a>
 +                                </td>
 +                                <td name='status'> </td>
 +                                <td name='location'> </td>
 +                                <td name='age_protect_value' class='hide_me'>[% l("- Disabled -") %]</td>
 +                                <td name='create_date_value' class='hide_me'> </td>
 +                                <td name='copy_holdable_td' class='hide_me'>
 +                                    <span name='copy_is_holdable'> </span>
 +                                </td>
 +                                <td name='copy_due_date_td' class='hide_me'>
 +                                    <span name='copy_due_date'> </span>
 +                                </td>
 +                            </tr>
 +                                -->
 +
 +                            <tr name='copy_extras_row' class='hide_me'>
 +                                <td colspan='10'>
 +                                    <table width='100%' class='data_grid'>
 +                                        <tbody name='extras_tbody'>
 +                                            <tr name='extras_row' class='hide_me'>
 +                                                <td name='type' width='20%'>
 +                                                    <span name='note' class='hide_me'>
 +                                                        <b>[% l("Copy Note") %]</b>
 +                                                    </span>
 +                                                    <span name='cat' class='hide_me'>
 +                                                        <b>[% l("Copy Category") %]</b>
 +                                                    </span>
 +                                                </td>
 +                                                <td>
 +                                                    <span name='key'> </span> : <span name='value'> </span>
 +                                                </td>
 +                                            </tr>
 +                                        </tbody>
 +                                    </table>
 +                                </td>
 +                            </tr>
 +                        </tbody>
 +                    </table>
 +                </div>
 +            </td>
 +        </tr>
 +    </tbody>
 +</table>
 +
 +<span class='hide_me' id='rdetail.yes'>[% l("Yes") %]</span>
 +<span class='hide_me' id='rdetail.no'>[% l("No") %]</span>
 +
 +<div id='rdetail_print_details' class='hide_me'>
 +    <div style='text-align: center; padding: 20px; width: 100%'>
 +        <div style='width:100%; border: 2px solid #E0F0E0; margin-bottom: 20px;'>
 +            <input type='submit' value='[% l("Print Page") %]' onclick='window.print();' />
 +        </div>
 +        <div name='body'>
 +            <table>
 +                <tbody name='tbody'>
 +                    <tr><td>[% l("Library") %]</td><td colspan='2' name='lib'></td></tr>
 +                    <tr><td>[% l("Title") %]</td><td colspan='2' name='title'></td></tr>
 +                    <tr><td>[% l("Author") %]</td><td colspan='2' name='author'></td></tr>
 +                    <tr><td>[% l("Edition") %]</td><td colspan='2' name='edition'></td></tr>
 +                    <tr><td>[% l("Publication Date") %]</td><td colspan='2' name='pubdate'></td></tr>
 +                    <tr><td>[% l("Publisher") %]</td><td colspan='2' name='publisher'></td></tr>
 +                    <tr><td>[% l("Physical Description") %]</td><td colspan='2' name='phys'></td></tr>
 +                    <tr>
++                        <td colspan='3' class='rdetail_print_details_cn_spacer'> </td>
 +                    </tr>
 +                    <tr name='cnrow'>
 +                        <td><b>[% l("Call Number") %]</b></td>
 +                        <td><b colspan='2' name='cn'></b></td>
 +                    </tr>
 +                </tbody>
 +            </table>
 +        </div>
 +    </div>
 +</div>