diff --git a/infolog/inc/class.uiinfolog.inc.php b/infolog/inc/class.uiinfolog.inc.php index e43189ee2f..7644cd7d99 100644 --- a/infolog/inc/class.uiinfolog.inc.php +++ b/infolog/inc/class.uiinfolog.inc.php @@ -147,7 +147,7 @@ return $total; } - function index($values = 0,$action='',$action_id='',$referer=0,$extra_app_header=False) + function index($values = 0,$action='',$action_id='',$referer=0,$extra_app_header=False,$return_html=False) { $referer = is_array($values) ? $values['referer'] : $referer; //echo "
uiinfolog::index(action='$action/$action_id',referer='$referer/$values[referer]')
\n"; @@ -236,7 +236,7 @@ $persist['action_id'] = $values['nm']['action_id'] = $action_id; $persist['referer'] = $referer; - $this->tmpl->exec('infolog.uiinfolog.index',$values,'',$readonlys,$persist); + return $this->tmpl->exec('infolog.uiinfolog.index',$values,'',$readonlys,$persist,'',$return_html); } function delete($values=0,$referer='') diff --git a/infolog/inc/hook_home.inc.php b/infolog/inc/hook_home.inc.php index 832fa38a17..116ff89244 100644 --- a/infolog/inc/hook_home.inc.php +++ b/infolog/inc/hook_home.inc.php @@ -20,15 +20,47 @@ $app_id = $GLOBALS['phpgw']->applications->name2id('infolog'); $GLOBALS['portal_order'][] = $app_id; - $GLOBALS['phpgw']->portalbox->set_params(array('app_id' => $app_id, - 'title' => lang('infolog'))); - - $GLOBALS['HTTP_POST_VARS']['filter'] = $GLOBALS['filter'] = 'own-open-today'; $infolog = CreateObject('infolog.uiinfolog'); - - $GLOBALS['phpgw']->portalbox->draw($infolog->index()); - + $html = $infolog->index(array('nm' => array('filter' => 'own-open-today')),'','',0,False,True); + $title = lang('InfoLog').' - '.lang($infolog->filters['own-open-today']); + $stable = $infolog->tmpl->stable; unset($infolog); + + if ($stable) // .14/6 + { + $portalbox = CreateObject('phpgwapi.listbox',array( + 'title' => $title, + 'primary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'], + 'secondary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'], + 'tertiary' => $GLOBALS['phpgw_info']['theme']['navbar_bg'], + 'width' => '100%', + 'outerborderwidth' => '0', + 'header_background_image' => $GLOBALS['phpgw']->common->image('phpgwapi/templates/default','bg_filler') + )); + foreach(array( + 'up' => Array('url' => '/set_box.php', 'app' => $app_id), + 'down' => Array('url' => '/set_box.php', 'app' => $app_id), + 'close' => Array('url' => '/set_box.php', 'app' => $app_id), + 'question' => Array('url' => '/set_box.php', 'app' => $app_id), + 'edit' => Array('url' => '/set_box.php', 'app' => $app_id) + ) as $key => $value) + { + $portalbox->set_controls($key,$value); + } + $portalbox->data = $data; + + echo "\n\n".$portalbox->draw($html)."\n\n"; + unset($portalbox); + } + else // HEAD / XSLT + { + $GLOBALS['phpgw']->portalbox->set_params(array( + 'app_id' => $app_id, + 'title' => $title + )); + $GLOBALS['phpgw']->portalbox->draw($html); + } + unset($html); $GLOBALS['phpgw_info']['flags']['currentapp'] = $save_app; } ?>