From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Tue, 29 Nov 2022 18:19:54 +0000 (-0500)
Subject: OPAC My Lists Fix for PINES
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=9b1d3cfc32660f4aa2c3c3a8ee6eac9578c30327;p=evergreen%2Fpines.git

OPAC My Lists Fix for PINES

This should clobber the old PINES customizations, apply the newer
version of the page, and re-apply a few PINES customizations.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
---

diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2
index e2aeebf3d7..bc91f39750 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2
@@ -13,53 +13,45 @@
 "click on the HTML View link in the Saved Lists section.");
 %]
 
-
-<h3>[% l('My Lists') %]</h3>
+<div class="row border-top pt-4">
+    <h3>[% l('My Lists') %]</h3>
+</div>
 <div style="padding-bottom:10px;">[% l("PINES Account Tips") %]</div>
-<div id='myopac_bookbag_div'>
+
+<div id='myopac_bookbag_div container'>
 
     <!-- new list creation -->
-    <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post" id="create_form">
-        <h4>[% l('Create New List') %]</h4><a id="createnewlist"></a>
-        <table class="table" >
-            <tr>
-                <td class="list_create_table_label">
-                    <label for="list_create_name">[% l('Enter the name of the new list:') %]</label>
-                </td>
-                <td class="px-3 my-2">
-                    [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                    <input id="list_create_name" type="text" name="name" class="form-control"/>
-                    <input type="hidden" name="action" value="create" class="form-control" />
-                    [% IF ctx.add_rec %]
-                    <input type="hidden" name="add_rec" value="[% ctx.add_rec %]" class="form-control" />
-                    [% END %]
-                    [% IF ctx.where_from %]
-                    <input type="hidden" name="where_from" value="[% ctx.where_from %]" class="form-control" />
-                    [% END %]
-                </td>
-            </tr>
-            <tr>
-                <td class="list_create_table_label">
-                    <label for="list_description">[% l("List description (optional):") %]</label>
-                </td>
-                <td class="px-3">
-                    <textarea name="description" id="list_description" class="form-control"></textarea>
-                </td>
-            </tr>
-            <tr>
-                <td class="list_create_table_label">
-                    <label for="list_create_shared">[% l('Share this list?') %]</label>
-                </td>
-                <td class="px-3">
-                    <select class="d-inline-block form-control mini-control" name="shared" id="list_create_shared">
-                        <option value="0">[% l('No') %]
-                        <option value="1">[% l('Yes') %]
-                    </select>
-                    <a title="[% l('Allows the list to be shared through a link or RSS.') %]" data-toggle="tooltip">
-                        <i class="fas fa-question-circle" aria-hidden="true"></i>
-                    </a>
-                </td>
-            </tr>
+    <div class="row">
+    <button class="btn btn-sm btn-opac my-2" data-toggle="collapse" data-target="#create_form" aria-expanded="false" aria-controls="create_form">[% l('Create New List') %]</button>
+    </div>
+    <div id="create_form" [% IF ctx.add_rec || move_cart_by_default || !ctx.bookbags.size %] class="collapse show my-3"[% ELSE %] class="row collapse my-3"[% END %]>
+        <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post">
+            [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
+            <input type="hidden" name="action" value="create" class="form-control" />
+            [% IF ctx.add_rec %]
+                <input type="hidden" name="add_rec" value="[% ctx.add_rec %]" class="form-control" />
+            [% END %]
+            [% IF ctx.where_from %]
+                 <input type="hidden" name="where_from" value="[% ctx.where_from %]" class="form-control" />
+            [% END %]
+            <div class="form-group">
+                <label for="list_create_name">[% l('Enter the name of the new list:') %]</label>
+                <input id="list_create_name" type="text" name="name" class="form-control" autofocus>
+            </div>
+            <div class="form-group">
+                <label for="list_description">[% l("List description (optional):") %]</label>
+                <textarea name="description" id="list_description" class="form-control"></textarea>
+            </div>
+            <div class="form-group">
+                <label for="list_create_shared">[% l('Share this list?') %]</label>
+                <select class="d-inline-block form-control mini-control" name="shared" id="list_create_shared">
+                    <option value="0">[% l('No') %]
+                    <option value="1">[% l('Yes') %]
+                </select>
+                <a href="#" title="Allows the list to be shared through a link or RSS." data-toggle="tooltip">
+                <i class="fas fa-question-circle" aria-hidden="true"></i>
+                </a>
+            </div>
             [% IF ctx.mylist.size %]
             <div class="form-group">
                 <label for="list_move_cart">[% l('Move contents of basket to this list?') %]</label>
@@ -79,7 +71,6 @@
     <h3>[% l("... from basket") %]</h3>
     [% INCLUDE "opac/parts/anon_list.tt2" %]
     [% ELSE %]
-    <h3>[% l("My Saved Lists") %]</h3>
     [% INCLUDE "opac/parts/anon_list.tt2" %]
     </div>
 
@@ -87,9 +78,12 @@
     <h3>[% l('Saved Lists') %]</h3>
    
 
-    [% IF ctx.bookbags.size %]
-    <div class="header_middle">
-        <span class="sr-only">[% l('Saved Lists') %]</span>
+        [% IF !ctx.bookbags.size %]
+        <div class="container pb-2 mt-2 pt-2">
+                <h4>[% l("You don't have any lists yet") %]</h4>
+                <a href='[% mkurl(ctx.opac_root _ '/myopac/lists', {}) %]'>[% l('Create a list with the form above') %]</a>
+  
+        [% ELSE %]
         [% IF limit < ctx.bookbag_count; %]
         <span class='float-left' style='padding-left: 10px;'>
             [%- IF offset > 0 -%]
@@ -139,34 +133,38 @@
 
     <div id='acct_lists_prime'>
         [% FOR bbag IN ctx.bookbags %]
-        <div>
-         <table class="table" style="border:3px solid #8DC641;"><tr>
-            <td class="listTitleText">
-                [% baseurl = ctx.opac_root _ '/myopac/lists';
-                IF bbag.id != CGI.param("bbid");
-                    url = mkurl(baseurl,{bbid => bbag.id, item_page => 1},['edit_notes','sort']);
-                    ltitle = l("Show items in list");
-                ELSE;
-                    url = mkurl(baseurl, {}, ['bbid', 'edit_notes', 'sort']);
-                    ltitle = l("Hide items in list");
-                END %]
-                <h4 class="bookbag-name"><a title="[% ltitle %]" href="[% url %]">[% bbag.name | html %]</a>[% IF bbag.pub == 't'; %]
-                <a target='_blank' href='/opac/extras/feed/bookbag/rss2-full/[% bbag.id %]' aria-label="RSS Feed">
-                <i class="fas fa-rss-square" aria-hidden="true"></i></a>
-                [% END %]</h4>
-                [% IF bbag.description %]<div class="bookbag-description" style="padding-left: 20px;">[% bbag.description | html %]</div>[% END %]
-             </td>
-            </tr>
-            <tr>
-            <td>
-            [% 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 %]" />
+        <div class="container border-bottom pb-2">
+            <div class="row mt-2">
+                    [% baseurl = ctx.opac_root _ '/myopac/lists';
+                    IF bbag.id != CGI.param("bbid");
+                        url = mkurl(baseurl,{bbid => bbag.id, item_page => 1},['edit_notes','sort']);
+                        ltitle = l("Show items in list");
+                    ELSE;
+                        url = mkurl(baseurl, {}, ['bbid', 'edit_notes', 'sort']);
+                        ltitle = l("Hide items in list");
+                    END %]
+                    <h4 class="bookbag-name"><a title="[% ltitle %]" href="[% url %]">[% bbag.name | html %]</a>[% IF bbag.pub == 't'; %]
+                    <a target='_blank' href='/opac/extras/feed/bookbag/rss2-full/[% bbag.id %]' aria-label="RSS Feed">
+                    <i class="fas fa-rss-square" aria-hidden="true"></i></a>
+                    [% END %]</h4>
+            </div>
+            <div class="row bookbag-description">
+                     [% bbag.description | html %]
+            </div>
+            <div class="row" style="border:1px solid #bbb;background:#eee;padding:5px;">
+                <div class="col-9">
+                    [% 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 %]
+                        <button class="fixed btn btn-success btn-sm m-1" type="submit" ><i class="fas fa-plus-square" aria-hidden="true"></i> [% l('Add to this list') %]</button>
+                    </div>
+                    </form>
                     [% END %]
 
             <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post">
@@ -230,24 +228,25 @@
             </div>
             [% END %]
 
-            [% IF bbag.pub == 't'; %]
             <div class="bookbag-controls">
-                <a class="btn btn-sm btn-opac m-1" href='[%-
-                    mkurl(
-                        ctx.opac_root _ '/results',
-                        {page => '0', bookbag => bbag.id, depth => 0, locg => ctx.search_ou},
-                        1
-                    )
-                -%]'><i class="fas fa-glasses" aria-hidden="true"></i> [% l('View in Catalog') %]</a>
-
+                <button class="btn btn-action btn-sm m-1" data-toggle="collapse" 
+                    data-target="#bbag-edit-div-[% bbag.id %]"><i class="fa fa-edit" 
+                    aria-hidden="true"></i> [% l('Edit List') %]</button>
             </div>
-               [% END %]
 
-            <div class="bookbag-controls">
-                <button class="btn btn-action btn-sm m-1" data-toggle="collapse" data-target="#bbag-edit-div-[% bbag.id %]"><i class="fa fa-edit" aria-hidden="true"></i> [% l('Edit List') %]</button>
-            </div>
+            [% IF bbag.pub == 't'; %]
+                <div class="bookbag-controls">
+                    <a class="btn btn-sm btn-opac m-1" href='[%-
+                        mkurl(
+                            ctx.opac_root _ '/results',
+                            {page => '0', bookbag => bbag.id, depth => 0, locg => ctx.search_ou},
+                            1
+                        )
+                    -%]'><i class="fas fa-glasses" aria-hidden="true"></i> [% l('View in Catalog') %]</a>
+                </div>
+            [% END %]
 
