moved opac over to pure SSI and browser-handled XML entities.
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 13 Dec 2005 23:57:18 +0000 (23:57 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 13 Dec 2005 23:57:18 +0000 (23:57 +0000)
index.xml is the starting point for all opac pages.  It determines which sub-chunks to load
the page_* pages are where the logic for each opac page type resides

git-svn-id: svn://svn.open-ils.org/ILS/trunk@2362 dcc99617-32d9-48b4-a31d-7c20da2025e4

38 files changed:
Open-ILS/web/opac/skin/default/xml/altcanvas.xml
Open-ILS/web/opac/skin/default/xml/body.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/css_common.xml
Open-ILS/web/opac/skin/default/xml/fonts.xml
Open-ILS/web/opac/skin/default/xml/footer.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/header.xml
Open-ILS/web/opac/skin/default/xml/holds.xml
Open-ILS/web/opac/skin/default/xml/homesearch.xml
Open-ILS/web/opac/skin/default/xml/html_xsl.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/index.xml
Open-ILS/web/opac/skin/default/xml/index_body.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/js_common.xml
Open-ILS/web/opac/skin/default/xml/login.xml
Open-ILS/web/opac/skin/default/xml/logo.xml
Open-ILS/web/opac/skin/default/xml/myopac_checked.xml
Open-ILS/web/opac/skin/default/xml/myopac_fines.xml
Open-ILS/web/opac/skin/default/xml/myopac_holds.xml
Open-ILS/web/opac/skin/default/xml/myopac_prefs.xml
Open-ILS/web/opac/skin/default/xml/myopac_summary.xml
Open-ILS/web/opac/skin/default/xml/orgtree.xml
Open-ILS/web/opac/skin/default/xml/page_advanced.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/page_mresult.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/page_myopac.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/page_rdetail.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/page_rresult.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/rdetail_altcanvas.xml
Open-ILS/web/opac/skin/default/xml/rdetail_copyinfo.xml
Open-ILS/web/opac/skin/default/xml/rdetail_extras.xml
Open-ILS/web/opac/skin/default/xml/rdetail_summary.xml
Open-ILS/web/opac/skin/default/xml/result_common.xml
Open-ILS/web/opac/skin/default/xml/result_info.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/result_lowhits.xml
Open-ILS/web/opac/skin/default/xml/result_table.xml
Open-ILS/web/opac/skin/default/xml/searchbar.xml
Open-ILS/web/opac/skin/default/xml/setenv.xml [new file with mode: 0644]
Open-ILS/web/opac/skin/default/xml/sidebar.xml
Open-ILS/web/opac/skin/default/xml/statusbar.xml
Open-ILS/web/opac/skin/default/xml/tips.xml

index 448ede5..5d19ad6 100644 (file)
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <!-- These are the UI components that may be needed on any given page.  The must be
        set to class += 'hide_me' by default -->
@@ -6,10 +5,12 @@
 <div id='not_the_canvas' xmlns:xi="http://www.w3.org/2001/XInclude">
 
        <!-- the login page -->
-       <xi:include href="login.xml"/> 
+       <!--#if expr="$FRONT_PAGE!='true'"-->
+               <!--#include virtual="login.xml"-->
+       <!--#endif-->
 
        <!-- The org tree -->
-       <xi:include href="orgtree.xml"/> 
+       <!--#include virtual="orgtree.xml"-->
 
        <!-- ============================================================================= -->
        <!-- Register the alternate canvases  -->
@@ -21,7 +22,9 @@
                config.ids.altcanvas.loading            = 'loading_alt';
        </script>
 
-       <xi:include href='holds.xml'/>
+       <!--#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'>
diff --git a/Open-ILS/web/opac/skin/default/xml/body.xml b/Open-ILS/web/opac/skin/default/xml/body.xml
new file mode 100644 (file)
index 0000000..1509248
--- /dev/null
@@ -0,0 +1,24 @@
+<body onload='init();'>
+       <table width='100%' height='99%'>
+               <tbody>
+                       <tr>
+                               <td id='main_left_cell'>
+                                       <!--#include virtual="logo.xml"-->
+                                       <!--#include virtual="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"--> 
+                                               <!--#include virtual="page_${OILS_PAGE}"-->
+                                       </div>
+                                       <br/>
+                                       <!--#include virtual="tips.xml"-->
+                               </td>
+                       </tr>
+               </tbody>
+       </table>
+       <!--#include virtual='footer.xml'-->
+</body>
index 6ee1881..33468c7 100644 (file)
@@ -1,23 +1,16 @@
-<?xml version='1.0'?>
 
 <!-- CSS shared across pages goes here --> 
 
-<css>
+<link type='text/css' rel='stylesheet' href='../css/layout.css'/>
 
-       <link type='text/css' rel='stylesheet' href='../css/layout.css'/>
-       <link type='text/css' rel='stylesheet' href='../../../common/css/dtree.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 font CSS's -->
-       <link type='text/css' rel='stylesheet'                                  
-               href='../../../common/css/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'/>
 
-       <!-- Our colors -->
-       <link type='text/css' rel="stylesheet" href="../../../theme/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" />
 
-       <!--
-       <link type='text/css' rel="alternate stylesheet" href="../../../theme/test/css/colors.css" 
-               title='Color Test' name='ColorTest' csstype="color" />
-               -->
-
-</css>
diff --git a/Open-ILS/web/opac/skin/default/xml/footer.xml b/Open-ILS/web/opac/skin/default/xml/footer.xml
new file mode 100644 (file)
index 0000000..d90364f
--- /dev/null
@@ -0,0 +1,12 @@
+<div style='width: 100%; text-align:center; vertical-align: bottom; margin-top: 50px;'>
+       <!--
+       <div style='width: 90%; background: #E0F0E0; text-align:center; vertical-align: bottom; margin: 10px; border: 1px solid #808080;'>
+       -->
+       <span 
+               style='width: 90%; background: #E0F0E0; text-align:center; vertical-align: bottom; border: 1px solid #808080; padding: 10px;'>
+               <span>Copyright (C) 2005 Georgia Public Library Service</span>
+       </span>
+       <!--
+       </div>
+       -->
+</div>
index 9268e9e..49c7dd0 100644 (file)
@@ -1,6 +1,12 @@
-<?xml version='1.0'?>
+<head>
+       <!-- Set the page title -->
 
-<div id='left_div' xmlns:xi="http://www.w3.org/2001/XInclude">
-       <xi:include href="logo.xml"/>
-       <xi:include href="sidebar.xml"/> 
-</div>
+       <!--#include virtual="css_common.xml"-->
+
+       <title>&<!--#echo var="OILS_TITLE"-->;</title>
+
+       <!--#if expr="$slimpac!='true'"-->
+               <!--#include virtual="js_common.xml"-->
+       <!--#endif-->
+
+</head>
index f2ebdbb..5ee36a2 100644 (file)
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div>
        <div id='xulholds_box' class='hide_me non_canvas' style='margin-top: 6px;'>
index 1aca33b..52723e5 100644 (file)
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='canvas_main' 
        style='border: 3px solid #A7EA9D; -moz-border-radius: 6px; padding: 6px; margin-top: 65px;' 
@@ -26,7 +25,7 @@
 
 
        <div style='width: 100%; text-align: center'>
-               <img src='../../../images/main_logo.jpg' />
+               <img src='../../../../images/main_logo.jpg' />
        </div>
 
 
diff --git a/Open-ILS/web/opac/skin/default/xml/html_xsl.xml b/Open-ILS/web/opac/skin/default/xml/html_xsl.xml
new file mode 100644 (file)
index 0000000..f223320
--- /dev/null
@@ -0,0 +1,10 @@
+
+<xsl:stylesheet version="1.0"
+       xmlns:xlink="http://www.w3.org/1999/xlink" 
+       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+       <xsl:output method="html" indent="yes" encoding="utf-8"/>
+       <xsl:template match="/">
+               <xsl:copy-of select='/*[local-name()="html"]'/>
+       </xsl:template>
+</xsl:stylesheet>   
index 15ad674..069ba8b 100644 (file)
@@ -1,44 +1,38 @@
-<?xml version='1.0'?>
-
-
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-       <head>
-               <title>&opac.title.home;</title>
-               <xi:include href="css_common.xml"/>
-               <script language='javascript' src='../../../common/js/utils.js'> </script>
-               <script language='javascript' src='../../../common/js//config.js'> </script>
-               <script language='javascript' src='../../../common/js/CGI.js'> </script>
-               <script language='javascript' src='../../../common/js/Cookie.js'> </script>
-
-               <script language='javascript' src='../../../common/js/slimtree.js'> </script>
-               <script language='javascript' src='../../../common/js/JSON.js'> </script>
-               <script language='javascript' src='../../../common/js/fmcore.js'> </script>
-               <script language='javascript' src='../../../common/js/fmgen.js'> </script>
-               <script language='javascript' src='../../../common/js/opac_utils.js'> </script>
-               <script language='javascript' src='../../../common/js/OrgTree.js'> </script>
-               <script language='javascript' src='../../../common/js/org_utils.js'> </script>
-               <script language='javascript' src='../../../common/js/init.js'> </script>
-
-       </head>
-
-       <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'>
-                                                       <xi:include href="altcanvas.xml"/>
-                                                       <xi:include href="homesearch.xml"/>
-                                               </div>
-                                       </td>
-                                       <td width='10%'> </td>
-                               </tr>
-                       </tbody>
-               </table>
-       </body>
-       <script language='javascript'>isFrontPage = true;</script>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Loads the environment -->
+<!--#include virtual="setenv.xml"-->
+
+<!-- Tells the browser to translate the page as HTML --> 
+<?xml-stylesheet type="text/xsl" href="html_xsl.xml"?> 
+
+
+<!DOCTYPE html PUBLIC 
+       "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
+       <!--#include virtual="/opac/locale/${locale}/common.dtd"-->
+       <!--#include virtual="/opac/locale/${locale}/opac_common.dtd"-->
+
+       <!--#if expr="$OILS_PAGE='rresult.xml' || $OILS_PAGE='mresult.xml'"-->
+               <!--#include virtual="/opac/locale/${locale}/opac_result.dtd"-->
+       <!--#endif-->
+
+       <!--#if expr="$OILS_PAGE='rdetail.xml'"-->
+               <!--#include virtual="/opac/locale/${locale}/opac_rdetail.dtd"-->
+       <!--#endif-->
+
+       <!--#if expr="$OILS_PAGE!='index.xml'"-->
+               <!--#include virtual="/opac/locale/${locale}/opac_holds.dtd"-->
+       <!--#endif-->
+
+]>
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+       <!--#include virtual="header.xml"-->
+       <!--#if expr="$OILS_PAGE='index.xml'"-->
+               <!--#include virtual="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
new file mode 100644 (file)
index 0000000..adef0ca
--- /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="altcanvas.xml"-->
+                                               <!--#include virtual="homesearch.xml"-->
+                                       </div>
+                               </td>
+                               <td width='10%'> </td>
+                       </tr>
+               </tbody>
+       </table>
+       <script language='javascript'>isFrontPage = true;</script>
+</body>
+
+
index e951e60..a09b0a2 100644 (file)
@@ -1,27 +1,24 @@
-<?xml version='1.0'?>
 
