From 1f177aace4469d51bf40f170245fbf959bc933c7 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 12 Mar 2015 12:39:49 +0000
Subject: [PATCH 1/7] Change category icon in all apps

---
 calendar/inc/class.calendar_ui.inc.php       | 2 +-
 etemplate/inc/class.nextmatch_widget.inc.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index c7700cc52f..2e261d8c7f 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -764,7 +764,7 @@ class calendar_ui
 			lang('Select a %1',lang('Category')). '"'.($cat_id && count($cat_id) > 1 ? ' multiple=true size=4':''). '>'.
 			'<option value="0">'.lang('All categories').'</option>'.
 				$this->categories->formatted_list('select','all',$cat_id,'True').
-			"</select>\n" . html::image('phpgwapi','attach','','id="calendar_cat_id_multiple"')."
+			"</select>\n" . html::image('phpgwapi','category','','id="calendar_cat_id_multiple"')."
 			<script type=\"text/javascript\" src=\"{$GLOBALS['egw_info']['server']['webserver_url']}/calendar/js/navigation.js\" id=\"calendar-navigation-script\"".
 			" data-link-day-url =\"".htmlspecialchars($link['day']).
 			"\" data-link-week-url=\"".htmlspecialchars($link['week']).
diff --git a/etemplate/inc/class.nextmatch_widget.inc.php b/etemplate/inc/class.nextmatch_widget.inc.php
index 520f32c090..efba972851 100644
--- a/etemplate/inc/class.nextmatch_widget.inc.php
+++ b/etemplate/inc/class.nextmatch_widget.inc.php
@@ -634,7 +634,7 @@ class nextmatch_widget
 			'add'  => 'new',
 			'new'  => 'new',
 			'delete' => 'delete',
-			'cat'  => 'attach',		// add as category icon to api
+			'cat'  => 'category',		// add as category icon to api
 			'document' => 'etemplate/merge',
 			'print'=> 'print',
 			'copy' => 'copy',

From 1db42841cf629d04f3bf71a6f81a1f8545a8913b Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 12 Mar 2015 14:59:25 +0000
Subject: [PATCH 2/7] Use bigger loading image for tab loading overlay (thanks
 Hadi)

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

diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 4383b89ba8..e58b05e214 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -2528,7 +2528,7 @@ body {
   float: right;
 }
 .egw_fw_ui_tab_content > .loading {
-  background-image: url('../images/ajax-loader.gif');
+  background-image: url('../images/loading.gif');
   text-align: center;
   line-height: 400px;
 }
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index e8d248bc56..81f0f16d7f 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -2517,7 +2517,7 @@ body {
   float: right;
 }
 .egw_fw_ui_tab_content > .loading {
-  background-image: url('../images/ajax-loader.gif');
+  background-image: url('../images/loading.gif');
   text-align: center;
   line-height: 400px;
 }
diff --git a/pixelegg/less/layout_ajaxLoader.less b/pixelegg/less/layout_ajaxLoader.less
index 2c4a6a5e1d..4c39bb2167 100644
--- a/pixelegg/less/layout_ajaxLoader.less
+++ b/pixelegg/less/layout_ajaxLoader.less
@@ -26,7 +26,7 @@
 }
 
 .egw_fw_ui_tab_content > .loading {
-    background-image:url('../images/ajax-loader.gif');
+    background-image:url('../images/loading.gif');
 	text-align: center;
 	line-height: 400px;
 }
\ No newline at end of file

From 5f3f3b3e55c942d349dae2b33599eb9bcfe6ed75 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 12 Mar 2015 15:23:15 +0000
Subject: [PATCH 3/7] Respect "Default type of resources selection" preference

---
 calendar/inc/class.calendar_uiforms.inc.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index 9914d39ab0..cfdb3926b2 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -1466,21 +1466,21 @@ class calendar_uiforms extends calendar_ui
 			}
 			// adding extra content for the resource link-entry widget to
 			// * select resources or addressbook as a default selection on the app selectbox based on prefs
