From 7402129ffaee8f937261b996f34c4aabe4663d60 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 12 Mar 2015 17:03:18 +0000
Subject: [PATCH 01/13] Remove old change password template file

---
 .../templates/default/changepassword.tpl      | 42 -------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 preferences/templates/default/changepassword.tpl

diff --git a/preferences/templates/default/changepassword.tpl b/preferences/templates/default/changepassword.tpl
deleted file mode 100644
index 35d322295d..0000000000
--- a/preferences/templates/default/changepassword.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<br>
-
-   <center>{messages}</center>
-
-   <form method="POST" action="{form_action}">
-    <table border="0" class="table_passord_change">
-     <tr>
-       <td>
-        {lang_enter_old_password}
-       </td>
-       <td>
-        <input type="password" name="o_passwd_2">
-       </td>
-     </tr>
-     <tr>
-       <td>
-        {lang_enter_password}
-       </td>
-       <td>
-        <input type="password" name="n_passwd">
-       </td>
-     </tr>
-     <tr>
-       <td>
-        {lang_reenter_password}
-       </td>
-       <td>
-        <input type="password" name="n_passwd_2">
-       </td>
-     </tr>
-     <tr>
-       <td colspan="2">
-        <table cellspacing="5"><tr>
-         <td><input type="submit" name="change" value="{lang_change}" id="passwordchange"></td>
-         <td><input type="submit" name="cancel" value="{lang_cancel}" id="passwordcancel"></td>
-        </tr></table>
-       </td>
-     </tr>
-    </table>
-   </form>
-   <br>
-   <pre>{sql_message}</pre>

From 68f3b2bb281f311a802cd3a640dfd7f82e5f8955 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 13 Mar 2015 09:22:08 +0000
Subject: [PATCH 02/13] Do not show print button for mobile devices in mobile
 theme

---
 pixelegg/css/mobile.css  | 3 +++
 pixelegg/css/mobile.less | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index e58b05e214..dee8be6f16 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -6998,6 +6998,9 @@ a.textSidebox {
   }
 }
 @media only screen and (max-device-width : 1024px) {
+  #egw_fw_print {
+    display: none;
+  }
   div#loginMainDiv #divAppIconBar #divLogo img[src$="svg"] {
     width: 40%;
     margin-top: 5px;
diff --git a/pixelegg/css/mobile.less b/pixelegg/css/mobile.less
index c59de378cc..874876402d 100644
--- a/pixelegg/css/mobile.less
+++ b/pixelegg/css/mobile.less
@@ -772,6 +772,9 @@
 }
 @media @handheld
 {
+	#egw_fw_print {
+		display:none;
+	}
 	div#loginMainDiv{
 			#divAppIconBar {
 				#divLogo img[src$="svg"] {

From e8786649e3163793ad8cec082d5eb412b77ff076 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 13 Mar 2015 12:05:15 +0000
Subject: [PATCH 03/13] Fix couple of glitches in mobile theme: - Fix extra gap
 between topmenu icons - Shows no print button - Resize sidebox

---
 pixelegg/css/mobile.css                     | 44 ++++++++------------
 pixelegg/css/mobile.less                    | 46 +++++++++------------
 pixelegg/templates/pixelegg/head_mobile.tpl |  2 -
 3 files changed, 38 insertions(+), 54 deletions(-)

diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index dee8be6f16..47c50a5a0d 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -6335,22 +6335,6 @@ a.textSidebox {
   #egw_fw_basecontainer #egw_fw_top_toolbar div.egw_fw_ui_tabs_header span h1 {
     display: none;
   }
