changing template to make a infolog as a subinfolog

infolog/setup/egw_de.lang

@@ -41,8 +41,10 @@ add:	infolog	de	Hinzufügen:
 all	infolog	de	alle
 all links and attachments	infolog	de	alle Verknüpfungen und Anhänge
 allows to set the status of an entry, eg. set a todo to done if it's finished (values depend on entry-typ)	infolog	de	erlaubt den Status eines Eintrags zu setzen, zB. eine Aufgabe auf erledigt wenn sie beendet ist (Werte hängen vom Type des Eintrags ab)
+alternatives	infolog	de	Alternativen
 apply the changes	infolog	de	Übernimmt die Änderungen
 archive	infolog	de	Archiviert
+are you shure you want to close this entry ?	infolog	de	Wollen Sie wirklich den Infolog schliessen?
 are you shure you want to delete this entry ?	infolog	de	Sind Sie sicher, dass Sie diesen Eintrag löschen wollen?
 attach a file	infolog	de	Datei anhängen
 attach file	infolog	de	Datei anhängen
@@ -64,6 +66,8 @@ check to specify custom contact	infolog	de	Ankreutzen um einen eigenen Kontakt a
 click here to create the link	infolog	de	hier klicken um die Verknüpfung zu erzeugen
 click here to start the search	infolog	de	hier klicken um die Suche zu starten
 close	infolog	de	Schließen
+close all	infolog	de	Alle schließen
+close this entry and all listed sub-entries	infolog	de	Diesen Eintrag und alle Untereintraäge schliessen
 comment	infolog	de	Kommentar
 completed	infolog	de	Erledigt
 configuration	infolog	de	Konfiguration
@@ -124,6 +128,7 @@ don't show infolog	infolog	de	InfoLog NICHT anzeigen
 done	infolog	de	erledigt
 download	infolog	de	Datei laden
 duration	infolog	de	Dauer
+e-mail:	infolog	de	E-Mail
 each value is a line like <id>[=<label>]	infolog	de	jeder Wert ist eine Zeile im Format id=[angezeigter Wert]
 edit	infolog	de	Bearbeiten
 edit or create categories for ingolog	infolog	de	Kategorien für InfoLog bearbeiten oder neu anlegen
@@ -235,6 +240,7 @@ own open	infolog	de	eigene offen
 own overdue	infolog	de	eigene überfällig
 own upcoming	infolog	de	eigene zukünftig
 parent	infolog	de	Elterneintrag
+parent infolog	infolog	de	Übergeordneter Infolog
 path on (web-)serverside<br>eg. /var/samba/share	infolog	de	Pfad auf (Web-)Server<br>zB. /var/samba/Share
 path to user and group files has to be outside of the webservers document-root!!!	infolog	de	Pfad zu Benutzer- und Gruppen-Dateien MUSS AUSSERHALB des Wurzelverzeichnisses des Webservers (document-root) liegen!!!
 pattern for search in addressbook	infolog	de	Muster für Suche im Adressbuch
@@ -253,6 +259,7 @@ priority	infolog	de	Priorität
 private	infolog	de	Privat
 project	infolog	de	Projekt
 project settings: price, times	infolog	de	Einstellungen zum Projekt: Preis, Zeiten
+projectmanager	infolog	de	Projektmanager
 re-planned	infolog	de	Umgeplant
 re-planned time	infolog	de	Umgeplante Zeit
 re:	infolog	de	Re:
@@ -363,6 +370,8 @@ which implicit acl rights should the responsible get?	infolog	de	Welche implizit
 which types should the calendar show	infolog	de	Welche Typen soll der Kalender anzeigen
 will-call	infolog	de	ruft zurück
 write (add or update) a record by passing its fields.	infolog	de	Schreiben (zufügen oder aktualisieren) eines Datensatzes durch Angabe seiner Felder.
+yes - close	infolog	de	Ja schließen
+yes - close including sub-entries	infolog	de	Ja- schließen inclusive Untereinträge
 yes - delete	infolog	de	Ja - Löschen
 yes - delete including sub-entries	infolog	de	Ja - Löschen einschließlich Untereinträge
 yes, noone can purge deleted items	infolog	de	Ja, niemand darf gelöschte Einträge bereinigen

infolog/setup/egw_en.lang

@@ -41,8 +41,10 @@ add:	infolog	en	Add:
 all	infolog	en	All
 all links and attachments	infolog	en	all links and attachments
 allows to set the status of an entry, eg. set a todo to done if it's finished (values depend on entry-typ)	infolog	en	allows to set the status of an entry, eg. set a ToDo to done if it's finished (values depend on entry-type)
+alternatives	infolog	en	Alternatives
 apply the changes	infolog	en	Apply the changes
 archive	infolog	en	archive
+are you shure you want to close this entry ?	infolog	en	Are you shure you want to close this entry ?
 are you shure you want to delete this entry ?	infolog	en	Are you sure you want to delete this entry ?
 attach a file	infolog	en	Attach a file
 attach file	infolog	en	Attach file
@@ -64,6 +66,8 @@ check to specify custom contact	infolog	en	Check to specify custom contact
 click here to create the link	infolog	en	click here to create the Link
 click here to start the search	infolog	en	click here to start the search
 close	infolog	en	Close
+close all	infolog	en	Close all
+close this entry and all listed sub-entries	infolog	en	Close this entry and all listed sub-entries
 comment	infolog	en	Comment
 completed	infolog	en	Completed
 configuration	infolog	en	Configuration
@@ -124,6 +128,7 @@ don't show infolog	infolog	en	DON'T show InfoLog
 done	infolog	en	done
 download	infolog	en	Download
 duration	infolog	en	Duration