-			$content['participants']['resource']['default_sel'] = $this->cal_prefs['defaultresource_sel'];
+			$content['participants']['resource']['app'] = $this->cal_prefs['defaultresource_sel'];
 			// * get informations from the event on the ajax callback
-			if (in_array($content['participants']['resource']['default_sel'],array('resources_conflict','resources_without_conflict')))
+			if (in_array($content['participants']['resource']['app'],array('resources_conflict','resources_without_conflict')))
 			{
 				// fix real app string
-				$content['participants']['resource']['default_sel'] = 'resources';
+				$content['participants']['resource']['app'] = 'resources';
 				// this will be used to get reservation information on the resource select list
 				$content['participants']['resource']['extra'] = "values2url(this.form,'start,end,duration,participants,recur_type,whole_day')".
 					"+'&exec[event_id]=".$content['id']."'"."+'&exec[show_conflict]=".
 					(($this->cal_prefs['defaultresource_sel'] == 'resources_without_conflict')? '0':'1')."'";
 			}
 			// check if current pref. is an allowed application for the user
-			if (!isset($GLOBALS['egw_info']['user']['apps'][$content['participants']['resource']['default_sel']]))
+			if (!isset($GLOBALS['egw_info']['user']['apps'][$content['participants']['resource']['app']]))
 			{
-				$content['participants']['resource']['default_sel'] = 'home-accounts';
+				$content['participants']['resource']['app'] = 'home-accounts';
 			}
 		}
 		$content['participants']['status_date'] = $preserv['actual_date'];

From 5a4ed19e73534f1317a89a01f3743664519e6843 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 12 Mar 2015 16:22:45 +0000
Subject: [PATCH 4/7] Make query callback parameters more useful (& documented)
 by passing the link widget instead of response

---
 etemplate/js/et2_widget_link.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etemplate/js/et2_widget_link.js b/etemplate/js/et2_widget_link.js
