deal with some onclick handlers, also with broken relative links from
authorsenator <lebbeous@esilibrary.com>
Thu, 3 Feb 2011 19:54:14 +0000 (14:54 -0500)
committersenator <lebbeous@esilibrary.com>
Thu, 3 Feb 2011 19:54:14 +0000 (14:54 -0500)
myopac/* templates

Open-ILS/web/opac/skin/kcls-wire/js/misc.js
Open-ILS/web/templates/default/kcls-wire/home.tt2
Open-ILS/web/templates/default/kcls-wire/parts/advanced/search.tt2
Open-ILS/web/templates/default/kcls-wire/parts/myopac/base.tt2
Open-ILS/web/templates/default/kcls-wire/parts/searchbar.tt2
Open-ILS/web/templates/default/kcls-wire/parts/topnav.tt2
Open-ILS/web/templates/default/kcls-wire/parts/utils.tt2

index 3e53964..9e24b46 100644 (file)
@@ -1,6 +1,24 @@
 /* Some really basic utils copied mostly from old opac js:
  * opac_utils.js, utils.js, misc.js (kcls). */
 function $(id) { return document.getElementById(id); }
+function $n(root, nodeName, attr) {
+    return findNodeByName(root, nodeName, attr);
+}
+
+function findNodeByName(root, nodeName, /* defaults to "name" */attr) {
+    if (!root || !nodeName) return null;
+    if (root.nodeType != 1) return null;
+    if (!attr) attr = "name";
+    if (root.getAttribute(attr) == nodeName || root[attr] == nodeName)
+        return root;
+
+    for (var i = 0; i != root.childNodes.length; i++) {
+        var n = findNodeByName(root.childNodes[i], nodeName);
+        if (n) return n;
+    }
+
+    return null;
+}
 
 function swapCSSClass(obj, old, newc) {
        removeCSSClass(obj, old);
@@ -95,3 +113,41 @@ function showDetailedResults(/* Boolean */ detailed) {
      * but leaving this stub here for now).
      */
 }
+
+/* Returns the character code pressed that caused the event. */
+function grabCharCode(evt) {
+    // OLD CODE: evt = (evt) ? evt : ((window.event) ? event : null);
+    evt = evt || window.event || event || null;
+    if (evt) {
+    // OLD CODE: return (evt.charCode ? evt.charCode : ((evt.which) ? evt.which : evt.keyCode));
+        return event.which || event.charCode || event.keyCode;
+    } else {
+        return -1;
+    }
+}
+
+/* returns true if the user pressed enter */
+function userPressedEnter(evt) {
+    var code = grabCharCode(evt);
+    return (code == 13 || code == 3);
+}
+
+function setEnterFunc(node, func) {
+    if (!(node && func)) return;
+    node.onkeydown = function(evt) {
+        if (userPressedEnter(evt)) func();
+    };
+}
+
+function advAddGblRow() {
+    var tbody = $("adv_global_tbody");
+    var newrow = $("adv_global_trow").cloneNode(true);
+    tbody.insertBefore(newrow, $("adv_global_addrow"));
+    var input = $n(newrow, "term");
+    input.value = "";
+    setEnterFunc(input, function() {
+        alert("XXX enter");
+        /* XXX TODO make a real form and get rid of this? */
+    });
+    $n(newrow, 'type').focus();
+}
index d828e91..952422c 100644 (file)
@@ -4,7 +4,6 @@
 [% BLOCK html_head -%]
 <script type="text/javascript" src="/opac/skin/kcls/js/contentslider.js"></script>
 [%- END %]
-
     <div id="search-wrapper">
         [% INCLUDE "default/kcls-wire/parts/utils.tt2" %]
         [% INCLUDE "default/kcls-wire/parts/searchbar.tt2" %]
index 3808123..baf0f50 100644 (file)
@@ -20,8 +20,7 @@
                         <td align='left' style="padding-top:7px;">
                             <a href="javascript:;"
                                 onclick='advAddGblRow();'>Add Search Row</a>
-                            <button onclick='advSubmitGlobal();'
-                                class="hide_me">&advanced.search.submit;</button>
+                            <button>&advanced.search.submit;</button><!-- XXX TODO make a real form -->
                         </td>
                     </tr>
                 </tbody>
 
     <tr class='border_4_2'>
         <td align="left" colspan='2'>
-        <img src="/opac/skin/kcls/graphics/search_btn.gif" alt="Search" onclick='advSubmitGlobal();' style="cursor:pointer;" />
+            <!-- XXX TODO make a real form, and make this a real submitter -->
+        <img src="/opac/skin/kcls/graphics/search_btn.gif" alt="Search"  style="cursor:pointer;" />
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-        <a href="javascript:;" onclick='clearSearchBoxes();' style="position: relative; top: -9px;">Reset Form</a>
+        <!-- XXX TODO make a real form, and make this a real resetter -->
+        <a href="javascript:;" style="position: relative; top: -9px;">Reset Form</a>
         </td>
     </tr>
 </table>
         </div>
 
         <div style='margin-top: 8px;' class='adv_quick_search_submit'>
