From: Chris Sharp <csharp@georgialibraries.org>
Date: Mon, 21 Nov 2016 19:15:17 +0000 (-0500)
Subject: Checking out stock version of lists.tt2 to re-customize
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1ffb20fce223f119d31679e3615639c339e1117e;p=evergreen%2Fpines.git

Checking out stock version of lists.tt2 to re-customize
---

diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2
index 13fb85461a..d0de2ee6c2 100644
--- a/Open-ILS/src/templates/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/lists.tt2
@@ -16,10 +16,7 @@
 
     <!-- new list creation -->
     <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post" id="create_form">
-	<p style="font-style:italic;">Lists allow you to keep track of books you'd like to read in the future, 
-	recommendations you'd like to share with other people, and more. 
-	<a href="http://pines.georgialibraries.org/catalog-help#my_list">Learn more about using lists.</a></p>
-    <div class="header_middle">[% l('Create a New List') %]</div><a name="createnewlist"></a>
+        <h1>[% l('Create New List') %]</h1><a name="createnewlist"></a>
         <table class="table_no_cell_pad" id="list_create_table">
             <tr>
                 <td class="list_create_table_label">
@@ -54,36 +51,36 @@
                         <option value="0">[% l('No') %]
                         <option value="1">[% l('Yes') %]
                     </select>
-                    <!--<a href="javascript:void(0);" 
+                    <a href="javascript:void(0);" 
                         onclick="alert('[% bb_publish_text %]')">
                         <img alt="[% l('Sharing Help') %]"
                             [% html_text_attr('title', bb_publish_text) %]
                             src="[% ctx.media_prefix %]/images/question-mark.png[% ctx.cache_key %]" />
-                    </a>-->
+                    </a>
                 </td>
             </tr>
             <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"  style="padding:5px;background-color:#669999;" />
-						
-					<input type="submit"
-                        value="[% l('Submit') %]"
-                        alt="[% l('Submit') %]"
-                        class="opac-button" style="padding:5px 30px 5px 30px;" />
+                        class="opac-button" />
                 </td>
             </tr>
         </table>
     </form>
 
-    <!--<div class="header_middle">[% l('My Existing Lists') %]</div>-->
+    <h1>[% l("My Existing Lists") %]</h1>
     [% INCLUDE "opac/parts/anon_list.tt2" %]
     [% IF ctx.bookbags.size %]
-    <div class="header_middle" style="margin-top:40px;">
-        <span class="float-left">[% l('My Lists') %]</span>
+    <div class="header_middle">
+        <span class="float-left">[% l('Saved Lists') %]</span>
         [% IF limit < ctx.bookbag_count; %]
         <span class='float-left' style='padding-left: 10px;'>
             [%- IF offset > 0 -%]
@@ -135,7 +132,7 @@
     <div id='acct_lists_prime'>
         [% FOR bbag IN ctx.bookbags %]
         <div class="bookbag-controls-holder">
