merged r28910: fixed not use popup in link list widget (eg. links tab

in different apps)
This commit is contained in:
Ralf Becker 2010-01-08 02:52:15 +00:00
parent 45e647b9d2
commit b851d88ac8
2 changed files with 10 additions and 13 deletions

View File

@ -2,7 +2,7 @@
/**
* eGroupWare - eTemplates for Application etemplate
* http://www.egroupware.org
* generated by soetemplate::dump4setup() 2008-10-06 19:41
* generated by soetemplate::dump4setup() 2010-01-08 03:21
*
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @package etemplate
@ -195,7 +195,7 @@ $templ_data[] = array('name' => 'etemplate.link_widget.list','template' => '','l
$templ_data[] = array('name' => 'etemplate.link_widget.list','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:1:"D";s:10:",!@primary";s:2:"c1";s:3:"nmr";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:4:"html";s:4:"name";s:17:"${row}[mime_icon]";}i:2;a:2:{s:4:"name";s:11:"${row}[app]";s:4:"type";s:5:"label";}}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:7:"no_lang";s:1:"1";s:4:"size";s:1:"2";s:4:"type";s:3:"box";i:1;a:2:{s:4:"type";s:4:"html";s:4:"name";s:17:"${row}[thumbnail]";}i:2;a:5:{s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[title]";s:4:"size";s:34:",@${row}[view],,,$row_cont[target]";s:4:"type";s:5:"label";s:4:"help";s:41:"view this linked entry in its application";}}i:2;a:4:{s:7:"no_lang";s:1:"1";s:4:"name";s:14:"${row}[remark]";s:4:"type";s:5:"label";s:4:"span";s:15:",note_following";}}s:1:"C";a:5:{s:5:"label";s:6:"Unlink";s:4:"name";s:26:"unlink[$row_cont[link_id]]";s:4:"type";s:6:"button";s:4:"size";s:10:"delete.png";s:4:"help";s:39:"Remove this link (not the entry itself)";}s:1:"D";a:4:{s:4:"name";s:7:"primary";s:4:"size";s:18:"$row_cont[link_id]";s:4:"type";s:5:"radio";s:4:"help";s:45:"Select a primary contact, to show in the list";}}}s:4:"cols";i:4;s:4:"rows";i:1;s:4:"size";s:12:",,,whiteback";}}','size' => ',,,whiteback','style' => '.whiteback { background: white; }
.note_following { font-style: italic; padding-left: 5px; }','modified' => '1192470162',);
$templ_data[] = array('name' => 'etemplate.link_widget.list','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:4:{s:2:"c1";s:3:"row";s:1:"A";s:25:"20,@link_list_format=text";s:1:"B";s:24:",@link_list_format=icons";s:1:"E";s:10:",!@primary";}i:1;a:5:{s:1:"A";a:2:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[icon]";}s:1:"B";a:2:{s:4:"name";s:11:"${row}[app]";s:4:"type";s:5:"label";}s:1:"C";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[title]";s:4:"size";s:34:",@${row}[view],,,$row_cont[target]";s:4:"type";s:5:"label";s:4:"help";s:41:"view this linked entry in its application";}i:2;a:4:{s:7:"no_lang";s:1:"1";s:4:"name";s:14:"${row}[remark]";s:4:"type";s:5:"label";s:4:"span";s:15:",note_following";}}s:1:"D";a:5:{s:5:"label";s:6:"Unlink";s:4:"name";s:26:"unlink[$row_cont[link_id]]";s:4:"type";s:6:"button";s:4:"size";s:10:"delete.png";s:4:"help";s:39:"Remove this link (not the entry itself)";}s:1:"E";a:4:{s:4:"name";s:7:"primary";s:4:"size";s:18:"$row_cont[link_id]";s:4:"type";s:5:"radio";s:4:"help";s:45:"Select a primary contact, to show in the list";}}}s:4:"cols";i:5;s:4:"rows";i:1;s:4:"size";s:12:",,,whiteback";}}','size' => ',,,whiteback','style' => '.whiteback { background: white; }
$templ_data[] = array('name' => 'etemplate.link_widget.list','template' => '','lang' => '','group' => '0','version' => '1.7.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:4:{s:2:"c1";s:3:"row";s:1:"A";s:25:"20,@link_list_format=text";s:1:"B";s:24:",@link_list_format=icons";s:1:"E";s:10:",!@primary";}i:1;a:5:{s:1:"A";a:2:{s:4:"type";s:8:"vfs-mime";s:4:"name";s:12:"${row}[icon]";}s:1:"B";a:2:{s:4:"name";s:11:"${row}[app]";s:4:"type";s:5:"label";}s:1:"C";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[title]";s:4:"size";s:51:",@${row}[view],,,$row_cont[target],$row_cont[popup]";s:4:"type";s:5:"label";s:4:"help";s:41:"view this linked entry in its application";}i:2;a:4:{s:7:"no_lang";s:1:"1";s:4:"name";s:14:"${row}[remark]";s:4:"type";s:5:"label";s:4:"span";s:15:",note_following";}}s:1:"D";a:5:{s:5:"label";s:6:"Unlink";s:4:"name";s:26:"unlink[$row_cont[link_id]]";s:4:"type";s:6:"button";s:4:"size";s:10:"delete.png";s:4:"help";s:39:"Remove this link (not the entry itself)";}s:1:"E";a:4:{s:4:"name";s:7:"primary";s:4:"size";s:18:"$row_cont[link_id]";s:4:"type";s:5:"radio";s:4:"help";s:45:"Select a primary contact, to show in the list";}}}s:4:"cols";i:5;s:4:"rows";i:1;s:4:"size";s:12:",,,whiteback";}}','size' => ',,,whiteback','style' => '.whiteback { background: white; }
.note_following { font-style: italic; padding-left: 5px; }
','modified' => '1192470162',);

View File

@ -1,25 +1,21 @@
<?xml version="1.0"?>
<!-- $Id$ -->
<overlay>
<template id="etemplate.link_widget.list" template="" lang="" group="0" version="1.5.001">
<template id="etemplate.link_widget.list" template="" lang="" group="0" version="1.7.001">
<grid class="whiteback">
<columns>
<column/>
<column width="20" disabled="@link_list_format=text"/>
<column disabled="@link_list_format=icons"/>
<column/>
<column/>
<column disabled="!@primary"/>
</columns>
<rows>
<row class="nmr">
<vbox>
<html id="${row}[mime_icon]"/>
<row class="row">
<vfs-mime id="${row}[icon]"/>
<description id="${row}[app]"/>
</vbox>
<hbox options="0,0">
<box no_lang="1">
<html id="${row}[thumbnail]"/>
<description no_lang="1" id="${row}[title]" options=",@${row}[view],,,$row_cont[target]" statustext="view this linked entry in its application"/>
</box>
<description no_lang="1" id="${row}[title]" options=",@${row}[view],,,$row_cont[target],$row_cont[popup]" statustext="view this linked entry in its application"/>
<description no_lang="1" id="${row}[remark]" class="note_following"/>
</hbox>
<button label="Unlink" id="unlink[$row_cont[link_id]]" image="delete.png" statustext="Remove this link (not the entry itself)"/>
@ -30,6 +26,7 @@
<styles>
.whiteback { background: white; }
.note_following { font-style: italic; padding-left: 5px; }
</styles>
</template>
</overlay>