extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 09:42:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set vertical splitter for mail list if nothing is selected as default

Browse Source
This commit is contained in:
Hadi Nategh 2017-08-24 12:14:06 +02:00
parent 82081eb58a
commit 26c4425e2b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -587,6 +587,8 @@ class mail_ui
case "fixed": case "fixed":
$etpl->setElementAttribute('mailSplitter', 'orientation', 'h'); $etpl->setElementAttribute('mailSplitter', 'orientation', 'h');
break; break;
default:
$etpl->setElementAttribute('mailSplitter', 'orientation', 'v');
} }
return $etpl->exec('mail.mail_ui.index',$content,$sel_options,$readonlys,$preserv); return $etpl->exec('mail.mail_ui.index',$content,$sel_options,$readonlys,$preserv);
} }
@ -2262,7 +2264,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
{ {
if (empty($_data[$key]) || in_array($key, $discards)) unset($_data[$key]); if (empty($_data[$key]) || in_array($key, $discards)) unset($_data[$key]);
} }
$response->data($smime->generate_certificate($_data, $ca, $passphrase)); $response->data($smime->generate_certificate($_data, $ca, null, $passphrase));
} }
/** /**

4
mail/js/app.js
View File

@ -168,8 +168,8 @@ app.classes.mail = AppJS.extend(
var nm = this.et2.getWidgetById(this.nm_index); var nm = this.et2.getWidgetById(this.nm_index);
this.mail_isMainWindow = true; this.mail_isMainWindow = true;
var previewPane = this.egw.preference('previewPane', 'mail'); var previewPane = this.egw.preference('previewPane', 'mail');
this.mail_disablePreviewArea(previewPane !== 'fixed' && previewPane !== 'vertical'); this.mail_disablePreviewArea(previewPane !== 'fixed' && previewPane !== 'vertical' && previewPane == true);
if (previewPane == 'vertical') nm.header.right_div.addClass('vertical_splitter'); if (previewPane == 'vertical' || previewPane != true) nm.header.right_div.addClass('vertical_splitter');
//Get initial folder status //Get initial folder status
this.mail_refreshFolderStatus(undefined,undefined,false); this.mail_refreshFolderStatus(undefined,undefined,false);