1) added planned/used time for project-manager

2) sorting by priority
3) tables renamed to use egw_ prefix now

infolog/inc/class.boinfolog.inc.php

@@ -65,13 +65,20 @@
 		var $tz_offset = 0;
 		var $tz_offset_s = 0;
 		var $user_time_now;
+		/**
+		 * @var array $config infolog configuration
+		 */
+		var $config;
 		
 		function boinfolog( $info_id = 0)
 		{
 			$this->enums = $this->stock_enums = array(
 				'priority' => array (
-					'urgent' => 'urgent','high' => 'high','normal' => 'normal',
+					3 => 'urgent',
-					'low' => 'low' ),
+					2 => 'high',
+					1 => 'normal',
+					0 => 'low' 
+				),
 /*				'status'   => array(
 					'offer' => 'offer','ongoing' => 'ongoing','call' => 'call',
 					'will-call' => 'will-call','done' => 'done',

infolog/inc/class.soinfolog.inc.php

@@ -31,8 +31,8 @@
 		var $grants;
 		var $data = array( );
 		var $user;
-		var $info_table = 'phpgw_infolog';
+		var $info_table = 'egw_infolog';
-		var $extra_table = 'phpgw_infolog_extra';
+		var $extra_table = 'egw_infolog_extra';
 
 		/**
 		 * constructor
@@ -236,7 +236,7 @@
 		{
 			$this->data = array(
 				'info_owner'    => $this->user,
-				'info_pri'   => 'normal'
+				'info_priority' => 1,
 			);
 		}
 

infolog/inc/class.solink.inc.php

@@ -32,7 +32,7 @@
 	{
 		var $db;
 		var $user;
-		var $link_table = 'phpgw_links';
+		var $link_table = 'egw_links';
 		var $debug;
 
 		/**

infolog/inc/class.uiinfolog.inc.php

@@ -104,7 +104,7 @@
 			}
 			$id = $info['info_id'];
 			$done = $info['info_status'] == 'done' || $info['info_status'] == 'billed';
-			$info['sub_class'] = $info['info_pri'] . ($done ? '_done' : '');
+			$info['sub_class'] = $this->bo->enums['priority'][$info['info_priority']] . ($done ? '_done' : '');
 			if (!$done && $info['info_enddate'] < $this->bo->user_time_now)
 			{
 				$info['end_class'] = 'overdue';
@@ -565,7 +565,7 @@
 			//echo "<p>uiinfolog.edit(info_id='$info_id',action='$action',action_id='$action_id') readonlys="; print_r($readonlys); echo ", content = "; _debug_array($content);
 			$this->tmpl->exec('infolog.uiinfolog.edit',$content,array(
 				'info_type'     => $this->bo->enums['type'],
-				'info_pri'      => $this->bo->enums['priority'],
+				'info_priority' => $this->bo->enums['priority'],
 				'info_confirm'  => $this->bo->enums['confirm'],
 				'info_status'   => $this->bo->status[$content['info_type']]
 			),$readonlys,array(

infolog/index.php

@@ -20,9 +20,19 @@
 );
 include('../header.inc.php');
 
-	$GLOBALS['egw']->redirect_link('/index.php',array(
+include_once(EGW_INCLUDE_ROOT.'/infolog/setup/setup.inc.php');
-		'menuaction' => 'infolog.uiinfolog.index',
+if ($setup_info['infolog']['version'] != $GLOBALS['egw_info']['apps']['infolog']['version'])
-//		'filter'     => 'default',
+{
-	));
+	$GLOBALS['egw']->common->egw_header();
+	parse_navbar();
+	echo '<p style="text-align: center; color:red; font-weight: bold;">'.lang('Your database is NOT up to date (%1 vs. %2), please run %3setup%4 to update your database.',
+		$setup_info['infolog']['version'],$GLOBALS['egw_info']['apps']['infolog']['version'],
+		'<a href="../setup/">','</a>')."</p>\n";
+	$GLOBALS['egw']->common->egw_exit();
+}
+unset($setup_info);
+
+ExecMethod('infolog.uiinfolog.index');
+
 $GLOBALS['egw']->common->egw_exit();
 ?>

infolog/setup/phpgw_de.lang

@@ -181,6 +181,7 @@ pattern for search in projects	infolog	de	Muster f
 phone	infolog	de	Anruf
 phone/email	infolog	de	Telefon/Email
 phonecall	infolog	de	Telefonanruf
+planned time	infolog	de	geplante Zeit
 priority	infolog	de	Priorität
 private	infolog	de	Privat
 project	infolog	de	Projekt
@@ -191,7 +192,7 @@ reject	infolog	de	Absage
 remark	infolog	de	Bemerkung
 remove this link (not the entry itself)	infolog	de	Diese Verknüpfung lösen (nicht den Eintrag selbst)
 responsible	infolog	de	Verantwortlich
-responsible user, priority, ...	infolog	de	Verantwortlicher, Prioritäten, ...
+responsible user, priority, times	infolog	de	Verantwortlicher, Priorität, Zeiten
 returns a list / search for records.	infolog	de	Liefert eine Liste von / sucht nach Datensätzen.
 save	infolog	de	Speichern
 saves the changes made and leaves	infolog	de	speichert die Änderungen und beendet
@@ -232,6 +233,7 @@ the name used internaly (<= 20 chars), changeing it makes existing data unavaili
 the text displayed to the user	infolog	de	der Text der dem Benutzer angezeigt wird
 this is the filter infolog uses when you enter the application. filters limit the entries to show in the actual view. there are filters to show only finished, still open or futures entries of yourself or all users.	infolog	de	Das ist der Filter, den InfoLog benutzt wenn es das erste mal aufgerufen wird. Filter beschränken die aktuelle Anzeige. Es gibt Filter um nur beendete, offene oder zukünftige Einträge von Ihnen oder allen Benutzern anzuzeigen.
 til when should the todo or phonecall be finished	infolog	de	bis wann soll der Auftrag oder Anruf erledigt sein
+times	infolog	de	Zeiten
 to many might exceed your execution-time-limit	infolog	de	zu viel können Ihre Laufzeitbeschränkung überschreiten
 today	infolog	de	Heute
 todo	infolog	de	Auftrag
@@ -247,6 +249,7 @@ urgency	infolog	de	Priorit
 urgent	infolog	de	Dringend
 use button to search for address	infolog	de	Button zum Suchen der Adresse verwenden
 use button to search for project	infolog	de	Button zum Suchen des Projekts verwenden
+used time	infolog	de	benötigte Zeit
 valid path on clientside<br>eg. \\server\share or e:\	infolog	de	gültiger Pfad clientseitig<br>zB. \\Server\Share oder e:\
 values for selectbox	infolog	de	Werte für die Auswahlbox
 view all subs of this entry	infolog	de	alle Untereinträge dieses Eintrag anzeigen

infolog/setup/phpgw_en.lang

@@ -181,6 +181,7 @@ pattern for search in projects	infolog	en	pattern for search in Projects
 phone	infolog	en	Phone Call
 phone/email	infolog	en	Phone/Email
 phonecall	infolog	en	Phone Call
+planned time	infolog	en	planned time
 priority	infolog	en	Priority
 private	infolog	en	Private
 project	infolog	en	Project
@@ -190,7 +191,7 @@ reg. expr. for local ip's<br>eg. ^192\.168\.1\.	infolog	en	reg. expr. for local
 remark	infolog	en	Remark
 remove this link (not the entry itself)	infolog	en	Remove this link (not the entry itself)
 responsible	infolog	en	Responsible
-responsible user, priority, ...	infolog	en	responsible user, priority, ...
+responsible user, priority, times	infolog	en	responsible user, priority, times
 returns a list / search for records.	infolog	en	Returns a list / search for records.
 save	infolog	en	Save
 saves the changes made and leaves	infolog	en	saves the changes made and leaves
@@ -231,6 +232,7 @@ the name used internaly (<= 20 chars), changeing it makes existing data unavaili
 the text displayed to the user	infolog	en	the text displayed to the user
 this is the filter infolog uses when you enter the application. filters limit the entries to show in the actual view. there are filters to show only finished, still open or futures entries of yourself or all users.	infolog	en	This is the filter InfoLog uses when you enter the application. Filters limit the entries to show in the actual view. There are filters to show only finished, still open or futures entries of yourself or all users.
 til when should the todo or phonecall be finished	infolog	en	til when should the ToDo or Phone call be finished
+times	infolog	en	Times
 to many might exceed your execution-time-limit	infolog	en	to many might exceed your execution-time-limit
 today	infolog	en	Today
 todo	infolog	en	ToDo
@@ -246,6 +248,7 @@ urgency	infolog	en	urgency
 urgent	infolog	en	urgent
 use button to search for address	infolog	en	use Button to search for Address
 use button to search for project	infolog	en	use Button to search for Project
+used time	infolog	en	used time
 valid path on clientside<br>eg. \\server\share or e:\	infolog	en	valid path on clientside<br>eg. \\Server\Share or e:\
 values for selectbox	infolog	en	Values for selectbox
 view all subs of this entry	infolog	en	View all subs of this entry

infolog/setup/setup.inc.php

@@ -12,9 +12,9 @@
 	/* $Id$ */
 
 	$setup_info['infolog']['name']      = 'infolog';
-	$setup_info['infolog']['version']   = '1.0.0.001';
+	$setup_info['infolog']['version']   = '1.0.1.001';
 	$setup_info['infolog']['app_order'] = 5;
-	$setup_info['infolog']['tables']    = array('phpgw_infolog','phpgw_links','phpgw_infolog_extra');
+	$setup_info['infolog']['tables']    = array('egw_infolog','egw_infolog_extra','egw_links');
 	$setup_info['infolog']['enable']    = 1;
 
 	$setup_info['infolog']['author'] = 
@@ -73,3 +73,5 @@
 
 
 
+
+

infolog/setup/tables_current.inc.php

@@ -12,7 +12,7 @@
   /* $Id$ */
 
 	$phpgw_baseline = array(
-		'phpgw_infolog' => array(
+		'egw_infolog' => array(
 			'fd' => array(
 				'info_id' => array('type' => 'auto','nullable' => False),
 				'info_type' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => 'task'),
@@ -24,24 +24,24 @@
 				'info_responsible' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
 				'info_access' => array('type' => 'varchar','precision' => '10','default' => 'public'),
 				'info_cat' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-				'info_datemodified' => array('type' => 'int','precision' => '4','nullable' => False),
+				'info_datemodified' => array('type' => 'int','precision' => '8','nullable' => False),
-				'info_startdate' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+				'info_startdate' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-				'info_enddate' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+				'info_enddate' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
 				'info_id_parent' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-				'info_pri' => array('type' => 'varchar','precision' => '10','default' => 'normal'),
+				'info_planned_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-				'info_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+				'info_used_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-				'info_bill_cat' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
 				'info_status' => array('type' => 'varchar','precision' => '40','default' => 'done'),
 				'info_confirm' => array('type' => 'varchar','precision' => '10','default' => 'not'),
 				'info_modifier' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-				'info_link_id' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0')
+				'info_link_id' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+				'info_priority' => array('type' => 'int','precision' => '2','default' => '1')
 			),
 			'pk' => array('info_id'),
 			'fk' => array(),
 			'ix' => array(array('info_owner','info_responsible','info_status','info_startdate'),array('info_id_parent','info_owner','info_responsible','info_status','info_startdate')),
 			'uc' => array()
 		),
-		'phpgw_links' => array(
+		'egw_links' => array(
 			'fd' => array(
 				'link_id' => array('type' => 'auto','nullable' => False),
 				'link_app1' => array('type' => 'varchar','precision' => '25','nullable' => False),
@@ -57,7 +57,7 @@
 			'ix' => array(array('link_app1','link_id1','link_lastmod'),array('link_app2','link_id2','link_lastmod')),
 			'uc' => array()
 		),
-		'phpgw_infolog_extra' => array(
+		'egw_infolog_extra' => array(
 			'fd' => array(
 				'info_id' => array('type' => 'int','precision' => '4','nullable' => False),
 				'info_extra_name' => array('type' => 'varchar','precision' => '32','nullable' => False),

infolog/setup/tables_update.inc.php

@@ -370,4 +370,75 @@
 		$GLOBALS['setup_info']['infolog']['currentver'] = '1.0.0.001';
 		return $GLOBALS['setup_info']['infolog']['currentver'];
 	}
+
+
+	$test[] = '1.0.0.001';
+	function infolog_upgrade1_0_0_001()
+	{
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_infolog','info_time','info_planned_time');
+		$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_infolog','info_bill_cat','info_used_time');
+		// timestamps have to be 8byte ints
+		$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_infolog','info_datemodified',array(
+			'type' => 'int',
+			'precision' => '8',
+			'nullable' => False
+		));
+		$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_infolog','info_startdate',array(
+			'type' => 'int',
+			'precision' => '8',
+			'nullable' => False,
+			'default' => '0'
+		));
+		$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_infolog','info_enddate',array(
+			'type' => 'int',
+			'precision' => '8',
+			'nullable' => False,
+			'default' => '0'
+		));
+		
+		// setting numerical priority 3=urgent, 2=high, 1=normal, 0=
+		$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_infolog','info_priority',array(
+			'type' => 'int',
+			'precision' => '2',
+			'default' => '1'
+		));
+		$GLOBALS['phpgw_setup']->oProc->query("UPDATE phpgw_infolog SET info_priority=(CASE WHEN info_pri='urgent' THEN 3 WHEN info_pre='high' THEN 2 WHEN info_pri='low' THEN 0 ELSE 1 END)",__LINE__,__FILE__);
+
+		$GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_infolog',array(
+			'fd' => array(
+				'info_id' => array('type' => 'auto','nullable' => False),
+				'info_type' => array('type' => 'varchar','precision' => '40','nullable' => False,'default' => 'task'),
+				'info_from' => array('type' => 'varchar','precision' => '255'),
+				'info_addr' => array('type' => 'varchar','precision' => '255'),
+				'info_subject' => array('type' => 'varchar','precision' => '255'),
+				'info_des' => array('type' => 'text'),
+				'info_owner' => array('type' => 'int','precision' => '4','nullable' => False),
+				'info_responsible' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+				'info_access' => array('type' => 'varchar','precision' => '10','default' => 'public'),
+				'info_cat' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+				'info_datemodified' => array('type' => 'int','precision' => '8','nullable' => False),
+				'info_startdate' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
+				'info_enddate' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
+				'info_id_parent' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+				'info_planned_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+				'info_used_time' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+				'info_status' => array('type' => 'varchar','precision' => '40','default' => 'done'),
+				'info_confirm' => array('type' => 'varchar','precision' => '10','default' => 'not'),
+				'info_modifier' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+				'info_link_id' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
+				'info_priority' => array('type' => 'int','precision' => '2','default' => '1')
+			),
+			'pk' => array('info_id'),
+			'fk' => array(),
+			'ix' => array(array('info_owner','info_responsible','info_status','info_startdate'),array('info_id_parent','info_owner','info_responsible','info_status','info_startdate')),
+			'uc' => array()
+		),'info_pri');
+		
+		$GLOBALS['phpgw_setup']->oProc->RenameTable('phpgw_infolog','egw_infolog');
+		$GLOBALS['phpgw_setup']->oProc->RenameTable('phpgw_infolog_extra','egw_infolog_extra');
+		$GLOBALS['phpgw_setup']->oProc->RenameTable('phpgw_links','egw_links');
+
+		$GLOBALS['setup_info']['infolog']['currentver'] = '1.0.1.001';
+		return $GLOBALS['setup_info']['infolog']['currentver'];
+	}
 ?>

