Checking in wjr changes so far, minus a few files

Checking in changes from wjr so far, minus changes made to two files:
opac/parts/searchbar.tt2
opac/parts/record/extras.tt2

Signed-off-by: Jeff Godin <jgodin@tadl.org>

diff --git a/templates_tadlskin/opac/myopac/circ_history.tt2 b/templates_tadlskin/opac/myopac/circ_history.tt2
index 4e8c861..af1c2d6 100644 (file)
--- a/templates_tadlskin/opac/myopac/circ_history.tt2
+++ b/templates_tadlskin/opac/myopac/circ_history.tt2
@@ -31,7 +31,7 @@
                 <div>
                     [%- INCLUDE "opac/parts/preserve_params.tt2" %]
                     <input type="hidden" name="filename" value="[% l('circ_history.csv') %]"/> 
-                    <button type="submit">[% l('Download CSV') %]</button>
+                    <button type="submit" class="opac-button">[% l('Download CSV') %]</button>
                 </div>
             </form>
         </span>

diff --git a/templates_tadlskin/opac/myopac/hold_history.tt2 b/templates_tadlskin/opac/myopac/hold_history.tt2
index bc3cc6c..2c3e611 100644 (file)
--- a/templates_tadlskin/opac/myopac/hold_history.tt2
+++ b/templates_tadlskin/opac/myopac/hold_history.tt2
@@ -107,4 +107,5 @@
         </table>
         [% END %]
     </div>
+</div>
 [% END %]

diff --git a/templates_tadlskin/opac/myopac/lists.tt2 b/templates_tadlskin/opac/myopac/lists.tt2
index 88972c6..e588552 100644 (file)
--- a/templates_tadlskin/opac/myopac/lists.tt2
+++ b/templates_tadlskin/opac/myopac/lists.tt2
@@ -52,8 +52,8 @@
         </table>
     </form>
 
-    <h1>[% l("Your existing lists") %]</h1>
     [% INCLUDE "opac/parts/anon_list.tt2" %]
+    <h1>[% l("Your existing lists") %]</h1>
     [% IF ctx.bookbags.size %]
     <div class="header_middle">
         <span class="float-left">[% l('Saved Lists') %]</span>
@@ -88,10 +88,10 @@
                     [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
                     [% IF bbag.pub != 't' %]
                     <input type="hidden" name="action" value="show" />
-                    <input class="fixed" type="submit" value="[% l('Share') %]" />
+                    <input class="fixed opac-button" type="submit" value="[% l('Share') %]" />
                     [% ELSE %]
                     <input type="hidden" name="action" value="hide" />
-                    <input class="fixed" type="submit" value="[% l('Hide') %]" />
+                    <input class="fixed opac-button" type="submit" value="[% l('Hide') %]" />
                     [% END %]
                 </div>
             </form>
@@ -100,7 +100,7 @@
                     <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') %]" />
+                    <input type="submit" class="opac-button" value="[% l('Delete List') %]" />
                 </div>
             </form>
             <form action="[% mkurl(ctx.opac_root _ '/myopac/list/print') %]" method="POST">
@@ -108,17 +108,15 @@
                     <input type="hidden" name="list" value="[% bbag.id %]" />
                     <input type="hidden" name="sort" value="[% CGI.param('sort') | html %]" />
                     [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                    <input type="submit" value="[% l('Download CSV') %]" />
+                    <input type="submit" class="opac-button" value="[% l('Download CSV') %]" />
                 </div>
             </form>
-            <div class="bookbag-controls">
+            <div class="bookbag-controls" style="margin-top:0px;">
                 [% 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>
+                <a target='_blank' href='/opac/extras/feed/bookbag/rss2-full/[% bbag.id %]' class='tbutton small tadlblue'><span>[% l('RSS') %]</span></a>
                 [% END %]
             </div>
-            <div class="bookbag-controls">
+            <div class="bookbag-controls" style="margin-top:0px;">
                 [% IF bbag.pub == 't'; %]
                 <a href='[%-
                     mkurl(
@@ -126,7 +124,7 @@
                         {page => '0', bookbag => bbag.id, depth => 0, locg => ctx.search_ou},
                         1
                     )
-                -%]'>[% l('HTML View') %]</a>
+                -%]' class='tbutton small tadlblue'><span>[% l('HTML') %]</span></a>
                 [% END %]
             </div>
             <div class="clear-both pad-bottom-five"></div>
@@ -141,7 +139,7 @@
                         value=CGI.param('sort') mode='bookbag' %]
                     <input type="hidden" name="bbid"
                         value="[% CGI.param('bbid') | html %]" />
