extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 09:58:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

default css for preview, triggered by details/no details; remember selection with implicit pref

Browse Source
This commit is contained in:
Klaus Leithoff 2016-02-19 12:23:06 +00:00
parent 701cea7c51
commit 4bcfd7f428
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mail/inc/class.mail_ui.inc.php
View File

@ -89,7 +89,7 @@ class mail_ui
'from' => 'from', // lang('from') 'from' => 'from', // lang('from')
'to' => 'to', // lang('to') 'to' => 'to', // lang('to')
'cc' => 'cc', // lang('cc') 'cc' => 'cc', // lang('cc')
'text' => 'whole message' // lang('whole message') 'text' => 'whole message', // lang('whole message')
); );
/** /**
@ -523,6 +523,7 @@ class mail_ui
$sel_options['cat_id'] = $this->searchTypes; $sel_options['cat_id'] = $this->searchTypes;
$sel_options['filter'] = $this->statusTypes; $sel_options['filter'] = $this->statusTypes;
$sel_options['filter2'] = array(''=>'No details',1=>'Details'); $sel_options['filter2'] = array(''=>'No details',1=>'Details');
$content[self::$nm_index]['filter2'] = $GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails'];
$etpl = new etemplate_new('mail.index'); $etpl = new etemplate_new('mail.index');
// Start at 2 so auto-added copy+paste actions show up as second group // Start at 2 so auto-added copy+paste actions show up as second group
@ -718,7 +719,7 @@ class mail_ui
// sending preview toolbar actions // sending preview toolbar actions
if ($content['mailSplitter']) $etpl->setElementAttribute('mailPreview[toolbar]', 'actions', $this->get_toolbar_actions()); if ($content['mailSplitter']) $etpl->setElementAttribute('mailPreview[toolbar]', 'actions', $this->get_toolbar_actions());
//we use the category "filter" option as specifier where we want to search (quick, subject, from, to, etc. ....)
if (empty($content[self::$nm_index]['cat_id']) || empty($content[self::$nm_index]['search'])) $content[self::$nm_index]['cat_id']=(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject'); if (empty($content[self::$nm_index]['cat_id']) || empty($content[self::$nm_index]['search'])) $content[self::$nm_index]['cat_id']=(emailadmin_imapbase::$supportsORinQuery[$this->mail_bo->profileID]?'quick':'subject');
$readonlys = $preserv = array(); $readonlys = $preserv = array();
if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__); if (mail_bo::$debugTimes) mail_bo::logRunTimes($starttime,null,'',__METHOD__.__LINE__);
@ -1320,6 +1321,12 @@ class mail_ui
$filter['status'] = $query['filter']; $filter['status'] = $query['filter'];
} }
$reverse = ($query['sort']=='ASC'?false:true); $reverse = ($query['sort']=='ASC'?false:true);
if (!isset($GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails']) || ($query['filter2'] !=$GLOBALS['egw_info']['user']['preferences']['mail']['ShowDetails']))
{
$GLOBALS['egw']->preferences->add('mail','ShowDetails',$query['filter2'],'user');
// save prefs
$GLOBALS['egw']->preferences->save_repository(true);
}
//error_log(__METHOD__.__LINE__.' maxMessages:'.$maxMessages.' Offset:'.$offset.' Filter:'.array2string($mail_ui->sessionData['messageFilter'])); //error_log(__METHOD__.__LINE__.' maxMessages:'.$maxMessages.' Offset:'.$offset.' Filter:'.array2string($mail_ui->sessionData['messageFilter']));
try try
{ {

12
mail/templates/default/app.css
View File

@ -137,6 +137,16 @@ tr.forwarded span.status_img {
font-family : Arial; font-family : Arial;
} }
.bodypreview {
white-space: normal !important;
max-height: 25px !important;
font-size: 11px;
font-style: italic;
font-weight : normal !important;
font-family: Arial;
color: grey !important;
}
TR.sieveRowActive TR.sieveRowActive
{ {
font-size: 11px; font-size: 11px;
@ -891,4 +901,4 @@ div.mailComposeHeaderSection>table {
/*Avoid getting scrollbar on form area, let scrolling be handled by tree*/ /*Avoid getting scrollbar on form area, let scrolling be handled by tree*/
#mail-subscribe { #mail-subscribe {
overflow: hidden; overflow: hidden;
} }