-<!-- Javascript shared across all pages -->
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->/utils.js'> </script>
 
-<div xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en" lang="en">
+       <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='../../../common/js/utils.js'> </script>
-       <script language='javascript' src='../../../common/js//config.js'> </script>
-       <script language='javascript' src='../../../common/js/CGI.js'> </script>
-       <script language='javascript' src='../../../common/js/Cookie.js'> </script>
-       <script language='javascript' src='../../../common/js/Cookies.js'> </script>
-       <script language='javascript' src='../../../common/js/md5.js'> </script>
+       <script language='javascript' src='<!--#echo var="OILS_JS_BASE"-->//slimtree.js'> </script>
 
-       <script language='javascript' src='../../../common/js/slimtree.js'> </script>
-
-       <script language='javascript' src='../../../common/js/JSON.js'> </script>
-       <script language='javascript' src='../../../common/js/fmcore.js'> </script>
-       <script language='javascript' src='../../../common/js/fmgen.js'> </script>
-       <script language='javascript' src='../../../common/js/opac_utils.js'> </script>
-       <script language='javascript' src='../../../common/js/OrgTree.js'> </script>
-       <script language='javascript' src='../../../common/js/org_utils.js'> </script>
-       <script language='javascript' src='../../../common/js/RemoteRequest.js'> </script>
-       <script language='javascript' src='../../../common/js/init.js'> </script>
-       <script language='javascript' src='../../../common/js/added_content.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'>
@@ -30,5 +27,4 @@
                config.css.color_3 = "color_3";
        </script>
 
