holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Better popup resize calculations

Browse Source 
- Test new popup size for addressbook
This commit is contained in:
Nathan Gray 2014-10-17 15:17:16 +00:00
parent 3f1721e904
commit 8a861fc628
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addressbook/inc/class.addressbook_hooks.inc.php
View File

@ -361,13 +361,13 @@ class addressbook_hooks
'menuaction' => 'addressbook.addressbook_ui.edit'
),
'edit_id' => 'contact_id',
'edit_popup' => '800x525',
'edit_popup' => '859x550',
'add' => array(
'menuaction' => 'addressbook.addressbook_ui.edit'
),
'add_app' => 'link_app',
'add_id' => 'link_id',
'add_popup' => '800x525',
'add_popup' => '859x550',
'file_access_user' => true, // file_access supports 4th parameter $user
'file_access'=> 'addressbook.addressbook_bo.file_access',
'default_types' => array('n' => array('name' => 'contact', 'options' => array('icon' => 'navbar.png','template' => 'addressbook.edit'))),

16
phpgwapi/js/jsapi/egw.js
View File

@ -224,7 +224,21 @@
{
// Resize popup when et2 load is done
jQuery(node).one("load",function() {
window.resizeTo(jQuery(document).width()+45,jQuery(document).height()+100);
var $main_div = $j('#popupMainDiv');
var $et2 = $j('.et2_container');
var w = {
width: egw_getWindowInnerWidth(),
height: egw_getWindowInnerHeight()
};
// Use et2_container for width since #popupMainDiv is full width, but we still need
// to take padding/margin into account
var delta_width = w.width - ($et2.outerWidth(true) + ($main_div.outerWidth(true) - $main_div.width()));
var delta_height = w.height - ($et2.outerHeight(true) + ($main_div.outerHeight(true) - $main_div.height()));
debugger;
if(delta_width != 0 || delta_height != 0)
{
window.resizeTo(egw_getWindowOuterWidth() - delta_width,egw_getWindowOuterHeight() - delta_height);
}
});
}
var et2 = new etemplate2(node, currentapp+".etemplate_new.ajax_process_content.etemplate");