From 8c5ea8eba90ed824688272ef982e7ec5b04fce03 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 27 Nov 2014 18:31:08 +0000
Subject: [PATCH] More Home progress:  - Remove app header from addressbook  -
 Always load app's CSS for single entry

---
 ...class.addressbook_favorite_portlet.inc.php | 19 ++++++++++++++++++-
 etemplate/js/et2_widget_portlet.js            |  2 +-
 home/inc/class.home_link_portlet.inc.php      |  4 ++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/addressbook/inc/class.addressbook_favorite_portlet.inc.php b/addressbook/inc/class.addressbook_favorite_portlet.inc.php
index 09d7d7c392..c5ffcea8e7 100644
--- a/addressbook/inc/class.addressbook_favorite_portlet.inc.php
+++ b/addressbook/inc/class.addressbook_favorite_portlet.inc.php
@@ -38,7 +38,7 @@ class addressbook_favorite_portlet extends home_favorite_portlet
 		}
 		error_log(array2string($this->nm_settings['col_filter']));
 		$this->nm_settings += array(
-			'get_rows'	=> 'addressbook.addressbook_ui.get_rows',
+			'get_rows'	=> 'addressbook_favorite_portlet::get_rows',
 			// Use a different template so it can be accessed from client side
 			'template'	=> 'addressbook.index.rows',
 			'default_cols'   => 'type,n_fileas_n_given_n_family_n_family_n_given_org_name_n_family_n_given_n_fileas,'.
@@ -55,6 +55,23 @@ class addressbook_favorite_portlet extends home_favorite_portlet
 
 		parent::exec($id, $etemplate);
 	}
+
+	/**
+	 * Override from addressbook to clear the app header
+	 *
+	 * @param type $query
+	 * @param type $rows
+	 * @param type $readonlys
+	 * @return integer Total rows found
+	 */
+	public static function get_rows(&$query, &$rows, &$readonlys)
+	{
+		$ui = new addressbook_ui();
+		$total = $ui->get_rows($query, $rows, $readonlys);
+		unset($GLOBALS['egw_info']['flags']['app_header']);
+		return $total;
+	}
+
 	/**
 	 * Here we need to handle any incoming data.  Setup is done in the constructor,
 	 * output is handled by parent.
diff --git a/etemplate/js/et2_widget_portlet.js b/etemplate/js/et2_widget_portlet.js
index 7b2c9ef55f..5e8f64608c 100644
--- a/etemplate/js/et2_widget_portlet.js
+++ b/etemplate/js/et2_widget_portlet.js
@@ -75,7 +75,7 @@ var et2_portlet = et2_valueWidget.extend(
 	},
 
 	createNamespace: true,
-	GRID: 50,
+	GRID: 55,
 
 	/**
 	 * These are the "normal" actions that every portlet is expected to have.
diff --git a/home/inc/class.home_link_portlet.inc.php b/home/inc/class.home_link_portlet.inc.php
index b89868b46b..437e4c3e99 100644
--- a/home/inc/class.home_link_portlet.inc.php
+++ b/home/inc/class.home_link_portlet.inc.php
@@ -115,6 +115,10 @@ class home_link_portlet extends home_portlet
 		// Try to load entry
 		if($this->context['entry'] && $this->context['entry']['app'])
 		{
+
+			// Always load app's css
+			egw_framework::includeCSS($this->context['entry']['app'],'app');
+			
 			try
 			{
 				$classname = $this->context['entry']['app'] . '_egw_record';