-</div>
 
index 436753a..5038d67 100644 (file)
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='login_box' class='hide_me non_canvas' style='margin-top: 6px;'>
 
index 4f0da1f..268a297 100644 (file)
@@ -1,5 +1,4 @@
-<?xml version='1.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>
+       <img src='../../../../images/small_logo.jpg' id='top_left_logo' border='0' class='logo'> </img>
 </div>
index d65f1e4..fd67694 100644 (file)
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='myopac_checked_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
index 808e156..ac5a63b 100644 (file)
@@ -1,12 +1,11 @@
-<?xml version='1.0'?>
 
 <div id='myopac_fines_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
        <br/>
-       <table width='100%' class='light_border data_grid'>
+       <table width='100%' class='data_grid data_grid_center'>
 
                <thead class='color_3'>
-                       <tr><td colspan='3' align='center' style='background: none'><b>Summary</b></td></tr>
+                       <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>
@@ -17,9 +16,9 @@
                <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 align='center' id='myopac_fines_summary_total' class='light_border'>$</td>
-                               <td align='center' id='myopac_fines_summary_paid' class='light_border'>$</td>
-                               <td align='center' id='myopac_fines_summary_balance' class='light_border' style='color:red;font-weight: bold;'>$</td>
+                               <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/>
 
+       <!--
        <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 class='color_3'>
