reorganizing into logical chunks for ease of maintenance
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Wed, 14 Dec 2005 22:45:15 +0000 (22:45 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Wed, 14 Dec 2005 22:45:15 +0000 (22:45 +0000)
git-svn-id: svn://svn.open-ils.org/ILS/trunk@2385 dcc99617-32d9-48b4-a31d-7c20da2025e4

73 files changed:
Open-ILS/web/opac/skin/default/xml/advanced/advanced_contains.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/advanced/advanced_location.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/advanced/advanced_marc.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/advanced/advanced_quick.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/advanced/advanced_refined.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/advanced/advanced_wizard.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/altcanvas.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/body.xml
Open-ILS/web/opac/skin/default/xml/common/altcanvas.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/common/css_common.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/common/fonts.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/common/format_selector.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/common/holds.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/common/ilsevents.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/common/js_common.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/common/libselect.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/common/login.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/common/logo.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/common/orgtree.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/common/searchbar.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/common/sidebar.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/common/statusbar.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/common/stypes_selector.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/common/tips.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/css_common.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/fonts.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/header.xml
Open-ILS/web/opac/skin/default/xml/holds.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/home/homesearch.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/home/index_body.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/homesearch.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/ilsevents.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/index.xml
Open-ILS/web/opac/skin/default/xml/index_body.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/js_common.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/login.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/logo.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/myopac/myopac_fines.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/myopac/myopac_prefs.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/myopac_checked.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/myopac_fines.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/myopac_holds.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/myopac_prefs.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/myopac_summary.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/orgtree.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/page_advanced.xml
Open-ILS/web/opac/skin/default/xml/page_mresult.xml
Open-ILS/web/opac/skin/default/xml/page_myopac.xml
Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
Open-ILS/web/opac/skin/default/xml/page_rresult.xml
Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_altcanvas.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/rdetail_altcanvas.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/rdetail_copyinfo.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/rdetail_extras.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/rdetail_summary.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/result/result_common.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/result/result_info.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/result/result_lowhits.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/result/result_table.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/result_common.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/result_info.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/result_lowhits.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/result_table.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/searchbar.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/sidebar.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/statusbar.xml [deleted file]
Open-ILS/web/opac/skin/default/xml/tips.xml [deleted file]

diff --git a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_contains.xml b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_contains.xml
new file mode 100644 (file)
index 0000000..ad77869
--- /dev/null
@@ -0,0 +1,5 @@
+<select id='<!--#echo var="OILS_ADV_CONT_ID"-->'>
+       <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>
diff --git a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_location.xml b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_location.xml
new file mode 100644 (file)
index 0000000..613ccc6
--- /dev/null
@@ -0,0 +1,10 @@
+<table>
+       <tbody>
+               <tr>
+                       <td><!--#include virtual="statusbar.xml"--></td>
+                       <td><a style='padding-left: 20px;'  href='javascript:void(0);'
+                               class='classic_link'>Change search location</a></td>
+               </tr>
+       </tbody>
+</table>
+
diff --git a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_marc.xml b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_marc.xml
new file mode 100644 (file)
index 0000000..88a3833
--- /dev/null
@@ -0,0 +1,44 @@
+<table class='data_grid' width='95%'>
+       <thead>
+               <tr>
+                       <td colspan='6'>&opac.advanced.marc.title; (&opac.advanced.marc.warning;)</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'> </input>
+                       </td>
+                       <!--
+                       <td>
+                               <span>&opac.advanced.marc.ind1;: </span>
+                               <input name='advanced.marc.ind1' maxlength='1' size='1'> </input>
+                       </td>
+                       <td>
+                               <span>&opac.advanced.marc.ind2;: </span>
+                               <input name='advanced.marc.ind2' maxlength='1' size='1'> </input>
+                       </td>
+                       -->
+                       <td>
+                               <span>&opac.advanced.marc.subfield;: </span>
+                               <input name='advanced.marc.subfield' maxlength='1' size='1'> </input>
+                       </td>
+                       <td>
+                               <span>&opac.advanced.marc.value;: </span>
+                               <input name='advanced.marc.value' size='24'> </input>
+                       </td>
+
+                       <td>
+                               <input name='advanced.marc.addrow' type='submit'
+                                       value='&opac.advanced.marc.addrow;'> </input>
+                       </td>
+               </tr>
+               <tr>
+                       <td colspan='6'>
+                               <input name='advanced.marc.submit' 
+                                       type='submit' value='&common.submit;'> </input>
+                       </td>
+               </tr>
+       </tbody>
+</table>
diff --git a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_quick.xml b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_quick.xml
new file mode 100644 (file)
index 0000000..5b7b9c4
--- /dev/null
@@ -0,0 +1,17 @@
+<table class='data_grid' width='95%'>
+       <thead>
+               <tr>
+                       <td colspan='6'>&opac.advanced.quick.title;</td>
+               </tr>
+       </thead>
+       <tbody>
+               <tr>
+                       <td>
+                               <!--
+                               <span>&opac.advanced.marc.tag;: </span>
+                               <input name='advanced.marc.tag' maxlength='3' size='3'> </input>
+                               -->
+                       </td>
+               </tr>
+       </tbody>
+</table>
diff --git a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_refined.xml b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_refined.xml
new file mode 100644 (file)
index 0000000..486281e
--- /dev/null
@@ -0,0 +1,56 @@
+<table class='data_grid' width='80%'>
+       <thead>
+               <tr><td colspan='3'>&opac.advanced.refined.title;</td></tr>
+       </thead>
+       <tbody style='text-align: left'>
+               <tr>
+                       <td>&common.title;</td>
+                       <td>
+                               <!--#set var='OILS_ADV_CONT_ID' value="advanced.refined.title_type"-->
+                               <!--#include virtual="advanced_contains.xml"-->
+                       </td>
+                       <td align='center'>
+                               <input type='text' size='36' id='advanced.refined.title_contains'> </input>
+                       </td>
+               </tr>
+               <tr>
+                       <td>&common.author;</td>
+                       <td>
+                               <!--#set var='OILS_ADV_CONT_ID' value="advanced.refined.author_type"-->
+                               <!--#include virtual="advanced_contains.xml"-->
+                       </td>
+                       <td align='center'>
+                               <input type='text' size='36' id='advanced.refined.author_contains'> </input>
+                       </td>
+               </tr>
+               <tr>
+                       <td>&common.subject;</td>
+                       <td>
+                               <!--#set var='OILS_ADV_CONT_ID' value="advanced.refined.subject_type"-->
+                               <!--#include virtual="advanced_contains.xml"-->
+                       </td>
+                       <td align='center'>
+                               <input type='text' size='36' id='advanced.refined.subject_contains'> </input>
+                       </td>
+               </tr>
+               <tr>
+                       <td>&common.series;</td>
+                       <td>
+                               <!--#set var='OILS_ADV_CONT_ID' value="advanced.refined.series_type"-->
+                               <!--#include virtual="advanced_contains.xml"-->
+                       </td>
+                       <td align='center'>
+                               <input type='text' size='36' id='advanced.refined.series_contains'> </input>
+                       </td>
+               </tr>
+               <tr>
+                       <td><span>&common.format;: </span></td>
+                       
+                       <td> <!--#include virtual="../common/format_selector.xml"--> </td>
+                       <td colspan='1' align='center'>
+                               <input type='submit' 
+                                       id='advanced.refined.submit' value='&common.submit;'> </input>
+                       </td>
+               </tr>
+       </tbody>
+</table>
diff --git a/Open-ILS/web/opac/skin/default/xml/advanced/advanced_wizard.xml b/Open-ILS/web/opac/skin/default/xml/advanced/advanced_wizard.xml
new file mode 100644 (file)
index 0000000..cf7dac4
--- /dev/null
@@ -0,0 +1,44 @@
+<table class='data_grid' width='80%'>
+       <thead>
+               <tr><td colspan='2'>&opac.advanced.wizard.title;</td></tr>
+       </thead>
+       <tbody style='text-align: left'>
+               <tr>
+                       <td>&opac.advanced.wizard.contains;</td>
+                       <td align='center'>
+                               <input type='text' size='36' id='advanced.wizard.contains'> </input>
+                               <!--
+                               <script language='javascript'>$('advanced.wizard.contains').focus();</script>
+                               -->
+                       </td>
+               </tr>
+               <tr>
+                       <td>&opac.advanced.wizard.nocontains;</td>
+                       <td align='center'>
+                               <input type='text' size='36' id='advanced.wizard.nocontains'> </input>
+                       </td>
+               </tr>
+               <tr>
+                       <td>&opac.advanced.wizard.exact;</td>
+                       <td align='center'>
+                               <input type='text' size='36' id='advanced.wizard.exact'> </input>
+                       </td>
+               </tr>
+               <tr>
+                       <td align='center'>
+                               <span>&common.type;: </span>
+                               <!--#include virtual="../common/stypes_selector.xml"-->
+                       </td>
+                       <td align='center'>
+                               <span>&common.format;: </span>
+                               <!--#include virtual="../common/format_selector.xml"-->
+                       </td>
+               </tr>
+               <tr>
+                       <td colspan='2' align='center'>
+                               <input type='submit' 
+                                       id='advanced.wizard.submit' value='&common.submit;'> </input>
+                       </td>
+               </tr>
+       </tbody>
+</table>
diff --git a/Open-ILS/web/opac/skin/default/xml/altcanvas.xml b/Open-ILS/web/opac/skin/default/xml/altcanvas.xml
deleted file mode 100644 (file)
index 5d19ad6..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-
-<!-- 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'>
-               config.ids.altcanvas.login                      = config.ids.login.box;
-               config.ids.altcanvas.org_tree           = config.ids.common.org_container;
-               config.ids.altcanvas.holds                      = 'holds_box';
-               config.ids.altcanvas.xulholds           = 'xulholds_box';
-               config.ids.altcanvas.loading            = 'loading_alt';
-       </script>
-
-       <!--#if expr="$FRONT_PAGE!='true'"-->
-               <!--#include virtual="holds.xml"-->
-       <!--#endif-->
-
-       <div id='loading_alt' class='hide_me non_canvas' style='margin-top: 6px;'>
-               <div style='margin-top: 30px; text-align: left; font-weight: 700;' class='color_3'>
-                       <span id='loading_alt_span'> Searching </span>
-               </div>
-       </div>
-
-</div>
index 1509248..7178552 100644 (file)
@@ -3,19 +3,23 @@
                <tbody>
                        <tr>
                                <td id='main_left_cell'>
-                                       <!--#include virtual="logo.xml"-->
-                                       <!--#include virtual="sidebar.xml"-->
+                                       <!--#include virtual="common/logo.xml"-->
+                                       <!--#include virtual="common/sidebar.xml"-->
                                </td>
                                <td id='main_right_cell'>
                                        <div id='canvas' class='canvas'>
-                                               <!--#include virtual="searchbar.xml"-->
-                                               <!--#include virtual="statusbar.xml"-->
-                                               <!--#include virtual="altcanvas.xml"-->
-                                               <!--#include virtual="ilsevents.xml"--> 
+                                               <!--#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="tips.xml"-->
+                                       <!--#include virtual="common/tips.xml"-->
                                </td>
                        </tr>
                </tbody>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/altcanvas.xml b/Open-ILS/web/opac/skin/default/xml/common/altcanvas.xml
new file mode 100644 (file)
index 0000000..6a29369
--- /dev/null
@@ -0,0 +1,34 @@
+
+<!-- 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'>
+               config.ids.altcanvas.org_tree           = config.ids.common.org_container;
+               config.ids.altcanvas.holds                      = 'holds_box';
+               config.ids.altcanvas.xulholds           = 'xulholds_box';
+               config.ids.altcanvas.loading            = 'loading_alt';
+       </script>
+
+       <!--#if expr="$FRONT_PAGE!='true'"-->
+               <!--#include virtual="holds.xml"-->
+       <!--#endif-->
+
+       <div id='loading_alt' class='hide_me non_canvas' style='margin-top: 6px;'>
+               <div style='margin-top: 30px; text-align: left; font-weight: 700;' class='color_3'>
+                       <span id='loading_alt_span'> Searching </span>
+               </div>
+       </div>
+
+</div>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/css_common.xml b/Open-ILS/web/opac/skin/default/xml/common/css_common.xml
new file mode 100644 (file)
index 0000000..7edcbee
--- /dev/null
@@ -0,0 +1,16 @@
+
+<!-- CSS shared across pages goes here --> 
+
+<link type='text/css' rel='stylesheet' href='../css/layout.css'/>
+
+<!-- Our font CSS's -->
+<link type='text/css' rel='stylesheet'                                 
+       href='<!--#echo var="OILS_CSS_BASE"-->/mediumfont.css' name='meduim_fonts' csstype='font'/>
+
+<!-- Our colors -->
+<link type='text/css' rel="stylesheet" href="<!--#echo var='OILS_THEME_BASE'-->/default/css/colors.css"  
+       name='Default' csstype='color'/>
+
+<link type='text/css' rel="alternate stylesheet" href="<!--#echo var='OILS_THEME_BASE'-->/water/css/colors.css" 
+       title='Water' name='Water' csstype="color" />
+
diff --git a/Open-ILS/web/opac/skin/default/xml/common/fonts.xml b/Open-ILS/web/opac/skin/default/xml/common/fonts.xml
new file mode 100644 (file)
index 0000000..f337350
--- /dev/null
@@ -0,0 +1,10 @@
+<div id='fonts_div'>
+
+       <div id='text_size_div' style='position:absolute; top: 2px; right: 6px;'>
+               <span>Text Size: </span>
+               <span><a href="javascript:void(0);" onclick="setFontSize('medium');"> Regular </a></span>
+               <span> / </span>
+               <span><a href="javascript:void(0);" onclick="setFontSize('large');"> Large </a></span>
+       </div>
+       
+</div>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/format_selector.xml b/Open-ILS/web/opac/skin/default/xml/common/format_selector.xml
new file mode 100644 (file)
index 0000000..910fb82
--- /dev/null
@@ -0,0 +1,10 @@
+<select id='form_selector' >
+       <option value='all'>&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>
+       
diff --git a/Open-ILS/web/opac/skin/default/xml/common/holds.xml b/Open-ILS/web/opac/skin/default/xml/common/holds.xml
new file mode 100644 (file)
index 0000000..5ee36a2
--- /dev/null
@@ -0,0 +1,71 @@
+
+<div>
+       <div id='xulholds_box' class='hide_me non_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'> </input></td>
+                                               <td><input type='submit' value='&common.submit;' 
+                                                       id='xul_recipient_barcode_submit'> </input></td>
+                                       </tr>
+                               </tbody>
+                       </table>
+               </center>
+       </div>
+
+       <div id='holds_box' class='hide_me non_canvas' style='margin-top: 6px;'>
+       
+               <br/><br/>
+               <table width='75%'>
+                       <tbody>
+                               <tr>
+                                       <td class='holds_cell color_1' 
+                                               align='center' colspan='2'>&opac.holds.placeHold;</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;:</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>
+                                       <td class='holds_cell'>&opac.holds.contactPhone;:</td>
+                                       <td class='holds_cell' id='holds_phone'> </td>
+                               </tr>
+                               <tr>
+                                       <td class='holds_cell'>&opac.holds.concactEmail;:</td>
+                                       <td class='holds_cell' id='holds_email'> </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' align='center' colspan='2'>
+                                               <button id='holds_submit'>&opac.holds.placeHold;</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>
+       
+       </div>
+</div>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/ilsevents.xml b/Open-ILS/web/opac/skin/default/xml/common/ilsevents.xml
new file mode 100644 (file)
index 0000000..671430d
--- /dev/null
@@ -0,0 +1,13 @@
+<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.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>
+
diff --git a/Open-ILS/web/opac/skin/default/xml/common/js_common.xml b/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
new file mode 100644 (file)
index 0000000..a09b0a2
--- /dev/null
@@ -0,0 +1,30 @@
+
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js'> </script>
+
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/config.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/CGI.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/Cookie.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/Cookies.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/md5.js'> </script>
+
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->//slimtree.js'> </script>
+
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/JSON.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/fmcore.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/fmgen.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/opac_utils.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/OrgTree.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/org_utils.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/init.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/added_content.js'> </script>
+
+       <!-- Some global js -->
+       <script language='javascript'>
+               config.css.color_1 = "color_1";
+               config.css.color_2 = "color_2";
+               config.css.color_3 = "color_3";
+       </script>
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/common/libselect.xml b/Open-ILS/web/opac/skin/default/xml/common/libselect.xml
new file mode 100644 (file)
index 0000000..7645516
--- /dev/null
@@ -0,0 +1,11 @@
+<span>
+       <span class='hide_me' id='depth_selector_span'>
+               <select id='depth_selector' >
+                       <option value='new'>Choose a different library...</option>
+               </select>
+       </span>
+       <span class='hide_me' id='lib_selector_span'>
+               <a id='lib_selector_link' class='classic_link' href='javascript:void(0)'>Choose a library to search</a>
+       </span>
+</span>
+
diff --git a/Open-ILS/web/opac/skin/default/xml/common/login.xml b/Open-ILS/web/opac/skin/default/xml/common/login.xml
new file mode 100644 (file)
index 0000000..37c5190
--- /dev/null
@@ -0,0 +1,59 @@
+
+<div id='login_box' class='hide_me non_canvas' style='margin-top: 6px;'>
+
+       <script language='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>
+
+       <div class='login_text color_1'>
+               <span>&opac.login.login;</span>
+       </div>
+
+       <br/>
+
+       <table>
+               <tbody>
+                       <tr>
+                               <td><span class='login_text'>&common.username;</span></td>
+                               <td>
+                                       <span class='login_text'>
+                                               <input id='login_username' type='text' size='16'> </input>
+                                       </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'> </input>
+                                       </span>
+                               </td>
+                       </tr>
+                       <tr><td><br/></td></tr>
+                       <tr>
+                               <td>
+                                       <span class='login_text'>
+                                       <a href="javascript:void(0);" id='login_button'> &common.login; </a>
+                                       </span>
+                               </td>
+                               <td>
+                                       <span class='login_text'>
+                                               <a href='javascript:void(0);' id='login_cancel_button'> &common.cancel; </a>
+                                       </span>
+                               </td>
+                       </tr>
+               </tbody>
+       </table>
+
+</div>
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/common/logo.xml b/Open-ILS/web/opac/skin/default/xml/common/logo.xml
new file mode 100644 (file)
index 0000000..268a297
--- /dev/null
@@ -0,0 +1,4 @@
+<div id='logo_div'>
+       <script language='javascript'>config.ids.common.top_logo = "top_left_logo";</script>
+       <img src='../../../../images/small_logo.jpg' id='top_left_logo' border='0' class='logo'> </img>
+</div>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/orgtree.xml b/Open-ILS/web/opac/skin/default/xml/common/orgtree.xml
new file mode 100644 (file)
index 0000000..7d71b3b
--- /dev/null
@@ -0,0 +1,27 @@
+
+<!-- the org tree -->
+<div id='org_container' class='hide_me non_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>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml b/Open-ILS/web/opac/skin/default/xml/common/searchbar.xml
new file mode 100644 (file)
index 0000000..132682c
--- /dev/null
@@ -0,0 +1,67 @@
+
+<!-- Searchbar for doing metarecord searches -->
+
+<div id='searchbar'>
+
+       <!-- load my js -->
+       <script language='javascript' src='../js/search_bar.js'> </script>
+
+       <script language='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' width='100%' style='border-collapse: collapse;'>
+               <tbody>
+                       <tr>
+
+                               <td nowrap='nowrap' align='center' 
+                                       style='width: 240px; padding: 3px; border: 1px solid #A0A0A0;' class='color_2'>
+                                       <input id='search_box' style='width: 190px;' type='text' />
+                                       <span style='padding-left: 6px;'>
+                                               <input type='button' style='width: 40px;' id='search_submit' value='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;'>
+                                               <!--
+                                               <span>&common.format;: </span>
+                                               -->
+                                               <!--#include virtual="format_selector.xml"-->
+                                       </span>
+
+                                       <!--#include virtual="libselect.xml"-->
+
+                               </td>
+                       </tr>
+               </tbody>
+       </table>
+</div>
+
+
+
+
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml b/Open-ILS/web/opac/skin/default/xml/common/sidebar.xml
new file mode 100644 (file)
index 0000000..e6931ad
--- /dev/null
@@ -0,0 +1,146 @@
+
+<!-- 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'  style='border: 1px solid #A7EA9D;'>
+                       <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="Record Details"
+                               id='rdetail_link_div' class="side_bar_item hide_me">
+                               <span>My Title Details</span>
+                       </div>
+               </div>
+       </div>
+
+       <br/>
+       <div id='subject_tree_sidebar' class='sidebar_chunk hide_me'> 
+               <div id='subject_sidebar_tree_div'> </div>
+               <script language='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'>
+                       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'>
+                       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>
+
+
+       <!-- ============================================================================= -->
+       <!-- Our javascript -->
+       <script language='javascript' src='../js/sidebar.js'> </script>
+
+       <script language='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>
+
diff --git a/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml b/Open-ILS/web/opac/skin/default/xml/common/statusbar.xml
new file mode 100644 (file)
index 0000000..866cf5e
--- /dev/null
@@ -0,0 +1,19 @@
+
+<div id='statusbar' style='margin-bottom: 6px; margin-top: 6px;'>
+
+       <table width='100%'>
+               <tbody>
+                       <tr>
+                               <td align='left'>
+                                       <span> Now searching </span>
+                                       <span style='padding: 1px; ' id='now_searching_location'>  </span>
+                               </td>
+                       </tr>
+               </tbody>
+       </table>
+
+       <script language='javascript'>
+               config.ids.common.now_searching = 'now_searching_location';
+       </script>
+
+</div>
diff --git a/Open-ILS/web/opac/skin/default/xml/common/stypes_selector.xml b/Open-ILS/web/opac/skin/default/xml/common/stypes_selector.xml
new file mode 100644 (file)
index 0000000..588030c
--- /dev/null
@@ -0,0 +1,8 @@
+<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>
+
diff --git a/Open-ILS/web/opac/skin/default/xml/common/tips.xml b/Open-ILS/web/opac/skin/default/xml/common/tips.xml
new file mode 100644 (file)
index 0000000..644e07a
--- /dev/null
@@ -0,0 +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;">Tip:  </span>
+</div>
diff --git a/Open-ILS/web/opac/skin/default/xml/css_common.xml b/Open-ILS/web/opac/skin/default/xml/css_common.xml
deleted file mode 100644 (file)
index 33468c7..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-
-<!-- CSS shared across pages goes here --> 
-
-<link type='text/css' rel='stylesheet' href='../css/layout.css'/>
-
-<!-- Our font CSS's -->
-<link type='text/css' rel='stylesheet'                                 
-       href='<!--#echo var="OILS_CSS_BASE"-->/mediumfont.css' name='meduim_fonts' csstype='font'/>
-
-<!-- Our colors -->
-<link type='text/css' rel="stylesheet" href="<!--#echo var='OILS_THEME_BASE'-->/default/css/colors.css"  
-       name='Default' csstype='color'/>
-
-<link type='text/css' rel="alternate stylesheet" href="<!--#echo var='OILS_THEME_BASE'-->/test/css/colors.css" 
-       title='Color Test' name='ColorTest' csstype="color" />
-
diff --git a/Open-ILS/web/opac/skin/default/xml/fonts.xml b/Open-ILS/web/opac/skin/default/xml/fonts.xml
deleted file mode 100644 (file)
index 1406de0..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id='fonts_div'>
-
-       <span>
-               <span>Text Size: </span>
-               <span><a href="javascript:void(0);" onclick="setFontSize('small');"> Small </a></span>
-               <span> / </span>
-               <span><a href="javascript:void(0);" onclick="setFontSize('medium');"> Medium </a></span>
-               <span> / </span>
-               <span><a href="javascript:void(0);" onclick="setFontSize('large');"> Large </a></span>
-       </span>
-
-</div>
index 49c7dd0..76bb10f 100644 (file)
@@ -1,12 +1,12 @@
 <head>
        <!-- Set the page title -->
 
-       <!--#include virtual="css_common.xml"-->
+       <!--#include virtual="common/css_common.xml"-->
 
        <title>&<!--#echo var="OILS_TITLE"-->;</title>
 
        <!--#if expr="$slimpac!='true'"-->
-               <!--#include virtual="js_common.xml"-->
+               <!--#include virtual="common/js_common.xml"-->
        <!--#endif-->
 
 </head>
diff --git a/Open-ILS/web/opac/skin/default/xml/holds.xml b/Open-ILS/web/opac/skin/default/xml/holds.xml
deleted file mode 100644 (file)
index 5ee36a2..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-
-<div>
-       <div id='xulholds_box' class='hide_me non_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'> </input></td>
-                                               <td><input type='submit' value='&common.submit;' 
-                                                       id='xul_recipient_barcode_submit'> </input></td>
-                                       </tr>
-                               </tbody>
-                       </table>
-               </center>
-       </div>
-
-       <div id='holds_box' class='hide_me non_canvas' style='margin-top: 6px;'>
-       
-               <br/><br/>
-               <table width='75%'>
-                       <tbody>
-                               <tr>
-                                       <td class='holds_cell color_1' 
-                                               align='center' colspan='2'>&opac.holds.placeHold;</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;:</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>
-                                       <td class='holds_cell'>&opac.holds.contactPhone;:</td>
-                                       <td class='holds_cell' id='holds_phone'> </td>
-                               </tr>
-                               <tr>
-                                       <td class='holds_cell'>&opac.holds.concactEmail;:</td>
-                                       <td class='holds_cell' id='holds_email'> </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' align='center' colspan='2'>
-                                               <button id='holds_submit'>&opac.holds.placeHold;</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>
-       
-       </div>
-</div>
diff --git a/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml b/Open-ILS/web/opac/skin/default/xml/home/homesearch.xml
new file mode 100644 (file)
index 0000000..421432c
--- /dev/null
@@ -0,0 +1,110 @@
+
+<div id='canvas_main' 
+       style='border: 3px solid #A7EA9D; -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' src='../js/search_bar.js'> </script>
+
+       <script language='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='../../../../images/main_logo.jpg' />
+       </div>
+
+
+
+       <table id='frontsearch_table' height='100%' width='100%' 
+               style='margin-top: 10px; border-collapse: collapse;'>
+               <tbody>
+
+                       <tr style='background: #E0F6E0'>
+
+                               <script language='javascript'>
+                                       config.ids.common.now_searching = 'now_searching_location';
+                               </script>
+
+                               <td style='padding: 6px; border: 1px solid #D0D0D0;' class='' align='center'>
+                                       <span>&opac.search.nowSearching;</span>
+                                       <span style='padding: 1px;' id='now_searching_location'>  </span>
+                               </td>
+                       </tr>
+
+
+                       <tr><td><br/></td></tr>
+
+                       <tr>
+                               <td nowrap='nowrap' align='center' style='border: 1px solid #D0D0D0;' class='color_1'>
+                                       <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><td><br/></td></tr>
+
+                       <tr style='border: 1px solid #D0D0D0; background: #E0F6E0'>
+
+                               <td nowrap='nowrap' align='center' style='padding: 4px;'>
+
+                                       <span style='padding-right:9px;'>
+                                               <!--#include virtual="../common/stypes_selector.xml"-->
+                                       </span>
+
+                                       <span style='padding-right:9px;'>
+                                               <span>&common.format;: </span>
+                                               <!--#include virtual="../common/format_selector.xml"-->
+                                       </span>
+
+                               </td>
+                       </tr>
+
+                       <tr><td><br/></td></tr>
+
+                       <tr class='color_1' style='border: 1px solid #D0D0D0;'>
+                               <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>
+
+               </tbody>
+       </table>
+
+</div>
+
+
+
+
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/home/index_body.xml b/Open-ILS/web/opac/skin/default/xml/home/index_body.xml
new file mode 100644 (file)
index 0000000..6aab9a3
--- /dev/null
@@ -0,0 +1,21 @@
+<body onload='init(); 
+       getId("home_adv_search_link").setAttribute("href", buildOPACLink({page:ADVANCED}));
+       getId("home_myopac_link").setAttribute("href", buildOPACLink({page:MYOPAC}, false, true));'>
+       <table 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'>isFrontPage = true;</script>
+</body>
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/homesearch.xml b/Open-ILS/web/opac/skin/default/xml/homesearch.xml
deleted file mode 100644 (file)
index 52723e5..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-
-<div id='canvas_main' 
-       style='border: 3px solid #A7EA9D; -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' src='../js/search_bar.js'> </script>
-
-       <script language='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='../../../../images/main_logo.jpg' />
-       </div>
-
-
-
-       <table id='frontsearch_table' height='100%' width='100%' 
-               style='margin-top: 10px; border-collapse: collapse;'>
-               <tbody>
-
-                       <tr style='background: #E0F6E0'>
-
-                               <script language='javascript'>
-                                       config.ids.common.now_searching = 'now_searching_location';
-                               </script>
-
-                               <td style='padding: 6px; border: 1px solid #D0D0D0;' class='' align='center'>
-                                       <span>&opac.search.nowSearching;</span>
-                                       <span style='padding: 1px;' id='now_searching_location'>  </span>
-                               </td>
-                       </tr>
-
-
-                       <tr><td><br/></td></tr>
-
-                       <tr>
-                               <td nowrap='nowrap' align='center' style='border: 1px solid #D0D0D0;' class='color_1'>
-                                       <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><td><br/></td></tr>
-
-                       <tr style='border: 1px solid #D0D0D0; background: #E0F6E0'>
-
-                               <td nowrap='nowrap' align='center' style='padding: 4px;'>
-
-                                       <span style='padding-right:9px;'>
-                                               <span>&common.type;: </span>
-                                               <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>
-                                       </span>
-
-                                       <span style='padding-right:9px;'>
-                                               <span>&common.format;: </span>
-                                       <select id='form_selector' >
-                                               <option value='all'>&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>
-                                       </span>
-
-                               </td>
-                       </tr>
-
-                       <tr><td><br/></td></tr>
-
-                       <tr class='color_1' style='border: 1px solid #D0D0D0;'>
-                               <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>
-
-               </tbody>
-       </table>
-
-</div>
-
-
-
-
-
-
diff --git a/Open-ILS/web/opac/skin/default/xml/ilsevents.xml b/Open-ILS/web/opac/skin/default/xml/ilsevents.xml
deleted file mode 100644 (file)
index 671430d..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<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.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>
-
index 069ba8b..a2c9a49 100644 (file)
@@ -3,8 +3,12 @@
 <!-- Loads the environment -->
 <!--#include virtual="setenv.xml"-->
 
+<!--#if expr="$safari || !$mozilla"-->
 <!-- Tells the browser to translate the page as HTML --> 
 <?xml-stylesheet type="text/xsl" href="html_xsl.xml"?> 
+<!--#else-->
+<?xml-stylesheet type="text/xsl" href="html_xsl.xml"?>  <!-- keep this in until we can fix some bugs -->
+<!--#endif-->
 
 
 <!DOCTYPE html PUBLIC 
                <!--#include virtual="/opac/locale/${locale}/opac_rdetail.dtd"-->
        <!--#endif-->
 
+       <!--#if expr="$OILS_PAGE='advanced.xml'"-->
+               <!--#include virtual="/opac/locale/${locale}/opac_advanced.dtd"-->
+       <!--#endif-->
+
        <!--#if expr="$OILS_PAGE!='index.xml'"-->
                <!--#include virtual="/opac/locale/${locale}/opac_holds.dtd"-->
        <!--#endif-->
@@ -31,8 +39,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
        <!--#include virtual="header.xml"-->
        <!--#if expr="$OILS_PAGE='index.xml'"-->
-               <!--#include virtual="index_body.xml"-->
+               <!--#include virtual="home/index_body.xml"-->
        <!--#else-->
                <!--#include virtual="body.xml"-->
        <!--#endif-->
 </html>
+
diff --git a/Open-ILS/web/opac/skin/default/xml/index_body.xml b/Open-ILS/web/opac/skin/default/xml/index_body.xml
deleted file mode 100644 (file)
index adef0ca..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<body onload='init(); 
-       getId("home_adv_search_link").setAttribute("href", buildOPACLink({page:ADVANCED}));
-       getId("home_myopac_link").setAttribute("href", buildOPACLink({page:MYOPAC}, false, true));'>
-       <table width='100%' style='border-collapse: collapse;'>
-               <tbody>
-                       <tr>
-                               <td width='10%'> </td>
-                               <td width='80%'>
-                                       <div id='canvas'>
-                                               <!--#include virtual="altcanvas.xml"-->
-                                               <!--#include virtual="homesearch.xml"-->
-                                       </div>
-                               </td>
-                               <td width='10%'> </td>
-                       </tr>
-               </tbody>
-       </table>
-       <script language='javascript'>isFrontPage = true;</script>
-</body>
-
-
diff --git a/Open-ILS/web/opac/skin/default/xml/js_common.xml b/Open-ILS/web/opac/skin/default/xml/js_common.xml
deleted file mode 100644 (file)
index a09b0a2..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js'> </script>
-
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js'> </script>
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/config.js'> </script>
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/CGI.js'> </script>
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/Cookie.js'> </script>
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/Cookies.js'> </script>
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/md5.js'> </script>
-
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->//slimtree.js'> </script>
-
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/JSON.js'> </script>
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/fmcore.js'> </script>
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/fmgen.js'> </script>
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/opac_utils.js'> </script>
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/OrgTree.js'> </script>
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/org_utils.js'> </script>
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/RemoteRequest.js'> </script>
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/init.js'> </script>
-       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/added_content.js'> </script>
-
-       <!-- Some global js -->
-       <script language='javascript'>
-               config.css.color_1 = "color_1";
-               config.css.color_2 = "color_2";
-               config.css.color_3 = "color_3";
-       </script>
-
-
diff --git a/Open-ILS/web/opac/skin/default/xml/login.xml b/Open-ILS/web/opac/skin/default/xml/login.xml
deleted file mode 100644 (file)
index 5038d67..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-
-<div id='login_box' class='hide_me non_canvas' style='margin-top: 6px;'>
-
-       <script language='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";
-       </script>
-
-       <div class='login_text color_1'>
-               <span>&opac.login.login;</span>
-       </div>
-
-       <br/>
-
-       <table>
-               <tbody>
-                       <tr>
-                               <td><span class='login_text'>&common.username;</span></td>
-                               <td>
-                                       <span class='login_text'>
-                                               <input id='login_username' type='text' size='16'> </input>
-                                       </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'> </input>
-                                       </span>
-                               </td>
-                       </tr>
-                       <tr><td><br/></td></tr>
-                       <tr>
-                               <td>
-                                       <span class='login_text'>
-                                       <a href="javascript:void(0);" id='login_button'> &common.login; </a>
-                                       </span>
-                               </td>
-                               <td>
-                                       <span class='login_text'>
-                                               <a href='javascript:void(0);' id='login_cancel_button'> &common.cancel; </a>
-                                       </span>
-                               </td>
-                       </tr>
-               </tbody>
-       </table>
-
-</div>
-
-
diff --git a/Open-ILS/web/opac/skin/default/xml/logo.xml b/Open-ILS/web/opac/skin/default/xml/logo.xml
deleted file mode 100644 (file)
index 268a297..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<div id='logo_div'>
-       <script language='javascript'>config.ids.common.top_logo = "top_left_logo";</script>
-       <img src='../../../../images/small_logo.jpg' id='top_left_logo' border='0' class='logo'> </img>
-</div>
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_checked.xml
new file mode 100644 (file)
index 0000000..fd67694
--- /dev/null
@@ -0,0 +1,51 @@
+
+<div id='myopac_checked_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
+
+       <script language='javascript'>
+       </script>
+
+
+       <table width='100%' class='light_border data_grid'>
+
+               <thead class='color_3'>
+                       <tr>
+                               <td width='50%'>Title</td>
+                               <td width='20%'>Author</td>
+                               <td width='10%' nowrap='nowrap' align='center'>Due Data</td>
+                               <td width='10%' nowrap='nowrap' align='center'>Renewals Remaining</td>
+                               <td width='10%' nowrap='nowrap' align='center'>Renew</td>
+                       </tr>
+               </thead>
+
+               <tbody id='myopac_checked_tbody'>
+
+                       <tr id='myopac_checked_none' class='hide_me'><td>You have no items checked out at this time</td></tr>
+                       <tr id='myopac_checked_loading'><td>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>
+
+                       </tr>
+               </tbody>
+       </table>
+
+       <div id='myopac_renew_success' class='hide_me'>Item successfully renewed</div>
+
+</div>
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_fines.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_fines.xml
new file mode 100644 (file)
index 0000000..ac5a63b
--- /dev/null
@@ -0,0 +1,65 @@
+
+<div id='myopac_fines_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
+
+       <br/>
+       <table width='100%' class='data_grid data_grid_center'>
+
+               <thead class='color_3'>
+                       <tr><td colspan='3' style='background: none'><b>Summary</b></td></tr>
+                       <tr>
+                               <td width='33%'>Total Owed</td>
+                               <td width='33%'>Total Paid</td>
+                               <td width='33%'>Balance Owed</td>
+                       </tr>
+               </thead>
+
+               <tbody id='myopac_fines_summary_tbody'>
+                       <tr id='myopac_fines_summary_loading'><td>Loading...</td></tr>
+                       <tr id='myopac_fines_summary_row' class='light_border hide_me'>
+                               <td id='myopac_fines_summary_total' class='light_border'>$</td>
+                               <td id='myopac_fines_summary_paid' class='light_border'>$</td>
+                               <td id='myopac_fines_summary_balance' class='light_border' style='color:red;font-weight: bold;'>$</td>
+                       </tr>
+               </tbody>
+       </table>
+
+       <br/>
+       <br/>
+       <br/>
+
+       <!--
+       <table width='100%' class='light_border myopac_table hide_me' id='myopac_trans_table'>
+       -->
+       <table width='100%' class='data_grid data_grid_center hide_me' id='myopac_trans_table'>
+
+               <thead>
+                       <tr><td colspan='8' style='background: none'><b>Transaction Details</b></td></tr>
+                       <tr>
+                               <td width='12%'>Transaction Start Time</td>
+                               <td width='12%'>Last Billing Time</td>
+                               <td width='12%'>Last Payment Time</td>
+                               <td width='12%'>Initial Amount Owed</td>
+                               <td width='12%'>Total Amount Paid</td>
+                               <td width='12%'>Balance Owed</td>
+                               <td width='12%'>Type</td>
+                               <td width='12%'>Extra Info</td>
+                       </tr>
+               </thead>
+
+               <tbody id='myopac_fines_tbody'>
+                       <tr id='myopac_trans_row'>
+                               <td name='myopac_trans_start'> </td>
+                               <td name='myopac_trans_last_bill'> </td>
+                               <td name='myopac_trans_last_payment'> </td>
+                               <td name='myopac_trans_init_amount'>$</td>
+                               <td name='myopac_trans_total_paid'>$</td>
+                               <td name='myopac_trans_balance' style='color:red; font-weight: bold;'>$</td>
+                               <td name='myopac_trans_type'> </td>
+                               <td name='myopac_trans_extra'> </td>
+                       </tr>
+               </tbody>
+       </table>
+
+</div>
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_holds.xml
new file mode 100644 (file)
index 0000000..273f199
--- /dev/null
@@ -0,0 +1,61 @@
+
+<div id='myopac_holds_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
+
+       <script language='javascript' src='../js/holds.js'> </script>
+
+       <table class='light_border data_grid'>
+
+               <thead class='color_3'>
+                       <tr>
+                               <td width='40%'>Title</td>
+                               <td width='20%'>Author</td>
+                               <td>Formats</td>
+                               <td align='center' nowrap='nowrap'>Pickup Location</td>
+                               <td align='center' nowrap='nowrap'>Email Notify</td>
+                               <td align='center' nowrap='nowrap'>Phone Notify</td>
+                               <td align='center' nowrap='nowrap'>Cancel</td>
+                       </tr>
+               </thead>
+
+               <tbody id='myopac_holds_tbody'>
+
+                       <tr id='myopac_holds_none' class='hide_me'><td>You have no items on hold at this time</td></tr>
+                       <tr id='myopac_holds_loading'><td>Loading...</td></tr>
+
+                       <tr id='myopac_holds_row' class='light_border hide_me'>
+
+                               <td name='myopac_holds_title' class='light_border'>
+                                       <a href='javascript:void(0);' name='myopac_holds_title_link'> </a>
+                               </td>
+
+                               <td name='myopac_holds_author' class='light_border'>
+                                       <a href='javascript:void(0);' name='myopac_holds_author_link'> </a>
+                               </td>
+
+                               <td align='center' name='myopac_holds_formats' class='light_border'> </td>
+
+                               <td align='center' name='myopac_holds_location' class='light_border'> </td>
+
+                               <td align='center' name='myopac_holds_email' class='light_border'>
+                                       <a href='javascript:void(0);' name='myopac_holds_email_link'></a>
+                               </td>
+
+                               <td align='center' name='myopac_holds_phone' class='light_border'>
+                                       <a href='javascript:void(0);' name='myopac_holds_phone_link'></a>
+                               </td>
+
+                               <td align='center' name='myopac_holds_cancel' class='light_border'>
+                                       <a href='javascript:void(0);' 
+                                               name='myopac_holds_cancel_link' class='classic_link'>Cancel</a>
+                               </td>
+
+                       </tr>
+               </tbody>
+       </table>
+
+       <div class='hide_me' id='myopac_holds_cancel_verify'>Are you sure you wish to cancel the selected hold?</div>
+
+
+</div>
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_prefs.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_prefs.xml
new file mode 100644 (file)
index 0000000..152dc39
--- /dev/null
@@ -0,0 +1,51 @@
+
+<div id='myopac_prefs_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
+
+       <table width='100%' class='data_grid'>
+
+               <br/>
+               <thead>
+                       <tr>
+                               <td colspan='2' align='center'>
+                                       <b>Preferences</b>
+                               </td>
+                       </tr>
+               </thead>
+
+               <tbody id='myopac_prefs_tbody'>
+                       <tr id='myopac_prefs_loading'><td>Loading...</td></tr>
+                       <tr id='myopac_prefs_row' class='light_border hide_me'>
+                               <td width='50%'>Search hits per page</td>
+                               <td>
+                                       <select id='prefs_hits_per'>
+                                               <option>5</option>
+                                               <option>8</option>
+                                               <option>10</option>
+                                               <option>15</option>
+                                               <option>20</option>
+                                               <option>25</option>
+                                               <option>50</option>
+                                       </select>
+                               </td>
+                       </tr>
+
+                       <tr>
+                               <td align='middle' colspan='2'>
+                                       <button onclick='myOPACSavePrefs();' 
+                                               id='myopac_prefs_submit'>Save Changes</button>
+                               </td>
+                       </tr>
+
+                       <tr>
+                               <td colspan='2' align='center'><br/><b> * More To Come...</b></td>
+                       </tr>
+
+               </tbody>
+       </table>
+
+       <div class='hide_me' id='prefs_update_success'>Preferences successfully updated</div>
+       <div class='hide_me' id='prefs_update_failure'>Preferences update failed!</div>
+
+</div>
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml
new file mode 100644 (file)
index 0000000..7283900
--- /dev/null
@@ -0,0 +1,180 @@
+
+<div id='myopac_summary_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
+
+       <br/>
+
+       <table width='100%' class='light_border data_grid'>
+
+               <tbody id='myopac_summary_tbody'>
+                       <tr>
+                               <td class='color_4 light_border' width='20%'>First Name</td>
+                               <td class='light_border' id='myopac_summary_first'> </td>
+                       </tr>
+                       <tr>
+                               <td class='color_4 light_border'>Middle Name</td>
+                               <td class='light_border' id='myopac_summary_middle'> </td>
+                       </tr>
+                       <tr>
+                               <td class='color_4 light_border'>Last Name</td>
+                               <td class='light_border' id='myopac_summary_last'> </td>
+                       </tr>
+                       <tr>
+                               <td class='color_4 light_border'>Day Phone</td>
+                               <td class='light_border' id='myopac_summary_dayphone'> </td>
+                       </tr>
+                       <tr>
+                               <td class='color_4 light_border'>Evening Phone</td>
+                               <td class='light_border' id='myopac_summary_eveningphone'> </td>
+                       </tr>
+                       <tr>
+                               <td class='color_4 light_border'>Other Phone</td>
+                               <td class='light_border' id='myopac_summary_otherphone'> </td>
+                       </tr>
+                       <tr>
+                               <td class='color_4 light_border'>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;'>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'>Enter new username: </span>
+                                       <input type='text' size='24' id='myopac_new_username'
+                                               onkeydown='if(userPressedEnter(event)) myOPACUpdateUsername();'> </input>
+                                       <span class='myopac_update_span'>
+                                               <button onclick='myOPACUpdateUsername();'>Submit</button>
+                                       </span>
+                                       <span class='myopac_update_span'>
+                                               <button onclick='hideMe($("myopac_update_username_row"));'>Cancel</button>
+                                       </span>
+                               </td>
+                       </tr>
+
+
+                       <tr>
+                               <td class='color_4 light_border'>Password</td>
+                               <td class='light_border' id='myopac_summary_password'>(not shown)</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;'>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'>Enter current password: </span></td>
+                                                       <td><input type='password' size='24' id='myopac_current_password'
+                                                               onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();'> </input></td>
+                                               </tr>
+                                               <tr>
+                                                       <td><span class='myopac_update_span'>Enter new password: </span></td>
+                                                       <td><input type='password' size='24' id='myopac_new_password'
+                                                               onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();'> </input></td>
+                                               </tr>
+                                               <tr>
+                                                       <td><span class='myopac_update_span'>Re-Enter new password: </span></td>
+                                                       <td><input type='password' size='24' id='myopac_new_password2'
+                                                               onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();'> </input></td>
+                                               </tr>
+                                       </tbody></table>
+
+                                       <span class='myopac_update_span'>
+                                               <button onclick='myOPACUpdatePassword();'>Submit</button>
+                                       </span>
+                                       <span class='myopac_update_span'>
+                                               <button onclick='hideMe($("myopac_update_password_row"));'>Cancel</button>
+                                       </span>
+                               </td>
+                       </tr>
+
+                       <tr>
+                               <td class='color_4 light_border'>Email Address</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;'>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'>Enter new email address: </span>
+                                       <input type='text' size='24' id='myopac_new_email'
+                                               onkeydown='if(userPressedEnter(event)) myOPACUpdateEmail();'> </input>
+                                       <span class='myopac_update_span'>
+                                               <button onclick='myOPACUpdateEmail();'>Submit</button>
+                                       </span>
+                                       <span class='myopac_update_span'>
+                                               <button onclick='hideMe($("myopac_update_email_row"));'>Cancel</button>
+                                       </span>
+                               </td>
+                       </tr>
+
+                       <tr>
+                               <td class='color_4 light_border'>Primary Identification</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'>Active Barcode</td>
+                               <td class='light_border' id='myopac_summary_barcode'> </td>
+                       </tr>
+                       <tr>
+                               <td class='color_4 light_border'>Home Library</td>
+                               <td class='light_border' id='myopac_summary_homelib'> </td>
+                       </tr>
+                       <tr>
+                               <td class='color_4 light_border'>Account Creation Date</td>
+                               <td class='light_border' id='myopac_summary_create_date'> </td>
+                       </tr>
+
+               </tbody>
+       </table>
+
+
+       <br/><br/><br/>
+       <table width='100%' class='light_border data_grid'>
+               <thead class='color_4'>
+                       <tr><td style='background: none; border-bottom: none' align='center' colspan='7'><b>Addresses</b></td></tr>
+                       <tr>
+                               <td width='16%'>Address Type</td>
+                               <td width='16%'>Street</td>
+                               <td width='16%'>City</td>
+                               <td width='16%'>County</td>
+                               <td width='16%'>State</td>
+                               <td width='16%'>Zip</td>
+                       </tr>
+               </thead>
+
+               <tbody id='myopac_addr_tbody'>
+                       <tr id='myopac_addr_row' class='light_border'>
+                               <td name='myopac_addr_type'> </td>
+                               <td name='myopac_addr_street'> </td>
+                               <td name='myopac_addr_city'> </td>
+                               <td name='myopac_addr_county'> </td>
+                               <td name='myopac_addr_state'> </td>
+                               <td name='myopac_addr_zip'> </td>
+                       </tr>
+               </tbody>
+       </table>
+
+       <div class='hide_me' id='myopac_username_error'>Please enter a username</div>
+       <div class='hide_me' id='myopac_username_success'>Username successfully updated</div>
+       <div class='hide_me' id='myopac_username_failure'>Username update failed</div>
+
+       <div class='hide_me' id='myopac_email_error'>Please enter a valid email address</div>
+       <div class='hide_me' id='myopac_email_success'>Email address successfully updated</div>
+       <div class='hide_me' id='myopac_email_failure'>Email address update failed</div>
+
+       <div class='hide_me' id='myopac_password_error'>Passwords are empty or do not match</div>
+       <div class='hide_me' id='myopac_password_success'>Password successfully updated</div>
+       <div class='hide_me' id='myopac_password_failure'>Password update failed</div>
+</div>
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac_checked.xml b/Open-ILS/web/opac/skin/default/xml/myopac_checked.xml
deleted file mode 100644 (file)
index fd67694..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-
-<div id='myopac_checked_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
-
-       <script language='javascript'>
-       </script>
-
-
-       <table width='100%' class='light_border data_grid'>
-
-               <thead class='color_3'>
-                       <tr>
-                               <td width='50%'>Title</td>
-                               <td width='20%'>Author</td>
-                               <td width='10%' nowrap='nowrap' align='center'>Due Data</td>
-                               <td width='10%' nowrap='nowrap' align='center'>Renewals Remaining</td>
-                               <td width='10%' nowrap='nowrap' align='center'>Renew</td>
-                       </tr>
-               </thead>
-
-               <tbody id='myopac_checked_tbody'>
-
-                       <tr id='myopac_checked_none' class='hide_me'><td>You have no items checked out at this time</td></tr>
-                       <tr id='myopac_checked_loading'><td>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>
-
-                       </tr>
-               </tbody>
-       </table>
-
-       <div id='myopac_renew_success' class='hide_me'>Item successfully renewed</div>
-
-</div>
-
-
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac_fines.xml b/Open-ILS/web/opac/skin/default/xml/myopac_fines.xml
deleted file mode 100644 (file)
index ac5a63b..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-
-<div id='myopac_fines_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
-
-       <br/>
-       <table width='100%' class='data_grid data_grid_center'>
-
-               <thead class='color_3'>
-                       <tr><td colspan='3' style='background: none'><b>Summary</b></td></tr>
-                       <tr>
-                               <td width='33%'>Total Owed</td>
-                               <td width='33%'>Total Paid</td>
-                               <td width='33%'>Balance Owed</td>
-                       </tr>
-               </thead>
-
-               <tbody id='myopac_fines_summary_tbody'>
-                       <tr id='myopac_fines_summary_loading'><td>Loading...</td></tr>
-                       <tr id='myopac_fines_summary_row' class='light_border hide_me'>
-                               <td id='myopac_fines_summary_total' class='light_border'>$</td>
-                               <td id='myopac_fines_summary_paid' class='light_border'>$</td>
-                               <td id='myopac_fines_summary_balance' class='light_border' style='color:red;font-weight: bold;'>$</td>
-                       </tr>
-               </tbody>
-       </table>
-
-       <br/>
-       <br/>
-       <br/>
-
-       <!--
-       <table width='100%' class='light_border myopac_table hide_me' id='myopac_trans_table'>
-       -->
-       <table width='100%' class='data_grid data_grid_center hide_me' id='myopac_trans_table'>
-
-               <thead>
-                       <tr><td colspan='8' style='background: none'><b>Transaction Details</b></td></tr>
-                       <tr>
-                               <td width='12%'>Transaction Start Time</td>
-                               <td width='12%'>Last Billing Time</td>
-                               <td width='12%'>Last Payment Time</td>
-                               <td width='12%'>Initial Amount Owed</td>
-                               <td width='12%'>Total Amount Paid</td>
-                               <td width='12%'>Balance Owed</td>
-                               <td width='12%'>Type</td>
-                               <td width='12%'>Extra Info</td>
-                       </tr>
-               </thead>
-
-               <tbody id='myopac_fines_tbody'>
-                       <tr id='myopac_trans_row'>
-                               <td name='myopac_trans_start'> </td>
-                               <td name='myopac_trans_last_bill'> </td>
-                               <td name='myopac_trans_last_payment'> </td>
-                               <td name='myopac_trans_init_amount'>$</td>
-                               <td name='myopac_trans_total_paid'>$</td>
-                               <td name='myopac_trans_balance' style='color:red; font-weight: bold;'>$</td>
-                               <td name='myopac_trans_type'> </td>
-                               <td name='myopac_trans_extra'> </td>
-                       </tr>
-               </tbody>
-       </table>
-
-</div>
-
-
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac_holds.xml b/Open-ILS/web/opac/skin/default/xml/myopac_holds.xml
deleted file mode 100644 (file)
index 273f199..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-
-<div id='myopac_holds_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
-
-       <script language='javascript' src='../js/holds.js'> </script>
-
-       <table class='light_border data_grid'>
-
-               <thead class='color_3'>
-                       <tr>
-                               <td width='40%'>Title</td>
-                               <td width='20%'>Author</td>
-                               <td>Formats</td>
-                               <td align='center' nowrap='nowrap'>Pickup Location</td>
-                               <td align='center' nowrap='nowrap'>Email Notify</td>
-                               <td align='center' nowrap='nowrap'>Phone Notify</td>
-                               <td align='center' nowrap='nowrap'>Cancel</td>
-                       </tr>
-               </thead>
-
-               <tbody id='myopac_holds_tbody'>
-
-                       <tr id='myopac_holds_none' class='hide_me'><td>You have no items on hold at this time</td></tr>
-                       <tr id='myopac_holds_loading'><td>Loading...</td></tr>
-
-                       <tr id='myopac_holds_row' class='light_border hide_me'>
-
-                               <td name='myopac_holds_title' class='light_border'>
-                                       <a href='javascript:void(0);' name='myopac_holds_title_link'> </a>
-                               </td>
-
-                               <td name='myopac_holds_author' class='light_border'>
-                                       <a href='javascript:void(0);' name='myopac_holds_author_link'> </a>
-                               </td>
-
-                               <td align='center' name='myopac_holds_formats' class='light_border'> </td>
-
-                               <td align='center' name='myopac_holds_location' class='light_border'> </td>
-
-                               <td align='center' name='myopac_holds_email' class='light_border'>
-                                       <a href='javascript:void(0);' name='myopac_holds_email_link'></a>
-                               </td>
-
-                               <td align='center' name='myopac_holds_phone' class='light_border'>
-                                       <a href='javascript:void(0);' name='myopac_holds_phone_link'></a>
-                               </td>
-
-                               <td align='center' name='myopac_holds_cancel' class='light_border'>
-                                       <a href='javascript:void(0);' 
-                                               name='myopac_holds_cancel_link' class='classic_link'>Cancel</a>
-                               </td>
-
-                       </tr>
-               </tbody>
-       </table>
-
-       <div class='hide_me' id='myopac_holds_cancel_verify'>Are you sure you wish to cancel the selected hold?</div>
-
-
-</div>
-
-
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac_prefs.xml b/Open-ILS/web/opac/skin/default/xml/myopac_prefs.xml
deleted file mode 100644 (file)
index 152dc39..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-
-<div id='myopac_prefs_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
-
-       <table width='100%' class='data_grid'>
-
-               <br/>
-               <thead>
-                       <tr>
-                               <td colspan='2' align='center'>
-                                       <b>Preferences</b>
-                               </td>
-                       </tr>
-               </thead>
-
-               <tbody id='myopac_prefs_tbody'>
-                       <tr id='myopac_prefs_loading'><td>Loading...</td></tr>
-                       <tr id='myopac_prefs_row' class='light_border hide_me'>
-                               <td width='50%'>Search hits per page</td>
-                               <td>
-                                       <select id='prefs_hits_per'>
-                                               <option>5</option>
-                                               <option>8</option>
-                                               <option>10</option>
-                                               <option>15</option>
-                                               <option>20</option>
-                                               <option>25</option>
-                                               <option>50</option>
-                                       </select>
-                               </td>
-                       </tr>
-
-                       <tr>
-                               <td align='middle' colspan='2'>
-                                       <button onclick='myOPACSavePrefs();' 
-                                               id='myopac_prefs_submit'>Save Changes</button>
-                               </td>
-                       </tr>
-
-                       <tr>
-                               <td colspan='2' align='center'><br/><b> * More To Come...</b></td>
-                       </tr>
-
-               </tbody>
-       </table>
-
-       <div class='hide_me' id='prefs_update_success'>Preferences successfully updated</div>
-       <div class='hide_me' id='prefs_update_failure'>Preferences update failed!</div>
-
-</div>
-
-
diff --git a/Open-ILS/web/opac/skin/default/xml/myopac_summary.xml b/Open-ILS/web/opac/skin/default/xml/myopac_summary.xml
deleted file mode 100644 (file)
index 7283900..0000000
+++ /dev/null
@@ -1,180 +0,0 @@
-
-<div id='myopac_summary_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
-
-       <br/>
-
-       <table width='100%' class='light_border data_grid'>
-
-               <tbody id='myopac_summary_tbody'>
-                       <tr>
-                               <td class='color_4 light_border' width='20%'>First Name</td>
-                               <td class='light_border' id='myopac_summary_first'> </td>
-                       </tr>
-                       <tr>
-                               <td class='color_4 light_border'>Middle Name</td>
-                               <td class='light_border' id='myopac_summary_middle'> </td>
-                       </tr>
-                       <tr>
-                               <td class='color_4 light_border'>Last Name</td>
-                               <td class='light_border' id='myopac_summary_last'> </td>
-                       </tr>
-                       <tr>
-                               <td class='color_4 light_border'>Day Phone</td>
-                               <td class='light_border' id='myopac_summary_dayphone'> </td>
-                       </tr>
-                       <tr>
-                               <td class='color_4 light_border'>Evening Phone</td>
-                               <td class='light_border' id='myopac_summary_eveningphone'> </td>
-                       </tr>
-                       <tr>
-                               <td class='color_4 light_border'>Other Phone</td>
-                               <td class='light_border' id='myopac_summary_otherphone'> </td>
-                       </tr>
-                       <tr>
-                               <td class='color_4 light_border'>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;'>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'>Enter new username: </span>
-                                       <input type='text' size='24' id='myopac_new_username'
-                                               onkeydown='if(userPressedEnter(event)) myOPACUpdateUsername();'> </input>
-                                       <span class='myopac_update_span'>
-                                               <button onclick='myOPACUpdateUsername();'>Submit</button>
-                                       </span>
-                                       <span class='myopac_update_span'>
-                                               <button onclick='hideMe($("myopac_update_username_row"));'>Cancel</button>
-                                       </span>
-                               </td>
-                       </tr>
-
-
-                       <tr>
-                               <td class='color_4 light_border'>Password</td>
-                               <td class='light_border' id='myopac_summary_password'>(not shown)</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;'>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'>Enter current password: </span></td>
-                                                       <td><input type='password' size='24' id='myopac_current_password'
-                                                               onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();'> </input></td>
-                                               </tr>
-                                               <tr>
-                                                       <td><span class='myopac_update_span'>Enter new password: </span></td>
-                                                       <td><input type='password' size='24' id='myopac_new_password'
-                                                               onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();'> </input></td>
-                                               </tr>
-                                               <tr>
-                                                       <td><span class='myopac_update_span'>Re-Enter new password: </span></td>
-                                                       <td><input type='password' size='24' id='myopac_new_password2'
-                                                               onkeydown='if(userPressedEnter(event)) myOPACUpdatePassword();'> </input></td>
-                                               </tr>
-                                       </tbody></table>
-
-                                       <span class='myopac_update_span'>
-                                               <button onclick='myOPACUpdatePassword();'>Submit</button>
-                                       </span>
-                                       <span class='myopac_update_span'>
-                                               <button onclick='hideMe($("myopac_update_password_row"));'>Cancel</button>
-                                       </span>
-                               </td>
-                       </tr>
-
-                       <tr>
-                               <td class='color_4 light_border'>Email Address</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;'>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'>Enter new email address: </span>
-                                       <input type='text' size='24' id='myopac_new_email'
-                                               onkeydown='if(userPressedEnter(event)) myOPACUpdateEmail();'> </input>
-                                       <span class='myopac_update_span'>
-                                               <button onclick='myOPACUpdateEmail();'>Submit</button>
-                                       </span>
-                                       <span class='myopac_update_span'>
-                                               <button onclick='hideMe($("myopac_update_email_row"));'>Cancel</button>
-                                       </span>
-                               </td>
-                       </tr>
-
-                       <tr>
-                               <td class='color_4 light_border'>Primary Identification</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'>Active Barcode</td>
-                               <td class='light_border' id='myopac_summary_barcode'> </td>
-                       </tr>
-                       <tr>
-                               <td class='color_4 light_border'>Home Library</td>
-                               <td class='light_border' id='myopac_summary_homelib'> </td>
-                       </tr>
-                       <tr>
-                               <td class='color_4 light_border'>Account Creation Date</td>
-                               <td class='light_border' id='myopac_summary_create_date'> </td>
-                       </tr>
-
-               </tbody>
-       </table>
-
-
-       <br/><br/><br/>
-       <table width='100%' class='light_border data_grid'>
-               <thead class='color_4'>
-                       <tr><td style='background: none; border-bottom: none' align='center' colspan='7'><b>Addresses</b></td></tr>
-                       <tr>
-                               <td width='16%'>Address Type</td>
-                               <td width='16%'>Street</td>
-                               <td width='16%'>City</td>
-                               <td width='16%'>County</td>
-                               <td width='16%'>State</td>
-                               <td width='16%'>Zip</td>
-                       </tr>
-               </thead>
-
-               <tbody id='myopac_addr_tbody'>
-                       <tr id='myopac_addr_row' class='light_border'>
-                               <td name='myopac_addr_type'> </td>
-                               <td name='myopac_addr_street'> </td>
-                               <td name='myopac_addr_city'> </td>
-                               <td name='myopac_addr_county'> </td>
-                               <td name='myopac_addr_state'> </td>
-                               <td name='myopac_addr_zip'> </td>
-                       </tr>
-               </tbody>
-       </table>
-
-       <div class='hide_me' id='myopac_username_error'>Please enter a username</div>
-       <div class='hide_me' id='myopac_username_success'>Username successfully updated</div>
-       <div class='hide_me' id='myopac_username_failure'>Username update failed</div>
-
-       <div class='hide_me' id='myopac_email_error'>Please enter a valid email address</div>
-       <div class='hide_me' id='myopac_email_success'>Email address successfully updated</div>
-       <div class='hide_me' id='myopac_email_failure'>Email address update failed</div>
-
-       <div class='hide_me' id='myopac_password_error'>Passwords are empty or do not match</div>
-       <div class='hide_me' id='myopac_password_success'>Password successfully updated</div>
-       <div class='hide_me' id='myopac_password_failure'>Password update failed</div>
-</div>
-
-
diff --git a/Open-ILS/web/opac/skin/default/xml/orgtree.xml b/Open-ILS/web/opac/skin/default/xml/orgtree.xml
deleted file mode 100644 (file)
index 7d71b3b..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-
-<!-- the org tree -->
-<div id='org_container' class='hide_me non_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>
index bcb552a..39f5a4d 100644 (file)
@@ -1,3 +1,36 @@
-<div id='canvas_main'>Advanced Search Goes Here</div>
+<div id='canvas_main' style='margin-top: 20px;'>
+
+       <style type='text/css'>
+               .advanced_div { text-align: center; margin: 20px; 
+                       margin-top: 30px; margin-bottom: 30px; width: 95%; padding: 5px; }
+       </style>
+
+
+       <div class='advanced_div' style='border: 1px solid #000; padding-left: 15px'>
+               <!--#include virtual="advanced/advanced_location.xml"-->
+       </div>
+
+       <div class='advanced_div'>
+               <!--#include virtual="advanced/advanced_quick.xml"-->
+       </div>
+
+       <div class='advanced_div'>
+               <!--#include virtual="advanced/advanced_wizard.xml"-->
+       </div>
+
+       <hr/>
+
+       <div class='advanced_div'>
+               <!--#include virtual="advanced/advanced_refined.xml"-->
+       </div>
+
+       <hr/>
+
+       <div class='advanced_div'>
+               <!--#include virtual="advanced/advanced_marc.xml"-->
+       </div>
+
+
+</div>
 
 
index 3715f0b..1447bdb 100644 (file)
@@ -4,6 +4,6 @@
        <script language='javascript' src='../js/result_common.js'> </script>
        <script language='javascript' src='../js/tips.js'> </script>
        <script language='javascript' src='../js/holds.js'> </script>   
-       <!--#include virtual="result_common.xml"-->
+       <!--#include virtual="result/result_common.xml"-->
 </div>
 
index a7f44ee..fc6aeeb 100644 (file)
        <br/>
 
        <div id='myopac_main_div'>
-               <!--#include virtual="myopac_summary.xml"-->
-               <!--#include virtual="myopac_checked.xml"-->
-               <!--#include virtual="myopac_holds.xml"-->
-               <!--#include virtual="myopac_fines.xml"-->
-               <!--#include virtual="myopac_prefs.xml"-->
+               <!--#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"-->
        </div>
 
 </div>
index ecb315f..934a420 100644 (file)
@@ -24,7 +24,7 @@
                        </tr>
                </tbody>
        </table>
-       <!--#include virtual="rdetail_summary.xml"-->
+       <!--#include virtual="rdetail/rdetail_summary.xml"-->
        <br/><br/>
-       <!--#include virtual="rdetail_extras.xml"-->
+       <!--#include virtual="rdetail/rdetail_extras.xml"-->
 </div>
index c0e3334..2f1aac5 100644 (file)
@@ -4,6 +4,6 @@
        <script language='javascript' src='../js/result_common.js'> </script>
        <script language='javascript' src='../js/tips.js'> </script>
        <script language='javascript' src='../js/holds.js'> </script>   
-       <!--#include virtual="result_common.xml"-->
+       <!--#include virtual="result/result_common.xml"-->
 </div>
 
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_altcanvas.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_altcanvas.xml
new file mode 100644 (file)
index 0000000..00f0caf
--- /dev/null
@@ -0,0 +1,28 @@
+
+<!-- record details alternate canvases -->
+<div class=''>
+
+       <!--
+       <script language='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 non_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>
+
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_copyinfo.xml
new file mode 100644 (file)
index 0000000..c78659b
--- /dev/null
@@ -0,0 +1,60 @@
+
+<!-- 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'>&rdetail.copyInfo.local;</a>
+               </span>
+               <span width=''>
+                       <a href='javascript:void(0);' id='copy_info_all_link' 
+                               class='rdetail_copy_nav_link classic_link'>&rdetail.copyInfo.all;</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  nowrap='nowarp' class='rdetail_copy_info_header_cell' id='rdetail_copy_info_status'> 
+                                       <div name='rdetail_status_cell'> </div>
+                               </td>
+                       </tr>
+
+               </thead>
+               <tbody>
+                       <tr id='rdetail_copy_info_row' class='hide_me'>
+                               <td name='rdetail_library_cell'> </td>
+                               <td name='rdetail_callnumber_cell'> </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>
+
+       <br/><br/>
+
+       <div id='rdetail_copy_info_none' class='hide_me'>&rdetail.noneAvailable;</div>
+
+       <script language='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 -->
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_extras.xml
new file mode 100644 (file)
index 0000000..3ecdc8e
--- /dev/null
@@ -0,0 +1,58 @@
+
+<div xmlns:xi="http://www.w3.org/2001/XInclude">
+
+       <table class='data_grid'>
+               <thead>
+                       <tr>
+                               <td id='rdetail_copy_info_link' class='rdetail_extras_td' 
+                                       style='padding-right: 15px; padding-left: 15px;' >
+                                       <a href='javascript:rdetailShowExtra("copyinfo");' 
+                                               class='classic_link'>Copy Information</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'>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'>Table of Contents</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'>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'>MARC Record</a>
+                               </td>
+                       </tr>
+               </thead>
+       </table>
+
+       <div id='rdetail_extras_div' style='width: 95%;'> 
+               <div id='rdetail_extras_loading' class='hide_me' 
+                       style='padding: 10px;'>Loading...</div>
+               <!--#include virtual="rdetail_copyinfo.xml"-->
+
+               <div id='rdetail_reviews_div' class='rdetail_extras_div hide_me'> 
+                       <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_marc_div' class='rdetail_extras_div hide_me'> 
+                       <div id='rdetail_view_marc_box'> </div>
+               </div>
+
+       </div>
+</div>
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml b/Open-ILS/web/opac/skin/default/xml/rdetail/rdetail_summary.xml
new file mode 100644 (file)
index 0000000..ddc29a8
--- /dev/null
@@ -0,0 +1,71 @@
+
+<!-- This holds the record summary information -->
+<div>
+       <table id='rdetail_details_table'>
+               <tbody id='rdetail_details_tbody'>
+
+                       <tr>
+                               <td id='rdetail_image_cell' rowspan='8'><img id='rdetail_image'> </img></td>
+                               <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.title;</td>                
+                               <td class='rdetail_item' id='rdetail_title'> </td>
+                       </tr>
+
+                       <tr>
+                               <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.author;</td>               
+                               <td class='rdetail_item'>
+                                       <a title='Perform an author search' id='rdetail_author'> </a>
+                               </td>
+                       </tr>
+
+                       <tr>
+                               <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.isbn;</td>                 
+                               <td class='rdetail_item' id='rdetail_isbn'> </td>
+                       </tr>
+
+                       <tr>
+                               <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.edition;</td>              
+                               <td class='rdetail_item' id='rdetail_edition'> </td>
+                       </tr>
+
+                       <tr>
+                               <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.pubdate;</td>              
+                               <td class='rdetail_item' id='rdetail_pubdate'> </td>
+                       </tr>
+
+                       <tr>
+                               <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.publisher;</td>            
+                               <td class='rdetail_item' id='rdetail_publisher'> </td>
+                       </tr>
+
+                       <tr>
+                               <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.tor;</td>                  
+                               <td class='rdetail_item'>
+                                       <img id='rdetail_tor_pic' class='tor_pic'> </img>
+                                       <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>
+
+               </tbody>
+       </table>
+
+       <script language='javascript'>
+               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';
+       </script>
+
+</div> <!-- details_body -->
+
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail_altcanvas.xml b/Open-ILS/web/opac/skin/default/xml/rdetail_altcanvas.xml
deleted file mode 100644 (file)
index 00f0caf..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-
-<!-- record details alternate canvases -->
-<div class=''>
-
-       <!--
-       <script language='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 non_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>
-
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail_copyinfo.xml b/Open-ILS/web/opac/skin/default/xml/rdetail_copyinfo.xml
deleted file mode 100644 (file)
index c78659b..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-
-<!-- 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'>&rdetail.copyInfo.local;</a>
-               </span>
-               <span width=''>
-                       <a href='javascript:void(0);' id='copy_info_all_link' 
-                               class='rdetail_copy_nav_link classic_link'>&rdetail.copyInfo.all;</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  nowrap='nowarp' class='rdetail_copy_info_header_cell' id='rdetail_copy_info_status'> 
-                                       <div name='rdetail_status_cell'> </div>
-                               </td>
-                       </tr>
-
-               </thead>
-               <tbody>
-                       <tr id='rdetail_copy_info_row' class='hide_me'>
-                               <td name='rdetail_library_cell'> </td>
-                               <td name='rdetail_callnumber_cell'> </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>
-
-       <br/><br/>
-
-       <div id='rdetail_copy_info_none' class='hide_me'>&rdetail.noneAvailable;</div>
-
-       <script language='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 -->
-
-
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail_extras.xml b/Open-ILS/web/opac/skin/default/xml/rdetail_extras.xml
deleted file mode 100644 (file)
index 3ecdc8e..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-
-<div xmlns:xi="http://www.w3.org/2001/XInclude">
-
-       <table class='data_grid'>
-               <thead>
-                       <tr>
-                               <td id='rdetail_copy_info_link' class='rdetail_extras_td' 
-                                       style='padding-right: 15px; padding-left: 15px;' >
-                                       <a href='javascript:rdetailShowExtra("copyinfo");' 
-                                               class='classic_link'>Copy Information</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'>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'>Table of Contents</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'>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'>MARC Record</a>
-                               </td>
-                       </tr>
-               </thead>
-       </table>
-
-       <div id='rdetail_extras_div' style='width: 95%;'> 
-               <div id='rdetail_extras_loading' class='hide_me' 
-                       style='padding: 10px;'>Loading...</div>
-               <!--#include virtual="rdetail_copyinfo.xml"-->
-
-               <div id='rdetail_reviews_div' class='rdetail_extras_div hide_me'> 
-                       <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_marc_div' class='rdetail_extras_div hide_me'> 
-                       <div id='rdetail_view_marc_box'> </div>
-               </div>
-
-       </div>
-</div>
diff --git a/Open-ILS/web/opac/skin/default/xml/rdetail_summary.xml b/Open-ILS/web/opac/skin/default/xml/rdetail_summary.xml
deleted file mode 100644 (file)
index ddc29a8..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-
-<!-- This holds the record summary information -->
-<div>
-       <table id='rdetail_details_table'>
-               <tbody id='rdetail_details_tbody'>
-
-                       <tr>
-                               <td id='rdetail_image_cell' rowspan='8'><img id='rdetail_image'> </img></td>
-                               <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.title;</td>                
-                               <td class='rdetail_item' id='rdetail_title'> </td>
-                       </tr>
-
-                       <tr>
-                               <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.author;</td>               
-                               <td class='rdetail_item'>
-                                       <a title='Perform an author search' id='rdetail_author'> </a>
-                               </td>
-                       </tr>
-
-                       <tr>
-                               <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.isbn;</td>                 
-                               <td class='rdetail_item' id='rdetail_isbn'> </td>
-                       </tr>
-
-                       <tr>
-                               <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.edition;</td>              
-                               <td class='rdetail_item' id='rdetail_edition'> </td>
-                       </tr>
-
-                       <tr>
-                               <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.pubdate;</td>              
-                               <td class='rdetail_item' id='rdetail_pubdate'> </td>
-                       </tr>
-
-                       <tr>
-                               <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.publisher;</td>            
-                               <td class='rdetail_item' id='rdetail_publisher'> </td>
-                       </tr>
-
-                       <tr>
-                               <td nowrap='nowrap' class='rdetail_desc'>&rdetail.detailMain.tor;</td>                  
-                               <td class='rdetail_item'>
-                                       <img id='rdetail_tor_pic' class='tor_pic'> </img>
-                                       <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>
-
-               </tbody>
-       </table>
-
-       <script language='javascript'>
-               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';
-       </script>
-
-</div> <!-- details_body -->
-
diff --git a/Open-ILS/web/opac/skin/default/xml/result/result_common.xml b/Open-ILS/web/opac/skin/default/xml/result/result_common.xml
new file mode 100644 (file)
index 0000000..7bdf1ad
--- /dev/null
@@ -0,0 +1,36 @@
+
+<div id='canvas_main' xmlns:xi="http://www.w3.org/2001/XInclude" >
+
+       <script language='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>
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/result/result_info.xml b/Open-ILS/web/opac/skin/default/xml/result/result_info.xml
new file mode 100644 (file)
index 0000000..461d01a
--- /dev/null
@@ -0,0 +1,52 @@
+<table style='width: 100%;'>
+       <tbody>
+
+               <tr style='height: 1em; background: #E0F6E0'>
+
+                       <td style='vertical-align: top;'  id='next_prev_links'>
+
+                               <span class='hide_me' id='result_info_div' style='font-size: 9pt;'>
+                                       <span> 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="First results page">Start</a>
+                                       <a class='search_page_nav_link' id='prev_link' 
+                                               title='Previus page'> &lt;&lt; </a>
+                                       <span class='search_page_nav_link' id='page_numbers'> </span>
+                                       <a  class='search_page_nav_link' id='next_link' 
+                                               title='Next Page'> &gt;&gt; </a>
+                                       <a  class='search_page_nav_link' id='end_link' 
+                                               title="Last results page">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>Available copies / Total copies </b>
+                                       </span>
+                       </td>
+               </tr>
+
+               <tr style='height: 2em;' id='result_thead_row'>
+                       <td> </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>
+
diff --git a/Open-ILS/web/opac/skin/default/xml/result/result_lowhits.xml b/Open-ILS/web/opac/skin/default/xml/result/result_lowhits.xml
new file mode 100644 (file)
index 0000000..01dd9e7
--- /dev/null
@@ -0,0 +1,51 @@
+
+<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'>Few hits were returned for your search.</div>
+               <div id='result_zero_hits_msg' class='hide_me'>Zero hits were returned for your search.</div>
+       </div>
+
+       <!-- spell checker -->
+       <div id='did_you_mean' class='lowhits_div hide_me'>
+               <span>Did you mean</span>
+               <a class='classic_link' id='spell_check_link'> </a>
+               <span>?</span>
+       </div>
+
+       <div id='low_hits_remove_format' class='lowhits_div hide_me'>
+               <span>You will find more hits when searching all item formats: </span>
+               <a id='low_hits_remove_format_link' class='classic_link'>Search again with all formats?</a>
+       </div>
+
+       <div id='low_hits_cross_ref' class='lowhits_div hide_me'>
+               <span>You may also like to try these related searches:</span>
+               <div style='padding: 5px;'>
+                       <a id='low_hits_xref_link' class='classic_link' style='padding-right: 5px;'> </a>
+               </div>
+       </div>
+
+       <div id='low_hits_expand_range' class='lowhits_div hide_me'>
+               <span>You may also wish to expand you search range to: </span>
+               <a id='low_hits_expand_link' class='classic_link' style='padding-right: 5px;'> </a>
+       </div>
+
+       <div id='low_hits_search_type' class='lowhits_div hide_me'>
+               <span>Would you like to try searching the same terms by</span>
+               <a id='low_hits_title_search' class='hide_me classic_link' 
+                       style='padding-right: 5px;'>title</a>
+               <a id='low_hits_author_search' class='hide_me classic_link' 
+                       style='padding-right: 5px;'>author</a>
+               <a id='low_hits_subject_search' class='hide_me classic_link' 
+                       style='padding-right: 5px;'>subject</a>
+               <a id='low_hits_series_search' class='hide_me classic_link' 
+                               style='padding-right: 5px;'>series</a>
+               <a id='low_hits_keyword_search' class='hide_me classic_link' 
+                       style='padding-right: 5px;'>keyword</a>
+               <span>?</span>
+       </div>
+
+</div>
+
diff --git a/Open-ILS/web/opac/skin/default/xml/result/result_table.xml b/Open-ILS/web/opac/skin/default/xml/result/result_table.xml
new file mode 100644 (file)
index 0000000..3c5f20c
--- /dev/null
@@ -0,0 +1,141 @@
+<!-- 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'>
+                       <td class='result_table_pic_header'></td>
+                       <td> </td>
+               </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'>
+                                                                       <a title="View titles for this record" 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="Perform an Author Search" name='item_author' class='search_link'> 
+                                                                               <!-- Author goes here -->
+                                                                       </a>
+                                                                       <span name='result_table_extra_span' class='hide_me'>
+                                                                               <span name='result_table_edition_span' style='padding-left: 10px;'> -- </span>
+                                                                               <span name='result_table_pub_box' style='padding-left: 10px;'> 
+                                                                                       <span> [ </span>
+                                                                                       <span name='result_table_pub_span'> </span>
+                                                                                       <span> ] </span>
+                                                                               </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'> </img>
+                                                                       </a>
+
+                                                                       <a name='sound recording-nonmusical_link' class='search_link'> 
+                                                                               <img src='../../../../images/tor/sound recording-nonmusical.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='moving image_link' class='search_link'> 
+                                                                               <img src='../../../../images/tor/moving image.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='software, multimedia_link' class='search_link'> 
+                                                                               <img src='../../../../images/tor/software, multimedia.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='sound recording-musical_link' class='search_link'> 
+                                                                               <img src='../../../../images/tor/sound recording-musical.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='cartographic_link' class='search_link'> 
+                                                                               <img src='../../../../images/tor/cartographic.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='mixed material_link' class='search_link'> 
+                                                                               <img src='../../../../images/tor/mixed material.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='notated music_link' class='search_link'> 
+                                                                               <img src='../../../../images/tor/notated music.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='sound recording_link' class='search_link'> 
+                                                                               <img src='../../../../images/tor/sound recording.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='still images_link' class='search_link'> 
+                                                                               <img src='../../../../images/tor/still images.jpg' class='dim tor_pic'> </img>
+                                                                       </a>
+
+                                                                       <a name='three dimensional object_link' class='search_link'> 
+                                                                               <img src='../../../../images/tor/three dimensional object.jpg' class='dim tor_pic'> </img>
+                                                                       </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'>Place Hold</a>
+                                                                       </span>
+
+                                                               </td>
+                                                       </tr>
+
+                                               </tbody>
+                                       </table>
+                               </td>
+                       </tr>
+               </tbody>
+       </table>
+
+       <script language='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>
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/result_common.xml b/Open-ILS/web/opac/skin/default/xml/result_common.xml
deleted file mode 100644 (file)
index 7bdf1ad..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-
-<div id='canvas_main' xmlns:xi="http://www.w3.org/2001/XInclude" >
-
-       <script language='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>
-
-
diff --git a/Open-ILS/web/opac/skin/default/xml/result_info.xml b/Open-ILS/web/opac/skin/default/xml/result_info.xml
deleted file mode 100644 (file)
index 461d01a..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<table style='width: 100%;'>
-       <tbody>
-
-               <tr style='height: 1em; background: #E0F6E0'>
-
-                       <td style='vertical-align: top;'  id='next_prev_links'>
-
-                               <span class='hide_me' id='result_info_div' style='font-size: 9pt;'>
-                                       <span> 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="First results page">Start</a>
-                                       <a class='search_page_nav_link' id='prev_link' 
-                                               title='Previus page'> &lt;&lt; </a>
-                                       <span class='search_page_nav_link' id='page_numbers'> </span>
-                                       <a  class='search_page_nav_link' id='next_link' 
-                                               title='Next Page'> &gt;&gt; </a>
-                                       <a  class='search_page_nav_link' id='end_link' 
-                                               title="Last results page">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>Available copies / Total copies </b>
-                                       </span>
-                       </td>
-               </tr>
-
-               <tr style='height: 2em;' id='result_thead_row'>
-                       <td> </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>
-
diff --git a/Open-ILS/web/opac/skin/default/xml/result_lowhits.xml b/Open-ILS/web/opac/skin/default/xml/result_lowhits.xml
deleted file mode 100644 (file)
index 01dd9e7..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-
-<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'>Few hits were returned for your search.</div>
-               <div id='result_zero_hits_msg' class='hide_me'>Zero hits were returned for your search.</div>
-       </div>
-
-       <!-- spell checker -->
-       <div id='did_you_mean' class='lowhits_div hide_me'>
-               <span>Did you mean</span>
-               <a class='classic_link' id='spell_check_link'> </a>
-               <span>?</span>
-       </div>
-
-       <div id='low_hits_remove_format' class='lowhits_div hide_me'>
-               <span>You will find more hits when searching all item formats: </span>
-               <a id='low_hits_remove_format_link' class='classic_link'>Search again with all formats?</a>
-       </div>
-
-       <div id='low_hits_cross_ref' class='lowhits_div hide_me'>
-               <span>You may also like to try these related searches:</span>
-               <div style='padding: 5px;'>
-                       <a id='low_hits_xref_link' class='classic_link' style='padding-right: 5px;'> </a>
-               </div>
-       </div>
-
-       <div id='low_hits_expand_range' class='lowhits_div hide_me'>
-               <span>You may also wish to expand you search range to: </span>
-               <a id='low_hits_expand_link' class='classic_link' style='padding-right: 5px;'> </a>
-       </div>
-
-       <div id='low_hits_search_type' class='lowhits_div hide_me'>
-               <span>Would you like to try searching the same terms by</span>
-               <a id='low_hits_title_search' class='hide_me classic_link' 
-                       style='padding-right: 5px;'>title</a>
-               <a id='low_hits_author_search' class='hide_me classic_link' 
-                       style='padding-right: 5px;'>author</a>
-               <a id='low_hits_subject_search' class='hide_me classic_link' 
-                       style='padding-right: 5px;'>subject</a>
-               <a id='low_hits_series_search' class='hide_me classic_link' 
-                               style='padding-right: 5px;'>series</a>
-               <a id='low_hits_keyword_search' class='hide_me classic_link' 
-                       style='padding-right: 5px;'>keyword</a>
-               <span>?</span>
-       </div>
-
-</div>
-
diff --git a/Open-ILS/web/opac/skin/default/xml/result_table.xml b/Open-ILS/web/opac/skin/default/xml/result_table.xml
deleted file mode 100644 (file)
index 3c5f20c..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-<!-- 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'>
-                       <td class='result_table_pic_header'></td>
-                       <td> </td>
-               </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'>
-                                                                       <a title="View titles for this record" 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="Perform an Author Search" name='item_author' class='search_link'> 
-                                                                               <!-- Author goes here -->
-                                                                       </a>
-                                                                       <span name='result_table_extra_span' class='hide_me'>
-                                                                               <span name='result_table_edition_span' style='padding-left: 10px;'> -- </span>
-                                                                               <span name='result_table_pub_box' style='padding-left: 10px;'> 
-                                                                                       <span> [ </span>
-                                                                                       <span name='result_table_pub_span'> </span>
-                                                                                       <span> ] </span>
-                                                                               </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'> </img>
-                                                                       </a>
-
-                                                                       <a name='sound recording-nonmusical_link' class='search_link'> 
-                                                                               <img src='../../../../images/tor/sound recording-nonmusical.jpg' class='dim tor_pic'> </img>
-                                                                       </a>
-
-                                                                       <a name='moving image_link' class='search_link'> 
-                                                                               <img src='../../../../images/tor/moving image.jpg' class='dim tor_pic'> </img>
-                                                                       </a>
-
-                                                                       <a name='software, multimedia_link' class='search_link'> 
-                                                                               <img src='../../../../images/tor/software, multimedia.jpg' class='dim tor_pic'> </img>
-                                                                       </a>
-
-                                                                       <a name='sound recording-musical_link' class='search_link'> 
-                                                                               <img src='../../../../images/tor/sound recording-musical.jpg' class='dim tor_pic'> </img>
-                                                                       </a>
-
-                                                                       <a name='cartographic_link' class='search_link'> 
-                                                                               <img src='../../../../images/tor/cartographic.jpg' class='dim tor_pic'> </img>
-                                                                       </a>
-
-                                                                       <a name='mixed material_link' class='search_link'> 
-                                                                               <img src='../../../../images/tor/mixed material.jpg' class='dim tor_pic'> </img>
-                                                                       </a>
-
-                                                                       <a name='notated music_link' class='search_link'> 
-                                                                               <img src='../../../../images/tor/notated music.jpg' class='dim tor_pic'> </img>
-                                                                       </a>
-
-                                                                       <a name='sound recording_link' class='search_link'> 
-                                                                               <img src='../../../../images/tor/sound recording.jpg' class='dim tor_pic'> </img>
-                                                                       </a>
-
-                                                                       <a name='still images_link' class='search_link'> 
-                                                                               <img src='../../../../images/tor/still images.jpg' class='dim tor_pic'> </img>
-                                                                       </a>
-
-                                                                       <a name='three dimensional object_link' class='search_link'> 
-                                                                               <img src='../../../../images/tor/three dimensional object.jpg' class='dim tor_pic'> </img>
-                                                                       </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'>Place Hold</a>
-                                                                       </span>
-
-                                                               </td>
-                                                       </tr>
-
-                                               </tbody>
-                                       </table>
-                               </td>
-                       </tr>
-               </tbody>
-       </table>
-
-       <script language='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>
-
-
diff --git a/Open-ILS/web/opac/skin/default/xml/searchbar.xml b/Open-ILS/web/opac/skin/default/xml/searchbar.xml
deleted file mode 100644 (file)
index 19febe0..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-
-<!-- Searchbar for doing metarecord searches -->
-
-<div id='searchbar'>
-
-       <!-- load my js -->
-       <script language='javascript' src='../js/search_bar.js'> </script>
-
-       <script language='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' width='100%' style='border-collapse: collapse;'>
-               <tbody>
-                       <tr>
-
-                               <td  nowrap='nowrap' align='center' style='width: 240px; padding: 3px; border: 1px solid #A0A0A0;' class='color_2'>
-                                       <input id='search_box' style='width: 190px;' type='text' />
-                                       <span style='padding-left: 6px;'>
-                                               <input type='button' style='width: 40px;' id='search_submit' value='Go!' />
-                                       </span>
-                               </td>
-
-                               <td nowrap='nowrap' style='padding: 3px;' align='right' >
-
-                                       <!--
-                                       <span style='margin-left: 3px; margin-right: 6px;'> Options:  </span>
-                                       -->
-
-                                       <span style='padding-right:9px;'>
-                                       <select id='search_type_selector'>
-                                               <option value='keyword' selected='selected'> Keyword </option>
-                                               <option value='title'>Title</option>
-                                               <option value='author'>Author</option>
-                                               <option value='subject'>Subject</option>
-                                               <option value='series'>Series</option>
-                                       </select>
-                                       </span>
-
-                                       <span style='padding-right:9px;'>
-                                       <select id='form_selector' >
-                                               <option value='all'>All Formats</option>
-                                               <option value='at'>Books</option>
-                                               <option value='at-d'>Large Print Books</option>
-                                               <option value='i'>Audiobooks</option>
-                                               <option value='g'>Video Recording</option>
-                                               <option value='j'>Music</option>
-                                               <option value='m'>Electronic Resources</option>
-                                       </select>
-                                       </span>
-
-                                       <span>
-                                               <span class='hide_me' id='depth_selector_span'>
-                                                       <select id='depth_selector' >
-                                                               <option value='new'>Choose a different library...</option>
-                                                       </select>
-                                               </span>
-                                               <span class='hide_me' id='lib_selector_span'>
-                                                       <a id='lib_selector_link' href='javascript:void(0)'>* Choose a library to search</a>
-                                               </span>
-                                       </span>
-
-                               </td>
-                       </tr>
-               </tbody>
-       </table>
-</div>
-
-
-
-
-
-
diff --git a/Open-ILS/web/opac/skin/default/xml/sidebar.xml b/Open-ILS/web/opac/skin/default/xml/sidebar.xml
deleted file mode 100644 (file)
index e6931ad..0000000
+++ /dev/null
@@ -1,146 +0,0 @@
-
-<!-- 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'  style='border: 1px solid #A7EA9D;'>
-                       <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="Record Details"
-                               id='rdetail_link_div' class="side_bar_item hide_me">
-                               <span>My Title Details</span>
-                       </div>
-               </div>
-       </div>
-
-       <br/>
-       <div id='subject_tree_sidebar' class='sidebar_chunk hide_me'> 
-               <div id='subject_sidebar_tree_div'> </div>
-               <script language='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'>
-                       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'>
-                       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>
-
-
-       <!-- ============================================================================= -->
-       <!-- Our javascript -->
-       <script language='javascript' src='../js/sidebar.js'> </script>
-
-       <script language='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>
-
diff --git a/Open-ILS/web/opac/skin/default/xml/statusbar.xml b/Open-ILS/web/opac/skin/default/xml/statusbar.xml
deleted file mode 100644 (file)
index 378e812..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-
-<div id='statusbar' style='margin-bottom: 6px; margin-top: 6px;'>
-
-       <div id='text_size_div' style='position:absolute; top: 2px; right: 6px;'>
-               <span>Text Size: </span>
-               <span><a href="javascript:void(0);" onclick="setFontSize('medium');"> Regular </a></span>
-               <span> / </span>
-               <span><a href="javascript:void(0);" onclick="setFontSize('large');"> Large </a></span>
-       </div>
-
-       <table width='100%'>
-               <tbody>
-                       <tr>
-                               <td align='left'>
-                                       <span> Now searching </span>
-                                       <span style='padding: 1px; ' id='now_searching_location'>  </span>
-                               </td>
-                       </tr>
-               </tbody>
-       </table>
-
-       <script language='javascript'>
-               config.ids.common.now_searching = 'now_searching_location';
-       </script>
-
-</div>
diff --git a/Open-ILS/web/opac/skin/default/xml/tips.xml b/Open-ILS/web/opac/skin/default/xml/tips.xml
deleted file mode 100644 (file)
index 644e07a..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<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;">Tip:  </span>
-</div>