explicitly loading addressbook css for CRM view and moved loading of infolog javascript to its hook

This commit is contained in:
Ralf Becker 2014-02-12 11:07:33 +00:00
parent 934650c64a
commit 7c02cd3cd4
2 changed files with 11 additions and 7 deletions

View File

@ -2238,8 +2238,9 @@ window.egw_LAB.wait(function() {
// set id for automatic linking via quick add
$GLOBALS['egw_info']['flags']['currentid'] = $content['id'];
// Load JS for infolog actions
egw_framework::validate_file('.','app','infolog');
// load app.css for addressbook explicit, as addressbook_view hooks changes currentapp!
egw_framework::includeCSS('addressbook', 'app');
$this->tmpl->exec('addressbook.addressbook_ui.view',$content,$sel_options,$readonlys,array('id' => $content['id']));

View File

@ -2566,6 +2566,9 @@ class infolog_ui
*/
function hook_view($args)
{
// Load JS for infolog actions
egw_framework::validate_file('.','app','infolog');
switch ($args['location'])
{
case 'addressbook_view':