extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 10:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

backport of chr.binders patch for the distinctive labeling of the close button; fix missing startdate, when importing mail from compose

Browse Source
This commit is contained in:
Klaus Leithoff 2009-12-15 16:13:30 +00:00
parent e4a105db84
commit 8efdb97c29
5 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
infolog/inc/class.infolog_ui.inc.php
View File

@ -1440,7 +1440,7 @@ class infolog_ui
$uid = $_GET['uid']; $uid = $_GET['uid'];
$partid = $_GET['part']; $partid = $_GET['part'];
$mailbox = base64_decode($_GET['mailbox']); $mailbox = base64_decode($_GET['mailbox']);
if ($_date == false || empty($_date)) $_date = $this->bo->user_time_now;
if (!empty($_to_emailAddress)) if (!empty($_to_emailAddress))
{ {
$GLOBALS['egw_info']['flags']['currentapp'] = 'infolog'; $GLOBALS['egw_info']['flags']['currentapp'] = 'infolog';
@ -1492,7 +1492,7 @@ class infolog_ui
//_debug_array($attachments); //_debug_array($attachments);
$body = strip_tags($_body); $body = strip_tags($_body);
$this->edit($this->bo->import_mail( $this->edit($this->bo->import_mail(
implode(',',$_to_emailAddress),$_subject,$body,$attachments,'' implode(',',$_to_emailAddress),$_subject,$body,$attachments,$_date
)); ));
exit; exit;
} }

2
infolog/lang/egw_de.lang
View File

@ -308,6 +308,8 @@ select an entry to link with infolog de einen Eintrag zum Verküpfen auswählen
select to filter by owner infolog de Besiter zum Filtern auswählen select to filter by owner infolog de Besiter zum Filtern auswählen
select to filter by responsible infolog de Verantwortlichen zum Filtern auswählen select to filter by responsible infolog de Verantwortlichen zum Filtern auswählen
sender infolog de Absender sender infolog de Absender
set status to done infolog de Status auf erledigt setzen
set status to done for all entries infolog de Status für alle Einträge auf erledigt setzen
sets the status of this entry and its subs to done infolog de Setzt den Status dieses Eintrags und seiner Untereinträge auf erledigt sets the status of this entry and its subs to done infolog de Setzt den Status dieses Eintrags und seiner Untereinträge auf erledigt
should infolog show subtasks, -calls or -notes in the normal view or not. you can always view the subs via there parent. infolog de Soll InfoLog Untereinträge in der normalen Ansicht anzeigen oder nicht. Sie können die Untereinträge immer über deren Haupteintrag anzeigen. should infolog show subtasks, -calls or -notes in the normal view or not. you can always view the subs via there parent. infolog de Soll InfoLog Untereinträge in der normalen Ansicht anzeigen oder nicht. Sie können die Untereinträge immer über deren Haupteintrag anzeigen.
should infolog show the links to other applications and/or the file-attachments in the infolog list (normal view when you enter infolog). infolog de Soll InfoLog die Verknüpfungen zu anderen Anwendungen und/oder die Datei-Anhänge in der InfoLog Liste (normale Ansicht wenn InfoLog aufgerufen wird) anzeigen. should infolog show the links to other applications and/or the file-attachments in the infolog list (normal view when you enter infolog). infolog de Soll InfoLog die Verknüpfungen zu anderen Anwendungen und/oder die Datei-Anhänge in der InfoLog Liste (normale Ansicht wenn InfoLog aufgerufen wird) anzeigen.

2
infolog/lang/egw_en.lang
View File

@ -308,6 +308,8 @@ select an entry to link with infolog en Select an entry to link with
select to filter by owner infolog en select to filter by owner select to filter by owner infolog en select to filter by owner
select to filter by responsible infolog en select to filter by responsible select to filter by responsible infolog en select to filter by responsible
sender infolog en Sender sender infolog en Sender
set status to done infolog en Set status to done
set status to done for all entries infolog en Set status to done for all entries
sets the status of this entry and its subs to done infolog en Sets the status of this entry and its subs to done sets the status of this entry and its subs to done infolog en Sets the status of this entry and its subs to done
should infolog show subtasks, -calls or -notes in the normal view or not. you can always view the subs via there parent. infolog en Should InfoLog show Subtasks, -calls or -notes in the normal view or not. You can always view the subs via their parent. should infolog show subtasks, -calls or -notes in the normal view or not. you can always view the subs via there parent. infolog en Should InfoLog show Subtasks, -calls or -notes in the normal view or not. You can always view the subs via their parent.
should infolog show the links to other applications and/or the file-attachments in the infolog list (normal view when you enter infolog). infolog en Should InfoLog show the links to other applications and/or the file-attachments in the InfoLog list (normal view when you enter InfoLog). should infolog show the links to other applications and/or the file-attachments in the infolog list (normal view when you enter infolog). infolog en Should InfoLog show the links to other applications and/or the file-attachments in the InfoLog list (normal view when you enter InfoLog).

15
infolog/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long

18
infolog/templates/default/index.xet
View File