-                       <tr><td colspan='8' align='center' style='background: none'><b>Transaction Details</b></td></tr>
+               <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>
                </thead>
 
                <tbody id='myopac_fines_tbody'>
-                       <tr id='myopac_trans_row' class='light_border'>
-                               <td align='center' name='myopac_trans_start' class='light_border'> </td>
-                               <td align='center' name='myopac_trans_last_bill' class='light_border'> </td>
-                               <td align='center' name='myopac_trans_last_payment' class='light_border'> </td>
-                               <td align='center' name='myopac_trans_init_amount' class='light_border'>$</td>
-                               <td align='center' name='myopac_trans_total_paid' class='light_border'>$</td>
-                               <td align='center' name='myopac_trans_balance' class='light_border' style='color:red; font-weight: bold;'>$</td>
-                               <td align='center' name='myopac_trans_type' class='light_border'> </td>
-                               <td align='center' name='myopac_trans_extra' class='light_border'> </td>
+                       <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>
index 905a00c..273f199 100644 (file)
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='myopac_holds_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
index b6cdc17..152dc39 100644 (file)
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='myopac_prefs_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
                                        <b>Preferences</b>
                                </td>
                        </tr>
-                       <!--
-                       <tr>
-                               <td >More To Come...</td>
-                       </tr>
-                       -->
                </thead>
 
                <tbody id='myopac_prefs_tbody'>