-  #egw_fw_basecontainer div#egw_fw_logout {
-    left: 310px;
-    top: 20px;
-    width: 24px;
-    height: 24px;
-    background-size: 24px 24px;
-    z-index: 1;
-  }
-  #egw_fw_basecontainer div#egw_fw_print {
-    left: 268px;
-    top: 20px;
-    width: 24px;
-    height: 24px;
-    background-size: 24px 24px;
-    z-index: 1;
-  }
   #egw_fw_basecontainer .egw_fw_top_toolbar > div:hover {
     -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
     -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@@ -6381,7 +6365,7 @@ a.textSidebox {
     box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items {
-    width: 250px;
+    width: 280px;
     display: inline;
     float: left;
     position: fixed;
@@ -6397,13 +6381,23 @@ a.textSidebox {
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul li {
     display: -webkit-inline-box;
     display: -moz-inline-box;
-    padding-right: 0.5em;
+    padding: 2px;
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul li:hover {
     -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
     -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
     box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
   }
+  #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_logout:before {
+    content: "";
+    background-image: url(../images/logout.png);
+    background-repeat: no-repeat;
+    width: 32px;
+    height: 32px;
+    background-size: 30px 30px;
+    display: inline-block;
+    background-position: center;
+  }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_home:before {
     content: " ";
     background-image: url(../images/topmenu_items/mobile/home.png);
@@ -6422,6 +6416,7 @@ a.textSidebox {
     height: 32px;
     background-size: 32px 32px;
     display: inline-block;
+    background-position: center;
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_prefs:active {
     -webkit-transform: rotate(180deg);
@@ -6435,6 +6430,7 @@ a.textSidebox {
     background-size: 32px 32px;
     background-image: url(../images/topmenu_items/mobile/access.png);
     display: inline-block;
+    background-position: center;
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_cats:before {
     background-image: url(../images/topmenu_items/mobile/category.png);
@@ -6444,6 +6440,7 @@ a.textSidebox {
     height: 32px;
     background-size: 32px 32px;
     display: inline-block;
+    background-position: center;
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_password:before {
     background-image: url(../images/topmenu_items/mobile/password.png);
@@ -6453,6 +6450,7 @@ a.textSidebox {
     height: 32px;
     background-size: 32px 32px;
     display: inline-block;
+    background-position: center;
   }
   #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_manual:before {
     background-image: url(../images/topmenu_items/mobile/help.png);
@@ -6471,11 +6469,7 @@ a.textSidebox {
     height: 32px;
     background-size: 32px 32px;
     display: inline-block;
-  }
-  #egw_fw_basecontainer div#egw_fw_topmenu_items ul a#topmenu_search:active {
-    transform: scale(-2);
-    -webkit-transform: scale(-2);
-    -webkit-transition: 1s ease;
+    background-position: center;
   }
   .egw_fw_ui_tabs_header {
     margin: 0px 0 0 0;
@@ -6963,9 +6957,7 @@ a.textSidebox {
   .sidebar-toggle #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_header_active h1 {
     display: none;
   }
-  .sidebar-toggle #egw_fw_logout,
-  .sidebar-toggle #egw_fw_topmenu_items,
-  .sidebar-toggle #egw_fw_print {
+  .sidebar-toggle #egw_fw_topmenu_items {
     display: none !important;
   }
   .tabs-header-portrait-collapsed {
diff --git a/pixelegg/css/mobile.less b/pixelegg/css/mobile.less
index 874876402d..970b7aa78f 100644
--- a/pixelegg/css/mobile.less
+++ b/pixelegg/css/mobile.less
@@ -132,25 +132,7 @@
 				}
 			}
 		}
-		//FW Logout
-		div#egw_fw_logout{
-			left: 310px;
-			top: 20px;
-			width: 24px;
-			height: 24px;
-			background-size: 24px 24px;
-			z-index: 1;
-		}
 
-		//FW Print
-		div#egw_fw_print{
-			left: 268px;
-			top: 20px;
-			width: 24px;
-			height: 24px;
-			background-size: 24px 24px;
-			z-index: 1;
-		}
 		.egw_fw_top_toolbar>div:hover{
 			-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
 			-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@@ -184,7 +166,7 @@
 			box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 		}
 		div#egw_fw_topmenu_items{
-			width: 250px;
+			width: 280px;
 			display: inline;
 			float: left;
 			position: fixed;
@@ -198,13 +180,25 @@
 				li{
 					display: -webkit-inline-box;
 					display: -moz-inline-box;
-					padding-right: 0.5em;
+					padding:2px;
 					&:hover {
 						-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
 						-moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
 						box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
 					}
 				}
+				a#topmenu_logout{
+					&:before {
+						content: "";
+						background-image: url(../images/logout.png);
+						background-repeat: no-repeat;
+						width: 32px;
+						height: 32px;
+						background-size: 30px 30px;
+						display: inline-block;
+						background-position: center;
+					}
+				}
 				a#topmenu_home:before {
 					content: " ";
 					background-image: url(../images/topmenu_items/mobile/home.png);
@@ -224,6 +218,7 @@
 						height: 32px;
 						background-size: 32px 32px;
 						display: inline-block;
+						background-position: center;
 					}
 					&:active {
 						-webkit-transform:rotate(180deg);
@@ -239,6 +234,7 @@
 					background-size: 32px 32px;
 					background-image: url(../images/topmenu_items/mobile/access.png);
 					display: inline-block;
+					background-position: center;
 				}
 
 				a#topmenu_cats:before {
@@ -249,6 +245,7 @@
 					height: 32px;
 					background-size: 32px 32px;
 					display: inline-block;
+					background-position: center;
 				}
 				a#topmenu_password:before {
 					background-image: url(../images/topmenu_items/mobile/password.png);
@@ -258,6 +255,7 @@
 					height: 32px;
 					background-size: 32px 32px;
 					display: inline-block;
+					background-position: center;
 				}
 
 				a#topmenu_manual:before {
@@ -279,11 +277,7 @@
 						height: 32px;
 						background-size: 32px 32px;
 						display: inline-block;
-					}
-					&:active {
-						transform: scale(-2);
-						-webkit-transform:scale(-2);
-						-webkit-transition: 1s ease;
+						background-position: center;
 					}
 				}
 			}
