1. index show icons for edit, view and (new) delete entries, owner is only showed in view or edit not longer in the index (same for vcard)

2. view is a bit compacter too as owner, access and cats are shown within the table and not as extra footer

addressbook/csv_import.php

@@ -436,7 +436,7 @@
 				if(!$_POST['debug'] && !$empty)	// dont import empty contacts
 				{
 					$GLOBALS['phpgw']->contacts->add( $values['owner'] ? $values['owner'] : $GLOBALS['phpgw_info']['user']['account_id'],
-						$values,$values['access'],$values['cat_id']);
+						$values);
 					// echo "<p>adding: ".print_r($values)."</p>\n";
 				}
 			}

addressbook/inc/class.uiaddressbook.inc.php

@@ -417,10 +417,7 @@
 
 			/* set basic vars and parse the header */
 			$GLOBALS['phpgw']->template->set_var('font',$GLOBALS['phpgw_info']['theme']['font']);
-			$GLOBALS['phpgw']->template->set_var('lang_view',lang('View'));
+			$GLOBALS['phpgw']->template->set_var('lang_actions',lang('Actions'));
-			$GLOBALS['phpgw']->template->set_var('lang_vcard',lang('VCard'));
-			$GLOBALS['phpgw']->template->set_var('lang_edit',lang('Edit'));
-			$GLOBALS['phpgw']->template->set_var('lang_owner',lang('Owner'));
 
 			$GLOBALS['phpgw']->template->set_var('searchreturn',$noprefs . ' ' . $searchreturn);
 			$GLOBALS['phpgw']->template->set_var('lang_showing',$lang_showing);
@@ -500,31 +497,36 @@
 					$GLOBALS['phpgw']->template->parse('columns','column',True);
 				}
 
-				if (1)
+				$actions = '<a href="'.
-				{
+					$GLOBALS['phpgw']->link('/index.php',array(
-					$GLOBALS['phpgw']->template->set_var('row_view_link',$GLOBALS['phpgw']->link('/index.php',
+						'menuaction' => 'addressbook.uiaddressbook.view',
-					'menuaction=addressbook.uiaddressbook.view&ab_id='.$entries[$i]['id']));
+						'ab_id'      => $entries[$i]['id']
-				}
+					)).'"><img src="'.
-				else
+					$GLOBALS['phpgw']->common->image('addressbook','view').
-				{
+					'" border="0" title="'.lang('View').'"></a> ';
-					$GLOBALS['phpgw']->template->set_var('row_view_link','');
-					$GLOBALS['phpgw']->template->set_var('lang_view',lang('Private'));
-				}
 
-				$GLOBALS['phpgw']->template->set_var('row_vcard_link',$GLOBALS['phpgw']->link('/index.php',
-				'menuaction=addressbook.uivcard.out&ab_id='.$entries[$i]['id']));
-				/* echo '<br>: ' . $contacts->grants[$myowner] . ' - ' . $myowner; */
 				if ($this->bo->check_perms($entries[$i],PHPGW_ACL_EDIT))
 				{
-					$GLOBALS['phpgw']->template->set_var('row_edit','<a href="' . $GLOBALS['phpgw']->link('/index.php',
+					$actions .= '<a href="' .
-					'menuaction=addressbook.uiaddressbook.edit&ab_id='.$entries[$i]['id']) . '">' . lang('Edit') . '</a>');
+						$GLOBALS['phpgw']->link('/index.php',array(
-				}
+							'menuaction' => 'addressbook.uiaddressbook.edit',
-				else
+							'ab_id'      => $entries[$i]['id']
-				{
+						)).'"><img src="'.
-					$GLOBALS['phpgw']->template->set_var('row_edit','&nbsp;');
+						$GLOBALS['phpgw']->common->image('addressbook','edit').
+						'" border="0" title="'.lang('Edit').'"></a> ';
 				}
 