@@ -25,6 +19,7 @@
                                <td>
                                        <select id='prefs_hits_per'>
                                                <option>5</option>
+                                               <option>8</option>
                                                <option>10</option>
                                                <option>15</option>
                                                <option>20</option>
index 6eb4956..7283900 100644 (file)
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='myopac_summary_div' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
index 251d820..7d71b3b 100644 (file)
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <!-- the org tree -->
 <div id='org_container' class='hide_me non_canvas'>
diff --git a/Open-ILS/web/opac/skin/default/xml/page_advanced.xml b/Open-ILS/web/opac/skin/default/xml/page_advanced.xml
new file mode 100644 (file)
index 0000000..bcb552a
--- /dev/null
@@ -0,0 +1,3 @@
+<div id='canvas_main'>Advanced Search Goes Here</div>
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/page_mresult.xml b/Open-ILS/web/opac/skin/default/xml/page_mresult.xml
new file mode 100644 (file)
index 0000000..3715f0b
--- /dev/null
@@ -0,0 +1,9 @@
+<div>
+       <script language='javascript' src='../js/sidebar_extras.js'> </script>
+       <script language='javascript' src='../js/mresult.js'> </script>
+       <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"-->
+</div>
+
diff --git a/Open-ILS/web/opac/skin/default/xml/page_myopac.xml b/Open-ILS/web/opac/skin/default/xml/page_myopac.xml
new file mode 100644 (file)
index 0000000..a7f44ee
--- /dev/null
@@ -0,0 +1,65 @@
+<div id='canvas_main'>
+
+       <script language='javascript' src='../js/myopac.js'> </script>
+
+       <!-- overwrite the fieldmapper code with the extended fieldmapper code -->
+       <script language='javascript' src='../../../../common/js/fmextcore.js'> </script>
+       <script language='javascript' src='../../../../common/js/fmgen.js'> </script>
+
+       <script language='javascript'>
+               config.ids.myopac = {};
+               config.css.myopac = {};
+               config.names.myopac = {};
+       </script>
+
+       <br/>
+       <table style='width: 95%; text-align: center;'>
+               <tbody>
+                       <tr id='myopac_nav_row'>
+
+                               <td width='5%' style='border-right: 1px solid #808080;'></td>
+
+                               <td class='myopac_link' id='myopac_summary_td' >
+                                       <a href='javascript:void(0);' 
+                                               onclick='myOPACChangePage("summary");'> Account Summary</a>
+                               </td>
+
+                               <td class='myopac_link' id='myopac_checked_td' >
+                                       <a href='javascript:void(0);' 
+                                               onclick='myOPACChangePage("checked");'> Checked Out</a>
+                               </td>
+
+                               <td class='myopac_link' id='myopac_holds_td' >
+                                       <a href='javascript:void(0);' 
+                                               onclick='myOPACChangePage("holds");'>Holds</a>
+                               </td>
+
+                               <td class='myopac_link' id='myopac_fines_td' >
+                                       <a href='javascript:void(0);' 
+                                               onclick='myOPACChangePage("fines");'>Fines</a>
+                               </td>
+
+                               <td class='myopac_link' id='myopac_prefs_td' >
+                                       <a href='javascript:void(0);' 
+                                               onclick='myOPACChangePage("prefs");'>Preferences</a>
+                               </td>
+
+                               <td width='5%' style='border-left: 1px solid #808080;'></td>
+
+                       </tr>
+               </tbody>
+       </table>
+
+       <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"-->
+       </div>
+
+</div>
+
+
diff --git a/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml b/Open-ILS/web/opac/skin/default/xml/page_rdetail.xml
new file mode 100644 (file)
index 0000000..ecb315f
--- /dev/null
@@ -0,0 +1,30 @@
+<div id='canvas_main'>
+
+       <script language='javascript' src='../js/sidebar_extras.js'> </script>
+       <script language='javascript' src='../js/rdetail.js'> </script>
+       <script language='javascript' src='../js/holds.js'> </script>
+
+       <script language='javascript'>
+               config.ids.rdetail = {};
+               config.ids.rdetail.view_marc = "rdetail_view_marc";
+       </script>
+
+
+       <table style='' class='rdetail_header color_1' width='100%'>
+               <tbody>
+                       <tr>
+                               <td>
+                                       <span>&rdetail.detailMain.headerLabel;</span>
+                               </td>
+                               <td align='right' style='padding-right: 7px;'>
+                                       <span style='padding-right: 5px;'>
+                                               <a id='rdetail_place_hold' class='classic_link'>Place Hold</a>
+                                       </span>
+                               </td>
+                       </tr>
+               </tbody>
+       </table>
+       <!--#include virtual="rdetail_summary.xml"-->
+       <br/><br/>
+       <!--#include virtual="rdetail_extras.xml"-->
+</div>
diff --git a/Open-ILS/web/opac/skin/default/xml/page_rresult.xml b/Open-ILS/web/opac/skin/default/xml/page_rresult.xml
new file mode 100644 (file)
index 0000000..c0e3334
--- /dev/null
@@ -0,0 +1,9 @@
+<div>
+       <script language='javascript' src='../js/sidebar_extras.js'> </script>
+       <script language='javascript' src='../js/rresult.js'> </script>
+       <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"-->
+</div>
+
index 1e11391..c78659b 100644 (file)
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <!-- This holds information for copies attached to this record -->
 <div id='rdetail_copy_info_div' class='rdetail_extras_div'>