-                    <input type="submit" value="[% l('Sort') %]" />
+                    <input type="submit" class="opac-button" value="[% l('Sort') %]" />
                 </form>
             </div>
             <div class="meta">
@@ -163,7 +161,7 @@
                             </td>
                             <td rowspan="2" class="saver">
                                 [% l("Save changes to name or description?") %]<br />
-                                <input type="submit" value="[% l('Save') %]" />
+                                <input type="submit" class="opac-button" value="[% l('Save') %]" />
                             </td>
                         </tr>
                         <tr>
@@ -211,7 +209,7 @@
                             <option value="del_item">[% l('Remove from list') %]</option>
                         </select>
                         [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                        <input type="submit" value="[% l('Go') %]" />
+                        <input type="submit" class="opac-button" value="[% l('Go') %]" />
                     </td>
                 </tr>
             </thead>

diff --git a/templates_tadlskin/opac/myopac/update_password.tt2 b/templates_tadlskin/opac/myopac/update_password.tt2
index c87fc5d..4fe4648 100644 (file)
--- a/templates_tadlskin/opac/myopac/update_password.tt2
+++ b/templates_tadlskin/opac/myopac/update_password.tt2
@@ -26,8 +26,8 @@
         <tr><td>[% l('Current Password') %]</td><td><input type='password' name='current_pw'/></td></tr>
         <tr><td>[% l('New Password') %]</td><td><input type='password' name='new_pw'/></td></tr>
         <tr><td>[% l('New Password Again') %]</td><td><input type='password' name='new_pw2'/></td></tr>
-        <tr><td colspan='2' align='center'><input value="[% l('Submit') %]" type='submit'/></td></tr>
+        <tr><td colspan='2' align='center'><input value="[% l('Submit') %]" type='submit' class='opac-button'/></td></tr>
     </table>
 </form>
-
+</div>
 [% END %]

diff --git a/templates_tadlskin/opac/myopac/update_username.tt2 b/templates_tadlskin/opac/myopac/update_username.tt2
index a3a0bd2..bb081a0 100644 (file)
--- a/templates_tadlskin/opac/myopac/update_username.tt2
+++ b/templates_tadlskin/opac/myopac/update_username.tt2
@@ -30,8 +30,8 @@
         <tr><td>[% l('Current Username') %]</td><td>[% ctx.user.usrname | html %]</td></tr>
         <tr><td>[% l('Current Password') %]</td><td><input type='password' name='current_pw'/></td></tr>
         <tr><td>[% l('New Username') %]</td><td><input type='text' name='username' value='[% ctx.invalid_username | html %]'/></td></tr>
-        <tr><td colspan='2' align='center'><input value="[% l('Submit') %]" type='submit'/></td></tr>
+        <tr><td colspan='2' align='center'><input value="[% l('Submit') %]" type='submit' class='opac-button'/></td></tr>
     </table>
 </form>
-
+</div>
 [% END %]

diff --git a/templates_tadlskin/opac/parts/anon_list.tt2 b/templates_tadlskin/opac/parts/anon_list.tt2
index 00a898d..27c471d 100644 (file)
--- a/templates_tadlskin/opac/parts/anon_list.tt2
+++ b/templates_tadlskin/opac/parts/anon_list.tt2
@@ -7,7 +7,7 @@
                 <input type="hidden" name="id"
                     value="[% CGI.param('id') | html %]" />
                 [%- INCLUDE "opac/parts/preserve_params.tt2"; %]
-                <input type="submit" value="[% l('Sort') %]" />
+                <input type="submit" class="opac-button" value="[% l('Sort') %]" />
             </form>
         </div>
 

diff --git a/templates_tadlskin/opac/parts/base.tt2 b/templates_tadlskin/opac/parts/base.tt2
index 1721a9c..80ba02b 100644 (file)
--- a/templates_tadlskin/opac/parts/base.tt2
+++ b/templates_tadlskin/opac/parts/base.tt2
@@ -8,7 +8,7 @@
         <meta http-equiv="refresh" content="[% ctx.authtime %]; url=[% ctx.logout_page %]">
         [% END %]
         <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/default/opac/semiauto.css" />
-        <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/default/opac/style.css" />
+        <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/default/opac/tadl.css" />
         <title>[% l('Catalog - [_1]', ctx.page_title) %]</title>
         <link rel="unapi-server" type="application/xml" title="unAPI" href="/opac/extras/unapi" />
         [% IF want_dojo %]

diff --git a/templates_tadlskin/opac/parts/footer.tt2 b/templates_tadlskin/opac/parts/footer.tt2
index 76c6b7a..d6b2553 100644 (file)
--- a/templates_tadlskin/opac/parts/footer.tt2
+++ b/templates_tadlskin/opac/parts/footer.tt2
@@ -4,11 +4,11 @@
 -%]
 <div id="footer-wrap">
 <div id="footer">
