diff --git a/infolog/inc/hook_home.inc.php b/infolog/inc/hook_home.inc.php
index 116ff89244..ab60d9c869 100644
--- a/infolog/inc/hook_home.inc.php
+++ b/infolog/inc/hook_home.inc.php
@@ -10,7 +10,8 @@
\**************************************************************************/
/* $Id$ */
- if ($GLOBALS['phpgw_info']['user']['preferences']['infolog']['homeShowEvents'])
+ $showevents = intval($GLOBALS['phpgw_info']['user']['preferences']['infolog']['homeShowEvents']);
+ if($showevents > 0)
{
$save_app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$GLOBALS['phpgw_info']['flags']['currentapp'] = 'infolog';
@@ -21,12 +22,20 @@
$GLOBALS['portal_order'][] = $app_id;
$infolog = CreateObject('infolog.uiinfolog');
- $html = $infolog->index(array('nm' => array('filter' => 'own-open-today')),'','',0,False,True);
+ if($showevents==1)
+ {
+ $html = $infolog->index(array('nm' => array('filter' => 'own-open-today')),'','',0,False,True);
+ }
+ elseif($showevents==2)
+ {
+ #$html = $infolog->index(array('nm' => array('filter' => 'own-upcoming')),'','',0,False,True);
+ $html = ExecMethod('calendar.uicalendar.get_todos', array('', false));
+ }
$title = lang('InfoLog').' - '.lang($infolog->filters['own-open-today']);
$stable = $infolog->tmpl->stable;
unset($infolog);
- if ($stable) // .14/6
+ if($stable) // .14/6
{
$portalbox = CreateObject('phpgwapi.listbox',array(
'title' => $title,
@@ -63,4 +72,5 @@
unset($html);
$GLOBALS['phpgw_info']['flags']['currentapp'] = $save_app;
}
+ unset($showevents);
?>
diff --git a/infolog/inc/hook_settings.inc.php b/infolog/inc/hook_settings.inc.php
index 2018fc2dd8..3b35fe7901 100644
--- a/infolog/inc/hook_settings.inc.php
+++ b/infolog/inc/hook_settings.inc.php
@@ -11,9 +11,18 @@
/* $Id$ */
- create_check_box('Show open entries: Tasks/Calls/Notes on main screen','homeShowEvents',
+ $show_entries = array(
+ 0 => lang('No'),
+ 1 => lang('Yes'),
+ 2 => lang('Yes').' - '.lang('show list of upcoming entries'),
+ );
+ create_select_box('Show open entries: Tasks/Calls/Notes on main screen','homeShowEvents',$show_entries,
'Should InfoLog display your open entries - not finised tasks, phonecalls or notes - on the main screen. Works only if you dont selected an application for the main screen (in your preferences).');
-
+ unset($show_entries);
+
+ create_input_box('Max number of entries to display on the main screen','mainscreen_maxshow',
+ 'The maximum number of entries to display on the main screen.','10',3);
+
$ui = CreateObject('infolog.uiinfolog'); // need some labels from
foreach($ui->filters as $key => $label)
{
@@ -38,3 +47,4 @@
);
create_select_box('Show in the InfoLog list','show_links',$show_links,
'Should InfoLog show the links to other applications and/or the file-attachments in the InfoLog list (normal view when u enter InfoLog).');
+ unset($show_links);
diff --git a/infolog/setup/phpgw_en.lang b/infolog/setup/phpgw_en.lang
index d9d2e4090f..c42d32f1ee 100644
--- a/infolog/setup/phpgw_en.lang
+++ b/infolog/setup/phpgw_en.lang
@@ -29,6 +29,7 @@ add: infolog en Add:
all infolog en All
all links and attachments infolog en all links and attachments
allows to set the status of an entry, eg. set a todo to done if it's finished (values depend on entry-typ) infolog en allows to set the status of an entry, eg. set a ToDo to done if it's finished (values depend on entry-type)
+allows to set the status of an entry, eg. set a todo to done if it\'s finished (values depend on entry-typ) infolog en allows to set the status of an entry, eg. set a ToDo to done if it's finished (values depend on entry-type)
applies the changes infolog en applies the changes
are you shure you want to delete this entry ? infolog en Are you sure you want to delete this entry ?
are you sure you want to delete this entry infolog en Are you sure you want to delete this entry
@@ -132,6 +133,7 @@ list no subs/childs infolog en List no Subs/Childs
longer textual description infolog en longer textual description
low infolog en low
max length of the input [, length of the inputfield (optional)] infolog en max length of the input [, length of the inputfield (optional)]
+max number of entries to display on the main screen infolog en Max number of entries to display on the main screen
name must not be empty !!! infolog en Name must not be empty !!!
name of new type to create infolog en name of new type to create
new name infolog en new name
@@ -163,7 +165,7 @@ owner infolog en Owner
owner responsible infolog en Owner Responsible
path on (web-)serverside
eg. /var/samba/share infolog en path on (web-)serverside
eg. /var/samba/Share
path to user and group files has to be outside of the webservers document-root!!! infolog en Path to user and group files HAS TO BE OUTSIDE of the webservers document-root!!!
-pattern for search in addressbook infolog en pattern for search in Addressbook
+pattern for search in addressbook infolog en pattern for search in Addressbook
pattern for search in projects infolog en pattern for search in Projects
phone infolog en Phone Call
phone/email infolog en Phone/Email
@@ -173,6 +175,7 @@ private infolog en Private
project infolog en Project
re: infolog en Re:
reg. expr. for local ip's
eg. ^192\.168\.1\. infolog en reg. expr. for local IP's
eg. ^192\.168\.1\.
+reg. expr. for local ip\'s
eg. ^192\\.168\\.1\\. infolog en reg. expr. for local IP's
eg. ^192\.168\.1\.
remark infolog en Remark
remove this link (not the entry itself) infolog en Remove this link (not the entry itself)
responsible infolog en Responsible
@@ -187,6 +190,7 @@ select a category for this entry infolog en select a category for this entry
select a priority for this task infolog en select a priority for this task
select a responsible user: a person you want to delegate this task infolog en select a responsible user: a person you want to delegate this task
select a typ to edit it's status-values or delete it infolog en select a type to edit it's status-values or delete it
+select a typ to edit it\'s status-values or delete it infolog en select a type to edit it's status-values or delete it
select an app to search in infolog en Select an App to search in
select an entry to link with infolog en Select an entry to link with
should infolog display your open entries - not finised tasks, phonecalls or notes - on the main screen. works only if you dont selected an application for the main screen (in your preferences). infolog en Should InfoLog display your open entries - not finised tasks, phone calls or notes - on the main screen. Works only if you dont selected an application for the main screen (in your preferences).
@@ -196,7 +200,9 @@ should infolog use full names (surname and familyname) or just the loginnames. i
should this entry only be visible to you and people you grant privat access via the acl infolog en should this entry only be visible to you and people you grant privat access via the ACL
show full usernames infolog en Show full usernames
show in the infolog list infolog en Show in the InfoLog list
+show list of upcoming entries infolog en show list of upcoming entries
show open entries: tasks/calls/notes on main screen infolog en Show open entries: Tasks/Calls/Notes on main screen
+small view infolog en small view
start a new search, cancel this link infolog en start a new search, cancel this link
startdate infolog en Start Date
startdate enddate infolog en Start Date End Date
@@ -206,6 +212,7 @@ sub infolog en Sub
subject infolog en Subject
task infolog en ToDo
test import (show importable records only in browser) infolog en Test Import (show importable records only in browser)
+the maximum number of entries to display on the main screen. infolog en The maximum number of entries to display on the main screen.
the name used internaly (<= 32 chars), changeing it makes existing data unavailible infolog en the name used internaly (<= 32 chars), changeing it makes existing data unavailible
the text displayed to the user infolog en the text displayed to the user
this is the filter infolog uses when you enter the application. filters limit the entries to show in the actual view. there are filters to show only finished, still open or futures entries of yourself or all users. infolog en This is the filter InfoLog uses when you enter the application. Filters limit the entries to show in the actual view. There are filters to show only finished, still open or futures entries of yourself or all users.
@@ -216,6 +223,7 @@ todo infolog en ToDo
translation infolog en Translation
typ infolog en Type
typ '%1' already exists !!! infolog en Type '%1' already exists !!!
+typ \'%1\' already exists !!! infolog en Type '%1' already exists !!!
type infolog en Type
type of the log-entry: note, phonecall or todo infolog en Type of the log-entry: Note, Phone call or ToDo
unlink infolog en Unlink
@@ -224,6 +232,7 @@ urgency infolog en urgency
urgent infolog en urgent
use button to search for address infolog en use Button to search for Address
use button to search for project infolog en use Button to search for Project
+valid path on clientside
eg. \\\\server\\share or e:\\ infolog en valid path on clientside
eg. \\Server\Share or e:\
valid path on clientside
eg. \\server\share or e:\ infolog en valid path on clientside
eg. \\Server\Share or e:\
values for selectbox infolog en Values for selectbox
view all subs of this entry infolog en View all subs of this entry
@@ -236,6 +245,7 @@ when should the todo or phonecall be started, it shows up from that date in the
will-call infolog en will call
yes - delete infolog en Yes - Delete
you can't delete one of the stock types !!! infolog en You can't delete one of the stock types !!!
+you can\'t delete one of the stock types !!! infolog en You can't delete one of the stock types !!!
you have entered an invalid ending date infolog en You have entered an invalid ending date
you have entered an invalid starting date infolog en You have entered an invalid starting date
you have to enter a name, to create a new typ!!! infolog en You have to enter a name, to create a new type!!!