infolog/templates/default/edit.xet

@@ -1,14 +1,15 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
-	<grid id="infolog.edit.description" template="" lang="" group="0" version="0.9.15.002" width="100%" border="0">
+	<template id="infolog.edit.description" template="" lang="" group="0" version="1.0.1.001">
+		<grid width="100%" border="0">
 			<columns>
 				<column width="100"/>
 				<column/>
 			</columns>
 			<rows>
 				<row class="th">
-				<description span="all" value="Description"/>
+					<description span="all" value="Description" options=",,,info_des"/>
 				</row>
 				<row class="row" valign="top">
 					<description/>
@@ -16,7 +17,9 @@
 				</row>
 			</rows>
 		</grid>
-	<grid id="infolog.edit.links" template="" lang="" group="0" version="0.9.15.003" width="100%">
+	</template>
+	<template id="infolog.edit.links" template="" lang="" group="0" version="0.9.15.003">
+		<grid width="100%">
 			<columns>
 				<column width="100"/>
 				<column/>
@@ -36,7 +39,9 @@
 				</row>
 			</rows>
 		</grid>
-	<grid id="infolog.edit.delegation" template="" lang="" group="0" version="0.9.15.002" width="100%">
+	</template>
+	<template id="infolog.edit.delegation" template="" lang="" group="0" version="1.0.0.001">
+		<grid width="100%">
 			<columns>
 				<column width="100"/>
 				<column/>
