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

show account-list by default, dont load site config in (disabled) iframe and remove app-header when switching back to account-list

Browse Source
This commit is contained in:
Ralf Becker 2014-04-02 19:04:37 +00:00
parent 554789e9ff
commit 524a289b32
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/inc/class.admin_ui.inc.php
View File

@ -81,12 +81,12 @@ class admin_ui
$vars['menuaction'] = $vars['load']; $vars['menuaction'] = $vars['load'];
unset($vars['ajax']); unset($vars['ajax']);
unset($vars['load']); unset($vars['load']);
$content['iframe'] = egw::link('/index.php', $vars);
} }
else 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); $tpl->exec('admin.admin_ui.index', $content, $sel_options);
} }

4
admin/js/app.js
View File

@ -105,6 +105,10 @@ app.classes.admin = AppJS.extend(
{ {
this.iframe.set_src(_url); this.iframe.set_src(_url);
} }
else
{
this.egw.app_header('');
}
this.iframe.set_disabled(!_url); this.iframe.set_disabled(!_url);
this.nm.set_disabled(!!_url); this.nm.set_disabled(!!_url);
}, },

4
admin/templates/default/index.xet
View File

@ -45,7 +45,7 @@
</template> </template>
<template id="admin.index" template="" lang="" group="0" version="1.9.001"> <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"/> <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"/> <nextmatch id="nm" template="admin.index.rows"/>
<iframe frameborder="1" height="100%" id="iframe" scrolling="auto" width="100%"/> <iframe frameborder="1" height="100%" id="iframe" scrolling="auto" width="100%" disabled="true"/>
</template> </template>
</overlay> </overlay>