finished infolog.edit port

infolog/inc/class.uiinfolog.inc.php

@@ -360,7 +360,10 @@
 			$GLOBALS['phpgw']->template->set_root($GLOBALS['phpgw']->common->get_tpl_dir('infolog'));	// necessary for hooks
 
 			$GLOBALS['phpgw']->template->set_file(array( 'info_list_t' => 'list.tpl' ));
-			$GLOBALS['phpgw']->template->set_block('info_list_t','projdetails','projdetailshandle');
+			if ($action == 'sp')
+			{
+				$GLOBALS['phpgw']->template->set_block('info_list_t','projdetails','projdetailshandle');
+			}
 			$GLOBALS['phpgw']->template->set_block('info_list_t','info_headers');
 			$GLOBALS['phpgw']->template->set_block('info_list_t','info_list','list');
 			$GLOBALS['phpgw']->template->set_block('info_list_t','get_list');
@@ -697,6 +700,16 @@
 			$this->get_list();
 		}
 
+		/*!
+		@function edit
+		@syntax edit( $content=0,$action='',$action_id=0,$type='' )
+		@author ralfbecker
+		@abstract Edit/Create an InfoLog Entry
+		@param $content   Content from the eTemplate Exec call or info_id on inital call
+		@param $action    Name of an app of 'sp' for a infolog-sub
+		@param $action_id Id of app-entry to which a link is created
+		@param $type      Type of log-entry: note,todo,task
+		*/
 		function edit($content = 0,$action = '',$action_id=0,$type='')
 		{
 			if (is_array($content))
@@ -759,6 +772,7 @@
 					$content['info_confirm'] = 'not';
 					$content['info_subject']=lang('Re:').' '.$parent['info_subject'];
 					$content['info_des'] = '';
+					$content['info_lastmodified'] = '';
 				}
 				else
 				{
@@ -800,7 +814,7 @@
 			$this->tmpl->read('infolog.edit');
 			$this->tmpl->exec('infolog.uiinfolog.edit',$content,array(
 				'info_type'     => $this->bo->enums['type'],
-				'info_priority' => $this->bo->enums['priority'],
+				'info_pri'      => $this->bo->enums['priority'],
 				'info_confirm'  => $this->bo->enums['confirm'],
 				'info_status'   => $this->bo->status[$content['info_type']]
 			),$readonlys,array(

infolog/templates/default/edit.xet

@@ -23,23 +23,15 @@
 		</columns>
 		<rows>
 			<row class="th">
-				<description span="all" value="Custom regarding"/>
+				<description span="all" value="Create new links"/>
-			</row>
-			<row class="row">
-				<description value="Contact"/>
-				<textbox size="64" maxlength="64" id="info_from" statustext="enter a custom contact, leave empty if linked entry should be used"/>
-			</row>
-			<row class="row">
-				<description value="Phone/Email"/>
-				<textbox size="64" maxlength="64" id="info_addr" statustext="enter a custom phone/email, leave empty if linked entry should be used"/>
-			</row>
-			<row class="th">
-				<description span="all" value="Links"/>
 			</row>
 			<row class="row">
 				<link-to span="all" id="link_to"/>
 			</row>
-			<row class="row_off" valign="top" height="112">
+			<row class="th">
+				<description span="all" value="Existing links"/>
+			</row>
+			<row class="row_off" valign="top" height="164">
 				<link-list span="all" id="link_to"/>
 			</row>
 		</rows>
@@ -56,7 +48,7 @@
 			<row class="row">
 				<description value="Priority"/>
 				<menulist>
-					<menupopup id="info_priority" statustext="select a priority for this task"/>
+					<menupopup id="info_pri" statustext="select a priority for this task"/>
 				</menulist>
 			</row>
 			<row class="th">
@@ -65,11 +57,11 @@
 			<row class="row">
 				<description value="Responsible"/>
 				<menulist>
-					<menupopup type="select-account" options="Self" id="info_responsible" statustext="select a responsible user: a person you want to delegate this task"/>
+					<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">
-				<description value="Confirmation"/>
+				<description value="Confirm"/>
 				<menulist>
 					<menupopup id="info_confirm" statustext="do you want a confirmation of the responsible on: accepting, finishing the task or both"/>
 				</menulist>
@@ -111,8 +103,10 @@
 				<description/>
 			</row>
 			<row class="row">
-				<description value="Regarding"/>
+				<description value="Contact"/>
-				<description span="all"/>
+				<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"/>
+				<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"/>