@@ -46,88 +51,96 @@
 					<description span="all" value="Priority"/>
 				</row>
 				<row class="row">
-				<description value="Priority"/>
+					<description value="Priority" options=",,,info_priority"/>
 					<menulist>
-					<menupopup id="info_pri" statustext="select a priority for this task"/>
+						<menupopup id="info_priority" statustext="select a priority for this task"/>
 					</menulist>
 				</row>
 				<row class="th">
 					<description span="all" value="Delegation"/>
 				</row>
 				<row class="row">
-				<description value="Responsible"/>
+					<description value="Responsible" options=",,,info_responsible"/>
 					<menulist>
 						<menupopup type="select-account" options="Owner" id="info_responsible" statustext="select a responsible user: a person you want to delegate this task"/>
 					</menulist>
 				</row>
 				<row class="row" disabled="1">
-				<description value="Confirm"/>
+					<description value="Confirm" options=",,,info_confirm"/>
 					<menulist>
 						<menupopup id="info_confirm" statustext="do you want a confirmation of the responsible on: accepting, finishing the task or both"/>
 					</menulist>
 				</row>
-			<row class="row" height="120">
+				<row class="th">
-				<description span="all"/>
+					<description span="all" value="Times"/>
+				</row>
+				<row class="row">
+					<description options=",,,info_planned_time" value="planned time"/>
+					<date-duration id="info_planned_time"/>
+				</row>
+				<row class="row" valign="top" height="120">
+					<description options=",,,info_used_time" value="used time"/>
+					<date-duration id="info_used_time"/>
 				</row>
 			</rows>
 		</grid>