+e-mail:	infolog	en	E-mail:
 each value is a line like <id>[=<label>]	infolog	en	each value is a line like <id>[=<label>]
 edit	infolog	en	Edit
 edit or create categories for ingolog	infolog	en	Edit or create categories for IngoLog
@@ -235,6 +240,7 @@ own open	infolog	en	own open
 own overdue	infolog	en	own overdue
 own upcoming	infolog	en	own upcoming
 parent	infolog	en	Parent
+parent infolog	infolog	en	Parent Infolog
 path on (web-)serverside<br>eg. /var/samba/share	infolog	en	path on (web-)serverside<br>eg. /var/samba/Share
 path to user and group files has to be outside of the webservers document-root!!!	infolog	en	Path to user and group files HAS TO BE OUTSIDE of the webservers document-root!!!
 pattern for search in addressbook	infolog	en	pattern for search in Addressbook
@@ -253,6 +259,7 @@ priority	infolog	en	Priority
 private	infolog	en	Private
 project	infolog	en	Project
 project settings: price, times	infolog	en	Project settings: price, times
+projectmanager	infolog	en	Projectmanager
 re-planned	infolog	en	Re-planned
 re-planned time	infolog	en	Re-planned time
 re:	infolog	en	Re:
@@ -360,6 +367,8 @@ which implicit acl rights should the responsible get?	infolog	en	Which implicit
 which types should the calendar show	infolog	en	Which types should the calendar show
 will-call	infolog	en	will call
 write (add or update) a record by passing its fields.	infolog	en	Write (add or update) a record by passing its fields.
+yes - close	infolog	en	Yes - Close
+yes - close including sub-entries	infolog	en	Yes - Close including sub-entries
 yes - delete	infolog	en	Yes - Delete
 yes - delete including sub-entries	infolog	en	Yes - Delete including sub-entries
 yes, noone can purge deleted items	infolog	en	Yes, noone can purge deleted items

infolog/templates/default/edit.xet

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
-	<template id="infolog.edit.description" template="" lang="" group="0" version="1.0.1.002">
+	<template id="infolog.edit.description" template="" lang="" group="0" version="1.6.001">
 		<grid width="100%" height="245" border="0">
 			<columns>
 				<column width="100"/>
@@ -54,24 +54,24 @@
 					<description span="all" value="General"/>
 				</row>
 				<row class="row">
-					<description value="Priority" options=",,,info_priority"/>
+					<description options=",,,info_priority" value="Priority"/>
 					<menulist>
 						<menupopup id="info_priority" statustext="select a priority for this task"/>
 					</menulist>
 				</row>
 				<row class="row">
 					<description options=",,,info_location" value="Location"/>
-					<textbox id="info_location" size="80" maxlength="255"/>
+					<textbox size="80" maxlength="255" id="info_location"/>
 				</row>
 				<row class="th">
 					<description span="all" value="Delegation"/>
 				</row>
 				<row class="row" valign="top">
-					<description value="Responsible" options=",,,info_responsible"/>
+					<description options=",,,info_responsible" value="Responsible"/>
-					<listbox type="select-account" rows="10" options="both" id="info_responsible" statustext="select a responsible user: a person you want to delegate this task"/>
+					<listbox type="select-account" id="info_responsible" rows="10" options="both" statustext="select a responsible user: a person you want to delegate this task"/>
 				</row>
 				<row class="row" disabled="1">
-					<description value="Confirm" options=",,,info_confirm"/>
+					<description options=",,,info_confirm" value="Confirm"/>
 					<menulist>
 						<menupopup id="info_confirm" statustext="do you want a confirmation of the responsible on: accepting, finishing the task or both"/>
 					</menulist>
@@ -79,7 +79,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="infolog.edit.project" template="" lang="" group="0" version="1.2.001">
+	<template id="infolog.edit.project" template="" lang="" group="0" version="1.5.004">
 		<grid width="100%" height="245">
 			<columns>
 				<column width="100"/>
@@ -104,8 +104,12 @@
 					<description options=",,,info_planned_time" value="planned time"/>
 					<date-duration id="info_planned_time" options=",$cont[duration_format]"/>
 				</row>
+				<row class="row">
+					<description options=",,,info_replanned_time" value="Re-planned time"/>
+					<date-duration id="info_replanned_time" options=",$cont[duration_format]"/>
+				</row>
 				<row class="row" valign="top" height="60%">
-					<description options=",,,info_used_time" value="used time"/>
+					<description options=",,,info_used_time" value="used time" statustext="Leave blank to get the used time calculated by timesheet entries"/>
 					<date-duration id="info_used_time"/>
 				</row>
 			</rows>
@@ -138,7 +142,7 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="infolog.edit" template="" lang="" group="0" version="1.5.001">
+	<template id="infolog.edit" template="" lang="" group="0" version="1.7.001">
 		<grid width="100%">
 			<columns>
 				<column width="103"/>
@@ -164,9 +168,10 @@
 				</row>
 				<row class="row">
 					<description value="Category" options=",,,info_cat"/>
-					<menulist span="all">
+					<menulist>
 						<menupopup type="select-cat" options="None" id="info_cat" statustext="select a category for this entry"/>
 					</menulist>
+					<link-entry options="infolog" span="all" label="Parent Infolog" id="info_id_parent"/>
 				</row>
 				<row class="row">
 					<description value="Contact" options=",,,info_from"/>
@@ -185,7 +190,7 @@
 					<textbox size="80" maxlength="255" span="all" id="info_subject" statustext="a short subject for the entry"/>
 				</row>
 				<row valign="top" height="250">
-					<tabbox span="all">
+					<tabbox span="all" id="description|links|delegation|project|customfields|history">
 						<tabs>
 							<tab label="Description" statustext="longer textual description"/>
 							<tab label="Links" statustext="Links of this entry"/>