index f534d1f..3ecdc8e 100644 (file)
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div xmlns:xi="http://www.w3.org/2001/XInclude">
 
@@ -40,7 +39,7 @@
        <div id='rdetail_extras_div' style='width: 95%;'> 
                <div id='rdetail_extras_loading' class='hide_me' 
                        style='padding: 10px;'>Loading...</div>
-               <xi:include href="rdetail_copyinfo.xml"/>
+               <!--#include virtual="rdetail_copyinfo.xml"-->
 
                <div id='rdetail_reviews_div' class='rdetail_extras_div hide_me'> 
                        <div id='rdetail_review_template' style='width: 100%;'>
index e082d0c..7bdf1ad 100644 (file)
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='canvas_main' xmlns:xi="http://www.w3.org/2001/XInclude" >
 
@@ -29,8 +28,8 @@
                config.names.result.count_cell  = "copy_count_cell";
        </script>
 
-       <xi:include href="result_table.xml"/>
-       <xi:include href='result_lowhits.xml'/>
+       <!--#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
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>
+
index 738a61e..3c5f20c 100644 (file)
@@ -1,5 +1,3 @@
-<?xml version='1.0'?>
-
 <!-- Search results are spit into this table -->
 
 <div id='result_table_div' xmlns:xi="http://www.w3.org/2001/XInclude">
                </thead>
 
                <tbody id='result_table'>
-
                        <tr>
 
                                <td class='result_table_row'>
-
-                                       <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'> &llt;&llt; </a>
-                                                                               <span class='search_page_nav_link' id='page_numbers'> </span>
-                                                                               <a  class='search_page_nav_link' id='next_link' 
-                                                                                       title='Next Page'> &ggt;&ggt; </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>
+                                       <!--#include virtual="result_info.xml"-->
                                </td>
                        </tr>
 
-
-
-
                        <!-- Template for displaying a search result.  This row template is cloned and inserted
                                        for each result returned -->
 
                                                                <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>
