+
diff --git a/infolog/setup/etemplates.inc.php b/infolog/setup/etemplates.inc.php
index 594d90c46b..1f1ee89699 100644
--- a/infolog/setup/etemplates.inc.php
+++ b/infolog/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
/**
* EGroupware - eTemplates for Application infolog
* http://www.egroupware.org
- * generated by soetemplate::dump4setup() 2012-07-23 09:59
+ * generated by soetemplate::dump4setup() 2012-11-14 12:38
*
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @package infolog
@@ -36,11 +36,12 @@ select.et2_selectbox, #info_contact > select { width: 117px; }
#info_contact > input {width: 134px;}
#info_from {width: 253px;}
#info_cat {width: 255px;}
-#info_subject {width: 100%;}','modified' => '1342024562',);
+#info_subject {width: 100%;}
+.responsible > select {width: 550px;}','modified' => '1342024562',);
$templ_data[] = array('name' => 'infolog.edit.customfields','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:4:{s:2:"c1";s:2:"th";s:2:"h2";s:4:"100%";s:2:"h1";s:2:"20";s:2:"c2";s:4:",top";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Custom fields";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:12:"customfields";s:4:"size";s:10:"@info_type";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:25:"100%,245,,row_on,0,0,auto";s:7:"options";a:6:{i:3;s:6:"row_on";i:0;s:4:"100%";i:1;s:3:"245";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}}','size' => '100%,245,,row_on,0,0,auto','style' => '','modified' => '1061732462',);
-$templ_data[] = array('name' => 'infolog.edit.delegation','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:9:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:2:"th";s:2:"c6";s:7:"row,top";s:2:"c7";s:3:"row";s:2:"h7";s:2:",1";s:2:"c5";s:3:"nmr";}i:1;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:7:"General";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"size";s:16:",,,info_priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";}s:1:"B";a:3:{s:4:"name";s:13:"info_priority";s:4:"type";s:6:"select";s:4:"help";s:31:"select a priority for this task";}}i:3;a:2:{s:1:"A";a:3:{s:4:"size";s:16:",,,info_location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";}s:1:"B";a:3:{s:4:"size";s:6:"80,255";s:4:"name";s:13:"info_location";s:4:"type";s:4:"text";}}i:4;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:10:"Delegation";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:2:"CC";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c2";s:9:"hiddenRow";s:1:"B";s:2:"16";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",254";s:4:"name";s:7:"info_cc";s:4:"span";s:15:",inputFullWidth";}s:1:"B";a:4:{s:4:"type";s:10:"buttononly";s:4:"size";s:5:"users";s:5:"label";s:20:"Add from Addressbook";s:7:"onclick";s:69:"return add_email_from_ab(form::name(\'ab[id]\'),form::name(\'info_cc\'));";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:10:"link-entry";s:4:"size";s:17:"addressbook-email";s:4:"name";s:2:"ab";s:4:"blur";s:6:"Search";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:7:"100%,,0";s:7:"options";a:2:{i:0;s:4:"100%";i:2;s:1:"0";}}}i:6;a:2:{s:1:"A";a:3:{s:4:"size";s:19:",,,info_responsible";s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}s:1:"B";a:4:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"info_responsible";s:4:"size";s:6:"6,both";s:4:"help";s:66:"select a responsible user: a person you want to delegate this task";}}i:7;a:2:{s:1:"A";a:3:{s:4:"size";s:15:",,,info_confirm";s:4:"type";s:5:"label";s:5:"label";s:7:"Confirm";}s:1:"B";a:3:{s:4:"name";s:12:"info_confirm";s:4:"type";s:6:"select";s:4:"help";s:87:"do you want a confirmation of the responsible on: accepting, finishing the task or both";}}}s:4:"cols";i:2;s:4:"rows";i:7;s:4:"size";s:8:"100%,245";}}','size' => '100%,245','style' => '','modified' => '1299608518',);
+$templ_data[] = array('name' => 'infolog.edit.delegation','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:9:{s:1:"A";s:3:"100";s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:2:"th";s:2:"c6";s:7:"row,top";s:2:"c7";s:3:"row";s:2:"h7";s:2:",1";s:2:"c5";s:3:"nmr";}i:1;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:7:"General";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"size";s:16:",,,info_priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";}s:1:"B";a:3:{s:4:"name";s:13:"info_priority";s:4:"type";s:6:"select";s:4:"help";s:31:"select a priority for this task";}}i:3;a:2:{s:1:"A";a:3:{s:4:"size";s:16:",,,info_location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";}s:1:"B";a:3:{s:4:"size";s:6:"80,255";s:4:"name";s:13:"info_location";s:4:"type";s:4:"text";}}i:4;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:10:"Delegation";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:2:"CC";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c2";s:9:"hiddenRow";s:1:"B";s:2:"16";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:",254";s:4:"name";s:7:"info_cc";s:4:"span";s:15:",inputFullWidth";}s:1:"B";a:4:{s:4:"type";s:10:"buttononly";s:4:"size";s:5:"users";s:5:"label";s:20:"Add from Addressbook";s:7:"onclick";s:69:"return add_email_from_ab(form::name(\'ab[id]\'),form::name(\'info_cc\'));";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:10:"link-entry";s:4:"size";s:17:"addressbook-email";s:4:"name";s:2:"ab";s:4:"blur";s:6:"Search";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:7:"100%,,0";s:7:"options";a:2:{i:0;s:4:"100%";i:2;s:1:"0";}}}i:6;a:2:{s:1:"A";a:3:{s:4:"size";s:19:",,,info_responsible";s:4:"type";s:5:"label";s:5:"label";s:11:"Responsible";}s:1:"B";a:5:{s:4:"type";s:14:"select-account";s:4:"name";s:16:"info_responsible";s:4:"size";s:6:"6,both";s:4:"help";s:66:"select a responsible user: a person you want to delegate this task";s:4:"span";s:12:",responsible";}}i:7;a:2:{s:1:"A";a:3:{s:4:"size";s:15:",,,info_confirm";s:4:"type";s:5:"label";s:5:"label";s:7:"Confirm";}s:1:"B";a:3:{s:4:"name";s:12:"info_confirm";s:4:"type";s:6:"select";s:4:"help";s:87:"do you want a confirmation of the responsible on: accepting, finishing the task or both";}}}s:4:"cols";i:2;s:4:"rows";i:7;s:4:"size";s:8:"100%,245";}}','size' => '100%,245','style' => '','modified' => '1299608518',);
$templ_data[] = array('name' => 'infolog.edit.description','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:1:{s:1:"A";a:6:{s:4:"type";s:8:"textarea";s:4:"size";s:2:"13";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"info_des";s:4:"help";s:44:"enter a textual description of the log-entry";s:4:"span";s:12:",description";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:10:"100%,245,0";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"245";i:2;s:1:"0";}}}','size' => '100%,245,0','style' => '','modified' => '1229074983',);
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
index 65d17f5a2b..1733ea4d16 100644
--- a/infolog/templates/default/edit.xet
+++ b/infolog/templates/default/edit.xet
@@ -81,7 +81,7 @@
-
+
@@ -310,6 +310,7 @@ select.et2_selectbox, #info_contact > select { width: 117px; }
#info_from {width: 253px;}
#info_cat {width: 255px;}
#info_subject {width: 100%;}
+.responsible > select {width: 550px;}
\ No newline at end of file
diff --git a/phpgwapi/inc/class.uiaccountsel.inc.php b/phpgwapi/inc/class.uiaccountsel.inc.php
index 11d083d1fe..7e9a917395 100644
--- a/phpgwapi/inc/class.uiaccountsel.inc.php
+++ b/phpgwapi/inc/class.uiaccountsel.inc.php
@@ -285,7 +285,7 @@ class uiaccountsel
);
}
//echo "html::select('$name',".print_r($selected,True).",".print_r($select,True).",True,'$options')
\n";
- $html = html::select($name,$selected,$select,True,$options.' id="'.$element_id.'"',$lines > 1 ? $lines : 0);
+ $html = html::select($name,$selected,$select,True,$options.' id="'.$element_id.'"',$lines > 1 ? $lines : 0,true);
if (!$only_groups && ($lines > 0 && $this->account_selection == 'popup' || $lines > 1 && $this->account_selection == 'primary_group'))
{
@@ -297,9 +297,9 @@ class uiaccountsel
elseif (!$only_groups && ($lines == 1 || $lines > 0 && $this->account_selection == 'primary_group'))
{
$js = "if (selectBox = document.getElementById('$element_id')) if (!selectBox.multiple) { if(\$j(selectBox).unchosen) \$j(selectBox).unchosen(); selectBox.size=$multi_size; selectBox.multiple=true; if (selectBox.options[0].value=='') selectBox.options[0] = null;";
- if(count($select) > html::SELECT_ENHANCED_ROW_COUNT)
+ if(count($select) > html::SELECT_ENHANCED_ROW_COUNT || true)
{
- $js .= "\$j(selectBox).css('width','100%').chosen({placeholder_text: '".lang('Select multiple accounts')."'}); ";
+ $js .= "\$j(selectBox).css('width','100%'); ";
}
if (!in_array($this->account_selection,array('groupmembers','selectbox'))) // no popup!
{
@@ -315,6 +315,8 @@ class uiaccountsel
$html .= html::submit_button('search','Select multiple accounts',$js,false,
' title="'.html::htmlspecialchars(lang('Select multiple accounts')).'"','users','phpgwapi');
}
+ // jDots needs a little re-do, since it plays with the layout
+ $html .= "";
if($need_js_popup && !$GLOBALS['egw_info']['flags']['uiaccountsel']['addOption_installed'])
{
$html .= '