From 793f2829c4aeaa99de5c18693b61ffb543e22c1d Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Thu, 1 Sep 2011 14:41:42 -0400
Subject: [PATCH] TPac: more template scrubbing and cleaning
Signed-off-by: Bill Erickson <berick@esilibrary.com>
---
Open-ILS/src/templates/opac/myopac/prefs.tt2 | 142 +++------------------
.../src/templates/opac/myopac/prefs_notify.tt2 | 92 -------------
Open-ILS/src/templates/opac/parts/anon_list.tt2 | 4 +-
.../src/templates/opac/parts/record/summary.tt2 | 2 +-
.../src/templates/opac/parts/result/lowhits.tt2 | 56 +-------
Open-ILS/src/templates/opac/parts/result/table.tt2 | 5 +-
Open-ILS/src/templates/opac/parts/searchbar.tt2 | 6 +-
Open-ILS/web/css/skin/default/opac/semiauto.css | 1 -
8 files changed, 25 insertions(+), 283 deletions(-)
diff --git a/Open-ILS/src/templates/opac/myopac/prefs.tt2 b/Open-ILS/src/templates/opac/myopac/prefs.tt2
index 2db15e591d..2aeea79fb1 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs.tt2
@@ -58,95 +58,21 @@
</tr>
<tr>
- <td class='color_4 light_border'>
- [% l("Day Phone") %]</td>
-
- <td class='light_border'
- id='myopac_summary_dayphone'>[% ctx.user.day_phone | html %]</td>
-
- <td class='light_border'><a href='#'
- class="hide_me"
- id='myopac_summary_phone1_change'
- style=
- 'text-decoration: underline;'>[% l("Change") %]</a></td>
- </tr>
-
- <tr id='myopac_update_phone1_row'
- class='hide_me'>
- <td class='myopac_update_cell'
- colspan='3'>
- <span class='myopac_update_span'>
- Enter New [% l("Day Phone") %]:
- </span>
-
- <input type='text' size='24' id='myopac_new_phone1' />
- <span class='myopac_update_span'>
- <button>
- <span class='myopac_update_span'>
- [% l("Submit") %]</span>
- </button>
- </span>
- <span class='myopac_update_span'>
- <button>
- <span class='myopac_update_span'>
- [% l("Cancel") %]</span>
- </button>
- </span>
- </td>
+ <td class='color_4 light_border'>[% l("Day Phone") %]</td>
+ <td class='light_border'>[% ctx.user.day_phone | html %]</td>
+ <td></td>
</tr>
<tr>
- <td class='color_4 light_border'>
- [% l("Evening Phone") %]</td>
-
- <td class='light_border'
- id='myopac_summary_eveningphone'>[% ctx.user.evening_phone | html %]</td>
-
- <td class='light_border'><a href='#'
- class="hide_me"
- id='myopac_summary_phone2_change'
- style=
- 'text-decoration: underline;'>[% l("Change") %]</a></td>
- </tr>
-
- <tr id='myopac_update_phone2_row'
- class='hide_me'>
- <td class='myopac_update_cell'
- colspan='3'><span class='myopac_update_span'>New
- [% l("Evening Phone") %]:</span>
- <input type='text' size='24' id='myopac_new_phone2' />
- <span class='myopac_update_span'><button><span class=
- 'myopac_update_span'>[% l("Submit") %]</span></button></span>
- <span class='myopac_update_span'><button><span class=
- 'myopac_update_span'>[% l("Cancel") %]</span></button></span>
- </td>
+ <td class='color_4 light_border'>[% l("Evening Phone") %]</td>
+ <td class='light_border'>[% ctx.user.evening_phone | html %]</td>
+ <td></td>
</tr>
<tr>
- <td class='color_4 light_border'>
- [% l("Other Phone") %]</td>
-
- <td class='light_border'
- id='myopac_summary_otherphone'>[% ctx.user.other_phone | html %]</td>
-
- <td class='light_border'><a href='#'
- class="hide_me"
- id='myopac_summary_phone3_change'
- style=
- 'text-decoration: underline;'>[% l("Change") %]</a></td>
- </tr>
-
- <tr id='myopac_update_phone3_row'
- class='hide_me'>
- <td class='myopac_update_cell'
- colspan='3'><span class='myopac_update_span'>Enter
- New [% l("Other Phone") %]:</span>
- <input type='text' size='24' id='myopac_new_phone3' />
- <span class='myopac_update_span'><button><span class=
- 'myopac_update_span'>[% l("Submit") %]</span></button></span>
- <span class='myopac_update_span'><button><span class=
- 'myopac_update_span'>[% l("Cancel") %]</span></button></span>
- </td>
+ <td class='color_4 light_border'>[% l("Other Phone") %]</td>
+ <td class='light_border'>[% ctx.user.other_phone | html %]</td>
+ <td></td>
</tr>
<tr>
@@ -187,49 +113,19 @@
</tr>[% END %]
<tr>
- <td class='color_4 light_border'>
- [% l("Active Barcode") %]</td>
-
+ <td class='color_4 light_border'>[% l("Active Barcode") %]</td>
<td class='light_border'>[% ctx.user.card.barcode %]</td>
-
<td></td>
</tr>
<tr>
- <td class='color_4 light_border'>
- [% l("Home Library") %]</td>
+ <td class='color_4 light_border'>[% l("Home Library") %]</td>
<td class='light_border'>[% ctx.user.home_ou.name | html %]</td>
- <td><a href='#'
- class="hide_me"
- style='text-decoration: underline;'>[% l("Change") %]</a></td>
- </tr>
- <tr class='hide_me'>
- <td class='myopac_update_cell'
- colspan='3'>
- <span class='myopac_update_span'>
- New home library:</span>
- <select>
- </select>
- <span class='myopac_update_span'>
- <button>
- <span class= 'myopac_update_span'>
- [% l("Submit") %]</span>
- </button>
- </span>
- <span class='myopac_update_span'>
- <button>
- <span class= 'myopac_update_span'>
- [% l("Cancel") %]</span>
- </button>
- </span>
- </td>
+ <td></td>
</tr>
- <tr class="hide_me">
- <td class='color_4 light_border'>
- [% l("Account Creation Date") %]
- </td>
- <td class='light_border'
- id='myopac_summary_create_date'></td>
+ <tr>
+ <td class='color_4 light_border'>[% l("Account Creation Date") %]</td>
+ <td class='light_border'>[% date.format(ctx.parse_datetime(ctx.user.create_date), DATE_FORMAT) %]</td>
<td></td>
</tr>
</tbody>
@@ -334,12 +230,8 @@
<tr>
<td><input type='submit' value="[% l('Save Changes') %]"/></td>
<td>
- [% IF pending_addr;
- url = mkurl('', {delete_pending => pending_addr.id}, 1);
- ELSE;
- url = mkurl('', {}, 1);
- END %]
- <a href="[% url %]">[% l('Discard Pending Address') %]</a>
+ [% params = (pending_addr) ? {delete_pending => pending_addr.id} : {} %]
+ <a href="[% mkurl('', params, 1) %]">[% l('Discard Pending Address') %]</a>
</td>
</tr>
<tr><td colspan='2'><i>[% l('Address changes will be verified by staff') %]</i></td></tr>
diff --git a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
index 91a3ce55a2..3729d3758c 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
@@ -3,7 +3,6 @@
myopac_page = "prefs_notify";
prefs_page = 'notify' %]
-
<form method='POST'>
<div style="float:right;width:65px;">
@@ -32,97 +31,6 @@
</tbody>
</table>
</form>
-
-
-<!-- NOTIFICATION PREFS / leaving here for reference
-<table class="hide_me"
- id="acct_notify_main">
- <tbody>
- <tr class="hide_me">
- <td><span>[% l("Default Hold Notification Method") %]</span> <a class=
- 'classic_link'
- href='#'>[% l("(Help)") %]</a></td>
-
- <td style="padding-left:15px;"><select id=
- 'prefs_hold_notify'>
- <option value='phone:email'
- selected='selected'>
- [% l("Use Phone and Email") %]
- </option>
-
- <option value='phone'>
- [% l("Use Phone Only") %]
- </option>
-
- <option value='email'>
- [% l("Use Email Only") %]
- </option>
- </select></td>
- </tr>
-
- <tr>
- <td style="padding-top:10px;"><strong>Pick Up Notice for
- Holds</strong><br />
- <input type="checkbox"
- id="opac.hold_notify.email"
- name="opac.hold_notify.email" /> <label for=
- "opac.hold_notify.email">Email</label><br />
- <input type="checkbox"
- id="opac.hold_notify.phone"
- name="opac.hold_notify.phone" /> <label for=
- "opac.hold_notify.phone">Phone</label>
- <b>(Temporarily phone notification will generate a
- mailed paper notice.)</b></td>
- </tr>
-
- <tr>
- <td style="padding-top:10px;"><strong>Expire Notice for
- Holds</strong><br />
- <input type="checkbox"
- id="notification.hold.expire.email"
- name="notification.hold.expire.email" /> <label for=
- "notification.hold.expire.email">Email</label></td>
- </tr>
-
- <tr>
- <td style="padding-top:10px;"><strong>Cancel Notice for
- Holds</strong><br />
- <input type="checkbox"
- id="notification.hold.cancel.email"
- name="notification.hold.cancel.email" /> <label for=
- "notification.hold.cancel.email">Email</label></td>
- </tr>
-
- <tr>
- <td style="padding-top:10px;"><strong>Overdue First
- Notice</strong><br />
- <input type="checkbox"
- id="notification.overdue.first.email"
- name="notification.overdue.first.email" />
- <label for=
- "notification.overdue.first.email">Email</label><br />
- <input type="checkbox"
- id="notification.overdue.first.phone"
- name="notification.overdue.first.phone" />
- <label for=
- "notification.overdue.first.phone">Phone</label>
- <b>(Temporarily phone notification will generate a
- mailed paper notice.)</b></td>
- </tr>
-
- <tr>
- <td style="padding-top:10px;"><strong>Courtesy
- Notice</strong><br />
- <input type="checkbox"
- id="notification.predue.email"
- name="notification.predue.email" /> <label for=
- "notification.predue.email">Email</label><br /></td>
- </tr>
- </tbody>
-</table>
--->
-
-
[% END %]
diff --git a/Open-ILS/src/templates/opac/parts/anon_list.tt2 b/Open-ILS/src/templates/opac/parts/anon_list.tt2
index a4630ca1b2..5101117bcc 100644
--- a/Open-ILS/src/templates/opac/parts/anon_list.tt2
+++ b/Open-ILS/src/templates/opac/parts/anon_list.tt2
@@ -1,6 +1,6 @@
[% IF ctx.mylist.size %]
<form action="[% ctx.opac_root %]/mylist/move" method="POST">
- <div id='acct_list_template2'>
+ <div>
<div style="width:100%">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
@@ -45,7 +45,7 @@
</td>
</tr>
</thead>
- <tbody id='anon_list_tbody'>
+ <tbody>
[% FOR item IN ctx.mylist;
attrs = {marc_xml => ctx.mylist_marc_xml.$item};
PROCESS get_marc_attrs args=attrs %]
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index a256d35cf7..a44e447a7e 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -108,7 +108,7 @@
<td nowrap='nowrap' valign="top">
<strong>[% IF attrs.publisher; l("Publisher"); END %]</strong>
</td>
- <td valign="top" id='rdetail_publisher'>[% attrs.publisher | html %]</td>
+ <td valign="top">[% attrs.publisher | html %]</td>
<td nowrap='nowrap' valign="top">
<strong>[% IF attrs.pubdate; l("Publication Date"); END %]</strong>
</td>
diff --git a/Open-ILS/src/templates/opac/parts/result/lowhits.tt2 b/Open-ILS/src/templates/opac/parts/result/lowhits.tt2
index fe2d1608e8..ecf245df97 100644
--- a/Open-ILS/src/templates/opac/parts/result/lowhits.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/lowhits.tt2
@@ -1,22 +1,11 @@
-<div id='result_low_hits'>
+<div>
<div id="zero_search_hits">
<div>
<p>[% l('Sorry, no entries were found for') %]
[% IF is_advanced OR is_special; l('your search'); ELSE %]
<q>[% CGI.param('query') | html %]</q>
[% END %]
- <br />
- <span id="zero_hits_label1" class="hide_me">[% l('Did you mean') %]
- <strong><a id="spell_check_link" href="javascript:;"></a></strong>?</span>
</p>
- <table cellpadding="0" cellspacing="0" border="0">
- <tr>
- <td valign="top" style="padding-right:10px;">
- <span id="zero_hits_label2" class="hide_me">[% l('Other Possibilities:') %]</span>
- </td>
- <td id="zero_hits_suggestions"></td>
- </tr>
- </table>
</div>
<div style="float:right;width:353px;background:#ccc;padding:10px;margin-top:7px;">
[% INCLUDE "opac/parts/result/lowhits_purchase.tt2" %]
@@ -48,47 +37,4 @@
</p>
</div>
</div>
- <div class="hide_me">
- <div style='text-align: center; padding-bottom: 8px;' class="hide_me">
- <div id='result_low_hits_msg' class='hide_me'>[% l("Few hits were returned for your search.") %]</div>
- <div id='result_zero_hits_msg' class='hide_me'>[% l("Zero hits were returned for your search.") %]</div>
- </div>
-
- <!-- spell checker -->
- <div id='did_you_mean' class='lowhits_div hide_me'>
- <span>[% l("Maybe you meant:") %] </span>
- <!-- <a class='classic_link' id='spell_check_link'> </a> -->
- </div>
-
- <div id='low_hits_remove_format' class='lowhits_div hide_me'>
- <span>[% l("You will find more hits when searching all item formats:") %] </span>
- <a id='low_hits_remove_format_link' class='classic_link'>[% l("Search again with all formats?") %]</a>
- </div>
-
- <div id='low_hits_cross_ref' class='lowhits_div hide_me'>
- <span>[% l("You may also like to try these related searches:") %]</span>
- <div style='padding: 5px;'>
- <a id='low_hits_xref_link' class='classic_link' style='padding-right: 5px;'> </a>
- </div>
- </div>
-
- <div id='low_hits_expand_range' class='lowhits_div hide_me'>
- <span>[% l("You may also wish to expand your search range to:") %] </span>
- <a id='low_hits_expand_link' class='classic_link' style='padding-right: 5px;'> </a>
- </div>
-
- <div id='low_hits_search_type' class='lowhits_div hide_me'>
- <span>[% l("You can try searching the same terms by:") %]</span>
- <a id='low_hits_title_search' class='hide_me classic_link'
- style='padding-right: 5px;'>[% l("title") %]</a>
- <a id='low_hits_author_search' class='hide_me classic_link'
- style='padding-right: 5px;'>[% l("author") %]</a>
- <a id='low_hits_subject_search' class='hide_me classic_link'
- style='padding-right: 5px;'>[% l("subject") %]</a>
- <a id='low_hits_series_search' class='hide_me classic_link'
- style='padding-right: 5px;'>[% l("series") %]</a>
- <a id='low_hits_keyword_search' class='hide_me classic_link'
- style='padding-right: 5px;'>[% l("keyword") %]</a>
- </div>
- </div>
</div>
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index ed58d26add..905307ed07 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -19,12 +19,13 @@
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr>
<td valign="top" width="1" style="padding-right:20px;">
- <div style="width:174px;" class="hide_me" id="tehSideBar">SIDEBAR TODO
+ <div style="width:174px;" class="hide_me">
+ SIDEBAR TODO
</div>
</td>
<td class='opac-auto-015' width="1"></td>
<td valign="top">
- <table id="res_table" cellpadding="0" cellspacing="0"
+ <table cellpadding="0" cellspacing="0"
border="0" width="100%" style="margin-top:10px;">
<tbody id="result_table">
[% FOR rec IN ctx.records;
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index aec70dbf36..0215c7415d 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -52,13 +52,9 @@
[% INCLUDE "opac/parts/coded_value_selector.tt2" attr=["mattype", "item_type"] none_ok=1 none_label=l('All Formats') %]
</td>
<td>
- <span id='depth_selector_span'>
+ <span>
[% PROCESS build_org_selector name='loc' value=CGI.param('loc') %]
</span>
- <span id='lib_selector_span'>
- <a id='lib_selector_link' class='classic_link'
- href='#'>[% l("Choose a library to search") %]</a>
- </span>
</td>
</tr>
[% END %]
diff --git a/Open-ILS/web/css/skin/default/opac/semiauto.css b/Open-ILS/web/css/skin/default/opac/semiauto.css
index 7eae4b5e63..dbae5b241f 100644
--- a/Open-ILS/web/css/skin/default/opac/semiauto.css
+++ b/Open-ILS/web/css/skin/default/opac/semiauto.css
@@ -21,7 +21,6 @@
/* ------------------------------------------- */
-#lib_selector_span { display: none }
.float-left { float: left; }
.bookbag-share { float: left; padding: 5px 0; }
.bookbag-controls { float: left; padding: 5px 0px 0px 10px; }
--
2.11.0