-                    </div>
+            </div>
                 <div class="col-3">
                     <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post" onsubmit="return confirm('[% l('Do you really want to delete this list?') %]')">
                     <div class="bookbag-controls float-right">
@@ -261,26 +260,30 @@
             </div>
         </div>
 
-        <div id="bbag-edit-div-[% bbag.id %]" class="row collapse">
+        <div id="bbag-edit-div-[% bbag.id %]" class="row collapse" style="margin:5px;">
             <div class="col-12 mt-3 p-2 bg-light">
             <h5>[% l('Edit List Description') %]</h5>
             <form method="post">
-                <div class="form-group">
+                <div class="row" style="margin-left:10px;padding:5px;">
                     <label for="bbag-edit-name">[% l('Name:') %]</label>
-                    <input class="form-control" name="name" type="text" value="[% bbag.name | html %]" id="bbag-edit-name" />
+                    <input class="form-control" name="name" type="text" value="[% bbag.name | html %]" id="bbag-edit-name"
+                        style="margin-left:10px;" />
                 </div>
-                <div class="form-group">
-                <label for="bbag-edit-description">[% l('Description:') %]</label>
-                <textarea name="description" class="form-control"
-                    id="bbag-edit-description">[% bbag.description | html %]
-                </textarea>
+                <div class="row" style="margin-left:10px;padding:5px;">
+                    <label for="bbag-edit-description">[% l('Description:') %]</label>
+                    <textarea name="description" class="form-control"
+                    id="bbag-edit-description" style="margin-left:10px;" />[% bbag.description | html %]
+                    </textarea>
                 </div>
                 <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"; %]
