mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-24 15:49:06 +01:00
show account-list by default, dont load site config in (disabled) iframe and remove app-header when switching back to account-list
This commit is contained in:
parent
554789e9ff
commit
524a289b32
@ -81,12 +81,12 @@ class admin_ui
|
||||
$vars['menuaction'] = $vars['load'];
|
||||
unset($vars['ajax']);
|
||||
unset($vars['load']);
|
||||
$content['iframe'] = egw::link('/index.php', $vars);
|
||||
}
|
||||
else
|
||||
{
|
||||
$vars = array('menuaction' => 'admin.uiconfig.index', 'appname' => 'admin');
|
||||
$content['iframe'] = 'about:blank'; // we show accounts-list be default now
|
||||
}
|
||||
$content['iframe'] = egw::link('/index.php', $vars);
|
||||
|
||||
$tpl->exec('admin.admin_ui.index', $content, $sel_options);
|
||||
}
|
||||
|
@ -105,6 +105,10 @@ app.classes.admin = AppJS.extend(
|
||||
{
|
||||
this.iframe.set_src(_url);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.egw.app_header('');
|
||||
}
|
||||
this.iframe.set_disabled(!_url);
|
||||
this.nm.set_disabled(!!_url);
|
||||
},
|
||||
@ -369,7 +373,7 @@ app.classes.admin = AppJS.extend(
|
||||
this.egw.link_title('home-accounts', content.acl_location, function(title) {sel_options.acl_location[content.acl_location] = title;});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
switch(_action.id)
|
||||
{
|
||||
case 'delete':
|
||||
|
@ -45,7 +45,7 @@
|
||||
</template>
|
||||
<template id="admin.index" template="" lang="" group="0" version="1.9.001">
|
||||
<tree autoloading="admin_ui::ajax_tree" id="tree" onclick="app.admin.run" parent_node="admin_tree_target" std_images="bullet"/>
|
||||
<nextmatch id="nm" template="admin.index.rows" disabled="true"/>
|
||||
<iframe frameborder="1" height="100%" id="iframe" scrolling="auto" width="100%"/>
|
||||
<nextmatch id="nm" template="admin.index.rows"/>
|
||||
<iframe frameborder="1" height="100%" id="iframe" scrolling="auto" width="100%" disabled="true"/>
|
||||
</template>
|
||||
</overlay>
|
||||
|
Loading…
Reference in New Issue
Block a user