extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-24 22:32:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

* eMail: fix for broken showHeader in Message Display window, code cleanup

Browse Source
This commit is contained in:
Klaus Leithoff 2011-07-21 13:13:44 +00:00
parent c2e2e1a84a
commit b42eadf8c6
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
felamimail/inc/class.uiwidgets.inc.php
View File

@ -1489,6 +1489,8 @@ $j(document).ready(function() {
function displayMessageActions($_headerData, $_folderName, $_icServer, $_forceNewWindow=false) function displayMessageActions($_headerData, $_folderName, $_icServer, $_forceNewWindow=false)
{ {
$fm_width = 700;
$fm_height = 600;
if ($_forceNewWindow) if ($_forceNewWindow)
{ {
list($fm_width,$fm_height) = explode('x',egw_link::get_registry('felamimail','view_popup')); list($fm_width,$fm_height) = explode('x',egw_link::get_registry('felamimail','view_popup'));
@ -1669,13 +1671,13 @@ $j(document).ready(function() {
} }
// save email as // save email as
$navbarImages['fileexport'] = array( $navbarImages['fileexport'] = array(
'action' => "document.location='$saveMessageURL';",//"($_forceNewWindow ? "window.open('$saveMessageURL','_blank','dependent=yes,width=100,height=100,scrollbars=yes,status=yes')": "window.location.href = '$saveMessageURL'"), 'action' => "document.location='$saveMessageURL';",
'tooltip' => lang('Save message to disk'), 'tooltip' => lang('Save message to disk'),
); );
// view header lines // view header lines
$navbarImages['kmmsgread'] = array( $navbarImages['kmmsgread'] = array(
'action' => "mail_displayHeaderLines('$viewHeaderURL')", 'action' => "egw_openWindowCentered('$viewHeaderURL','fm_displayHeaderLines_".$_headerData['uid']."',".$fm_width.",".$fm_height.");",
'tooltip' => lang('view header lines'), 'tooltip' => lang('view header lines'),
); );

1
felamimail/js/jscode/viewMainScreen.js
View File

@ -336,6 +336,7 @@ function displayMessage(_url,_windowName) {
} }
function mail_displayHeaderLines(_url) { function mail_displayHeaderLines(_url) {
// only used by right clickaction
egw_openWindowCentered(_url,'fm_display_headerLines','700','600',window.outerWidth/2,window.outerHeight/2); egw_openWindowCentered(_url,'fm_display_headerLines','700','600',window.outerWidth/2,window.outerHeight/2);
} }

4
felamimail/js/jscode/view_message.js
View File

@ -110,7 +110,3 @@ function fm_resizeBodyDIV() {
bodyDIV.style.height = egw_getWindowInnerHeight() - bodyDIV.offsetTop - 2 + 'px'; bodyDIV.style.height = egw_getWindowInnerHeight() - bodyDIV.offsetTop - 2 + 'px';
} }
} }
function fm_displayHeaderLines(_url) {
egw_openWindowCentered(_url,'fm_display_headerLines','700','600',window.outerWidth/2,window.outerHeight/2);
}