@@ -717,7 +711,7 @@
 				}
 			}
 		}
-		#egw_fw_logout, #egw_fw_topmenu_items, #egw_fw_print{
+		#egw_fw_topmenu_items {
 			display:none !important;
 		}
 	}
diff --git a/pixelegg/templates/pixelegg/head_mobile.tpl b/pixelegg/templates/pixelegg/head_mobile.tpl
index 39161be2a6..0413f66f71 100644
--- a/pixelegg/templates/pixelegg/head_mobile.tpl
+++ b/pixelegg/templates/pixelegg/head_mobile.tpl
@@ -28,8 +28,6 @@
 		{hook_after_navbar}
 		<div id="egw_fw_basecontainer">
 			<div id="egw_fw_top_toolbar">
-				<div id="egw_fw_logout" title="{title_logout}" data-logout-url="{link_logout}"></div>
-				<div id="egw_fw_print" title="{title_print}"></div>
 				<div id="egw_fw_topmenu_items">{topmenu_items}</div>
 				<div id="egw_fw_menu" title="{title_menu}">
 					<audio id="egw_fw_menuAudioTag" autobuffer="autobuffer">

From 386ee978f34571a2146dd34c6415921edb28b44c Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 13 Mar 2015 12:51:36 +0000
Subject: [PATCH 04/13] need to query all apps for CSP frame-sources, as they
 need to be set on top-level window/document

---
 phpgwapi/inc/class.egw_framework.inc.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index 88aa4193d3..aafe369fea 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -205,9 +205,12 @@ abstract class egw_framework
 		if (!isset(self::$csp_frame_src_attrs) && !isset($set))
 		{
 			$frame_src = array('manual.egroupware.org', 'www.egroupware.org');
-			if (($additional = $GLOBALS['egw']->hooks->single('csp-frame-src', $GLOBALS['egw_info']['flags']['currentapp'])))
+			if (($app_additional = $GLOBALS['egw']->hooks->process('csp-frame-src')))
 			{
-				$frame_src = array_unique(array_merge($frame_src, $additional));
+				foreach($app_additional as $addtional)
+				{
+					if ($addtional) $frame_src = array_unique(array_merge($frame_src, $addtional));
+				}
 			}
 			return self::csp_frame_src_attrs($frame_src);
 		}