-	<grid id="infolog.edit.customfields" template="" lang="" group="0" version="0.9.15.001" width="100%" height="100%" spacing="0" padding="0">
+	</template>
+	<template id="infolog.edit.customfields" template="" lang="" group="0" version="1.0.0.001">
+		<grid width="100%" height="100%" spacing="0" padding="0">
 			<columns>
 				<column/>
 			</columns>
 			<rows>
-			<row height="100%">
+				<row>
 					<customfields id="customfields"/>
 				</row>
 			</rows>
 		</grid>
-	<grid id="infolog.edit" template="" lang="" group="" version="1.0.0.000" width="100%">
+	</template>
+	<template id="infolog.edit" template="" lang="" group="0" version="1.0.1.001">
+		<grid width="100%">
 			<columns>
 				<column width="103"/>
-			<column width="350"/>
+				<column width="300"/>
-			<column width="50"/>
+				<column width="100"/>
 				<column/>
 			</columns>
 			<rows>
 				<row class="th">
-				<description value="Type"/>
+					<description value="Type" options=",,,info_type"/>
 					<menulist span="all">
 						<menupopup id="info_type" onchange="1" statustext="Type of the log-entry: Note, Phonecall or ToDo"/>
 					</menulist>
-				<description/>
-				<description/>
 				</row>
 				<row class="row">
