holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some no longer needed preferences

Browse Source
This commit is contained in:
Nathan Gray 2014-01-14 15:05:23 +00:00
parent 959a6bd588
commit a3d626176a
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
infolog/inc/class.infolog_hooks.inc.php
View File

@ -253,15 +253,6 @@ class infolog_hooks
'admin' => False,
'default'=> 1, // Yes
),
'never_hide' => array(
'type' => 'check',
'label' => 'Never hide search and filters',
'name' => 'never_hide',
'help' => 'If not set, the line with search and filters is hidden for less entries then "max matches per page" (as defined in your common preferences).',
'xmlrpc' => True,
'admin' => False,
'default'=> '1',
),
'limit_des_lines' => array(
'type' => 'input',
'size' => 5,
@ -272,15 +263,6 @@ class infolog_hooks
'admin' => False,
'default'=> 5,
),
'limit_des_width' => array(
'type' => 'input',
'size' => 5,
'label' => 'Limit width of description column ((effective only if lines limit is set), 0 for no limit)',
'name' => 'limit_des_width',
'help' => 'How wide should the description area be. This value is numeric and interpreted as em; 60 works reasonably well.',
'xmlrpc' => True,
'admin' => False,
),
);
$settings[] = array(
'type' => 'section',

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

@ -865,9 +865,6 @@ class infolog_ui
{
foreach (array_keys($values['nm']['col_filter']) as $colfk) if (is_int($colfk)) unset($values['nm']['col_filter']);
}
$values['nm']['bottom_too'] = True;
$values['nm']['never_hide'] = isset($this->prefs['never_hide']) ?
$this->prefs['never_hide'] : $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'] > 15;
$values['action'] = $persist['action'] = $values['nm']['action'] = $action;
$values['action_id'] = $persist['action_id'] = $values['nm']['action_id'] = $action_id;
$values['action_title'] = $persist['action_title'] = $values['nm']['action_title'] = $action_title;
@ -893,7 +890,7 @@ class infolog_ui
if ($this->prefs['limit_des_lines'] > 0 || (string)$this->prefs['limit_des_lines'] == '');
{
$values['css'] .= '<style type="text/css">@media screen { .infoDes { '.
($this->prefs['limit_des_width']?'max-width:'.$this->prefs['limit_des_width'].'em;':'').' max-height: '.
' max-height: '.
(($this->prefs['limit_des_lines'] ? $this->prefs['limit_des_lines'] : 5) * 1.35). // dono why em is not real lines
'em; overflow: auto; }}</style>';
}
@ -1525,10 +1522,7 @@ class infolog_ui
'action_id' => $info_id,
'options-filter' => $this->filters,
'get_rows' => 'infolog.infolog_ui.get_rows',
'no_filter2' => True,
'never_hide' => isset($this->prefs['never_hide']) ?
$this->prefs['never_hide'] :
$GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'] > 15,
'no_filter2' => True
);
$values['main']['no_actions'] = $values['nm']['no_actions'] = True;