From 61cf8fa9f5b1b86f221b5db6d32a2f007b47e0b4 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Fri, 13 Mar 2015 13:51:10 +0000
Subject: [PATCH 05/13] * Univention: Samba SID was not propagated to config of
 SambaAdmin app

---
 doc/rpm-build/post_install.php           | 6 +++---
 setup/inc/class.setup_cmd_config.inc.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/rpm-build/post_install.php b/doc/rpm-build/post_install.php
index 6eb899757a..15822330ed 100755
--- a/doc/rpm-build/post_install.php
+++ b/doc/rpm-build/post_install.php
@@ -56,7 +56,7 @@ $config = array(
 	'ldap_search_filter' => '(uid=%user)',
 	'ldap_group_context' => 'ou=groups,$base',
 	'ldap_encryption_type' => '',
-	'sambaadmin/sambaSID'=> '',	// SID for sambaadmin
+	'sambaadmin/sambasid'=> '',	// SID for sambaadmin
 	'mailserver'    => '',
 	'smtpserver'    => 'localhost,25',
 	'smtp'          => '',	// see setup-cli.php --help config
@@ -300,7 +300,7 @@ if (!file_exists($config['header']) || filesize($config['header']) < 200)	// def
 		foreach(array(
 			'domain','ldap_suffix','ldap_host','ldap_admin','ldap_admin_pw',	// non-egw params: only used for create
 			'ldap_base','ldap_root_dn','ldap_root_pw','ldap_context','ldap_search_filter','ldap_group_context',	// egw params
-			'ldap_encryption_type', 'sambaadmin/sambaSID',
+			'ldap_encryption_type', 'sambaadmin/sambasid',
 		) as $name)
 		{
 			if (strpos($value=$config[$name],'$') !== false)
@@ -636,7 +636,7 @@ function set_univention_defaults()
 		$config['account-auth'] = 'univention,ldap';
 
 		// set sambaadmin sambaSID
-		$config['sambaadmin/sambaSID'] = exec('/usr/bin/univention-ldapsearch -x "(objectclass=sambadomain)" sambaSID|sed -n "s/sambaSID: \(.*\)/\1/p"');
+		$config['sambaadmin/sambasid'] = exec('/usr/bin/univention-ldapsearch -x "(objectclass=sambadomain)" sambaSID|sed -n "s/sambaSID: \(.*\)/\1/p"');
 
 		// mailserver, see setup-cli.php --help config
 		if (($mailserver = exec('/usr/bin/univention-ldapsearch -x "(univentionAppID=mailserver_*)" univentionAppInstalledOnServer|sed -n "s/univentionAppInstalledOnServer: \(.*\)/\1/p"')) &&
diff --git a/setup/inc/class.setup_cmd_config.inc.php b/setup/inc/class.setup_cmd_config.inc.php
index 0e2fd4b49f..b82e4963e1 100644
--- a/setup/inc/class.setup_cmd_config.inc.php
+++ b/setup/inc/class.setup_cmd_config.inc.php
@@ -199,7 +199,7 @@ class setup_cmd_config extends setup_cmd
 		'--ldap-context' => 'ldap_context',
 		'--ldap-search-filter' => 'ldap_search_filter',
 		'--ldap-group-context' => 'ldap_group_context',
-		'--sambaadmin-sid' => 'sambaadmin/sambaSID',
+		'--sambaadmin-sid' => 'sambaadmin/sambasid',
 		'--allow-remote-admin' => 'allow_remote_admin',
 		'--install-id' => 'install_id',
 		'--ads-host' => 'ads_host',

From 9278ae296993cd616d5639b309e4c9691f48a947 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 15 Mar 2015 08:15:40 +0000
Subject: [PATCH 06/13] * Mail: fix fatal error / white screen when parsing
 winmal.dat (by updating to fixed Horde_Compress-2.1.1)

---
 composer.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.lock b/composer.lock
index eaac0720f4..e47abc83cc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,10 +8,10 @@
     "packages": [
         {
             "name": "pear-pear.horde.org/Horde_Compress",
-            "version": "2.1.0",
+            "version": "2.1.1",
             "dist": {
                 "type": "file",
-                "url": "http://pear.horde.org/get/Horde_Compress-2.1.0.tgz",
+                "url": "http://pear.horde.org/get/Horde_Compress-2.1.1.tgz",
                 "reference": null,
                 "shasum": null
             },
@@ -23,7 +23,7 @@
                 "php": "<6.0.0.0"
             },
             "replace": {
-                "pear-horde/horde_compress": "== 2.1.0.0"
+                "pear-horde/horde_compress": "== 2.1.1.0"
             },
             "type": "pear-library",
             "autoload": {

From feb0d6d5af244a6e08635c8ef78d3c5b7f86e15a Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 16 Mar 2015 10:28:46 +0000
Subject: [PATCH 07/13] Fix prefsHelper tooltip always on top -Fix prefsHelper
 tooltips layover fields in FF

---
 preferences/templates/default/app.css   | 2 +-
 preferences/templates/pixelegg/app.css  | 6 +++---
 preferences/templates/pixelegg/app.less | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/preferences/templates/default/app.css b/preferences/templates/default/app.css
index ceebb13bc8..019749e152 100644
--- a/preferences/templates/default/app.css
+++ b/preferences/templates/default/app.css
@@ -21,7 +21,7 @@ tr.prefRow > td {
 	vertical-align: bottom;	/* otherwise help will cover bigger prefValue */
 }
 .prefHelp {
-	position: absolute;
+	position: fixed;
 	display: none;
 	width: 98%;
 	background-color: lightyellow;
diff --git a/preferences/templates/pixelegg/app.css b/preferences/templates/pixelegg/app.css
index d8c9881a38..c78681c650 100755
--- a/preferences/templates/pixelegg/app.css
+++ b/preferences/templates/pixelegg/app.css
@@ -18,7 +18,7 @@
  * @package preferences
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker@outdoor-training.de>
- * @version $Id: app.css 46460 2014-04-01 16:07:38Z ralfbecker $
+ * @version $Id: app.css 52121 2015-03-12 16:58:01Z hnategh $
  */
 table.prefTable {
   width: 100%;
@@ -34,7 +34,7 @@ tr.prefRow > td {
   /* otherwise help will cover bigger prefValue */
 }
 .prefHelp {
-  position: absolute;
+  position: fixed;
   display: none;
   width: 98%;
   background-color: lightyellow;
@@ -103,7 +103,7 @@ tr.prefRow > td {
   /* otherwise help will cover bigger prefValue */
 }
 .prefHelp {
-  position: absolute;
+  position: fixed;
   background-color: #e6e6e6;
   /*border-radius: 10px;*/
   -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
diff --git a/preferences/templates/pixelegg/app.less b/preferences/templates/pixelegg/app.less
index b73395b260..011a396826 100755
--- a/preferences/templates/pixelegg/app.less
+++ b/preferences/templates/pixelegg/app.less
@@ -52,7 +52,7 @@ tr.prefRow > td {
 	vertical-align: bottom;	/* otherwise help will cover bigger prefValue */
 }
 .prefHelp {
-	position: absolute;
+	position: fixed;
         background-color: @gray_10;
 	/*border-radius: 10px;*/
         .box_shadow_message;

From e6bdc9fd8c0ced2c1d4f530044e4cb27208fd0af Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 16 Mar 2015 15:30:17 +0000
Subject: [PATCH 08/13] Re-enable view infologs on organisations, works fine.

---
 addressbook/inc/class.addressbook_ui.inc.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index ad42d695db..075494c4f4 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -570,7 +570,6 @@ class addressbook_ui extends addressbook_bo
 						'icon' => 'infolog/navbar',
 						'onExecute' => 'javaScript:app.addressbook.view_infolog',
 						'allowOnMultiple' => true,
-						'disableClass' => 'contact_organisation',
 						'hideOnDisabled' => true,
 					),
 					'infolog_add' => array(

From 58ddac77e93af80d8d49c1ffb241b8f7bf4b8ada Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 16 Mar 2015 17:43:42 +0000
Subject: [PATCH 09/13] Fix password change dialog does not open in safari

---
 phpgwapi/inc/class.egw_framework.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index aafe369fea..ee7f245865 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -1599,8 +1599,8 @@ abstract class egw_framework
 				'id'    => 'password',
 				'name'  => 'preferences',
 				'title' => lang('Password'),
-				'url'   => 'javascript:egw.open_link("'.
-					egw::link('/index.php?menuaction=preferences.preferences_password.change').'","_blank","400x270")',
+				'url'   => "javascript:egw.open_link('".
+					egw::link('/index.php?menuaction=preferences.preferences_password.change')."','_blank','400x270')",
 			));
 		}
 		/* disable help until content is reworked

From 7ccca9f4c6b5f9cd8f31c01bbd28d3005f39cd81 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 16 Mar 2015 20:17:55 +0000
Subject: [PATCH 10/13] When creating a new objectManager, use the
 actionManager at the matching search depth. Fixes objectManagers using an
 actionManager from a different application, and failing.

---
 phpgwapi/js/egw_action/egw_action.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpgwapi/js/egw_action/egw_action.js b/phpgwapi/js/egw_action/egw_action.js
index db040059dd..52baffc5e4 100644
--- a/phpgwapi/js/egw_action/egw_action.js
+++ b/phpgwapi/js/egw_action/egw_action.js
@@ -91,7 +91,7 @@ function egw_getObjectManager(_id, _create, _search_depth) {
 		res = egw_globalObjectManager.getObjectById(_id, _search_depth);
 		if (res == null && _create) {
 			res = new egwActionObjectManager(_id,
-				egw_getActionManager(_id));
+				egw_getActionManager(_id,true,_search_depth));
 			egw_globalObjectManager.addObject(res);
 		}
 	}

From 9e1625c983b98d8e5c7f34549aa674744a7c86d0 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 16 Mar 2015 21:15:38 +0000
Subject: [PATCH 11/13] Avoid errors in refresh if most recently opened
 etemplate gets closed before refresh.

---
 infolog/js/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infolog/js/app.js b/infolog/js/app.js
index 0f12ebd1e0..8cf7a2e217 100644
--- a/infolog/js/app.js
+++ b/infolog/js/app.js
@@ -101,7 +101,7 @@ app.classes.infolog = AppJS.extend(
 			}
 		}
 		// Refresh handler for Addressbook CRM view
-		if (_app == 'infolog' && this.et2._inst.app == 'addressbook' && this.et2._inst.name == 'infolog.index')
+		if (_app == 'infolog' && this.et2.getInstanceManager() && this.et2.getInstanceManager().app == 'addressbook' && this.et2.getInstanceManager().name == 'infolog.index')
 		{
 			this.et2._inst.refresh(_msg, _app, _id, _type);
 		}

From 984bbf4d44440da32bcda5ca2190fb6959b7f85d Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 16 Mar 2015 22:28:18 +0000
Subject: [PATCH 12/13] Include lettersearch when forcing preferences

---
 etemplate/inc/class.etemplate_widget_nextmatch.inc.php | 9 ++++++++-
 etemplate/js/et2_extension_nextmatch.js                | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
index f92102d4a2..5dde80c4bd 100644
--- a/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
+++ b/etemplate/inc/class.etemplate_widget_nextmatch.inc.php
@@ -1056,19 +1056,25 @@ class etemplate_widget_nextmatch extends etemplate_widget
 			{
 				$GLOBALS['egw']->preferences->delete($app,$pref_name,'forced');
 				$GLOBALS['egw']->preferences->delete($app,$refresh_pref_name,'forced');
+				$GLOBALS['egw']->preferences->delete($app,$pref_name.'-size','forced');
+				$GLOBALS['egw']->preferences->delete($app,$pref_name.'-lettersearch','forced');
 				$GLOBALS['egw']->preferences->save_repository(true,'forced');
 			}
 
 			// Set columns + refresh as default for all users
 			// Columns included in submit, preference might not be updated yet
 			$cols = $value['selectcols'];
-			$GLOBALS['egw']->preferences->read();
+			$GLOBALS['egw']->preferences->read_repository(true);
 			$GLOBALS['egw']->preferences->add($app,$pref_name,is_array($cols) ? implode(',',$cols) : $cols, $pref_level);
 
 			// Autorefresh
 			$refresh = $value['nm_autorefresh'];
 			$GLOBALS['egw']->preferences->add($app,$refresh_pref_name,(int)$refresh,$pref_level);
 
+			// Lettersearch
+			$lettersearch = is_array($cols) && in_array('lettersearch', $cols);
+			$GLOBALS['egw']->preferences->add($app,$pref_name.'-lettersearch',(int)$lettersearch,$pref_level);
+
 			$GLOBALS['egw']->preferences->save_repository(true,$pref_level);
 			$GLOBALS['egw']->preferences->read(true);
 
@@ -1077,6 +1083,7 @@ class etemplate_widget_nextmatch extends etemplate_widget
 				// Clear column + refresh preference so users go back to default
 				$GLOBALS['egw']->preferences->delete_preference($app,$pref_name);
 				$GLOBALS['egw']->preferences->delete_preference($app,$pref_name.'-size');
+				$GLOBALS['egw']->preferences->delete_preference($app,$pref_name.'-lettersearch');
 				$GLOBALS['egw']->preferences->delete_preference($app,$refresh_pref_name);
 			}
 		}
diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js
index a7a2b2a6a3..7c214ceeb9 100644
--- a/etemplate/js/et2_extension_nextmatch.js
+++ b/etemplate/js/et2_extension_nextmatch.js
@@ -1379,6 +1379,10 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput, et2_IPrin
 				// Set default or clear forced?
 				if(defaultCheck.get_value())
 				{
+					if(show_letters)
+					{
+						self.activeFilters.selectcols.push('lettersearch');
+					}
 					self.getInstanceManager().submit();
 				}
 				self.selectPopup = null;

From 3d05a434178898809aa5cb67933b81ffeda0f266 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 17 Mar 2015 09:44:14 +0000
Subject: [PATCH 13/13] implement part attribute with values "header" and
 "footer" to put rows in thead or tfoot instead of tbody of table

---
 .../inc/class.etemplate_table_test.inc.php    | 14 ++++++++
 etemplate/js/et2_widget_grid.js               | 35 +++++++++++++++----
 etemplate/templates/default/table_test.xet    | 33 +++++++++++++++++
 3 files changed, 76 insertions(+), 6 deletions(-)
 create mode 100644 etemplate/inc/class.etemplate_table_test.inc.php
 create mode 100644 etemplate/templates/default/table_test.xet

diff --git a/etemplate/inc/class.etemplate_table_test.inc.php b/etemplate/inc/class.etemplate_table_test.inc.php
new file mode 100644
index 0000000000..fe6c01764e
--- /dev/null
+++ b/etemplate/inc/class.etemplate_table_test.inc.php
@@ -0,0 +1,14 @@
+<?php
+class etemplate_table_test
+{
+	var $public_functions = array(
+		'index' => true,
+	);
+
+	function index(array $content=null, $msg='')
+	{
+		$tmpl = new etemplate_new('etemplate.table_test');
+		$content = array();
+		$tmpl->exec('etemplate.etemplate_table_test.index', $content);
+	}
+}
diff --git a/etemplate/js/et2_widget_grid.js b/etemplate/js/et2_widget_grid.js
index 9d6aa2f54f..23dc1423db 100644
--- a/etemplate/js/et2_widget_grid.js
+++ b/etemplate/js/et2_widget_grid.js
@@ -62,10 +62,14 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
 	 */
 	init: function() {
 		// Create the table body and the table
-		this.tbody = $j(document.createElement("tbody"));
 		this.table = $j(document.createElement("table"))
 			.addClass("et2_grid");
-		this.table.append(this.tbody);
+		this.thead = $j(document.createElement("thead"))
+			.appendTo(this.table);
+		this.tfoot = $j(document.createElement("tfoot"))
+			.appendTo(this.table);
+		this.tbody = $j(document.createElement("tbody"))
+			.appendTo(this.table);
 
 		// Call the parent constructor
 		this._super.apply(this, arguments);
@@ -180,7 +184,7 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
 				colDataEntry["class"] = et2_readAttrWithDefault(node, "class", "");
 				colDataEntry["align"] = et2_readAttrWithDefault(node, "align", "");
 				colDataEntry["span"] = et2_readAttrWithDefault(node, "span", "1");
-				
+
 				// Keep any others attributes set, there's no 'column' widget
 				for(var i in node.attributes)
 				{
@@ -212,6 +216,7 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
 				rowDataEntry["class"] = et2_readAttrWithDefault(node, "class", "");
 				rowDataEntry["valign"] = et2_readAttrWithDefault(node, "valign", "");
 				rowDataEntry["span"] = et2_readAttrWithDefault(node, "span", "1");
+				rowDataEntry["part"] = et2_readAttrWithDefault(node, "part", "body");
 
 				var id = et2_readAttrWithDefault(node, "id", "");
 				if(id)
@@ -645,7 +650,23 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
 		for (var y = 0; y < h; y++)
 		{
 			var row = _cells[y];
-			var tr = $j(document.createElement("tr")).appendTo(this.tbody)
+			var parent = this.tbody;
+			switch(this.rowData[y]["part"])
+			{
+				case 'header':
+					if (!this.tbody.children().length && !this.tfoot.children().length)
+					{
+						parent = this.thead;
+					}
+					break;
+				case 'footer':
+					if (!this.tbody.children().length)
+					{
+						parent = this.tfoot;
+					}
+					break;
+			}
+			var tr = $j(document.createElement("tr")).appendTo(parent)
 				.addClass(this.rowData[y]["class"]);
 
 			if (this.rowData[y].disabled)
@@ -838,6 +859,8 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
 			}
 		}
 		this.managementArray = [];
+		this.thead.empty();
+		this.tfoot.empty();
 		this.tbody.empty();
 
 		// Update array managers
@@ -983,7 +1006,7 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
 		}
 		return ids.join('_');
 	},
-	
+
 	resize: function (_height)
 	{
 		if (typeof this.options != 'undefined' && _height
@@ -1002,7 +1025,7 @@ var et2_grid = et2_DOMWidget.extend([et2_IDetachedDOM, et2_IAligned, et2_IResize
 					this.table.height(this.table.height() + _height );
 				}
 			}
-			
+
 		}
 	}
 });
diff --git a/etemplate/templates/default/table_test.xet b/etemplate/templates/default/table_test.xet
new file mode 100644
index 0000000000..0c6fcc14c7
--- /dev/null
+++ b/etemplate/templates/default/table_test.xet
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
+<overlay>
+	<template id="etemplate.table_test" template="" lang="" group="0" version="">
+		<grid id="rows" order="first" sort="asc" onsort="alert">
+			<columns>
+				<column/>
+				<column/>
+			</columns>
+			<rows>
+				<row part="header">
+					<description value="Header" span="all"/>
+					<description/>
+				</row>
+				<row part="footer">
+					<description value="Footer" span="all"/>
+					<description/>
+				</row>
+				<row class="th">
+					<grid-sortheader label="Col 1 Header" id="first" custom-sort="app.method"/>
+					<grid-sortheader label="Col 2 Header" id="second"/>
+					<description value="Col 3 Header"/>
+				</row>
+				<row class="row">
+					<description id="${row}[first]"/>
+					<description id="${row}[second]"/>
+					<description id="${row}[third]"/>
+				</row>
+			</rows>
+		</grid>
+	</template>
+</overlay>
\ No newline at end of file