-				<description value="Category"/>
+					<description value="Category" options=",,,info_cat"/>
 					<menulist span="all">
 						<menupopup type="select-cat" options="None" id="info_cat" statustext="select a category for this entry"/>
 					</menulist>
-				<description/>
-				<description/>
 				</row>
 				<row class="row">
-				<description value="Contact"/>
+					<description value="Contact" options=",,,info_from"/>
-				<textbox size="40" maxlength="64" id="info_from" statustext="Custom contact-information, leave emtpy to use information from most recent link" blur="@blur_title"/>
+					<textbox size="40" maxlength="64" id="info_from" statustext="Custom contact-information, leave emtpy to use information from most recent link"/>
-				<description value="Phone/Email"/>
+					<description value="Phone/Email" options=",,,info_addr"/>
 					<textbox size="40" maxlength="64" id="info_addr" statustext="Custom contact-address, leave empty to use information from most recent link"/>
 				</row>
 				<row class="row">
-				<description value="Subject"/>
+					<description value="Subject" options=",,,info_subject"/>
 					<textbox size="64" maxlength="64" span="all" id="info_subject" needed="1" statustext="a short subject for the entry"/>
 				</row>
 				<row valign="top" height="250">
-				<tabbox>
+					<tabbox span="all">
-					<tabs span="all">
+						<tabs>
 							<tab label="Description" statustext="longer textual description"/>
 							<tab label="Links" statustext="Links of this entry"/>
