From 5e5410e9ad0d1bc513c94351c3c804be9e21cb4b Mon Sep 17 00:00:00 2001 From: senator Date: Thu, 3 Feb 2011 14:54:14 -0500 Subject: [PATCH] deal with some onclick handlers, also with broken relative links from myopac/* templates --- Open-ILS/web/opac/skin/kcls-wire/js/misc.js | 56 ++++++++++++++++++++++ Open-ILS/web/templates/default/kcls-wire/home.tt2 | 1 - .../default/kcls-wire/parts/advanced/search.tt2 | 23 +++++---- .../default/kcls-wire/parts/myopac/base.tt2 | 14 +++--- .../default/kcls-wire/parts/searchbar.tt2 | 6 ++- .../templates/default/kcls-wire/parts/topnav.tt2 | 2 +- .../templates/default/kcls-wire/parts/utils.tt2 | 2 +- 7 files changed, 83 insertions(+), 21 deletions(-) diff --git a/Open-ILS/web/opac/skin/kcls-wire/js/misc.js b/Open-ILS/web/opac/skin/kcls-wire/js/misc.js index 3e53964ff9..9e24b46642 100644 --- a/Open-ILS/web/opac/skin/kcls-wire/js/misc.js +++ b/Open-ILS/web/opac/skin/kcls-wire/js/misc.js @@ -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(); +} diff --git a/Open-ILS/web/templates/default/kcls-wire/home.tt2 b/Open-ILS/web/templates/default/kcls-wire/home.tt2 index d828e915d6..952422cfd0 100644 --- a/Open-ILS/web/templates/default/kcls-wire/home.tt2 +++ b/Open-ILS/web/templates/default/kcls-wire/home.tt2 @@ -4,7 +4,6 @@ [% BLOCK html_head -%] [%- END %] -
[% INCLUDE "default/kcls-wire/parts/utils.tt2" %] [% INCLUDE "default/kcls-wire/parts/searchbar.tt2" %] diff --git a/Open-ILS/web/templates/default/kcls-wire/parts/advanced/search.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/advanced/search.tt2 index 3808123935..baf0f50bd3 100644 --- a/Open-ILS/web/templates/default/kcls-wire/parts/advanced/search.tt2 +++ b/Open-ILS/web/templates/default/kcls-wire/parts/advanced/search.tt2 @@ -20,8 +20,7 @@ Add Search Row - + @@ -286,9 +285,11 @@ - Search + + Search       - Reset Form + + Reset Form @@ -315,8 +316,10 @@
- Search - + + Search
@@ -353,10 +356,10 @@ &search.marc.add.row; - - Search + + Search diff --git a/Open-ILS/web/templates/default/kcls-wire/parts/myopac/base.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/myopac/base.tt2 index fdc29cedd9..fbae83eabb 100644 --- a/Open-ILS/web/templates/default/kcls-wire/parts/myopac/base.tt2 +++ b/Open-ILS/web/templates/default/kcls-wire/parts/myopac/base.tt2 @@ -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" %]
[% INCLUDE "default/kcls-wire/parts/utils.tt2" %] 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 a5d9ef99c2..9a4950ad6a 100644 --- a/Open-ILS/web/templates/default/kcls-wire/parts/searchbar.tt2 +++ b/Open-ILS/web/templates/default/kcls-wire/parts/searchbar.tt2 @@ -4,7 +4,7 @@ Search the Catalog - Advanced Search @@ -52,6 +52,8 @@ Limit to available items
- +
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 ea36ba7315..16d8819fc9 100644 --- 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" />
Your Account Log in Back - Homepage + Homepage Print Page Help Forward -- 2.11.0