-    <a href="[% hostname %]">[% l('Dynamic catalog') %]</a> &nbsp;|&nbsp;
-    <a href="http://example.com">[% l('Bottom Link 2') %]</a> &nbsp;|&nbsp;
-    <a href="http://example.com">[% l('Bottom Link 3') %]</a> &nbsp;|&nbsp;
-    <a href="http://example.com">[% l('Bottom Link 4') %]</a> &nbsp;|&nbsp;
-    <a href="http://example.com">[% l('Bottom Link 5') %]</a>
+    <div style="float:right;">
+    <a href="http://www.tadl.org/">[% l('TADL Home') %]</a><!-- &nbsp;|&nbsp;
+    <a href="#">[% l('link text') %]</a> &nbsp;|&nbsp;
+    <a href="#">[% l('link text') %]</a> -->
+    </div>
     [% IF ctx.timing %]
     <div id="timing">
         [% FOR event IN ctx.timing %]
@@ -17,14 +17,14 @@
         [% END %]
     </div>
     [% END %]
-    <div id="copyright_text" style="margin-top: 2em;">
+    <div id="copyright_text" style="float:left;">
         [% l('Copyright &copy; 2006-[_1] Georgia Public Library Service, and others', date.format(date.now, '%Y')) %]
     </div>
-    <div id="footer_logo">
-        [% l('Powered by') %]
+    <div id="footer_logo" style="clear:both;">
+        <div style="float:left;padding-top:2px;">[% l('Powered by&nbsp;&nbsp;') %]</div>
         <a href="http://evergreen-ils.org">
             <img src="[% ctx.media_prefix %]/opac/images/eg_tiny_logo.png"
-                style="border:none; width: 94px; height: 16px;"
+                style="border:none; width: 94px; height: 17px; vertical-align:top;"
                 alt="[% l('Evergreen') %]"
             />
         </a>

diff --git a/templates_tadlskin/opac/parts/login/help.tt2 b/templates_tadlskin/opac/parts/login/help.tt2
index 16db31f..060d473 100644 (file)
--- a/templates_tadlskin/opac/parts/login/help.tt2
+++ b/templates_tadlskin/opac/parts/login/help.tt2
@@ -1,12 +1,13 @@
 <td class="login_boxes right_brain" align="center" valign="top" width="291">
+    <p>&nbsp;</p>
 
-    <a href="http://example.com"><img 
-        src="[% ctx.media_prefix %]/images/questions.png" alt="[% l('Questions?') %]" style="margin-top:29px;" /></a>
+    <a class="tbutton large tadlblue" href="http://www.tadl.org/contact"><span>Questions?</span></a>
+
+    <p>&nbsp;</p>
 
     <div style="width:182px;color:black;padding:5px 25px;">