-						<tab label="Delegation" statustext="responsible user, priority, ..."/>
+							<tab label="Delegation" statustext="responsible user, priority, times"/>
-						<tab label="Customfields" statustext=""/>
+							<tab label="Customfields" statustext="Custom fields"/>
 						</tabs>
 						<tabpanels>
-						<grid id="infolog.edit.description"/>
+							<template id="infolog.edit.description"/>
-						<grid id="infolog.edit.links"/>
+							<template id="infolog.edit.links"/>
-						<grid id="infolog.edit.delegation"/>
+							<template id="infolog.edit.delegation"/>
-						<grid id="infolog.edit.customfields"/>
+							<template id="infolog.edit.customfields"/>
 						</tabpanels>
 					</tabbox>
 				</row>
@@ -135,26 +148,26 @@
 					<description span="all" value="Dates, Status, Access"/>
 				</row>
 				<row class="row">
-				<description value="Startdate"/>
+					<description value="Startdate" options=",,,info_startdate"/>
 					<date-time options=",2" id="info_startdate" statustext="when should the ToDo or Phonecall be started, it shows up from that date in the filter open or own open (startpage)"/>
-				<description value="Enddate"/>
+					<description value="Enddate" options=",,,info_enddate"/>
 					<date id="info_enddate" statustext="til when should the ToDo or Phonecall be finished"/>
 				</row>
 				<row class="row">
-				<description value="Status"/>
+					<description value="Status" options=",,,info_status"/>
 					<menulist>
 						<menupopup id="info_status" statustext="@status_help"/>
 					</menulist>
-				<description value="Private"/>
+					<description value="Private" options=",,,info_access"/>
 					<checkbox options="private,public" id="info_access" statustext="should this entry only be visible to you and people you grant privat access via the ACL"/>
 				</row>
-			<row class="row">
+				<row class="row" disabled="!@info_owner">
 					<description value="Owner"/>
 					<menulist>
 						<menupopup type="select-account" id="info_owner" readonly="true"/>
 					</menulist>
 					<description value="Last modified"/>
-				<hbox options="0,0">
+					<hbox orient="0,0">
 						<menulist>
 							<menupopup type="select-account" id="info_modifier" readonly="true"/>
 						</menulist>
@@ -168,9 +181,10 @@
 					<button label="Delete" align="right" id="delete" statustext="delete this entry"/>
 				</row>
 			</rows>
+		</grid>
 		<styles>
 			.headertext { color: black; font-size: 120%; }
 .lpadding5 { padding-left: 5px; };
 		</styles>
-	</grid>
+	</template>
 </overlay>

infolog/templates/default/index.xet

@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
-	<grid id="infolog.index.rows-noheader" template="" lang="" group="0" version="0.9.15.003">
+	<template id="infolog.index.rows-noheader" template="" lang="" group="0" version="0.9.15.003">
+		<grid>
 			<columns>
 				<column width="5%"/>
 				<column/>
@@ -34,21 +35,21 @@
 					<description value="Action"/>
 				</row>
 				<row class="row" valign="top">
-				<hbox options="2,2" align="center">
+					<hbox align="center" orient="2,2">
 						<image label="$row_cont[info_type]" src="${row}[info_type]"/>
 						<button image="$row_cont[info_status]" ro_image="$row_cont[info_status]" label="$row_cont[info_status]" id="edit_status[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it"/>
 					</hbox>
