From ec3107169ce05c3c17a1ccd31451aef50cf5dd34 Mon Sep 17 00:00:00 2001
From: McCanna <tmccanna@georgialibraries.org>
Date: Wed, 8 Nov 2017 09:35:46 -0500
Subject: [PATCH] OPAC Customization: My Lists

Reset customizations to master and reapplied PINES help tips.

Signed-off-by: McCanna <tmccanna@georgialibraries.org>
---
 Open-ILS/src/templates/opac/myopac/lists.tt2 | 100 +++++++++++++--------------
 1 file changed, 49 insertions(+), 51 deletions(-)

diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2
index cd4faf9f1c..e60cf595a0 100644
--- a/Open-ILS/src/templates/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/lists.tt2
@@ -12,15 +12,16 @@
 "click on the HTML View link in the Saved Lists section.");
 %]
 <h3 class="sr-only">[% l('My Lists') %]</h3>
-<div id='myopac_bookbag_div' style="padding:5px;">
-
 
-    <!-- PINES Customization -->
-    <p><i>[% l("PINES List Tips") %]</i></p>
+<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>
+		
+		<!-- PINES Customization -->
+        <p><i>[% l("PINES List Tips") %]</i></p>
+		
         <table class="table_no_cell_pad" id="list_create_table">
             <tr>
                 <td class="list_create_table_label">
@@ -66,15 +67,15 @@
             <tr>
                 <td>&nbsp;</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" />
+                    &nbsp;&nbsp;&nbsp;
+                    <input type="submit"
+                        value="[% l('Submit') %]"
+                        alt="[% l('Submit') %]"
+                        class="opac-button"/>
                 </td>
             </tr>
         </table>
@@ -136,7 +137,7 @@
     <div id='acct_lists_prime'>
         [% FOR bbag IN ctx.bookbags %]
         <div class="bookbag-controls-holder">
-            <div class="bookbag-controls most">
+            <div class="bookbag-controls-title-block">
                 [% baseurl = ctx.opac_root _ '/myopac/lists';
                 IF bbag.id != CGI.param("bbid");
                     url = mkurl(baseurl,{bbid => bbag.id, item_page => 1},['edit_notes','sort']);
@@ -232,8 +233,6 @@
                     alt="[% l('RSS Feed') %]" border="0"
                     src="[% ctx.media_prefix %]/images/small-rss.png[% ctx.cache_key %]"/></a>
                 [% END %]
-            </div>
-            <div class="bookbag-controls">
                 [% IF bbag.pub == 't'; %]
                 <a href='[%-
                     mkurl(
@@ -244,21 +243,24 @@
                 -%]'>[% l('HTML View') %]</a>
                 [% END %]
             </div>
+            </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>
+            [% IF bbag.items.size %]
+                <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" class="opac-button" value="[% l('Sort') %]" />
+                    </form>
+                </div>
+            [% END %]
             <div class="meta">
                 <form method="post">
                     <input type="hidden" name="bbid" value="[% bbag.id %]" />
@@ -266,25 +268,18 @@
                     <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>
+                            <p style="font-weight:bold;">[% l('Edit List Description') %]</p>
+                            <div class="bbag-edit-desc-label">
                                 <label for="bbag-edit-name">[% l('Name:') %]</label>
-                            </th>
-                            <td>
-                                <input name="name" type="text"
+                            </div>
+                            <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"
+                            <div style="clear:both;" />
+                            <div class="bbag-edit-desc-label">
+                                <label for="bbag-edit-description">[% l('Description:') %]</label>
+                            </div>
+                            <textarea name="description"
                                     id="bbag-edit-description">[% bbag.description | html %]</textarea>
                             <div class="bbag-edit-desc-save">
                                 [% l("Save changes to name or description?") %]
@@ -297,6 +292,18 @@
         <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 class="bbag-content">
+        [% IF bbag.items.size %]
+            <div class="bbag-action">
+                <select name="action" class="bbag-action-field">
+                    <option disabled="disabled" selected="selected">[% l('-- Actions for these items --') %]</option>
+                    <option value="place_hold">[% l('Place hold') %]</option>
+                    <option value="del_item">[% l('Remove from list') %]</option>
+                </select>
+                [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
+                <input class="opac-button" type="submit" value="[% l('Go') %]" />
+            </div>
+        [% END %]
         <table class="bookbag-specific table_no_cell_pad table_no_border_space table_no_border">
             <thead id="acct_list_header">
                 <tr>
@@ -329,15 +336,6 @@
                         | <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="place_hold">[% l('Place hold') %]</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>
@@ -403,12 +401,12 @@
                 </tr>
                 [% END %]
                 [% IF CGI.param("edit_notes") == bbag.id %]
-                <tr>
-                    <td colspan="3"><!-- All space left of notes column --></td>
+                <tr class="mobile_hide">
+                    <td colspan="6"><!-- 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') %]" />
+                        <input type="submit" class="opac-button" name="save_notes" value="[% l('Save Notes') %]" />
                     </td>
                 </tr>
                 [% END %]
-- 
2.11.0