this wraps the input elements used for opac login in an actual form element, with...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@18548 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/opac/skin/default/js/sidebar.js b/Open-ILS/web/opac/skin/default/js/sidebar.js
index 30a2ffe..80a5f9e 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/sidebar.js
+++ b/Open-ILS/web/opac/skin/default/js/sidebar.js
@@ -157,12 +157,12 @@ function strongPassword(pass, alrt) {
 
 function initLogin() {
 
-       G.ui.login.button.onclick = loginDance;
+       G.ui.login.button.onclick = function(evt) { G.ui.login.form.setAttribute('action','javascript:loginDance();'); };
        G.ui.login.username.onkeydown = 
-               function(evt) {if(userPressedEnter(evt)) loginDance();};
+               function(evt) {if(userPressedEnter(evt)) G.ui.login.form.setAttribute('action','javascript:loginDance();');};
        G.ui.login.password.onkeydown = 
-               function(evt) {if(userPressedEnter(evt)) loginDance();};
-
+               function(evt) {if(userPressedEnter(evt)) G.ui.login.form.setAttribute('action','javascript:loginDance();');};
+    
 //     if(loginBoxVisible) {
 //             showCanvas();
 //     } else {
@@ -171,9 +171,9 @@ function initLogin() {
 //     }
 
 //     loginBoxVisible = !loginBoxVisible;
-       G.ui.login.cancel.onclick = showCanvas;
+       G.ui.login.cancel.onclick = function(evt) { G.ui.login.form.setAttribute('action','javascript:showCanvas();'); };
        if(findCurrentPage() == MYOPAC) 
-               G.ui.login.cancel.onclick = goHome;
+               G.ui.login.cancel.onclick = function(evt) { G.ui.login.form.setAttribute('action','javascript:goHome();'); };
 }
 
 function setSidebarLinks() {

diff --git a/Open-ILS/web/opac/skin/default/xml/common/login.xml b/Open-ILS/web/opac/skin/default/xml/common/login.xml
index a875410..3199e07 100644 (file)
--- a/Open-ILS/web/opac/skin/default/xml/common/login.xml
+++ b/Open-ILS/web/opac/skin/default/xml/common/login.xml
@@ -4,6 +4,7 @@
        <script language='javascript' type='text/javascript'>
                config.ids.login = {};
                config.css.login = {};
+               config.ids.login.form                   = "login_form";
                config.ids.login.box                    = "login_box";
                config.ids.login.tbody                  = "login_tbody";
                config.ids.login.username       = "login_username";
@@ -22,39 +23,41 @@
 
        <br/>
 
-       <table id='login_table' class='data_grid' style='margin-left: 20px;' width='95%'>
-               <tbody id='login_tbody'>
-                       <tr>
-                               <td><span class='login_text'>&login.username;</span></td>
-                               <td>
-                                       <span class='login_text'>
-                                               <input id='login_username' type='text' size='16' />
-                                       </span>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td>
-                                       <span class='login_text'>&common.password;</span>
-                               </td>
-                               <td>
-                                       <span class='login_text'>
-                                               <input id='login_password' type='password' size='16' />
-                                       </span>
-                               </td>
-                       </tr>
-                       <tr><td><br/></td><td/></tr>
-                       <tr class='color_1'>
-                               <td colspan='2' align='center'>
-                                       <span class='login_text' style='margin-right: 20px;'>
-                                       <input type='submit' value='&common.login;'  id='login_button'/>
-                                       </span>
-                                       <span class='login_text' style='margin-left: 20px;'>
-                                               <input type='submit' id='login_cancel_button' value='&common.cancel;'/>
-                                       </span>
-                               </td>
-                       </tr>
-               </tbody>
-       </table>
+    <form id='login_form'>
+        <table id='login_table' class='data_grid' style='margin-left: 20px;' width='95%'>
+            <tbody id='login_tbody'>
+                <tr>
+                    <td><span class='login_text'>&login.username;</span></td>
+                    <td>
+                        <span class='login_text'>
+                            <input id='login_username' type='text' size='16' />
+                        </span>
+                    </td>
+                </tr>
+                <tr>
+                    <td>
+                        <span class='login_text'>&common.password;</span>
+                    </td>
+                    <td>
+                        <span class='login_text'>
+                            <input id='login_password' type='password' size='16' />
+                        </span>
+                    </td>
+                </tr>
+                <tr><td><br/></td><td/></tr>
+                <tr class='color_1'>
+                    <td colspan='2' align='center'>
+                        <span class='login_text' style='margin-right: 20px;'>
+                        <input type='submit' value='&common.login;'  id='login_button'/>
+                        </span>
+                        <span class='login_text' style='margin-left: 20px;'>
+                            <input type='submit' id='login_cancel_button' value='&common.cancel;'/>
+                        </span>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </form>
 
        <table id='change_pw_table' class='data_grid hide_me' style='margin-left: 20px;' width='95%'>
                <thead>