index 01e7bc393f..217dea338d 100644
--- a/etemplate/js/et2_widget_link.js
+++ b/etemplate/js/et2_widget_link.js
@@ -522,7 +522,7 @@ var et2_link_entry = et2_inputWidget.extend(
 			"name": "Query callback",
 			"type": "js",
 			"default": et2_no_init,
-			"description": "Callback before query to server.  Must return true, or false to abort query."
+			"description": "Callback before query to server.  It will be passed the request & et2_link_entry objects.  Must return true, or false to abort query."
 		},
 		"select": {
 			"name": "Select callback",
@@ -921,7 +921,7 @@ var et2_link_entry = et2_inputWidget.extend(
 		// Allow hook / tie in
 		if(this.options.query && typeof this.options.query == 'function')
 		{
-			if(!this.options.query(request, response)) return false;
+			if(!this.options.query(request, this)) return false;
 		}
 
 		if((typeof request.no_cache == 'undefined' && !request.no_cache) && request.term in this.cache) {

From 255494fc200f5ed7416e602866d6a5465499f270 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 12 Mar 2015 16:24:55 +0000
Subject: [PATCH 5/7] Fix resource participant search conflict checking

---
 calendar/inc/class.calendar_uiforms.inc.php |  4 ---
 calendar/js/app.js                          | 34 +++++++++++++++++++++
 calendar/templates/default/edit.xet         |  2 +-
 resources/inc/class.resources_bo.inc.php    | 12 +++-----
 4 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index cfdb3926b2..1a64b39bbe 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -1472,10 +1472,6 @@ class calendar_uiforms extends calendar_ui
 			{
 				// fix real app string
 				$content['participants']['resource']['app'] = 'resources';
-				// this will be used to get reservation information on the resource select list
-				$content['participants']['resource']['extra'] = "values2url(this.form,'start,end,duration,participants,recur_type,whole_day')".
-					"+'&exec[event_id]=".$content['id']."'"."+'&exec[show_conflict]=".
-					(($this->cal_prefs['defaultresource_sel'] == 'resources_without_conflict')? '0':'1')."'";
 			}
 			// check if current pref. is an allowed application for the user
 			if (!isset($GLOBALS['egw_info']['user']['apps'][$content['participants']['resource']['app']]))
diff --git a/calendar/js/app.js b/calendar/js/app.js
index 47272a6235..8e5d105011 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -939,6 +939,40 @@ app.classes.calendar = AppJS.extend(
 		}
 	},
 
+	/**
+	 * In edit popup, search for calendar participants.
+	 * Resources need to have the start & duration (etc.)
+	 * passed along in the query.
+	 *
+	 * @param {Object} request
+	 * @param {et2_link_entry} widget
+	 *
+	 * @returns {boolean} True to continue with the search
+	 */
+	edit_participant_search: function(request, widget)
+	{
+		if(widget.app_select.val() == 'resources')
+		{
+			// Resources search is expecting exec
+			var values = widget.getInstanceManager().getValues(widget.getRoot());
+			if(typeof request.options != 'object' || request.options == null)
+			{
+				request.options = {};
+			}
+			request.options.exec = {
+				start: values.start,
+				end: values.end,
+				duration: values.duration,
+				participants: values.participants,
+				recur_type: values.recur_type,
+				whole_day: values.whole_day,
+				event_id: values.link_to.to_id, // cal_id, if available
+				show_conflict: (egw.preference('defaultresource_sel','calendar') == 'resources_without_conflict') ? '0' : '1'
+			}
+		}
+		return true;
+	},
+	
 	/**
 	 * Handles to select freetime, and replace the selected one on Start,
 	 * and End date&time in edit calendar entry popup.
diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet
index ccb0988322..b55f8784b4 100644
--- a/calendar/templates/default/edit.xet
+++ b/calendar/templates/default/edit.xet
@@ -112,7 +112,7 @@
 						<menulist>
 							<menupopup type="select-account" statustext="User or group" id="account" multiple="true" no_lang="true" tags="true" account_type="both" empty_label="User or group" class="et2_fullWidth" width="99%"/>
 						</menulist>
-						<link-entry id="resource" options="@cal_resources"/>
+						<link-entry id="resource" options="@cal_resources" query="app.calendar.edit_participant_search"/>
 					</vbox>
 					<vbox span="2" valign="middle">
 						<textbox type="integer" align="center" id="quantity" min="1" size="3"/>
diff --git a/resources/inc/class.resources_bo.inc.php b/resources/inc/class.resources_bo.inc.php
index fb9ea02023..748955f0f8 100755
--- a/resources/inc/class.resources_bo.inc.php
+++ b/resources/inc/class.resources_bo.inc.php
@@ -588,11 +588,11 @@ class resources_bo
 		$data = $this->so->search($criteria,$only_keys,$order_by='name',$extra_cols='',$wildcard='%',$empty,$op='OR',$limit,$filter);
 		// maybe we need to check disponibility of the searched resources in the calendar if $pattern ['exec'] contains some extra args
 		$show_conflict=False;
-		if (is_array($pattern) && isset($pattern['exec']) )
+		if ($options['exec'])
 		{
 			// we'll use a cache for resources info taken from database
 			static $res_info_cache = array();
-			$cal_info=$pattern['exec'];
+			$cal_info=$options['exec'];
 			if ( isset($cal_info['start']) && isset($cal_info['duration']))
 			{
 				//get a calendar objet for reservations
@@ -602,11 +602,7 @@ class resources_bo
 					$this->bocal =& CreateObject('calendar.calendar_bo');
 				}
 
-				//get the real timestamps from infos we have on the event
-				//use etemplate date widget to handle date values
-				require_once(EGW_INCLUDE_ROOT.'/phpgwapi/inc/class.jscalendar.inc.php');
-				$jscal=& CreateObject('phpgwapi.jscalendar');
-				$startarr= $jscal->input2date($cal_info['start']['str'],$raw='raw',$day='day',$month='month',$year='year');
+				$startarr= getdate(strtotime($cal_info['start']));
 				if (isset($cal_info['whole_day'])) {
 					$startarr['hour'] = $startarr['minute'] = 0;
 					unset($startarr['raw']);
@@ -673,7 +669,7 @@ class resources_bo
 			}
 		}
 		if (isset($res_info_cache)) {
-			$show_conflict= (isset($pattern['exec']['show_conflict'])&& ($pattern['exec']['show_conflict']=='0'))? False:True;
+			$show_conflict= (isset($options['exec']['show_conflict'])&& ($options['exec']['show_conflict']=='0'))? False:True;
 			// if we have this array indexed on resource id it means non-bookable resource are removed and we are working for calendar
 			// so we'll loop on this one and not $data
 			foreach($res_info_cache as $id => $resource) {

From 047ee1325390bebced41ba87db709c84082e96fc Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 12 Mar 2015 16:50:47 +0000
Subject: [PATCH 6/7] Fix some missed details and simplifications in resource
 search options

---
 calendar/js/app.js                       |  5 ++++-
 resources/inc/class.resources_bo.inc.php | 14 +++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/calendar/js/app.js b/calendar/js/app.js
index 8e5d105011..8a7d9eff02 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -965,9 +965,12 @@ app.classes.calendar = AppJS.extend(
 				duration: values.duration,
 				participants: values.participants,
 				recur_type: values.recur_type,
-				whole_day: values.whole_day,
 				event_id: values.link_to.to_id, // cal_id, if available
 				show_conflict: (egw.preference('defaultresource_sel','calendar') == 'resources_without_conflict') ? '0' : '1'
+			};
+			if(values.whole_day)
+			{
+				request.options.exec.whole_date = true;
 			}
 		}
 		return true;
diff --git a/resources/inc/class.resources_bo.inc.php b/resources/inc/class.resources_bo.inc.php
index 748955f0f8..f0af53e732 100755
--- a/resources/inc/class.resources_bo.inc.php
+++ b/resources/inc/class.resources_bo.inc.php
@@ -601,18 +601,14 @@ class resources_bo
 					require_once(EGW_INCLUDE_ROOT.'/calendar/inc/class.calendar_bo.inc.php');
 					$this->bocal =& CreateObject('calendar.calendar_bo');
 				}
-
-				$startarr= getdate(strtotime($cal_info['start']));
+				$start = new egw_time($cal_info['start']);
+				$startarr= getdate($start->format('ts'));
 				if (isset($cal_info['whole_day'])) {
 					$startarr['hour'] = $startarr['minute'] = 0;
-					unset($startarr['raw']);
-					$start = $this->bocal->date2ts($startarr);
-					$end = $start + 86399;
+					$start = new egw_time($startarr);
+					$end = $start->format('ts') + 86399;
 				} else {
-					$startarr['hour'] = $cal_info['start']['H'];
-					$startarr['minute'] = $cal_info['start']['i'];
-					unset($startarr['raw']);
-					$start = $this->bocal->date2ts($startarr);
+					$start = $start->format('ts');
 					$end = $start + ($cal_info['duration']);
 				}
 

From 87ee54992105d9fe073e22760d4c9d6ab215e57f Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 12 Mar 2015 16:58:01 +0000
Subject: [PATCH 7/7] Port the change password dialog to et2

---
 .../inc/class.preferences_password.inc.php    | 136 +++++++++---------
 preferences/templates/default/app.css         |   3 +
 preferences/templates/default/password.xet    |  43 ++++++
 preferences/templates/pixelegg/app.css        |   6 +-
 4 files changed, 114 insertions(+), 74 deletions(-)
 create mode 100644 preferences/templates/default/password.xet

diff --git a/preferences/inc/class.preferences_password.inc.php b/preferences/inc/class.preferences_password.inc.php
index 4360d91d64..36bdae790a 100644
--- a/preferences/inc/class.preferences_password.inc.php
+++ b/preferences/inc/class.preferences_password.inc.php
@@ -15,87 +15,79 @@ class preferences_password
 		'change' => True
 	);
 
-	function change()
+	/**
+	 * Change password function
+	 * process change password form
+	 *
+	 * @param type $content
+	 */
+	function change($content = null)
 	{
-		//_debug_array($GLOBALS['egw_info']['user']);
-		$n_passwd   = $_POST['n_passwd'];
-		$n_passwd_2 = $_POST['n_passwd_2'];
-		$o_passwd_2 = $_POST['o_passwd_2'];
-		if (isset($_GET['message'])) $message = str_replace("<br />"," ",html::purify($_GET['message']));
-		if($GLOBALS['egw']->acl->check('nopasswordchange', 1) || $_POST['cancel'])
+		if ($GLOBALS['egw']->acl->check('nopasswordchange', 1))
 		{
-			egw_framework::window_close();
+			egw_framework::window_close('There was no password change!');
 		}
-
-		$GLOBALS['egw']->template->set_file(array(
-			'form' => 'changepassword.tpl'
-		));
-		$GLOBALS['egw']->template->set_var('lang_enter_password',lang('Enter your new password'));
-		$GLOBALS['egw']->template->set_var('lang_reenter_password',lang('Re-enter your password'));
-		$GLOBALS['egw']->template->set_var('lang_enter_old_password',lang('Enter your old password'));
-		$GLOBALS['egw']->template->set_var('lang_change',lang('Change password'));
-		$GLOBALS['egw']->template->set_var('lang_cancel',lang('Cancel'));
-		$GLOBALS['egw']->template->set_var('form_action',egw::link('/index.php','menuaction=preferences.preferences_password.change'));
-
-		$errors = array();
-		if($_POST['change'])
+		
+		if (!is_array($content))
 		{
-			$o_passwd = $GLOBALS['egw_info']['user']['passwd'];
-
-			if($o_passwd != $o_passwd_2)
+			$content= array();
+		}
+		else
+		{
+			if ($content['button']['change'])
 			{
-				$errors[] = lang('The old password is not correct');
-			}
-
-			if($n_passwd != $n_passwd_2)
-			{
-				$errors[] = lang('The two passwords are not the same');
-			}
-
-			if($o_passwd == $n_passwd)
-			{
-				$errors[] = lang('Old password and new password are the same. This is invalid. You must enter a new password');
-			}
-
-			if(!$n_passwd)
-			{
-				$errors[] = lang('You must enter a password');
-			}
-
-			// allow auth backends or configured password strenght to throw exceptions and display there message
-			if (!$errors)
-			{
-				try {
-					$passwd_changed = $GLOBALS['egw']->auth->change_password($o_passwd, $n_passwd,
-						$GLOBALS['egw_info']['user']['account_id']);
-				}
-				catch (Exception $e) {
-					$errors[] = $e->getMessage();
-				}
-			}
-			if(!$passwd_changed)
-			{
-				if (!$errors)	// if we have no specific error, add general message
+				$o_passwd = $GLOBALS['egw_info']['user']['passwd'];
+				if($o_passwd != $content['o_passwd_2'])
 				{
-					$errors[] = lang('Failed to change password.');
+					$errors[] = lang('The old password is not correct');
 				}
-				egw_framework::message(implode("\n", $errors), 'error');
-				common::egw_header();
-				echo parse_navbar();
-				$GLOBALS['egw']->template->pfp('out','form');
-				common::egw_exit(True);
-			}
-			else
-			{
-				egw_framework::refresh_opener(lang('Password changed'), 'preferences');
-				egw_framework::window_close();
+				if($content['n_passwd'] != $content['n_passwd_2'])
+				{
+					$errors[] = lang('The two passwords are not the same');
+				}
+
+				if($o_passwd == $content['n_passwd'])
+				{
+					$errors[] = lang('Old password and new password are the same. This is invalid. You must enter a new password');
+				}
+
+				if(!$content['n_passwd'])
+				{
+					$errors[] = lang('You must enter a password');
+				}
+
+				// allow auth backends or configured password strenght to throw exceptions and display there message
+				if (!$errors)
+				{
+					try {
+						$passwd_changed = $GLOBALS['egw']->auth->change_password($o_passwd, $content['n_passwd'],
+							$GLOBALS['egw_info']['user']['account_id']);
+					}
+					catch (Exception $e) {
+						$errors[] = $e->getMessage();
+					}
+				}
+				if(!$passwd_changed)
+				{
+					if (!$errors)	// if we have no specific error, add general message
+					{
+						$errors[] = lang('Failed to change password.');
+					}
+					egw_framework::message(implode("\n", $errors), 'error');
+					$content = array();
+				}
+				else
+				{
+					egw_framework::refresh_opener(lang('Password changed'), 'preferences');
+					egw_framework::window_close();
+				}
+
 			}
 		}
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('Change your password');
-		common::egw_header();
-		echo parse_navbar();
 
-		$GLOBALS['egw']->template->pfp('out','form');
-		common::egw_footer();
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('Change your password');
+		$tmpl = new etemplate_new('preferences.password');
+
+		$tmpl->exec('preferences.preferences_password.change', $content,array(),array(),array(),2);
 	}
 }
diff --git a/preferences/templates/default/app.css b/preferences/templates/default/app.css
index 04b1d6d9f0..ceebb13bc8 100644
--- a/preferences/templates/default/app.css
+++ b/preferences/templates/default/app.css
@@ -48,4 +48,7 @@ tr.prefRow:hover .prefHelp {
 	font-size: 150%;
 	margin-top: 10px;
 	margin-right: 5px;
+}
+#preferences-password .dialogHeader td {
+	text-align: center;
 }
