readonlys = "; _debug_array($readonlys); //echo "rows=
".print_r($rows,True)."\n"; - reset($rows); return $query['total']; } @@ -302,12 +305,13 @@ { if ($typ != 'defaults') $all_stati += $stati; } + $GLOBALS['egw_info']['flags']['app_header'] = lang('InfoLog'); $GLOBALS['egw_info']['flags']['params']['manual'] = array('page' => 'ManualInfologIndex'); return $this->tmpl->exec('infolog.uiinfolog.index',$values,array( 'info_type' => $this->bo->enums['type'], 'info_status' => $all_stati - ),$readonlys,$persist,(int) $return_html); + ),$readonlys,$persist,$return_html ? -1 : 0); } function delete($values=0,$referer='') diff --git a/infolog/inc/hook_settings.inc.php b/infolog/inc/hook_settings.inc.php index 4df7dda9bb..46b64fb01f 100644 --- a/infolog/inc/hook_settings.inc.php +++ b/infolog/inc/hook_settings.inc.php @@ -44,7 +44,8 @@ 'all' => lang('all links and attachments'), 'links' => lang('only the links'), 'attach' => lang('only the attachments'), - 'none' => lang('no links or attachments') + 'none' => lang('no links or attachments'), + 'no_describtion' => lang('no describtion, links or attachments'), ); 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).'); diff --git a/infolog/setup/etemplates.inc.php b/infolog/setup/etemplates.inc.php index b197057517..30d975c8f0 100644 --- a/infolog/setup/etemplates.inc.php +++ b/infolog/setup/etemplates.inc.php @@ -1,5 +1,5 @@ 'infolog.index.rows','template' => '','lang' => .private { font-style:italic; } ','modified' => '1093714137',); -$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:1:"A";s:2:"2%";s:1:"C";s:2:"8%";s:1:"D";s:2:"8%";s:1:"E";s:3:"12%";s:1:"F";s:14:"3%,@no_actions";s:1:"G";s:14:"3%,@no_actions";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:7:{s:1:"A";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:8:"Type ...";s:4:"name";s:9:"info_type";}i:2;a:3:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:10:"Status ...";s:4:"name";s:11:"info_status";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";}i:2;a:4:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:11:"Responsible";s:4:"help";s:31:"Select to filter by responsible";}}s:1:"E";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";}}i:2;a:7:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"2,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:45:"$row_cont[info_status],$row_cont[info_status]";s:5:"label";s:22:"$row_cont[info_status]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";}}s:1:"B";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";i:1;a:6:{s:4:"type";s:5:"label";s:4:"size";s:25:"b,@${row}[info_link_view]";s:5:"label";s:23:"%s $row_cont[info_addr]";s:7:"no_lang";s:1:"1";s:4:"name";s:23:"${row}[info_link_title]";s:4:"help";s:41:"view this linked entry in its application";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:21:",$row_cont[end_class]";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"F";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"3,0,0";s:5:"align";s:6:"center";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:7:"new.gif";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}}s:1:"G";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"edit.gif";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:10:"delete.gif";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:11:"addfile.gif";s:5:"label";s:8:"Add file";s:4:"name";s:24:"file[$row_cont[info_id]]";s:8:"disabled";s:1:"1";s:4:"help";s:13:"Attach a file";}}}}s:4:"rows";i:2;s:4:"cols";i:7;}}','size' => '','style' => '.low,.low_done,.normal,.normal_done,.high,.high_done,.urgent,.urgent_done { font-weight: bold; } +$templ_data[] = array('name' => 'infolog.index.rows','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:8:{s:1:"A";s:2:"2%";s:1:"C";s:2:"8%";s:1:"D";s:2:"8%";s:1:"E";s:2:"9%";s:1:"F";s:14:"3%,@no_actions";s:1:"G";s:14:"3%,@no_actions";s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";}i:1;a:7:{s:1:"A";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:8:"Type ...";s:4:"name";s:9:"info_type";}i:2;a:3:{s:4:"type";s:22:"nextmatch-filterheader";s:4:"size";s:10:"Status ...";s:4:"name";s:11:"info_status";}}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Subject";s:4:"name";s:12:"info_subject";}s:1:"B";a:5:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"Priority";s:5:"align";s:5:"right";s:4:"name";s:13:"info_priority";s:4:"size";s:4:"DESC";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:11:"Description";s:4:"name";s:8:"info_des";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:7:"options";a:3:{i:0;s:4:"100%";i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:11:"100%,,,,0,0";}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:9:"Startdate";s:4:"name";s:14:"info_startdate";}i:2;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Enddate";s:4:"name";s:12:"info_enddate";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:10:"info_owner";s:4:"size";s:5:"Owner";s:4:"help";s:25:"Select to filter by owner";}i:2;a:4:{s:4:"type";s:23:"nextmatch-accountfilter";s:4:"name";s:16:"info_responsible";s:4:"size";s:11:"Responsible";s:4:"help";s:31:"Select to filter by responsible";}}s:1:"E";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:12:"last changed";s:4:"name";s:17:"info_datemodified";s:4:"size";s:4:"DESC";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Sub";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Action";}}i:2;a:7:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:4:"2,,5";s:5:"align";s:6:"center";i:1;a:3:{s:4:"type";s:5:"image";s:5:"label";s:20:"$row_cont[info_type]";s:4:"name";s:17:"${row}[info_type]";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:45:"$row_cont[info_status],$row_cont[info_status]";s:5:"label";s:22:"$row_cont[info_status]";s:4:"name";s:31:"edit_status[$row_cont[info_id]]";s:4:"help";s:43:"Change the status of an entry, eg. close it";}}s:1:"B";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"4,0,0";i:1;a:6:{s:4:"type";s:5:"label";s:4:"size";s:25:"b,@${row}[info_link_view]";s:5:"label";s:23:"%s $row_cont[info_addr]";s:7:"no_lang";s:1:"1";s:4:"name";s:23:"${row}[info_link_title]";s:4:"help";s:41:"view this linked entry in its application";}i:2;a:4:{s:4:"type";s:5:"label";s:4:"span";s:21:",$row_cont[sub_class]";s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[info_subject]";}i:3;a:4:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[info_des]";}i:4;a:2:{s:4:"type";s:11:"link-string";s:4:"name";s:17:"${row}[filelinks]";}}s:1:"C";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:4:{s:4:"type";s:9:"date-time";s:4:"size";s:2:",8";s:4:"name";s:22:"${row}[info_startdate]";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"type";s:4:"date";s:4:"span";s:21:",$row_cont[end_class]";s:4:"name";s:20:"${row}[info_enddate]";s:8:"readonly";s:1:"1";}}s:1:"D";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:18:"${row}[info_owner]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:24:"${row}[info_responsible]";s:8:"readonly";s:1:"1";}}s:1:"E";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"2,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:25:"${row}[info_datemodified]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:21:"${row}[info_modifier]";s:8:"readonly";s:1:"1";}}s:1:"F";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:5:"3,0,0";s:5:"align";s:6:"center";i:1;a:6:{s:4:"type";s:6:"button";s:4:"size";s:7:"new.gif";s:5:"label";s:7:"Add sub";s:5:"align";s:6:"center";s:4:"name";s:22:"sp[$row_cont[info_id]]";s:4:"help";s:46:"Add a new sub-task, -note, -call to this entry";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:8:"view.gif";s:5:"label";s:9:"View subs";s:5:"align";s:6:"center";s:4:"name";s:24:"view[$row_cont[info_id]]";s:4:"help";s:27:"View all subs of this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:10:"parent.gif";s:5:"label";s:11:"View parent";s:5:"align";s:6:"center";s:4:"name";s:31:"view[$row_cont[info_id_parent]]";s:4:"help";s:46:"View the parent of this entry and all his subs";}}s:1:"G";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:8:"edit.gif";s:5:"label";s:4:"Edit";s:4:"name";s:24:"edit[$row_cont[info_id]]";s:4:"help";s:15:"Edit this entry";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:10:"delete.gif";s:5:"label";s:6:"Delete";s:4:"name";s:26:"delete[$row_cont[info_id]]";s:4:"help";s:17:"Delete this entry";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"size";s:11:"addfile.gif";s:5:"label";s:8:"Add file";s:4:"name";s:24:"file[$row_cont[info_id]]";s:8:"disabled";s:1:"1";s:4:"help";s:13:"Attach a file";}}}}s:4:"rows";i:2;s:4:"cols";i:7;}}','size' => '','style' => '.low,.low_done,.normal,.normal_done,.high,.high_done,.urgent,.urgent_done { font-weight: bold; } .low,.low_done { color:#606060; } .normal,.normal_done { color:black } .high { color:#cc0000; } diff --git a/infolog/setup/phpgw_de.lang b/infolog/setup/phpgw_de.lang index 5f94f8d4e3..002b638842 100644 --- a/infolog/setup/phpgw_de.lang +++ b/infolog/setup/phpgw_de.lang @@ -151,6 +151,7 @@ never hide search and filters infolog de Suche und Filter niemals ausblenden new name infolog de neuer name new search infolog de Neue Suche no - cancel infolog de Nein - Abbruch +no describtion, links or attachments infolog de Keine Beschreibung, Verküpfungen oder Anhänge no entries found, try again ... infolog de Kein Einträge gefunden, nochmal versuchen ... no filter infolog de kein Filter no links or attachments infolog de keine Verknüpfungen oder Anhänge @@ -208,6 +209,7 @@ select an app to search in infolog de eine Anwendung zum Durchsuchen ausw 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 responsible infolog de Verantwortlichen zum Filtern auswählen +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 de Soll InfoLog die offenen Einträge - nicht beendete Aufgaben, Anrufe oder Notizen - auf der Startsteite anzeigen. Funktioniert nur, wenn Sie keine (einzelne) Anwendung für die Startseite ausgewählt haben (in Ihren Einstellungen). should infolog display your open entries - not finished tasks, phonecalls or notes - on the main screen. works only if you dont selected an application for the main screen (in your preferences). infolog de Soll InfoLog die offenen Einträge - nicht beendete Aufgaben, Anrufe oder Notizen - auf der Startsteite anzeigen. Funktioniert nur, wenn Sie keine (einzelne) Anwendung für die Startseite ausgewählt haben (in Ihren Einstellungen). 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 u 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. @@ -267,3 +269,4 @@ you have entered an invalid ending date infolog de Sie haben ein ung you have entered an invalid starting date infolog de Sie haben ein ungültiges Startdatum eingegeben you have to enter a name, to create a new typ!!! infolog de Sie müssen einen Namen angeben, um einen neuen Typ zu erzeugen!!! you must enter a subject or a description infolog de Sie müssen einen Titel oder eine Beschreibung eingeben +your database is not up to date (%1 vs. %2), please run %3setup%4 to update your database. infolog de Ihre Datenbank ist NICHT aktuell (%1 gegenüber %2), bitte rufen Sie %3setup%4 auf um ihre Datenbank zu aktualisieren. diff --git a/infolog/setup/phpgw_en.lang b/infolog/setup/phpgw_en.lang index 50821396d2..6c1a03550d 100644 --- a/infolog/setup/phpgw_en.lang +++ b/infolog/setup/phpgw_en.lang @@ -151,6 +151,7 @@ never hide search and filters infolog en Never hide search and filters new name infolog en new name new search infolog en New search no - cancel infolog en No - Cancel +no describtion, links or attachments infolog en no describtion, links or attachments no entries found, try again ... infolog en no entries found, try again ... no filter infolog en no Filter no links or attachments infolog en no links or attachments @@ -207,6 +208,7 @@ 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 select to filter by owner infolog en select to filter by owner select to filter by responsible infolog en select to filter by responsible +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, phonecalls or notes - on the main screen. Works only if you dont selected an application for the main screen (in your preferences). should infolog display your open entries - not finished 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). 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 u enter infolog). infolog en Should InfoLog show the links to other applications and/or the file-attachments in the InfoLog list (normal view when u enter InfoLog). @@ -266,3 +268,4 @@ you have entered an invalid ending date infolog en You have entered an invalid e 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!!! you must enter a subject or a description infolog en You must enter a subject or a description +your database is not up to date (%1 vs. %2), please run %3setup%4 to update your database. infolog en Your database is NOT up to date (%1 vs. %2), please run %3setup%4 to update your database. diff --git a/infolog/templates/default/index.xet b/infolog/templates/default/index.xet index b6d069208f..63214e116c 100644 --- a/infolog/templates/default/index.xet +++ b/infolog/templates/default/index.xet @@ -96,7 +96,7 @@