[OpenbravoERP-commits] devel/pi: Related to issue 12479: Now Login_*.html has relative ...

[hg]

details:   /erp/devel/pi/rev/6453c420f908
changeset: 6527:6453c420f908
user:      David Baz Fayos <david.baz <at> openbravo.com>
date:      Sun Feb 28 00:33:49 2010 +0100
summary:   Related to issue 12479: Now Login_*.html has relative references 
-part2

diffstat:

 src/org/openbravo/erpCommon/security/Login_F1.html         |  14 +++-
 src/org/openbravo/erpCommon/security/Login_Options_F1.html |  49 ++++++++++++-
 2 files changed, 57 insertions(+), 6 deletions(-)

diffs (111 lines):

diff -r 8d6fb7325144 -r 6453c420f908 
src/org/openbravo/erpCommon/security/Login_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_F1.html        Sun Feb 28 
00:32:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html        Sun Feb 28 
00:33:49 2010 +0100
@@ -45,8 +45,18 @@
 function onloadFunctions() {
 }
 function buttonOK_click() {
-    submitCommandForm('DEFAULT', false, null, 
'../secureApp/LoginHandler.html', '_top', true);
-    return false;
+  var target;
+  try {
+    if (parent.frameMenu) {
+      target = "_parent";
+    } else {
+      target = "_self";
+    }
+  } catch (e) {
+    target = "_self";
+  }
+  submitCommandForm('DEFAULT', false, null, '../secureApp/LoginHandler.html', 
target, true);
+  return false;
 }
 
 function redirectWhenPopup() {
diff -r 8d6fb7325144 -r 6453c420f908 
src/org/openbravo/erpCommon/security/Login_Options_F1.html
--- a/src/org/openbravo/erpCommon/security/Login_Options_F1.html        Sun Feb 
28 00:32:37 2010 +0100
+++ b/src/org/openbravo/erpCommon/security/Login_Options_F1.html        Sun Feb 
28 00:33:49 2010 +0100
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2009 Openbravo SL 
+ * All portions are Copyright (C) 2001-2010 Openbravo SL 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -47,6 +47,37 @@
 
 function onloadFunctions() {
 }
+
+function buttonOK_click() {
+  var target;
+  try {
+    if (parent.frameMenu) {
+      target = "_parent";
+    } else {
+      target = "_self";
+    }
+  } catch (e) {
+    target = "_self";
+  }
+  submitCommandForm('OPTIONS', false, null, '../secureApp/LoginHandler.html', 
target, true)
+  return false;
+}
+
+function buttonBack_click() {
+  var target;
+  try {
+    if (parent.frameMenu) {
+      target = "_parent";
+    } else {
+      target = "_self";
+    }
+  } catch (e) {
+    target = "_self";
+  }
+  submitCommandForm('CLOSE_SESSION', false, null, 'Login_FS.html', target)
+  return false;
+}
+
 </script>
        <script language="JavaScript" type="text/javascript">
        function onLoadDo(){
@@ -61,7 +92,17 @@
                  onloadFunctions();
                } catch (e) {}
                clearForm();
-               
byDefaultAction('submitCommandForm(\'OPTIONS\',false,null,\'../secureApp/LoginHandler.html\',\'_top\',true)');
+    var target;
+    try {
+      if (parent.frameMenu) {
+        target = "_parent";
+      } else {
+        target = "_self";
+      }
+    } catch (e) {
+      target = "_self";
+    }
+               
byDefaultAction('submitCommandForm(\'OPTIONS\',false,null,\'../secureApp/LoginHandler.html\',\''
 + target + '\',true)');
 
                setWindowElementFocus('firstElement');
        }
@@ -180,7 +221,7 @@
                       <button type="button" 
                         id="buttonOK" 
                         class="ButtonLink" 
-                        
onclick="submitCommandForm('OPTIONS',false,null,'../secureApp/LoginHandler.html','_top',true);return
 false;" 
+                        onclick="buttonOK_click(); return false;" 
                         onfocus="buttonEvent('onfocus', this); 
window.status='Login'; return true;" 
                         onblur="buttonEvent('onblur', this);" 
                         onkeyup="buttonEvent('onkeyup', this);" 
@@ -204,7 +245,7 @@
                     <div>
                       <button type="button" 
                         class="ButtonLink" 
-                        
onclick="submitCommandForm('CLOSE_SESSION',false,null,'Login_FS.html', 
'_top');return false;" 
+                        onclick="buttonBack_click(); return false;" 
                         onfocus="buttonEvent('onfocus', this); 
window.status='Back'; return true;" 
                         onblur="buttonEvent('onblur', this);" 
                         onkeyup="buttonEvent('onkeyup', this);" 

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits