holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix addressbook email popup; still todo: rightclick action

Browse Source
This commit is contained in:
Klaus Leithoff 2013-07-17 14:53:24 +00:00
parent 9af953e2b1
commit 88f866aec9
3 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -675,23 +675,13 @@ class addressbook_ui extends addressbook_bo
{ {
if (strpos($GLOBALS['egw_info']['flags']['java_script'],'addEmail') === false) if (strpos($GLOBALS['egw_info']['flags']['java_script'],'addEmail') === false)
{ {
if ($_GET['compat']) // 1.2 felamimail or old email $handler = 'opener.addEmail(to,email)';
{
$handler = "if (opener.document.doit[to].value != '')
{
opener.document.doit[to].value += ',';
}
opener.document.doit[to].value += email";
}
else // 1.3+ felamimail
{
$handler = 'opener.addEmail(to,email)';
}
$GLOBALS['egw_info']['flags']['java_script'].= " $GLOBALS['egw_info']['flags']['java_script'].= "
<script> <script>
window.egw_LAB.wait(function() {
window.focus(); window.focus();
function addEmail(email) window.addEmail = function(email)
{ {
var to = 'to'; var to = 'to';
splitter = email.indexOf(' <'); splitter = email.indexOf(' <');
@ -711,7 +701,8 @@ class addressbook_ui extends addressbook_bo
} }
} }
$handler; $handler;
} };
});
</script> </script>
"; ";
} }
@ -2262,7 +2253,7 @@ class addressbook_ui extends addressbook_bo
$do_email = strpos($_SERVER['HTTP_REFERER'],'emailpopup') !== false; $do_email = strpos($_SERVER['HTTP_REFERER'],'emailpopup') !== false;
} }
$GLOBALS['egw_info']['flags']['include_xajax'] = true; $GLOBALS['egw_info']['flags']['include_xajax'] = true;
$GLOBALS['egw_info']['flags']['java_script'] .= "<script>window.focus()</script>"; $GLOBALS['egw_info']['flags']['java_script'] .= "<script>window.egw_LAB.wait(function() {window.focus();});</script>";
$GLOBALS['egw_info']['etemplate']['advanced_search'] = true; $GLOBALS['egw_info']['etemplate']['advanced_search'] = true;
// initialize etemplate arrays // initialize etemplate arrays
@ -2357,6 +2348,7 @@ class addressbook_ui extends addressbook_bo
list($width,$height) = explode('x',egw_link::get_registry('felamimail','add_popup')); list($width,$height) = explode('x',egw_link::get_registry('felamimail','add_popup'));
return '<script LANGUAGE="JavaScript"> return '<script LANGUAGE="JavaScript">
window.egw_LAB.wait(function() {
function adb_mail_vcard(_action, _elems) function adb_mail_vcard(_action, _elems)
{ {
var link = "'.egw::link('/index.php',array('menuaction' => 'felamimail.uicompose.compose')).'"; var link = "'.egw::link('/index.php',array('menuaction' => 'felamimail.uicompose.compose')).'";
@ -2414,6 +2406,7 @@ class addressbook_ui extends addressbook_bo
} }
} }
});
</script>'; </script>';
} }

6
addressbook/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long

24
addressbook/templates/default/email.xet
View File

@ -2,17 +2,17 @@
<!-- $Id$ --> <!-- $Id$ -->
<overlay> <overlay>
<template id="addressbook.email.left" template="" lang="" group="0" version="1.5.001"> <template id="addressbook.email.left" template="" lang="" group="0" version="1.5.001">
<hbox class="bold" cols="1" no_lang="1" rows="1"> <hbox no_lang="1" class="bold">
<radio cols="1" statustext="where to add the email address" label="To" id="to" no_lang="1" rows="1" options="to" class="bold"/> <radio statustext="where to add the email address" label="To" id="to" no_lang="1" options="to" class="bold"/>
<radio cols="1" statustext="where to add the email address" label="Cc" id="to" no_lang="1" rows="1" options="cc" class="bold"/> <radio statustext="where to add the email address" label="Cc" id="to" no_lang="1" options="cc" class="bold"/>
<radio cols="1" statustext="where to add the email address" label="Bcc" id="to" no_lang="1" rows="1" options="bcc" class="bold"/> <radio statustext="where to add the email address" label="Bcc" id="to" no_lang="1" options="bcc" class="bold"/>
</hbox> </hbox>
<hbox class="bold" no_lang="1"> <hbox no_lang="1" class="bold">
<radio statustext="preferred type of email address to add for distribution lists" label="Business email" id="email_type" no_lang="1" options="email" class="bold"/> <radio statustext="preferred type of email address to add for distribution lists" label="Business email" id="email_type" no_lang="1" options="email" class="bold"/>
<radio statustext="preferred type of email address to add for distribution lists" label="Home email" id="email_type" no_lang="1" options="email_home" class="bold"/> <radio statustext="preferred type of email address to add for distribution lists" label="Home email" id="email_type" no_lang="1" options="email_home" class="bold"/>
</hbox> </hbox>
</template> </template>
<template id="addressbook.email.rows" template="" lang="" group="0" version="1.9.002"> <template id="addressbook.email.rows" template="" lang="" group="0" version="1.9.003">
<grid width="100%"> <grid width="100%">
<columns> <columns>
<column/> <column/>
@ -53,7 +53,7 @@
<description value=" " id="${row}[n_given]" no_lang="1"/> <description value=" " id="${row}[n_given]" no_lang="1"/>
<description id="${row}[n_family]" no_lang="1" class="leftPad5"/> <description id="${row}[n_family]" no_lang="1" class="leftPad5"/>
</hbox> </hbox>
<hbox options="0,0" orient="0"> <hbox options="0,0">
<description id="${row}[n_family]" no_lang="1"/> <description id="${row}[n_family]" no_lang="1"/>
<description value=" " id="${row}[n_given]" no_lang="1" class="leftPad5"/> <description value=" " id="${row}[n_given]" no_lang="1" class="leftPad5"/>
</hbox> </hbox>
@ -63,12 +63,12 @@
<description value=" " id="${row}[n_given]" no_lang="1" class="leftPad5"/> <description value=" " id="${row}[n_given]" no_lang="1" class="leftPad5"/>
</hbox> </hbox>
<box no_lang="1" options="0,0" class="emailCol"> <box no_lang="1" options="0,0" class="emailCol">
<description id="${row}[email]" no_lang="1" href="&quot;javascript:var nfn='$row_cont[n_fn]';nfn=nfn.replace(/" activate_links="|@/g" for="'');addEmail(nfn+' &lt;$row_cont[email]&gt;');&quot;" extra_link_title=",,$row_cont[email]"/> <description id="${row}[email]" no_lang="1" href="&quot;javascript:var nfn='$row_cont[n_fn]';nfn=nfn.replace(/" activate_links="|@/g" for="'');this.addEmail(nfn+' &lt;$row_cont[email]&gt;');&quot;" extra_link_title=",,$row_cont[email]"/>
</box> </box>
<box no_lang="1" options="0,0" class="emailCol"> <box no_lang="1" options="0,0" class="emailCol">
<description id="${row}[email_home]" no_lang="1" href="&quot;javascript:var nfn='$row_cont[n_fn]';nfn=nfn.replace(/" activate_links="|@/g" for="'');addEmail(nfn+' &lt;$row_cont[email_home]&gt;');&quot;" extra_link_title=",,$row_cont[email_home]"/> <description id="${row}[email_home]" no_lang="1" href="&quot;javascript:var nfn='$row_cont[n_fn]';nfn=nfn.replace(/" activate_links="|@/g" for="'');this.addEmail(nfn+' &lt;$row_cont[email_home]&gt;');&quot;" extra_link_title=",,$row_cont[email_home]"/>
</box> </box>
<hbox options="0" class="noPrint" orient="0"> <hbox options="0" class="noPrint">
<button label="Edit" id="edit[$row_cont[id]]" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit&amp;contact_id=$row_cont[id]'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;" image="edit"/> <button label="Edit" id="edit[$row_cont[id]]" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_ui.edit&amp;contact_id=$row_cont[id]'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;" image="edit"/>
<button statustext="Delete this contact" label="Delete" id="delete[$row_cont[id]]" onclick="return confirm('Delete this contact');" image="delete"/> <button statustext="Delete this contact" label="Delete" id="delete[$row_cont[id]]" onclick="return confirm('Delete this contact');" image="delete"/>
<checkbox align="right" statustext="Select multiple contacts for a further action" id="checked[]" options="$row_cont[id]"/> <checkbox align="right" statustext="Select multiple contacts for a further action" id="checked[]" options="$row_cont[id]"/>
@ -82,18 +82,20 @@
<columns> <columns>
<column/> <column/>
<column/> <column/>
<column/>
</columns> </columns>
<rows> <rows>
<row disabled="!@msg"> <row disabled="!@msg">
<description align="center" id="msg" no_lang="1" span="all" class="redItalic"/> <description align="center" id="msg" no_lang="1" span="all" class="redItalic"/>
<description/> <description/>
<description/>
</row> </row>
<row disabled="1"> <row disabled="1">
<template id="addressbook.email.left"/> <template id="addressbook.email.left"/>
<description align="right"/> <description align="right"/>
</row> </row>
<row> <row>
<nextmatch id="nm" options="addressbook.email.rows" span="all"/> <nextmatch id="nm" template="addressbook.email.rows" span="all"/>
</row> </row>
<row class="noPrint"> <row class="noPrint">
<button statustext="Add a new contact" label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=addressbook.uicontacts.edit'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;"/> <button statustext="Add a new contact" label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=addressbook.uicontacts.edit'),'_blank','dependent=yes,width=850,height=440,scrollbars=yes,status=yes'); return false;"/>