-        [% l('Visit our FAQs section for answers to common questions about how to use your account.') %]
+        [% l('If you have any questions or need any assistance using our updated catalog, please let us know!') %]
     </div>
-
-    <a href="http://example.com"><img
-        alt="[% l('FAQs') %]" src="[% ctx.media_prefix %]/images/faqs-btn.png" style="margin-top:13px;" /></a>
+<!--
+    <a class="tbutton medium tadlblue" href="http://www.tadl.org/catalog"><span>FAQs&nbsp;&raquo;</span></a> -->
 </td>

diff --git a/templates_tadlskin/opac/parts/place_hold_result.tt2 b/templates_tadlskin/opac/parts/place_hold_result.tt2
index 6504906..651c71e 100644 (file)
--- a/templates_tadlskin/opac/parts/place_hold_result.tt2
+++ b/templates_tadlskin/opac/parts/place_hold_result.tt2
@@ -108,9 +108,9 @@
         [% END %]
         <span>
         [% IF any_failures OR ctx.general_hold_error %]
-        <a href="[% CGI.param('redirect_to') || CGI.referer | html %]">[% l('Cancel') %]</a>
+        <a href="[% CGI.param('redirect_to') || CGI.referer | html %]" class="tbutton small tadlblue"><span>[% l('Cancel') %]</span></a>
         [% ELSE %]
-        <a href="[% CGI.param('redirect_to') || CGI.referer | html %]">[% l('Continue') %]</a>
+        <a href="[% CGI.param('redirect_to') || CGI.referer | html %]" class="tbutton small tadlblue"><span>[% l('Continue') %]</span></a>
         [% END %]
         </span>
     </form>