+                                                                               <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>
+                                                                               <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>
+                                                                               <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>
+                                                                               <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>
+                                                                               <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>
+                                                                               <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>
+                                                                               <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>
+                                                                               <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>
+                                                                               <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>
+                                                                               <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>
+                                                                               <img src='../../../../images/tor/three dimensional object.jpg' class='dim tor_pic'> </img>
                                                                        </a>
 
                                                                        <span class='hide_me' 
index d2fa5d9..19febe0 100644 (file)
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <!-- Searchbar for doing metarecord searches -->
 
diff --git a/Open-ILS/web/opac/skin/default/xml/setenv.xml b/Open-ILS/web/opac/skin/default/xml/setenv.xml
new file mode 100644 (file)
index 0000000..a1feed1
--- /dev/null
@@ -0,0 +1,34 @@
+<!-- Sets our environment variables for convenience and determining which page we're on -->
+
+<!--#set var='OILS_PAGE' value="$DOCUMENT_NAME"-->
+
+<!--#if expr="$DOCUMENT_NAME='index.xml'"-->
+       <!--#set var='OILS_TITLE' value='opac.title.home'-->
+       <!--#set var='FRONT_PAGE' value='true'-->
+
+<!--#elif expr="$DOCUMENT_NAME='mresult.xml'"-->
+       <!--#set var='OILS_TITLE' value='opac.title.mresult'-->
+       
+
+<!--#elif expr="$DOCUMENT_NAME='rresult.xml'"-->
+       <!--#set var='OILS_TITLE' value='opac.title.rresult'-->
+
+<!--#elif expr="$DOCUMENT_NAME='rdetail.xml'"-->
+       <!--#set var='OILS_TITLE' value='opac.title.rdetail'-->
+
+<!--#elif expr="$DOCUMENT_NAME='myopac.xml'"-->
+       <!--#set var='OILS_TITLE' value='opac.title.myopac'-->
+
+<!--#elif expr="$DOCUMENT_NAME='advanced.xml'"-->
+       <!--#set var='OILS_TITLE' value='opac.title.advanced'-->
+
+<!--#endif-->
+
+<!--#set var="OILS_BASE" value="http://${SERVER_NAME}/${OILS_OPAC_BASE}"-->
+<!--#set var="OILS_JS_BASE" value="${OILS_BASE}/common/js"-->
+<!--#set var="OILS_CSS_BASE" value="${OILS_BASE}/common/css"--> 
+<!--#set var="OILS_THEME_BASE" value="${OILS_BASE}/theme"--> 
+
+<!--#if expr="!$locale || $locale=''"-->
+       <!--#set var="locale" value="en-US"-->
+<!--#endif-->
index b213cb7..e6931ad 100644 (file)
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <!-- Navigation bar -->
 
        <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', '../../../../images/slimtree/related.jpg');
                        subjectSidebarTree.addNode( 'subjectSidebarTreeRoot', -1, 
                                "&sidebar.relevantSubjects.headerLabel;", 
                                'javascript:subjectSidebarTree.toggle(' +
                <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','../../../../images/slimtree/people.jpg');
                        authorSidebarTree.addNode( 'authorSidebarTreeRoot', -1, 
                                "&sidebar.relevantAuthors.headerLabel;", 
                                'javascript:authorSidebarTree.toggle(' +
                <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');
+                               '../../../../images/slimtree/houses.jpg');
                        seriesSidebarTree.addNode( 'seriesSidebarTreeRoot', -1, 
                                "&sidebar.relevantSeries.headerLabel;", 
                                'javascript:seriesSidebarTree.toggle(' +
index cab1711..378e812 100644 (file)
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='statusbar' style='margin-bottom: 6px; margin-top: 6px;'>
 
index cf31218..644e07a 100644 (file)
@@ -1,4 +1,3 @@
-<?xml version='1.0'?>
 
 <div id='tips' class='tips hide_me'>
        <div class='hide_me'>