-        <img src="/opac/skin/kcls/graphics/search_btn.gif" alt="Search" id="adv_quick_submit" onclick='advGenericSearch();' style="cursor:pointer;" />
-            <!-- <a id='adv_quick_submit' href='javascript:advGenericSearch();' class='classic_link'>&common.submit;</a> -->
+            <!-- XXX TODO make a real form, and make a real submitter (quick
+            submit, FKA advGenericSearch() -->
+            <img src="/opac/skin/kcls/graphics/search_btn.gif"
+                alt="Search" id="adv_quick_submit" style="cursor:pointer;" />
         </div>
     </div>
 </div>
         <a style='margin-right: 4px; position:relative;top:-10px;'
             class='classic_link'
             href='javascript:advAddMARC();'>&search.marc.add.row;</a>
-        <!-- <a style='margin-left: 4px;' class='classic_link' href='javascript:advMARCRun();'>&common.submit;</a> -->
-        <img alt="Search"
-            src="/opac/skin/kcls/graphics/search_btn.gif"
-            onclick='advMARCRun();' style="cursor:pointer;" />
+        <!-- XXX TODO make a real form, and make a real submitter (FKA
+        advMARCRun()) -->
+        <img alt="Search" src="/opac/skin/kcls/graphics/search_btn.gif"
+            style="cursor:pointer;" />
     </div>
 </div>
 <!-- ****************** end: advanced_global.xml ***************************** -->
index fdc29ce..fbae83e 100644 (file)
@@ -1,10 +1,12 @@
 [% myopac_pages = [
-    {url => "main", name => "Account Summary"},
-    {url => "circs", name => "Items Checked Out"},
-    {url => "holds", name => "Holds"},
-    {url => "prefs", name => "Account Preferences"},
-    {url => "lists", name => "My Lists"}
-] %]
+        {url => "main", name => "Account Summary"},
+        {url => "circs", name => "Items Checked Out"},
+        {url => "holds", name => "Holds"},
+        {url => "prefs", name => "Account Preferences"},
+        {url => "lists", name => "My Lists"}
+    ];
+    skin_root = "../"
+%]
     [% INCLUDE "default/kcls-wire/parts/topnav.tt2" %]
     <div id="search-wrapper">
         [% INCLUDE "default/kcls-wire/parts/utils.tt2" %]
index a5d9ef9..9a4950a 100644 (file)
@@ -4,7 +4,7 @@
         <tr>
             <td colspan="3">
                 <span class="search_catalog_lbl">Search the Catalog</span>
-                <a href="advanced" id="home_adv_search_link"
+                <a href="[% skin_root %]advanced" id="home_adv_search_link"
                     style="position:relative;top:-1px;left:10px;"><span
                     class="adv_search_font">Advanced Search</span></a>
             </td>
@@ -52,6 +52,8 @@
             <span style="font-size:10px;">Limit to available items</span>
         </label>
       </div>
-    <div id="breadcrumb"><a href="./">Catalog Home</a> &gt;</div>
+      <div id="breadcrumb">
+          <a href="[% skin_root %]home">Catalog Home</a> &gt;
+      </div>
     <div style="clear:both"></div>
 </div>
index ea36ba7..16d8819 100644 (file)
@@ -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="login" id="home_myopac_link"><img
+            href="[% skin_root %]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';"
index 13f8028..85e1df8 100644 (file)
@@ -19,7 +19,7 @@
   <div style="float:left;width:163px;height:30px;background:url('/opac/skin/kcls/graphics/utils-corner-mid.png') repeat-x top;"> 
   
        <a href="javascript:history.go(-1)" style="position:relative;top:1px;left:10px;"><img alt="Back" src="/opac/skin/kcls/graphics/tool_back.png" /></a>
-       <a href="./" style="position:relative;top:3px;left:20px;"><img src="/opac/skin/kcls/graphics/tool_home.png" alt="Homepage" /></a>
+       <a href="[% skin_root %]home" style="position:relative;top:3px;left:20px;"><img src="/opac/skin/kcls/graphics/tool_home.png" alt="Homepage" /></a>
        <a href="javascript:window.print();" style="position:relative;top:5px;left:30px;"><img src="/opac/skin/kcls/graphics/tool_print.png" alt="Print Page" /></a>
        <a href="http://www.kcls.org/usingthelibrary/catalog_help/index.cfm" style="position:relative;top:2px;left:40px;"><img alt="Help" src="/opac/skin/kcls/graphics/tool_help.png" /></a>
        <a href="javascript:history.go(+1)" style="position:relative;top:2px;left:50px;"><img src="/opac/skin/kcls/graphics/tool_forward.png" alt="Forward" /></a>