-            <div class="bookbag-controls most" style="width:200px;padding-left:10px;" >
+            <div class="bookbag-controls most">
                 [% baseurl = ctx.opac_root _ '/myopac/lists';
                 IF bbag.id != CGI.param("bbid");
                     url = mkurl(baseurl,{bbid => bbag.id, item_page => 1},['edit_notes','sort']);
@@ -161,26 +158,47 @@
                 </div>
             </form>
             [% END %]
-            [% setting = 'opac.default_list'; %]
             <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post">
-                <div class="bookbag-controls">
+                <div class="bookbag-share">
                     <input type="hidden" name="list" value="[% bbag.id %]" />
                     [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                    [% IF ctx.user_setting_map.$setting == bbag.id %]
-                    <input type="hidden" name="action" value="remove_default" />
-                    <input type="submit" value="[% l('Remove Default List') %]" style="width:150px;" />
+                    [% IF bbag.pub != 't' %]
+                    <input type="hidden" name="action" value="show" />
+                    <input class="fixed" type="submit" value="[% l('Share') %]" />
                     [% ELSE %]
-                    <input type="hidden" name="action" value="make_default" />
-                    <input type="submit" value="[% l('Make Default List') %]"  style="width:150px;" />
+                    <input type="hidden" name="action" value="hide" />
+                    <input class="fixed" type="submit" value="[% l('Hide') %]" />
                     [% END %]
                 </div>
             </form>
+            <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post" onsubmit="return confirm('[% l('Do you really want to delete this list?') %]')">
+                <div class="bookbag-controls">
+                    <input type="hidden" name="list" value="[% bbag.id %]" />
+                    <input type="hidden" name="action" value="delete" />
+                    [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
+                    <input type="submit" value="[% l('Delete List') %]" />
+                </div>
+            </form>
             <form action="[% mkurl(ctx.opac_root _ '/myopac/list/print') %]" method="post">
                 <div class="bookbag-controls">
                     <input type="hidden" name="list" value="[% bbag.id %]" />
                     <input type="hidden" name="sort" value="[% CGI.param('sort') | html %]" />
                     [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                    <input type="submit" value="[% l('Download List Data') %]" />
+                    <input type="submit" value="[% l('Download CSV') %]" />
+                </div>
+            </form>
+            [% setting = 'opac.default_list'; %]
+            <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post">
+                <div class="bookbag-controls">
+                    <input type="hidden" name="list" value="[% bbag.id %]" />
+                    [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
+                    [% IF ctx.user_setting_map.$setting == bbag.id %]
+                    <input type="hidden" name="action" value="remove_default" />
+                    <input type="submit" value="[% l('Remove Default List') %]" />
+                    [% ELSE %]
+                    <input type="hidden" name="action" value="make_default" />
+                    <input type="submit" value="[% l('Make Default List') %]" />
+                    [% END %]
                 </div>
             </form>
             [% IF ctx.is_staff %]
@@ -204,29 +222,15 @@
                 />
             </div>
             [% END %]
-			<form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post">
-                <div class="bookbag-share" style="margin-left:10px;" >
-                    <input type="hidden" name="list" value="[% bbag.id %]" />
-                    [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                    [% IF bbag.pub != 't' %]
-                    <input type="hidden" name="action" value="show" />
-                    <input class="fixed" type="submit" value="[% l('Make Public') %]" style="width:100px;" />
-                    [% ELSE %]
-                    <input type="hidden" name="action" value="hide" />
-                    <input class="fixed" type="submit" value="[% l('Make Private') %]" style="width:100px;" />
-                    [% END %]
-                </div>
-            </form>
-            <div  class="bookbag-controls" style="width:100px;">
-			<div class="bookbag-controls">
-                [% IF bbag.pub == 't'; %]RSS: 
+            <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[% ctx.cache_key %]"/></a>
                 [% END %]
             </div>
             <div class="bookbag-controls">
-                 [% IF bbag.pub == 't'; %]
+                [% IF bbag.pub == 't'; %]
                 <a href='[%-
                     mkurl(
                         ctx.opac_root _ '/results',
@@ -236,23 +240,13 @@
                 -%]'>[% l('HTML View') %]</a>
                 [% END %]
             </div>
-			</div>
-			<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">
-                    <input type="hidden" name="list" value="[% bbag.id %]" />
-                    <input type="hidden" name="action" value="delete" />
-                    [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                    <input type="submit" value="[% l('Delete List') %]" />
-                </div>
-            </form>
             <div class="clear-both pad-bottom-five"></div>
         </div>
         [% IF CGI.param("bbid") == bbag.id %]
-        <div class="bookbag-specific" style="height:10em;margin-bottom:0px;margin-top:0px;" >
-        <!-- Hide for PINES - it's unnecessary since the table columns can sort            
-           <div class="sort">
+        <div class="bookbag-specific">
+            <div class="sort">
                 <form method="get">
-                    <label for="opac.result.sort"><strong>[% l("Sort list items by: ") %]</strong></label>
+                    <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' %]
@@ -261,7 +255,6 @@
                     <input type="submit" value="[% l('Sort') %]" />
                 </form>
             </div>
-        -->
             <div class="meta">
                 <form method="post">
                     <input type="hidden" name="bbid" value="[% bbag.id %]" />
@@ -272,23 +265,22 @@
                     <table id="bbag-name-desc-form">
                         <tr>
                             <th>
-                                <label for="bbag-edit-name">[% l('List Name:') %]</label>
+                                <label for="bbag-edit-name">[% l('Name:') %]</label>
                             </th>
                             <td>
-                                <input name="name" type="text" style="font-size:1em;"
+                                <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 Changes') %]" alt="[% l('Save') %]" 
-                                    class="opac-button" style="padding-left:20px;padding-right:20px;" />
+                                [% 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" style="font-size:1em;"
+                                <textarea name="description"
                                     id="bbag-edit-description">[% bbag.description | html %]</textarea>
                             <div class="bbag-edit-desc-save">
                                 [% l("Save changes to name or description?") %]
@@ -301,9 +293,7 @@
         <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post">
         <input type="hidden" name="list" value="[% bbag.id %]" />
         <input type="hidden" name="sort" value="[% CGI.param('sort') | uri %]" />
-        <table class="bookbag-specific table_no_cell_pad table_no_border_space table_no_border" 
-            style="margin-bottom:10px;margin-top:-20px;border-bottom: 2px solid #ccc;">
-            [% IF bbag.items.size > 0 %]
+        <table class="bookbag-specific table_no_cell_pad table_no_border_space table_no_border">
             <thead id="acct_list_header">
                 <tr>
                     <td class="list_checkbox">
@@ -314,28 +304,28 @@
                                 inputs[i].checked = this.checked;}"/>
 
                     </td>
-                    <td class="list_entry" style="font-weight:bold;">
+                    <td class="list_entry">
                         <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {sort=> (CGI.param('sort') == 'titlesort' ? 'titlesort.descending' : 'titlesort')}) %]">[% l('Title') %]</a>
                     </td>
-                    <td class="list_entry" style="font-weight:bold;">
-                        <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {sort=>(CGI.param('sort') == 'authorsort' ? 'authorsort.descending' : 'authorsort')}) %]">[% l('Author') %]</a>
+                    <td class="list_entry">
+                        <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {sort=>(CGI.param('sort') == 'authorsort' ? 'authorsort.descending' : 'authorsort')}) %]">[% l('Author(s)') %]</a>
                     </td>
-                    <td class='list_entry' style="font-weight:bold;">
+                    <td class='list_entry'>
                         [% l('Local Call Number') %]
                     </td>
-                    <td class="list_entry" style="font-weight:bold;">
+                    <td class="list_entry">
                         <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {sort=>(CGI.param('sort') == 'pubdate' ? 'pubdate.descending' : 'pubdate')}) %]">[% l('Publication Date') %]</a>
                     </td>
