From: erickson Date: Thu, 13 Nov 2008 19:59:23 +0000 (+0000) Subject: slight cleanup and re-org X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=91c9ca1a73709c67289d51bb1bf65d85267648fe;p=Evergreen.git slight cleanup and re-org git-svn-id: svn://svn.open-ils.org/ILS/trunk@11168 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/web/js/ui/base.js b/Open-ILS/web/js/ui/base.js index 1c3c2491bf..1bf2355a05 100644 --- a/Open-ILS/web/js/ui/base.js +++ b/Open-ILS/web/js/ui/base.js @@ -1,22 +1,28 @@ dojo.require('dijit.Dialog'); +dojo.require('dojo.cookie'); dojo.require('fieldmapper.dojoData'); dojo.require('openils.User'); -dojo.require('dojo.cookie'); dojo.require('openils.CGI'); dojo.require('openils.Event'); +dojo.require('openils.Util'); function oilsSetupUser() { var authtoken = new openils.CGI().param('ses') || dojo.cookie('ses'); + var workstation = dojo.cookie('oils.ws'); var user; if(authtoken) user = new openils.User({authtoken:authtoken}); if(!authtoken || openils.Event.parse(user.user)) { - dojo.cookie('ses', openils.User.authtoken, {expires:-1, path:'/'}); + dojo.cookie('ses', openils.User.authtoken, {expires:-1, path:'/'}); // remove the cookie openils.User.authtoken = null; - dojo.addOnLoad(function(){oilsLoginDialog.show();}); + dojo.addOnLoad(function(){ + oilsLoginDialog.show(); + dojo.byId('oils-login-workstation').innerHTML = workstation || ''; + }); return; } dojo.cookie('ses', authtoken, {path : oilsCookieBase}); openils.User.authtoken = authtoken; + openils.User.workstation = dojo.cookie('oils.ws'); } function oilsDoLogin() { @@ -27,7 +33,8 @@ function oilsDoLogin() { type: 'staff' // hardcode for now }); dojo.cookie('ses', user.authtoken, {path : oilsCookieBase}); - return true; + location.href = location.href; + return false; } oilsSetupUser(); diff --git a/Open-ILS/web/templates/base.tt2 b/Open-ILS/web/templates/base.tt2 index 84549c1cbe..0b015e5b7a 100644 --- a/Open-ILS/web/templates/base.tt2 +++ b/Open-ILS/web/templates/base.tt2 @@ -14,28 +14,7 @@ - - - - [% content %] + [% INCLUDE login.tt2 %] + [% content %] diff --git a/Open-ILS/web/templates/login.tt2 b/Open-ILS/web/templates/login.tt2 new file mode 100644 index 0000000000..7d2371dcbe --- /dev/null +++ b/Open-ILS/web/templates/login.tt2 @@ -0,0 +1,25 @@ + +