-				$GLOBALS['phpgw']->template->set_var('row_owner',$GLOBALS['phpgw']->accounts->id2name($myowner));
+				if ($this->bo->check_perms($entries[$i],PHPGW_ACL_DELETE))
+				{
+					$actions .= '<a href="' .
+						$GLOBALS['phpgw']->link('/index.php',array(
+							'menuaction' => 'addressbook.uiaddressbook.delete',
+							'ab_id'      => $entries[$i]['id']
+						)).'"><img src="'.
+						$GLOBALS['phpgw']->common->image('addressbook','delete').
+						'" border="0" title="'.lang('Delete').'"></a>';
+				}
+				$GLOBALS['phpgw']->template->set_var('actions',$actions);
 
 				$GLOBALS['phpgw']->template->parse('rows','row',True);
 				$GLOBALS['phpgw']->template->pparse('out','row');
@@ -907,7 +909,7 @@
 				}
 			}
 			/* Following cleans up view_row, since we were only using it to fill {cols} */
-			$GLOBALS['phpgw']->template->set_var('view_row','');
+			//$GLOBALS['phpgw']->template->set_var('view_row','');
 
 			$fields['cat_id'] = is_array($this->cat_id) ? implode(',',$this->cat_id) : $this->cat_id;
 
@@ -937,16 +939,32 @@
 					$this->cat_id = $fields[0]['cat_id'];
 				}
 			}
+			$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
+			$GLOBALS['phpgw']->template->set_var(array(
+				'ref_data' => $GLOBALS['phpgw']->common->grab_owner_name($record_owner),
+				'display_col' => lang('Record owner'),
+				'th_bg' => $tr_color
+			));
+			$GLOBALS['phpgw']->template->parse('cols','view_row',True);
 
-			if (!$catname) { $catname = lang('none'); }
+			$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
+			$GLOBALS['phpgw']->template->set_var(array(
+				'ref_data' => $access_check,
+				'display_col' => lang('Record access'),
+				'th_bg' => $tr_color
+			));
+			$GLOBALS['phpgw']->template->parse('cols','view_row',True);
 