\ No newline at end of file
diff --git a/preferences/templates/default/password.xet b/preferences/templates/default/password.xet
new file mode 100644
index 0000000000..ad9967e8f0
--- /dev/null
+++ b/preferences/templates/default/password.xet
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
+<overlay>
+	<template id="preferences.password" template="" lang="" group="0" version="14.2">
+		<grid resize_ratio="0.25" >
+			<columns>
+				<column width="35%"/>
+				<column width="65%"/>
+			</columns>
+			<rows>
+				<row class="dialogHeader">
+					<description value="Change password" class="et2_fullWidth"/>
+				</row>
+				<row>
+					<description value="Enter your old password"/>
+					<passwd id="o_passwd_2" class="et2_fullWidth" needed="true"/>
+				</row>
+				<row>
+					<description value="Enter your new password"/>
+					<passwd id="n_passwd" class="et2_fullWidth" needed="true"/>
+				</row>
+				<row>
+					<description value="Re-enter your password"/>
+					<passwd id="n_passwd_2" class="et2_fullWidth" needed="true"/>
+				</row>
+			</rows>
+		</grid>
+		<!-- the empty resizable grid make sure that the toolbar stays always at the bottom after window gets resized -->
+		<grid resize_ratio="0.75">
+			<columns>
+				<column/>
+			</columns>
+			<rows>
+				<row></row>
+			</rows>
+		</grid>
+		<hbox class="dialogFooterToolbar">
+			<button label="Change" id="button[change]"/>
+			<button label="Cancel" id="button[cancel]" onclick="window.close();"/>
+		</hbox>
+	</template>
+</overlay>
diff --git a/preferences/templates/pixelegg/app.css b/preferences/templates/pixelegg/app.css
index f5ce7940f1..d8c9881a38 100755
--- a/preferences/templates/pixelegg/app.css
+++ b/preferences/templates/pixelegg/app.css
@@ -66,6 +66,9 @@ textarea.prefValue {
   margin-top: 10px;
   margin-right: 5px;
 }
+#preferences-password .dialogHeader td {
+  text-align: center;
+}
 /* #############################################################################
 // iframe
 // Rahmen + padding**/
@@ -100,7 +103,7 @@ tr.prefRow > td {
   /* otherwise help will cover bigger prefValue */
 }
 .prefHelp {
-  position: fixed;
+  position: absolute;
   background-color: #e6e6e6;
   /*border-radius: 10px;*/
   -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.5);
@@ -188,7 +191,6 @@ div#preferences-settings {
 }
 div#preferences-settings div.dialogHeader {
   height: 50px;
-  font-size: 100% !important;
 }
 div#preferences-settings div.dialogHeader select#preferences-settings_appname {
   min-width: 47%;