[open-ils-commits] r984 - in conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml: . advanced common home myopac rdetail result (artunit)
svn at svn.open-ils.org
svn at svn.open-ils.org
Fri Sep 10 17:14:14 EDT 2010
Author: artunit
Date: 2010-09-10 17:14:08 -0400 (Fri, 10 Sep 2010)
New Revision: 984
Modified:
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/advanced/adv_global_row.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/advanced/advanced_global.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/advanced/advanced_marc.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/advanced/advanced_quick.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/body.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/altcanvas.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/cn_browse.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/css_common.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/fonts.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/format_selector.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/holds.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/ilsevents.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/js_common.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/libselect.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/login.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/logo.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/orgtree.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/searchbar.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/sidebar.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/statusbar.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/stypes_selector.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/tips.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/footer.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/header.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/home/homesearch.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/home/index_body.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/html_xsl.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/index.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_bookbags.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_checked.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_fines.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_holds.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_prefs.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_summary.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_advanced.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_cnbrowse.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_mresult.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_myopac.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_rdetail.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_rresult.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_altcanvas.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_cn_details.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_copyinfo.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_extras.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/filtersort.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/result_common.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/result_info.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/result_lowhits.xml
conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/result_table.xml
Log:
1.6.1 xml files
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/advanced/adv_global_row.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/advanced/adv_global_row.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/advanced/adv_global_row.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,36 +1,36 @@
-<!--
-<tr id='adv_global_trow' type='input'>
--->
-<tr id='<!--#echo var="adv_global_row_id"-->' type='input'>
- <td align='center' width='100%' nowrap='nowrap'>
-
- <!-- select the search class -->
- <select name='type' style='margin-right: 7px;'>
- <option value='keyword' selected='selected'>&common.keyword;</option>
- <option value='title'>&common.title;</option>
- <option value='author'>&common.author;</option>
- <option value='subject'>&common.subject;</option>
- <option value='series'>&common.series;</option>
- </select>
-
- <!-- select how to treat the text -->
- <select name='contains' style='margin-right: 7px;'>
- <option value='contains'>&opac.advanced.refined.contains;</option>
- <option value='nocontains'>&opac.advanced.refined.nocontains;</option>
- <option value='exact'>&opac.advanced.refined.exact;</option>
- </select>
-
- <!-- search term -->
- <input type='text' size='18' name='term' style='margin-right: 3px;' />
-
- <!-- Remove this row -->
- <button
- onclick='
- var row = this.parentNode.parentNode;
- var tbody = row.parentNode;
- if( tbody.getElementsByTagName("tr").length > 2 )
- row.parentNode.removeChild(row);'>X</button>
-
- </td>
-</tr>
-
+<!--
+<tr id='adv_global_trow' type='input'>
+-->
+<tr id='<!--#echo var="adv_global_row_id"-->' type='input'>
+ <td align='center' width='100%' nowrap='nowrap'>
+
+ <!-- select the search class -->
+ <select name='type' style='margin-right: 7px;'>
+ <option value='keyword' selected='selected'>&common.keyword;</option>
+ <option value='title'>&common.title;</option>
+ <option value='author'>&common.author;</option>
+ <option value='subject'>&common.subject;</option>
+ <option value='series'>&common.series;</option>
+ </select>
+
+ <!-- select how to treat the text -->
+ <select name='contains' style='margin-right: 7px;'>
+ <option value='contains'>&opac.advanced.refined.contains;</option>
+ <option value='nocontains'>&opac.advanced.refined.nocontains;</option>
+ <option value='exact'>&opac.advanced.refined.exact;</option>
+ </select>
+
+ <!-- search term -->
+ <input type='text' size='18' name='term' style='margin-right: 3px;' />
+
+ <!-- Remove this row -->
+ <button
+ onclick='
+ var row = this.parentNode.parentNode;
+ var tbody = row.parentNode;
+ if( tbody.getElementsByTagName("tr").length > 2 )
+ row.parentNode.removeChild(row);'>X</button>
+
+ </td>
+</tr>
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/advanced/advanced_global.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/advanced/advanced_global.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/advanced/advanced_global.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,307 +1,309 @@
-<table id='adv_global_search' class='data_grid data_grid_center' width='100%'>
-
- <style>
- #adv_global_search select { width: 13em; }
- #adv_global_input_table select { width: 7em; }
- .adv_adv_link { font-size: 8pt; color: red; }
- </style>
-
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/adv_global.js'> </script>
-
- <tr style='border-bottom: none;'>
-
- <!-- Contains the user-addable(?) rows to define search class, containment and text -->
- <td valign='top' width='65%' style='border-bottom: none;'>
- <table width='100%' id='adv_global_input_table'>
-
- <thead>
- <tr><td colspan='2' align='center'>&advanced.search.title;</td></tr>
- </thead>
- <tbody id='adv_global_tbody'>
-
- <script language='javascript' type='text/javascript'>
- config.ids.common.now_searching = 'now_searching_location';
- </script>
-
- <!--#set var="adv_global_row_id" value="adv_global_trow"-->
- <!--#include virtual="adv_global_row.xml"-->
-
- <!--#set var="adv_global_row_id" value=""-->
- <!--#include virtual="adv_global_row.xml"-->
- <!--#include virtual="adv_global_row.xml"-->
-
- <!-- add a new row -->
- <tr id='adv_global_addrow'>
- <td align='center'>
- <button onclick='clearSearchBoxes();'>&advanced.search.reset;</button>
- <span style='padding-left: 10px;'> </span>
- <button id='myopac_new_global_row' onclick='advAddGblRow();'>&advanced.add.row;</button>
- <span style='padding-left: 10px;'> </span>
- <button onclick='advSubmitGlobal();'>&advanced.search.submit;</button>
- </td>
- </tr>
-
- </tbody>
- </table>
- </td>
-
-
- <td rowspan='2'>
-
- <table width='100%'>
- <thead>
- <tr><td colspan='2' align='center'>&advanced.search.filters;</td></tr>
- </thead>
- <tbody>
-
- <tr>
- <td align='right'>
- <span>&advanced.item.form;</span>
- </td>
- <td align='left'>
- <select multiple='multiple' size='3' id='adv_global_item_form'>
- </select>
- </td>
- </tr>
-
- <tr>
- <td align='right'>
- <span>&advanced.item.type;</span>
- <a id='adv_global_item_type_link_adv' class='classic_link adv_adv_link'
- href='javascript:void(0);' onclick='
- hideMe($("adv_global_item_type_basic"));
- unHideMe($("adv_global_item_type"));
- hideMe(this);
- unHideMe($("adv_global_item_type_link_basic"));
- '>&advanced.link;</a>
-
- <a id='adv_global_item_type_link_basic' class='hide_me classic_link adv_adv_link'
- href='javascript:void(0);' onclick='
- unHideMe($("adv_global_item_type_basic"));
- hideMe($("adv_global_item_type"));
- unHideMe($("adv_global_item_type_link_adv"));
- hideMe(this);
- '>&advanced.basic.link;</a>
- </td>
-
- <td align='left'>
- <select multiple='multiple' size='3' id='adv_global_item_type' class='hide_me'>
- </select>
- <select multiple='multiple' size='3' id='adv_global_item_type_basic'>
- <option value='at'>&opac.search.books;</option>
- <option value='i'>&opac.search.audioBooks;</option>
- <option value='g'>&opac.search.videoRecordings;</option>
- <option value='j'>&opac.search.music;</option>
- <option value='m'>&opac.search.electronic;</option>
- </select>
- </td>
- </tr>
-
- <tr>
- <td align='right'>
- <span>&advanced.literary.form;</span>
- <a id='adv_global_lit_form_link_adv' class='classic_link adv_adv_link'
- href='javascript:void(0);' onclick='
- hideMe($("adv_global_lit_form_basic"));
- unHideMe($("adv_global_lit_form"));
- hideMe(this);
- unHideMe($("adv_global_lit_form_link_basic"));
- '>&advanced.link;</a>
-
- <a id='adv_global_lit_form_link_basic' class='hide_me classic_link adv_adv_link'
- href='javascript:void(0);' onclick='
- unHideMe($("adv_global_lit_form_basic"));
- hideMe($("adv_global_lit_form"));
- unHideMe($("adv_global_lit_form_link_adv"));
- hideMe(this);
- '>&advanced.basic.link;</a>
- </td>
- <td align='left'>
- <select multiple='multiple' size='3' id='adv_global_lit_form' class='hide_me'>
- </select>
- <select multiple='multiple' size='3' id='adv_global_lit_form_basic'>
- <option value='0 '>&advanced.non.fiction;</option>
- <option value='1'>&advanced.fiction;</option>
- </select>
- </td>
- </tr>
-
-
- <!-- Language selector -->
- <tr>
- <td align='right'>
- <span>&advanced.language;</span>
- </td>
-
- <td align='left'>
- <select multiple='multiple' size='3' id='adv_global_lang'>
- <!--#include virtual="../../../../../common/xml/item_lang_options.xml"-->
- </select>
- </td>
- </tr>
-
- <!-- Audience selector -->
- <tr>
- <td align='right'>
- <span>&advanced.audience;</span>
-
- <a id='adv_global_audience_link_adv' class='classic_link adv_adv_link'
- href='javascript:void(0);' onclick='
- hideMe($("adv_global_audience_basic"));
- unHideMe($("adv_global_audience"));
- hideMe(this);
- unHideMe($("adv_global_audience_link_basic"));
- '>&advanced.link;</a>
-
- <a id='adv_global_audience_link_basic' class='hide_me classic_link adv_adv_link'
- href='javascript:void(0);' onclick='
- unHideMe($("adv_global_audience_basic"));
- hideMe($("adv_global_audience"));
- unHideMe($("adv_global_audience_link_adv"));
- hideMe(this);'>&advanced.basic.link;</a>
- </td>
-
- <td align='left'>
- <select multiple='multiple' size='3' id='adv_global_audience' class='hide_me'>
- </select>
- <select multiple='multiple' size='3' id='adv_global_audience_basic'>
- <option value='e '>&advanced.adult;</option>
- <option value='abcdj'>&advanced.juvenile;</option>
- <option value='fg '>&advanced.general;</option>
- </select>
- </td>
- </tr>
-
- <tr>
- <td align='right'>
- <span>&advanced.biblevel;</span>
- </td>
- <td align='left'>
- <select multiple='multiple' size='3' id='adv_global_bib_level'>
- </select>
- </td>
- </tr>
-
- <tr>
- <td align='right'>
- <span>&advanced.filter.pubyear;</span>
- </td>
- <td align='left'>
- <select id='adv_global_pub_date_type' onchange='
- if($("adv_global_pub_date_type").selectedIndex == 3)
- unHideMe($("adv_global_pub_date_2_span"));
- else
- hideMe($("adv_global_pub_date_2_span"));'>
- <option value='equals' selected='selected'>&advanced.filter.pubyear.equals;</option>
- <option value='before'>&advanced.filter.pubyear.before;</option>
- <option value='after'>&advanced.filter.pubyear.after;</option>
- <option value='between'>&advanced.filter.pubyear.between;</option>
- </select>
- <div style='margin-top:5px;'>
- <input id='adv_global_pub_date_1' type='text' size='4' maxlength='4'/>
- <span id='adv_global_pub_date_2_span' class='hide_me'>
- &common.and; <input id='adv_global_pub_date_2' type='text' size='4' maxlength='4'/>
- </span>
- </div>
- </td>
- </tr>
-
-
- <!-- copy location selector -->
- <tr id='adv_copy_location_filter_row' class='hide_me'>
- <td align='right'>&opac.advanced.copy_loc_filter;</td>
- <td align='left' id='adv_copy_location_filter_td'>
- <select size='3' id='adv_copy_location_filter_select' multiple='multiple'>
- </select>
- </td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
-
- <tr style='border-top: none;'>
- <td align='center' valign='top' style='border-top: none;'>
-
- <table style='border: none; width: 100%;'>
- <tr>
- <td align='center' width='100%'>
- <table class='' width='100%'>
-
- <thead>
- <tr>
- <td align='center' width='50%'>&advanced.sort.criteria;</td>
- <td align='center'>&advanced.search.library;</td>
- </tr>
- </thead>
-
- <tbody>
- <tr>
-
- <script language='javascript' type='text/javascript'>
- function __setsortsel() {
- var sel = $('adv_global_sort_by')
- if(sel.selectedIndex == 0) {
- $("adv_global_sort_dir").disabled = true;
- $("adv_global_sort_dir").selectedIndex = 0;
- } else $("adv_global_sort_dir").disabled = false;
- }
- </script>
-
- <td align=''>
- <select id='adv_global_sort_by' onchange='__setsortsel();'>
- <option value='rel'>&advanced.relevance;</option>
- <option value='title'>&common.title;</option>
- <option value='author'>&common.author;</option>
- <option value='pubdate'>&advanced.pubdate;</option>
- </select>
- </td>
-
-
- <td align='center' width='100%' nowrap='nowrap'>
- <b id='now_searching_location'> </b>
- </td>
-
- </tr>
-
- <tr>
-
- <td>
- <select id='adv_global_sort_dir' disabled='disabled'>
- <option value='asc'>&advanced.sort.asc;</option>
- <option value='desc'>&advanced.sort.desc;</option>
- </select>
- </td>
-
- <!-- force the enable/disable sort dir code to run -->
- <script language='javascript' type='text/javascript'>__setsortsel();</script>
-
- <td align='center'>
- <!--#include virtual="../common/libselect.xml"-->
- </td>
-
- </tr>
- <tr>
- <td align='center'>
- <span>&advanced.frbrize;</span>
- <input id='adv_group_titles' type='checkbox' />
- </td>
- <td align='center'>
- <span>&result.limit2avail;</span>
- <input type='checkbox' id='opac.result.limit2avail'/>
- </td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- </table>
- </td>
-
- </tr>
-
- <tr class='border_4_2'>
- <td colspan='2'><input type='submit' onclick='advSubmitGlobal();' value='&advanced.search.submit;'></input></td>
- </tr>
-
-</table>
+<table id='adv_global_search' class='data_grid data_grid_center' width='100%'>
+
+ <style>
+ #adv_global_search select { width: 13em; }
+ #adv_global_input_table select { width: 7em; }
+ .adv_adv_link { font-size: 8pt; color: red; }
+ </style>
+
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/adv_global.js'> </script>
+
+ <tr style='border-bottom: none;'>
+
+ <!-- Contains the user-addable(?) rows to define search class, containment and text -->
+ <td valign='top' width='65%' style='border-bottom: none;'>
+ <table width='100%' id='adv_global_input_table'>
+
+ <thead>
+ <tr><td colspan='2' align='center'>&advanced.search.title;</td></tr>
+ </thead>
+ <tbody id='adv_global_tbody'>
+
+ <script language='javascript' type='text/javascript'>
+ config.ids.common.now_searching = 'now_searching_location';
+ </script>
+
+ <!--#set var="adv_global_row_id" value="adv_global_trow"-->
+ <!--#include virtual="adv_global_row.xml"-->
+
+ <!--#set var="adv_global_row_id" value=""-->
+ <!--#include virtual="adv_global_row.xml"-->
+ <!--#include virtual="adv_global_row.xml"-->
+
+ <!-- add a new row -->
+ <tr id='adv_global_addrow'>
+ <td align='center'>
+ <button onclick='clearSearchBoxes();'>&advanced.search.reset;</button>
+ <span style='padding-left: 10px;'> </span>
+ <button id='myopac_new_global_row' onclick='advAddGblRow();'>&advanced.add.row;</button>
+ <span style='padding-left: 10px;'> </span>
+ <button onclick='advSubmitGlobal();'>&advanced.search.submit;</button>
+ </td>
+ </tr>
+
+ </tbody>
+ </table>
+ </td>
+
+
+ <td rowspan='2'>
+
+ <table width='100%'>
+ <thead>
+ <tr><td colspan='2' align='center'>&advanced.search.filters;</td></tr>
+ </thead>
+ <tbody>
+
+ <tr>
+ <td align='right'>
+ <span>&advanced.item.form;</span>
+ </td>
+ <td align='left'>
+ <select multiple='multiple' size='3' id='adv_global_item_form'>
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td align='right'>
+ <span>&advanced.item.type;</span>
+ <a id='adv_global_item_type_link_adv' class='classic_link adv_adv_link'
+ href='javascript:void(0);' onclick='
+ hideMe($("adv_global_item_type_basic"));
+ unHideMe($("adv_global_item_type"));
+ hideMe(this);
+ unHideMe($("adv_global_item_type_link_basic"));
+ '>&advanced.link;</a>
+
+ <a id='adv_global_item_type_link_basic' class='hide_me classic_link adv_adv_link'
+ href='javascript:void(0);' onclick='
+ unHideMe($("adv_global_item_type_basic"));
+ hideMe($("adv_global_item_type"));
+ unHideMe($("adv_global_item_type_link_adv"));
+ hideMe(this);
+ '>&advanced.basic.link;</a>
+ </td>
+
+ <td align='left'>
+ <select multiple='multiple' size='3' id='adv_global_item_type' class='hide_me'>
+ </select>
+ <select multiple='multiple' size='3' id='adv_global_item_type_basic'>
+ <option value='at'>&opac.search.books;</option>
+ <option value='i'>&opac.search.audioBooks;</option>
+ <option value='g'>&opac.search.videoRecordings;</option>
+ <option value='j'>&opac.search.music;</option>
+ <option value='m'>&opac.search.electronic;</option>
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td align='right'>
+ <span>&advanced.literary.form;</span>
+ <a id='adv_global_lit_form_link_adv' class='classic_link adv_adv_link'
+ href='javascript:void(0);' onclick='
+ hideMe($("adv_global_lit_form_basic"));
+ unHideMe($("adv_global_lit_form"));
+ hideMe(this);
+ unHideMe($("adv_global_lit_form_link_basic"));
+ '>&advanced.link;</a>
+
+ <a id='adv_global_lit_form_link_basic' class='hide_me classic_link adv_adv_link'
+ href='javascript:void(0);' onclick='
+ unHideMe($("adv_global_lit_form_basic"));
+ hideMe($("adv_global_lit_form"));
+ unHideMe($("adv_global_lit_form_link_adv"));
+ hideMe(this);
+ '>&advanced.basic.link;</a>
+ </td>
+ <td align='left'>
+ <select multiple='multiple' size='3' id='adv_global_lit_form' class='hide_me'>
+ </select>
+ <select multiple='multiple' size='3' id='adv_global_lit_form_basic'>
+ <option value='0 '>&advanced.non.fiction;</option>
+ <option value='1'>&advanced.fiction;</option>
+ </select>
+ </td>
+ </tr>
+
+
+ <!-- Language selector -->
+ <tr>
+ <td align='right'>
+ <span>&advanced.language;</span>
+ </td>
+
+ <td align='left'>
+ <select multiple='multiple' size='3' id='adv_global_lang'>
+ <!--#include virtual="../../../../../common/xml/item_lang_options.xml"-->
+ </select>
+ </td>
+ </tr>
+
+ <!-- Audience selector -->
+ <tr>
+ <td align='right'>
+ <span>&advanced.audience;</span>
+
+ <a id='adv_global_audience_link_adv' class='classic_link adv_adv_link'
+ href='javascript:void(0);' onclick='
+ hideMe($("adv_global_audience_basic"));
+ unHideMe($("adv_global_audience"));
+ hideMe(this);
+ unHideMe($("adv_global_audience_link_basic"));
+ '>&advanced.link;</a>
+
+ <a id='adv_global_audience_link_basic' class='hide_me classic_link adv_adv_link'
+ href='javascript:void(0);' onclick='
+ unHideMe($("adv_global_audience_basic"));
+ hideMe($("adv_global_audience"));
+ unHideMe($("adv_global_audience_link_adv"));
+ hideMe(this);'>&advanced.basic.link;</a>
+ </td>
+
+ <td align='left'>
+ <select multiple='multiple' size='3' id='adv_global_audience' class='hide_me'>
+ </select>
+ <select multiple='multiple' size='3' id='adv_global_audience_basic'>
+ <option value='e '>&advanced.adult;</option>
+ <option value='abcdj'>&advanced.juvenile;</option>
+ <option value='fg '>&advanced.general;</option>
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td align='right'>
+ <span>&advanced.biblevel;</span>
+ </td>
+ <td align='left'>
+ <select multiple='multiple' size='3' id='adv_global_bib_level'>
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td align='right'>
+ <span>&advanced.filter.pubyear;</span>
+ </td>
+ <td align='left'>
+ <select id='adv_global_pub_date_type' onchange='
+ if($("adv_global_pub_date_type").selectedIndex == 3)
+ unHideMe($("adv_global_pub_date_2_span"));
+ else
+ hideMe($("adv_global_pub_date_2_span"));'>
+ <option value='equals' selected='selected'>&advanced.filter.pubyear.equals;</option>
+ <option value='before'>&advanced.filter.pubyear.before;</option>
+ <option value='after'>&advanced.filter.pubyear.after;</option>
+ <option value='between'>&advanced.filter.pubyear.between;</option>
+ </select>
+ <div style='margin-top:5px;'>
+ <input id='adv_global_pub_date_1' type='text' size='4' maxlength='4'/>
+ <span id='adv_global_pub_date_2_span' class='hide_me'>
+ &common.and; <input id='adv_global_pub_date_2' type='text' size='4' maxlength='4'/>
+ </span>
+ </div>
+ </td>
+ </tr>
+
+
+ <!-- copy location selector -->
+ <tr id='adv_copy_location_filter_row' class='hide_me'>
+ <td align='right'>&opac.advanced.copy_loc_filter;</td>
+ <td align='left' id='adv_copy_location_filter_td'>
+ <select size='3' id='adv_copy_location_filter_select' multiple='multiple'>
+ </select>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+
+ <tr style='border-top: none;'>
+ <td align='center' valign='top' style='border-top: none;'>
+
+ <table style='border: none; width: 100%;'>
+ <tr>
+ <td align='center' width='100%'>
+ <table class='' width='100%'>
+
+ <thead>
+ <tr>
+ <td align='center' width='50%'>&advanced.sort.criteria;</td>
+ <td align='center'>&advanced.search.library;</td>
+ </tr>
+ </thead>
+
+ <tbody>
+ <tr>
+
+ <script language='javascript' type='text/javascript'>
+ function __setsortsel() {
+ var sel = $('adv_global_sort_by')
+ if(sel.selectedIndex == 0) {
+ $("adv_global_sort_dir").disabled = true;
+ $("adv_global_sort_dir").selectedIndex = 0;
+ } else $("adv_global_sort_dir").disabled = false;
+ }
+ </script>
+
+ <td align=''>
+ <select id='adv_global_sort_by' onchange='__setsortsel();'>
+ <option value='rel'>&advanced.relevance;</option>
+ <option value='title'>&common.title;</option>
+ <option value='author'>&common.author;</option>
+ <option value='pubdate'>&advanced.pubdate;</option>
+ </select>
+ </td>
+
+
+ <td align='center' width='100%' nowrap='nowrap'>
+ <b id='now_searching_location'> </b>
+ </td>
+
+ </tr>
+
+ <tr>
+
+ <td>
+ <select id='adv_global_sort_dir' disabled='disabled'>
+ <option value='asc'>&advanced.sort.asc;</option>
+ <option value='desc'>&advanced.sort.desc;</option>
+ </select>
+ </td>
+
+ <!-- force the enable/disable sort dir code to run -->
+ <script language='javascript' type='text/javascript'>__setsortsel();</script>
+
+ <td align='center'>
+ <!--#include virtual="../common/libselect.xml"-->
+ </td>
+
+ </tr>
+ <tr>
+ <td align='center'>
+ <span>&advanced.frbrize;</span>
+ <input id='adv_group_titles' type='checkbox' />
+ </td>
+ <td align='center'>
+ <span>&result.limit2avail;</span>
+ <input type='checkbox' id='opac.result.limit2avail'/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </td>
+
+ </tr>
+
+ <tr class='border_4_2'>
+ <td colspan='2'><input type='submit' onclick='advSubmitGlobal();' value='&advanced.search.submit;'></input></td>
+ </tr>
+
+</table>
+
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/advanced/advanced_marc.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/advanced/advanced_marc.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/advanced/advanced_marc.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,46 +1,46 @@
-<!--
-XXX Deprecate me
--->
-
-<table class='data_grid' width='100%'>
- <thead>
- <tr>
- <td colspan='6'>&opac.advanced.marc.title;</td>
- </tr>
- </thead>
- <tbody id='advanced.marc.tbody'>
- <tr id='advanced.marc.template'>
- <td>
- <span>&opac.advanced.marc.tag;: </span>
- <input name='advanced.marc.tag' maxlength='3' size='3' />
- </td>
- <td>
- <span>&opac.advanced.marc.subfield;: </span>
- <input name='advanced.marc.subfield' maxlength='1' size='1' />
- </td>
- <td>
- <span>&opac.advanced.marc.value;: </span>
- <input name='advanced.marc.value' size='36' />
- </td>
-
- <td>
- <input type='submit' value='X' onclick='
- var row = this.parentNode.parentNode;
- var tbody = row.parentNode;
- if(tbody.getElementsByTagName("tr").length > 2)
- tbody.removeChild(row);
- ' />
- </td>
- </tr>
- <tr id='advanced.marc.submit.row'>
- <td colspan='4' align='center'>
-
- <input name='advanced.marc.addrow' type='submit' onclick='advAddMARC();'
- value='&opac.advanced.marc.addrow;' />
-
- <input style='margin-left: 10px;'
- onclick='advMARCRun();' type='submit' value='&common.submit;' />
- </td>
- </tr>
- </tbody>
-</table>
+<!--
+XXX Deprecate me
+-->
+
+<table class='data_grid' width='100%'>
+ <thead>
+ <tr>
+ <td colspan='6'>&opac.advanced.marc.title;</td>
+ </tr>
+ </thead>
+ <tbody id='advanced.marc.tbody'>
+ <tr id='advanced.marc.template'>
+ <td>
+ <span>&opac.advanced.marc.tag;: </span>
+ <input name='advanced.marc.tag' maxlength='3' size='3' />
+ </td>
+ <td>
+ <span>&opac.advanced.marc.subfield;: </span>
+ <input name='advanced.marc.subfield' maxlength='1' size='1' />
+ </td>
+ <td>
+ <span>&opac.advanced.marc.value;: </span>
+ <input name='advanced.marc.value' size='36' />
+ </td>
+
+ <td>
+ <input type='submit' value='X' onclick='
+ var row = this.parentNode.parentNode;
+ var tbody = row.parentNode;
+ if(tbody.getElementsByTagName("tr").length > 2)
+ tbody.removeChild(row);
+ ' />
+ </td>
+ </tr>
+ <tr id='advanced.marc.submit.row'>
+ <td colspan='4' align='center'>
+
+ <input name='advanced.marc.addrow' type='submit' onclick='advAddMARC();'
+ value='&opac.advanced.marc.addrow;' />
+
+ <input style='margin-left: 10px;'
+ onclick='advMARCRun();' type='submit' value='&common.submit;' />
+ </td>
+ </tr>
+ </tbody>
+</table>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/advanced/advanced_quick.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/advanced/advanced_quick.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/advanced/advanced_quick.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,30 +1,30 @@
-<!--
-XXX Deprecate me
--->
-
-<table class='data_grid' width='95%'>
- <thead>
- <tr>
- <td colspan='6'>&opac.advanced.quick.title;</td>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <span style='padding-right: 0px;'>&common.call.number.label;</span>
- <input id='opac.advanced.quick.cn' style='margin: 2px;' type='text' size='12' />
- <input type='submit' onclick='advCNRun();' value='&advanced.go;' />
- </td>
- <td>
- <span style='padding-right: 0px;'>&common.isbn.label;</span>
- <input id='opac.advanced.quick.isbn' style='margin: 2px;' type='text' size='13' maxlength='13' />
- <input type='submit' onclick='advISBNRun();' value='&advanced.go;' />
- </td>
- <td>
- <span style='padding-right: 0px;'>&common.issn.label;</span>
- <input id='opac.advanced.quick.issn' style='margin: 2px;' type='text' size='9' maxlength='9' />
- <input type='submit' onclick='advISSNRun();' value='&advanced.go;' />
- </td>
- </tr>
- </tbody>
-</table>
+<!--
+XXX Deprecate me
+-->
+
+<table class='data_grid' width='95%'>
+ <thead>
+ <tr>
+ <td colspan='6'>&opac.advanced.quick.title;</td>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>
+ <span style='padding-right: 0px;'>&common.call.number.label;</span>
+ <input id='opac.advanced.quick.cn' style='margin: 2px;' type='text' size='12' />
+ <input type='submit' onclick='advCNRun();' value='&advanced.go;' />
+ </td>
+ <td>
+ <span style='padding-right: 0px;'>&common.isbn.label;</span>
+ <input id='opac.advanced.quick.isbn' style='margin: 2px;' type='text' size='13' maxlength='13' />
+ <input type='submit' onclick='advISBNRun();' value='&advanced.go;' />
+ </td>
+ <td>
+ <span style='padding-right: 0px;'>&common.issn.label;</span>
+ <input id='opac.advanced.quick.issn' style='margin: 2px;' type='text' size='9' maxlength='9' />
+ <input type='submit' onclick='advISSNRun();' value='&advanced.go;' />
+ </td>
+ </tr>
+ </tbody>
+</table>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/body.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/body.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/body.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,30 +1,30 @@
-<body class="tundra">
- <table width='100%'>
- <tbody>
- <tr>
- <td id='main_left_cell'>
- <!--#include virtual="common/logo.xml"-->
- <!--#include virtual="common/sidebar.xml"-->
- </td>
- <td id='main_right_cell'>
- <div id='content' class=''>
-
- <!--#if expr="$OILS_PAGE!='advanced.xml'"-->
- <!--#include virtual="common/searchbar.xml"-->
- <!--#include virtual="common/statusbar.xml"-->
- <!--#endif-->
-
- <!--#include virtual="common/fonts.xml"-->
-
- <!--#include virtual="common/altcanvas.xml"-->
- <!--#include virtual="common/ilsevents.xml"-->
- <!--#include virtual="page_${OILS_PAGE}"-->
- </div>
- <br/>
- <!--#include virtual="common/tips.xml"-->
- </td>
- </tr>
- </tbody>
- </table>
- <!--#include virtual='footer.xml'-->
-</body>
+<body class="tundra">
+ <table width='100%'>
+ <tbody>
+ <tr>
+ <td id='main_left_cell'>
+ <!--#include virtual="common/logo.xml"-->
+ <!--#include virtual="common/sidebar.xml"-->
+ </td>
+ <td id='main_right_cell'>
+ <div id='content' class=''>
+
+ <!--#if expr="$OILS_PAGE!='advanced.xml'"-->
+ <!--#include virtual="common/searchbar.xml"-->
+ <!--#include virtual="common/statusbar.xml"-->
+ <!--#endif-->
+
+ <!--#include virtual="common/fonts.xml"-->
+
+ <!--#include virtual="common/altcanvas.xml"-->
+ <!--#include virtual="common/ilsevents.xml"-->
+ <!--#include virtual="page_${OILS_PAGE}"-->
+ </div>
+ <br/>
+ <!--#include virtual="common/tips.xml"-->
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <!--#include virtual='footer.xml'-->
+</body>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/altcanvas.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/altcanvas.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/altcanvas.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,37 +1,37 @@
-
-<!-- These are the UI components that may be needed on any given page. The must be
- set to class += 'hide_me' by default -->
-
-<div id='not_the_canvas' xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <!-- the login page -->
- <!--#if expr="$FRONT_PAGE!='true'"-->
- <!--#include virtual="login.xml"-->
- <!--#endif-->
-
- <!-- The org tree -->
- <!--#include virtual="orgtree.xml"-->
-
- <!-- ============================================================================= -->
- <!-- Register the alternate canvases -->
- <script language='javascript' type='text/javascript'>
- config.ids.altcanvas.org_tree = config.ids.common.org_container;
- config.ids.altcanvas.holds = 'holds_box';
- config.ids.altcanvas.check_holds = 'check_holds_box';
- config.ids.altcanvas.xulholds = 'xulholds_box';
- config.ids.altcanvas.loading = 'loading_alt';
- //config.ids.altcanvas.cnbrowse = 'cn_browse';
- </script>
-
- <!--#if expr="$FRONT_PAGE!='true'"-->
- <!--#include virtual="holds.xml"-->
- <!-- #include virtual="cn_browse.xml"-->
- <!--#endif-->
-
- <div id='loading_alt' class='hide_me canvas' style='margin-top: 6px;'>
- <div style='margin-top: 30px; margin-bottom: 30px; text-align: center; font-weight: 700;' class='color_3'>
- <img src='../../../../images/progressbar_green.gif' style='margin: 5px;' />
- </div>
- </div>
-
-</div>
+
+<!-- These are the UI components that may be needed on any given page. The must be
+ set to class += 'hide_me' by default -->
+
+<div id='not_the_canvas' xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <!-- the login page -->
+ <!--#if expr="$FRONT_PAGE!='true'"-->
+ <!--#include virtual="login.xml"-->
+ <!--#endif-->
+
+ <!-- The org tree -->
+ <!--#include virtual="orgtree.xml"-->
+
+ <!-- ============================================================================= -->
+ <!-- Register the alternate canvases -->
+ <script language='javascript' type='text/javascript'>
+ config.ids.altcanvas.org_tree = config.ids.common.org_container;
+ config.ids.altcanvas.holds = 'holds_box';
+ config.ids.altcanvas.check_holds = 'check_holds_box';
+ config.ids.altcanvas.xulholds = 'xulholds_box';
+ config.ids.altcanvas.loading = 'loading_alt';
+ //config.ids.altcanvas.cnbrowse = 'cn_browse';
+ </script>
+
+ <!--#if expr="$FRONT_PAGE!='true'"-->
+ <!--#include virtual="holds.xml"-->
+ <!-- #include virtual="cn_browse.xml"-->
+ <!--#endif-->
+
+ <div id='loading_alt' class='hide_me canvas' style='margin-top: 6px;'>
+ <div style='margin-top: 30px; margin-bottom: 30px; text-align: center; font-weight: 700;' class='color_3'>
+ <img src='../../../../images/progressbar_green.gif' style='margin: 5px; height: 32px; width: 32px;' />
+ </div>
+ </div>
+
+</div>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/cn_browse.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/cn_browse.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/cn_browse.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,34 +1,34 @@
-<div id='cn_browse' class='hide_me cn_browser'
- style='width: 95%; text-align: center; padding: 15px;'>
- <div id='cn_browse_loading' class='cn_browse_loading hide_me'>&common.cn.loading;</div>
- <div id='cn_browse_div'>
-
-
- <div style='width: 90%; text-align: center; margin: 10px;' class='color_4'>
- <span>&common.cn.browsing;</span><b style='margin-left: 6px;' id='cn_browse_where'> </b>
- </div>
- <table class='data_grid bookshelf' width='100%'>
- <thead>
- <tr>
- <td><a id='cn_browse_next' class='classic_link'
- href='javascript:cnBrowsePrev();'><b>&common.cn.previous;</b></a></td>
- <td colspan='1' align='center'>&common.cn.shelf;</td>
- <td><a id='cn_browse_prev' class='classic_link'
- href='javascript:cnBrowseNext();'><b>&common.cn.next;</b></a></td>
- </tr>
- </thead>
- <tbody id='cn_tbody'>
- <tr id='cn_browse_row'>
- <td id='cn_browse_td' class='cn_browse_item' width='25%' valign='top'>
- <a><img height='60' width='50'
- class='cn_browse_info' name='cn_browse_pic' border='0' /></a>
- <div style='font-weight: bold;' class='cn_browse_info' name='cn_browse_cn'> </div>
- <div class='cn_browse_info'><a name='cn_browse_title' class='classic_link'> </a></div>
- <div class='cn_browse_info'><a name='cn_browse_author' class='classic_link'> </a></div>
- <div class='cn_browse_info' name='cn_browse_lib'> </div>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
-</div>
+<div id='cn_browse' class='hide_me cn_browser'
+ style='width: 95%; text-align: center; padding: 15px;'>
+ <div id='cn_browse_loading' class='cn_browse_loading hide_me'>&common.cn.loading;</div>
+ <div id='cn_browse_div'>
+
+
+ <div style='width: 90%; text-align: center; margin: 10px;' class='color_4'>
+ <span>&common.cn.browsing;</span><b style='margin-left: 6px;' id='cn_browse_where'> </b>
+ </div>
+ <table class='data_grid bookshelf' width='100%'>
+ <thead>
+ <tr>
+ <td><a id='cn_browse_next' class='classic_link'
+ href='javascript:cnBrowsePrev();'><b>&common.cn.previous;</b></a></td>
+ <td colspan='1' align='center'>&common.cn.shelf;</td>
+ <td><a id='cn_browse_prev' class='classic_link'
+ href='javascript:cnBrowseNext();'><b>&common.cn.next;</b></a></td>
+ </tr>
+ </thead>
+ <tbody id='cn_tbody'>
+ <tr id='cn_browse_row'>
+ <td id='cn_browse_td' class='cn_browse_item' width='25%' valign='top'>
+ <a><img height='60' width='50'
+ class='cn_browse_info' name='cn_browse_pic' border='0' /></a>
+ <div style='font-weight: bold;' class='cn_browse_info' name='cn_browse_cn'> </div>
+ <div class='cn_browse_info'><a name='cn_browse_title' class='classic_link'> </a></div>
+ <div class='cn_browse_info'><a name='cn_browse_author' class='classic_link'> </a></div>
+ <div class='cn_browse_info' name='cn_browse_lib'> </div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+</div>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/css_common.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/css_common.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/css_common.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,24 +1,24 @@
-<!-- CSS shared across pages goes here -->
-
-<link type='text/css' rel='stylesheet' href="<!--#echo var='OILS_SKIN_BASE'-->/uwin/css/layout.css"/>
-
-<!-- Our font CSS's -->
-<link type='text/css' rel='stylesheet' href='<!--#echo var="OILS_CSS_BASE"-->/mediumfont.css' />
-
-<!-- Our colors -->
-<link type='text/css' rel="stylesheet" href="<!--#echo var='OILS_SKIN_BASE'-->/uwin/css/colors.css" />
-
-<!-- An alternate stylesheet -->
-<link type='text/css' rel="alternate stylesheet" title='&opac.style.reddish;' href="<!--#echo var='OILS_THEME_BASE'-->/reddish/css/colors.css" />
-
-<!-- OpenSearch auto discovery -->
-<link type="application/opensearchdescription+xml"
- rel='search' title="Laurentian Library Catalogue"
- href="http://<!--#echo var='SERVER_NAME'-->/opac/extras/opensearch/1.1/LUSYS/LUSYS/osd.xml" />
-
-<!-- enable Dojo date picker -->
-<style type="text/css">
- @import '/js/dojo/dojo/resources/dojo.css';
- @import '/js/dojo/dijit/themes/tundra/tundra.css';
- @import '/js/dojo/dijit/themes/tundra/tundra_rtl.css';
-</style>
+<!-- CSS shared across pages goes here -->
+
+<link type='text/css' rel='stylesheet' href="<!--#echo var='OILS_SKIN_BASE'-->/uwin/css/layout.css"/>
+
+<!-- Our font CSS's -->
+<link type='text/css' rel='stylesheet' href='<!--#echo var="OILS_CSS_BASE"-->/mediumfont.css' />
+
+<!-- Our colors -->
+<link type='text/css' rel="stylesheet" href="<!--#echo var='OILS_THEME_BASE'-->/uwin/css/colors.css" />
+
+<!-- An alternate stylesheet -->
+<link type='text/css' rel="alternate stylesheet" title='&opac.style.reddish;' href="<!--#echo var='OILS_THEME_BASE'-->/reddish/css/colors.css" />
+
+<!-- OpenSearch auto discovery -->
+<link type="application/opensearchdescription+xml"
+ rel='search' title="Laurentian Library Catalogue"
+ href="http://<!--#echo var='SERVER_NAME'-->/opac/extras/opensearch/1.1/WINDSYS/WINDSYS/osd.xml" />
+
+<!-- enable Dojo date picker -->
+<style type="text/css">
+ @import '/js/dojo/dojo/resources/dojo.css';
+ @import '/js/dojo/dijit/themes/tundra/tundra.css';
+ @import '/js/dojo/dijit/themes/tundra/tundra_rtl.css';
+</style>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/fonts.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/fonts.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/fonts.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,25 +1,25 @@
-<div id='fonts_div'>
-
- <div id='text_size_div' style='position:absolute; top: 2px; right: 6px;'>
- <span style='vertical-align: top;'>&common.textsize.title;</span>
- <span style='vertical-align: top;'><a href="javascript:void(0);" onclick="setFontSize('regular');"> &common.textsize.regular; </a></span>
- <span style='vertical-align: top;'> &common.textsize.separator; </span>
- <span style='vertical-align: top;'><a href="javascript:void(0);" onclick="setFontSize('large');"> &common.textsize.large; </a></span>
-<!-- <span style='vertical-align: top;'> <span style="font-weight:bold;">|</span> </span>
- <span style='vertical-align: top;'>&common.language;</span>
- <span id='translation_switch' dojoType="dijit.form.FilteringSelect" store="openils.I18N.localeStore"
- searchAttr="label" required="false" jsId='opacLocaleSelector'>
- <script>
- dojo.addOnLoad(function() {
- opacLocaleSelector.setValue(locale);
- dojo.connect(opacLocaleSelector, 'onChange',
- function () {
- location.href = location.href.replace(/opac\/[^\/]+\/skin/, 'opac/' + this.getValue() + '/skin');
- }
- );
- });
- </script>
- </span> -->
- </div>
-
-</div>
+<div id='fonts_div'>
+
+ <div id='text_size_div' style='position:absolute; top: 2px; right: 6px;'>
+ <span style='vertical-align: top;'>&common.textsize.title;</span>
+ <span style='vertical-align: top;'><a href="javascript:void(0);" onclick="setFontSize('regular');"> &common.textsize.regular; </a></span>
+ <span style='vertical-align: top;'> &common.textsize.separator; </span>
+ <span style='vertical-align: top;'><a href="javascript:void(0);" onclick="setFontSize('large');"> &common.textsize.large; </a></span>
+ <span style='vertical-align: top;'> <span style="font-weight:bold;">|</span> </span>
+ <span style='vertical-align: top;'>&common.language;</span>
+ <span id='translation_switch' dojoType="dijit.form.FilteringSelect" store="openils.I18N.localeStore"
+ searchAttr="label" required="false" jsId='opacLocaleSelector'>
+ <script>
+ dojo.addOnLoad(function() {
+ opacLocaleSelector.setValue(locale);
+ dojo.connect(opacLocaleSelector, 'onChange',
+ function () {
+ location.href = location.href.replace(/opac\/[^\/]+\/skin/, 'opac/' + this.getValue() + '/skin');
+ }
+ );
+ });
+ </script>
+ </span>
+ </div>
+
+</div>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/format_selector.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/format_selector.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/format_selector.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,10 +1,10 @@
-<select id='<!--#echo var="FORM_SEL_ID"-->' >
- <option value=''>&opac.search.allFormats;</option>
- <option value='at'>&opac.search.books;</option>
- <option value='at-d'>&opac.search.largePrint;</option>
- <option value='i'>&opac.search.audioBooks;</option>
- <option value='g'>&opac.search.videoRecordings;</option>
- <option value='j'>&opac.search.music;</option>
- <option value='m'>&opac.search.electronic;</option>
-</select>
-
+<select id='<!--#echo var="FORM_SEL_ID"-->' >
+ <option value=''>&opac.search.allFormats;</option>
+ <option value='at'>&opac.search.books;</option>
+ <option value='at-d'>&opac.search.largePrint;</option>
+ <option value='i'>&opac.search.audioBooks;</option>
+ <option value='g'>&opac.search.videoRecordings;</option>
+ <option value='j'>&opac.search.music;</option>
+ <option value='m'>&opac.search.electronic;</option>
+</select>
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/holds.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/holds.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/holds.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,232 +1,232 @@
-<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/DP_DateExtensions.js'></script>
-<div>
- <div id='xulholds_box' class='hide_me canvas' style='margin-top: 6px;'>
- <center>
- <table class='data_grid' style='margin-top: 20px;'>
- <tbody>
- <tr>
- <td>&opac.holds.xulRecipient;:</td>
- <td><input type='text' id='xul_recipient_barcode' /></td>
- <td><input type='submit' value='&common.submit;' id='xul_recipient_barcode_submit' /></td>
- <td><input type='submit' value='&common.cancel;' onclick='showCanvas();' /></td>
- <td><input type='submit' value='&common.hold.place;' id='xul_recipient_me' /></td>
- </tr>
- </tbody>
- </table>
- </center>
- </div>
-
- <div id='check_holds_box' class='hide_me canvas'
- style='margin-top: 6px; width: 100%; text-align: center'>
- <br/><br/><br/>
- <b>&common.hold.check;</b>
- </div>
-
- <div id='holds_box' class='hide_me canvas' style='margin-top: 6px;'>
-
- <br/>
- <table width='90%'>
- <tbody>
- <tr>
- <td class='holds_cell color_1'
- align='center' colspan='2'>&common.hold.create;</td>
- </tr>
- <tr>
- <td class='holds_cell'>&opac.holds.recipient;:</td>
- <td class='holds_cell' id='holds_recipient'> </td>
- </tr>
- <tr>
- <td class='holds_cell'>&common.title.label;</td>
- <td class='holds_cell' id='holds_title'> </td>
- </tr>
- <tr>
- <td class='holds_cell'>&common.author;</td>
- <td class='holds_cell' id='holds_author'> </td>
- </tr>
- <tr>
- <td class='holds_cell'>&common.format;</td>
- <td class='holds_cell' id='holds_format'> </td>
- </tr>
- <tr id='hold_physical_desc_row'>
- <td class='holds_cell'>&common.physical.label;</td>
- <td class='holds_cell' id='holds_physical_desc'> </td>
- </tr>
-
- <tr class='hide_me' id='holds_cn_row'>
- <td class='holds_cell'>&common.call.number.label;</td>
- <td class='holds_cell'><b id='holds_cn'/> </td>
- </tr>
-
- <tr class='hide_me' id='holds_copy_row'>
- <td class='holds_cell'>&common.copy.barcode.label;</td>
- <td class='holds_cell'><b id='holds_copy'/> </td>
- </tr>
-
- <tr class='hide_me' id='holds_type_row'>
- <td class='holds_cell'>&common.hold.type.label;</td>
- <td class='holds_cell hide_me' id='holds_is_cn'><b>&common.hold.volume;</b></td>
- <td class='holds_cell hide_me' id='holds_is_copy'><b>&common.hold.copy;</b></td>
- </tr>
-
- <tr>
- <td class='holds_cell'>&opac.holds.contactPhone;:</td>
- <td class='holds_cell'>
- <input id='holds_phone' size='13' maxlength='12'/>
- <span style='margin-left: 4px; font-size: 7pt;'>&common.phone.format;</span>
- </td>
- </tr>
- <tr>
- <td class='holds_cell'>&common.phone.enable;</td>
- <td class='holds_cell'>
- <input type='checkbox' id='holds_enable_phone' checked='checked'
- onchange='
- if (this.checked) $("holds_phone").disabled=false;
- else $("holds_phone").disabled = true;'/>
- </td>
- </tr>
-
- <tr>
- <td class='holds_cell'>&opac.holds.contactEmail;:</td>
- <td class='holds_cell' id='holds_email'>
- <span class='hide_me' id='holds.no_email'>
- &common.email.none;<br/>
- &common.email.set;
- </span>
- <span class='hide_me' id='holds.no_email.xul'>
- &common.email.none;
- </span>
-
- </td>
- </tr>
- <tr>
- <td class='holds_cell'>&common.email.enable;</td>
- <td class='holds_cell'>
- <input type='checkbox' id='holds_enable_email' checked='checked'/>
- </td>
- </tr>
- <!--
- <tr id='holds_depth_selector_row' class='hide_me'>
- <td class='holds_cell'>Hold Range</td>
- <td class='holds_cell'>
- <select id='holds_depth_selector'></select>
- </td>
- </tr>
- -->
- <tr>
- <td class='holds_cell'>&opac.holds.pickupLocation;</td>
- <td class='holds_cell'>
- <select id='holds_org_selector'> </select>
- </td>
- </tr>
-
- <tr>
- <td class='holds_cell'>&opac.holds.expire_time;</td>
- <td class='holds_cell'>
- <input dojoType="dijit.form.DateTextBox" size='10' maxlength='10' id='holds_expire_time' />
- </td>
- </tr>
-
- <tr>
- <td class='holds_cell'>
- &opac.holds.freeze;
- <a class='classic_link' href='javascript:alert("&opac.holds.freeze.help;");'>&common.help;</a>
- </td>
- <td class='holds_cell'>
- <input type='checkbox' id='holds_frozen_chkbox'
- onchange='
- if($("holds_frozen_chkbox").checked)
- unHideMe($("hold_frozen_thaw_row"));
- else
- hideMe($("hold_frozen_thaw_row"));
- ' />
- </td>
- </tr>
-
- <tr id='hold_frozen_thaw_row' class='hide_me'>
- <td class='holds_cell'>
- <script language='javascript' type='text/javascript'> if($('holds_frozen_chkbox').checked) unHideMe($("hold_frozen_thaw_row"));</script>
- &opac.holds.freeze.thaw_date;
- </td>
- <td class='holds_cell'>
- <input dojoType="dijit.form.DateTextBox" size='10' maxlength='10' id='holds_frozen_thaw_input' />
- </td>
- </tr>
-
- <tr id='holds_alt_formats_row_extras' class='hide_me'>
- <td colspan='2' align='center'>
- <div style='padding: 8px;'>
- <a class='classic_link' href='javascript:void(0);' style='padding: 5px;'
- onclick='unHideMe($("holds_alt_formats_row"));'>&common.hold.advanced;</a>
- </div>
- </td>
- </tr>
-
- <tr id='holds_alt_formats_row' class='hide_me'>
-
- <td class='holds_cell'>
- <div style='margin-bottom: 5px;'>
- <span>&common.format.alternatives; </span>
- <span> <a class='classic_link' style='color:red;' href='javascript:void(0);'
- onclick='alert($("holds_explain_adv").innerHTML)'>&common.help;</a></span>
- </div>
- <div>&common.control.click;</div>
- </td>
-
- <td class='holds_cell'>
- <select id='hold_alt_form_selector' multiple='multiple' style='width: 14em;'>
- <option value='at' class='hide_me'>&opac.search.books;</option>
- <option value='at-d' class='hide_me'>&opac.search.largePrint;</option>
- <option value='i' class='hide_me'>&opac.search.audioBooks;</option>
- <option value='g' class='hide_me'>&opac.search.videoRecordings;</option>
- <option value='j' class='hide_me'>&opac.search.music;</option>
- </select>
- </td>
- </tr>
-
- <tr>
- <td class='holds_cell' align='center' colspan='2'>
- <button id='holds_submit'>&opac.holds.placeHold;</button>
- <button class='hide_me' id='holds_update'>&common.hold.update;</button>
- <span style='padding: 20px;'> </span>
- <button id='holds_cancel'>&common.cancel;</button>
- </td>
- </tr>
- </tbody>
- </table>
-
- <div class='hide_me' id='holds_success'>&opac.holds.success;</div>
- <div class='hide_me' id='holds_failure'>&opac.holds.failure;</div>
- <span class='hide_me' id='holds_bad_phone'>
- &common.phone.format.help;
- </span>
-
- <span class='hide_me' id='hold_not_allowed'>
- &common.hold.failed;
- </span>
-
- </div>
-
- <span class='hide_me' id='format_words'>
- <span name='at'>&opac.search.books;</span>
- <span name='at-d'>&opac.search.largePrint;</span>
- <span name='i'>&opac.search.audioBooks;</span>
- <span name='g'>&opac.search.videoRecordings;</span>
- <span name='j'>&opac.search.music;</span>
- <span name='m'>&opac.search.electronic;</span>
- </span>
-
- <span class='hide_me' id='holds_explain_adv'>&holds.advanced_options;</span>
-
- <span class='hide_me' id='holds_pick_good_org'>&common.hold.delivery;</span>
-
- <span class='hide_me' id='hold_dup_exists'>&common.hold.exists;</span>
-
- <span class='hide_me' id='hold_dup_exists_override'>&common.hold.exists.override;</span>
-
- <span id='hold_failed_patron_barred' class='hide_me'>&common.hold.barred;</span>
-
- <span id='invalid_hold' class='hide_me'>&common.hold.item.invalid;</span>
-
- <span id='holds_invalid_recipient' class='hide_me'>&common.hold.patron.invalid;</span>
-
-</div>
+<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/DP_DateExtensions.js'></script>
+<div>
+ <div id='xulholds_box' class='hide_me canvas' style='margin-top: 6px;'>
+ <center>
+ <table class='data_grid' style='margin-top: 20px;'>
+ <tbody>
+ <tr>
+ <td>&opac.holds.xulRecipient;:</td>
+ <td><input type='text' id='xul_recipient_barcode' /></td>
+ <td><input type='submit' value='&common.submit;' id='xul_recipient_barcode_submit' /></td>
+ <td><input type='submit' value='&common.cancel;' onclick='showCanvas();' /></td>
+ <td><input type='submit' value='&common.hold.place;' id='xul_recipient_me' /></td>
+ </tr>
+ </tbody>
+ </table>
+ </center>
+ </div>
+
+ <div id='check_holds_box' class='hide_me canvas'
+ style='margin-top: 6px; width: 100%; text-align: center'>
+ <br/><br/><br/>
+ <b>&common.hold.check;</b>
+ </div>
+
+ <div id='holds_box' class='hide_me canvas' style='margin-top: 6px;'>
+
+ <br/>
+ <table width='90%'>
+ <tbody>
+ <tr>
+ <td class='holds_cell color_1'
+ align='center' colspan='2'>&common.hold.create;</td>
+ </tr>
+ <tr>
+ <td class='holds_cell'>&opac.holds.recipient;:</td>
+ <td class='holds_cell' id='holds_recipient'> </td>
+ </tr>
+ <tr>
+ <td class='holds_cell'>&common.title.label;</td>
+ <td class='holds_cell' id='holds_title'> </td>
+ </tr>
+ <tr>
+ <td class='holds_cell'>&common.author;</td>
+ <td class='holds_cell' id='holds_author'> </td>
+ </tr>
+ <tr>
+ <td class='holds_cell'>&common.format;</td>
+ <td class='holds_cell' id='holds_format'> </td>
+ </tr>
+ <tr id='hold_physical_desc_row'>
+ <td class='holds_cell'>&common.physical.label;</td>
+ <td class='holds_cell' id='holds_physical_desc'> </td>
+ </tr>
+
+ <tr class='hide_me' id='holds_cn_row'>
+ <td class='holds_cell'>&common.call.number.label;</td>
+ <td class='holds_cell'><b id='holds_cn'/> </td>
+ </tr>
+
+ <tr class='hide_me' id='holds_copy_row'>
+ <td class='holds_cell'>&common.copy.barcode.label;</td>
+ <td class='holds_cell'><b id='holds_copy'/> </td>
+ </tr>
+
+ <tr class='hide_me' id='holds_type_row'>
+ <td class='holds_cell'>&common.hold.type.label;</td>
+ <td class='holds_cell hide_me' id='holds_is_cn'><b>&common.hold.volume;</b></td>
+ <td class='holds_cell hide_me' id='holds_is_copy'><b>&common.hold.copy;</b></td>
+ </tr>
+
+ <tr>
+ <td class='holds_cell'>&opac.holds.contactPhone;:</td>
+ <td class='holds_cell'>
+ <input id='holds_phone' size='13' maxlength='12'/>
+ <span style='margin-left: 4px; font-size: 7pt;'>&common.phone.format;</span>
+ </td>
+ </tr>
+ <tr>
+ <td class='holds_cell'>&common.phone.enable;</td>
+ <td class='holds_cell'>
+ <input type='checkbox' id='holds_enable_phone' checked='checked'
+ onchange='
+ if (this.checked) $("holds_phone").disabled=false;
+ else $("holds_phone").disabled = true;'/>
+ </td>
+ </tr>
+
+ <tr>
+ <td class='holds_cell'>&opac.holds.contactEmail;:</td>
+ <td class='holds_cell' id='holds_email'>
+ <span class='hide_me' id='holds.no_email'>
+ &common.email.none;<br/>
+ &common.email.set;
+ </span>
+ <span class='hide_me' id='holds.no_email.xul'>
+ &common.email.none;
+ </span>
+
+ </td>
+ </tr>
+ <tr>
+ <td class='holds_cell'>&common.email.enable;</td>
+ <td class='holds_cell'>
+ <input type='checkbox' id='holds_enable_email' checked='checked'/>
+ </td>
+ </tr>
+ <!--
+ <tr id='holds_depth_selector_row' class='hide_me'>
+ <td class='holds_cell'>Hold Range</td>
+ <td class='holds_cell'>
+ <select id='holds_depth_selector'></select>
+ </td>
+ </tr>
+ -->
+ <tr>
+ <td class='holds_cell'>&opac.holds.pickupLocation;</td>
+ <td class='holds_cell'>
+ <select id='holds_org_selector'> </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td class='holds_cell'>&opac.holds.expire_time;</td>
+ <td class='holds_cell'>
+ <input dojoType="dijit.form.DateTextBox" size='10' maxlength='10' id='holds_expire_time' />
+ </td>
+ </tr>
+
+ <tr>
+ <td class='holds_cell'>
+ &opac.holds.freeze;
+ <a class='classic_link' href='javascript:alert("&opac.holds.freeze.help;");'>&common.help;</a>
+ </td>
+ <td class='holds_cell'>
+ <input type='checkbox' id='holds_frozen_chkbox'
+ onchange='
+ if($("holds_frozen_chkbox").checked)
+ unHideMe($("hold_frozen_thaw_row"));
+ else
+ hideMe($("hold_frozen_thaw_row"));
+ ' />
+ </td>
+ </tr>
+
+ <tr id='hold_frozen_thaw_row' class='hide_me'>
+ <td class='holds_cell'>
+ <script language='javascript' type='text/javascript'> if($('holds_frozen_chkbox').checked) unHideMe($("hold_frozen_thaw_row"));</script>
+ &opac.holds.freeze.thaw_date;
+ </td>
+ <td class='holds_cell'>
+ <input dojoType="dijit.form.DateTextBox" size='10' maxlength='10' id='holds_frozen_thaw_input' />
+ </td>
+ </tr>
+
+ <tr id='holds_alt_formats_row_extras' class='hide_me'>
+ <td colspan='2' align='center'>
+ <div style='padding: 8px;'>
+ <a class='classic_link' href='javascript:void(0);' style='padding: 5px;'
+ onclick='unHideMe($("holds_alt_formats_row"));'>&common.hold.advanced;</a>
+ </div>
+ </td>
+ </tr>
+
+ <tr id='holds_alt_formats_row' class='hide_me'>
+
+ <td class='holds_cell'>
+ <div style='margin-bottom: 5px;'>
+ <span>&common.format.alternatives; </span>
+ <span> <a class='classic_link' style='color:red;' href='javascript:void(0);'
+ onclick='alert($("holds_explain_adv").innerHTML)'>&common.help;</a></span>
+ </div>
+ <div>&common.control.click;</div>
+ </td>
+
+ <td class='holds_cell'>
+ <select id='hold_alt_form_selector' multiple='multiple' style='width: 14em;'>
+ <option value='at' class='hide_me'>&opac.search.books;</option>
+ <option value='at-d' class='hide_me'>&opac.search.largePrint;</option>
+ <option value='i' class='hide_me'>&opac.search.audioBooks;</option>
+ <option value='g' class='hide_me'>&opac.search.videoRecordings;</option>
+ <option value='j' class='hide_me'>&opac.search.music;</option>
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td class='holds_cell' align='center' colspan='2'>
+ <button id='holds_submit'>&opac.holds.placeHold;</button>
+ <button class='hide_me' id='holds_update'>&common.hold.update;</button>
+ <span style='padding: 20px;'> </span>
+ <button id='holds_cancel'>&common.cancel;</button>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <div class='hide_me' id='holds_success'>&opac.holds.success;</div>
+ <div class='hide_me' id='holds_failure'>&opac.holds.failure;</div>
+ <span class='hide_me' id='holds_bad_phone'>
+ &common.phone.format.help;
+ </span>
+
+ <span class='hide_me' id='hold_not_allowed'>
+ &common.hold.failed;
+ </span>
+
+ </div>
+
+ <span class='hide_me' id='format_words'>
+ <span name='at'>&opac.search.books;</span>
+ <span name='at-d'>&opac.search.largePrint;</span>
+ <span name='i'>&opac.search.audioBooks;</span>
+ <span name='g'>&opac.search.videoRecordings;</span>
+ <span name='j'>&opac.search.music;</span>
+ <span name='m'>&opac.search.electronic;</span>
+ </span>
+
+ <span class='hide_me' id='holds_explain_adv'>&holds.advanced_options;</span>
+
+ <span class='hide_me' id='holds_pick_good_org'>&common.hold.delivery;</span>
+
+ <span class='hide_me' id='hold_dup_exists'>&common.hold.exists;</span>
+
+ <span class='hide_me' id='hold_dup_exists_override'>&common.hold.exists.override;</span>
+
+ <span id='hold_failed_patron_barred' class='hide_me'>&common.hold.barred;</span>
+
+ <span id='invalid_hold' class='hide_me'>&common.hold.item.invalid;</span>
+
+ <span id='holds_invalid_recipient' class='hide_me'>&common.hold.patron.invalid;</span>
+
+</div>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/ilsevents.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/ilsevents.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/ilsevents.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,14 +1,14 @@
-<span class='hide_me'>
- <span id='ilsevent.1000'>&ilsevent.1000;</span>
- <span id='ilsevent.1001'>&ilsevent.1001;</span>
- <span id='ilsevent.1002'>&ilsevent.1002;</span>
- <span id='ilsevent.1200'>&ilsevent.1200;</span>
- <span id='ilsevent.5000'>&ilsevent.5000;</span>
- <span id='ilsperm.CREATE_HOLD'>&ilsperm.CREATE_HOLD;</span>
-
- <!-- Local OPAC Specific strings/events -->
- <span id='auth_session_expiring'>&opac.session_expiring;</span>
- <span id='auth_session_expired'>&opac.session_expired;</span>
- <span id='user_not_found'>&common.user_not_found;</span>
-</span>
-
+<span class='hide_me'>
+ <span id='ilsevent.1000'>&ilsevent.1000;</span>
+ <span id='ilsevent.1001'>&ilsevent.1001;</span>
+ <span id='ilsevent.1002'>&ilsevent.1002;</span>
+ <span id='ilsevent.1200'>&ilsevent.1200;</span>
+ <span id='ilsevent.5000'>&ilsevent.5000;</span>
+ <span id='ilsperm.CREATE_HOLD'>&ilsperm.CREATE_HOLD;</span>
+
+ <!-- Local OPAC Specific strings/events -->
+ <span id='auth_session_expiring'>&opac.session_expiring;</span>
+ <span id='auth_session_expired'>&opac.session_expired;</span>
+ <span id='user_not_found'>&common.user_not_found;</span>
+</span>
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/js_common.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/js_common.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/js_common.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,77 +1,72 @@
- <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js' type='text/javascript'></script>
- <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/config.js' type='text/javascript'></script>
-
- <!-- overriding the default setting for metarecord grouping -->
- <script language='javascript' type='text/javascript'>
- SHOW_MR_DEFAULT = false;
- </script>
-
-
- <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/CGI.js' type='text/javascript'></script>
- <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/Cookies.js' type='text/javascript'></script>
- <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/md5.js' type='text/javascript'></script>
-
- <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/slimtree.js' type='text/javascript'></script>
-
- <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/JSON_v1.js' type='text/javascript'></script>
- <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/fmcore.js' type='text/javascript'></script>
- <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/fmgen.js' type='text/javascript'></script>
- <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/opac_utils.js' type='text/javascript'></script>
- <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/OrgTree.js' type='text/javascript'></script>
- <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/OrgLasso.js' type='text/javascript'></script>
- <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/org_utils.js' type='text/javascript'></script>
- <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js' type='text/javascript'></script>
- <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/init.js' type='text/javascript'></script>
- <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/added_content.js' type='text/javascript'></script>
-
- <!-- Some global js -->
- <script language='javascript' type='text/javascript'>
-
- config.css.color_1 = "color_1";
- config.css.color_2 = "color_2";
- config.css.color_3 = "color_3";
-
-
- <!-- set up some global JS config variables, read from the Apache config -->
- var OILS_OPAC_IMAGES_HOST = null;
- <!--#if expr="$OILS_OPAC_IMAGES_HOST"-->
- OILS_OPAC_IMAGES_HOST = '<!--#echo var="OILS_OPAC_IMAGES_HOST"-->extras/ac/jacket/';
- <!--#endif -->
- var OILS_OPAC_STATIC_PROTOCOL = null;
- <!--#if expr="$OILS_OPAC_STATIC_PROTOCOL"-->
- OILS_OPAC_STATIC_PROTOCOL = '<!--#echo var="OILS_OPAC_STATIC_PROTOCOL"-->';
- <!--#endif -->
-
- <!-- builds the "Now searching: <org_unit>" text on the home page -->
- function home_init() {
- getId("home_adv_search_link").setAttribute("href", buildOPACLink({page:ADVANCED}));
- getId("home_myopac_link").setAttribute("href", buildOPACLink({page:MYOPAC}, false, true));
- }
- </script>
-
- <!-- enable Dojo date picker -->
- <script language='javascript' type="text/javascript">
-
- var djConfig = {parseOnLoad: true, isDebug: false}, lang, bidi;
-
- var locale = location.href.replace( /.+opac\/([^\/]+)\/skin.+/, '$1' );
- if (!locale) locale = '<!--#echo var="locale"-->';
-
- djConfig.locale = locale.toLowerCase();
-
- </script>
-
- <script type="text/javascript" src='/js/dojo/dojo/dojo.js'></script>
- <script type="text/javascript" src='/js/dojo/dojo/openils_dojo.js'></script>
- <script type="text/javascript" src='/js/dojo/opensrf/opensrf.js'></script>
-
- <script language="javascript" type="text/javascript">
- dojo.addOnLoad(init);
- dojo.require("dijit._Calendar");
- dojo.require("dijit.form.DateTextBox");
- dojo.require("dijit.form.FilteringSelect");
- dojo.require("dojo.date.locale");
- dojo.require("dojo.date.stamp");
- dojo.require("dojo.parser");
- dojo.require("openils.I18N");
- </script>
+ <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js' type='text/javascript'></script>
+ <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/config.js' type='text/javascript'></script>
+ <script language='javascript' type='text/javascript'> SHOW_MR_DEFAULT = false; </script>
+ <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/CGI.js' type='text/javascript'></script>
+ <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/Cookies.js' type='text/javascript'></script>
+ <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/md5.js' type='text/javascript'></script>
+
+ <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/slimtree.js' type='text/javascript'></script>
+
+ <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/JSON_v1.js' type='text/javascript'></script>
+ <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/fmcore.js' type='text/javascript'></script>
+ <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/fmgen.js' type='text/javascript'></script>
+ <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/opac_utils.js' type='text/javascript'></script>
+ <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/<!--#echo var="locale"-->/OrgTree.js' type='text/javascript'></script>
+ <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/OrgLasso.js' type='text/javascript'></script>
+ <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/org_utils.js' type='text/javascript'></script>
+ <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js' type='text/javascript'></script>
+ <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/init.js' type='text/javascript'></script>
+ <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/added_content.js' type='text/javascript'></script>
+ <script src='https://www.google.com/jsapi' type='text/javascript' language='javascript'></script>
+
+ <!-- Some global js -->
+ <script language='javascript' type='text/javascript'>
+
+ config.css.color_1 = "color_1";
+ config.css.color_2 = "color_2";
+ config.css.color_3 = "color_3";
+
+
+ <!-- set up some global JS config variables, read from the Apache config -->
+ var OILS_OPAC_IMAGES_HOST = null;
+ <!--#if expr="$OILS_OPAC_IMAGES_HOST"-->
+ OILS_OPAC_IMAGES_HOST = '<!--#echo var="OILS_OPAC_IMAGES_HOST"-->extras/ac/jacket/';
+ <!--#endif -->
+ var OILS_OPAC_STATIC_PROTOCOL = null;
+ <!--#if expr="$OILS_OPAC_STATIC_PROTOCOL"-->
+ OILS_OPAC_STATIC_PROTOCOL = '<!--#echo var="OILS_OPAC_STATIC_PROTOCOL"-->';
+ <!--#endif -->
+
+ <!-- builds the "Now searching: <org_unit>" text on the home page -->
+ function home_init() {
+ getId("home_adv_search_link").setAttribute("href", buildOPACLink({page:ADVANCED}));
+ getId("home_myopac_link").setAttribute("href", buildOPACLink({page:MYOPAC}, false, true));
+ }
+ </script>
+
+ <!-- enable Dojo date picker -->
+ <script language='javascript' type="text/javascript">
+
+ var djConfig = {parseOnLoad: true, isDebug: false}, lang, bidi;
+
+ var locale = location.href.replace( /.+opac\/([^\/]+)\/skin.+/, '$1' );
+ if (!locale) locale = '<!--#echo var="locale"-->';
+
+ djConfig.locale = locale.toLowerCase();
+
+ </script>
+
+ <script type="text/javascript" src='/js/dojo/dojo/dojo.js'></script>
+ <script type="text/javascript" src='/js/dojo/dojo/openils_dojo.js'></script>
+ <script type="text/javascript" src='/js/dojo/opensrf/opensrf.js'></script>
+
+ <script language="javascript" type="text/javascript">
+ dojo.addOnLoad(init);
+ dojo.require("dijit._Calendar");
+ dojo.require("dijit.form.DateTextBox");
+ dojo.require("dijit.form.FilteringSelect");
+ dojo.require("dojo.date.locale");
+ dojo.require("dojo.date.stamp");
+ dojo.require("dojo.parser");
+ dojo.require("openils.I18N");
+ </script>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/libselect.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/libselect.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/libselect.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,15 +1,15 @@
-<span>
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/depth_selector.js'></script>
- <span class='hide_me' id='depth_selector_span'>
- <!--#if expr="$SHOW_DEPTHSEL_TEXT='true'"-->
- <span>&library.select; </span>
- <!--#endif-->
- <select id='depth_selector' >
- <option value='new'>&library.select.label;</option>
- </select>
- </span>
- <span class='hide_me' id='lib_selector_span'>
- <a id='lib_selector_link' class='classic_link' href='javascript:void(0)'>&library.select.help;</a>
- </span>
-</span>
-
+<span>
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/depth_selector.js'></script>
+ <span class='hide_me' id='depth_selector_span'>
+ <!--#if expr="$SHOW_DEPTHSEL_TEXT='true'"-->
+ <span>&library.select; </span>
+ <!--#endif-->
+ <select id='depth_selector' >
+ <option value='new'>&library.select.label;</option>
+ </select>
+ </span>
+ <span class='hide_me' id='lib_selector_span'>
+ <a id='lib_selector_link' class='classic_link' href='javascript:void(0)'>&library.select.help;</a>
+ </span>
+</span>
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/login.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/login.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/login.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,110 +1,112 @@
-
-<div id='login_box' class='hide_me canvas' style='margin-top: 6px;'>
-
- <script language='javascript' type='text/javascript'>
- config.ids.login = {};
- config.css.login = {};
- config.ids.login.box = "login_box";
- config.ids.login.username = "login_username";
- config.ids.login.password = "login_password";
- config.ids.login.button = "login_button";
- config.ids.login.cancel = "login_cancel_button";
- config.ids.altcanvas.login = config.ids.login.box;
- </script>
-
- <br/>
-
- <div class='login_text color_1' style='padding: 4px; text-align: center;'>
- <span>&uwin.myopac.loginhelp.question; <a class="classic_link" target="_blank" href="&uwin.myopac.loginhelp.url;">&uwin.myopac.loginhelp.url_text;</a></span>
- </div>
-
- <br/>
-
- <table id='login_table' class='data_grid' style='margin-left: 20px;' width='95%'>
- <tbody>
- <tr>
- <td><span class='login_text'>&login.username;</span></td>
- <td>
- <span class='login_text'>
- <input id='login_username' type='text' size='32' />
- </span>
- </td>
- </tr>
- <tr>
- <td>
- <span class='login_text'>&common.password;</span>
- </td>
- <td>
- <span class='login_text'>
- <input id='login_password' type='password' size='32' />
- </span>
- </td>
- </tr>
- <tr><td colspan="2" style="text-align: center;"></td></tr>
- <tr class='color_1'>
- <td colspan='2' align='center'>
- <span class='login_text' style='margin-right: 20px;'>
- <input type='submit' value='&common.login;' id='login_button'/>
- </span>
- <span class='login_text' style='margin-left: 20px;'>
- <input type='submit' id='login_cancel_button' value='&common.cancel;'/>
- </span>
- </td>
- </tr>
- </tbody>
- </table>
-
- <table id='change_pw_table' class='data_grid hide_me' style='margin-left: 20px;' width='95%'>
- <thead>
- <tr><td colspan='2' align='center'><b>&login.password;</b></td></tr>
- </thead>
- <tbody>
-
- <tr>
- <td colspan='2' style='padding:10px;'>
- &login.first.time;
- &common.password_criteria;
- </td>
- </tr>
-
- <tr>
- <td>&login.password.current.enter;</td>
- <td><input type='password' id='change_pw_current'/></td>
- </tr>
-
- <tr>
- <td>&login.password.new.enter;</td>
- <td><input type='password' id='change_pw_1'/></td>
- </tr>
- <tr>
- <td>&login.password.new.reenter;</td>
- <td><input type='password' id='change_pw_2'/></td>
- </tr>
- <tr><td><br/></td><td/></tr>
- <tr class='color_1'>
- <td colspan='2' align='center'>
- <span class='login_text' style='margin-right: 20px;'>
- <input type='submit' value='&login.password.update;' id='change_pw_button'/>
- </span>
- </td>
- </tr>
- </tbody>
- </table>
-
- <span id='pw_no_match' class='hide_me'>&login.password.nomatch;</span>
- <span id='pw_update_successful' class='hide_me'>&login.password.success;</span>
-
- <span id='pw_not_strong' class='hide_me'>
- &login.password.strength;
- &common.password_criteria;
- </span>
-
- <span id='patron_card_inactive_alert' class='hide_me'>&login.barcode.inactive;</span>
-
- <span id='patron_inactive_alert' class='hide_me'>&login.account.inactive;</span>
-
- <span id='patron_login_failed' class='hide_me'>&login.failed;</span>
-
-</div>
-
-
+
+<div id='login_box' class='hide_me canvas' style='margin-top: 6px;'>
+
+ <script language='javascript' type='text/javascript'>
+ config.ids.login = {};
+ config.css.login = {};
+ config.ids.login.box = "login_box";
+ config.ids.login.tbody = "login_tbody";
+ config.ids.login.username = "login_username";
+ config.ids.login.password = "login_password";
+ config.ids.login.button = "login_button";
+ config.ids.login.cancel = "login_cancel_button";
+ config.ids.altcanvas.login = config.ids.login.box;
+ </script>
+ <script type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/password_reset.js'></script>
+
+ <br/>
+
+ <div class='login_text color_1' style='padding: 4px; text-align: center;'>
+ <span>&opac.login.login;</span>
+ </div>
+
+ <br/>
+
+ <table id='login_table' class='data_grid' style='margin-left: 20px;' width='95%'>
+ <tbody id='login_tbody'>
+ <tr>
+ <td><span class='login_text'>&login.username;</span></td>
+ <td>
+ <span class='login_text'>
+ <input id='login_username' type='text' size='16' />
+ </span>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <span class='login_text'>&common.password;</span>
+ </td>
+ <td>
+ <span class='login_text'>
+ <input id='login_password' type='password' size='16' />
+ </span>
+ </td>
+ </tr>
+ <tr><td><br/></td><td/></tr>
+ <tr class='color_1'>
+ <td colspan='2' align='center'>
+ <span class='login_text' style='margin-right: 20px;'>
+ <input type='submit' value='&common.login;' id='login_button'/>
+ </span>
+ <span class='login_text' style='margin-left: 20px;'>
+ <input type='submit' id='login_cancel_button' value='&common.cancel;'/>
+ </span>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <table id='change_pw_table' class='data_grid hide_me' style='margin-left: 20px;' width='95%'>
+ <thead>
+ <tr><td colspan='2' align='center'><b>&login.password;</b></td></tr>
+ </thead>
+ <tbody>
+
+ <tr>
+ <td colspan='2' style='padding:10px;'>
+ &login.first.time;
+ &common.password_criteria;
+ </td>
+ </tr>
+
+ <tr>
+ <td>&login.password.current.enter;</td>
+ <td><input type='password' id='change_pw_current'/></td>
+ </tr>
+
+ <tr>
+ <td>&login.password.new.enter;</td>
+ <td><input type='password' id='change_pw_1'/></td>
+ </tr>
+ <tr>
+ <td>&login.password.new.reenter;</td>
+ <td><input type='password' id='change_pw_2'/></td>
+ </tr>
+ <tr><td><br/></td><td/></tr>
+ <tr class='color_1'>
+ <td colspan='2' align='center'>
+ <span class='login_text' style='margin-right: 20px;'>
+ <input type='submit' value='&login.password.update;' id='change_pw_button'/>
+ </span>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <span id='pw_no_match' class='hide_me'>&login.password.nomatch;</span>
+ <span id='pw_update_successful' class='hide_me'>&login.password.success;</span>
+
+ <span id='pw_not_strong' class='hide_me'>
+ &login.password.strength;
+ &common.password_criteria;
+ </span>
+
+ <span id='patron_card_inactive_alert' class='hide_me'>&login.barcode.inactive;</span>
+
+ <span id='patron_inactive_alert' class='hide_me'>&login.account.inactive;</span>
+
+ <span id='patron_login_failed' class='hide_me'>&login.failed;</span>
+
+</div>
+
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/logo.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/logo.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/logo.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,4 +1,4 @@
-<div id='logo_div'>
- <script language='javascript' type='text/javascript'>config.ids.common.top_logo = "top_left_logo";</script>
- <img style='margin-right: 4px;' src='<!--#echo var="OILS_BASE"-->/skin/uwin/local/images/uwin_small.png' id='top_left_logo' border='0' class='logo' />
-</div>
+<div id='logo_div'>
+ <script language='javascript' type='text/javascript'>config.ids.common.top_logo = "top_left_logo";</script>
+ <img style='margin-right: 4px;' src='<!--#echo var="OILS_BASE"-->/images/uwin_logo_small.png' id='top_left_logo' border='0' class='logo' />
+</div>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/orgtree.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/orgtree.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/orgtree.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,27 +1,27 @@
-
-<!-- the org tree -->
-<div id='org_container' class='hide_me canvas'>
-
- <div id='org_link_container' class='color_1'>
- <span class='org_link'>
- <a onclick='orgTreeSelector.expandAll();'
- href='javascript:void(0);'>&common.org.openAll;</a>
- </span>
- <span class='org_link'>
- <a onclick='orgTreeSelector.closeAll();'
- href='javascript:void(0);'>&common.org.closeAll;</a>
- </span>
- <span class='org_link'>
- <a onclick='showCanvas();' href='javascript:void(0);'>&common.org.cancel;</a>
- </span>
- </div>
-
- <div id='org_loading_div'><br/><span>&common.org.loading;</span></div>
- <br/>
- <div id='org_selector_tip' class='tips hide_me'><b>&common.org.note;</b>
- <span>&common.org.notetext;</span>
- </div>
- <br/>
- <div id='org_tree' class='org_tree'> </div>
- <br/>
-</div>
+
+<!-- the org tree -->
+<div id='org_container' class='hide_me canvas'>
+
+ <div id='org_link_container' class='color_1'>
+ <span class='org_link'>
+ <a onclick='orgTreeSelector.expandAll();'
+ href='javascript:void(0);'>&common.org.openAll;</a>
+ </span>
+ <span class='org_link'>
+ <a onclick='orgTreeSelector.closeAll();'
+ href='javascript:void(0);'>&common.org.closeAll;</a>
+ </span>
+ <span class='org_link'>
+ <a onclick='showCanvas();' href='javascript:void(0);'>&common.org.cancel;</a>
+ </span>
+ </div>
+
+ <div id='org_loading_div'><br/><span>&common.org.loading;</span></div>
+ <br/>
+ <div id='org_selector_tip' class='tips hide_me'><b>&common.org.note;</b>
+ <span>&common.org.notetext;</span>
+ </div>
+ <br/>
+ <div id='org_tree' class='org_tree'> </div>
+ <br/>
+</div>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/searchbar.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/searchbar.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/searchbar.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,64 +1,64 @@
-
-<!-- Searchbar for doing metarecord searches -->
-
-<div id='searchbar'>
-
- <!-- load my js -->
- <script language='javascript' type='text/javascript'>
- config.ids.searchbar = {};
- config.css.searchbar = {};
- config.ids.searchbar.text = 'search_box';
- config.ids.searchbar.submit = 'search_submit';
- config.ids.searchbar.type_selector = 'search_type_selector';
- config.ids.searchbar.depth_selector = 'depth_selector';
- config.ids.searchbar.form_selector = 'form_selector';
- config.ids.searchbar.extra_row = 'searchbar_extra';
- config.ids.searchbar.main_row = 'searchbar_main_row';
- config.ids.searchbar.table = 'searchbar_table';
- config.ids.searchbar.location_tag = 'search_location_tag_link';
- config.ids.searchbar.lib_sel_span = 'lib_selector_span';
- config.ids.searchbar.lib_sel_link = 'lib_selector_link';
- config.ids.searchbar.depth_sel_span = 'depth_selector_span';
- </script>
-
-
- <table class='color_1 color_border1' width='100%' style='border-collapse: collapse;'>
- <tbody>
- <tr>
-
- <td nowrap='nowrap' align='center' class='search_box_container color_2'>
-
- <input id='search_box' type='text' />
- <span style='padding-left: 6px;'>
- <input type='button' style='width: 40px;' id='search_submit' value='&button.go;' />
- </span>
- </td>
-
- <td nowrap='nowrap' style='padding: 3px;' align='right' >
-
- <span style='padding-right:9px;'>
- <!--
- <span>&common.type;: </span>
- -->
- <!--#include virtual="stypes_selector.xml"-->
- </span>
-
- <span style='padding-right:9px;'>
- <!--#set var='FORM_SEL_ID' value='form_selector'-->
- <!--#include virtual="format_selector.xml"-->
- </span>
-
- <!--#include virtual="libselect.xml"-->
-
- </td>
- </tr>
- </tbody>
- </table>
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/search_bar.js'></script>
-</div>
-
-
-
-
-
-
+
+<!-- Searchbar for doing metarecord searches -->
+
+<div id='searchbar'>
+
+ <!-- load my js -->
+ <script language='javascript' type='text/javascript'>
+ config.ids.searchbar = {};
+ config.css.searchbar = {};
+ config.ids.searchbar.text = 'search_box';
+ config.ids.searchbar.submit = 'search_submit';
+ config.ids.searchbar.type_selector = 'search_type_selector';
+ config.ids.searchbar.depth_selector = 'depth_selector';
+ config.ids.searchbar.form_selector = 'form_selector';
+ config.ids.searchbar.extra_row = 'searchbar_extra';
+ config.ids.searchbar.main_row = 'searchbar_main_row';
+ config.ids.searchbar.table = 'searchbar_table';
+ config.ids.searchbar.location_tag = 'search_location_tag_link';
+ config.ids.searchbar.lib_sel_span = 'lib_selector_span';
+ config.ids.searchbar.lib_sel_link = 'lib_selector_link';
+ config.ids.searchbar.depth_sel_span = 'depth_selector_span';
+ </script>
+
+
+ <table class='color_1 color_border1' width='100%' style='border-collapse: collapse;'>
+ <tbody>
+ <tr>
+
+ <td nowrap='nowrap' align='center' class='search_box_container color_2'>
+
+ <input id='search_box' type='text' />
+ <span style='padding-left: 6px;'>
+ <input type='button' style='width: 40px;' id='search_submit' value='&button.go;' />
+ </span>
+ </td>
+
+ <td nowrap='nowrap' style='padding: 3px;' align='right' >
+
+ <span style='padding-right:9px;'>
+ <!--
+ <span>&common.type;: </span>
+ -->
+ <!--#include virtual="stypes_selector.xml"-->
+ </span>
+
+ <span style='padding-right:9px;'>
+ <!--#set var='FORM_SEL_ID' value='form_selector'-->
+ <!--#include virtual="format_selector.xml"-->
+ </span>
+
+ <!--#include virtual="libselect.xml"-->
+
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/search_bar.js'></script>
+</div>
+
+
+
+
+
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/sidebar.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/sidebar.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/sidebar.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,224 +1,220 @@
-
-<!-- Navigation bar -->
-
-<div id="sidebar_div" class="sidebar_div" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <div class='sidebar_chunk'>
-
- <div title="&navigate.home.title;"
- id='home_link_div' class="side_bar_item ">
- <a id='home_link' href='index.xml'>&navigate.home;</a>
- </div>
-
- <div title="&uwin.askON.title;"
- id="&uwin.askON.div.id;" class="side_bar_item ">
- <a id="&uwin.askON.link.id;" href="&uwin.askON.url;" target="_blank">&uwin.askON;</a>
- </div>
-
- <div title="&opac.navigate.advanced.title;"
- id='advanced_link_div' class="side_bar_item ">
- <a id='advanced_link' href='advanced.xml'>&opac.navigate.advanced;</a>
- </div>
-
- <div title="&navigate.myopac.title;"
- id='myopac_link_div' class="side_bar_item ">
- <a id='myopac_link' href='myopac/myopac.xml'>&navigate.myopac;</a>
- </div>
-
- <div title="&navigate.login.title;"
- id='login_link_div' class="side_bar_item ">
- <a id='login_link' href='javascript:void(0);'>&navigate.login;</a>
- </div>
-
- <div title="&navigate.logout.title;"
- id='logout_link_div' class="side_bar_item hide_me ">
- <a id='logout_link' href='javascript:void(0);'>&navigate.logout;</a>
- </div>
-
-
- <!-- Informational sidebar components -->
-
- <div id='logged_in_as_div' title="&navigate.loggedinas.title;" class="side_bar_item hide_me">
- <span>&navigate.loggedinas;<b id='username_dest'> </b></span>
- </div>
-
- <div id='sidebar_results_wrapper' class='hide_me border_1'>
- <div title="&navigate.titleGroupResults;"
- id='mresult_link_div' class="side_bar_item hide_me">
- <a id='sidebar_title_group_results'>&navigate.titleGroupResults;</a>
- </div>
-
- <div title="&navigate.titleResults;"
- id='result_link_div' class="side_bar_item hide_me">
- <a id='sidebar_title_results'>&navigate.titleResults;</a>
- </div>
-
- <div title="&navigate.record.details;"
- id='rdetail_link_div' class="side_bar_item hide_me">
- <span>&navigate.title.details;</span>
- </div>
- </div>
- </div>
-
-<!-- As commenting out relevant subjects/authors/series divs causes some javascipt crashes
-because subjectSidebarTree in not defined in uwin_test/js/sidebar_extra.js and uwin_test/js/sidebar.js files,
-created a new div: <div id='subject_tree_sidebar_no_display'>, uncommented above mentioned divs,
-moved them into this new div and hided it, problem solved *** GL *** -->
-
- <!-- relevant subjects/authors/series commented out, cause they just don't work -->
-
-<div id='subject_tree_sidebar_no_display' class='hide_me' style='margin-top: 12px;'>
- <div id='subject_tree_sidebar' class='sidebar_chunk hide_me' style='margin-top: 12px;'>
- <div id='subject_sidebar_tree_div'> </div>
- <script language='javascript' type='text/javascript'>
- removeChildren($('subject_sidebar_tree_div'));
- var subjectSidebarTree = new SlimTree(
- document.getElementById('subject_sidebar_tree_div'),
- 'subjectSidebarTree', '../../../../images/slimtree/related.jpg');
- subjectSidebarTree.addNode( 'subjectSidebarTreeRoot', -1,
- "&sidebar.relevantSubjects.headerLabel;",
- 'javascript:subjectSidebarTree.toggle(' +
- '"subjectSidebarTreeRoot");');
- </script>
- </div>
-
- <div id='author_tree_sidebar' class='sidebar_chunk hide_me'>
- <hr/>
- <div id='author_sidebar_tree_div'> </div>
- <script language='javascript' type='text/javascript'>
- removeChildren($('author_sidebar_tree_div'));
- var authorSidebarTree = new SlimTree(
- document.getElementById('author_sidebar_tree_div'),
- 'authorSidebarTree','../../../../images/slimtree/people.jpg');
- authorSidebarTree.addNode( 'authorSidebarTreeRoot', -1,
- "&sidebar.relevantAuthors.headerLabel;",
- 'javascript:authorSidebarTree.toggle(' +
- '"authorSidebarTreeRoot");');
- </script>
- </div>
-
- <div id='series_tree_sidebar' class='sidebar_chunk hide_me'>
- <hr/>
- <div id='series_sidebar_tree_div'> </div>
- <script language='javascript' type='text/javascript'>
- removeChildren($('series_sidebar_tree_div'));
- var seriesSidebarTree = new SlimTree(
- document.getElementById('series_sidebar_tree_div'),
- 'seriesSidebarTree',
- '../../../../images/slimtree/houses.jpg');
- seriesSidebarTree.addNode( 'seriesSidebarTreeRoot', -1,
- "&sidebar.relevantSeries.headerLabel;",
- 'javascript:seriesSidebarTree.toggle(' +
- '"seriesSidebarTreeRoot");');
- </script>
- </div>
-</div>
-
- <div id='adv_quick_search_sidebar' class='sidebar_chunk hide_me'
- style='text-align:center; margin-top: 20px;'>
- <hr/>
- <div id='adv_quick_search'>
- <div class='adv_quick_search color_4'><b>&sidebar.quick.search;</b></div>
- <div style='margin-top: 8px;'>
- <table><tbody><tr>
- <td>
- <select id='adv_quick_type' style='width: 6em;'>
- <option value='isbn'>&opac.advanced.quick.isbn;</option>
- <option value='issn'>&opac.advanced.quick.issn;</option>
- <option value='cn'>&opac.advanced.quick.cn;</option>
- <option value='lccn'>&opac.advanced.quick.lccn;</option>
- <option value='tcn'>&opac.advanced.quick.tcn;</option>
- <option value='barcode'>&opac.advanced.quick.barcode;</option>
- </select>
- </td><td>
- <input type='text' id='adv_quick_text' size='16' />
- </td>
- </tr></tbody></table>
- </div>
-
- <span class='hide_me' id='myopac.copy.not.found'>&sidebar.copy.not.found;</span>
- <div style='margin-top: 8px;' class='adv_quick_search_submit'>
- <a id='adv_quick_submit' href='javascript:advGenericSearch();' class='classic_link'>&common.submit;</a>
- </div>
- </div>
- </div>
-
- <div id='adv_marc_search_sidebar' class='sidebar_chunk hide_me'
- style='text-align:center; margin-top: 20px;'>
- <hr/>
- <div class='adv_quick_search color_4'><b>&search.marc;</b></div>
- <table style='margin: 3px; width: 100%;' id='adv_sdbar_table' class='border_4_3'>
- <tbody>
- <tr>
- <td>&search.marc.tag;</td>
- <td><input name='advanced.marc.tag' maxlength='3' size='3' /></td>
- <td>&search.marc.subfield;</td>
- <td><input name='advanced.marc.subfield' maxlength='1' size='1' /></td>
- </tr>
- <tr>
- <td>&search.marc.value;</td>
- <td colspan='3'><input name='advanced.marc.value' size='18' /></td>
- </tr>
- <tr name='crow' class='hide_me'>
- <td colspan='4' align='center'>
- <a href='javascript:void(0);' class='classic_link'
- onclick='
- var div = $("adv_marc_search_sidebar");
- if( div.getElementsByTagName("table").length > 1 )
- div.removeChild(this.parentNode.parentNode.parentNode.parentNode);'>&common.close;</a>
- </td>
- </tr>
-
- </tbody>
- </table>
- <div id='adv_marc_submit' class='adv_quick_search_submit'>
- <a style='margin-right: 4px;' class='classic_link' href='javascript:advAddMARC();'>&search.marc.add.row;</a>
- <a style='margin-left: 4px;' class='classic_link' href='javascript:advMARCRun();'>&common.submit;</a>
- </div>
- </div>
-
-
-
-
- <!-- ============================================================================= -->
- <!-- Our javascript -->
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/sidebar.js'></script>
-
- <script language='javascript' type='text/javascript'>
- config.ids.sidebar = {};
- config.css.sidebar = {};
- config.names.sidebar = {};
- config.css.sidebar.item = {};
- config.ids.sidebar.home = 'home_link_div';
- config.ids.sidebar.advanced = 'advanced_link_div';
- config.ids.sidebar.myopac = 'myopac_link_div';
- config.ids.sidebar.prefs = 'prefs_link_div';
- config.ids.sidebar.mresult = 'mresult_link_div';
- config.ids.sidebar.rresult = 'result_link_div';
- config.ids.sidebar.rdetail = "rdetail_link_div";
- config.ids.sidebar.login = 'login_link';
- config.ids.sidebar.logout = 'logout_link';
- config.ids.sidebar.logoutbox = 'logout_link_div';
- config.ids.sidebar.loginbox = 'login_link_div';
- config.ids.sidebar.logged_in_as = 'logged_in_as_div';
- config.ids.sidebar.username_dest = 'username_dest';
- config.ids.sidebar.subject = 'subject_sidebar';
- config.ids.sidebar.subject_item = 'subject_item';
- config.ids.sidebar.author = 'author_sidebar';
- config.ids.sidebar.author_item = 'author_item';
- config.ids.sidebar.series = 'series_sidebar';
- config.ids.sidebar.series_item = 'series_item';
-
- config.ids.sidebar.home_link = 'home_link'
- config.ids.sidebar.advanced_link = 'advanced_link'
- config.ids.sidebar.myopac_link = 'myopac_link'
-
- config.names.sidebar.subject_item = 'subject_item';
- config.names.sidebar.author_item = 'author_item';
- config.names.sidebar.series_item = 'series_item';
-
- config.css.encircled = 'encircled';
- </script>
-
-</div>
-
+
+<!-- Navigation bar -->
+
+<div id="sidebar_div" class="sidebar_div" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <div class='sidebar_chunk'>
+
+ <div title="&navigate.home.title;"
+ id='home_link_div' class="side_bar_item ">
+ <a id='home_link' href='index.xml'>&navigate.home;</a>
+ </div>
+
+ <div title="&opac.navigate.advanced.title;"
+ id='advanced_link_div' class="side_bar_item ">
+ <a id='advanced_link' href='advanced.xml'>&opac.navigate.advanced;</a>
+ </div>
+
+ <div title="&navigate.myopac.title;"
+ id='myopac_link_div' class="side_bar_item ">
+ <a id='myopac_link' href='myopac/myopac.xml'>&navigate.myopac;</a>
+ </div>
+
+ <div title="&navigate.login.title;"
+ id='login_link_div' class="side_bar_item ">
+ <a id='login_link' href='javascript:void(0);'>&navigate.login;</a>
+ </div>
+
+ <div title="&navigate.logout.title;"
+ id='logout_link_div' class="side_bar_item hide_me ">
+ <a id='logout_link' href='javascript:void(0);'>&navigate.logout;</a>
+ </div>
+
+
+ <!-- Informational sidebar components -->
+
+ <div id='logged_in_as_div' title="&navigate.loggedinas.title;" class="side_bar_item hide_me">
+ <span>&navigate.loggedinas;<b id='username_dest'> </b></span>
+ </div>
+
+ <div id='sidebar_results_wrapper' class='hide_me border_1'>
+ <div title="&navigate.titleGroupResults;"
+ id='mresult_link_div' class="side_bar_item hide_me">
+ <a id='sidebar_title_group_results'>&navigate.titleGroupResults;</a>
+ </div>
+
+ <div title="&navigate.titleResults;"
+ id='result_link_div' class="side_bar_item hide_me">
+ <a id='sidebar_title_results'>&navigate.titleResults;</a>
+ </div>
+
+ <div title="&navigate.record.details;"
+ id='rdetail_link_div' class="side_bar_item hide_me">
+ <span>&navigate.title.details;</span>
+ </div>
+ </div>
+ </div>
+
+ <div id='subject_tree_sidebar' class='sidebar_chunk hide_me' style='margin-top: 12px;'>
+ <div id='subject_sidebar_tree_div'> </div>
+ <script language='javascript' type='text/javascript'>
+ removeChildren($('subject_sidebar_tree_div'));
+ var subjectSidebarTree = new SlimTree(
+ document.getElementById('subject_sidebar_tree_div'),
+ 'subjectSidebarTree', '../../../../images/slimtree/related.jpg');
+ subjectSidebarTree.addNode( 'subjectSidebarTreeRoot', -1,
+ "&sidebar.relevantSubjects.headerLabel;",
+ 'javascript:subjectSidebarTree.toggle(' +
+ '"subjectSidebarTreeRoot");');
+ </script>
+ </div>
+
+ <div id='author_tree_sidebar' class='sidebar_chunk hide_me'>
+ <hr/>
+ <div id='author_sidebar_tree_div'> </div>
+ <script language='javascript' type='text/javascript'>
+ removeChildren($('author_sidebar_tree_div'));
+ var authorSidebarTree = new SlimTree(
+ document.getElementById('author_sidebar_tree_div'),
+ 'authorSidebarTree','../../../../images/slimtree/people.jpg');
+ authorSidebarTree.addNode( 'authorSidebarTreeRoot', -1,
+ "&sidebar.relevantAuthors.headerLabel;",
+ 'javascript:authorSidebarTree.toggle(' +
+ '"authorSidebarTreeRoot");');
+ </script>
+ </div>
+
+ <div id='series_tree_sidebar' class='sidebar_chunk hide_me'>
+ <hr/>
+ <div id='series_sidebar_tree_div'> </div>
+ <script language='javascript' type='text/javascript'>
+ removeChildren($('series_sidebar_tree_div'));
+ var seriesSidebarTree = new SlimTree(
+ document.getElementById('series_sidebar_tree_div'),
+ 'seriesSidebarTree',
+ '../../../../images/slimtree/houses.jpg');
+ seriesSidebarTree.addNode( 'seriesSidebarTreeRoot', -1,
+ "&sidebar.relevantSeries.headerLabel;",
+ 'javascript:seriesSidebarTree.toggle(' +
+ '"seriesSidebarTreeRoot");');
+ </script>
+ </div>
+
+ <div id='adv_quick_search_sidebar' class='sidebar_chunk hide_me'
+ style='text-align:center; margin-top: 20px;'>
+ <hr/>
+ <div id='adv_quick_search'>
+ <div class='adv_quick_search color_4'><b>&sidebar.quick.search;</b></div>
+ <div style='margin-top: 8px;'>
+ <table><tbody><tr>
+ <td>
+ <select id='adv_quick_type' style='width: 6em;'>
+ <option value='isbn'>&opac.advanced.quick.isbn;</option>
+ <option value='issn'>&opac.advanced.quick.issn;</option>
+ <option id='adv_quick_type_cn' value='cn'>&opac.advanced.quick.cn;</option>
+ <option value='lccn'>&opac.advanced.quick.lccn;</option>
+ <option value='tcn'>&opac.advanced.quick.tcn;</option>
+ <option id='adv_quick_type_cn' value='barcode'>&opac.advanced.quick.barcode;</option>
+ </select>
+ </td><td>
+ <input type='text' id='adv_quick_text' size='16' />
+ </td>
+ </tr></tbody></table>
+ </div>
+ <script language='javascript' type='text/javascript'><![CDATA[
+ dojo.addOnLoad(function() {
+ if (isXUL()) {
+ dojo.query('#adv_quick_type_barcode').attr('selected', 'selected');
+ } else {
+ dojo.query('#adv_quick_type_cn').attr('selected', 'selected');
+ }
+ });
+ ]]>
+ </script>
+
+ <span class='hide_me' id='myopac.copy.not.found'>&sidebar.copy.not.found;</span>
+ <div style='margin-top: 8px;' class='adv_quick_search_submit'>
+ <a id='adv_quick_submit' href='javascript:advGenericSearch();' class='classic_link'>&common.submit;</a>
+ </div>
+ </div>
+ </div>
+
+ <div id='adv_marc_search_sidebar' class='sidebar_chunk hide_me'
+ style='text-align:center; margin-top: 20px;'>
+ <hr/>
+ <div class='adv_quick_search color_4'><b>&search.marc;</b></div>
+ <table style='margin: 3px; width: 100%;' id='adv_sdbar_table' class='border_4_3'>
+ <tbody>
+ <tr>
+ <td>&search.marc.tag;</td>
+ <td><input name='advanced.marc.tag' maxlength='3' size='3' /></td>
+ <td>&search.marc.subfield;</td>
+ <td><input name='advanced.marc.subfield' maxlength='1' size='1' /></td>
+ </tr>
+ <tr>
+ <td>&search.marc.value;</td>
+ <td colspan='3'><input name='advanced.marc.value' size='18' /></td>
+ </tr>
+ <tr name='crow' class='hide_me'>
+ <td colspan='4' align='center'>
+ <a href='javascript:void(0);' class='classic_link'
+ onclick='
+ var div = $("adv_marc_search_sidebar");
+ if( div.getElementsByTagName("table").length > 1 )
+ div.removeChild(this.parentNode.parentNode.parentNode.parentNode);'>&common.close;</a>
+ </td>
+ </tr>
+
+ </tbody>
+ </table>
+ <div id='adv_marc_submit' class='adv_quick_search_submit'>
+ <a style='margin-right: 4px;' class='classic_link' href='javascript:advAddMARC();'>&search.marc.add.row;</a>
+ <a style='margin-left: 4px;' class='classic_link' href='javascript:advMARCRun();'>&common.submit;</a>
+ </div>
+ </div>
+
+
+
+
+ <!-- ============================================================================= -->
+ <!-- Our javascript -->
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/sidebar.js'></script>
+
+ <script language='javascript' type='text/javascript'>
+ config.ids.sidebar = {};
+ config.css.sidebar = {};
+ config.names.sidebar = {};
+ config.css.sidebar.item = {};
+ config.ids.sidebar.home = 'home_link_div';
+ config.ids.sidebar.advanced = 'advanced_link_div';
+ config.ids.sidebar.myopac = 'myopac_link_div';
+ config.ids.sidebar.prefs = 'prefs_link_div';
+ config.ids.sidebar.mresult = 'mresult_link_div';
+ config.ids.sidebar.rresult = 'result_link_div';
+ config.ids.sidebar.rdetail = "rdetail_link_div";
+ config.ids.sidebar.login = 'login_link';
+ config.ids.sidebar.logout = 'logout_link';
+ config.ids.sidebar.logoutbox = 'logout_link_div';
+ config.ids.sidebar.loginbox = 'login_link_div';
+ config.ids.sidebar.logged_in_as = 'logged_in_as_div';
+ config.ids.sidebar.username_dest = 'username_dest';
+ config.ids.sidebar.subject = 'subject_sidebar';
+ config.ids.sidebar.subject_item = 'subject_item';
+ config.ids.sidebar.author = 'author_sidebar';
+ config.ids.sidebar.author_item = 'author_item';
+ config.ids.sidebar.series = 'series_sidebar';
+ config.ids.sidebar.series_item = 'series_item';
+
+ config.ids.sidebar.home_link = 'home_link'
+ config.ids.sidebar.advanced_link = 'advanced_link'
+ config.ids.sidebar.myopac_link = 'myopac_link'
+
+ config.names.sidebar.subject_item = 'subject_item';
+ config.names.sidebar.author_item = 'author_item';
+ config.names.sidebar.series_item = 'series_item';
+
+ config.css.encircled = 'encircled';
+ </script>
+
+</div>
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/statusbar.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/statusbar.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/statusbar.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,28 +1,28 @@
-
-<div id='statusbar' style='margin-bottom: 6px; margin-top: 6px;'>
-
- <table width='100%'>
- <tbody>
- <tr>
- <td align='left'>
- <b>
- <span style='padding: 1px; ' id='now_searching_location'> </span>
- </b>
- <i id='including_results_for' class='hide_me'>
- <span>&status.results;</span> <b id='including_results_location'> </b>
- </i>
- </td>
- <td align='right'>
- <!--#if expr="$OILS_PAGE='rresult.xml' || $OILS_PAGE='mresult.xml'"-->
- <!--#include virtual="../result/filtersort.xml" -->
- <!--#endif -->
- </td>
- </tr>
- </tbody>
- </table>
-
- <script language='javascript' type='text/javascript'>
- config.ids.common.now_searching = 'now_searching_location';
- </script>
-
-</div>
+
+<div id='statusbar' style='margin-bottom: 6px; margin-top: 6px;'>
+
+ <table width='100%'>
+ <tbody>
+ <tr>
+ <td align='left'>
+ <b>
+ <span style='padding: 1px; ' id='now_searching_location'> </span>
+ </b>
+ <i id='including_results_for' class='hide_me'>
+ <span>&status.results;</span> <b id='including_results_location'> </b>
+ </i>
+ </td>
+ <td align='right'>
+ <!--#if expr="$OILS_PAGE='rresult.xml' || $OILS_PAGE='mresult.xml'"-->
+ <!--#include virtual="../result/filtersort.xml" -->
+ <!--#endif -->
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <script language='javascript' type='text/javascript'>
+ config.ids.common.now_searching = 'now_searching_location';
+ </script>
+
+</div>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/stypes_selector.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/stypes_selector.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/stypes_selector.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,8 +1,9 @@
-<select id='search_type_selector'>
- <option value='keyword' selected='selected'>&common.keyword;</option>
- <option value='title'>&common.title;</option>
- <option value='author'>&common.author;</option>
- <option value='subject'>&common.subject;</option>
- <option value='series'>&common.series;</option>
-</select>
-
+<select id='search_type_selector'>
+ <option value='keyword' selected='selected'>&common.keyword;</option>
+ <option value='title'>&common.title;</option>
+ <option value='title' id='jtitle'>&common.journal.title;</option>
+ <option value='author'>&common.author;</option>
+ <option value='subject'>&common.subject;</option>
+ <option value='series'>&common.series;</option>
+</select>
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/tips.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/tips.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/common/tips.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,8 +1,8 @@
-
-<div id='tips' class='tips hide_me'>
- <div class='hide_me'>
- <span>&common.tips.tip1;</span>
- <span>&common.tips.tip2;</span>
- </div>
- <span style="font-weight: bold;">&tips.label; </span>
-</div>
+
+<div id='tips' class='tips hide_me'>
+ <div class='hide_me'>
+ <span>&common.tips.tip1;</span>
+ <span>&common.tips.tip2;</span>
+ </div>
+ <span style="font-weight: bold;">&tips.label; </span>
+</div>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/footer.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/footer.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/footer.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,39 +1,50 @@
-<div id='copyright_block'>
- <div id='footer_links'>
- <span class='footer_link'>
- <a target='_blank' class='classic_link'
- href='http://windsor.concat.ca/opac/en-CA/extras/slimpac/start.html'>Basic Catalogue (HTML only)</a>
- </span>
- <span> | </span>
- <span class='footer_link'>
- <a target='_blank' class='classic_link'
- href='&uwin.footer.home.leddy.url;'>&uwin.footer.home.leddy;</a>
- </span>
- <span> | </span>
- <span class='footer_link'>
- <a target='_blank' class='classic_link'
- href='&uwin.footer.home.law.url;'>&uwin.footer.home.law;</a>
- </span>
- <span> | </span>
- <span class='footer_link'>
- <a target='_blank' class='classic_link'
- href='&uwin.footer.help.url;'>&uwin.footer.help;</a>
- </span>
- <span> | </span>
- <span class='footer_link'>
- <a target='_blank' class='classic_link'
- href='&uwin.footer.journals.url;'>&uwin.footer.journals;</a>
- </span>
- <span> | </span>
- <span class='footer_link'>
- <a target='_blank' class='classic_link'
- href='&uwin.footer.databases.url;'>&uwin.footer.databases;</a>
- </span>
- </div>
- <div id='copyright_text'>
- <span>&footer.copyright;</span>
- </div>
- <div id='footer_logo'>&footer.logo;
- <a href='http://open-ils.org'><img style='border:none;' src='../../../../images/eg_tiny_logo.jpg'/></a>
- </div>
-</div>
+<div id='copyright_block'>
+ <div id='footer_links'>
+ <span class='footer_link'>
+ <a class='classic_link'
+ href='/opac/<!--#echo var="locale"-->/extras/slimpac/start.html'>&opac.basic;</a>
+ </span>
+ <span> | </span>
+ <span class='footer_link'>
+ <a target='_blank' class='classic_link'
+ href='&lu.footer.help.url;'>&footer.help;</a>
+ </span>
+ <span> | </span>
+ <span class='footer_link'>
+ <a target='_blank' class='classic_link'
+ href='&lu.footer.ejournals.url;'>&lu.footer.ejournals;</a>
+ </span>
+ <span> | </span>
+ <span class='footer_link'>
+ <a target='_blank' class='classic_link'
+ href='&lu.footer.databases.url;'>&lu.footer.databases;</a>
+ </span>
+ <span> | </span>
+ <span class='footer_link'>
+ <a target='_blank' class='classic_link'
+ href='&lu.footer.library.url;'>&lu.footer.library.about;</a>
+ </span>
+ <span> | </span>
+ <span class='footer_link'>
+ <a target='_blank' class='classic_link'
+ href='&lu.footer.archives.url;'>&lu.footer.archives;</a>
+ </span>
+ <span> | </span>
+ <span class='footer_link'>
+ <a target='_blank' class='classic_link'
+ href='&lu.footer.reserves.url;'>&lu.footer.reserves;</a>
+ </span>
+ <span> | </span>
+ <span class='footer_link'>
+ <a target='_blank' class='classic_link'
+ href='&lu.footer.feedback.url;'>&lu.footer.feedback;</a>
+ </span>
+
+ </div>
+ <div id='copyright_text'>
+ <span>&footer.copyright;</span>
+ </div>
+ <div id='footer_logo'>&footer.logo;
+ <a href='http://open-ils.org'><img style='border:none;' src='../../../../images/eg_tiny_logo.jpg'/></a>
+ </div>
+</div>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/header.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/header.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/header.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,13 +1,13 @@
-<head>
- <!-- Set the page title -->
-
- <!--#include virtual="common/css_common.xml"-->
-
- <title>&<!--#echo var="OILS_TITLE"-->;</title>
- <link rel="unapi-server" type="application/xml" title="unAPI" href="http://<!--#echo var='HTTP_HOST'-->/opac/extras/unapi"/>
-
- <!--#if expr="$slimpac!='true'"-->
- <!--#include virtual="common/js_common.xml"-->
- <!--#endif-->
-
-</head>
+<head>
+ <!-- Set the page title -->
+
+ <!--#include virtual="common/css_common.xml"-->
+
+ <title>&<!--#echo var="OILS_TITLE"-->;</title>
+ <link rel="unapi-server" type="application/xml" title="unAPI" href="http://<!--#echo var='HTTP_HOST'-->/opac/extras/unapi"/>
+
+ <!--#if expr="$slimpac!='true'"-->
+ <!--#include virtual="common/js_common.xml"-->
+ <!--#endif-->
+
+</head>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/home/homesearch.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/home/homesearch.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/home/homesearch.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,135 +1,135 @@
-
-<div id='canvas_main' class='home_search canvas'
- style='-moz-border-radius: 6px; padding: 6px; margin-top: 65px;'
- xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <!-- load my js -->
- <script language='javascript' type='text/javascript'
- src="<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/depth_selector.js"> </script>
- <script language='javascript' type='text/javascript'
- src="<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/search_bar.js"> </script>
-
- <script language='javascript' type='text/javascript'>
- config.ids.searchbar = {};
- config.css.searchbar = {};
- config.ids.searchbar.text = 'search_box';
- config.ids.searchbar.submit = 'search_submit';
- config.ids.searchbar.type_selector = 'search_type_selector';
- config.ids.searchbar.depth_selector = 'depth_selector';
- config.ids.searchbar.form_selector = 'form_selector';
- config.ids.searchbar.extra_row = 'searchbar_extra';
- config.ids.searchbar.main_row = 'searchbar_main_row';
- config.ids.searchbar.table = 'searchbar_table';
- config.ids.searchbar.location_tag = 'search_location_tag_link';
- config.ids.searchbar.lib_sel_span = 'lib_selector_span';
- config.ids.searchbar.lib_sel_link = 'lib_selector_link';
- config.ids.searchbar.depth_sel_span = 'depth_selector_span';
- </script>
-
-
- <div style='width: 100%; text-align: center'>
- <img src='<!--#echo var="OILS_BASE"-->/skin/uwin/local/images/uwin_main.png' />
- </div>
-
- <style>.rowpad { height: 20px; }</style>
-
- <table id='frontsearch_table' height='100%' width='100%'
- style='margin-top: 10px; border-collapse: collapse;'>
-
- <tbody>
-
- <tr class='color_3'>
-
- <script language='javascript' type='text/javascript'>
- config.ids.common.now_searching = 'now_searching_location';
- </script>
-
- <td style='padding: 6px;' class='border_5' align='center'>
- <span>&opac.search.nowSearching;</span>
- <span style='padding: 1px;' id='now_searching_location'> </span>
- </td>
- </tr>
-
-
- <tr class='rowpad'><td></td></tr>
-
- <tr>
- <td nowrap='nowrap' align='center' class='color_1 border_5'>
- <input id='search_box' style='width: 300px;' type='text' />
- <span style='padding-left: 6px;'>
- <input type='button' style='width: 40px;' id='search_submit' value='Go!' />
- </span>
- </td>
- </tr>
-
- <tr class='rowpad'><td></td></tr>
-
- <tr class='color_3 border_5'>
-
- <td nowrap='nowrap' align='center' style='padding: 4px;'>
-
- <span style='padding-right:40px;'>
- <!--#include virtual="../common/stypes_selector.xml"-->
- </span>
-
- <span>
- <!--
- <span>&common.format;: </span>
- -->
- <!--#set var='FORM_SEL_ID' value='form_selector'-->
- <!--#include virtual="../common/format_selector.xml"-->
- </span>
-
- </td>
- </tr>
-
- <tr class='rowpad'><td></td></tr>
-
- <tr class='color_1 border_5'>
- <td align='center' style='padding: 4px; padding-bottom: 6px;'>
- <span style='padding-right: 15px;'>
- <a id='home_adv_search_link' href='javascript:void(0);'>&opac.navigate.advanced;</a></span>
- <span>
- <span class='hide_me' id='depth_selector_span'>
- <select id='depth_selector' >
- <option value='new'>&opac.navigate.selectNewOrg;...</option>
- </select>
- </span>
- <span class='hide_me' id='lib_selector_span'>
- <a id='lib_selector_link' href='javascript:void(0)'>&opac.navigate.selectOrg;</a>
- </span>
- </span>
- <span style='padding-left: 15px;'>
- <a id='home_myopac_link' href='javascript:void(0);'>&opac.navigate.myopac;</a>
- </span>
- </td>
- </tr>
-
- <!-- locale picker -->
- <tr><td align='center' valign='bottom' style='padding-top:10px;'>
-<!-- <span style='vertical-align: top;'>&common.language;</span>
- <span dojoType="dijit.form.FilteringSelect" store="openils.I18N.localeStore"
- searchAttr="label" required="false" jsId='opacLocaleSelector'>
- <script>
- dojo.addOnLoad(function() {
- opacLocaleSelector.setValue(locale);
- dojo.connect(opacLocaleSelector, 'onChange',
- function () {
- location.href = location.href.replace(/opac\/[^\/]+\/skin/, 'opac/' + this.getValue() + '/skin');
- }
- );
- });
- </script>
- </span> -->
- </td></tr>
-
- </tbody>
- </table>
-
-</div>
-
-
-
-
-
-
+
+<div id='canvas_main' class='home_search canvas'
+ style='-moz-border-radius: 6px; padding: 6px; margin-top: 65px;'
+ xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <!-- load my js -->
+ <script language='javascript' type='text/javascript'
+ src="<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/depth_selector.js"> </script>
+ <script language='javascript' type='text/javascript'
+ src="<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/search_bar.js"> </script>
+
+ <script language='javascript' type='text/javascript'>
+ config.ids.searchbar = {};
+ config.css.searchbar = {};
+ config.ids.searchbar.text = 'search_box';
+ config.ids.searchbar.submit = 'search_submit';
+ config.ids.searchbar.type_selector = 'search_type_selector';
+ config.ids.searchbar.depth_selector = 'depth_selector';
+ config.ids.searchbar.form_selector = 'form_selector';
+ config.ids.searchbar.extra_row = 'searchbar_extra';
+ config.ids.searchbar.main_row = 'searchbar_main_row';
+ config.ids.searchbar.table = 'searchbar_table';
+ config.ids.searchbar.location_tag = 'search_location_tag_link';
+ config.ids.searchbar.lib_sel_span = 'lib_selector_span';
+ config.ids.searchbar.lib_sel_link = 'lib_selector_link';
+ config.ids.searchbar.depth_sel_span = 'depth_selector_span';
+ </script>
+
+
+ <div style='width: 100%; text-align: center'>
+ <img src='<!--#echo var="OILS_BASE"-->/images/uwin_logo.png' />
+ </div>
+
+ <style>.rowpad { height: 20px; }</style>
+
+ <table id='frontsearch_table' height='100%' width='100%'
+ style='margin-top: 10px; border-collapse: collapse;'>
+
+ <tbody>
+
+ <tr class='color_3'>
+
+ <script language='javascript' type='text/javascript'>
+ config.ids.common.now_searching = 'now_searching_location';
+ </script>
+
+ <td style='padding: 6px;' class='border_5' align='center'>
+ <span>&opac.search.nowSearching;</span>
+ <span style='padding: 1px;' id='now_searching_location'> </span>
+ </td>
+ </tr>
+
+
+ <tr class='rowpad'><td></td></tr>
+
+ <tr>
+ <td nowrap='nowrap' align='center' class='color_1 border_5'>
+ <input id='search_box' style='width: 300px;' type='text' />
+ <span style='padding-left: 6px;'>
+ <input type='button' style='width: 40px;' id='search_submit' value='Go!' />
+ </span>
+ </td>
+ </tr>
+
+ <tr class='rowpad'><td></td></tr>
+
+ <tr class='color_3 border_5'>
+
+ <td nowrap='nowrap' align='center' style='padding: 4px;'>
+
+ <span style='padding-right:40px;'>
+ <!--#include virtual="../common/stypes_selector.xml"-->
+ </span>
+
+ <span>
+ <!--
+ <span>&common.format;: </span>
+ -->
+ <!--#set var='FORM_SEL_ID' value='form_selector'-->
+ <!--#include virtual="../common/format_selector.xml"-->
+ </span>
+
+ </td>
+ </tr>
+
+ <tr class='rowpad'><td></td></tr>
+
+ <tr class='color_1 border_5'>
+ <td align='center' style='padding: 4px; padding-bottom: 6px;'>
+ <span style='padding-right: 15px;'>
+ <a id='home_adv_search_link' href='javascript:void(0);'>&opac.navigate.advanced;</a></span>
+ <span>
+ <span class='hide_me' id='depth_selector_span'>
+ <select id='depth_selector' >
+ <option value='new'>&opac.navigate.selectNewOrg;...</option>
+ </select>
+ </span>
+ <span class='hide_me' id='lib_selector_span'>
+ <a id='lib_selector_link' href='javascript:void(0)'>&opac.navigate.selectOrg;</a>
+ </span>
+ </span>
+ <span style='padding-left: 15px;'>
+ <a id='home_myopac_link' href='javascript:void(0);'>&opac.navigate.myopac;</a>
+ </span>
+ </td>
+ </tr>
+
+ <!-- locale picker -->
+ <tr><td align='center' valign='bottom' style='padding-top:10px;'>
+ <span style='vertical-align: top;'>&common.language;</span>
+ <span dojoType="dijit.form.FilteringSelect" store="openils.I18N.localeStore"
+ searchAttr="label" required="false" jsId='opacLocaleSelector'>
+ <script>
+ dojo.addOnLoad(function() {
+ opacLocaleSelector.setValue(locale);
+ dojo.connect(opacLocaleSelector, 'onChange',
+ function () {
+ location.href = location.href.replace(/opac\/[^\/]+\/skin/, 'opac/' + this.getValue() + '/skin');
+ }
+ );
+ });
+ </script>
+ </span>
+ </td></tr>
+
+ </tbody>
+ </table>
+
+</div>
+
+
+
+
+
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/home/index_body.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/home/index_body.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/home/index_body.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,38 +1,38 @@
-<body class="tundra">
-
- <noscript>
- <style type="text/css">#toptable { display: none; }</style>
- <p style="font-size: 1.3em; padding: 3em; text-align: center;">
- &home.js.disabled;
- </p>
- </noscript>
-
- <table id='toptable' width='100%' style='border-collapse: collapse;'>
- <tbody>
- <tr>
- <td width='10%'> </td>
- <td width='80%'>
- <div id='canvas'>
- <!--#include virtual="../common/altcanvas.xml"-->
- <!--#include virtual="homesearch.xml"-->
- </div>
- </td>
- <td width='10%'> </td>
- </tr>
- </tbody>
- </table>
- <script language='javascript' type='text/javascript'>isFrontPage = true;</script>
- <script language="javascript" type='text/javascript'>
- dojo.addOnLoad(home_init);
- try {
- document.getElementById('toptable').style.display = 'table';
- } catch(e) {
- try {
- document.getElementById('toptable').style.display = '';
- } catch(ee) {}
- }
- </script>
- <!--#include virtual='../footer.xml'-->
-</body>
-
-
+<body class="tundra">
+
+ <noscript>
+ <style type="text/css">#toptable { display: none; }</style>
+ <p style="font-size: 1.3em; padding: 3em; text-align: center;">
+ &home.js.disabled;
+ </p>
+ </noscript>
+
+ <table id='toptable' width='100%' style='border-collapse: collapse;'>
+ <tbody>
+ <tr>
+ <td width='10%'> </td>
+ <td width='80%'>
+ <div id='canvas'>
+ <!--#include virtual="../common/altcanvas.xml"-->
+ <!--#include virtual="homesearch.xml"-->
+ </div>
+ </td>
+ <td width='10%'> </td>
+ </tr>
+ </tbody>
+ </table>
+ <script language='javascript' type='text/javascript'>isFrontPage = true;</script>
+ <script language="javascript" type='text/javascript'>
+ dojo.addOnLoad(home_init);
+ try {
+ document.getElementById('toptable').style.display = 'table';
+ } catch(e) {
+ try {
+ document.getElementById('toptable').style.display = '';
+ } catch(ee) {}
+ }
+ </script>
+ <!--#include virtual='../footer.xml'-->
+</body>
+
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/html_xsl.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/html_xsl.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/html_xsl.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,10 +1,10 @@
-
-<xsl:stylesheet version="1.0"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
- <xsl:output method="html" indent="yes" encoding="utf-8"/>
- <xsl:template match="/">
- <xsl:copy-of select='/*[local-name()="html"]'/>
- </xsl:template>
-</xsl:stylesheet>
+
+<xsl:stylesheet version="1.0"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+ <xsl:output method="html" indent="yes" encoding="utf-8"/>
+ <xsl:template match="/">
+ <xsl:copy-of select='/*[local-name()="html"]'/>
+ </xsl:template>
+</xsl:stylesheet>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/index.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/index.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/index.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Loads the environment -->
-<!--#include virtual="setenv.xml"-->
-
-<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
- <!--#include virtual="/opac/skin/uwin/local/locale/en-CA/opac.dtd"-->
- <!--#include virtual="/opac/skin/uwin/local/locale/en-CA/opac_conifer.dtd"-->
-]>
-
-
-<html xmlns='http://www.w3.org/1999/xhtml'>
- <!--#include virtual="header.xml"-->
- <!--#if expr="$OILS_PAGE='index.xml'"-->
- <!--#include virtual="home/index_body.xml"-->
- <!--#else-->
- <!--#include virtual="body.xml"-->
- <!--#endif-->
-</html>
-
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Loads the environment -->
+<!--#include virtual="setenv.xml"-->
+
+<!DOCTYPE html PUBLIC
+ "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+ <!--#include virtual="/opac/locale/${locale}/opac.dtd"-->
+ <!--#include virtual="/opac/locale/${locale}/opac_conifer.dtd"-->
+]>
+
+
+<html xmlns='http://www.w3.org/1999/xhtml'>
+ <!--#include virtual="header.xml"-->
+ <!--#if expr="$OILS_PAGE='index.xml'"-->
+ <!--#include virtual="home/index_body.xml"-->
+ <!--#else-->
+ <!--#include virtual="body.xml"-->
+ <!--#endif-->
+</html>
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_bookbags.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_bookbags.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_bookbags.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,135 +1,136 @@
-
-<div id='myopac_bookbag_div' class='hide_me' xmlns:xi="http://www.w3.org/2001/XInclude" >
-
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/container.js'> </script>
-
- <div id='myopac_delete_bookbag_warn' class='hide_me'>
- &myopac.delete.bookbag;
- </div>
-
- <div style='text-align: center; font-weight: bold;'
- class='hide_me' id='myopac_bookbags_none'>&myopac.no.bookbags;</div>
-
- <div style='width: 99%; text-align: center; margin-bottom: 10px;'>
- <b>&myopac.bookbags.title;</b>
- <!--
- <a class='classic_link' style='margin-left: 5px; font-size: 8pt;'
- href='javascript:alert($("myopac_bb_what_are").innerHTML);'>(What are Bookbags?)</a>
- -->
- </div>
-
- <table width='100%' class='data_grid data_grid_center hide_me' id='myopac_bookbag_table'>
- <thead>
- <tr><td>&common.name;</td><td>&myopac.bookbag.items;</td><td>&myopac.bookbag.shared;</td><td>&myopac.bookbag.toggle;</td><td>&myopac.bookbag.delete;</td></tr>
- </thead>
- <tbody id='myopac_bookbag_tbody'>
- <tr id='myopac_bookbag_tr'>
- <td>
- <a href='javascript:void(0);' class='classic_link' name='myopac_expand_bookbag'> </a>
- </td>
- <td><span name='myopac_bookbag_item_count'> </span> <span> &myopac.items;</span></td>
- <td>
- <span name='myopac_bb_published_no' class='hide_me'>&common.no;</span>
- <span name='myopac_bb_published_yes' class='hide_me'>&common.yes;</span>
- <a name='myopac_bb_published_view' class='classic_link hide_me'>&myopac.view;</a>
- <a name='myopac_bb_published_atom' class='unadorned_link hide_me'>
- <img border="0" src="/opac/images/small-rss.png" title="&myopac.atom.feed;" alt="&myopac.atom.feed;"/>
- </a>
- </td>
-
- <td>
- <a name='myopac_bb_make_unpublished' class='classic_link hide_me'>&myopac.bookbag.hide;</a>
- <a name='myopac_bb_make_published' class='classic_link hide_me'>&myopac.bookbag.share;</a>
- </td>
-
- <td>
- <a class='classic_link' href='javascript:void(0);' name='myopac_container_delete'>&myopac.delete;</a>
- </td>
- </tr>
- </tbody>
- </table>
-
- <table width='100%' class='data_grid data_grid_center' style='margin-top: 10px;'>
- <thead>
- <tr><td>&myopac.bookbag.create;</td></tr>
- </thead>
- <tbody>
- <tr>
- <td>
- <span style='padding-right: 5px;'>&myopac.bookbag.naming;</span>
- <input id='myopac_bookbag_new_name' type='text' />
- </td>
- </tr>
- <tr>
- <td>
- <span style='padding: 5px;'>&myopac.bookbag.share;</span>
- <a class='classic_link' href='javascript:alert($("bb_publish_text").innerHTML);'><b>&common.help;</b></a>
- <span>&common.yes;</span> <input type='radio' name='bb_public' id='bb_public_yes'/>
- <span>&common.no;</span> <input type='radio' name='bb_public' id='bb_public_no' checked='checked'/>
- <input style='padding-left: 10px;' onclick='myOPACCreateBookbag();'
- type='submit' value='&common.submit;' />
- </td>
- </tr>
- </tbody>
- </table>
-
- <!--
- <div style='overflow: auto; max-height: 200px;' class='hide_me'>
- -->
- <div style='width: 99%; text-align: center'> <b id='myopac_bookbag_items_name'> </b></div>
-
- <div class='hide_me' style='width: 100%; text-align: center; font-weight: 700; margin-top: 10px;'
- id='myopac_bookbag_no_items'>&myopac.bookbag.no.items;</div>
-
- <table width='100%' class='hide_me data_grid data_grid_center' id='myopac_bookbag_items_table'>
- <thead>
- <tr> <td>&common.title;</td> <td>&common.authors;</td> <td>&myopac.bookbag.remove;</td> </tr>
- </thead>
- <tbody id='myopac_bookbag_items_tbody'>
- <tr id='myopac_bookbag_items_row'>
- <td> <a name='myopac_bookbag_items_title' class='classic_link'> </a> </td>
- <!--
- <td> <a name='myopac_bookbag_items_author' class='classic_link'> </a> </td>
- -->
- <td name='myopac_bookbag_items_author'> </td>
- <td><a name='myopac_bookbag_items_remove' class='classic_link'>&myopac.remove.link;</a></td>
- </tr>
- </tbody>
- </table>
- <!--</div>-->
-
- <span id='bb_publish_text' class='hide_me'>
- &myopac.publish.text;
- </span>
-
- <span id='myopac_remove_bb_item_confirm' class='hide_me'>
- &myopac.item.confirm;
- </span>
-
- <span id='myopac_make_published_confirm' class='hide_me'>
- &myopac.publish.confirm;
- </span>
-
- <span id='myopac_make_unpublished_confirm' class='hide_me'>
- &myopac.unpublish.confirm;
- </span>
-
- <span id='myopac_bb_update_success' class='hide_me'>
- &myopac.update.success;
- </span>
-
- <span id='bb_create_warning' class='hide_me'>
- &myopac.create.warning;
- </span>
-
- <span id='myopac_bb_what_are' class='hide_me'>
- &myopac.describe.bookbags;
- </span>
-
- <span class='hide_me' id='bb_update_success'>
- &myopac.updated.success;
- </span>
-
-</div>
-
-
+
+<div id='myopac_bookbag_div' class='hide_me' xmlns:xi="http://www.w3.org/2001/XInclude" >
+
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/container.js'> </script>
+
+ <div id='myopac_delete_bookbag_warn' class='hide_me'>
+ &myopac.delete.bookbag;
+ </div>
+
+ <div style='text-align: center; font-weight: bold;'
+ class='hide_me' id='myopac_bookbags_none'>&myopac.no.bookbags;</div>
+
+ <div style='width: 99%; text-align: center; margin-bottom: 10px;'>
+ <b>&myopac.bookbags.title;</b>
+ <!--
+ <a class='classic_link' style='margin-left: 5px; font-size: 8pt;'
+ href='javascript:alert($("myopac_bb_what_are").innerHTML);'>(What are Bookbags?)</a>
+ -->
+ </div>
+
+ <table width='100%' class='data_grid data_grid_center hide_me' id='myopac_bookbag_table'>
+ <thead>
+ <tr><td>&common.name;</td><td>&myopac.bookbag.items;</td><td>&myopac.bookbag.shared;</td><td>&myopac.bookbag.toggle;</td><td>&myopac.bookbag.delete;</td></tr>
+ </thead>
+ <tbody id='myopac_bookbag_tbody'>
+ <tr id='myopac_bookbag_tr'>
+ <td>
+ <a href='javascript:void(0);' class='classic_link' name='myopac_expand_bookbag'> </a>
+ </td>
+ <td><span name='myopac_bookbag_item_count'> </span> <span> &myopac.items;</span></td>
+ <td>
+ <span name='myopac_bb_published_no' class='hide_me'>&common.no;</span>
+ <span name='myopac_bb_published_yes' class='hide_me'>&common.yes;</span>
+ <a name='myopac_bb_published_view' class='classic_link hide_me'>&myopac.view;</a>
+ <a name='myopac_bb_published_atom' class='unadorned_link hide_me'>
+ <img border="0" src="/opac/images/small-rss.png" title="&myopac.atom.feed;" alt="&myopac.atom.feed;"/>
+ </a>
+ <br/><a name='myopac_bb_exp_refworks' class='classic_link hide_me'>&myopac.bookbag.refworks;</a>
+ </td>
+
+ <td>
+ <a name='myopac_bb_make_unpublished' class='classic_link hide_me'>&myopac.bookbag.hide;</a>
+ <a name='myopac_bb_make_published' class='classic_link hide_me'>&myopac.bookbag.share;</a>
+ </td>
+
+ <td>
+ <a class='classic_link' href='javascript:void(0);' name='myopac_container_delete'>&myopac.delete;</a>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <table width='100%' class='data_grid data_grid_center' style='margin-top: 10px;'>
+ <thead>
+ <tr><td>&myopac.bookbag.create;</td></tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>
+ <span style='padding-right: 5px;'>&myopac.bookbag.naming;</span>
+ <input id='myopac_bookbag_new_name' type='text' />
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <span style='padding: 5px;'>&myopac.bookbag.share;</span>
+ <a class='classic_link' href='javascript:alert($("bb_publish_text").innerHTML);'><b>&common.help;</b></a>
+ <span>&common.yes;</span> <input type='radio' name='bb_public' id='bb_public_yes'/>
+ <span>&common.no;</span> <input type='radio' name='bb_public' id='bb_public_no' checked='checked'/>
+ <input style='padding-left: 10px;' onclick='myOPACCreateBookbag();'
+ type='submit' value='&common.submit;' />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <!--
+ <div style='overflow: auto; max-height: 200px;' class='hide_me'>
+ -->
+ <div style='width: 99%; text-align: center'> <b id='myopac_bookbag_items_name'> </b></div>
+
+ <div class='hide_me' style='width: 100%; text-align: center; font-weight: 700; margin-top: 10px;'
+ id='myopac_bookbag_no_items'>&myopac.bookbag.no.items;</div>
+
+ <table width='100%' class='hide_me data_grid data_grid_center' id='myopac_bookbag_items_table'>
+ <thead>
+ <tr> <td>&common.title;</td> <td>&common.authors;</td> <td>&myopac.bookbag.remove;</td> </tr>
+ </thead>
+ <tbody id='myopac_bookbag_items_tbody'>
+ <tr id='myopac_bookbag_items_row'>
+ <td> <a name='myopac_bookbag_items_title' class='classic_link'> </a> </td>
+ <!--
+ <td> <a name='myopac_bookbag_items_author' class='classic_link'> </a> </td>
+ -->
+ <td name='myopac_bookbag_items_author'> </td>
+ <td><a name='myopac_bookbag_items_remove' class='classic_link'>&myopac.remove.link;</a></td>
+ </tr>
+ </tbody>
+ </table>
+ <!--</div>-->
+
+ <span id='bb_publish_text' class='hide_me'>
+ &myopac.publish.text;
+ </span>
+
+ <span id='myopac_remove_bb_item_confirm' class='hide_me'>
+ &myopac.item.confirm;
+ </span>
+
+ <span id='myopac_make_published_confirm' class='hide_me'>
+ &myopac.publish.confirm;
+ </span>
+
+ <span id='myopac_make_unpublished_confirm' class='hide_me'>
+ &myopac.unpublish.confirm;
+ </span>
+
+ <span id='myopac_bb_update_success' class='hide_me'>
+ &myopac.update.success;
+ </span>
+
+ <span id='bb_create_warning' class='hide_me'>
+ &myopac.create.warning;
+ </span>
+
+ <span id='myopac_bb_what_are' class='hide_me'>
+ &myopac.describe.bookbags;
+ </span>
+
+ <span class='hide_me' id='bb_update_success'>
+ &myopac.updated.success;
+ </span>
+
+</div>
+
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_checked.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_checked.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_checked.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,107 +1,107 @@
-
-<div id='myopac_checked_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
-
- <!--
- <script language='javascript' type='text/javascript' src='<!||#echo var="OILS_JS_BASE"||>/Date.W3CDTF.js'/>
- -->
-
- <table width='100%'><tbody>
- <tr>
- <td aligh='left' class='data_grid'>
- <!--
- Total items out: <b id='mo_items_out_count' style='padding-right: 20px;'>0</b>
- -->
- &myopac.checked.out; <b id='mo_items_out_count' style='padding: 5px;'>0</b> /
- &myopac.checked.overdue; <b id='mo_items_overdue_count' style='padding: 5px;'>0</b>
- </td>
- <td align='right'>
- <button onclick='myOPACRenewSelected();' id='mo_renew_button' disabled='disabled'>&myopac.checked.renew;</button>
- </td>
- </tr>
- <tr id='my_renewing' class='hide_me'><td align='center'><b>&myopac.checked.renewing;</b></td></tr>
- </tbody></table>
-
- <table width='100%' class='light_border data_grid'>
-
- <thead class='color_3'>
- <tr>
- <td width='45%'>&common.title;</td>
- <td width='20%'>&common.author;</td>
- <td width='10%' nowrap='nowrap' align='center'>&myopac.fines.due;</td>
- <td width='10%' nowrap='nowrap' align='center'>&myopac.checked.renew.remaining;</td>
- <td width='15%'>&common.select;
- (<a id='myopac_select_all_checked' onclick='myopacSelectAllChecked();'
- class='classic_link' href='javascript:void(0);'>&common.all;</a>/<a id='myopac_select_none_checked'
- onclick='myopacSelectNoneChecked();' class='classic_link' href='javascript:void(0);'>&common.none;</a>)
- </td>
- </tr>
- </thead>
-
-
- <tbody id='myopac_checked_tbody'>
-
- <tr id='myopac_checked_none' class='hide_me'>
- <td colspan='10' align='center'><b>&myopac.checked.noitems;</b></td>
- </tr>
-
-
- <tr id='myopac_checked_loading'><td>&common.loading;</td></tr>
-
- <tr id='myopac_checked_row' class='light_border hide_me'>
-
- <td name='myopac_checked_title' class='light_border'>
- <a href='javascript:void(0);' name='myopac_checked_title_link'> </a>
- </td>
-
- <td name='myopac_checked_author' class='light_border'>
- <a href='javascript:void(0);' name='myopac_checked_author_link'> </a>
- </td>
-
- <td align='center' name='myopac_checked_due' class='light_border'> </td>
- <td align='center' name='myopac_checked_renewals' class='light_border'> </td>
-
- <!--
- <td align='center' name='myopac_checked_renew' class='light_border'>
- <a style='text-decoration:underline;' href='javascript:void(0);'
- name='myopac_checked_renew_link' class='class_link'>Renew</a>
- </td>
- -->
-
- <td align='center'><input type='checkbox' name='selectme'/></td>
-
- </tr>
- </tbody>
- </table>
-
- <div id='non_cat_circs_div' class='hide_me'>
- <br/>
- <div style='text-align: center'><b>&myopac.common.other.circ;</b></div>
- <table class='data_grid' width='100%'>
- <thead>
- <tr>
- <td>&myopac.checked.circ.lib;</td>
- <td>&myopac.checked.item.type;</td>
- <td>&myopac.checked.circ.time;</td>
- </tr>
- </thead>
- <tbody id='non_cat_circs_tbody'>
- <tr id='non_cat_circs_row'>
- <td name='circ_lib'/>
- <td name='item_type'/>
- <td name='circ_time'/>
- </tr>
- </tbody>
- </table>
- </div>
-
- <div id='myopac_renew_success' class='hide_me'>&myopac.checked.renew.success;</div>
-
- <span class='hide_me' id='myopac_renew_confirm'>&myopac.checked.renew.confirm;</span>
-
- <span class='hide_me' id='myopac_renew_fail'>&myopac.checked.renew.fail;</span>
-
- <span class='hide_me' id='myopac_renew_fail2'>&myopac.checked.renew.fail2;</span>
-
-</div>
-
-
+
+<div id='myopac_checked_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
+
+ <!--
+ <script language='javascript' type='text/javascript' src='<!||#echo var="OILS_JS_BASE"||>/Date.W3CDTF.js'/>
+ -->
+
+ <table width='100%'><tbody>
+ <tr>
+ <td aligh='left' class='data_grid'>
+ <!--
+ Total items out: <b id='mo_items_out_count' style='padding-right: 20px;'>0</b>
+ -->
+ &myopac.checked.out; <b id='mo_items_out_count' style='padding: 5px;'>0</b> /
+ &myopac.checked.overdue; <b id='mo_items_overdue_count' style='padding: 5px;'>0</b>
+ </td>
+ <td align='right'>
+ <button onclick='myOPACRenewSelected();' id='mo_renew_button' disabled='disabled'>&myopac.checked.renew;</button>
+ </td>
+ </tr>
+ <tr id='my_renewing' class='hide_me'><td align='center'><b>&myopac.checked.renewing;</b></td></tr>
+ </tbody></table>
+
+ <table width='100%' class='light_border data_grid'>
+
+ <thead class='color_3'>
+ <tr>
+ <td width='45%'>&common.title;</td>
+ <td width='20%'>&common.author;</td>
+ <td width='10%' nowrap='nowrap' align='center'>&myopac.fines.due;</td>
+ <td width='10%' nowrap='nowrap' align='center'>&myopac.checked.renew.remaining;</td>
+ <td width='15%'>&common.select;
+ (<a id='myopac_select_all_checked' onclick='myopacSelectAllChecked();'
+ class='classic_link' href='javascript:void(0);'>&common.all;</a>/<a id='myopac_select_none_checked'
+ onclick='myopacSelectNoneChecked();' class='classic_link' href='javascript:void(0);'>&common.none;</a>)
+ </td>
+ </tr>
+ </thead>
+
+
+ <tbody id='myopac_checked_tbody'>
+
+ <tr id='myopac_checked_none' class='hide_me'>
+ <td colspan='10' align='center'><b>&myopac.checked.noitems;</b></td>
+ </tr>
+
+
+ <tr id='myopac_checked_loading'><td>&common.loading;</td></tr>
+
+ <tr id='myopac_checked_row' class='light_border hide_me'>
+
+ <td name='myopac_checked_title' class='light_border'>
+ <a href='javascript:void(0);' name='myopac_checked_title_link'> </a>
+ </td>
+
+ <td name='myopac_checked_author' class='light_border'>
+ <a href='javascript:void(0);' name='myopac_checked_author_link'> </a>
+ </td>
+
+ <td align='center' name='myopac_checked_due' class='light_border'> </td>
+ <td align='center' name='myopac_checked_renewals' class='light_border'> </td>
+
+ <!--
+ <td align='center' name='myopac_checked_renew' class='light_border'>
+ <a style='text-decoration:underline;' href='javascript:void(0);'
+ name='myopac_checked_renew_link' class='class_link'>Renew</a>
+ </td>
+ -->
+
+ <td align='center'><input type='checkbox' name='selectme'/></td>
+
+ </tr>
+ </tbody>
+ </table>
+
+ <div id='non_cat_circs_div' class='hide_me'>
+ <br/>
+ <div style='text-align: center'><b>&myopac.common.other.circ;</b></div>
+ <table class='data_grid' width='100%'>
+ <thead>
+ <tr>
+ <td>&myopac.checked.circ.lib;</td>
+ <td>&myopac.checked.item.type;</td>
+ <td>&myopac.checked.circ.time;</td>
+ </tr>
+ </thead>
+ <tbody id='non_cat_circs_tbody'>
+ <tr id='non_cat_circs_row'>
+ <td name='circ_lib'/>
+ <td name='item_type'/>
+ <td name='circ_time'/>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <div id='myopac_renew_success' class='hide_me'>&myopac.checked.renew.success;</div>
+
+ <span class='hide_me' id='myopac_renew_confirm'>&myopac.checked.renew.confirm;</span>
+
+ <span class='hide_me' id='myopac_renew_fail'>&myopac.checked.renew.fail;</span>
+
+ <span class='hide_me' id='myopac_renew_fail2'>&myopac.checked.renew.fail2;</span>
+
+</div>
+
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_fines.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_fines.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_fines.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,101 +1,101 @@
-
-<div id='myopac_fines_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
-
- <table width='100%' class='data_grid data_grid_center'>
-
- <thead class='color_3'>
- <tr><td colspan='3' style='padding: 6px'><b>&myopac.fines.title;</b></td></tr>
- <tr>
- <td width='33%'>&myopac.fines.owed;</td>
- <td width='33%'>&myopac.fines.paid;</td>
- <td width='33%'>&myopac.fines.balance;</td>
- </tr>
- </thead>
-
- <tbody id='myopac_fines_summary_tbody'>
- <tr id='myopac_fines_summary_loading'><td>&myopac.fines.status;</td></tr>
- <tr id='myopac_fines_summary_row' class='hide_me'>
- <td id='myopac_fines_summary_total' >&common.currency;</td>
- <td id='myopac_fines_summary_paid' >&common.currency;</td>
- <td id='myopac_fines_summary_balance' style='color:red;font-weight: bold;'>&common.currency;</td>
- </tr>
- </tbody>
- </table>
-
- <!--
- <div id='accrue_explanation' class='hide_me'>
- <span>Transactions whose balances are marked with a</span>
- <span style='color:red; font-weight: bold'>*</span>
- <span>will continue to accrue fines until the checked out item is returned.</span>
- </div>
- -->
-
-
- <!-- Table for circulation transactions only -->
- <div id='myopac_circ_trans_div' class='hide_me'>
- <br/><hr/><br/>
- <table width='100%' class='data_grid data_grid_center' id='myopac_circ_trans_table'>
- <thead>
- <tr><td colspan='10' style='padding: 6px'><b>&myopac.fines.overdue;</b></td></tr>
- <tr>
- <td>&common.title;</td>
- <td>&common.author;</td>
- <td>&myopac.fines.checkout;</td>
- <td>&myopac.fines.due;</td>
- <td>&myopac.fines.returned;</td>
- <td>&myopac.fines.balance;</td>
- </tr>
- </thead>
- <tbody id='myopac_circ_trans_tbody'>
- <tr id='myopac_circ_trans_row'>
- <td><a class='classic_link' name='myopac_circ_trans_title'> </a></td>
- <td name='myopac_circ_trans_author'> </td>
- <td name='myopac_circ_trans_start'> </td>
- <td name='myopac_circ_trans_due'> </td>
- <td name='myopac_circ_trans_finished'><span style='color:red;'>&myopac.fines.accruing;</span></td>
- <td>
- <span style='color: red; font-weight: bold;'
- name='myopac_circ_trans_balance'>&common.currency;</span>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
-
- <!-- Table for all non-circulation transactions -->
- <div id='myopac_trans_div' class='hide_me'>
- <br/><hr/><br/>
- <table width='100%' class='data_grid data_grid_center' id='myopac_trans_table'>
- <thead>
- <tr><td colspan='8' style='padding: 6px'><b>&myopac.fines.other;</b></td></tr>
- <tr>
- <td width='12%'>&myopac.fines.time.start;</td>
- <td width='12%'>&myopac.fines.time.paid;</td>
- <td width='12%'>&myopac.fines.owed.initial;</td>
- <td width='12%'>&myopac.fines.paid.amount;</td>
- <td width='12%'>&myopac.fines.balance;</td>
- <td width='12%'>&myopac.fines.type;</td>
- </tr>
- </thead>
-
- <tbody id='myopac_trans_tbody'>
- <tr id='myopac_trans_row'>
- <td name='myopac_trans_start'> </td>
- <td name='myopac_trans_last_payment'> </td>
- <td name='myopac_trans_init_amount'>&common.currency;</td>
- <td name='myopac_trans_total_paid'>&common.currency;</td>
- <td style='color:red; font-weight: bold;'>
- <span name='myopac_trans_balance_recur' class='hide_me'> * </span>
- <span name='myopac_trans_balance'>&common.currency;</span>
- </td>
- <td name='myopac_trans_bill_type'> </td>
- </tr>
- </tbody>
- </table>
- </div>
-
- <br/>
-
-</div>
-
-
+
+<div id='myopac_fines_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
+
+ <table width='100%' class='data_grid data_grid_center'>
+
+ <thead class='color_3'>
+ <tr><td colspan='3' style='padding: 6px'><b>&myopac.fines.title;</b></td></tr>
+ <tr>
+ <td width='33%'>&myopac.fines.owed;</td>
+ <td width='33%'>&myopac.fines.paid;</td>
+ <td width='33%'>&myopac.fines.balance;</td>
+ </tr>
+ </thead>
+
+ <tbody id='myopac_fines_summary_tbody'>
+ <tr id='myopac_fines_summary_loading'><td>&myopac.fines.status;</td></tr>
+ <tr id='myopac_fines_summary_row' class='hide_me'>
+ <td id='myopac_fines_summary_total' >&common.currency;</td>
+ <td id='myopac_fines_summary_paid' >&common.currency;</td>
+ <td id='myopac_fines_summary_balance' style='color:red;font-weight: bold;'>&common.currency;</td>
+ </tr>
+ </tbody>
+ </table>
+
+ <!--
+ <div id='accrue_explanation' class='hide_me'>
+ <span>Transactions whose balances are marked with a</span>
+ <span style='color:red; font-weight: bold'>*</span>
+ <span>will continue to accrue fines until the checked out item is returned.</span>
+ </div>
+ -->
+
+
+ <!-- Table for circulation transactions only -->
+ <div id='myopac_circ_trans_div' class='hide_me'>
+ <br/><hr/><br/>
+ <table width='100%' class='data_grid data_grid_center' id='myopac_circ_trans_table'>
+ <thead>
+ <tr><td colspan='10' style='padding: 6px'><b>&myopac.fines.overdue;</b></td></tr>
+ <tr>
+ <td>&common.title;</td>
+ <td>&common.author;</td>
+ <td>&myopac.fines.checkout;</td>
+ <td>&myopac.fines.due;</td>
+ <td>&myopac.fines.returned;</td>
+ <td>&myopac.fines.balance;</td>
+ </tr>
+ </thead>
+ <tbody id='myopac_circ_trans_tbody'>
+ <tr id='myopac_circ_trans_row'>
+ <td><a class='classic_link' name='myopac_circ_trans_title'> </a></td>
+ <td name='myopac_circ_trans_author'> </td>
+ <td name='myopac_circ_trans_start'> </td>
+ <td name='myopac_circ_trans_due'> </td>
+ <td name='myopac_circ_trans_finished'><span style='color:red;'>&myopac.fines.accruing;</span></td>
+ <td>
+ <span style='color: red; font-weight: bold;'
+ name='myopac_circ_trans_balance'>&common.currency;</span>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <!-- Table for all non-circulation transactions -->
+ <div id='myopac_trans_div' class='hide_me'>
+ <br/><hr/><br/>
+ <table width='100%' class='data_grid data_grid_center' id='myopac_trans_table'>
+ <thead>
+ <tr><td colspan='8' style='padding: 6px'><b>&myopac.fines.other;</b></td></tr>
+ <tr>
+ <td width='12%'>&myopac.fines.time.start;</td>
+ <td width='12%'>&myopac.fines.time.paid;</td>
+ <td width='12%'>&myopac.fines.owed.initial;</td>
+ <td width='12%'>&myopac.fines.paid.amount;</td>
+ <td width='12%'>&myopac.fines.balance;</td>
+ <td width='12%'>&myopac.fines.type;</td>
+ </tr>
+ </thead>
+
+ <tbody id='myopac_trans_tbody'>
+ <tr id='myopac_trans_row'>
+ <td name='myopac_trans_start'> </td>
+ <td name='myopac_trans_last_payment'> </td>
+ <td name='myopac_trans_init_amount'>&common.currency;</td>
+ <td name='myopac_trans_total_paid'>&common.currency;</td>
+ <td style='color:red; font-weight: bold;'>
+ <span name='myopac_trans_balance_recur' class='hide_me'> * </span>
+ <span name='myopac_trans_balance'>&common.currency;</span>
+ </td>
+ <td name='myopac_trans_bill_type'> </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <br/>
+
+</div>
+
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_holds.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_holds.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_holds.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,122 +1,122 @@
-
-<div id='myopac_holds_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
-
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/holds.js'> </script>
-
- <table width='100%'>
- <tbody><tr><td width='100%' align='right'>
- <select id='myopac_holds_actions' onchange='myopacDoHoldAction();'>
- <option id='myopac_holds_actions_none' value=''>-- &myopac.holds.actions; --</option>
- <option value='freeze'>&myopac.holds.freeze_selected;</option>
- <option value='thaw'>&myopac.holds.thaw_selected;</option>
- <option value='thaw_date'>&myopac.holds.thaw_date_selected;</option>
- <option value='cancel'>&myopac.holds.cancel_selected;</option>
- </select>
- </td></tr></tbody>
- <script language='javascript' type='text/javascript'>$('myopac_holds_actions_none').selected = true;</script>
- </table>
-
- <span id='myopac.holds.cancel.confirm' class='hide_me'>&myopac.holds.cancel.confirm;</span>
- <span id='myopac.holds.freeze.confirm' class='hide_me'>&myopac.holds.freeze.confirm;</span>
- <span id='myopac.holds.thaw.confirm' class='hide_me'>&myopac.holds.thaw.confirm;</span>
- <span id='myopac.holds.thaw_date.confirm' class='hide_me'>&myopac.holds.thaw_date.confirm;</span>
- <span id='myopac.holds.freeze.select_thaw' class='hide_me'>&myopac.holds.freeze.select_thaw;</span>
-
- <table width='100%' id='myopac_holds_processing' class='hide_me'>
- <tr><td>&myopac.holds.processing;</td></tr>
- </table>
-
- <div id='myopac_holds_thaw_date_form' class='hide_me'>
- <div id='myopac_holds_freeze_select_thaw'>&myopac.holds.freeze.select_thaw;</div>
- <p>
- <input dojoType="dijit.form.DateTextBox" size='10' maxlength='10' type='text' id='myopac_holds_thaw_date_input' />
- </p>
- <p>
- <button onclick='myopacApplyThawDate();'>&common.submit;</button>
- </p>
- </div>
-
- <table width='100%' class='light_border data_grid data_grid_center' id='myopac_holds_main_table'>
-
- <thead class='color_3'>
- <tr>
- <td width=''>&common.title;</td>
- <td width=''>&common.author;</td>
- <td>&myopac.holds.formats;</td>
- <td>&myopac.holds.location;</td>
- <td>&common.status;</td>
- <td class='hide_me' id='myopac_holds_estimated_wait_column'>&myopac.holds.estimated_wait;</td>
- <td>&myopac.holds.unfrozen;</td>
- <td>&myopac.holds.frozen.until;</td>
- <td>&opac.holds.expire_time;</td>
- <td width=''>&common.select;
- (<a id='myopac_select_all_holds' onclick='myopacSelectAllHolds();'
- class='classic_link' href='javascript:void(0);'>&common.all;</a>/<a id='myopac_select_none_holds'
- onclick='myopacSelectNoneHolds();' class='classic_link' href='javascript:void(0);'>&common.none;</a>)
- </td>
-
- <td>&myopac.holds.edit;</td>
- </tr>
- </thead>
-
- <tbody id='myopac_holds_tbody'>
-
- <tr id='myopac_holds_none' class='hide_me'>
- <td colspan='10'><b>&myopac.holds.status.none;</b></td>
- </tr>
- <tr id='myopac_holds_loading'><td>&myopac.loading;</td></tr>
-
- <tr id='myopac_holds_row' class='hide_me'>
-
- <td name='myopac_holds_title'>
- <a href='javascript:void(0);' name='myopac_holds_title_link'> </a>
- <div name='vol_copy' style='border: 1px solid #808080; width:98%; margin-top: 2px;' class='hide_me'>
- <div style='font-size: 90%' name='volume'/>
- <div style='font-size: 90%' name='copy'/>
- </div>
- </td>
-
- <td name='myopac_holds_author'>
- <a href='javascript:void(0);' name='myopac_holds_author_link'> </a>
- </td>
-
- <td name='myopac_holds_formats'> </td>
-
- <td name='myopac_holds_location'></td>
- <td>
- <span class='hide_me' name='hold_status_waiting'>&myopac.holds.status.waiting;</span>
- <span class='hide_me' name='hold_status_transit'>&myopac.holds.status.intransit;</span>
- <span class='hide_me' name='hold_status_available'><b style='color:red'>&myopac.holds.status.available;</b></span>
- <span class='hide_me' name='hold_qstats'></span>
- </td>
- <td class='hide_me' name='myopac_holds_estimated_wait'/>
-
- <td>
- <!-- These characaters do not display in Internet Exploror, *sigh*
- <span name='myopac_hold_unfrozen_false' class='x_mark'>✗</span>
- <span name='myopac_hold_unfrozen_true' class='hide_me check_mark'>✓</span>
- -->
- <span name='myopac_hold_unfrozen_false' class='x_mark'>&common.no;</span>
- <span name='myopac_hold_unfrozen_true' class='hide_me check_mark'>&common.yes;</span>
- </td>
-
-
- <td name='myopac_holds_frozen_until'></td>
- <td name='myopac_hold_expire_time'></td>
- <td><input type='checkbox' name='myopac_holds_selected_chkbx'/></td>
-
- <td name='myopac_holds_cancel' style='border-left: 3px solid #E0E0E0; border-right: 3px solid #E0E0E0;'>
- <a href='javascript:void(0);'
- name='myopac_holds_edit_link' class='classic_link'>&myopac.holds.edit;</a>
- </td>
- </tr>
- </tbody>
- </table>
-
- <span class='hide_me' id='myopac_holds_cancel_verify'>
- &myopac.holds.verify;
- </span>
-
-</div>
-
-
+
+<div id='myopac_holds_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
+
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/holds.js'> </script>
+
+ <table width='100%'>
+ <tbody><tr><td width='100%' align='right'>
+ <select id='myopac_holds_actions' onchange='myopacDoHoldAction();'>
+ <option id='myopac_holds_actions_none' value=''>-- &myopac.holds.actions; --</option>
+ <option value='freeze'>&myopac.holds.freeze_selected;</option>
+ <option value='thaw'>&myopac.holds.thaw_selected;</option>
+ <option value='thaw_date'>&myopac.holds.thaw_date_selected;</option>
+ <option value='cancel'>&myopac.holds.cancel_selected;</option>
+ </select>
+ </td></tr></tbody>
+ <script language='javascript' type='text/javascript'>$('myopac_holds_actions_none').selected = true;</script>
+ </table>
+
+ <span id='myopac.holds.cancel.confirm' class='hide_me'>&myopac.holds.cancel.confirm;</span>
+ <span id='myopac.holds.freeze.confirm' class='hide_me'>&myopac.holds.freeze.confirm;</span>
+ <span id='myopac.holds.thaw.confirm' class='hide_me'>&myopac.holds.thaw.confirm;</span>
+ <span id='myopac.holds.thaw_date.confirm' class='hide_me'>&myopac.holds.thaw_date.confirm;</span>
+ <span id='myopac.holds.freeze.select_thaw' class='hide_me'>&myopac.holds.freeze.select_thaw;</span>
+
+ <table width='100%' id='myopac_holds_processing' class='hide_me'>
+ <tr><td>&myopac.holds.processing;</td></tr>
+ </table>
+
+ <div id='myopac_holds_thaw_date_form' class='hide_me'>
+ <div id='myopac_holds_freeze_select_thaw'>&myopac.holds.freeze.select_thaw;</div>
+ <p>
+ <input dojoType="dijit.form.DateTextBox" size='10' maxlength='10' type='text' id='myopac_holds_thaw_date_input' />
+ </p>
+ <p>
+ <button onclick='myopacApplyThawDate();'>&common.submit;</button>
+ </p>
+ </div>
+
+ <table width='100%' class='light_border data_grid data_grid_center' id='myopac_holds_main_table'>
+
+ <thead class='color_3'>
+ <tr>
+ <td width=''>&common.title;</td>
+ <td width=''>&common.author;</td>
+ <td>&myopac.holds.formats;</td>
+ <td>&myopac.holds.location;</td>
+ <td>&common.status;</td>
+ <td class='hide_me' id='myopac_holds_estimated_wait_column'>&myopac.holds.estimated_wait;</td>
+ <td>&myopac.holds.unfrozen;</td>
+ <td>&myopac.holds.frozen.until;</td>
+ <td>&opac.holds.expire_time;</td>
+ <td width=''>&common.select;
+ (<a id='myopac_select_all_holds' onclick='myopacSelectAllHolds();'
+ class='classic_link' href='javascript:void(0);'>&common.all;</a>/<a id='myopac_select_none_holds'
+ onclick='myopacSelectNoneHolds();' class='classic_link' href='javascript:void(0);'>&common.none;</a>)
+ </td>
+
+ <td>&myopac.holds.edit;</td>
+ </tr>
+ </thead>
+
+ <tbody id='myopac_holds_tbody'>
+
+ <tr id='myopac_holds_none' class='hide_me'>
+ <td colspan='10'><b>&myopac.holds.status.none;</b></td>
+ </tr>
+ <tr id='myopac_holds_loading'><td>&myopac.loading;</td></tr>
+
+ <tr id='myopac_holds_row' class='hide_me'>
+
+ <td name='myopac_holds_title'>
+ <a href='javascript:void(0);' name='myopac_holds_title_link'> </a>
+ <div name='vol_copy' style='border: 1px solid #808080; width:98%; margin-top: 2px;' class='hide_me'>
+ <div style='font-size: 90%' name='volume'/>
+ <div style='font-size: 90%' name='copy'/>
+ </div>
+ </td>
+
+ <td name='myopac_holds_author'>
+ <a href='javascript:void(0);' name='myopac_holds_author_link'> </a>
+ </td>
+
+ <td name='myopac_holds_formats'> </td>
+
+ <td name='myopac_holds_location'></td>
+ <td>
+ <span class='hide_me' name='hold_status_waiting'>&myopac.holds.status.waiting;</span>
+ <span class='hide_me' name='hold_status_transit'>&myopac.holds.status.intransit;</span>
+ <span class='hide_me' name='hold_status_available'><b style='color:red'>&myopac.holds.status.available;</b></span>
+ <span class='hide_me' name='hold_qstats'></span>
+ </td>
+ <td class='hide_me' name='myopac_holds_estimated_wait'/>
+
+ <td>
+ <!-- These characaters do not display in Internet Exploror, *sigh*
+ <span name='myopac_hold_unfrozen_false' class='x_mark'>✗</span>
+ <span name='myopac_hold_unfrozen_true' class='hide_me check_mark'>✓</span>
+ -->
+ <span name='myopac_hold_unfrozen_false' class='x_mark'>&common.no;</span>
+ <span name='myopac_hold_unfrozen_true' class='hide_me check_mark'>&common.yes;</span>
+ </td>
+
+
+ <td name='myopac_holds_frozen_until'></td>
+ <td name='myopac_hold_expire_time'></td>
+ <td><input type='checkbox' name='myopac_holds_selected_chkbx'/></td>
+
+ <td name='myopac_holds_cancel' style='border-left: 3px solid #E0E0E0; border-right: 3px solid #E0E0E0;'>
+ <a href='javascript:void(0);'
+ name='myopac_holds_edit_link' class='classic_link'>&myopac.holds.edit;</a>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <span class='hide_me' id='myopac_holds_cancel_verify'>
+ &myopac.holds.verify;
+ </span>
+
+</div>
+
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_prefs.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_prefs.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_prefs.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,105 +1,105 @@
-
-<div id='myopac_prefs_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
-
- <table width='100%' class='data_grid'>
-
- <thead>
- <tr>
- <td colspan='2' align='center'>
- <b>&myopac.prefs.title;</b>
- </td>
- </tr>
- </thead>
-
- <tbody id='myopac_prefs_tbody'>
- <tr id='myopac_prefs_loading'><td colspan='3'><b>&myopac.loading;</b></td></tr>
- <tr id='myopac_prefs_row'>
- <td width='50%'>&myopac.prefs.hits;</td>
- <td>
- <select id='prefs_hits_per'>
- <option value='5'>5</option>
- <option value='8'>8</option>
- <option value='10'>10</option>
- <option value='15'>15</option>
- <option value='20'>20</option>
- <option value='25'>25</option>
- <option value='50'>50</option>
- </select>
- </td>
- </tr>
-
- <!-- FONT size preference -->
- <tr>
- <td>&myopac.prefs.font;</td>
- <td>
- <select id='prefs_def_font'>
- <option value='regular'>&myopac.prefs.font.regular;</option>
- <option value='large'>&myopac.prefs.font.large;</option>
- </select>
- </td>
- </tr>
-
- <!-- default hold notification type -->
- <tr>
- <td>
- <span>&myopac.prefs.holds.notify;</span>
- <a class='classic_link' href='javascript:void(0);'
- onclick='alert($("myopac_pref_hold_notify_alert").textContent);' >&common.help;</a>
- </td>
- <td>
- <select id='prefs_hold_notify'>
- <option value='phone:email' selected='selected'>&myopac.prefs.holds.both;</option>
- <option value='phone'>&myopac.prefs.holds.phone;</option>
- <option value='email'>&myopac.prefs.holds.email;</option>
- </select>
- </td>
- </tr>
-
-
- <tr>
- <td>&myopac.prefs.search.location;</td>
- <td>
- <div style='margin-bottom: 5px;'>
- <input type='checkbox' id='myopac_pref_home_lib'
- onclick='
- if( this.checked ) $("prefs_def_location").disabled = true;
- else $("prefs_def_location").disabled = false;
- ' /> &myopac.prefs.search.home;
- </div>
- <select id='prefs_def_location'>
- </select>
- </td>
- </tr>
-
- <tr>
- <td>&myopac.prefs.search.range;</td>
- <td>
- <select id='prefs_def_range'>
- </select>
- </td>
- </tr>
-
-
-
- <!-- Save the preferences -->
- <tr><td colspan='2'><br/></td></tr>
-
- <tr>
- <td align='center' class='color_3' colspan='2'>
- <button onclick='myOPACSavePrefs();'
- id='myopac_prefs_submit'>&myopac.prefs.save;</button>
- </td>
- </tr>
-
- </tbody>
- </table>
-
- <div class='hide_me' id='prefs_update_success'>&myopac.prefs.save.success;</div>
- <div class='hide_me' id='prefs_update_failure'>&myopac.prefs.save.failed;</div>
- <span class='hide_me' id='myopac_pref_hold_notify_alert'>
- &myopac.prefs.help;
- </span>
-
-</div>
-
-
+
+<div id='myopac_prefs_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
+
+ <table width='100%' class='data_grid'>
+
+ <thead>
+ <tr>
+ <td colspan='2' align='center'>
+ <b>&myopac.prefs.title;</b>
+ </td>
+ </tr>
+ </thead>
+
+ <tbody id='myopac_prefs_tbody'>
+ <tr id='myopac_prefs_loading'><td colspan='3'><b>&myopac.loading;</b></td></tr>
+ <tr id='myopac_prefs_row'>
+ <td width='50%'>&myopac.prefs.hits;</td>
+ <td>
+ <select id='prefs_hits_per'>
+ <option value='5'>5</option>
+ <option value='8'>8</option>
+ <option value='10'>10</option>
+ <option value='15'>15</option>
+ <option value='20'>20</option>
+ <option value='25'>25</option>
+ <option value='50'>50</option>
+ </select>
+ </td>
+ </tr>
+
+ <!-- FONT size preference -->
+ <tr>
+ <td>&myopac.prefs.font;</td>
+ <td>
+ <select id='prefs_def_font'>
+ <option value='regular'>&myopac.prefs.font.regular;</option>
+ <option value='large'>&myopac.prefs.font.large;</option>
+ </select>
+ </td>
+ </tr>
+
+ <!-- default hold notification type -->
+ <tr>
+ <td>
+ <span>&myopac.prefs.holds.notify;</span>
+ <a class='classic_link' href='javascript:void(0);'
+ onclick='alert($("myopac_pref_hold_notify_alert").textContent);' >&common.help;</a>
+ </td>
+ <td>
+ <select id='prefs_hold_notify'>
+ <option value='phone:email' selected='selected'>&myopac.prefs.holds.both;</option>
+ <option value='phone'>&myopac.prefs.holds.phone;</option>
+ <option value='email'>&myopac.prefs.holds.email;</option>
+ </select>
+ </td>
+ </tr>
+
+
+ <tr id='prefs_def_location_row'>
+ <td>&myopac.prefs.search.location;</td>
+ <td>
+ <div style='margin-bottom: 5px;'>
+ <input type='checkbox' id='myopac_pref_home_lib'
+ onclick='
+ if( this.checked ) $("prefs_def_location").disabled = true;
+ else $("prefs_def_location").disabled = false;
+ ' /> &myopac.prefs.search.home;
+ </div>
+ <select id='prefs_def_location'>
+ </select>
+ </td>
+ </tr>
+
+ <tr id='prefs_def_range_row'>
+ <td>&myopac.prefs.search.range;</td>
+ <td>
+ <select id='prefs_def_range'>
+ </select>
+ </td>
+ </tr>
+
+
+
+ <!-- Save the preferences -->
+ <tr><td colspan='2'><br/></td></tr>
+
+ <tr>
+ <td align='center' class='color_3' colspan='2'>
+ <button onclick='myOPACSavePrefs();'
+ id='myopac_prefs_submit'>&myopac.prefs.save;</button>
+ </td>
+ </tr>
+
+ </tbody>
+ </table>
+
+ <div class='hide_me' id='prefs_update_success'>&myopac.prefs.save.success;</div>
+ <div class='hide_me' id='prefs_update_failure'>&myopac.prefs.save.failed;</div>
+ <span class='hide_me' id='myopac_pref_hold_notify_alert'>
+ &myopac.prefs.help;
+ </span>
+
+</div>
+
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_summary.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_summary.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/myopac/myopac_summary.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,286 +1,286 @@
-
-<div id='myopac_summary_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
-
-
- <div id='myopac.expired.alert' class='hide_me' style='margin-bottom: 20px;'>
- <table class='data_grid' width='100%'>
- <tbody>
- <tr>
- <td width='100%' style='color:red;'>
- &myopac.summary.expired;
- </td>
- </tr>
- </tbody>
- </table>
- </div>
-
- <div id='myopac.notes.div' class='hide_me'>
- <table class='data_grid' width='100%'>
- <thead>
- <tr>
- <td colspan='2'><b> &myopac.summary.notes;</b></td>
- </tr>
- </thead>
- <tbody id='myopac.notes.tbody'>
- <tr id='myopac.notes.tr'>
- <td>
- <b name='title'/> : <span name='value'/>
- </td>
- </tr>
- </tbody>
- </table>
- <br/>
- </div>
-
- <table width='70%' class='light_border myopac_summary_table'>
- <tbody id='myopac_summary_tbody'>
- <tr>
- <td width='30%' class='color_4 light_border'>&common.name;</td>
- <td class='light_border'>
- <span id='myopac_summary_prefix' style='padding-right: 5px;'> </span>
- <span id='myopac_summary_first' style='padding-right: 5px;'> </span>
- <span id='myopac_summary_middle' style='padding-right: 5px;'> </span>
- <span id='myopac_summary_last' style='padding-right: 5px;'> </span>
- <span id='myopac_summary_suffix'> </span>
- </td>
- </tr>
-
- <tr>
- <td class='color_4 light_border'>&myopac.summary.phone.day;</td>
- <td class='light_border' id='myopac_summary_dayphone'> </td>
- </tr>
- <tr>
- <td class='color_4 light_border'>&myopac.summary.phone.evening;</td>
- <td class='light_border' id='myopac_summary_eveningphone'> </td>
- </tr>
- <tr>
- <td class='color_4 light_border'>&myopac.summary.phone.other;</td>
- <td class='light_border' id='myopac_summary_otherphone'> </td>
- </tr>
- <tr>
- <td class='color_4 light_border'>&common.username;</td>
- <td class='light_border' id='myopac_summary_username'> </td>
- <td class='light_border'><a href='javascript:void(0);'
- onclick='unHideMe($("myopac_update_username_row"));$("myopac_new_username").focus();'
- id='myopac_summary_username_change' style='text-decoration: underline;'>&myopac.summary.change;</a></td>
- </tr>
-
- <tr id='myopac_update_username_row' class='hide_me'>
- <td class='myopac_update_cell' colspan='3'>
- <span class='myopac_update_span'>&myopac.summary.username.enter; </span>
- <input type='text' size='24' id='myopac_new_username'
- onkeydown='if(userPressedEnter(event)) myOPACUpdateUsername();' />
- <span class='myopac_update_span'>
- <button onclick='myOPACUpdateUsername();'>&common.submit;</button>
- </span>
- <span class='myopac_update_span'>
- <button onclick='hideMe($("myopac_update_username_row"));'>&common.cancel;</button>
- </span>
- </td>
- </tr>
-
-
- <tr>
- <td class='color_4 light_border'>&common.password;</td>
- <td class='light_border' id='myopac_summary_password'>&myopac.summary.password.text;</td>
- <td class='light_border'><a href='javascript:void(0);'
- onclick='unHideMe($("myopac_update_password_row"));$("myopac_current_password").focus();'
- id='myopac_summary_password_change' style='text-decoration: underline;'>&myopac.summary.change;</a></td>
- </tr>
-
- <tr id='myopac_update_password_row' class='hide_me'>
- <td class='myopac_update_cell' colspan='3'>
-
- <table><tbody>
- <tr>
- <td><span class='myopac_update_span'>&myopac.summary.password.current; </span></td>
- <td><input type='password' size='24' id='myopac_current_password'
- onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();' /></td>
- </tr>
- <tr>
- <td><span class='myopac_update_span'>&myopac.summary.password.new; </span></td>
- <td><input type='password' size='24' id='myopac_new_password'
- onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();' /></td>
- </tr>
- <tr>
- <td><span class='myopac_update_span'>&myopac.summary.password.reenter; </span></td>
- <td><input type='password' size='24' id='myopac_new_password2'
- onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();' /></td>
- </tr>
- </tbody></table>
-
- <span class='myopac_update_span'>
- <button onclick='myOPACUpdatePassword();'>&common.submit;</button>
- </span>
- <span class='myopac_update_span'>
- <button onclick='hideMe($("myopac_update_password_row"));'>&common.cancel;</button>
- </span>
- </td>
- </tr>
-
- <tr>
- <td class='color_4 light_border'>&myopac.summary.email;</td>
- <td class='light_border' id='myopac_summary_email'> </td>
- <td class='light_border'><a href='javascript:void(0);'
- onclick='unHideMe($("myopac_update_email_row"));$("myopac_new_email").focus();'
- id='myopac_summary_email_change' style='text-decoration: underline;'>&myopac.summary.change;</a></td>
- </tr>
-
- <tr id='myopac_update_email_row' class='hide_me'>
- <td class='myopac_update_cell' colspan='3'>
- <span class='myopac_update_span'>&myopac.summary.email.new; </span>
- <input type='text' size='24' id='myopac_new_email'
- onkeydown='if(userPressedEnter(event)) myOPACUpdateEmail();' />
- <span class='myopac_update_span'>
- <button onclick='myOPACUpdateEmail();'>&common.submit;</button>
- </span>
- <span class='myopac_update_span'>
- <button onclick='hideMe($("myopac_update_email_row"));'>&common.cancel;</button>
- </span>
- </td>
- </tr>
-
- <tr>
- <td class='color_4 light_border'>&myopac.summary.id.primary;</td>
- <td class='light_border' id='myopac_summary_ident1'> </td>
- </tr>
- <!--
- <tr>
- <td class='color_4 light_border'>Secondary Identification</td>
- <td class='light_border' id='myopac_summary_ident2'> </td>
- </tr>
- -->
- <tr>
- <td class='color_4 light_border'>&myopac.summary.barcode;</td>
- <td class='light_border' id='myopac_summary_barcode'> </td>
- </tr>
- <tr>
- <td class='color_4 light_border'>&myopac.summary.home;</td>
- <td class='light_border' id='myopac_summary_homelib'> </td>
- </tr>
- <tr>
- <td class='color_4 light_border'>&myopac.summary.genesis;</td>
- <td class='light_border' id='myopac_summary_create_date'> </td>
- </tr>
-
- </tbody>
- </table>
-
-
- <br/><hr/><br/>
-
- <table width='100%' class='light_border data_grid'>
- <thead>
- <tr>
- <td>&myopac.summary.addresses;</td>
- <td id='myopac_pending_addr_td' class='hide_me'>&myopac.summary.addresses.pending;</td>
- </tr>
- </thead>
- <tbody id='myopac_addr_tbody'>
- <tr id='myopac_addr_row' class='light_border'>
- <td>
- <table>
- <tr>
- <td>&myopac.summary.address.type;</td>
- <td name='myopac_addr_type'> </td>
- </tr>
- <tr>
- <td>&myopac.summary.address.street;</td>
- <td name='myopac_addr_street'> </td>
- </tr>
- <tr>
- <td>&myopac.summary.address.street;</td>
- <td name='myopac_addr_street2'> </td>
- </tr>
- <tr>
- <td>&myopac.summary.address.city;</td>
- <td name='myopac_addr_city'> </td>
- </tr>
- <tr>
- <td>&myopac.summary.address.county;</td>
- <td name='myopac_addr_county'> </td>
- </tr>
- <tr>
- <td>&myopac.summary.address.state;</td>
- <td name='myopac_addr_state'> </td>
- </tr>
- <tr>
- <td>&myopac.summary.address.country;</td>
- <td name='myopac_addr_country'> </td>
- </tr>
- <tr>
- <td>&myopac.summary.address.zip;</td>
- <td name='myopac_addr_zip'> </td>
- </tr>
- <tr>
- <td name='myopac_addr_edit_td' colspan='2' class='hide_me'>
- <a class='classic_link' name='myopac_addr_edit_link' href='javascript:void(0);'>Edit Address</a>
- </td>
- </tr>
- </table>
- </td>
- <td class='hide_me' name='myopac_pending_addr_td'>
- <table>
- <tr>
- <td>&myopac.summary.address.type;</td>
- <td><input name='myopac_pending_addr_type'/> </td>
- </tr>
- <tr>
- <td>&myopac.summary.address.street;</td>
- <td><input name='myopac_pending_addr_street'/> </td>
- </tr>
- <tr>
- <td>&myopac.summary.address.street;</td>
- <td><input name='myopac_pending_addr_street2'/> </td>
- </tr>
- <tr>
- <td>&myopac.summary.address.city;</td>
- <td><input name='myopac_pending_addr_city'/> </td>
- </tr>
- <tr>
- <td>&myopac.summary.address.county;</td>
- <td><input name='myopac_pending_addr_county'/> </td>
- </tr>
- <tr>
- <td>&myopac.summary.address.state;</td>
- <td><input name='myopac_pending_addr_state'/> </td>
- </tr>
- <tr>
- <td>&myopac.summary.address.country;</td>
- <td><input name='myopac_pending_addr_country'/> </td>
- </tr>
- <tr>
- <td>&myopac.summary.address.zip;</td>
- <td><input name='myopac_pending_addr_zip'/> </td>
- </tr>
- <tr>
- <td name='myopac_addr_edit_td' colspan='2'>
- <a class='classic_link' name='myopac_pending_addr_edit_link' href='javascript:void(0);'>Save Changes</a>
- <a style='padding-left:10px;' class='classic_link' name='myopac_pending_addr_del_link' href='javascript:void(0);'>Discard Pending Address</a>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </tbody>
- </table>
-
- <div class='hide_me' id='myopac_username_error'>&myopac.summary.username.error;</div>
- <div class='hide_me' id='myopac_username_dup'>
- &myopac.summary.username.dup;
- </div>
- <div class='hide_me' id='myopac_username_success'>&myopac.summary.username.success;</div>
- <div class='hide_me' id='myopac_username_failure'>&myopac.summary.username.failure;</div>
-
- <div class='hide_me' id='myopac_email_error'>&myopac.summary.email.error;</div>
- <div class='hide_me' id='myopac_email_success'>&myopac.summary.email.success;</div>
- <div class='hide_me' id='myopac_email_failure'>&myopac.summary.email.failed;</div>
-
- <div class='hide_me' id='myopac_password_error'>&myopac.summary.password.error;</div>
- <div class='hide_me' id='myopac_password_success'>&myopac.summary.password.success;</div>
- <div class='hide_me' id='myopac_password_failure'>&myopac.summary.password.failure;</div>
- <span class='hide_me' id='myopac_invalid_username'>&myopac.summary.username.invalid;</span>
- <span class='hide_me' id='myopac_addr_changes_saved'>Address Saved</span>
-</div>
-
-
+
+<div id='myopac_summary_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
+
+
+ <div id='myopac.expired.alert' class='hide_me' style='margin-bottom: 20px;'>
+ <table class='data_grid' width='100%'>
+ <tbody>
+ <tr>
+ <td width='100%' style='color:red;'>
+ &myopac.summary.expired;
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+
+ <div id='myopac.notes.div' class='hide_me'>
+ <table class='data_grid' width='100%'>
+ <thead>
+ <tr>
+ <td colspan='2'><b> &myopac.summary.notes;</b></td>
+ </tr>
+ </thead>
+ <tbody id='myopac.notes.tbody'>
+ <tr id='myopac.notes.tr'>
+ <td>
+ <b name='title'/> : <span name='value'/>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <br/>
+ </div>
+
+ <table width='70%' class='light_border myopac_summary_table'>
+ <tbody id='myopac_summary_tbody'>
+ <tr>
+ <td width='30%' class='color_4 light_border'>&common.name;</td>
+ <td class='light_border'>
+ <span id='myopac_summary_prefix' style='padding-right: 5px;'> </span>
+ <span id='myopac_summary_first' style='padding-right: 5px;'> </span>
+ <span id='myopac_summary_middle' style='padding-right: 5px;'> </span>
+ <span id='myopac_summary_last' style='padding-right: 5px;'> </span>
+ <span id='myopac_summary_suffix'> </span>
+ </td>
+ </tr>
+
+ <tr>
+ <td class='color_4 light_border'>&myopac.summary.phone.day;</td>
+ <td class='light_border' id='myopac_summary_dayphone'> </td>
+ </tr>
+ <tr>
+ <td class='color_4 light_border'>&myopac.summary.phone.evening;</td>
+ <td class='light_border' id='myopac_summary_eveningphone'> </td>
+ </tr>
+ <tr>
+ <td class='color_4 light_border'>&myopac.summary.phone.other;</td>
+ <td class='light_border' id='myopac_summary_otherphone'> </td>
+ </tr>
+ <tr>
+ <td class='color_4 light_border'>&common.username;</td>
+ <td class='light_border' id='myopac_summary_username'> </td>
+ <td class='light_border'><a href='javascript:void(0);'
+ onclick='unHideMe($("myopac_update_username_row"));$("myopac_new_username").focus();'
+ id='myopac_summary_username_change' style='text-decoration: underline;'>&myopac.summary.change;</a></td>
+ </tr>
+
+ <tr id='myopac_update_username_row' class='hide_me'>
+ <td class='myopac_update_cell' colspan='3'>
+ <span class='myopac_update_span'>&myopac.summary.username.enter; </span>
+ <input type='text' size='24' id='myopac_new_username'
+ onkeydown='if(userPressedEnter(event)) myOPACUpdateUsername();' />
+ <span class='myopac_update_span'>
+ <button onclick='myOPACUpdateUsername();'>&common.submit;</button>
+ </span>
+ <span class='myopac_update_span'>
+ <button onclick='hideMe($("myopac_update_username_row"));'>&common.cancel;</button>
+ </span>
+ </td>
+ </tr>
+
+
+ <tr>
+ <td class='color_4 light_border'>&common.password;</td>
+ <td class='light_border' id='myopac_summary_password'>&myopac.summary.password.text;</td>
+ <td class='light_border'><a href='javascript:void(0);'
+ onclick='unHideMe($("myopac_update_password_row"));$("myopac_current_password").focus();'
+ id='myopac_summary_password_change' style='text-decoration: underline;'>&myopac.summary.change;</a></td>
+ </tr>
+
+ <tr id='myopac_update_password_row' class='hide_me'>
+ <td class='myopac_update_cell' colspan='3'>
+
+ <table><tbody>
+ <tr>
+ <td><span class='myopac_update_span'>&myopac.summary.password.current; </span></td>
+ <td><input type='password' size='24' id='myopac_current_password'
+ onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();' /></td>
+ </tr>
+ <tr>
+ <td><span class='myopac_update_span'>&myopac.summary.password.new; </span></td>
+ <td><input type='password' size='24' id='myopac_new_password'
+ onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();' /></td>
+ </tr>
+ <tr>
+ <td><span class='myopac_update_span'>&myopac.summary.password.reenter; </span></td>
+ <td><input type='password' size='24' id='myopac_new_password2'
+ onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();' /></td>
+ </tr>
+ </tbody></table>
+
+ <span class='myopac_update_span'>
+ <button onclick='myOPACUpdatePassword();'>&common.submit;</button>
+ </span>
+ <span class='myopac_update_span'>
+ <button onclick='hideMe($("myopac_update_password_row"));'>&common.cancel;</button>
+ </span>
+ </td>
+ </tr>
+
+ <tr>
+ <td class='color_4 light_border'>&myopac.summary.email;</td>
+ <td class='light_border' id='myopac_summary_email'> </td>
+ <td class='light_border'><a href='javascript:void(0);'
+ onclick='unHideMe($("myopac_update_email_row"));$("myopac_new_email").focus();'
+ id='myopac_summary_email_change' style='text-decoration: underline;'>&myopac.summary.change;</a></td>
+ </tr>
+
+ <tr id='myopac_update_email_row' class='hide_me'>
+ <td class='myopac_update_cell' colspan='3'>
+ <span class='myopac_update_span'>&myopac.summary.email.new; </span>
+ <input type='text' size='24' id='myopac_new_email'
+ onkeydown='if(userPressedEnter(event)) myOPACUpdateEmail();' />
+ <span class='myopac_update_span'>
+ <button onclick='myOPACUpdateEmail();'>&common.submit;</button>
+ </span>
+ <span class='myopac_update_span'>
+ <button onclick='hideMe($("myopac_update_email_row"));'>&common.cancel;</button>
+ </span>
+ </td>
+ </tr>
+
+ <tr>
+ <td class='color_4 light_border'>&myopac.summary.id.primary;</td>
+ <td class='light_border' id='myopac_summary_ident1'> </td>
+ </tr>
+ <!--
+ <tr>
+ <td class='color_4 light_border'>Secondary Identification</td>
+ <td class='light_border' id='myopac_summary_ident2'> </td>
+ </tr>
+ -->
+ <tr>
+ <td class='color_4 light_border'>&myopac.summary.barcode;</td>
+ <td class='light_border' id='myopac_summary_barcode'> </td>
+ </tr>
+ <tr>
+ <td class='color_4 light_border'>&myopac.summary.home;</td>
+ <td class='light_border' id='myopac_summary_homelib'> </td>
+ </tr>
+ <tr>
+ <td class='color_4 light_border'>&myopac.summary.genesis;</td>
+ <td class='light_border' id='myopac_summary_create_date'> </td>
+ </tr>
+
+ </tbody>
+ </table>
+
+
+ <br/><hr/><br/>
+
+ <table width='100%' class='light_border data_grid'>
+ <thead>
+ <tr>
+ <td>&myopac.summary.addresses;</td>
+ <td id='myopac_pending_addr_td' class='hide_me'>&myopac.summary.addresses.pending;</td>
+ </tr>
+ </thead>
+ <tbody id='myopac_addr_tbody'>
+ <tr id='myopac_addr_row' class='light_border'>
+ <td>
+ <table>
+ <tr>
+ <td>&myopac.summary.address.type;</td>
+ <td name='myopac_addr_type'> </td>
+ </tr>
+ <tr>
+ <td>&myopac.summary.address.street;</td>
+ <td name='myopac_addr_street'> </td>
+ </tr>
+ <tr>
+ <td>&myopac.summary.address.street;</td>
+ <td name='myopac_addr_street2'> </td>
+ </tr>
+ <tr>
+ <td>&myopac.summary.address.city;</td>
+ <td name='myopac_addr_city'> </td>
+ </tr>
+ <tr>
+ <td>&myopac.summary.address.county;</td>
+ <td name='myopac_addr_county'> </td>
+ </tr>
+ <tr>
+ <td>&myopac.summary.address.state;</td>
+ <td name='myopac_addr_state'> </td>
+ </tr>
+ <tr>
+ <td>&myopac.summary.address.country;</td>
+ <td name='myopac_addr_country'> </td>
+ </tr>
+ <tr>
+ <td>&myopac.summary.address.zip;</td>
+ <td name='myopac_addr_zip'> </td>
+ </tr>
+ <tr>
+ <td name='myopac_addr_edit_td' colspan='2' class='hide_me'>
+ <a class='classic_link' name='myopac_addr_edit_link' href='javascript:void(0);'>Edit Address</a>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td class='hide_me' name='myopac_pending_addr_td'>
+ <table>
+ <tr>
+ <td>&myopac.summary.address.type;</td>
+ <td><input name='myopac_pending_addr_type'/> </td>
+ </tr>
+ <tr>
+ <td>&myopac.summary.address.street;</td>
+ <td><input name='myopac_pending_addr_street'/> </td>
+ </tr>
+ <tr>
+ <td>&myopac.summary.address.street;</td>
+ <td><input name='myopac_pending_addr_street2'/> </td>
+ </tr>
+ <tr>
+ <td>&myopac.summary.address.city;</td>
+ <td><input name='myopac_pending_addr_city'/> </td>
+ </tr>
+ <tr>
+ <td>&myopac.summary.address.county;</td>
+ <td><input name='myopac_pending_addr_county'/> </td>
+ </tr>
+ <tr>
+ <td>&myopac.summary.address.state;</td>
+ <td><input name='myopac_pending_addr_state'/> </td>
+ </tr>
+ <tr>
+ <td>&myopac.summary.address.country;</td>
+ <td><input name='myopac_pending_addr_country'/> </td>
+ </tr>
+ <tr>
+ <td>&myopac.summary.address.zip;</td>
+ <td><input name='myopac_pending_addr_zip'/> </td>
+ </tr>
+ <tr>
+ <td name='myopac_addr_edit_td' colspan='2'>
+ <a class='classic_link' name='myopac_pending_addr_edit_link' href='javascript:void(0);'>Save Changes</a>
+ <a style='padding-left:10px;' class='classic_link' name='myopac_pending_addr_del_link' href='javascript:void(0);'>Discard Pending Address</a>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+ <div class='hide_me' id='myopac_username_error'>&myopac.summary.username.error;</div>
+ <div class='hide_me' id='myopac_username_dup'>
+ &myopac.summary.username.dup;
+ </div>
+ <div class='hide_me' id='myopac_username_success'>&myopac.summary.username.success;</div>
+ <div class='hide_me' id='myopac_username_failure'>&myopac.summary.username.failure;</div>
+
+ <div class='hide_me' id='myopac_email_error'>&myopac.summary.email.error;</div>
+ <div class='hide_me' id='myopac_email_success'>&myopac.summary.email.success;</div>
+ <div class='hide_me' id='myopac_email_failure'>&myopac.summary.email.failed;</div>
+
+ <div class='hide_me' id='myopac_password_error'>&myopac.summary.password.error;</div>
+ <div class='hide_me' id='myopac_password_success'>&myopac.summary.password.success;</div>
+ <div class='hide_me' id='myopac_password_failure'>&myopac.summary.password.failure;</div>
+ <span class='hide_me' id='myopac_invalid_username'>&myopac.summary.username.invalid;</span>
+ <span class='hide_me' id='myopac_addr_changes_saved'>Address Saved</span>
+</div>
+
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_advanced.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_advanced.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_advanced.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,14 +1,14 @@
-<div id='canvas_main' class='canvas' style='margin-top: 20px;'>
-
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/advanced.js'></script>
-
- <style type='text/css'>
- .advanced_div { text-align: center; margin: 8px; margin-left: 2px; width: 95%; padding: 5px; }
- </style>
-
- <div class='advanced_div'>
- <!--#include virtual="advanced/advanced_global.xml"-->
- </div>
-</div>
-
-
+<div id='canvas_main' class='canvas' style='margin-top: 20px;'>
+
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/advanced.js'></script>
+
+ <style type='text/css'>
+ .advanced_div { text-align: center; margin: 8px; margin-left: 2px; width: 95%; padding: 5px; }
+ </style>
+
+ <div class='advanced_div'>
+ <!--#include virtual="advanced/advanced_global.xml"-->
+ </div>
+</div>
+
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_cnbrowse.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_cnbrowse.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_cnbrowse.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,6 +1,6 @@
-<div id='canvas_main' class='canvas' style='margin-top: 20px;'>
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/cn_browse.js'></script>
- <!--#include virtual="common/cn_browse.xml"-->
-</div>
-
-
+<div id='canvas_main' class='canvas' style='margin-top: 20px;'>
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/cn_browse.js'></script>
+ <!--#include virtual="common/cn_browse.xml"-->
+</div>
+
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_mresult.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_mresult.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_mresult.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,9 +1,9 @@
-<div>
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/sidebar_extras.js'></script>
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/mresult.js'></script>
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/result_common.js'></script>
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/tips.js'></script>
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/holds.js'></script>
- <!--#include virtual="result/result_common.xml"-->
-</div>
-
+<div>
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/sidebar_extras.js'></script>
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/mresult.js'></script>
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/result_common.js'></script>
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/tips.js'></script>
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/holds.js'></script>
+ <!--#include virtual="result/result_common.xml"-->
+</div>
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_myopac.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_myopac.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_myopac.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,68 +1,68 @@
-<div id='canvas_main' class='canvas hide_me'>
-
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/myopac.js'></script>
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/DP_DateExtensions.js'></script>
-
- <script language='javascript' type='text/javascript'> config.ids.altcanvas.myopac_reload = 'myopac_reloading'; </script>
- <div id='myopac_reloading' class='hide_me canvas'> &common.loading; </div>
-
- <script language='javascript' type='text/javascript'>
- config.ids.myopac = {};
- config.css.myopac = {};
- config.names.myopac = {};
- </script>
-
- <br/>
- <table style='width: 98%; text-align: center;'>
- <tbody>
- <tr id='myopac_nav_row'>
-
- <td class='myopac_link border_6' id='myopac_summary_td' >
- <a href='javascript:void(0);'
- onclick='myOPACChangePage("summary");'>&myopac.account;</a>
- </td>
-
- <td class='myopac_link border_6' id='myopac_checked_td' >
- <a href='javascript:void(0);'
- onclick='myOPACChangePage("checked");'>&myopac.checkouts;</a>
- </td>
-
- <td class='myopac_link border_6' id='myopac_holds_td' >
- <a href='javascript:void(0);'
- onclick='myOPACChangePage("holds");'>&myopac.holds;</a>
- </td>
-
- <td class='myopac_link border_6' id='myopac_fines_td' >
- <a href='javascript:void(0);'
- onclick='myOPACChangePage("fines");'>&myopac.fines;</a>
- </td>
-
- <td class='myopac_link border_6' id='myopac_prefs_td' >
- <a href='javascript:void(0);'
- onclick='myOPACChangePage("prefs");'>&myopac.preferences;</a>
- </td>
-
- <td class='myopac_link border_6' id='myopac_bookbag_td' nowrap='nowrap'>
- <a href='javascript:void(0);'
- onclick='myOPACChangePage("bookbag");'>&myopac.bookbags;</a>
-
- </td>
-
- </tr>
- </tbody>
- </table>
-
- <br/>
-
- <div id='myopac_main_div'>
- <!--#include virtual="myopac/myopac_summary.xml"-->
- <!--#include virtual="myopac/myopac_checked.xml"-->
- <!--#include virtual="myopac/myopac_holds.xml"-->
- <!--#include virtual="myopac/myopac_fines.xml"-->
- <!--#include virtual="myopac/myopac_prefs.xml"-->
- <!--#include virtual="myopac/myopac_bookbags.xml"-->
- </div>
-
-</div>
-
-
+<div id='canvas_main' class='canvas hide_me'>
+
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/myopac.js'></script>
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/DP_DateExtensions.js'></script>
+
+ <script language='javascript' type='text/javascript'> config.ids.altcanvas.myopac_reload = 'myopac_reloading'; </script>
+ <div id='myopac_reloading' class='hide_me canvas'> &common.loading; </div>
+
+ <script language='javascript' type='text/javascript'>
+ config.ids.myopac = {};
+ config.css.myopac = {};
+ config.names.myopac = {};
+ </script>
+
+ <br/>
+ <table style='width: 98%; text-align: center;'>
+ <tbody>
+ <tr id='myopac_nav_row'>
+
+ <td class='myopac_link border_6' id='myopac_summary_td' >
+ <a href='javascript:void(0);'
+ onclick='myOPACChangePage("summary");'>&myopac.account;</a>
+ </td>
+
+ <td class='myopac_link border_6' id='myopac_checked_td' >
+ <a href='javascript:void(0);'
+ onclick='myOPACChangePage("checked");'>&myopac.checkouts;</a>
+ </td>
+
+ <td class='myopac_link border_6' id='myopac_holds_td' >
+ <a href='javascript:void(0);'
+ onclick='myOPACChangePage("holds");'>&myopac.holds;</a>
+ </td>
+
+ <td class='myopac_link border_6' id='myopac_fines_td' >
+ <a href='javascript:void(0);'
+ onclick='myOPACChangePage("fines");'>&myopac.fines;</a>
+ </td>
+
+ <td class='myopac_link border_6' id='myopac_prefs_td' >
+ <a href='javascript:void(0);'
+ onclick='myOPACChangePage("prefs");'>&myopac.preferences;</a>
+ </td>
+
+ <td class='myopac_link border_6' id='myopac_bookbag_td' nowrap='nowrap'>
+ <a href='javascript:void(0);'
+ onclick='myOPACChangePage("bookbag");'>&myopac.bookbags;</a>
+
+ </td>
+
+ </tr>
+ </tbody>
+ </table>
+
+ <br/>
+
+ <div id='myopac_main_div'>
+ <!--#include virtual="myopac/myopac_summary.xml"-->
+ <!--#include virtual="myopac/myopac_checked.xml"-->
+ <!--#include virtual="myopac/myopac_holds.xml"-->
+ <!--#include virtual="myopac/myopac_fines.xml"-->
+ <!--#include virtual="myopac/myopac_prefs.xml"-->
+ <!--#include virtual="myopac/myopac_bookbags.xml"-->
+ </div>
+
+</div>
+
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_rdetail.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_rdetail.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_rdetail.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -7,11 +7,6 @@
<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/holds.js'></script>
<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/cn_browse.js'></script>
<script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/container.js'></script>
- <script language='javascript' type='text/javascript' src='../js/rdetail_custom.js'></script>
- <script language='javascript' type='text/javascript' src='../js/xregexp.js'></script>
- <script language='javascript' type='text/javascript' src='../js/check_sfx.js'></script>
- <script src='http://www.google.com/jsapi' type='text/javascript' language='javascript'></script>
- <script type='text/javascript' src='http://books.google.com/books/api.js?key=notsupplied&v=0&callback=google.loader.callbacks.books'></script>
<script language='javascript' type='text/javascript'>
config.ids.rdetail = {};
@@ -33,10 +28,10 @@
<a class='np_nav_link classic_link hide_me' id='np_start'
href='javascript:rdetailStart();' title="&rdetail.page.results;">&rdetail.start;</a>
<a class='np_nav_link classic_link hide_me' id='np_prev'
- href='javascript:rdetailPrev();' title='&rdetail.page.previous;'><<</a>
+ href='javascript:rdetailPrev();' title='&rdetail.page.previous;'>&rdetail.page.previous.short;</a>
<span> </span>
<a class='np_nav_link classic_link hide_me' id='np_next'
- href='javascript:rdetailNext();' title='&rdetail.page.next;'>>></a>
+ href='javascript:rdetailNext();' title='&rdetail.page.next;'>&rdetail.page.next.short;</a>
<a class='np_nav_link classic_link hide_me' id='np_end'
href='javascript:rdetailEnd();' title="&rdetail.page.last;">&rdetail.end;</a>
</span>
@@ -55,11 +50,11 @@
</td>
<td align='right' style='padding-right: 7px;' width='33%'>
- <span style='padding-right: 7px;' class='hide_me' id='rdetail_exp_refworks_span'>
- <a id='rdetail_exp_refworks' class='classic_link'>Export to RefWorks</a>
+ <span id='rdetail_exp_refworks_span' class='hide_me' style='padding-right: 7px;'>
+ <a id='rdetail_exp_refworks'>&opac.holds.exportRefWorks;</a>
</span>
- <span style='padding-right: 7px;'>
- <a id='rdetail_place_hold' class='classic_link'></a>
+ <span style='padding-right: 7px;'>
+ <a id='rdetail_place_hold' class='classic_link'>&opac.holds.placeHold;</a>
</span>
<span style='padding-right: 7px;' class='hide_me' id='rdetail_more_actions'>
<select id='rdetail_more_actions_selector' style='max-width: 11em;'>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_rresult.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_rresult.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/page_rresult.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,9 +1,9 @@
-<div>
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/sidebar_extras.js'></script>
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/rresult.js'></script>
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/result_common.js'></script>
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/tips.js'></script>
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/holds.js'></script>
- <!--#include virtual="result/result_common.xml"-->
-</div>
-
+<div>
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/sidebar_extras.js'></script>
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/rresult.js'></script>
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/result_common.js'></script>
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/tips.js'></script>
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/holds.js'></script>
+ <!--#include virtual="result/result_common.xml"-->
+</div>
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_altcanvas.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_altcanvas.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_altcanvas.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,28 +1,28 @@
-
-<!-- record details alternate canvases -->
-<div class=''>
-
- <!--
- <script language='javascript' type='text/javascript'>
- config.ids.rdetail.view_marc_div = 'view_marc_div';
- config.ids.altcanvas.view_marc_div = config.ids.rdetail.view_marc_div;
- config.ids.rdetail.hide_marc = "rdetail_hide_marc";
- config.ids.rdetail.view_marc_box = "rdetail_view_marc_box";
- </script>
-
- <div class='hide_me canvas' id='view_marc_div'>
- <div>
- <table width='100%'><tbody><tr>
- <td class='color_1' align='left' style='padding-left: 7px;text-decoration: underline;'>
- <a href="javascript:void(0);" id='rdetail_hide_marc'>&rdetail.detailMain.hideMarc;</a>
- </td>
- </tr></tbody></table>
- </div>
- <br/>
- <div id='rdetail_view_marc_box'> </div>
- <br/><br/>
- </div>
- -->
-
-</div>
-
+
+<!-- record details alternate canvases -->
+<div class=''>
+
+ <!--
+ <script language='javascript' type='text/javascript'>
+ config.ids.rdetail.view_marc_div = 'view_marc_div';
+ config.ids.altcanvas.view_marc_div = config.ids.rdetail.view_marc_div;
+ config.ids.rdetail.hide_marc = "rdetail_hide_marc";
+ config.ids.rdetail.view_marc_box = "rdetail_view_marc_box";
+ </script>
+
+ <div class='hide_me canvas' id='view_marc_div'>
+ <div>
+ <table width='100%'><tbody><tr>
+ <td class='color_1' align='left' style='padding-left: 7px;text-decoration: underline;'>
+ <a href="javascript:void(0);" id='rdetail_hide_marc'>&rdetail.detailMain.hideMarc;</a>
+ </td>
+ </tr></tbody></table>
+ </div>
+ <br/>
+ <div id='rdetail_view_marc_box'> </div>
+ <br/><br/>
+ </div>
+ -->
+
+</div>
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_cn_details.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_cn_details.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_cn_details.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,103 +1,105 @@
-<table class='hide_me'>
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/default/js/copy_details.js'></script>
- <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/Date.W3CDTF.js'></script>
- <tbody>
- <tr style='border: 3px solid #E0E0E0;' id='rdetail_volume_details_row' templateRow='1'>
- <td colspan='10'>
- <div style='text-align: center; margin-top: 6px; margin-bottom: 6px'>
-
- <a name='print' href='javascript:void(0);' class='classic_link'>&rdetail.print;</a>
- <table class='data_grid data_grid_center' style='width: 100%'>
- <thead>
- <tr>
- <td width='33%'>&rdetail.cn.barcode;</td>
- <td>&common.status;</td>
- <td>&rdetail.cn.location;</td>
- <td name='age_protect_label' class='hide_me'>&rdetail.cn.hold.age;</td>
- <td name='create_date_label' class='hide_me'>&rdetail.cn.genesis;</td>
- <td name='holdable_label' class='hide_me'>&rdetail.cn.holdable;</td>
- <td name='due_date_label' class='hide_me'>&rdetail.cn.due;</td>
- </tr>
- </thead>
- <tbody name='copies_tbody' class='copy_details_table' width='100%'>
-
- <tr name='copies_row'>
-
- <td>
- <span name='barcode'> </span>
- <a class='hide_me classic_link copy_more_info' name='details_link'>&rdetail.cn.more;</a>
- <a class='hide_me classic_link copy_more_info' name='less_details_link'>&rdetail.cn.less;</a>
- <a class='hide_me classic_link copy_more_info' name='copy_hold_link'
- href='javascript:void(0);'>&rdetail.cn.hold;</a>
- </td>
-
- <td name='status'> </td>
- <td name='location'> </td>
- <td name='age_protect_value' class='hide_me'>&rdetail.cn.disabled;</td>
- <td name='create_date_value' class='hide_me'> </td>
-
- <td name='copy_holdable_td' class='hide_me'>
- <span name='copy_is_holdable'> </span>
- </td>
-
- <td name='copy_due_date_td' class='hide_me'>
- <span name='copy_due_date'> </span>
- </td>
-
- </tr>
-
- <tr name='copy_extras_row' class='hide_me'>
- <td colspan='10'>
- <table width='100%' class='data_grid'>
- <tbody name='extras_tbody'>
- <tr name='extras_row' class='hide_me'>
- <td name='type' width='20%'>
- <span name='note' class='hide_me'><b>&rdetail.cn.note;</b></span>
- <span name='cat' class='hide_me'><b>&rdetail.cn.category;</b></span>
- </td>
- <td>
- <span name='key'> </span> : <span name='value'> </span>
- </td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
-
- </tbody>
- </table>
- </div>
- </td>
- </tr>
- </tbody>
-</table>
-
-<span class='hide_me' id='rdetail.yes'>&common.yes;</span>
-<span class='hide_me' id='rdetail.no'>&common.no;</span>
-
-
-<div id='rdetail_print_details' class='hide_me'>
- <div style='text-align: center; padding: 20px; width: 100%'>
- <div style='width:100%; border: 2px solid #E0F0E0; margin-bottom: 20px;'>
- <input type='submit' value='&rdetail.cn.print;' onclick='window.print();'> </input>
- </div>
- <div name='body'>
- <table>
- <tbody name='tbody'>
- <tr><td>&common.library;</td><td colspan='2' name='lib'></td></tr>
- <tr><td>&common.title;</td><td colspan='2' name='title'></td></tr>
- <tr><td>&common.author;</td><td colspan='2' name='author'></td></tr>
- <tr><td>&common.edition;</td><td colspan='2' name='edition'></td></tr>
- <tr><td>&common.pubdate;</td><td colspan='2' name='pubdate'></td></tr>
- <tr><td>&common.publisher;</td><td colspan='2' name='publisher'></td></tr>
- <tr><td>&common.physical;</td><td colspan='2' name='phys'></td></tr>
- <tr>
- <td colspan='3' style='background: #E0F0E0;'> </td>
- </tr>
- <tr name='cnrow'><td><b>&common.callnumber;</b></td><td><b colspan='2' name='cn'></b></td></tr>
- </tbody>
- </table>
- </div>
- </div>
-</div>
-
+<table class='hide_me'>
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/skin/uwin/js/copy_details.js'></script>
+ <script language='javascript' type='text/javascript' src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/Date.W3CDTF.js'></script>
+ <tbody>
+ <tr style='border: 3px solid #E0E0E0;' id='rdetail_volume_details_row' templateRow='1'>
+ <td colspan='10'>
+ <div style='text-align: center; margin-top: 6px; margin-bottom: 6px'>
+
+ <a name='print' href='javascript:void(0);' class='classic_link'>&rdetail.print;</a>
+ <table class='data_grid data_grid_center' style='width: 100%'>
+ <thead>
+ <tr>
+ <td width='33%'>&rdetail.cn.barcode;</td>
+ <td>&common.status;</td>
+ <td>&rdetail.cn.location;</td>
+ <td name='age_protect_label' class='hide_me'>&rdetail.cn.hold.age;</td>
+ <td name='create_date_label' class='hide_me'>&rdetail.cn.genesis;</td>
+ <td name='holdable_label' class='hide_me'>&rdetail.cn.holdable;</td>
+ <td name='due_date_label' class='hide_me'>&rdetail.cn.due;</td>
+ </tr>
+ </thead>
+ <tbody name='copies_tbody' class='copy_details_table' width='100%'>
+
+ <tr name='copies_row'>
+
+ <td>
+ <span name='barcode'> </span>
+ <a class='hide_me classic_link copy_more_info' name='details_link'>&rdetail.cn.more;</a>
+ <a class='hide_me classic_link copy_more_info' name='less_details_link'>&rdetail.cn.less;</a>
+ <a class='hide_me classic_link copy_more_info' name='copy_hold_link'
+ href='javascript:void(0);'>&rdetail.cn.hold;</a>
+ <a class='hide_me classic_link copy_more_info' name='copy_reserve_link'
+ href='javascript:void(0);'>&rdetail.cn.reserve;</a>
+ </td>
+
+ <td name='status'> </td>
+ <td name='location'> </td>
+ <td name='age_protect_value' class='hide_me'>&rdetail.cn.disabled;</td>
+ <td name='create_date_value' class='hide_me'> </td>
+
+ <td name='copy_holdable_td' class='hide_me'>
+ <span name='copy_is_holdable'> </span>
+ </td>
+
+ <td name='copy_due_date_td' class='hide_me'>
+ <span name='copy_due_date'> </span>
+ </td>
+
+ </tr>
+
+ <tr name='copy_extras_row' class='hide_me'>
+ <td colspan='10'>
+ <table width='100%' class='data_grid'>
+ <tbody name='extras_tbody'>
+ <tr name='extras_row' class='hide_me'>
+ <td name='type' width='20%'>
+ <span name='note' class='hide_me'><b>&rdetail.cn.note;</b></span>
+ <span name='cat' class='hide_me'><b>&rdetail.cn.category;</b></span>
+ </td>
+ <td>
+ <span name='key'> </span> : <span name='value'> </span>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+
+ </tbody>
+ </table>
+ </div>
+ </td>
+ </tr>
+ </tbody>
+</table>
+
+<span class='hide_me' id='rdetail.yes'>&common.yes;</span>
+<span class='hide_me' id='rdetail.no'>&common.no;</span>
+
+
+<div id='rdetail_print_details' class='hide_me'>
+ <div style='text-align: center; padding: 20px; width: 100%'>
+ <div style='width:100%; border: 2px solid #E0F0E0; margin-bottom: 20px;'>
+ <input type='submit' value='&rdetail.cn.print;' onclick='window.print();'> </input>
+ </div>
+ <div name='body'>
+ <table>
+ <tbody name='tbody'>
+ <tr><td>&common.library;</td><td colspan='2' name='lib'></td></tr>
+ <tr><td>&common.title;</td><td colspan='2' name='title'></td></tr>
+ <tr><td>&common.author;</td><td colspan='2' name='author'></td></tr>
+ <tr><td>&common.edition;</td><td colspan='2' name='edition'></td></tr>
+ <tr><td>&common.pubdate;</td><td colspan='2' name='pubdate'></td></tr>
+ <tr><td>&common.publisher;</td><td colspan='2' name='publisher'></td></tr>
+ <tr><td>&common.physical;</td><td colspan='2' name='phys'></td></tr>
+ <tr>
+ <td colspan='3' style='background: #E0F0E0;'> </td>
+ </tr>
+ <tr name='cnrow'><td><b>&common.callnumber;</b></td><td><b colspan='2' name='cn'></b></td></tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+</div>
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_copyinfo.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_copyinfo.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_copyinfo.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,93 +1,89 @@
-
-<!-- This holds information for copies attached to this record -->
-<div id='rdetail_copy_info_div' class='rdetail_extras_div'>
-
- <div style='width: 100%; text-align: center; padding-bottom: 5px;'>
- <span>
- <a href='javascript:void(0);' id='copy_info_local_link'
- class='rdetail_copy_nav_link hide_me classic_link'><b>&rdetail.copyInfo.local;</b></a>
- </span>
- <span width=''>
- <a href='javascript:void(0);' id='copy_info_all_link'
- class='rdetail_copy_nav_link classic_link'><b>&rdetail.copyInfo.all;</b></a>
- </span>
- </div>
-
- <style>
- #rdetail_copy_info_table { font-size: 8pt; }
- #rdetail_copy_info_table td { padding: 3px; }
- </style>
- <table id='rdetail_copy_info_table' class='data_grid'>
- <thead>
-
- <tr>
- <td class='rdetail_copy_info_header_cell'>&rdetail.copyInfo.library;</td>
- <td class='rdetail_copy_info_header_cell'>&rdetail.copyInfo.callnumber;</td>
- <td name='rdetail_copylocation_header' class='rdetail_copy_info_header_cell hide_me'>&rdetail.copyInfo.copylocation;</td>
- <td class='rdetail_copy_info_header_cell'>&rdetail.copyInfo.actions;</td>
- <td nowrap='nowrap' class='rdetail_copy_info_header_cell' id='rdetail_copy_info_status'>
- <div name='rdetail_status_cell'> </div>
- </td>
- </tr>
-
- </thead>
- <tbody id='rdetail_copy_info_tbody'>
- <tr id='rdetail_copy_info_row' class='hide_me'>
- <td name='rdetail_library_cell'>
- <a name='lib_print_link' class='hide_me classic_link' style='font-size: 8pt; padding-left: 20px;'>
- &rdetail.copyInfo.print;
- </a>
- </td>
- <td name='rdetail_callnumber_cell'> </td>
- <td class="hide_me" name='rdetail_copylocation_cell'> </td>
- <td name='rdetail_actions_cell'>
- <div style='padding-bottom: 1px;'>
- <a style='font-size: 8pt;'
- name='details' class='hide_me classic_link'>&rdetail.copyInfo.details;</a>
- </div>
- <div style='margin-top: 2px;'>
- <a name='browse' style='font-size: 8pt;'
- class='hide_me classic_link'><!-- &rdetail.copyInfo.browse; --></a>
- </div>
-<!-- <div style='margin-top: 2px;' name='hold_div' class='hide_me'>
- <a name='hold' style='font-size: 8pt;' href='javascript:void(0);'
- class='classic_link'>&rdetail.copyInfo.hold;</a>
- </div> -->
- </td>
- <td nowrap='nowrap' class='rdetail_copy_count_cell vertical'
- name='rdetail_copy_count_cell'> </td>
- </tr>
-
- <tr id='rdetail_copy_info_loading'><td>&rdetail.loading;</td></tr>
-
- </tbody>
- </table>
-
- <!--
- <table class='hide_me'>
- <tbody>
- <tr style='border: 3px solid #E0E0E0;' id='rdetail_volume_details_row'><td colspan='10'></td></tr>
- </tbody>
- </table>
- -->
-
- <br/><br/>
-
- <div id='rdetail_copy_info_none' class='hide_me'>&rdetail.noneAvailable;</div>
-
- <script language='javascript' type='text/javascript'>
- config.ids.rdetail.cp_status = "rdetail_copy_info_status";
- config.ids.rdetail.cp_info_row = "rdetail_copy_info_row";
- config.ids.rdetail.cp_info_loading = "rdetail_copy_info_loading";
- config.ids.rdetail.cp_info_local = "copy_info_local_link";
- config.ids.rdetail.cp_info_all = "copy_info_all_link";
- config.ids.rdetail.cp_info_none = "rdetail_copy_info_none";
- config.names.rdetail.lib_cell = "rdetail_library_cell";
- config.names.rdetail.cn_cell = "rdetail_callnumber_cell";
- config.names.rdetail.cp_count_cell = "rdetail_copy_count_cell";
- config.names.rdetail.cp_status = 'rdetail_status_cell';
- </script>
-
-</div> <!-- copy info -->
-
-
+
+<!-- This holds information for copies attached to this record -->
+<div id='rdetail_copy_info_div' class='rdetail_extras_div'>
+
+ <div style='width: 100%; text-align: center; padding-bottom: 5px;'>
+ <span>
+ <a href='javascript:void(0);' id='copy_info_local_link'
+ class='rdetail_copy_nav_link hide_me classic_link'><b>&rdetail.copyInfo.local;</b></a>
+ </span>
+ <span width=''>
+ <a href='javascript:void(0);' id='copy_info_all_link'
+ class='rdetail_copy_nav_link classic_link'><b>&rdetail.copyInfo.all;</b></a>
+ </span>
+ </div>
+
+ <table id='rdetail_copy_info_table' class='data_grid'>
+ <thead>
+
+ <tr>
+ <td class='rdetail_copy_info_header_cell'>&rdetail.copyInfo.library;</td>
+ <td class='rdetail_copy_info_header_cell'>&rdetail.copyInfo.callnumber;</td>
+ <td name='rdetail_copylocation_header' class='rdetail_copy_info_header_cell hide_me'>&rdetail.copyInfo.copylocation;</td>
+ <td class='rdetail_copy_info_header_cell'>&rdetail.copyInfo.actions;</td>
+ <td nowrap='nowrap' class='rdetail_copy_info_header_cell' id='rdetail_copy_info_status'>
+ <div name='rdetail_status_cell'> </div>
+ </td>
+ </tr>
+
+ </thead>
+ <tbody id='rdetail_copy_info_tbody'>
+ <tr id='rdetail_copy_info_row' class='hide_me'>
+ <td name='rdetail_library_cell'>
+ <a name='lib_print_link' class='hide_me classic_link' style='font-size: 8pt; padding-left: 20px;'>
+ &rdetail.copyInfo.print;
+ </a>
+ </td>
+ <td name='rdetail_callnumber_cell'> </td>
+ <td class="hide_me" name='rdetail_copylocation_cell'> </td>
+ <td name='rdetail_actions_cell'>
+ <div style='padding-bottom: 1px;'>
+ <a style='font-size: 8pt;'
+ name='details' class='hide_me classic_link'>&rdetail.copyInfo.details;</a>
+ </div>
+ <div style='margin-top: 2px;'>
+ <a name='browse' style='font-size: 8pt;'
+ class='hide_me classic_link'>&rdetail.copyInfo.browse;</a>
+ </div>
+ <div style='margin-top: 2px;' name='hold_div' class='hide_me'>
+ <a name='hold' style='font-size: 8pt;' href='javascript:void(0);'
+ class='classic_link'>&rdetail.copyInfo.hold;</a>
+ </div>
+ </td>
+ <td nowrap='nowrap' class='rdetail_copy_count_cell vertical'
+ name='rdetail_copy_count_cell'> </td>
+ </tr>
+
+ <tr id='rdetail_copy_info_loading'><td>&rdetail.loading;</td></tr>
+
+ </tbody>
+ </table>
+
+ <!--
+ <table class='hide_me'>
+ <tbody>
+ <tr style='border: 3px solid #E0E0E0;' id='rdetail_volume_details_row'><td colspan='10'></td></tr>
+ </tbody>
+ </table>
+ -->
+
+ <br/><br/>
+
+ <div id='rdetail_copy_info_none' class='hide_me'>&rdetail.noneAvailable;</div>
+
+ <script language='javascript' type='text/javascript'>
+ config.ids.rdetail.cp_status = "rdetail_copy_info_status";
+ config.ids.rdetail.cp_info_row = "rdetail_copy_info_row";
+ config.ids.rdetail.cp_info_loading = "rdetail_copy_info_loading";
+ config.ids.rdetail.cp_info_local = "copy_info_local_link";
+ config.ids.rdetail.cp_info_all = "copy_info_all_link";
+ config.ids.rdetail.cp_info_none = "rdetail_copy_info_none";
+ config.names.rdetail.lib_cell = "rdetail_library_cell";
+ config.names.rdetail.cn_cell = "rdetail_callnumber_cell";
+ config.names.rdetail.cp_count_cell = "rdetail_copy_count_cell";
+ config.names.rdetail.cp_status = 'rdetail_status_cell';
+ </script>
+
+</div> <!-- copy info -->
+
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_extras.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_extras.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_extras.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,125 +1,125 @@
-
-<div xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <table class='rdetails_extra_links'>
- <thead>
- <tr>
- <td id='rdetail_copy_info_link' class='rdetail_extras_td rdetail_extras_selected'
- style='padding-right: 15px; padding-left: 15px;' >
- <a href='javascript:rdetailShowExtra("copyinfo");'
- class='classic_link'>&rdetail.extras.summary;</a>
- </td>
-
- <td id='rdetail_viewcn_link' class='rdetail_extras_td'
- style='padding-right: 15px; padding-left: 15px;' >
- <a href='javascript:rdetailShowExtra("cn");'
- class='classic_link'>&rdetail.extras.browser;</a>
- </td>
-
- <td id='rdetail_reviews_link' class='hide_me rdetail_extras_td'
- style='padding-right: 15px; padding-left: 15px;' >
- <a href='javascript:rdetailShowExtra("reviews");'
- class='classic_link'>&rdetail.extras.reviews;</a>
- </td>
-
- <td id='rdetail_toc_link' class='hide_me rdetail_extras_td'
- style='padding-right: 15px; padding-left: 15px;' >
- <a href='javascript:rdetailShowExtra("toc");'
- class='classic_link'>&rdetail.extras.toc;</a>
- </td>
-
- <td id='rdetail_excerpt_link' class='hide_me rdetail_extras_td'
- style='padding-right: 15px; padding-left: 15px;' >
- <a href='javascript:rdetailShowExtra("excerpt");'
- class='classic_link'>&rdetail.extras.excerpt;</a>
- </td>
-
- <td id='rdetail_preview_link' class='hide_me rdetail_extras_td'
- style='padding-right: 15px; padding-left: 15px;' >
- <a href='javascript:rdetailShowExtra("preview");'
- class='classic_link'>&rdetail.extras.preview;</a>
- </td>
-
- <td id='rdetail_anotes_link' class='hide_me rdetail_extras_td'
- style='padding-right: 15px; padding-left: 15px;' >
- <a href='javascript:rdetailShowExtra("anotes");'
- class='classic_link'>&rdetail.extras.author.notes;</a>
- </td>
-
- <td id='rdetail_performer_notes_link' class='hide_me rdetail_extras_td'
- style='padding-right: 15px; padding-left: 15px;' >
- <a href='javascript:rdetailShowExtra("performer_notes");'
- class='classic_link'>&rdetail.extras.performer.notes;</a>
- </td>
-
-
- <td id='rdetail_annotation_link' class='hide_me rdetail_extras_td'
- style='padding-right: 15px; padding-left: 15px;' >
- <a href='javascript:rdetailShowExtra("annotation");'
- class='classic_link'>&rdetail.extras.annotation;</a>
- </td>
-
- <td id='rdetail_viewmarc_link' class='rdetail_extras_td'
- style='padding-right: 15px; padding-left: 15px;' >
- <a href='javascript:rdetailShowExtra("marc");'
- class='classic_link'>&rdetail.extras.marc;</a>
- </td>
-
-
- </tr>
- </thead>
- </table>
-
- <div id='rdetail_extras_div' style='width: 95%;'>
- <div id='rdetail_extras_loading' class='hide_me'
- style='padding: 10px;'>&common.loading;</div>
- <!--#include virtual="rdetail_copyinfo.xml"-->
-
- <div id='rdetail_reviews_div' class='rdetail_extras_div hide_me'>
- <div id='rdetail_review_container'/>
- <!--
- <div id='rdetail_review_template' style='width: 100%;'>
- <div name='review_header' style='width: 100%; padding: 15px; border: 1px solid #E0E0E0;'> </div>
- <div name='review_text' style='width: 100%; padding: 15px; border: 1px solid #E0E0E0;'> </div>
- </div>
- -->
- </div>
-
- <div id='rdetail_toc_div' class='rdetail_extras_div hide_me'> </div>
-
- <div id='rdetail_excerpt_div' class='rdetail_extras_div hide_me'> </div>
-
- <div id='rdetail_preview_div' class='rdetail_extras_div hide_me'> </div>
-
- <div id='rdetail_anotes_div' class='rdetail_extras_div hide_me'> </div>
-
- <div id='rdetail_performer_notes_div' class='rdetail_extras_div hide_me'> </div>
-
- <div id='rdetail_marc_div' class='rdetail_extras_div hide_me'>
- <div id='rdetail_view_marc_box'> </div>
- </div>
-
- <div id='rdetail_cn_browse_div' style='text-align: center;' class='hide_me'>
-
- <div id='cn_browse_none' class='hide_me color_4' style='width: 90%; text-align: center; margin: 10px;'>
- &rdetail.extras.call.null;
- </div>
-
- <div id='rdetail_cn_browse_select_div'
- style='width: 100%; border: 1px solid black; padding: 6px; margin-top: 5px;'>
- <span>&rdetail.extras.call.local; </span>
- <select id='cn_browse_selector'>
- </select>
- </div>
-
- <!--#include virtual="../common/cn_browse.xml"-->
- </div>
-
- <!--#include virtual="rdetail_cn_details.xml"-->
-
- </div>
- <!-- Text for dynamic JavaScript -->
- <div id='rdetail_preview_full_text' class='hide_me'>&rdetail.extras.preview.fulltext;</div>
- <div id='rdetail_preview_title' class='hide_me'>&rdetail.extras.preview.title;</div>
- <div id='rdetail_preview_badge' class='hide_me'>&rdetail.extras.preview.badge;</div>
-</div>
+
+<div xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <table class='rdetails_extra_links'>
+ <thead>
+ <tr>
+ <td id='rdetail_copy_info_link' class='rdetail_extras_td rdetail_extras_selected'
+ style='padding-right: 15px; padding-left: 15px;' >
+ <a href='javascript:rdetailShowExtra("copyinfo");'
+ class='classic_link'>&rdetail.extras.summary;</a>
+ </td>
+
+ <td id='rdetail_viewcn_link' class='rdetail_extras_td'
+ style='padding-right: 15px; padding-left: 15px;' >
+ <a href='javascript:rdetailShowExtra("cn");'
+ class='classic_link'>&rdetail.extras.browser;</a>
+ </td>
+
+ <td id='rdetail_reviews_link' class='hide_me rdetail_extras_td'
+ style='padding-right: 15px; padding-left: 15px;' >
+ <a href='javascript:rdetailShowExtra("reviews");'
+ class='classic_link'>&rdetail.extras.reviews;</a>
+ </td>
+
+ <td id='rdetail_toc_link' class='hide_me rdetail_extras_td'
+ style='padding-right: 15px; padding-left: 15px;' >
+ <a href='javascript:rdetailShowExtra("toc");'
+ class='classic_link'>&rdetail.extras.toc;</a>
+ </td>
+
+ <td id='rdetail_excerpt_link' class='hide_me rdetail_extras_td'
+ style='padding-right: 15px; padding-left: 15px;' >
+ <a href='javascript:rdetailShowExtra("excerpt");'
+ class='classic_link'>&rdetail.extras.excerpt;</a>
+ </td>
+
+ <td id='rdetail_preview_link' class='hide_me rdetail_extras_td'
+ style='padding-right: 15px; padding-left: 15px;' >
+ <a href='javascript:rdetailShowExtra("preview");'
+ class='classic_link'>&rdetail.extras.preview;</a>
+ </td>
+
+ <td id='rdetail_anotes_link' class='hide_me rdetail_extras_td'
+ style='padding-right: 15px; padding-left: 15px;' >
+ <a href='javascript:rdetailShowExtra("anotes");'
+ class='classic_link'>&rdetail.extras.author.notes;</a>
+ </td>
+
+ <td id='rdetail_performer_notes_link' class='hide_me rdetail_extras_td'
+ style='padding-right: 15px; padding-left: 15px;' >
+ <a href='javascript:rdetailShowExtra("performer_notes");'
+ class='classic_link'>&rdetail.extras.performer.notes;</a>
+ </td>
+
+
+ <td id='rdetail_annotation_link' class='hide_me rdetail_extras_td'
+ style='padding-right: 15px; padding-left: 15px;' >
+ <a href='javascript:rdetailShowExtra("annotation");'
+ class='classic_link'>&rdetail.extras.annotation;</a>
+ </td>
+
+ <td id='rdetail_viewmarc_link' class='rdetail_extras_td'
+ style='padding-right: 15px; padding-left: 15px;' >
+ <a href='javascript:rdetailShowExtra("marc");'
+ class='classic_link'>&rdetail.extras.marc;</a>
+ </td>
+
+
+ </tr>
+ </thead>
+ </table>
+
+ <div id='rdetail_extras_div' style='width: 95%;'>
+ <div id='rdetail_extras_loading' class='hide_me'
+ style='padding: 10px;'>&common.loading;</div>
+ <!--#include virtual="rdetail_copyinfo.xml"-->
+
+ <div id='rdetail_reviews_div' class='rdetail_extras_div hide_me'>
+ <div id='rdetail_review_container'/>
+ <!--
+ <div id='rdetail_review_template' style='width: 100%;'>
+ <div name='review_header' style='width: 100%; padding: 15px; border: 1px solid #E0E0E0;'> </div>
+ <div name='review_text' style='width: 100%; padding: 15px; border: 1px solid #E0E0E0;'> </div>
+ </div>
+ -->
+ </div>
+
+ <div id='rdetail_toc_div' class='rdetail_extras_div hide_me'> </div>
+
+ <div id='rdetail_excerpt_div' class='rdetail_extras_div hide_me'> </div>
+
+ <div id='rdetail_preview_div' class='rdetail_extras_div hide_me'> </div>
+
+ <div id='rdetail_anotes_div' class='rdetail_extras_div hide_me'> </div>
+
+ <div id='rdetail_performer_notes_div' class='rdetail_extras_div hide_me'> </div>
+
+ <div id='rdetail_marc_div' class='rdetail_extras_div hide_me'>
+ <div id='rdetail_view_marc_box'> </div>
+ </div>
+
+ <div id='rdetail_cn_browse_div' style='text-align: center;' class='hide_me'>
+
+ <div id='cn_browse_none' class='hide_me color_4' style='width: 90%; text-align: center; margin: 10px;'>
+ &rdetail.extras.call.null;
+ </div>
+
+ <div id='rdetail_cn_browse_select_div'
+ style='width: 100%; border: 1px solid black; padding: 6px; margin-top: 5px;'>
+ <span>&rdetail.extras.call.local; </span>
+ <select id='cn_browse_selector'>
+ </select>
+ </div>
+
+ <!--#include virtual="../common/cn_browse.xml"-->
+ </div>
+
+ <!--#include virtual="rdetail_cn_details.xml"-->
+
+ </div>
+ <!-- Text for dynamic JavaScript -->
+ <div id='rdetail_preview_full_text' class='hide_me'>&rdetail.extras.preview.fulltext;</div>
+ <div id='rdetail_preview_title' class='hide_me'>&rdetail.extras.preview.title;</div>
+ <div id='rdetail_preview_badge' class='hide_me'>&rdetail.extras.preview.badge;</div>
+</div>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/rdetail/rdetail_summary.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,171 +1,442 @@
-
-<abbr class="unapi-id" title='tag:<!--#echo var="HTTP_HOST"-->,<!--#echo var="OILS_TIME_YEAR"-->:biblio-record_entry/<!--#echo var="OILS_OPAC_RID"-->'></abbr>
-<!-- This holds the record summary information -->
-<div>
- <table id='rdetail_details_table'>
- <tbody id='rdetail_details_tbody'>
-
- <tr>
- <td id='rdetail_image_cell' rowspan='20'>
- <a id='rdetail_img_link'>
- <img style='border: none;' id='rdetail_image'
- onerror='
- hideMe($("rdetail.jacket_attrib_div"));
- hideMe($("rdetail_img_link"));'/>
- </a>
- <!-- vendor attribution link -->
- <div class='jacket_attrib hide_me' id='rdetail.jacket_attrib_div'>
- <div>&opac.image_provided;</div>
- <div><a target='_blank' href='&vendor.base_link;'
- class='classic_link' id='rdetail.jacket_attrib_link'>&vendor.name;</a></div>
- </div>
- </td>
- <td nowrap='nowrap' class='rdetail_desc'>
- <a style='float:right; white-space:nowrap;' class='hide_me' id='rdetail_sfx_check' title='Check All Holdings'>
- <img border='0' target='_top' src='../local/images/sfx_button.gif' /></a>&common.title;</td>
- <!-- *** Example of how to use the openils.BibTemplate infrastructure to augment the stock
- *** summary screen with more and/or different information. In this case, the raw MARC 245. -->
- <td type='opac/slot-data' query='datafield[tag=245]' class='rdetail_item' id='rdetail_title'> </td>
- </tr>
-
- <tr>
- <td nowrap='nowrap' class='rdetail_desc'>&common.author;</td>
- <td class='rdetail_item'>
- <a title='&rdetail.author.search;' id='rdetail_author'> </a>
- </td>
- </tr>
-
- <tr class='hide_me' id='rdetail_isbn_row'>
- <td nowrap='nowrap' class='rdetail_desc'>&common.isbn;</td>
- <td class='rdetail_item' id='rdetail_isbn'> </td>
- </tr>
-
- <tr>
- <td nowrap='nowrap' class='rdetail_desc'>&common.issn;</td>
- <td class='rdetail_item' id='rdetail_issn'><MARC datafield="022"></MARC></td>
- </tr>
-
- <tr>
- <td nowrap='nowrap' class='rdetail_desc'>&common.edition;</td>
- <td class='rdetail_item' id='rdetail_edition'> </td>
- </tr>
-
- <tr>
- <td nowrap='nowrap' class='rdetail_desc'>Place of Publication</td>
- <td class='rdetail_item' id='rdetail_place_of_pub'><MARC datafield="260" subfield='a'></MARC></td>
- </tr>
-
- <tr>
- <td nowrap='nowrap' class='rdetail_desc'>&common.publisher;</td>
- <td class='rdetail_item' id='rdetail_publisher'><MARC datafield="260" subfield='b'></MARC></td>
- </tr>
-
- <tr>
- <td nowrap='nowrap' class='rdetail_desc'>&common.pubdate;</td>
- <td class='rdetail_item' id='rdetail_pubdate'> </td>
- </tr>
-
- <tr>
- <td nowrap='nowrap' class='rdetail_desc'>&common.physical;</td>
- <td class='rdetail_item' id='rdetail_physical_desc'> </td>
- </tr>
-
- <tr>
- <td nowrap='nowrap' class='rdetail_desc'>&common.format;</td>
- <td class='rdetail_item'>
- <img id='rdetail_tor_pic' class='tor_pic' />
- <span id='rdetail_tor' style='padding-left: 5px;'> </span>
- </td>
- </tr>
-
- <tr>
- <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.abstract;</td>
- <td class='rdetail_item' id='rdetail_abstract'> </td>
- </tr>
-
- <!-- *** Example of how to use the openils.BibTemplate infrastructure to augment the stock
- *** summary screen with complex information, such as new search links on subjects. -->
- <tr>
- <td nowrap='nowrap' class='rdetail_desc'>Subjects</td>
- <td type='opac/slot-data' query='datafield[tag^=65]' class='rdetail_item'>
- <script type='opac/slot-format'><![CDATA[
- var cgi = new CGI();
- var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
- var total = '';
- var output = [];
- var list = dojo.query( 'subfield', item );
- for (var i =0; i < list.length; i++) {
- total += dojox.data.dom.textContent(list[i]) + ' ';
- var current = '<a href="rresult.xml?rt=subject&t=' + total;
- for (var p in other_params) {
- if (cgi.param(other_params[p]))
- current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
- }
- current += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
- output.push(current);
- }
- return '<span>' + output.join(' -- ') + '</span><br/>';
- ]]></script>
- </td>
- </tr>
- <tr class='hide_me' id='rdetail_online_row'>
- <!-- *** Example of how to use the openils.BibTemplate infrastructure to augment the stock
- *** summary screen with complex information, such as location-specific URIs (856$9). -->
- <td nowrap='nowrap' class='rdetail_desc'>&rdetail.summary.online;</td>
- <td class='rdetail_item' id='rdetail_online' type='opac/slot-data' query='volumes volume uris uri'>
- <script type='opac/slot-format'><![CDATA[
- dojo.query('*:not([type^=opac])', 'rdetail_online').orphan();
- var uri = new Object;
- uri.href = item.getAttribute('href');
- uri.label = item.getAttribute('label');
- uri.use = item.getAttribute('use_restriction');
- if (uri.href == uri.label) {
- if (uri.use && uri.use != uri.label) {
- uri.label = uri.use;
- uri.use = null;
- }
- }
- var link = '<a class="search_link" href="' + uri.href + '">' + uri.label + '</a>';
- if (uri.use) {
- link += ' (' + uri.use + ')';
- }
- return '<span>' + link + '</span><br/>';
- ]]></script>
- </td>
- </tr>
- </tbody>
- </table>
-
- <!-- Empty span used for creating unAPI links -->
- <abbr name="unapi" class="unapi-id">
- <!-- unAPI URI goes here -->
- </abbr>
-
- <script language='javascript' type='text/javascript'><![CDATA[
-
- config.ids.rdetail.details_body = 'rdetail_details_body';
- config.ids.rdetail.title = 'rdetail_title';
- config.ids.rdetail.author = 'rdetail_author';
- config.ids.rdetail.isbn = 'rdetail_isbn';
- config.ids.rdetail.edition = 'rdetail_edition';
- config.ids.rdetail.pubdate = 'rdetail_pubdate';
- config.ids.rdetail.publisher = 'rdetail_publisher';
- config.ids.rdetail.tor = 'rdetail_tor';
- config.ids.rdetail.abstr = 'rdetail_abstract';
- config.ids.rdetail.image = 'rdetail_image';
- config.ids.rdetail.tor_pic = 'rdetail_tor_pic';
-
- dojo.addOnLoad( function () {
- var here = findOrgUnit(getLocation());
- if (getDepth() > 0 || getDepth === 0 ) {
- while (getDepth() < findOrgDepth(here))
- here = findOrgUnit( here.parent_ou() );
- }
-
- dojo.require('openils.BibTemplate');
- new openils.BibTemplate({ record : new CGI().param('r'), org_unit : here.shortname() }).render();
- });
- ]]></script>
-
-</div> <!-- details_body -->
-
+
+<abbr name="unapi" class="unapi-id" title='tag:<!--#echo var="HTTP_HOST"-->,<!--#echo var="OILS_TIME_YEAR"-->:biblio-record_entry/<!--#echo var="OILS_OPAC_RID"-->'></abbr>
+<!-- This holds the record summary information -->
+<div>
+ <!-- Hack to give IE somewhere to put these things; should just rip out from rdetail.js -->
+ <span class='hide_me' id='rdetail_title'></span>
+ <span class='hide_me' id='rdetail_isbn'></span>
+ <span class='hide_me' id='rdetail_publisher'></span>
+ <span class='hide_me' id='rdetail_abstract'></span>
+ <span class='hide_me' id='rdetail_edition'></span>
+ <table id='rdetail_details_table'>
+ <tbody id='rdetail_details_tbody'>
+
+ <tr>
+ <td id='rdetail_image_cell' rowspan='40'>
+ <a id='rdetail_img_link'>
+ <img style='border: none;' id='rdetail_image'
+ onerror='
+ hideMe($("rdetail.jacket_attrib_div"));
+ hideMe($("rdetail_img_link"));'/>
+ </a>
+ <!-- vendor attribution link -->
+ <div class='jacket_attrib hide_me' id='rdetail.jacket_attrib_div'>
+ <div>&opac.image_provided;</div>
+ <div><a target='_blank' href='&vendor.base_link;'
+ class='classic_link' id='rdetail.jacket_attrib_link'>&vendor.name;</a></div>
+ </div>
+ </td>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.title;</td>
+ <td type='opac/slot-data' query='datafield[tag=245]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ var rdetail_bib_title = dojox.data.dom.textContent(item);
+ var title_node = dojo.query('head title');
+ dojo.addOnLoad(function() {dojo.place('<title>' + rdetail_bib_title + '</title>', title_node[0], 'replace');});
+ return '<span>' + rdetail_bib_title + '</span><br/>';
+ ]]></script>
+ </td>
+ </tr>
+
+ <tr class='hide_me' id='tag246'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.alternate.title;</td>
+ <td type='opac/slot-data' query='datafield[tag=246] subfield[code=a]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ dojo.query('#tag246').removeClass('hide_me');
+ return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.author;</td>
+ <td class='rdetail_item'>
+ <a title='&rdetail.author.search;' id='rdetail_author'> </a>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag100'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.author;</td>
+ <td type='opac/slot-data' query='datafield[tag=100]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ dojo.query('#tag100').removeClass('hide_me');
+ return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag110'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.corporate.author;</td>
+ <td type='opac/slot-data' query='datafield[tag=110]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ dojo.query('#tag110').removeClass('hide_me');
+ return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag111'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.meeting.name;</td>
+ <td type='opac/slot-data' query='datafield[tag=111]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ dojo.query('#tag111').removeClass('hide_me');
+ return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag020'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.isbn;</td>
+ <td type='opac/slot-data' query='datafield[tag=020]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ dojo.query('#tag020').removeClass('hide_me');
+ return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+ ]]></script>
+ </td>
+
+ </tr>
+ <tr class='hide_me' id='tag022'>
+ <td nowrap='nowrap' class='rdetail_desc' id='issn_title'>&common.issn;</td>
+ <td type='opac/slot-data' query='datafield[tag=022]' class='rdetail_item' id='rdetail_issn'>
+ <script type='opac/slot-format'><![CDATA[
+ dojo.query('#tag022').removeClass('hide_me');
+ var issn_raw = dojo.trim(dojox.data.dom.textContent(item));
+
+ // textContent returns multiple subfields concatenated with linefeeds,
+ // so our regex needs to match against linefeeds. "." does not match
+ // linefeeds, so get \s into the mix
+ var issn = issn_raw.replace(/^(\s|.)*?(\d{4}).(\d{3,4}[xX]?)(\s|.)*/, "$2-$3");
+
+ var ses = new OpenSRF.ClientSession('open-ils.resolver');
+ var req = ses.request('open-ils.resolver.resolve_holdings.raw', 'issn', issn, 'http://sfx.scholarsportal.info/windsor');
+ req.oncomplete = function(r) {
+ var msg;
+ dojo.forEach(r.recv().content(), function(entry) {
+ if (first_issn) {
+ dojo.query('#rdetail_online *').orphan();
+ first_issn = false;
+ }
+ dojo.place('<div style="width: 100%">'
+ + ' <a class="search_link" href="' + entry.target_url
+ + '">' + entry.public_name + '</a> - '
+ + entry.target_coverage
+ + (entry.target_embargo ? (' / ' + entry.target_embargo) : '')
+ + '</div>', 'rdetail_online');
+ dojo.query('#rdetail_online_row').removeClass('hide_me');
+ });
+ }
+ req.send();
+
+ return '<span>' + issn + '</span><br/>';
+ ]]></script>
+ </td>
+
+ </tr>
+
+ <tr class='hide_me' id='tag250'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.edition;</td>
+ <td type='opac/slot-data' query='datafield[tag=250]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ dojo.query('#tag250').removeClass('hide_me');
+ return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+ ]]></script>
+ </td>
+ </tr>
+
+ <tr class='hide_me'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.pubdate;</td>
+ <td class='rdetail_item' id='rdetail_pubdate'> </td>
+ </tr>
+
+ <tr class='hide_me' id='tag260'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.publisher;</td>
+ <td type='opac/slot-data' query='datafield[tag=260]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ dojo.query('#tag260').removeClass('hide_me');
+ return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+ ]]></script>
+ </td>
+ </tr>
+
+
+ <tr>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.physical;</td>
+ <td class='rdetail_item' id='rdetail_physical_desc'> </td>
+ </tr>
+
+ <tr>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.format;</td>
+ <td class='rdetail_item'>
+ <img id='rdetail_tor_pic' class='tor_pic' />
+ <span id='rdetail_tor' style='padding-left: 5px;'> </span>
+ </td>
+ </tr>
+
+ <tr class='hide_me' id='tag520'>
+ <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.abstract;</td>
+ <td type='opac/slot-data' query='datafield[tag=520]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ dojo.query('#tag520').removeClass('hide_me');
+ return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+ ]]></script>
+ </td>
+
+ </tr>
+
+ <!-- *** Example of how to use the openils.BibTemplate infrastructure to augment the stock
+ *** summary screen with complex information, such as new search links on subjects. -->
+ <tr class='hide_me' id='tag600'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.subject.600;</td>
+ <td type='opac/slot-data' query='datafield[tag^=600]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ return subjectMe('#tag600', item);
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag610'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.subject.610;</td>
+ <td type='opac/slot-data' query='datafield[tag^=610]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ return subjectMe('#tag610', item);
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag611'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.subject.611;</td>
+ <td type='opac/slot-data' query='datafield[tag^=611]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ return subjectMe('#tag611', item);
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag630'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.subject.630;</td>
+ <td type='opac/slot-data' query='datafield[tag^=630]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ return subjectMe('#tag630', item);
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag648'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.subject.648;</td>
+ <td type='opac/slot-data' query='datafield[tag^=648]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ return subjectMe('#tag648', item);
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag650'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.subjects;</td>
+ <td type='opac/slot-data' query='datafield[tag^=650]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ return subjectMe('#tag650', item);
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag651'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.subject.651;</td>
+ <td type='opac/slot-data' query='datafield[tag^=651]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ return subjectMe('#tag651', item);
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag653'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.subject.653;</td>
+ <td type='opac/slot-data' query='datafield[tag^=653]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ return subjectMe('#tag653', item);
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag654'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.subject.654;</td>
+ <td type='opac/slot-data' query='datafield[tag^=654]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ return subjectMe('#tag654', item);
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag655'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.subject.655;</td>
+ <td type='opac/slot-data' query='datafield[tag^=655]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ return subjectMe('#tag655', item);
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag656'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.subject.656;</td>
+ <td type='opac/slot-data' query='datafield[tag^=656]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ return subjectMe('#tag656', item);
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag657'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.subject.657;</td>
+ <td type='opac/slot-data' query='datafield[tag^=657]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ return subjectMe('#tag657', item);
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag658'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.subject.658;</td>
+ <td type='opac/slot-data' query='datafield[tag^=658]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ return subjectMe('#tag658', item);
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag662'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.subject.662;</td>
+ <td type='opac/slot-data' query='datafield[tag^=662]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ return subjectMe('#tag662', item);
+ ]]></script>
+ </td>
+ </tr>
+
+ <tr class='hide_me' id='tag500'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.general.note;</td>
+ <td type='opac/slot-data' query='datafield[tag=500]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ dojo.query('#tag500').removeClass('hide_me');
+ return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag505'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.contents.note;</td>
+ <td type='opac/slot-data' query='datafield[tag=505]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ dojo.query('#tag505').removeClass('hide_me');
+ return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag506'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.usage.restrictions;</td>
+ <td type='opac/slot-data' query='datafield[tag=506] subfield[code=a]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ dojo.query('#tag506').removeClass('hide_me');
+ return '<span>' + dojox.data.dom.textContent(item) + '</span> ';
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag511'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.performer.note;</td>
+ <td type='opac/slot-data' query='datafield[tag=511]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ dojo.query('#tag511').removeClass('hide_me');
+ return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag700'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.additional.authors;</td>
+ <td type='opac/slot-data' query='datafield[tag=700]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ dojo.query('#tag700').removeClass('hide_me');
+ var text = '';
+ var list = dojo.query( 'subfield:not([code=4])', item );
+ for (var i =0; i < list.length; i++) {
+ text += dojox.data.dom.textContent(list[i]) + ' ';
+ }
+ return '<span>' + text + '</span><br/>';
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag780'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.preceding.entry;</td>
+ <td type='opac/slot-data' query='datafield[tag=780]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ dojo.query('#tag780').removeClass('hide_me');
+ return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='tag785'>
+ <td nowrap='nowrap' class='rdetail_desc'>&common.succeeding.entry;</td>
+ <td type='opac/slot-data' query='datafield[tag=785]' class='rdetail_item'>
+ <script type='opac/slot-format'><![CDATA[
+ dojo.query('#tag785').removeClass('hide_me');
+ return '<span>' + dojox.data.dom.textContent(item) + '</span><br/>';
+ ]]></script>
+ </td>
+ </tr>
+ <tr class='hide_me' id='rdetail_online_row'>
+ <!-- *** Example of how to use the openils.BibTemplate infrastructure to augment the stock
+ *** summary screen with complex information, such as location-specific URIs (856$9). -->
+ <td nowrap='nowrap' class='rdetail_desc'>&rdetail.summary.online;</td>
+ <td class='rdetail_item' id='rdetail_online' type='opac/slot-data' query='volumes volume uris uri'>
+ <script type='opac/slot-format'><![CDATA[
+ dojo.query('*:not([type^=opac])', 'rdetail_online').orphan();
+ var uri = new Object;
+ uri.href = item.getAttribute('href');
+ uri.label = item.getAttribute('label');
+ uri.use = item.getAttribute('use_restriction');
+ if (uri.href == uri.label) {
+ if (uri.use && uri.use != uri.label) {
+ uri.label = uri.use;
+ uri.use = null;
+ }
+ }
+ var link = '<a class="search_link" href="' + uri.href + '">' + uri.label + '</a>';
+ if (uri.use) {
+ link += ' (' + uri.use + ')';
+ }
+ return '<span>' + link + '</span><br/>';
+ ]]></script>
+ </td>
+ </tr>
+
+ </tbody>
+ </table>
+
+ <script language='javascript' type='text/javascript'><![CDATA[
+
+ config.ids.rdetail.details_body = 'rdetail_details_body';
+ config.ids.rdetail.title = 'rdetail_title';
+ config.ids.rdetail.author = 'rdetail_author';
+ config.ids.rdetail.isbn = 'rdetail_isbn';
+ config.ids.rdetail.edition = 'rdetail_edition';
+ config.ids.rdetail.pubdate = 'rdetail_pubdate';
+ config.ids.rdetail.publisher = 'rdetail_publisher';
+ config.ids.rdetail.tor = 'rdetail_tor';
+ config.ids.rdetail.abstr = 'rdetail_abstract';
+ config.ids.rdetail.image = 'rdetail_image';
+ config.ids.rdetail.tor_pic = 'rdetail_tor_pic';
+
+ /* Only clear the resources box once */
+ var first_issn = true;
+
+ function subjectMe(tag, item) {
+ dojo.query(tag).removeClass('hide_me');
+ var cgi = new CGI();
+ var other_params = [ 'd', 'l', 'r', 'av', 's', 'sd' ];
+ var total = '';
+ var output = [];
+ var list = dojo.query( 'subfield:not([code=2])', item );
+ for (var i =0; i < list.length; i++) {
+ total += dojox.data.dom.textContent(list[i]) + ' ';
+ var current = '<a class="search_link" href="rresult.xml?rt=subject&tp=subject&t=' + total;
+ for (var p in other_params) {
+ if (cgi.param(other_params[p]))
+ current += '&' + other_params[p] + '=' + cgi.param(other_params[p]);
+ }
+ current += '">' + dojox.data.dom.textContent(list[i]) + '</a>'
+ output.push(current);
+ }
+ return '<span>' + output.join(' -- ') + '</span><br/>';
+ }
+
+ dojo.addOnLoad( function () {
+ var here = findOrgUnit(getLocation());
+ if (getDepth() > 0 || getDepth === 0 ) {
+ while (getDepth() < findOrgDepth(here))
+ here = findOrgUnit( here.parent_ou() );
+ }
+
+ dojo.require('openils.BibTemplate');
+ new openils.BibTemplate({ record : new CGI().param('r'), org_unit : here.shortname() }).render();
+ });
+ ]]></script>
+
+</div> <!-- details_body -->
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/filtersort.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/filtersort.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/filtersort.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,20 +1,20 @@
-<span>
- &result.limit2avail;<input type='checkbox' id='opac.result.limit2avail' onclick='searchBarSubmit(true);'/>
- <select id='opac.result.sort' onchange='searchBarSubmit(true);'>
- <option selected='selected' value=''>&result.sort_by;</option>
- <optgroup label='&result.sort_by.title;'>
- <option id='opac.result.title.a2z' label='&common.a2z.titla;' value='title.asc'>&common.a2z.title;</option>
- <option id='opac.result.title.z2a' label='&common.z2a.titla;' value='title.desc'>&common.z2a.title;</option>
- </optgroup>
- <optgroup label='&result.sort_by.author;'>
- <option id='opac.result.author.a2z' label='&common.a2z.author;' value='author.asc'>&common.a2z.author;</option>
- <option id='opac.result.author.z2a' label='&common.z2a.author;' value='author.desc'>&common.z2a.author;</option>
- </optgroup>
- <optgroup label='&result.sort_by.pubdate;'>
- <option id='opac.result.pubdate.new2old' label='&common.new2old.pubdate;'
- value='pubdate.desc'>&common.new2old.pubdate;</option>
- <option id='opac.result.pubdate.old2new' label='&common.old2new.pubdate;'
- value='pubdate.asc'>&common.old2new.pubdate;</option>
- </optgroup>
- </select>
-</span>
+<span>
+ &result.limit2avail;<input type='checkbox' id='opac.result.limit2avail' onclick='searchBarSubmit(true);'/>
+ <select id='opac.result.sort' onchange='searchBarSubmit(true);'>
+ <option selected='selected' value=''>&result.sort_by;</option>
+ <optgroup label='&result.sort_by.title;'>
+ <option id='opac.result.title.a2z' label='&common.a2z.titla;' value='title.asc'>&common.a2z.title;</option>
+ <option id='opac.result.title.z2a' label='&common.z2a.titla;' value='title.desc'>&common.z2a.title;</option>
+ </optgroup>
+ <optgroup label='&result.sort_by.author;'>
+ <option id='opac.result.author.a2z' label='&common.a2z.author;' value='author.asc'>&common.a2z.author;</option>
+ <option id='opac.result.author.z2a' label='&common.z2a.author;' value='author.desc'>&common.z2a.author;</option>
+ </optgroup>
+ <optgroup label='&result.sort_by.pubdate;'>
+ <option id='opac.result.pubdate.new2old' label='&common.new2old.pubdate;'
+ value='pubdate.desc'>&common.new2old.pubdate;</option>
+ <option id='opac.result.pubdate.old2new' label='&common.old2new.pubdate;'
+ value='pubdate.asc'>&common.old2new.pubdate;</option>
+ </optgroup>
+ </select>
+</span>
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/result_common.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/result_common.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/result_common.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,36 +1,36 @@
-
-<div id='canvas_main' class='canvas' xmlns:xi="http://www.w3.org/2001/XInclude" >
-
- <script language='javascript' type='text/javascript'>
- config.ids.result = {};
- config.css.result = {};
- config.names.result = {};
- config.ids.result.offset_start = "offset_start";
- config.ids.result.offset_end = "offset_end";
- config.ids.result.result_count = "result_count";
- config.ids.result.next_link = 'next_link';
- config.ids.result.prev_link = 'prev_link';
- config.ids.result.home_link = 'search_home_link';
- config.ids.result.end_link = 'end_link';
- config.ids.result.main_table = 'result_table';
- config.ids.result.row_template = 'result_table_template';
- config.ids.result.num_pages = 'num_pages';
- config.ids.result.current_page = 'current_page';
- config.css.result.nav_active = "nav_link_active";
- config.ids.result.top_div = "result_table_div";
- config.ids.result.nav_links = "search_nav_links";
- config.ids.result.info = "result_info_div";
- config.css.result.cc_cell_even = "copy_count_cell_even";
- config.names.result.item_jacket = "item_jacket";
- config.names.result.item_title = "item_title";
- config.names.result.item_author = "item_author";
- config.names.result.counts_row = "counts_row";
- config.names.result.count_cell = "copy_count_cell";
- </script>
-
- <!--#include virtual="result_table.xml"-->
- <!--#include virtual="result_lowhits.xml"-->
-
-</div>
-
-
+
+<div id='canvas_main' class='canvas' xmlns:xi="http://www.w3.org/2001/XInclude" >
+
+ <script language='javascript' type='text/javascript'>
+ config.ids.result = {};
+ config.css.result = {};
+ config.names.result = {};
+ config.ids.result.offset_start = "offset_start";
+ config.ids.result.offset_end = "offset_end";
+ config.ids.result.result_count = "result_count";
+ config.ids.result.next_link = 'next_link';
+ config.ids.result.prev_link = 'prev_link';
+ config.ids.result.home_link = 'search_home_link';
+ config.ids.result.end_link = 'end_link';
+ config.ids.result.main_table = 'result_table';
+ config.ids.result.row_template = 'result_table_template';
+ config.ids.result.num_pages = 'num_pages';
+ config.ids.result.current_page = 'current_page';
+ config.css.result.nav_active = "nav_link_active";
+ config.ids.result.top_div = "result_table_div";
+ config.ids.result.nav_links = "search_nav_links";
+ config.ids.result.info = "result_info_div";
+ config.css.result.cc_cell_even = "copy_count_cell_even";
+ config.names.result.item_jacket = "item_jacket";
+ config.names.result.item_title = "item_title";
+ config.names.result.item_author = "item_author";
+ config.names.result.counts_row = "counts_row";
+ config.names.result.count_cell = "copy_count_cell";
+ </script>
+
+ <!--#include virtual="result_table.xml"-->
+ <!--#include virtual="result_lowhits.xml"-->
+
+</div>
+
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/result_info.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/result_info.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/result_info.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,74 +1,74 @@
-<table style='width: 100%;'>
- <tbody>
-
- <tr class='color_4' style='height: 1em;'>
-
- <td style='vertical-align: top;' id='next_prev_links'>
-
- <span class='hide_me' id='result_info_div' style='font-size: 9pt;'>
- <span> &common.results; </span>
- <span id='offset_start'> </span>
- <span> - </span>
- <span id='offset_end'> </span>
- <span> &common.ofAtLeast; </span>
- <span id='result_count'> </span>
- <span style='padding-left: 6px;'> (page </span>
- <span id='current_page'> </span>
- <span> &common.of; </span>
- <span id='num_pages'> </span>
- </span>
-
- <span id='start_end_links_span' class='hide_me'
- style='padding-left: 40px;' >
- <a class='search_page_nav_link' id='search_home_link'
- title="&rdetail.page.results;">&rdetail.start;</a><a class='search_page_nav_link'
- id='prev_link' title='&rdetail.page.previous;'>«</a>
-
- <span class='search_page_nav_link' id='page_numbers'> </span>
-
- <a class='search_page_nav_link' id='next_link'
- title='&rdetail.page.next;'>»</a>
- <!--
- <a class='search_page_nav_link'
- id='end_link' title="&rdetail.page.last;">&rdetail.end;</a>
- -->
- </span>
-
- </td>
-
- <td colspan='5'
- style='padding-bottom: 4px; text-align:center; vertical-align: top; border-bottom: 1px solid #E0E0E0;'>
- <span id='search_info_table' class='hide_me' style='font-size: 8pt;'>
- <b>&result.info.copies; </b>
- </span>
- </td>
- </tr>
-
- <tr style='height: 2em;' id='result_thead_row'>
- <td>
- <div class='hide_me' id='no_formats' style='padding: 4px;'>
- <b>
- <span style='color:red;'>*</span>
- &result.info.no.items;
- <div>&result.info.format.items;</div>
- </b>
- </div>
-
- <div class='hide_me' id='rresult_show_all' style='padding: 4px;'>
- <a href='javascript:rresultExpandSearch();' id='rresult_show_all_link'
- class='classic_link'>&result.info.show; </a>
- </div>
-
- <div class='hide_me' id='rresult_show_here' style='padding: 4px;'>
- <a href='javascript:rresultContractSearch();' id='rresult_show_here_link'
- class='classic_link'>&result.info.show; </a>
- </div>
-
- </td>
- <td rowspan='2' style='font-size: 8pt; padding-top: 4px;' class='copy_count_cell'
- width='12%' align='center' name='result_thead_ccell'> </td>
- </tr>
-
- </tbody>
-</table>
-
+<table style='width: 100%;'>
+ <tbody>
+
+ <tr class='color_4' style='height: 1em;'>
+
+ <td style='vertical-align: top;' id='next_prev_links'>
+
+ <span class='hide_me' id='result_info_div' style='font-size: 9pt;'>
+ <span> &common.results; </span>
+ <span id='offset_start'> </span>
+ <span> - </span>
+ <span id='offset_end'> </span>
+ <span> &common.ofAtLeast; </span>
+ <span id='result_count'> </span>
+ <span style='padding-left: 6px;'> (page </span>
+ <span id='current_page'> </span>
+ <span> &common.of; </span>
+ <span id='num_pages'> </span>
+ </span>
+
+ <span id='start_end_links_span' class='hide_me'
+ style='padding-left: 40px;' >
+ <a class='search_page_nav_link' id='search_home_link'
+ title="&rdetail.page.results;">&rdetail.start;</a><a class='search_page_nav_link'
+ id='prev_link' title='&rdetail.page.previous;'>&rdetail.page.previous.short;</a>
+
+ <span class='search_page_nav_link' id='page_numbers'> </span>
+
+ <a class='search_page_nav_link' id='next_link'
+ title='&rdetail.page.next;'>&rdetail.page.next.short;</a>
+ <!--
+ <a class='search_page_nav_link'
+ id='end_link' title="&rdetail.page.last;">&rdetail.end;</a>
+ -->
+ </span>
+
+ </td>
+
+ <td colspan='5'
+ style='padding-bottom: 4px; text-align:center; vertical-align: top; border-bottom: 1px solid #E0E0E0;'>
+ <span id='search_info_table' class='hide_me' style='font-size: 8pt;'>
+ <b>&result.info.copies; </b>
+ </span>
+ </td>
+ </tr>
+
+ <tr style='height: 2em;' id='result_thead_row'>
+ <td>
+ <div class='hide_me' id='no_formats' style='padding: 4px;'>
+ <b>
+ <span style='color:red;'>*</span>
+ &result.info.no.items;
+ <div>&result.info.format.items;</div>
+ </b>
+ </div>
+
+ <div class='hide_me' id='rresult_show_all' style='padding: 4px;'>
+ <a href='javascript:rresultExpandSearch();' id='rresult_show_all_link'
+ class='classic_link'>&result.info.show; </a>
+ </div>
+
+ <div class='hide_me' id='rresult_show_here' style='padding: 4px;'>
+ <a href='javascript:rresultContractSearch();' id='rresult_show_here_link'
+ class='classic_link'>&result.info.show; </a>
+ </div>
+
+ </td>
+ <td rowspan='2' style='font-size: 8pt; padding-top: 4px;' class='copy_count_cell'
+ width='12%' align='center' name='result_thead_ccell'> </td>
+ </tr>
+
+ </tbody>
+</table>
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/result_lowhits.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/result_lowhits.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/result_lowhits.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,49 +1,49 @@
-
-<div id='result_low_hits' class='hide_me'>
-
- <br/><br/><br/>
-
- <div style='text-align: center; padding-bottom: 8px;'>
- <div id='result_low_hits_msg' class='hide_me'>&result.lowhits.few;</div>
- <div id='result_zero_hits_msg' class='hide_me'>&result.lowhits.zero;</div>
- </div>
-
- <!-- spell checker -->
- <div id='did_you_mean' class='lowhits_div hide_me'>
- <span>&result.lowhits.did.you.mean; </span>
- <a class='classic_link' id='spell_check_link'> </a>
- </div>
-
- <div id='low_hits_remove_format' class='lowhits_div hide_me'>
- <span>&result.lowhits.formats; </span>
- <a id='low_hits_remove_format_link' class='classic_link'>&result.lowhits.formats.search;</a>
- </div>
-
- <div id='low_hits_cross_ref' class='lowhits_div hide_me'>
- <span>&result.lowhits.related;</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>&result.lowhits.expand; </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>&result.lowhits.class;</span>
- <a id='low_hits_title_search' class='hide_me classic_link'
- style='padding-right: 5px;'>&result.lowhits.title;</a>
- <a id='low_hits_author_search' class='hide_me classic_link'
- style='padding-right: 5px;'>&result.lowhits.author;</a>
- <a id='low_hits_subject_search' class='hide_me classic_link'
- style='padding-right: 5px;'>&result.lowhits.subject;</a>
- <a id='low_hits_series_search' class='hide_me classic_link'
- style='padding-right: 5px;'>&result.lowhits.series;</a>
- <a id='low_hits_keyword_search' class='hide_me classic_link'
- style='padding-right: 5px;'>&result.lowhits.keyword;</a>
- </div>
-
-</div>
-
+
+<div id='result_low_hits' class='hide_me'>
+
+ <br/><br/><br/>
+
+ <div style='text-align: center; padding-bottom: 8px;'>
+ <div id='result_low_hits_msg' class='hide_me'>&result.lowhits.few;</div>
+ <div id='result_zero_hits_msg' class='hide_me'>&result.lowhits.zero;</div>
+ </div>
+
+ <!-- spell checker -->
+ <div id='did_you_mean' class='lowhits_div hide_me'>
+ <span>&result.lowhits.did.you.mean; </span>
+ <a class='classic_link' id='spell_check_link'> </a>
+ </div>
+
+ <div id='low_hits_remove_format' class='lowhits_div hide_me'>
+ <span>&result.lowhits.formats; </span>
+ <a id='low_hits_remove_format_link' class='classic_link'>&result.lowhits.formats.search;</a>
+ </div>
+
+ <div id='low_hits_cross_ref' class='lowhits_div hide_me'>
+ <span>&result.lowhits.related;</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>&result.lowhits.expand; </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>&result.lowhits.class;</span>
+ <a id='low_hits_title_search' class='hide_me classic_link'
+ style='padding-right: 5px;'>&result.lowhits.title;</a>
+ <a id='low_hits_author_search' class='hide_me classic_link'
+ style='padding-right: 5px;'>&result.lowhits.author;</a>
+ <a id='low_hits_subject_search' class='hide_me classic_link'
+ style='padding-right: 5px;'>&result.lowhits.subject;</a>
+ <a id='low_hits_series_search' class='hide_me classic_link'
+ style='padding-right: 5px;'>&result.lowhits.series;</a>
+ <a id='low_hits_keyword_search' class='hide_me classic_link'
+ style='padding-right: 5px;'>&result.lowhits.keyword;</a>
+ </div>
+
+</div>
+
Modified: conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/result_table.xml
===================================================================
--- conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/result_table.xml 2010-09-10 21:02:17 UTC (rev 983)
+++ conifer/branches/rel_1_6_1/web/opac/skin/uwin/xml/result/result_table.xml 2010-09-10 21:14:08 UTC (rev 984)
@@ -1,209 +1,304 @@
-<!-- Search results are spit into this table -->
-
-<div id='result_table_div' xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <table id='res_table'>
-
- <!-- for some reason, this is the only way i can force the cell widths -->
- <thead id='result_thead'>
- <tr>
- <td class='result_table_pic_header'></td>
- <td> </td>
- </tr>
- </thead>
-
- <tbody id='result_table'>
- <tr>
-
- <td class='result_table_row'>
- <!--#include virtual="result_info.xml"-->
- </td>
- </tr>
-
- <!-- Template for displaying a search result. This row template is cloned and inserted
- for each result returned -->
-
- <tr id='result_table_template' class='hide_me'>
-
- <!-- Jacket image goes here -->
-
- <td class='result_table_row' align='left'>
- <table class='result_table_subtable'>
- <tbody class='result_table_subtbody'>
-
- <tr style='height: 1em' name='counts_row'>
-
- <td rowspan='3' class='result_table_pic_header'>
- <a><img name='item_jacket' class='result_table_pic'/></a>
- </td>
-
- <td class='result_table_title_cell' name='result_table_title_cell'>
- <!-- Title goes here -->
- <a title="&result.table.keyword;" name='item_title' class='search_link'>
- <!-- Title goes here -->
- </a>
- </td>
-
- <!-- Copy this td for each copy count appended -->
- <td rowspan='3' nowrap='nowrap' name="copy_count_cell" class='copy_count_cell'>
- </td>
-
- </tr>
-
- <tr style='height: 1em' >
- <td class='result_table_author_cell'>
- <a title="&result.table.author;" name='item_author' class='search_link'>
- <!-- Author goes here -->
- </a>
- <div>
- <span name='result_table_extra_span' class='hide_me'>
- <span name='result_table_pub_box' style='padding-left: 10px;'>
- <span name='result_table_edition_span' style='padding-left: 10px;'></span> |
- <span name='result_table_pub_span'> </span> |
- <span name='result_table_phys_span'> </span>
- </span>
- </span>
- </div>
- </td>
- </tr>
-
- <tr style='height:1em;' >
- <td name='result_table_format_cell' class='result_table_format_cell'>
-
- <a name='text_link' class='search_link'>
- <img src='../../../../images/tor/text.jpg' class='dim tor_pic' />
- </a>
-
- <a name='sound recording-nonmusical_link' class='search_link'>
- <img src='../../../../images/tor/sound recording-nonmusical.jpg' class='dim tor_pic' />
- </a>
-
- <a name='moving image_link' class='search_link'>
- <img src='../../../../images/tor/moving image.jpg' class='dim tor_pic' />
- </a>
-
- <a name='software, multimedia_link' class='search_link'>
- <img src='../../../../images/tor/software, multimedia.jpg' class='dim tor_pic' />
- </a>
-
- <a name='sound recording-musical_link' class='search_link'>
- <img src='../../../../images/tor/sound recording-musical.jpg' class='dim tor_pic' />
- </a>
-
- <a name='cartographic_link' class='search_link'>
- <img src='../../../../images/tor/cartographic.jpg' class='dim tor_pic' />
- </a>
-
- <a name='mixed material_link' class='search_link'>
- <img src='../../../../images/tor/mixed material.jpg' class='dim tor_pic' />
- </a>
-
- <a name='notated music_link' class='search_link'>
- <img src='../../../../images/tor/notated music.jpg' class='dim tor_pic' />
- </a>
-
- <a name='sound recording_link' class='search_link'>
- <img src='../../../../images/tor/sound recording.jpg' class='dim tor_pic' />
- </a>
-
- <a name='still image_link' class='search_link'>
- <img src='../../../../images/tor/still images.jpg' class='dim tor_pic' />
- </a>
-
- <a name='three dimensional object_link' class='search_link'>
- <img src='../../../../images/tor/three dimensional object.jpg' class='dim tor_pic' />
- </a>
-
- <span class='hide_me'
- style='color: #9999FF; padding-left: 10px; font-size: 7pt; font-weight: 300;'>
- <span>&common.relevancy; </span><span name='relevancy_span'> </span>
- </span>
-
- <span class='hide_me' name='place_hold_span'>
- <a style='padding-left: 8px;' href='javascript:void(0);'
- class='classic_link' name='place_hold_link'></a>
- </span>
-
- <!-- Empty span used for creating unAPI links -->
- <abbr style='padding-left: 8px;' name="unapi" class="unapi-id">
- <!-- unAPI URI goes here -->
- </abbr>
-
- <!-- Empty span used for creating Google Book Search-->
- <span name="googleBooksLink" class="hide_me">
- <a style='padding-left: 8px;' class='classic_link' name="googleBooks-link"></a>
- </span>
-
-
- </td>
- </tr>
-
- </tbody>
- </table>
- </td>
- </tr>
- </tbody>
- </table>
-
-
- <!-- ====================== -->
- <table style='width: 100%; margin-top: 12px;' id='result_info_2' class='hide_me'>
- <tbody>
-
- <tr class='color_4' style='height: 1em;'>
-
- <td style='vertical-align: top;' id='next_prev_links2'>
-
- <span class='hide_me' id='result_info_div2' style='font-size: 9pt;'>
- <span> &common.results; </span>
- <b id='offset_start2'> </b>
- <span> - </span>
- <b id='offset_end2'> </b>
- <span> &common.ofAtLeast; </span>
- <b id='result_count2'> </b>
- <span style='padding-left: 6px;'> (page </span>
- <span id='current_page2'> </span>
- <span> &common.of; </span>
- <span id='num_pages2'> </span>
- </span>
-
- <span id='start_end_links_span2' class='hide_me'
- style='padding-left: 40px;' >
- <a class='search_page_nav_link' id='search_home_link2'
- title="&rdetail.page.results;">&rdetail.start;</a><a class='search_page_nav_link'
- id='prev_link2' title='&rdetail.page.previous;'>«</a>
-
- <span class='search_page_nav_link' id='page_numbers2'> </span>
- <a class='search_page_nav_link' id='next_link2'
- title='&rdetail.page.next;'>»</a>
- <!--
- <a class='search_page_nav_link'
- id='end_link2' title="&rdetail.page.last;">&rdetail.end;</a>
- -->
- </span>
-
- </td>
-
- <td colspan='5'
- style='padding-bottom: 4px; text-align:center; vertical-align: top; border-bottom: 1px solid #E0E0E0;'>
- <!--
- <span id='search_info_table2' style='font-size: 8pt;'>
- <b>Available copies / Total copies </b>
- </span>
- -->
- </td>
- </tr>
- </tbody>
- </table>
- <!-- ====================== -->
-
-
- <script language='javascript' type='text/javascript'>
- config.names.result.format_cell = 'result_table_format_cell';
- config.names.result.format_link = 'resource_link'
- config.names.result.format_pic = 'format_pic'
- </script>
-
-</div>
-
-
+<!-- Search results are spit into this table -->
+
+<div id='result_table_div' xmlns:xi="http://www.w3.org/2001/XInclude">
+
+ <table id='res_table'>
+
+ <!-- for some reason, this is the only way i can force the cell widths -->
+ <thead id='result_thead'>
+ <tr>
+ <td class='result_table_pic_header'></td>
+ <td> </td>
+ </tr>
+ </thead>
+
+ <tbody id='result_table'>
+ <tr>
+
+ <td class='result_table_row'>
+ <!--#include virtual="result_info.xml"-->
+ </td>
+ </tr>
+
+ <!-- Template for displaying a search result. This row template is cloned and inserted
+ for each result returned -->
+
+ <tr id='result_table_template' class='hide_me'>
+
+ <!-- Jacket image goes here -->
+
+ <td class='result_table_row' align='left'>
+ <table class='result_table_subtable'>
+ <tbody class='result_table_subtbody'>
+
+ <tr style='height: 1em' name='counts_row'>
+
+ <td rowspan='5' class='result_table_pic_header'>
+ <a><img name='item_jacket' class='result_table_pic'/></a>
+ </td>
+
+ <td class='result_table_title_cell' name='result_table_title_cell'>
+ <!-- Title goes here -->
+ <a title="&result.table.keyword;" name='item_title' class='search_link'>
+ <!-- Title goes here -->
+ </a>
+ </td>
+
+ <!-- Copy this td for each copy count appended -->
+ <td rowspan='5' nowrap='nowrap' name="copy_count_cell" class='copy_count_cell'>
+ </td>
+
+ </tr>
+
+ <tr style='height: 1em' >
+ <td class='result_table_author_cell'>
+ <a title="&result.table.author;" name='item_author' class='search_link'>
+ <!-- Author goes here -->
+ </a>
+ <div>
+ <span name='result_table_extra_span' class='hide_me'>
+ <span name='result_table_pub_box' style='padding-left: 10px;'>
+ <span name='result_table_edition_span' style='padding-left: 10px;'></span> |
+ <span name='result_table_pub_span'> </span> |
+ <span name='result_table_phys_span'> </span>
+ </span>
+ </span>
+ </div>
+ </td>
+ </tr>
+
+ <tr name="local_callnumber_list" class="result_table_title_cell hide_me">
+ <td colspan="2">&result.localCallNumbers;
+ <!-- Prevent records with dozens of items attached from filling the screen -->
+ <span type='opac/slot-data+marcxml-full' query='volumes'>
+ <span class='hide_me' debug='true' type='opac/slot-format'><![CDATA[
+ var item_cnt = 0;
+ var max_items = 4;
+
+ var output = dojo.create('span');
+
+ dojo.query('volume', item).forEach(function(vol) {
+ if (item_cnt >= max_items) {
+ return output.innerHTML;
+ }
+ dojo.query('copy', vol).forEach(function (cp) {
+ if (cp.getAttribute('deleted') == 't') {
+ return;
+ }
+ var loc_id;
+ var vol_appended = false;
+ dojo.query('location', cp).forEach(function (location) {
+ loc_id = parseInt(location.getAttribute('ident'));
+ if (loc_id != 8 && loc_id != 20) {
+ if (!vol_appended) {
+ dojo.create('span',{ className: 'live_location_cell',
+ innerHTML: vol.getAttribute('label')},
+ output);
+ vol_appended = true;
+ }
+ /*
+ var pfx = dojo.doc.createTextNode(' - ');
+ output.appendChild(pfx);
+ */
+ dojo.create('span', { className: 'live_separator_cell',
+ "innerHTML": ' - '},
+ output);
+ dojo.create('span', { className: 'live_location_cell',
+ "innerHTML": dojox.xml.parser.textContent(location)},
+ output);
+ }
+ });
+ if (loc_id == 8 || loc_id == 20) {
+ return;
+ }
+ dojo.query('status', cp).forEach(function (status) {
+ var pfx = dojo.doc.createTextNode(' (');
+ output.appendChild(pfx);
+ dojo.create('span', { className: 'live_status_cell',
+ "innerHTML": dojox.xml.parser.textContent(status) }, output);
+ var sfx = dojo.doc.createTextNode(')');
+ output.appendChild(sfx);
+ });
+ dojo.create('br', null, output);
+
+ item_cnt++;
+ if (item_cnt >= max_items) {
+ output.appendChild(dojo.doc.createTextNode('... more items in full record'));
+ }
+ });
+ });
+ return output.innerHTML;
+ ]]></span>
+ </span>
+
+ <!-- Be lenient in what we accept -->
+ <span type='opac/slot-data+marcxml-full' query='volumes volume uris uri'>
+ <span class='hide_me' type='opac/slot-format'><![CDATA[
+ var output = dojo.create('span');
+ var uri = new Object;
+ uri.href = item.getAttribute('href');
+ uri.label = item.getAttribute('label');
+ uri.use = item.getAttribute('use_restriction');
+ if (uri.href == uri.label) {
+ if (uri.use && uri.use != uri.label) {
+ uri.label = uri.use;
+ uri.use = null;
+ }
+ }
+ var link = dojo.create('a', {"class":"search_link", "href": uri.href});
+ var link_text = dojo.doc.createTextNode(uri.label);
+ link.appendChild(link_text);
+ output.appendChild(link);
+
+ if (uri.use) {
+ var use_text = dojo.doc.createTextNode(' (' + uri.use + ')');
+ output.appendChild(use_text);
+ }
+ dojo.create('br', null, output);
+ return output.innerHTML;
+ ]]></span>
+ </span>
+
+ </td>
+ </tr>
+
+ <tr style='height:1em;' >
+ <td name='result_table_format_cell' class='result_table_format_cell'>
+
+ <a name='text_link' class='search_link'>
+ <img src='../../../../images/tor/text.jpg' class='dim tor_pic' />
+ </a>
+
+ <a name='sound recording-nonmusical_link' class='search_link'>
+ <img src='../../../../images/tor/sound recording-nonmusical.jpg' class='dim tor_pic' />
+ </a>
+
+ <a name='moving image_link' class='search_link'>
+ <img src='../../../../images/tor/moving image.jpg' class='dim tor_pic' />
+ </a>
+
+ <a name='software, multimedia_link' class='search_link'>
+ <img src='../../../../images/tor/software, multimedia.jpg' class='dim tor_pic' />
+ </a>
+
+ <a name='sound recording-musical_link' class='search_link'>
+ <img src='../../../../images/tor/sound recording-musical.jpg' class='dim tor_pic' />
+ </a>
+
+ <a name='cartographic_link' class='search_link'>
+ <img src='../../../../images/tor/cartographic.jpg' class='dim tor_pic' />
+ </a>
+
+ <a name='mixed material_link' class='search_link'>
+ <img src='../../../../images/tor/mixed material.jpg' class='dim tor_pic' />
+ </a>
+
+ <a name='notated music_link' class='search_link'>
+ <img src='../../../../images/tor/notated music.jpg' class='dim tor_pic' />
+ </a>
+
+ <a name='sound recording_link' class='search_link'>
+ <img src='../../../../images/tor/sound recording.jpg' class='dim tor_pic' />
+ </a>
+
+ <a name='still image_link' class='search_link'>
+ <img src='../../../../images/tor/still images.jpg' class='dim tor_pic' />
+ </a>
+
+ <a name='three dimensional object_link' class='search_link'>
+ <img src='../../../../images/tor/three dimensional object.jpg' class='dim tor_pic' />
+ </a>
+
+ <span class='hide_me'
+ style='color: #9999FF; padding-left: 10px; font-size: 7pt; font-weight: 300;'>
+ <span>&common.relevancy; </span><span name='relevancy_span'> </span>
+ </span>
+
+ <span class='hide_me' name='place_hold_span'>
+ <a style='padding-left: 8px;' href='javascript:void(0);'
+ class='classic_link' name='place_hold_link'>&opac.holds.placeHold;</a>
+ </span>
+
+ <!-- Empty span used for creating unAPI links -->
+ <abbr style='padding-left: 8px;' name="unapi" class="unapi-id">
+ <!-- unAPI URI goes here -->
+ </abbr>
+
+ <!-- Empty span used for creating Google Book Search-->
+ <span name="googleBooksLink" class="hide_me">
+ <a style='padding-left: 8px;' class='classic_link' name="googleBooks-link">&result.googleBooks.browse;</a>
+ </span>
+
+
+ </td>
+ </tr>
+
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
+
+ <!-- ====================== -->
+ <table style='width: 100%; margin-top: 12px;' id='result_info_2' class='hide_me'>
+ <tbody>
+
+ <tr class='color_4' style='height: 1em;'>
+
+ <td style='vertical-align: top;' id='next_prev_links2'>
+
+ <span class='hide_me' id='result_info_div2' style='font-size: 9pt;'>
+ <span> &common.results; </span>
+ <b id='offset_start2'> </b>
+ <span> - </span>
+ <b id='offset_end2'> </b>
+ <span> &common.ofAtLeast; </span>
+ <b id='result_count2'> </b>
+ <span style='padding-left: 6px;'> (page </span>
+ <span id='current_page2'> </span>
+ <span> &common.of; </span>
+ <span id='num_pages2'> </span>
+ </span>
+
+ <span id='start_end_links_span2' class='hide_me'
+ style='padding-left: 40px;' >
+ <a class='search_page_nav_link' id='search_home_link2'
+ title="&rdetail.page.results;">&rdetail.start;</a><a class='search_page_nav_link'
+ id='prev_link2' title='&rdetail.page.previous;'>&rdetail.page.previous.symbol;</a>
+
+ <span class='search_page_nav_link' id='page_numbers2'> </span>
+ <a class='search_page_nav_link' id='next_link2'
+ title='&rdetail.page.next;'>&rdetail.page.next.symbol;</a>
+ <!--
+ <a class='search_page_nav_link'
+ id='end_link2' title="&rdetail.page.last;">&rdetail.end;</a>
+ -->
+ </span>
+
+ </td>
+
+ <td colspan='5'
+ style='padding-bottom: 4px; text-align:center; vertical-align: top; border-bottom: 1px solid #E0E0E0;'>
+ <!--
+ <span id='search_info_table2' style='font-size: 8pt;'>
+ <b>Available copies / Total copies </b>
+ </span>
+ -->
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <!-- ====================== -->
+
+
+ <script language='javascript' type='text/javascript'>
+ config.names.result.format_cell = 'result_table_format_cell';
+ config.names.result.format_link = 'resource_link'
+ config.names.result.format_pic = 'format_pic'
+ </script>
+
+</div>
+
+
More information about the open-ils-commits
mailing list