-			/* These are in the footer */
+			if ($catname)
-			$GLOBALS['phpgw']->template->set_var('lang_owner',lang('Record owner'));
+			{
-			$GLOBALS['phpgw']->template->set_var('owner',$GLOBALS['phpgw']->common->grab_owner_name($record_owner));
+				$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
-			$GLOBALS['phpgw']->template->set_var('lang_access',lang('Record access'));
+				$GLOBALS['phpgw']->template->set_var(array(
-			$GLOBALS['phpgw']->template->set_var('access',$access_check);
+					'ref_data' => $catname,
-			$GLOBALS['phpgw']->template->set_var('lang_category',lang('Category'));
+					'display_col' => lang('Category'),
-			$GLOBALS['phpgw']->template->set_var('catname',$catname);
+					'th_bg' => $tr_color
+				));
+				$GLOBALS['phpgw']->template->parse('cols','view_row',True);
+			}
 
 			if (($this->bo->grants[$record_owner] & PHPGW_ACL_EDIT) || ($record_owner == $GLOBALS['phpgw_info']['user']['account_id']))
 			{

addressbook/setup/phpgw_de.lang

@@ -1,7 +1,9 @@
 %1 records imported	addressbook	de	%1 Datensätze importiert
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	de	%1 Datensätze gelesen (noch nicht importiert, sie können %2zurück%3 gehen und Test-Import auschalten)
+(e.g. 1969)	addressbook	de	(zB. 1966)
 <b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	de	<b>Kein Übersetzungstyp &lt;none&gt; konnte gefunden werden.</b> Bitte wählen Sie einen Übersetzungstype aus der Liste
 @-eval() is only availible to admins!!!	addressbook	de	@-eval() ist nur verfügbar für Administratoren!!!
+actions	addressbook	de	Befehle
 add a single entry by passing the fields.	addressbook	de	Hinzufügen eines einzelnen Eintrags durch Übergeben der Felder.
 add custom field	addressbook	de	Benutzerdefiniertes Feld hinzufügen
 address book	common	de	Adressbuch
@@ -37,6 +39,7 @@ charset of file	addressbook	de	Zeichensatz der Datei
 city	common	de	Stadt
 company	common	de	Firma
 company name	common	de	Firmenname
+configuration	common	de	Konfiguration
 contact	common	de	Kontakt
 contact application	admin	de	Kontakt Anwendung
 contact settings	admin	de	Kontakt Einstellungen

addressbook/setup/phpgw_en.lang

@@ -1,7 +1,9 @@
 %1 records imported	addressbook	en	%1 records imported
 %1 records read (not yet imported, you may go %2back%3 and uncheck test import)	addressbook	en	%1 records read (not yet imported, you may go %2back%3 and uncheck Test Import)
+(e.g. 1969)	addressbook	en	(e.g. 1969)
 <b>no conversion type &lt;none&gt; could be located.</b>  please choose a conversion type from the list	addressbook	en	<b>No conversion type &lt;none&gt; could be located.</b>  Please choose a conversion type from the list
 @-eval() is only availible to admins!!!	addressbook	en	@-eval() is only availible to admins!!!
+actions	addressbook	en	Actions
 add a single entry by passing the fields.	addressbook	en	Add a single entry by passing the fields.
 add custom field	addressbook	en	Add Custom Field
 address book	common	en	Address Book
@@ -37,6 +39,7 @@ charset of file	addressbook	en	Charset of file
 city	common	en	City
 company	common	en	Company
 company name	common	en	Company Name
+configuration	common	en	Configuration
 contact	common	en	Contact
 contact application	admin	en	Contact application
 contact settings	admin	en	Contact Settings

addressbook/templates/default/index.tpl

@@ -5,10 +5,7 @@
 {search_filter}
 <table width="95%" border="0" cellspacing="1" cellpadding="3">
 <tr bgcolor="{th_bg}">{cols}
-  <td width="3%" height="21"><font face="Arial, Helvetica, sans-serif" size="-1">{lang_view}</font></td>
+  <td width="5%" height="21"><font face="Arial, Helvetica, sans-serif" size="-1">{lang_actions}</font></td>
-  <td width="3%" height="21"><font face="Arial, Helvetica, sans-serif" size="-1">{lang_vcard}</font></td>
-  <td width="5%" height="21"><font face="Arial, Helvetica, sans-serif" size="-1">{lang_edit}</font></td>
-  <td width="5%" height="21"><font face="Arial, Helvetica, sans-serif" size="-1">{lang_owner}</font></td>
 </tr>
 <!-- END addressbook_header -->
 
@@ -18,10 +15,7 @@
 
 <!-- BEGIN row -->
 <tr bgcolor="{row_tr_color}">{columns}
-  <td valign="top" width="3%"><font face="{font}" size="2"><a href="{row_view_link}">{lang_view}</a></font></td>
+  <td valign="top" nowrap>{actions}</td>
-  <td valign="top" width="3%"><font face="{font}" size="2"><a href="{row_vcard_link}">{lang_vcard}</a></font></td>
-  <td valign="top" width="5%"><font face="{font}" size="2">{row_edit}</font></td>
-  <td valign="top" width="5%"><font face="{font}" size="2">{row_owner}</font></td>
 </tr>
 <!-- END row -->
 

addressbook/templates/default/view.tpl

@@ -9,24 +9,6 @@
 <!-- END view_row -->
 {cols}
 <!-- BEGIN view_footer -->
-  <tr>
-    <td colspan="4">&nbsp;</td>
-  </tr>
-  <tr>
-    <td><b>{lang_owner}</b></td>
-    <td>{owner}</td>
-  </tr>
-  <tr>
-    <td><b>{lang_access}</b></td>
-    <td>{access}</b>
-    </td>
-  </tr>
-  <tr>
-    <td><b>{lang_category}</b></td>
-    <td>{catname}</b></td>
-  </tr>
-  </td>
-</td>
 </table>
 <!-- END view_footer -->
 <!-- BEGIN view_buttons -->