@ -5,16 +5,16 @@
<description class="headertext bold" value="InfoLog"/> <description class="headertext bold" value="InfoLog"/>
<styles>.bold { font-weight: bold; }</styles> <styles>.bold { font-weight: bold; }</styles>
</template> </template>
<template id="infolog.index.header_right" template="" lang="" group="0" version="1.5.001"> <template id="infolog.index.header_right" template="" lang="" group="0" version="1.7.001">
<hbox> <hbox>
<description class="headertext" value="Add:"/> <description class="headertext" value="Add:"/>
<button image="task" label="ToDo" id="add[task]" statustext="Add a new ToDo" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;type=task&amp;action=$cont[action]&amp;action_id=$cont[action_id]&amp;cat_id=$cont[cat_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/> <button image="task" label="ToDo" id="add[task]" statustext="Add a new ToDo" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;type=task&amp;action=$cont[action]&amp;action_id=$cont[action_id]&amp;cat_id=$cont[cat_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
<button image="phone" label="Phonecall" id="add[phone]" statustext="Add a new Phonecall" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;type=phone&amp;action=$cont[action]&amp;action_id=$cont[action_id]&amp;cat_id=$cont[cat_id]}'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/> <button image="phone" label="Phonecall" id="add[phone]" statustext="Add a new Phonecall" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;type=phone&amp;action=$cont[action]&amp;action_id=$cont[action_id]&amp;cat_id=$cont[cat_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
<button image="note" label="Note" id="add[note]" statustext="Add a new Note" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;type=note&amp;action=$cont[action]&amp;action_id=$cont[action_id]&amp;cat_id=$cont[cat_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/> <button image="note" label="Note" id="add[note]" statustext="Add a new Note" onclick="window.open(egw::link('/index.php','menuaction=infolog.infolog_ui.edit&amp;type=note&amp;action=$cont[action]&amp;action_id=$cont[action_id]&amp;cat_id=$cont[cat_id]'),'_blank','dependent=yes,width=750,height=600,scrollbars=yes,status=yes'); return false;"/>
</hbox> </hbox>
</template> </template>
<template id="infolog.index.rows-noheader" template="" lang="" group="0" version="1.7.003"> <template id="infolog.index.rows-noheader" template="" lang="" group="0" version="1.7.005">
<grid> <grid width="100%" class="my_form">
<columns> <columns>
<column width="2%"/> <column width="2%"/>
<column/> <column/>
@ -141,8 +141,8 @@
<button image="delete" label="Delete" id="delete[$row_cont[info_id]]" statustext="Delete this entry" onclick="return $row_cont[info_anz_subs] || confirm('Delete this entry');"/> <button image="delete" label="Delete" id="delete[$row_cont[info_id]]" statustext="Delete this entry" onclick="return $row_cont[info_anz_subs] || confirm('Delete this entry');"/>
</hbox> </hbox>
<hbox options="0,0" class="noPrint" orient="0"> <hbox options="0,0" class="noPrint" orient="0">
<button image="done" label="Close" id="close[$row_cont[info_id]]" statustext="Sets the status of this entry to done"/> <button image="done" label="Set status to done" id="close[$row_cont[info_id]]" statustext="Sets the status of this entry to done"/>
<button image="done_all" label="Close all" id="close_all[$row_cont[info_id]]" statustext="Sets the status of this entry and its subs to done"/> <button image="done_all" label="Set status to done for all entries" id="close_all[$row_cont[info_id]]" statustext="Sets the status of this entry and its subs to done"/>
<description/> <description/>
<description/> <description/>
</hbox> </hbox>
@ -152,7 +152,7 @@
</rows> </rows>
</grid> </grid>
</template> </template>
<template id="infolog.index.rows" template="" lang="" group="0" version="1.7.004"> <template id="infolog.index.rows" template="" lang="" group="0" version="1.7.005">
<grid> <grid>
<columns> <columns>
<column width="2%"/> <column width="2%"/>
@ -294,8 +294,8 @@
<button image="delete" label="Delete" id="delete[$row_cont[info_id]]" statustext="Delete this entry" onclick="return $row_cont[info_anz_subs] || confirm('Delete this entry');"/> <button image="delete" label="Delete" id="delete[$row_cont[info_id]]" statustext="Delete this entry" onclick="return $row_cont[info_anz_subs] || confirm('Delete this entry');"/>
</hbox> </hbox>
<hbox options="0,0" class="noPrint" orient="0"> <hbox options="0,0" class="noPrint" orient="0">
<button image="done" label="Close" id="close[$row_cont[info_id]]" statustext="Sets the status of this entry to done"/> <button image="done" label="Set status to done" id="close[$row_cont[info_id]]" statustext="Sets the status of this entry to done"/>
<button image="done_all" label="Close all" id="close_all[$row_cont[info_id]]" statustext="Sets the status of this entry and its subs to done"/> <button image="done_all" label="Set status to done for all entries" id="close_all[$row_cont[info_id]]" statustext="Sets the status of this entry and its subs to done"/>
</hbox> </hbox>
<image src="filemanager/navbar" options="/index.php?menuaction=filemanager.filemanager_ui.index&amp;path=/apps/infolog/$row_cont[info_id]" class="image16" label="Filemanager"/> <image src="filemanager/navbar" options="/index.php?menuaction=filemanager.filemanager_ui.index&amp;path=/apps/infolog/$row_cont[info_id]" class="image16" label="Filemanager"/>
</vbox> </vbox>