a little consolidation, a little linking of new pages to each other

diff --git a/Open-ILS/web/templates/default/kcls-wire/advanced.tt2 b/Open-ILS/web/templates/default/kcls-wire/advanced.tt2
index 0de7191..287260c 100644 (file)
--- a/Open-ILS/web/templates/default/kcls-wire/advanced.tt2
+++ b/Open-ILS/web/templates/default/kcls-wire/advanced.tt2
@@ -11,20 +11,7 @@
 </style>
 [% END -%]
     <div id="search-wrapper">
-        <div style="margin:auto;width:974px;height:0px;">
-            <div id="user-ql">
-                <script type="text/javascript">
-/* if(grabUser()) {
-    var str = '<div style="float:right;width:214px;">';
-    str += '<div style="position:absolute;"><div style="position:relative;top:-81px;">\n';
-    str += '<div id="quick-links">\n';
-    str += '</div></div></div></div>';
-    document.write(str);
-}*/
-                </script>
-            </div>
         [% INCLUDE "default/kcls-wire/parts/utils.tt2" %]
-        </div>
         <div id="adv_search_parent">
             <div id="adv_search_tabs">
                 <a href="javascript:;" alt="Advanced Search" id="adv_search"

diff --git a/Open-ILS/web/templates/default/kcls-wire/home.tt2 b/Open-ILS/web/templates/default/kcls-wire/home.tt2
index 2e17bc2..d828e91 100644 (file)
--- a/Open-ILS/web/templates/default/kcls-wire/home.tt2
+++ b/Open-ILS/web/templates/default/kcls-wire/home.tt2
@@ -6,20 +6,7 @@
 [%- END %]
 
     <div id="search-wrapper">
-        <div style="margin:auto;width:974px;height:0px;">
-            <div id="user-ql">
-                <script type="text/javascript">
-/* if(grabUser()) {
-    var str = '<div style="float:right;width:214px;">';
-    str += '<div style="position:absolute;"><div style="position:relative;top:-81px;">\n';
-    str += '<div id="quick-links">\n';
-    str += '</div></div></div></div>';
-    document.write(str);
-}*/
-                </script>
-            </div>
         [% INCLUDE "default/kcls-wire/parts/utils.tt2" %]
-        </div>
         [% INCLUDE "default/kcls-wire/parts/searchbar.tt2" %]
     </div>
     <div id="content-wrapper">

diff --git a/Open-ILS/web/templates/default/kcls-wire/login.tt2 b/Open-ILS/web/templates/default/kcls-wire/login.tt2
index 1ea4112..2488f3d 100644 (file)
--- a/Open-ILS/web/templates/default/kcls-wire/login.tt2
+++ b/Open-ILS/web/templates/default/kcls-wire/login.tt2
@@ -5,20 +5,7 @@
 <script type="text/javascript" src="/opac/skin/kcls/js/contentslider.js"></script>
 [%- END %]
     <div id="search-wrapper">
-        <div style="margin:auto;width:974px;height:0px;">
-            <div id="user-ql">
-                <script type="text/javascript">
-/* if(grabUser()) {
-    var str = '<div style="float:right;width:214px;">';
-    str += '<div style="position:absolute;"><div style="position:relative;top:-81px;">\n';
-    str += '<div id="quick-links">\n';
-    str += '</div></div></div></div>';
-    document.write(str);
-}*/
-                </script>
-            </div>
         [% INCLUDE "default/kcls-wire/parts/utils.tt2" %]
-        </div>
         [% INCLUDE "default/kcls-wire/parts/searchbar.tt2" %]
     </div>
     <div id="content-wrapper">

diff --git a/Open-ILS/web/templates/default/kcls-wire/parts/searchbar.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/searchbar.tt2
index 26c37b4..04b8ff4 100644 (file)
--- a/Open-ILS/web/templates/default/kcls-wire/parts/searchbar.tt2
+++ b/Open-ILS/web/templates/default/kcls-wire/parts/searchbar.tt2
@@ -2,7 +2,7 @@
     <table cellpadding="0" cellspacing="10" border="0" style="position:relative;left:-10px;">
         <tr>
             <td colspan="3">
-                <span class="search_catalog_lbl">Search the Catalog</span> <a href="javascript:;" id="home_adv_search_link" style="position:relative;top:-1px;left:10px;"><span class="adv_search_font">Advanced Search</span></a>
+                <span class="search_catalog_lbl">Search the Catalog</span> <a href="advanced" id="home_adv_search_link" style="position:relative;top:-1px;left:10px;"><span class="adv_search_font">Advanced Search</span></a>
             </td>
         </tr>
         <tr>
@@ -30,6 +30,6 @@
         </label>
       </div>
       
-    <div id="breadcrumb"><a href="index.xml">Catalog Home</a> &gt;</div>
+    <div id="breadcrumb"><a href="./">Catalog Home</a> &gt;</div>
     <div style="clear:both"></div>
 </div>

diff --git a/Open-ILS/web/templates/default/kcls-wire/parts/topnav.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/topnav.tt2
index f775126..ea36ba7 100644 (file)
--- a/Open-ILS/web/templates/default/kcls-wire/parts/topnav.tt2
+++ b/Open-ILS/web/templates/default/kcls-wire/parts/topnav.tt2
@@ -5,7 +5,7 @@
         src="/opac/skin/kcls/graphics/KCLS_logo_horiz.gif" /></a></div>
     <div style="float:right;">
         <div id="your-acct-login"><a
-            href="javascript:void(0);" id="home_myopac_link"><img
+            href="login" id="home_myopac_link"><img
             alt="Your Account Log in"
             src="/opac/skin/kcls/graphics/login-btn.png"
             onmouseover="this.src='/opac/skin/kcls/graphics/login-btn-hover.png';"

diff --git a/Open-ILS/web/templates/default/kcls-wire/parts/utils.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/utils.tt2
index 4ab334a..13f8028 100644 (file)
--- a/Open-ILS/web/templates/default/kcls-wire/parts/utils.tt2
+++ b/Open-ILS/web/templates/default/kcls-wire/parts/utils.tt2
@@ -1,3 +1,16 @@
+        <div style="margin:auto;width:974px;height:0px;">
+            <div id="user-ql">
+                <script type="text/javascript">
+/* if(grabUser()) {
+    var str = '<div style="float:right;width:214px;">';
+    str += '<div style="position:absolute;"><div style="position:relative;top:-81px;">\n';
+    str += '<div id="quick-links">\n';
+    str += '</div></div></div></div>';
+    document.write(str);
+}*/
+                </script>
+            </div>
+
 <!-- ****************** utils.xml ***************************** -->
 
 <div style="float:right;">
@@ -16,4 +29,4 @@
 </div>
 </div>
 
-<!-- ****************** end: utils.xml ***************************** -->
+        </div>