-				<vbox options="0,0">
+					<vbox orient="0,0">
 						<description options="b,@${row}[info_link_view]" value="%s $row_cont[info_addr]" no_lang="1" id="${row}[info_link_title]" statustext="view this linked entry in its application"/>
 						<description class="$row_cont[sub_class]" no_lang="1" id="${row}[info_subject]"/>
 						<description options=",,1" no_lang="1" id="${row}[info_des]"/>
 						<link-string id="${row}[filelinks]"/>
 					</vbox>
-				<vbox options="0,0">
+					<vbox orient="0,0">
 						<date id="${row}[info_startdate]" readonly="true"/>
 						<date class="$row_cont[end_class]" id="${row}[info_enddate]" readonly="true"/>
 					</vbox>
-				<vbox options="0,0">
+					<vbox orient="0,0">
 						<menulist>
 							<menupopup type="select-account" id="${row}[info_owner]" readonly="true"/>
 						</menulist>
@@ -56,13 +57,13 @@
 							<menupopup type="select-account" id="${row}[info_responsible]" readonly="true"/>
 						</menulist>
 					</vbox>
-				<vbox options="0,0">
+					<vbox orient="0,0">
 						<date-time id="${row}[info_datemodified]" readonly="true"/>
 						<menulist>
 							<menupopup type="select-account" id="${row}[info_modifier]" readonly="true"/>
 						</menulist>
 					</vbox>
-				<vbox options="0,0" align="center">
+					<vbox align="center" orient="0,0">
 						<button image="new.gif" label="Add sub" align="center" id="sp[$row_cont[info_id]]" statustext="Add a new sub-task, -note, -call to this entry"/>
 						<button image="view.gif" label="View subs" align="center" id="view[$row_cont[info_id]]" statustext="View all subs of this entry"/>
 						<button image="parent.gif" label="View parent" align="center" id="view[$row_cont[info_id_parent]]" statustext="View the parent of this entry and all his subs"/>
@@ -74,6 +75,7 @@
 					</hbox>
 				</row>
 			</rows>
