extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 12:21:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

mark popups as such by enclosing there content in div#popupMainDiv and properly closing html markup for popups

Browse Source
This commit is contained in:
Ralf Becker 2013-11-03 09:30:25 +00:00
parent 4dbb522887
commit 7e856af544
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etemplate/inc/class.etemplate.inc.php
View File

@ -208,7 +208,17 @@ class etemplate_new extends etemplate_widget_template
{ {
parse_navbar(); parse_navbar();
} }
else // mark popups as such, by enclosing everything in div#popupMainDiv
{
echo '<div id="popupMainDiv">'."\n";
}
echo '<div id="'.$dom_id.'" class="et2_container"></div>'; echo '<div id="'.$dom_id.'" class="et2_container"></div>';
if ($output_mode == 2)
{
echo "\n</div>\n";
echo $GLOBALS['egw']->framework->footer();
}
} }
ob_flush(); ob_flush();

3
phpgwapi/templates/idots/class.idots_framework.inc.php
View File

@ -758,7 +758,8 @@ egw.set_user('.$GLOBALS['egw']->accounts->json($GLOBALS['egw_info']['user']['acc
$content .= $this->tpl->fp('out','footer'); $content .= $this->tpl->fp('out','footer');
} }
elseif (!isset($GLOBALS['egw_info']['flags']['noheader']) || !$GLOBALS['egw_info']['flags']['noheader'] || elseif (!isset($GLOBALS['egw_info']['flags']['noheader']) || !$GLOBALS['egw_info']['flags']['noheader'] ||
!empty($_GET['nonavbar']) || $GLOBALS['egw_info']['flags']['currentapp'] == 'admin' && empty($_GET['ajax'])) self::$header_done || !empty($_GET['nonavbar']) ||
$GLOBALS['egw_info']['flags']['currentapp'] == 'admin' && empty($_GET['ajax']))
{ {
$content .= "</body>\n</html>\n"; // close body and html tag, eg. for popups $content .= "</body>\n</html>\n"; // close body and html tag, eg. for popups
} }

12
phpgwapi/templates/idots/js/idots.js
View File

@ -28,12 +28,12 @@
for(var i=0; i < data_slide_out.length; ++i) for(var i=0; i < data_slide_out.length; ++i)
{ {
var args=data_slide_out[i]; var args=data_slide_out[i];
new ypSlideOutMenu(args.id, args.dir, args.left, args.top, args.width, args.height, args.pos); new ypSlideOutMenu(args.id, args.dir, args.left, args.top, args.width, args.height, args.pos);
for(var selector in args.bind) for(var selector in args.bind)
{ {
var data = args.bind[selector]; var data = args.bind[selector];
jQuery(selector).on(data.event, {menu: args.id, method: data.method}, function(event){ jQuery(selector).on(data.event, {menu: args.id, method: data.method}, function(event){
window.ypSlideOutMenu[event.data.method].call(window, event.data.menu); window.ypSlideOutMenu[event.data.method].call(window, event.data.menu);
event.preventDefault(); event.preventDefault();
}); });
@ -41,7 +41,7 @@
} }
} }
} }
/** /**
* Initialisation, when DOM is ready * Initialisation, when DOM is ready
*/ */
@ -53,13 +53,13 @@
$j('#divStatusBar').height()-$j('#divAppboxHeader').height()-$j('#divPoweredBy').height()-20; $j('#divStatusBar').height()-$j('#divAppboxHeader').height()-$j('#divPoweredBy').height()-20;
//console.log('setting height of '+appbox_height); //console.log('setting height of '+appbox_height);
$j('#divAppbox').css('min-height', appbox_height+'px'); $j('#divAppbox').css('min-height', appbox_height+'px');
$j('.et2_container').height(appbox_height); $j('.et2_container').height(appbox_height-7);
}); });
$j(window).resize(); $j(window).resize();
$j(window).load(function(){ // fixes sometimes not called resize, probably due to timing issues $j(window).load(function(){ // fixes sometimes not called resize, probably due to timing issues
$j(window).resize(); $j(window).resize();
}); });
// allowing javascript urls in topmenu and sidebox only under CSP by binding click handlers to them // allowing javascript urls in topmenu and sidebox only under CSP by binding click handlers to them
var href_regexp = /^javascript:([^\(]+)\((.*)?\);?$/; var href_regexp = /^javascript:([^\(]+)\((.*)?\);?$/;
jQuery('#topmenu_items,#thesideboxcolumn').on('click','a[href^="javascript:"]',function(){ jQuery('#topmenu_items,#thesideboxcolumn').on('click','a[href^="javascript:"]',function(){
@ -76,7 +76,7 @@
// return false to not execute link itself, which would violate CSP // return false to not execute link itself, which would violate CSP
return false; return false;
}); });
// make sidebox resizable with jQueryUI resizable // make sidebox resizable with jQueryUI resizable
jQuery('#thesideboxcolumn').resizable({handles: 'e', minWidth: 200, stop: function(event, ui){ jQuery('#thesideboxcolumn').resizable({handles: 'e', minWidth: 200, stop: function(event, ui){
egw.set_preference(egw_appName, 'idotssideboxwidth', ui.size.width); egw.set_preference(egw_appName, 'idotssideboxwidth', ui.size.width);