From 524a289b326832a19e9939a5610d3e44b7dac6ab Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 2 Apr 2014 19:04:37 +0000
Subject: [PATCH] show account-list by default, dont load site config in
 (disabled) iframe and remove app-header when switching back to account-list

---
 admin/inc/class.admin_ui.inc.php  | 4 ++--
 admin/js/app.js                   | 6 +++++-
 admin/templates/default/index.xet | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/admin/inc/class.admin_ui.inc.php b/admin/inc/class.admin_ui.inc.php
index 9e6be3b1a5..4298adef4a 100644
--- a/admin/inc/class.admin_ui.inc.php
+++ b/admin/inc/class.admin_ui.inc.php
@@ -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);
 	}
diff --git a/admin/js/app.js b/admin/js/app.js
index bc6a0b8cc4..26f18fee45 100644
--- a/admin/js/app.js
+++ b/admin/js/app.js
@@ -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':
diff --git a/admin/templates/default/index.xet b/admin/templates/default/index.xet
index 2e3cbcf0ae..f7e02dca39 100644
--- a/admin/templates/default/index.xet
+++ b/admin/templates/default/index.xet
@@ -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>