+		</grid>
 		<styles>
 			.low,.low_done,.normal,.normal_done,.high,.high_done,.urgent,.urgent_done { font-weight: bold; }
 .low,.low_done { color:#606060; }
@@ -86,55 +88,68 @@
 .private { font-style:italic; }
 
 		</styles>
-	</grid>
+	</template>
-	<grid id="infolog.index.rows" template="" lang="" group="0" version="0.9.15.008">
+	<template id="infolog.index.rows" template="" lang="" group="0" version="1.0.1.001">
+		<grid>
 			<columns>
 				<column width="2%"/>
 				<column/>
 				<column width="8%"/>
 				<column width="8%"/>
-			<column width="8%"/>
+				<column width="12%"/>
 				<column width="3%" disabled="@no_actions"/>
 				<column width="3%" disabled="@no_actions"/>
 			</columns>
 			<rows>
 				<row class="th">
-				<vbox options="0,0">
+					<vbox orient="0,0">
 						<nextmatch-filterheader options="Type ..." id="info_type"/>
 						<nextmatch-filterheader options="Status ..." id="info_status"/>
 					</vbox>
-				<vbox>
+					<grid width="100%" spacing="0" padding="0">
+						<columns>
+							<column/>
+							<column/>
+						</columns>
+						<rows>
+							<row>
 								<nextmatch-sortheader label="Subject" id="info_subject"/>
+								<nextmatch-sortheader label="Priority" align="right" id="info_priority"/>
+							</row>
+							<row>
 								<nextmatch-sortheader label="Description" id="info_des"/>
-				</vbox>
+								<description/>
+							</row>
+						</rows>
+					</grid>
 					<vbox>
 						<nextmatch-sortheader label="Startdate" id="info_startdate"/>
 						<nextmatch-sortheader label="Enddate" id="info_enddate"/>
 					</vbox>
 					<vbox>
-					<nextmatch-sortheader label="Owner" id="info_owner"/>
+						<nextmatch-accountfilter id="info_owner" options="Owner" statustext="Select to filter by owner"/>
-					<nextmatch-sortheader label="Responsible" id="info_responsible"/>
+						<nextmatch-accountfilter id="info_responsible" options="Responsible" statustext="Select to filter by responsible"/>
 					</vbox>
 					<nextmatch-sortheader label="last changed" id="info_datemodified"/>
 					<description value="Sub"/>
 					<description value="Action"/>
 				</row>
 				<row class="row" valign="top">
-				<hbox options=",5" align="center">
+					<hbox align="center" orient=",5">
 						<image label="$row_cont[info_type]" src="${row}[info_type]"/>
 						<button image="$row_cont[info_status]" ro_image="$row_cont[info_status]" label="$row_cont[info_status]" id="edit_status[$row_cont[info_id]]" statustext="Change the status of an entry, eg. close it"/>
 					</hbox>
-				<vbox options="0,0">
+					<vbox orient="0,0">
 						<description options="b,@${row}[info_link_view]" value="%s $row_cont[info_addr]" no_lang="1" id="${row}[info_link_title]" statustext="view this linked entry in its application"/>
 						<description class="$row_cont[sub_class]" no_lang="1" id="${row}[info_subject]"/>
 						<description options=",,1" no_lang="1" id="${row}[info_des]"/>
 						<link-string id="${row}[filelinks]"/>
 					</vbox>
-				<vbox options="0,0">
+					<vbox orient="0,0">
-					<date id="${row}[info_startdate]" readonly="true"/>
+						<date-time options=",8" id="${row}[info_startdate]" readonly="true"/>
 						<date class="$row_cont[end_class]" id="${row}[info_enddate]" readonly="true"/>
 					</vbox>
-				<vbox options="0,0">
+					<vbox orient="0,0">
 						<menulist>
 							<menupopup type="select-account" id="${row}[info_owner]" readonly="true"/>
 						</menulist>
@@ -142,13 +157,13 @@
 							<menupopup type="select-account" id="${row}[info_responsible]" readonly="true"/>
 						</menulist>
 					</vbox>
-				<vbox options="0,0">
+					<vbox orient="0,0">
 						<date-time id="${row}[info_datemodified]" readonly="true"/>
 						<menulist>
 							<menupopup type="select-account" id="${row}[info_modifier]" readonly="true"/>
 						</menulist>
 					</vbox>
-				<vbox options="0,0" align="center">
+					<vbox align="center" orient="0,0">
 						<button image="new.gif" label="Add sub" align="center" id="sp[$row_cont[info_id]]" statustext="Add a new sub-task, -note, -call to this entry"/>
 						<button image="view.gif" label="View subs" align="center" id="view[$row_cont[info_id]]" statustext="View all subs of this entry"/>
 						<button image="parent.gif" label="View parent" align="center" id="view[$row_cont[info_id_parent]]" statustext="View the parent of this entry and all his subs"/>
@@ -160,6 +175,7 @@
 					</hbox>
 				</row>
 			</rows>
+		</grid>
 		<styles>
 			.low,.low_done,.normal,.normal_done,.high,.high_done,.urgent,.urgent_done { font-weight: bold; }
 .low,.low_done { color:#606060; }
@@ -172,8 +188,9 @@
 .private { font-style:italic; }
 
 		</styles>
-	</grid>
+	</template>
-	<grid id="infolog.index" template="" lang="" group="" version="0.9.15.005" width="100%" border="0" spacing="0" padding="0">
+	<template id="infolog.index" template="" lang="" group="0" version="1.0.1.001">
+		<grid width="100%" border="0" spacing="0" padding="0">
 			<columns>
 				<column width="95%"/>
 				<column/>
@@ -190,7 +207,7 @@
 					</hbox>
 				</row>
 				<row disabled="!@main">
-				<grid content="main" span="all" id="infolog.index.rows-noheader"/>
+					<template content="main" span="all" id="infolog.index.rows-noheader"/>
 				</row>
 				<row>
 					<nextmatch options="infolog.index.rows" span="all" id="nm"/>
@@ -202,8 +219,9 @@
 					</hbox>
 				</row>
 			</rows>
+		</grid>
 		<styles>
 			.headertext { color: black; font-size: 120%; }
 		</styles>
-	</grid>
+	</template>
 </overlay>