diff --git a/home/inc/class.home_favorite_portlet.inc.php b/home/inc/class.home_favorite_portlet.inc.php index b3e7ff5f71..7d43c6e194 100644 --- a/home/inc/class.home_favorite_portlet.inc.php +++ b/home/inc/class.home_favorite_portlet.inc.php @@ -33,10 +33,6 @@ class home_favorite_portlet extends home_portlet * @var array */ protected $nm_settings = array( - 'no_filter' => true, - 'no_filter2' => true, - 'no_cat' => true, - 'no_search' => true, 'lettersearch' => false, 'favorites' => false, // Hide favorite control ); @@ -103,9 +99,11 @@ class home_favorite_portlet extends home_portlet $etemplate->set_dom_id($id); $content = $this->context + array('nm' => $this->nm_settings); + $sel_options = $content['sel_options'] ? $content['sel_options'] : array(); + unset($content['sel_options']); $etemplate->setElementAttribute('nm', 'template',$this->nm_settings['template']); - $etemplate->exec(get_called_class() .'::process',$content); + $etemplate->exec(get_called_class() .'::process',$content,$sel_options); } public static function process($content = array()) diff --git a/home/js/app.js b/home/js/app.js index 2349193ab7..316ff6d09d 100644 --- a/home/js/app.js +++ b/home/js/app.js @@ -526,7 +526,7 @@ app.classes.home = AppJS.extend( var window_width = Math.max(580, width+20); var window_height = Math.max(350, height+70); - // Open popup, but add 30 to the height for the toolbar + // Open popup, but add 70 to the height for the toolbar egw.open_link(egw.link('/index.php',{ menuaction: 'home.home_note_portlet.edit', id: id, diff --git a/home/templates/default/app.css b/home/templates/default/app.css index e581a5fce4..ddc71ae928 100644 --- a/home/templates/default/app.css +++ b/home/templates/default/app.css @@ -53,4 +53,4 @@ background: rgba(0,0,0,.3); border: 1px solid silver; position: absolute; -} \ No newline at end of file +} diff --git a/infolog/inc/class.infolog_favorite_portlet.inc.php b/infolog/inc/class.infolog_favorite_portlet.inc.php index 1cc6274c7f..9466600053 100644 --- a/infolog/inc/class.infolog_favorite_portlet.inc.php +++ b/infolog/inc/class.infolog_favorite_portlet.inc.php @@ -31,20 +31,21 @@ class infolog_favorite_portlet extends home_favorite_portlet $ui = new infolog_ui(); $this->context['template'] = 'infolog.index.rows'; + $this->context['sel_options'] = array( + 'info_type' => $ui->bo->enums['type'], + 'pm_id' => array(lang('No project')), + 'info_priority' => $ui->bo->enums['priority'], + ); $this->nm_settings += array( 'get_rows' => 'infolog.infolog_ui.get_rows', // Use a different template so it can be accessed from client side 'template' => 'infolog.home', // Don't overwrite infolog 'session_for' => 'home', - + 'no_filter2' => true, + 'options-filter'=> $ui->filters, // Allow add actions even when there's no rows 'placeholder_actions' => array(), - 'sel_options' => array( - 'info_type' => $ui->bo->enums['type'], - 'pm_id' => array(lang('No project')), - 'info_priority' => $ui->bo->enums['priority'], - ) ); }