- fixed not shown last modified column

- id, separate percen, last modified and times can now be enabled for the details view only
- you can now specify the filter for home

infolog/inc/class.uiinfolog.inc.php

@@ -120,7 +120,7 @@
 			$GLOBALS['uiinfolog'] =& $this;	// make ourself availible for ExecMethod of get_rows function
 		}
 
-		function get_info($info,&$readonlys,$action='',$action_id='',$show_links=false)
+		function get_info($info,&$readonlys,$action='',$action_id='',$show_links=false,$details = 1)
 		{
 			if (!is_array($info))
 			{
@@ -179,7 +179,7 @@
 			$info['info_type_label'] = $this->bo->enums['type'][$info['info_type']];
 			$info['info_status_label'] = $this->bo->status[$info['info_type']][$info['info_status']];
 			
-			if (!$this->prefs['show_percent'])
+			if (!$this->prefs['show_percent'] || $this->prefs['show_percent'] == 2 && !$details)
 			{
 				if ($info['info_status'] == 'ongoing' && $info['info_type'] != 'phone')
 				{
@@ -191,7 +191,7 @@
 			{
 				$info['info_percent2'] = $info['info_percent'];
 			}
-			if ($this->prefs['show_id'])
+			if ($this->prefs['show_id'] == 1 || $this->prefs['show_id'] == 2 && $details)
 			{
 				$info['info_number'] = $info['info_id'];
 			}
@@ -242,10 +242,11 @@
 			{
 				$ids = array( );
 			}
+			$details = $query['filter2'] == 'all';
 			$readonlys = $rows = array();
 			foreach($ids as $id => $info)
 			{
-				$info = $this->get_info($info,$readonlys,$query['action'],$query['action_id'],$query['filter2']);
+				$info = $this->get_info($info,$readonlys,$query['action'],$query['action_id'],$query['filter2'],$details);
 				if (!$query['filter2'] && $this->prefs['show_links'] == 'no_describtion' ||
 					$query['filter2'] == 'no_describtion')
 				{
@@ -254,8 +255,8 @@
 				$rows[] = $info;
 			}
 			if ($query['no_actions']) $rows['no_actions'] = true;
-			$rows['no_details'] = $query['filter2'] == 'no_describtion';
+			$rows['no_modified'] = !$this->prefs['show_modified'] || $this->prefs['show_modified'] == 2 && !$details;
-			$rows['no_times'] = !$this->prefs['show_times'];
+			$rows['no_times'] = !$this->prefs['show_times'] || $this->prefs['show_times'] == 2 && !$details;
 			$rows['no_timesheet'] = !isset($GLOBALS['egw_info']['user']['apps']['timesheet']);
 			$rows['duration_format'] = ','.$this->duration_format.',,1';
 			//echo "<p>readonlys = "; _debug_array($readonlys);

infolog/inc/hook_home.inc.php

@@ -10,7 +10,7 @@
 	\**************************************************************************/
 	/* $Id$ */
 
-	if (($showevents = (int) $GLOBALS['egw_info']['user']['preferences']['infolog']['homeShowEvents']) > 0)
+	if (($showevents = $GLOBALS['egw_info']['user']['preferences']['infolog']['homeShowEvents']))
 	{
 		$save_app = $GLOBALS['egw_info']['flags']['currentapp'];
 		$GLOBALS['egw_info']['flags']['currentapp'] = 'infolog';
@@ -23,15 +23,8 @@
 		$infolog =& CreateObject('infolog.uiinfolog');
 		$infolog->called_by = 'home';
 
-		/*switch($showevents)
+		if (in_array($showevents,array('1','2'))) $showevents = 'own-open-today';
-		{
+		$html = $infolog->index(array('nm' => array('filter' => $showevents)),'','',0,False,True);
-			case 1:*/
-				$html = $infolog->index(array('nm' => array('filter' => 'own-open-today')),'','',0,False,True);
-				/*break;
-			case 2:
-				$html = ExecMethod('calendar.uicalendar.get_todos', array('', false));
-				break;
-		}*/
 		$title = lang('InfoLog').' - '.lang($infolog->filters['own-open-today']);
 		unset($infolog);
 

infolog/inc/hook_settings.inc.php

@@ -13,18 +13,21 @@
 	/* $Id$ */
 
 	/* Setup some values to fill the array of this app's settings below */
-	$show_entries = array(
-		0 => lang('No'),
-		1 => lang('Yes'),
-		2 => lang('Yes').' - '.lang('show list of upcoming entries'),
-	);
-
 	$ui =& CreateObject('infolog.uiinfolog');	// need some labels from
+	$filters = $show_home = array();
+	$show_home[] = lang("DON'T show InfoLog");
 	foreach($ui->filters as $key => $label)
 	{
-		$filters[$key] = lang($label);
+		$show_home[$key] = $filters[$key] = lang($label);
 	}
 	unset($ui);
+
+	// migrage old filter-pref 1,2 to the filter one 'own-open-today'
+	if (in_array($GLOBALS['egw']->preferences->{$GLOBALS['type']}['homeShowEvents'],array('1','2')))
+	{
+		$GLOBALS['egw']->preferences->add('infolog','homeShowEvents','own-open-today',$GLOBALS['type']);
+		$GLOBALS['egw']->preferences->save_repository();
+	}
 	$show_links = array(
 		'all'    => lang('all links and attachments'),
 		'links'  => lang('only the links'),
@@ -32,27 +35,13 @@
 		'none'   => lang('no links or attachments'),
  		'no_describtion' => lang('no describtion, links or attachments'),
 	);
+	$show_details = array(
+		0 => lang('No'),
+		1 => lang('Yes'),
+		2 => lang('Only for details'),
+	);
 	/* Settings array for this app */
 	$GLOBALS['settings'] = array(
-		'homeShowEvents' => array(
-			'type'   => 'select',
-			'label'  => 'Show open entries: Tasks/Calls/Notes on main screen',
-			'name'   => 'homeShowEvents',
-			'values' => $show_entries,
-			'help'   => 'Should InfoLog display your open entries - not finished tasks, phonecalls or notes - on the main screen. Works only if you dont selected an application for the main screen (in your preferences).',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
-		'mainscreen_maxshow' => array(
-			'type'   => 'input',
-			'label'  => 'Max number of entries to display on the main screen',
-			'name'   => 'mainscreen_maxshow',
-			'size'    => 3,
-			'maxsize'    => 10,
-			'help'   => 'Only up to this number of entries are displayed on the main screen.',
-			'xmlrpc' => True,
-			'admin'  => False
-		),
 		'defaultFilter' => array(
 			'type'   => 'select',
 			'label'  => 'Default Filter for InfoLog',
@@ -62,6 +51,15 @@
 			'xmlrpc' => True,
 			'admin'  => False
 		),
+		'homeShowEvents' => array(
+			'type'   => 'select',
+			'label'  => 'InfoLog filter for the main screen',
+			'name'   => 'homeShowEvents',
+			'values' => $show_home,
+			'help'   => 'Should InfoLog show up on the main screen and with which filter. Works only if you dont selected an application for the main screen (in your preferences).',
+			'xmlrpc' => True,
+			'admin'  => False
+		),
 		'listNoSubs' => array(
 			'type'   => 'check',
 			'label'  => 'List no Subs/Childs',
@@ -88,29 +86,41 @@
 			'admin'  => False
 		),
 		'show_times' => array(
-			'type'   => 'check',
+			'type'   => 'select',
 			'label'  => 'Show times',
 			'name'   => 'show_times',
+			'values' => $show_details,
 			'help'   => 'Show a column for used and planned times in the list.',
 			'xmlrpc' => True,
 			'admin'  => False
 		),
 		'show_percent' => array(
-			'type'   => 'check',
+			'type'   => 'select',
 			'label'  => 'Show status and percent done separate',
 			'name'   => 'show_percent',
+			'values' => $show_details,
 			'help'   => 'Should the Infolog list show the percent done only for status ongoing or two separate icons.',
 			'xmlrpc' => True,
 			'admin'  => False
 		),
 		'show_id' => array(
-			'type'   => 'check',
+			'type'   => 'select',
 			'label'  => 'Show ticket Id',
 			'name'   => 'show_id',
+			'values' => $show_details,
 			'help'   => 'Should the Infolog list show a unique numerical Id, which can be used eg. as ticket Id.',
 			'xmlrpc' => True,
 			'admin'  => False
 		),
+		'show_modified' => array(
+			'type'   => 'select',
+			'label'  => 'Show last modified',
+			'name'   => 'show_modified',
+			'values' => $show_details,
+			'help'   => 'Should the Infolog list show the column "last modified".',
+			'xmlrpc' => True,
+			'admin'  => False
+		),
 		'set_start' => array(
 			'type'   => 'select',
 			'label'  => 'Startdate for new entries',
@@ -126,6 +136,7 @@
 		),
 	);
 
-	unset($show_entries);
+	unset($show_home);
+	unset($show_details);
 	unset($filters);
 	unset($show_links);

infolog/setup/phpgw_de.lang

@@ -92,6 +92,7 @@ description	infolog	de	Beschreibung
 determines the order the fields are displayed	infolog	de	legt die Reihenfolge fest in der die Felder angezeigt werden
 disables a status without deleting it	infolog	de	deaktiviert einen Status ohne ihn zu löschen
 do you want a confirmation of the responsible on: accepting, finishing the task or both	infolog	de	wollen Sie eine Bestätigung des Verantwortlichen bei: Annahme, Beendigung der Aufgabe oder bei beidem
+don't show infolog	infolog	de	InfoLog NICHT anzeigen
 done	infolog	de	erledigt
 download	infolog	de	Datei laden
 duration	infolog	de	Dauer
@@ -134,6 +135,7 @@ infolog - new subproject	infolog	de	InfoLog - Anlegen Teilprojekt
 infolog - subprojects from	infolog	de	InfoLog - Teilprojekte von
 infolog entry deleted	infolog	de	InfoLog Eintrag gelöscht
 infolog entry saved	infolog	de	InfoLog Eintrag gespeichert
+infolog filter for the main screen	infolog	de	InfoLog Filter für Startseite
 infolog list	infolog	de	InfoLog Liste
 infolog preferences	common	de	InfoLog Einstellungen
 infolog-fieldname	infolog	de	InfoLog-Feldname
@@ -154,7 +156,6 @@ location	infolog	de	Ort
 longer textual description	infolog	de	längere textliche Beschreibung
 low	infolog	de	niedrig
 max length of the input [, length of the inputfield (optional)]	infolog	de	max. Länge der Eingabe [, Länge des Eingabefeldes (optional)]
-max number of entries to display on the main screen	infolog	de	Wieviele Einträge sollen maximal auf der Startseite angezeigt werden
 name must not be empty !!!	infolog	de	Name darf nicht leer sein !!!
 name of new type to create	infolog	de	Name des neu anzulegenden Types
 never hide search and filters	infolog	de	Suche und Filter niemals ausblenden
@@ -176,9 +177,9 @@ number of records to read (%1)	infolog	de	Anzahl Datens
 number of row for a multiline inputfield or line of a multi-select-box	infolog	de	Anzahl Zeilen für ein mehrzeiliges Eingabefeld oder eines mehrfachen Auswahlfeldes
 offer	infolog	de	Angebot
 ongoing	infolog	de	in Arbeit
+only for details	infolog	de	Nur bei Details
 only the attachments	infolog	de	nur die Anhänge
 only the links	infolog	de	nur die Verknüpfungen
-only up to this number of entries are displayed on the main screen.	infolog	de	Nur bis zu dieser Anzahl Einträge wird auf der Startseite angezeigt.
 open	infolog	de	offen
 optional note to the link	infolog	de	zusätzliche Notiz zur Verknüfung
 order	infolog	de	Reihenfolge
@@ -233,18 +234,18 @@ select an entry to link with	infolog	de	einen Eintrag zum Verk
 select to filter by owner	infolog	de	Besiter zum Filtern auswählen
 select to filter by responsible	infolog	de	Verantwortlichen zum Filtern auswählen
 sets the status of this entry and its subs to done	infolog	de	Setzt den Status dieses Eintrags und seiner Untereinträge auf erledigt
-should infolog display your open entries - not finished tasks, phonecalls or notes - on the main screen. works only if you dont selected an application for the main screen (in your preferences).	infolog	de	Soll InfoLog die offenen Einträge - nicht beendete Aufgaben, Anrufe oder Notizen - auf der Startsteite anzeigen. Funktioniert nur, wenn Sie keine (einzelne) Anwendung für die Startseite ausgewählt haben (in Ihren Einstellungen).
 should infolog show subtasks, -calls or -notes in the normal view or not. you can always view the subs via there parent.	infolog	de	Soll InfoLog Untereinträge in der normalen Ansicht anzeigen oder nicht. Sie können die Untereinträge immer über deren Haupteintrag anzeigen.
 should infolog show the links to other applications and/or the file-attachments in the infolog list (normal view when you enter infolog).	infolog	de	Soll InfoLog die Verknüpfungen zu anderen Anwendungen und/oder die Datei-Anhänge in der InfoLog Liste (normale Ansicht wenn InfoLog aufgerufen wird) anzeigen.
+should infolog show up on the main screen and with which filter. works only if you dont selected an application for the main screen (in your preferences).	infolog	de	Soll InfoLog auf der Startseite angezeigt werden und mit welchem Filter. Funktioniert nur, wenn Sie keine (einzelne) Anwendung für die Startseite ausgewählt haben (in Ihren Einstellungen).
 should infolog use full names (surname and familyname) or just the loginnames.	infolog	de	Soll InfoLog den vollen Namen (Vor- und Familienname) oder nur die Benutzerkennung verwenden.
 should the infolog list show a unique numerical id, which can be used eg. as ticket id.	infolog	de	Soll die InfoLog Liste eine eindeutige Nummer anzeigen, die zB. als Ticketnummer verwendet werden kann.
+should the infolog list show the column "last modified".	infolog	de	Soll die InfoLog Liste die Spalte "Zuletzt geändert" anzeigen.
 should the infolog list show the percent done only for status ongoing or two separate icons.	infolog	de	Soll die InfoLog Liste Prozent erledigt nur für den Status "in Arbeit" anzeigen oder zwei separate Icons.
 should this entry only be visible to you and people you grant privat access via the acl	infolog	de	soll dieser Eintrag nur sichtbar sein für Sie und Personen denen Sie privaten Zugriff über die ACL erlaubt haben
 show a column for used and planned times in the list.	infolog	de	Zeige eine Spalte für benutzte und geplante Zeiten in der List.
 show full usernames	infolog	de	Kompletten Benutzernamen anzeigen
 show in the infolog list	infolog	de	In der InfoLog Liste anzeigen
-show list of upcoming entries	infolog	de	Liste zukünftiger Einträge anzeigen
+show last modified	infolog	de	Zuletzt geändert anzeigen
-show open entries: tasks/calls/notes on main screen	infolog	de	Nicht erledigte Einträge: Aufgaben/Anrufe/Notizen auf Startseite anzeigen
 show status and percent done separate	infolog	de	Status und Prozent erledigt separat anzeigen
 show ticket id	infolog	de	Ticketnummer anzeigen
 show times	infolog	de	Zeiten anzeigen

infolog/setup/phpgw_en.lang

@@ -92,6 +92,7 @@ description	infolog	en	Description
 determines the order the fields are displayed	infolog	en	determines the order the fields are displayed
 disables a status without deleting it	infolog	en	disables a status without deleting it
 do you want a confirmation of the responsible on: accepting, finishing the task or both	infolog	en	do you want a confirmation of the responsible on: accepting, finishing the task or both
+don't show infolog	infolog	en	DON'T show InfoLog
 done	infolog	en	done
 download	infolog	en	Download
 duration	infolog	en	Duration
@@ -134,6 +135,7 @@ infolog - new subproject	infolog	en	InfoLog - New Subproject
 infolog - subprojects from	infolog	en	InfoLog - Subprojects from
 infolog entry deleted	infolog	en	InfoLog entry deleted
 infolog entry saved	infolog	en	InfoLog entry saved
+infolog filter for the main screen	infolog	en	InfoLog filter for the main screen
 infolog list	infolog	en	InfoLog list
 infolog preferences	common	en	InfoLog preferences
 infolog-fieldname	infolog	en	Info Log-Fieldname
@@ -154,7 +156,6 @@ location	infolog	en	Location
 longer textual description	infolog	en	longer textual description
 low	infolog	en	low
 max length of the input [, length of the inputfield (optional)]	infolog	en	max length of the input [, length of the inputfield (optional)]
-max number of entries to display on the main screen	infolog	en	Max number of entries to display on the main screen
 name must not be empty !!!	infolog	en	Name must not be empty !!!
 name of new type to create	infolog	en	name of new type to create
 never hide search and filters	infolog	en	Never hide search and filters
@@ -176,9 +177,9 @@ number of records to read (%1)	infolog	en	Number of records to read (%1)
 number of row for a multiline inputfield or line of a multi-select-box	infolog	en	number of row for a multiline inputfield or line of a multi-select-box
 offer	infolog	en	offer
 ongoing	infolog	en	ongoing
+only for details	infolog	en	Only for details
 only the attachments	infolog	en	only the attachments
 only the links	infolog	en	only the links
-only up to this number of entries are displayed on the main screen.	infolog	en	Only up to this number of entries are displayed on the main screen.
 open	infolog	en	open
 optional note to the link	infolog	en	optional note to the Link
 order	infolog	en	Order
@@ -233,18 +234,18 @@ select an entry to link with	infolog	en	Select an entry to link with
 select to filter by owner	infolog	en	select to filter by owner
 select to filter by responsible	infolog	en	select to filter by responsible
 sets the status of this entry and its subs to done	infolog	en	Sets the status of this entry and its subs to done
-should infolog display your open entries - not finished tasks, phonecalls or notes - on the main screen. works only if you dont selected an application for the main screen (in your preferences).	infolog	en	Should InfoLog display your open entries - not finised tasks, phonecalls or notes - on the main screen. Works only if you dont selected an application for the main screen (in your preferences).
 should infolog show subtasks, -calls or -notes in the normal view or not. you can always view the subs via there parent.	infolog	en	Should InfoLog show Subtasks, -calls or -notes in the normal view or not. You can always view the subs via their parent.
 should infolog show the links to other applications and/or the file-attachments in the infolog list (normal view when you enter infolog).	infolog	en	Should InfoLog show the links to other applications and/or the file-attachments in the InfoLog list (normal view when you enter InfoLog).
+should infolog show up on the main screen and with which filter. works only if you dont selected an application for the main screen (in your preferences).	infolog	en	Should InfoLog show up on the main screen and with which filter. Works only if you dont selected an application for the main screen (in your preferences).
 should infolog use full names (surname and familyname) or just the loginnames.	infolog	en	Should InfoLog use full names (surname and familyname) or just the loginnames.
 should the infolog list show a unique numerical id, which can be used eg. as ticket id.	infolog	en	Should the Infolog list show a unique numerical Id, which can be used eg. as ticket Id.
+should the infolog list show the column "last modified".	infolog	en	Should the Infolog list show the column "last modified".
 should the infolog list show the percent done only for status ongoing or two separate icons.	infolog	en	Should the Infolog list show the percent done only for status ongoing or two separate icons.
 should this entry only be visible to you and people you grant privat access via the acl	infolog	en	should this entry only be visible to you and people you grant privat access via the ACL
 show a column for used and planned times in the list.	infolog	en	Show a column for used and planned times in the list.
 show full usernames	infolog	en	Show full usernames
 show in the infolog list	infolog	en	Show in the InfoLog list
-show list of upcoming entries	infolog	en	show list of upcoming entries
+show last modified	infolog	en	Show last modified
-show open entries: tasks/calls/notes on main screen	infolog	en	Show open entries: Tasks/Calls/Notes on main screen
 show status and percent done separate	infolog	en	Show status and percent done separate
 show ticket id	infolog	en	Show ticket Id
 show times	infolog	en	Show times

infolog/templates/default/customfields.xet

@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
-	<grid id="infolog.customfields.status" template="" lang="" group="0" version="0.9.15.001">
+	<template id="infolog.customfields.status" template="" lang="" group="0" version="1.2.001">
+		<grid>
 			<columns>
 				<column/>
 				<column/>
@@ -20,7 +21,7 @@
 					<description value="Action" align="center"/>
 				</row>
 				<row class="row">
-				<textbox size="10" maxlength="10" id="${row}[name]" statustext="the name used internaly (&lt;= 10 chars), changeing it makes existing data unavailible"/>
+					<textbox size="10" maxlength="40" id="${row}[name]" statustext="the name used internaly (&lt;= 10 chars), changeing it makes existing data unavailible"/>
 					<textbox size="40" id="${row}[label]" statustext="the text displayed to the user"/>
 					<description id="${row}[label]"/>
 					<radio options="$row_cont[name]" align="center" id="default" statustext="default status for a new log entry"/>
@@ -32,7 +33,9 @@
 				</row>
 			</rows>
 		</grid>
-	<grid id="infolog.customfields.fields" template="" lang="" group="0" version="0.9.15.001">
+	</template>
+	<template id="infolog.customfields.fields" template="" lang="" group="0" version="1.2.001">
+		<grid>
 			<columns>
 				<column/>
 				<column/>
@@ -74,7 +77,9 @@
 				</row>
 			</rows>
 		</grid>
-	<grid id="infolog.customfields" template="" lang="" group="" version="0.9.15.001">
+	</template>
+	<template id="infolog.customfields" template="" lang="" group="0" version="1.2.001">
+		<grid>
 			<columns>
 				<column/>
 				<column/>
@@ -90,7 +95,7 @@
 						<menupopup id="typ" onchange="1" statustext="select a typ to edit it's status-values or delete it"/>
 					</menulist>
 					<button label="Delete" id="button[delete]" statustext="deletes the selected typ"/>
-				<textbox size="10" maxlength="10" id="new_name" statustext="name of new type to create" blur="new name"/>
+					<textbox size="10" maxlength="40" id="new_name" statustext="name of new type to create" blur="new name"/>
 					<button label="Create" id="button[create]" statustext="creates a new typ with the given name"/>
 					<description class="error_msg" no_lang="1" align="center" id="error_msg"/>
 				</row>
@@ -98,13 +103,13 @@
 					<description span="all" value="Custom status for typ" id="typ"/>
 				</row>
 				<row>
-				<grid content="status" span="all" id="infolog.customfields.status"/>
+					<template content="status" span="all" id="infolog.customfields.status"/>
 				</row>
 				<row class="header">
 					<description span="all" value="Custom fields"/>
 				</row>
 				<row>
-				<grid content="fields" span="all" id="infolog.customfields.fields"/>
+					<template content="fields" span="all" id="infolog.customfields.fields"/>
 				</row>
 				<row>
 					<hbox span="all">
@@ -114,9 +119,10 @@
 					</hbox>
 				</row>
 			</rows>
+		</grid>
 		<styles>
 			.header { font-weight: bold; font-size: 120%; }
 .error_msg { color: red; font-style: italics; }
 		</styles>
-	</grid>
+	</template>
 </overlay>

infolog/templates/default/index.xet

@@ -21,7 +21,7 @@
 				<column width="120"/>
 				<column disabled="@no_times"/>
 				<column width="8%"/>
-				<column width="12%" disabled="1"/>
+				<column width="12%" disabled="@no_modified"/>
 				<column width="3%" disabled="@no_actions"/>
 				<column width="3%" disabled="@no_actions"/>
 			</columns>
@@ -114,7 +114,7 @@
 				<column width="120"/>
 				<column disabled="@no_times"/>
 				<column width="8%"/>
-				<column width="12%" disabled="1"/>
+				<column width="12%" disabled="@no_modified"/>
 				<column width="3%" disabled="@no_actions"/>
 				<column width="3%" disabled="@no_actions"/>
 			</columns>