diff --git a/templates_tadlskin/opac/parts/record/copy_table.tt2 b/templates_tadlskin/opac/parts/record/copy_table.tt2
index b806f5c..36a5e1e 100644 (file)
--- a/templates_tadlskin/opac/parts/record/copy_table.tt2
+++ b/templates_tadlskin/opac/parts/record/copy_table.tt2
@@ -166,13 +166,11 @@ END;
                 [%- more_copies_limit = 50 %] [%# TODO: config %]
                 [%- IF  ctx.copy_limit != more_copies_limit AND copies.size >= ctx.copy_limit %]
                     <div class="rdetail_show_copies">
-                        <img src="[% ctx.media_prefix %]/images/plus_sign.png" />
-                        <a href="[% mkurl('', {copy_limit => more_copies_limit, copy_offset => 0}) %]">[% l('Show more copies') %]</a>
+                        <a href="[% mkurl('', {copy_limit => more_copies_limit, copy_offset => 0}) %]" class="tbutton small tadlblue"><span>[% l('Show more copies') %]</span></a>
                     </div>
                 [%- ELSIF ctx.copy_limit == more_copies_limit %]
                     <div  class="rdetail_show_copies">
-                        <img src="[% ctx.media_prefix %]/images/minus_sign.png" />
-                        <a href="[% mkurl('', {copy_limit => 0, copy_offset => 0}) %]">[% l('Show fewer copies') %]</a>
+                        <a href="[% mkurl('', {copy_limit => 0, copy_offset => 0}) %]" class="tbutton small tadlblue"><span>[% l('Show fewer copies') %]</span></a>
                     </div>
                 [%- END %]
             </td>

diff --git a/templates_tadlskin/opac/parts/result/lowhits.tt2 b/templates_tadlskin/opac/parts/result/lowhits.tt2
index f6f39b2..19d6981 100644 (file)
--- a/templates_tadlskin/opac/parts/result/lowhits.tt2
+++ b/templates_tadlskin/opac/parts/result/lowhits.tt2
@@ -15,7 +15,7 @@
 
             </p>
         </div>
-        <div style="float:right;width:353px;background:#ccc;padding:10px;margin-top:7px;">
+        <div style="float:right;width:353px;background:#fff;border:1px solid #e6e6e6;padding:10px;margin-top:7px;">
             [% INCLUDE "opac/parts/result/lowhits_purchase.tt2" %]
             <p>
                 <strong>Keyword Search Tips</strong><br />

diff --git a/templates_tadlskin/opac/parts/result/table.tt2 b/templates_tadlskin/opac/parts/result/table.tt2
index 21ccaa4..73d81e1 100644 (file)
--- a/templates_tadlskin/opac/parts/result/table.tt2
+++ b/templates_tadlskin/opac/parts/result/table.tt2
@@ -43,12 +43,12 @@
                                             <td class='result_table_pic_header'>
                                                 [% ident = attrs.isbn_clean || attrs.upc; IF ident; %]
                                                 <a href="[% mkurl(ctx.opac_root _ '/record/' _ rec.id) %]"><img alt="[% l('Image of item') %]"
-                                                        name='item_jacket' class='result_table_pic' width="55"
-                                                        src='[% ctx.media_prefix %]/opac/extras/ac/jacket/small/[% ident | uri %]' /></a><br />
+                                                        name='item_jacket' class='result_table_pic' width="100"
+                                                        src='[% ctx.media_prefix %]/opac/extras/ac/jacket/medium/[% ident | uri %]' /></a><br />
                                                 [% END %]
                                             </td>
                                             <td class='result_table_title_cell' name='result_table_title_cell'>
-                                                <div class="bold">
+                                                <div class="bold bigger">
                                                     <a name='record_[% rec.id %]' name='item_title'
                                                         href="[% mkurl(ctx.opac_root _ '/record/' _ rec.id) %]"
                                                         [% HTML.attributes(title => l('Display record details for "[_1]"', attrs.title)) %]

diff --git a/templates_tadlskin/opac/parts/topnav.tt2 b/templates_tadlskin/opac/parts/topnav.tt2
index beaccb8..66681ca 100644 (file)
--- a/templates_tadlskin/opac/parts/topnav.tt2
+++ b/templates_tadlskin/opac/parts/topnav.tt2
@@ -8,9 +8,9 @@
         [% IF !ctx.user %]
         <div id="your-acct-login">
             <a href="[% mkurl(ctx.opac_root _ '/myopac/main') %]" 
-                class="opac-button opac-button-header" id="home_myopac_link">
+                class="tbutton medium tadlblue" id="home_myopac_link"><span>
                 [% l('Your Account Log in') %]
-            </a>
+            </span></a>
         </div>
         [% ELSE %]
         <div id="dash_wrapper">
@@ -18,12 +18,12 @@
                 <span id="dash_user">
                     [%  l('[_1] [_2]', ctx.user.first_given_name, ctx.user.family_name) | html %]
                 </span>
-                <span class="dash_divider">|</span>
+                <span class="dash_divider"><!-- | --></span>
                 <a href="[% mkurl(ctx.opac_root _ '/myopac/main') %]" 
-                    class="opac-button">[% l('My Account') %]</a>
+                    class="tbutton small tadlblue"><span>[% l('My Account') %]</span></a>
 
                 <a href="[% mkurl(ctx.opac_root _ '/logout', {}, 1) %]"
-                    class="opac-button" id="logout_link">[% l('Logout') %]</a>
+                    class="tbutton small tadlblue" id="logout_link"><span>[% l('Logout') %]</span></a>
             </div>
             <div id="dashboard">
                 <span class="dash-align">
@@ -57,4 +57,3 @@
 </div>
 </div>
 [% END %]
-[% INCLUDE "opac/parts/topnav_links.tt2" %]

diff --git a/templates_tadlskin/opac/parts/topnav_links.tt2 b/templates_tadlskin/opac/parts/topnav_links.tt2
index e6f4169..f3ce29b 100644 (file)
--- a/templates_tadlskin/opac/parts/topnav_links.tt2
+++ b/templates_tadlskin/opac/parts/topnav_links.tt2
@@ -1,11 +1,11 @@
 <div id="gold-links-holder">
     <div id="gold-links">
         <div id="header-links">
-            <a href="http://example.com">[% l('Link 1') %]</a>
+<!--            <a href="http://example.com">[% l('Link 1') %]</a>
             <a href="http://example.com">[% l('Link 2') %]</a>
             <a href="http://example.com">[% l('Link 3') %]</a>
             <a href="http://example.com">[% l('Link 4') %]</a>
-            <a href="http://example.com">[% l('Link 5') %]</a>
+            <a href="http://example.com">[% l('Link 5') %]</a>-->
         </div>
     </div>
 </div>

diff --git a/templates_tadlskin/opac/parts/topnav_logo.tt2 b/templates_tadlskin/opac/parts/topnav_logo.tt2
index 0b55700..6be8926 100644 (file)
--- a/templates_tadlskin/opac/parts/topnav_logo.tt2
+++ b/templates_tadlskin/opac/parts/topnav_logo.tt2
@@ -1,2 +1,2 @@
-       <div id="topnav_logo"> <a href="http://evergreen-ils.org"><img alt="[% l('Evergreen Logo') %]" 
-            src="[% ctx.media_prefix %]/opac/images/small_logo.png" /></a></div>
+       <div id="topnav_logo"> <a href="http://www.tadl.org/"><img alt="[% l('TADL Logo') %]" 
+            src="https://www.tadl.org/sites/all/themes/converge_custom/logo.png" /></a></div>

diff --git a/templates_tadlskin/opac/results.tt2 b/templates_tadlskin/opac/results.tt2
index 875a8d2..67f7023 100644 (file)
--- a/templates_tadlskin/opac/results.tt2
+++ b/templates_tadlskin/opac/results.tt2
@@ -21,18 +21,18 @@
     <div class="almost-content-wrapper">
         <div id="results_header_bar">
             <div id="results_header_inner">
-                <div class="results_header_btns">
-                    <a href="[% mkurl(ctx.opac_root _ '/home') %]">[% l('Another Search') %]</a>
-                </div>
-                <div class="results_header_btns">
-                    <a href="[% mkurl(ctx.opac_root _ '/advanced') %]">[% l('Advanced Search') %]</a>
+<!--                <div class="float-left">
+                    <a class="tbutton small tadlblue" href="[% mkurl(ctx.opac_root _ '/home') %]"><span>[% l('Another Search') %]</span></a>
                 </div>
+                <div class="float-left">
+                    <a class="tbutton small tadlblue" href="[% mkurl(ctx.opac_root _ '/advanced') %]"><span>[% l('Advanced Search') %]</span></a>
+                </div> -->
                 [% IF ctx.mylist.size %]
-                <div class="results_header_btns cached_list_div">
+                <div class="float-left">
                     [%- IF ctx.user; %]
-                    <a href="[% mkurl(ctx.opac_root _ '/myopac/lists') %]">[% l('View My List') %]</a>
+                    <a class="tbutton small tadlblue" href="[% mkurl(ctx.opac_root _ '/myopac/lists') %]"><span>[% l('View My List') %]</span></a>
                     [%- ELSE %]
-                    <a href="[% mkurl(ctx.opac_root _ '/mylist') %]">[% l('View My List') %]</a>
+                    <a class="tbutton small tadlblue" href="[% mkurl(ctx.opac_root _ '/mylist') %]"><span>[% l('View My List') %]</span></a>
                     [%- END %]
                 </div>
                 [% END %]
@@ -42,11 +42,11 @@
                     </label>
                     <div class="results_header_div"></div>
 
-                    <div class='results_header_sel' id='simple-detail-view-links'>
+                    <div class="float-left">
                         [% IF CGI.param('detail_record_view') %]
-                        <a href="[% mkurl('', {detail_record_view => ''}) %]">[% l('Show Fewer Details') %]</a>
+                        <a class="tbutton small tadlblue" href="[% mkurl('', {detail_record_view => ''}) %]"><span>[% l('Show Fewer Details') %]</span></a>
                         [% ELSE %]
-                        <a href="[% mkurl('', {detail_record_view => 1}) %]">[% l('Show More Details') %]</a>
+                        <a class="tbutton small tadlblue" href="[% mkurl('', {detail_record_view => 1}) %]"><span>[% l('Show More Details') %]</span></a>
                         [% END %]
                     </div>
                     <div class="results_header_div"></div>