From 6bd3260cee31c43d4462925f243fe64d72093395 Mon Sep 17 00:00:00 2001 From: erickson Date: Thu, 7 Jul 2005 18:43:43 +0000 Subject: [PATCH] changing the login dialog over to use the popup box stuff git-svn-id: svn://svn.open-ils.org/ILS/trunk@1093 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Evergreen/css/opac/opac_main.css | 8 ++-- Open-ILS/src/javascript/opac/HoldsWindow.js | 2 +- Open-ILS/src/javascript/opac/LoginDialog.js | 62 +++++++++++---------------- Open-ILS/src/javascript/opac/MyOPACSPage.js | 2 + Open-ILS/src/javascript/opac/OPACStartPage.js | 2 +- Open-ILS/src/javascript/opac/Page.js | 2 +- Open-ILS/src/javascript/widgets/PopupBox.js | 12 +++--- 7 files changed, 41 insertions(+), 49 deletions(-) diff --git a/Evergreen/css/opac/opac_main.css b/Evergreen/css/opac/opac_main.css index 79b7ea15bd..eef6d85848 100644 --- a/Evergreen/css/opac/opac_main.css +++ b/Evergreen/css/opac/opac_main.css @@ -205,15 +205,15 @@ table { border-collapse: collapse; } vertical-align: middle; } -.popup_box_buttons { +.popup_box_group { border-top: 1px solid lightgrey; border-bottom: 1px solid lightgrey; text-align:center; } -.popup_box_buttons td { - padding-left: 5px; - padding-right: 5px; +.popup_box_group td { + padding-left: 8px; + padding-right: 8px; } .popup_box_title { diff --git a/Open-ILS/src/javascript/opac/HoldsWindow.js b/Open-ILS/src/javascript/opac/HoldsWindow.js index a2fe044465..a7309b62e8 100644 --- a/Open-ILS/src/javascript/opac/HoldsWindow.js +++ b/Open-ILS/src/javascript/opac/HoldsWindow.js @@ -95,7 +95,7 @@ HoldsWindow.prototype.buildWindow = function(node) { obj.session = usr.session_id; obj.toggle(); } - var diag = new LoginDialog(getDocument().body, func); + var diag = new LoginDialog(func); diag.display(node); return false; } diff --git a/Open-ILS/src/javascript/opac/LoginDialog.js b/Open-ILS/src/javascript/opac/LoginDialog.js index 92d2eb5f73..6556cac31d 100644 --- a/Open-ILS/src/javascript/opac/LoginDialog.js +++ b/Open-ILS/src/javascript/opac/LoginDialog.js @@ -1,7 +1,6 @@ -/* node is where we attache the div */ -function LoginDialog(node, logged_in_callback) { - this.node = node; +function LoginDialog(logged_in_callback) { this.callback = logged_in_callback; + this.rand = Math.random(); } /* node is the element the dialog should popup under */ @@ -12,13 +11,14 @@ LoginDialog.prototype.display = function(node) { return; } - this.div = elem("div",{id:"login_dialog"}); - var div = this.div; - if(IE) div.style.width = "200px"; /* just has to be done */ + this.box = new PopupBox(node); + var box = this.box; + box.title("Login"); - add_css_class(div,"login_dialog"); - var ut = elem("input", {id:"login_uname",type:"text",size:"16"}); - var pw = elem("input",{id:"login_passwd",type:"password",size:"16"}); + var ut = elem("input", {id:"login_uname_" + this.rand,type:"text",size:"16"}); + var pw = elem("input",{id:"login_passwd_" + this.rand,type:"password",size:"16"}); + ut.size = 16; + pw.size = 16; var but = elem("input", {style:"margin-right: 10px", type:"submit",value:"Login"}); @@ -28,8 +28,8 @@ LoginDialog.prototype.display = function(node) { var obj = this; var submitFunc = function() { - var uname = getById("login_uname").value; - var passwd = getById("login_passwd").value; + var uname = getById("login_uname_" + obj.rand).value; + var passwd = getById("login_passwd_" + obj.rand).value; if(uname == null || uname == "") { alert("Please enter username"); @@ -53,36 +53,23 @@ LoginDialog.prototype.display = function(node) { try{pw.focus();}catch(e){} } } + but.onclick = submitFunc; ut.onkeyup = function(evt) { if(userPressedEnter(evt)) submitFunc(); } pw.onkeyup = function(evt) { if(userPressedEnter(evt)) submitFunc(); } cancel.onclick = function() { obj.hideMe(); } - var A = getXYOffsets(node); - div.style.left = A[0]; - div.style.top = A[1]; - - div.appendChild(elem("br")); - div.appendChild(mktext("Username ")); - div.appendChild(ut); - div.appendChild(elem("br")); - div.appendChild(elem("br")); - div.appendChild(mktext("Password ")); - div.appendChild(pw); - div.appendChild(elem("br")); - div.appendChild(elem("br")); - - var bdiv = elem("div"); - add_css_class(bdiv, "holds_window_buttons"); - bdiv.appendChild(but); - bdiv.appendChild(cancel); - div.appendChild(bdiv); - - - div.appendChild(elem("br")); - this.node.appendChild(this.div); - + box.addText("Username "); + box.addNode(ut); + box.lines(); + box.addText("Passwod "); + box.addNode(pw); + box.lines(); + box.makeGroup([but, cancel]); + + box.show(); try{ut.focus();}catch(E){} + } function runLoginOnEnter(evt) { @@ -91,7 +78,8 @@ function runLoginOnEnter(evt) { } - LoginDialog.prototype.hideMe = function() { - this.node.removeChild(this.div); + this.box.hide(); } + + diff --git a/Open-ILS/src/javascript/opac/MyOPACSPage.js b/Open-ILS/src/javascript/opac/MyOPACSPage.js index 7631b95cda..6dfcd1ffed 100644 --- a/Open-ILS/src/javascript/opac/MyOPACSPage.js +++ b/Open-ILS/src/javascript/opac/MyOPACSPage.js @@ -693,8 +693,10 @@ function _submitUpdateNotifyPhone(hold) { function _buildChangePhoneNotify(hold) { + var a = elem("a",{href:"javascript:void(0);", style:"text-decoration:underline"},null, hold.phone_notify()); + var et1 = elem("input",{type:"text",size:"10"}); var box = new PopupBox(a); var but = elem("input",{type:"submit",value:"Submit"}); diff --git a/Open-ILS/src/javascript/opac/OPACStartPage.js b/Open-ILS/src/javascript/opac/OPACStartPage.js index 6efd9b28f4..c2245244c1 100644 --- a/Open-ILS/src/javascript/opac/OPACStartPage.js +++ b/Open-ILS/src/javascript/opac/OPACStartPage.js @@ -48,7 +48,7 @@ OPACStartPage.prototype.init = function() { if(!UserSession.instance().verifySession()) { login.setAttribute("href","javascript:void(0);"); var func = function(){url_redirect(["target","my_opac"])}; - var diag = new LoginDialog(getDocument().body, func); + var diag = new LoginDialog(func); login.onclick = function(){diag.display(login);} } } diff --git a/Open-ILS/src/javascript/opac/Page.js b/Open-ILS/src/javascript/opac/Page.js index 54e0995e2c..07eb0d8cf4 100644 --- a/Open-ILS/src/javascript/opac/Page.js +++ b/Open-ILS/src/javascript/opac/Page.js @@ -219,7 +219,7 @@ Page.prototype.buildNavBox = function(full) { if(!UserSession.instance().verifySession()) { mylink.setAttribute("href","javascript:void(0);"); var func = function(){url_redirect(["target","my_opac"])}; - var diag = new LoginDialog(getDocument().body, func); + var diag = new LoginDialog(func); mylink.onclick = function(){diag.display(mylink);} } diff --git a/Open-ILS/src/javascript/widgets/PopupBox.js b/Open-ILS/src/javascript/widgets/PopupBox.js index b771afaf05..6ef8dd7812 100644 --- a/Open-ILS/src/javascript/widgets/PopupBox.js +++ b/Open-ILS/src/javascript/widgets/PopupBox.js @@ -88,17 +88,19 @@ PopupBox.prototype.hide = function() { /* pass in an array of DOM nodes and they will be displayed as a group along the box */ -PopupBox.prototype.makeGroup = function(buttons) { +PopupBox.prototype.makeGroup = function(group) { + var center = elem("center"); var table = elem("table"); - add_css_class(table, "popup_box_buttons"); + center.appendChild(table); + add_css_class(table, "popup_box_group"); var row = table.insertRow(0); - for(var i = 0; i!= buttons.length; i++) { + for(var i = 0; i!= group.length; i++) { var cell = row.insertCell(row.cells.length); - cell.appendChild(buttons[i]); + cell.appendChild(group[i]); } this.div.appendChild(elem("br")); - this.div.appendChild(table); + this.div.appendChild(center); } -- 2.11.0