-                <input type="submit" class="btn btn-action btn-sm" value="[% l('Save') %]" />
+                <div style="float:right;">
+                    <button type="submit" class="btn btn-confirm"><i class="fas fa-plus-square" 
+                        aria-hidden="true"></i> [% l('Save Changes') %]</button>
+                </div>
             </form>
             </div>
         </div>
@@ -288,18 +291,17 @@
         [% IF CGI.param("bbid") == bbag.id %]
 
         <div>
-        <h5 class="sr-only">List Items</h5>
+        <h5 class="text-center my-2">List Items</h5>
         <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 %]" />
-
-        <div style="border:1px solid #8DC641;margin: -17px 0px 30px 0px;">
+        <div>
         [% IF bbag.items.size %]
-            <div class="my-2" style="padding-left:30px;">
-                [% l('Select at least one item from your list below to use these actions:') %]<br/>
-                <button name="action" class="btn btn-action" type="submit" value="place_hold" id="place_hold">[% l('Place hold') %]</button>
-                <button name="action" class="btn btn-action" type="submit" value="print">[% l('Print title details') %]</button>
-                <button name="action" class="btn btn-action" type="submit" value="del_item">[% l('Remove from list') %]</button>
+            <div class="my-2">
+                <button name="action" class="btn btn-action btn-sm" type="submit" value="place_hold" id="place_hold">[% l('Place hold') %]</button>
+                <button name="action" class="btn btn-action btn-sm" type="submit" value="print">[% l('Print title details') %]</button>
+                <button name="action" class="btn btn-action btn-sm" type="submit" value="email">[% l('Email title details') %]</button>
+                <button name="action" class="btn btn-action btn-sm" type="submit" value="del_item">[% l('Remove from list') %]</button>
             </div>
         [% END %]
 
@@ -440,10 +442,11 @@
 
 
 
+
         [% IF ctx.bb_page_count > 1; %]
             <div class="header_middle" style="padding-top:7px;">
-                <div class="bbag-navigate-list sr-only">[% l('Navigate Selected List ') %]</div>
-                <div class="bbag-navigate-list-pages" style="width:100%;text-align:center;">
+                <div class="bbag-navigate-list">[% l('Navigate Selected List ') %]</div>
+                <div class="bbag-navigate-list-pages">
                     [%- IF item_page > 1 -%]
                         <a href='[% mkurl(ctx.opac_root _ '/myopac/lists', {
                             item_page => item_page - 1
@@ -501,5 +504,4 @@
 </div>
 
 [% END %]
-[% END %]