-                    <td class="list_entry" style="font-weight:bold;">
+                    <td class="list_entry">
                          [% l('Format') %]
                     </td>
-                    <td class="list_entry" style="font-weight:bold;">
+                    <td class="list_entry">
                         [% l('Notes') %]
                         [% IF CGI.param("edit_notes") != bbag.id %]
                         | <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {edit_notes=> bbag.id}) %]">[% l('Edit') %]</a>
                         [% END %]
                     </td>
-                    <td class="list_actions" style="font-weight:bold;">
+                    <td class="list_actions">
                         <select name="action">
                             <option disabled="disabled">[% l('-- Actions for these items --') %]</option>
                             <option value="place_hold">[% l('Place hold') %]</option>
@@ -346,10 +336,9 @@
                     </td>
                 </tr>
             </thead>
-            [% END %]
             <tbody>
                 [% UNLESS bbag.items.size %]
-                <tr><td colspan="6" class="list_is_empty" style="text-align:left;padding:10px;">
+                <tr><td colspan="6" class="list_is_empty">
                     [% l("This list contains no items.") %]
                 </td></tr>
                 [% END %]
@@ -409,14 +398,13 @@
                     [% END %]
                 </tr>
                 [% END %]
-                [% IF CGI.param("edit_notes") == bbag.id AND bbag.items.size %]
+                [% IF CGI.param("edit_notes") == bbag.id %]
                 <tr>
-                    <td colspan="6"><!-- All space left of notes column --></td>
+                    <td colspan="3"><!-- All space left of notes column --></td>
                     <td class="save-notes">
                         [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
                         <input type="hidden" name="bbid" value="[% CGI.param('bbid') | html %]" />
-                        <input type='submit' name="save_notes" value="[% l('Save Notes') %]" alt="[% l('Save Notes') %]" 
-                            class="opac-button" style="padding-left:20px;padding-right:20px;" />
+                        <input type="submit" name="save_notes" value="[% l('Save Notes') %]" />
                     </td>
                 </tr>
                 [% END %]