details: /erp/devel/pi/rev/7e481affde18
changeset: 6530:7e481affde18
user: David Baz Fayos <david.baz <at> openbravo.com>
date: Sun Feb 28 02:01:45 2010 +0100
summary: Related to issue 12479: Now Login_*.html has relative references
-part3
diffstat:
src/org/openbravo/erpCommon/utility/VerticalMenu.html | 21 +----------
src/org/openbravo/erpCommon/utility/VerticalMenuLoading.html | 19 +---------
web/js/utils.js | 12 ++++++-
3 files changed, 16 insertions(+), 36 deletions(-)
diffs (107 lines):
diff -r dcac1428c851 -r 7e481affde18
src/org/openbravo/erpCommon/utility/VerticalMenu.html
--- a/src/org/openbravo/erpCommon/utility/VerticalMenu.html Sun Feb 28
00:41:47 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/VerticalMenu.html Sun Feb 28
02:01:45 2010 +0100
@@ -186,21 +186,6 @@
return url;
}
- function buttonLogout_click() {
- var target;
- try {
- if (parent.frameMenu) {
- target = "_parent";
- } else {
- target = "_self";
- }
- } catch (e) {
- target = "_self";
- }
- submitCommandForm('DEFAULT', false, null, '../security/Logout.html',
target)
- return false;
- }
-
function getForm() {
try {
var appForm = getFrame('appFrame').document.forms[0];
@@ -283,15 +268,15 @@
<td colspan="2" class="Menu_ToolBar_textlabel_bg_body"><nobr><a
class="Menu_ToolBar_text_username" href="#" onclick="menuUserOptions(); return
false;" id="userName"><span id="fieldUserName">xxKain
Smitherson</span></a><nobr></td>
<td width="1" class="Menu_ToolBar_textlabel_bg_right">
- <a class="Menu_ToolBar_Button" href="#" onclick="menuQuit();
return false;" onmouseover="window.status='Close session';return true;"
onmouseout="window.status='';return true;" id="buttonQuit"><img
class="Menu_ToolBar_Button_Icon Menu_ToolBar_Button_Icon_logout"
src="../../../../../web/images/blank.gif" onclick="buttonLogout_click();return
false;" border="0" alt="Close session" title="Close session" /></a>
+ <a class="Menu_ToolBar_Button" href="#" onclick="menuQuit();
return false;" onmouseover="window.status='Close session';return true;"
onmouseout="window.status='';return true;" id="buttonQuit"><img
class="Menu_ToolBar_Button_Icon Menu_ToolBar_Button_Icon_logout"
src="../../../../../web/images/blank.gif" border="0" alt="Close session"
title="Close session" /></a>
</td>
<td class="Menu_ToolBar_Space"></td>
<td width="1">
- <a class="Menu_ToolBar_Button" href="#"
onclick="setMenuLoading(true); menuExpand(); return false;"
onmouseover="window.status='Expand the menu';return true;"
onmouseout="window.status='';return true;" id="buttonExpand"><img
class="Menu_ToolBar_Button_Icon Menu_ToolBar_Button_Icon_expand"
src="../../../../../web/images/blank.gif" onclick="menuExpand(); return false;"
border="0" alt="Expand the menu" title="Expand the menu" /></a>
+ <a class="Menu_ToolBar_Button" href="#"
onclick="setMenuLoading(true); menuExpand(); return false;"
onmouseover="window.status='Expand the menu';return true;"
onmouseout="window.status='';return true;" id="buttonExpand"><img
class="Menu_ToolBar_Button_Icon Menu_ToolBar_Button_Icon_expand"
src="../../../../../web/images/blank.gif" border="0" alt="Expand the menu"
title="Expand the menu" /></a>
- <a class="Menu_ToolBar_Button" href="#"
onclick="setMenuLoading(true); menuCollapse(); return false;"
onmouseover="window.status='Contract all the menu';return true;"
onmouseout="window.status='';return true;" id="buttonCollapse"><img
class="Menu_ToolBar_Button_Icon Menu_ToolBar_Button_Icon_contract"
src="../../../../../web/images/blank.gif" onclick="menuCollapse(); return
false;" border="0" alt="Contract all the menu" title="Contract all the menu"
/></a>
+ <a class="Menu_ToolBar_Button" href="#"
onclick="setMenuLoading(true); menuCollapse(); return false;"
onmouseover="window.status='Contract all the menu';return true;"
onmouseout="window.status='';return true;" id="buttonCollapse"><img
class="Menu_ToolBar_Button_Icon Menu_ToolBar_Button_Icon_contract"
src="../../../../../web/images/blank.gif" border="0" alt="Contract all the
menu" title="Contract all the menu" /></a>
</td>
</tr>
diff -r dcac1428c851 -r 7e481affde18
src/org/openbravo/erpCommon/utility/VerticalMenuLoading.html
--- a/src/org/openbravo/erpCommon/utility/VerticalMenuLoading.html Sun Feb
28 00:41:47 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/VerticalMenuLoading.html Sun Feb
28 02:01:45 2010 +0100
@@ -50,21 +50,6 @@
mnu.style.width = w - (mleft.clientWidth + mright.clientWidth) -
((name.indexOf("Microsoft")==-1)?2:0);
mnu.style.display = "";
}
-
- function buttonLogout_click() {
- var target;
- try {
- if (parent.frameMenu) {
- target = "_parent";
- } else {
- target = "_self";
- }
- } catch (e) {
- target = "_self";
- }
- submitCommandForm('DEFAULT', false, null, '../security/Logout.html',
target)
- return false;
- }
</script>
<script language="JavaScript" type="text/javascript">
function onLoadDo() {
@@ -146,13 +131,13 @@
<td colspan="2" class="Menu_ToolBar_textlabel_bg_body"><nobr><a
class="Menu_ToolBar_text_username" href="#" onclick="menuUserOptions();"><span
id="fieldUserName">Loading</span></a><nobr></td>
<td width="1" class="Menu_ToolBar_textlabel_bg_right">
- <a class="Menu_ToolBar_Button" href="#" onclick="menuQuit();"
onmouseover="window.status='Close session';return true;"
onmouseout="window.status='';return true;" id="buttonQuit"><img
class="Menu_ToolBar_Button_Icon Menu_ToolBar_Button_Icon_logout"
src="../../../../../web/images/blank.gif" onclick="buttonLogout_click();return
false;" border="0" alt="Close session" title="Close session" /></a>
+ <a class="Menu_ToolBar_Button" href="#" onclick="menuQuit();"
onmouseover="window.status='Close session';return true;"
onmouseout="window.status='';return true;" id="buttonQuit"><img
class="Menu_ToolBar_Button_Icon Menu_ToolBar_Button_Icon_logout"
src="../../../../../web/images/blank.gif" border="0" alt="Close session"
title="Close session" /></a>
</td>
<td class="Menu_ToolBar_Space"></td>
<td width="1">
- <a class="Menu_ToolBar_Button" href="#" onclick=""
onmouseover="window.status='Expand the menu';return true;"
onmouseout="window.status='';return true;" id="buttonExpand"><img
class="Menu_ToolBar_Button_Icon Menu_ToolBar_Button_Icon_expand"
src="../../../../../web/images/blank.gif" onclick="menuExpand();" border="0"
alt="Expand the menu" title="Expand the menu" /></a>
+ <a class="Menu_ToolBar_Button" href="#" onclick=""
onmouseover="window.status='Expand the menu';return true;"
onmouseout="window.status='';return true;" id="buttonExpand"><img
class="Menu_ToolBar_Button_Icon Menu_ToolBar_Button_Icon_expand"
src="../../../../../web/images/blank.gif" border="0" alt="Expand the menu"
title="Expand the menu" /></a>
</td>
</tr>
diff -r dcac1428c851 -r 7e481affde18 web/js/utils.js
--- a/web/js/utils.js Sun Feb 28 00:41:47 2010 +0100
+++ b/web/js/utils.js Sun Feb 28 02:01:45 2010 +0100
@@ -2372,7 +2372,17 @@
function menuQuit() {
var appUrl = getAppUrl();
- submitCommandForm('DEFAULT', false, null, appUrl + '/security/Logout.html',
'_top');
+ var target;
+ try {
+ if (parent.frameMenu) {
+ target = "_parent";
+ } else {
+ target = "_self";
+ }
+ } catch (e) {
+ target = "_self";
+ }
+ submitCommandForm('DEFAULT', false, null, appUrl + '/security/Logout.html',
target);
return false;
}
------------------------------------------------------------------------------
Download Intel® 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
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
