* Mail/preferences: Add Preview Pane option into mail preferences in order to be able to show/hide mail preview pane (split panel)

This commit is contained in:
Hadi Nategh 2015-09-02 13:00:35 +00:00
parent beeaf21521
commit 1563f9d43a
6 changed files with 79 additions and 58 deletions

View File

@ -408,6 +408,17 @@ class mail_hooks
'admin' => False,
'default'=> 'text',
),
'previewPane' => array(
'type' => 'select',
'label' => 'Preview pane',
'help' => 'Show/Hide preview pane in mail list view',
'name' => 'previewPane',
'values' => array(
'0' => lang('show'),
'1' => lang('hide')
),
'default' => '0'
),
);
if (!$GLOBALS['egw_info']['apps']['stylite']) unset($settingsArray['attachVCardAtCompose']);
return $settingsArray;

View File

@ -722,6 +722,9 @@ class mail_ui
{
self::callWizard($e->getMessage(),true, 'error');
}
// Check preview pane is enabled, then show spliter
if ($this->mail_bo->mailPreferences['previewPane']) $etpl->setElementAttribute('mail.index.spliter', 'template', 'mail.index.nospliter');
return $etpl->exec('mail.mail_ui.index',$content,$sel_options,$readonlys,$preserv);
}

View File

@ -656,17 +656,10 @@ app.classes.mail = AppJS.extend(
var splitter = this.et2.getWidgetById('mailSplitter');
// return if there's no splitter we maybe in mobile mode
if (typeof splitter == 'undefined' || splitter == null) return;
var splitterDN = splitter.getDOMNode();
if(splitter.isDocked())
{
this.mail_previewAreaActive = false;
}
//this.et2.getWidgetById('mailPreviewHeadersFrom').set_disabled(_value);
//this.et2.getWidgetById('mailPreviewHeadersTo').set_disabled(_value);
//this.et2.getWidgetById('mailPreviewHeadersDate').set_disabled(_value);
//this.et2.getWidgetById('mailPreviewHeadersSubject').set_disabled(_value);
this.et2.getWidgetById('mailPreview').set_disabled(_value);
//Dock the splitter always if we are browsing with mobile
if (_value==true)

View File

@ -209,6 +209,7 @@ get acl rights failed from imap server! mail de Die Zugriffskontrollrechte konnt
greater than mail de größer als
header mail de Kopfzeilen
header lines mail de Kopfzeilen anzeigen
hide mail de ausblenden
hold %1 to drag files to your computer mail de %1 halten um Dateien auf Ihren Computer zu ziehen
home page folders mail de Darstellung von E-Mails auf der Startseite
hostname or ip mail de Hostname oder IP
@ -330,6 +331,7 @@ prevent managing filters mail de Zugriff auf Filterregeln deaktivieren
prevent managing folders mail de Zugriff auf die Ordnerverwaltung deaktivieren
prevent managing notifications mail de Zugriff auf Benachrichtigungen deaktivieren
prevent managing vacation notice mail de Zugriff auf die Abwesenheitsbenachrichtigung deaktivieren
preview pane mail de Mailvorschau
primary profile mail de Primäres Profil
printview mail de Druckansicht
processing of file %1 failed. failed to meet basic restrictions. mail de Das Verarbeiten der Datei %1 ist fehlgeschlagen. Grundlegende Voraussetzungen wurden nicht erfüllt.
@ -413,11 +415,13 @@ set / remove labels mail de Schlagworte setzen / entfernen
set it as default: mail de als Vorgabe speichern
should new messages show up on the home page mail de Wie sollen Nachrichten auf der Startseite angezeigt werden?
should signature be inserted after (standard) or before a reply or inline forward, and should signature be visible and changeable during compose. mail de Soll die Signatur nach (gemäß Standard) oder vor dem zitierten Text einer email eingefügt werden und soll diese bearbeitbar sein?
show mail de anzeigen
show all folders mail de Darstellung aller E-Mail Ordner
show all folders, (subscribed and unsubscribed) in main screen folder pane mail de Zeige alle Ordner, die in Ihrem Postfach eingerichtet sind. Expliziere Deaktivierung der Abonnement-Funktion des E-Mail Programms. Dies kann sich negativ auf die Performance Ihrer EGroupware auswirken.
show new messages on home page mail de Anzeigen von neuen E-Mails auf der Startseite
show test connection section and control the level of info displayed? mail de Zeige Verbindungstest Link an und spezifiziere das Ausmaß der angezeigten Information?
show test connection section and control the level of info displayed?? mail de Soll der Verbindungstest und die dazugehörigen Informationen angezeigt werden?
show/hide preview pane in mail list view mail de Mailvorschau anzeigen oder ausblenden
sieve mail de Sieve
sieve connection status mail de Sieve Verbindungsstatus
sieve not activated mail de Sieve nicht aktiviert

View File

@ -209,6 +209,7 @@ get acl rights failed from imap server! mail en Get ACL rights failed from IMAP
greater than mail en greater than
header mail en Header
header lines mail en Header lines
hide mail en hide
hold %1 to drag files to your computer mail en Hold %1 to drag files to your computer
home page folders mail en home page folders
hostname or ip mail en Hostname or IP
@ -330,6 +331,7 @@ prevent managing filters mail en Prevent managing filters
prevent managing folders mail en Prevent managing folders
prevent managing notifications mail en Prevent managing notifications
prevent managing vacation notice mail en Prevent managing vacation notice
preview pane mail en Preview pane
primary profile mail en Primary Profile
printview mail en printview
processing of file %1 failed. failed to meet basic restrictions. mail en Processing of file %1 failed. Failed to meet basic restrictions.
@ -413,11 +415,13 @@ set / remove labels mail en Set / Remove Labels
set it as default: mail en set it as default:
should new messages show up on the home page mail en Should new messages show up on the Home page
should signature be inserted after (standard) or before a reply or inline forward, and should signature be visible and changeable during compose. mail en Should signature be inserted after (standard) or before a reply or inline forward, and should signature be visible and changeable during compose.
show mail en show
show all folders mail en show all Folders
show all folders, (subscribed and unsubscribed) in main screen folder pane mail en show all folders, (subscribed AND unsubscribed) in Main Screen Folder Pane
show new messages on home page mail en show new messages on home page
show test connection section and control the level of info displayed? mail en Show Test Connection section and control the level of info displayed?
show test connection section and control the level of info displayed?? mail en Show Test Connection section and control the level of info displayed??
show/hide preview pane in mail list view mail en Show/Hide preview pane in mail list view
sieve mail en Sieve
sieve connection status mail en Sieve Connection Status
sieve not activated mail en Sieve not activated

View File

@ -2,57 +2,7 @@
<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
<!-- $Id$ -->
<overlay>
<template id="mail.index.rows" template="" lang="" group="0" version="1.9.001">
<grid width="100%">
<columns>
<column width="25"/>
<column width="20"/>
<column width="20"/>
<column width="40%"/>
<column width="95"/>
<column width="95"/>
<column width="30%"/>
<column width="30%"/>
<column width="30%"/>
<column width="80"/>
</columns>
<rows>
<row class="th">
<nextmatch-sortheader label="ID" id="uid" readonly="true"/>
<nextmatch-header statustext="Status" label="St." id="status"/>
<nextmatch-header statustext="attachments, ..." label="..." id="attachments"/>
<nextmatch-sortheader label="subject" id="subject"/>
<nextmatch-sortheader align="center" label="date" id="date" sortmode="DESC"/>
<nextmatch-sortheader align="center" label="arrival" id="arrival"/>
<nextmatch-sortheader label="mail-address" id="address"/>
<nextmatch-sortheader label="to" id="toaddress"/>
<nextmatch-sortheader label="from" id="fromaddress"/>
<nextmatch-sortheader align="center" label="size" id="size"/>
</row>
<row class="$row_cont[class]">
<description id="${row}[uid]" no_lang="1" readonly="true"/>
<description span="1" class="status_img"/>
<html id="${row}[attachments]"/>
<description id="${row}[subject]" no_lang="1"/>
<date-time_today align="center" id="${row}[date]" readonly="true"/>
<date-time_today align="center" id="${row}[modified]" readonly="true"/>
<url-email id="${row}[address]" contact_plus = "true" readonly="true"/>
<url-email id="${row}[toaddress]" contact_plus = "true" readonly="true"/>
<url-email id="${row}[fromaddress]" contact_plus = "true" readonly="true"/>
<vfs-size align="right" id="${row}[size]" no_lang="1" readonly="true"/>
</row>
</rows>
</grid>
</template>
<template id="mail.index" template="" lang="" group="0" version="1.9.001">
<tree autoloading="mail.mail_ui.ajax_foldertree" id="nm[foldertree]" onclick="app.mail.mail_changeFolder" parent_node="mail-tree_target" onopenstart="app.mail.subscription_autoloadingStart" onopenend="app.mail.subscription_autoloadingEnd" highlighting="true"/>
<html id="msg"/>
<buttononly id="button[mailcreate]" onclick="app.mail.mail_compose(false);" label="Compose" parent_node="mail-index_buttonmailcreate"/>
<hbox class="mail-index_quotabox"><progress id="nm[quotainpercent]" label="@nm[quota]" class="@nm[quotaclass]"/></hbox>
<hbox class="mail-index_vacation"><vbox>
<description id="nm[vacationnotice]" class="@nm[vacationclass]"/>
<description id="nm[vacationrange]" class="@nm[vacationrangeclass]"/></vbox>
</hbox>
<template id="mail.index.spliter" height="100%" template="" lang="" group="0" version="1.9.001">
<split dock_side="bottomDock" id="mailSplitter" orientation="h">
<nextmatch id="nm" onselect="app.mail.mail_preview" template="mail.index.rows"/>
<vbox id="mailPreview" width="100%">
@ -118,6 +68,62 @@
</box>
</vbox>
</split>
</template>
<template id="mail.index.nospliter" template="" lang="" group="0" version="1.9.001">
<nextmatch id="nm" onselect="app.mail.mail_preview" template="mail.index.rows"/>
</template>
<template id="mail.index.rows" template="" lang="" group="0" version="1.9.001">
<grid width="100%">
<columns>
<column width="25"/>
<column width="20"/>
<column width="20"/>
<column width="40%"/>
<column width="95"/>
<column width="95"/>
<column width="30%"/>
<column width="30%"/>
<column width="30%"/>
<column width="80"/>
</columns>
<rows>
<row class="th">
<nextmatch-sortheader label="ID" id="uid" readonly="true"/>
<nextmatch-header statustext="Status" label="St." id="status"/>
<nextmatch-header statustext="attachments, ..." label="..." id="attachments"/>
<nextmatch-sortheader label="subject" id="subject"/>
<nextmatch-sortheader align="center" label="date" id="date" sortmode="DESC"/>
<nextmatch-sortheader align="center" label="arrival" id="arrival"/>
<nextmatch-sortheader label="mail-address" id="address"/>
<nextmatch-sortheader label="to" id="toaddress"/>
<nextmatch-sortheader label="from" id="fromaddress"/>
<nextmatch-sortheader align="center" label="size" id="size"/>
</row>
<row class="$row_cont[class]">
<description id="${row}[uid]" no_lang="1" readonly="true"/>
<description span="1" class="status_img"/>
<html id="${row}[attachments]"/>
<description id="${row}[subject]" no_lang="1"/>
<date-time_today align="center" id="${row}[date]" readonly="true"/>
<date-time_today align="center" id="${row}[modified]" readonly="true"/>
<url-email id="${row}[address]" contact_plus = "true" readonly="true"/>
<url-email id="${row}[toaddress]" contact_plus = "true" readonly="true"/>
<url-email id="${row}[fromaddress]" contact_plus = "true" readonly="true"/>
<vfs-size align="right" id="${row}[size]" no_lang="1" readonly="true"/>
</row>
</rows>
</grid>
</template>
<template id="mail.index" template="" lang="" group="0" version="1.9.001">
<tree autoloading="mail.mail_ui.ajax_foldertree" id="nm[foldertree]" onclick="app.mail.mail_changeFolder" parent_node="mail-tree_target" onopenstart="app.mail.subscription_autoloadingStart" onopenend="app.mail.subscription_autoloadingEnd" highlighting="true"/>
<html id="msg"/>
<buttononly id="button[mailcreate]" onclick="app.mail.mail_compose(false);" label="Compose" parent_node="mail-index_buttonmailcreate"/>
<hbox class="mail-index_quotabox"><progress id="nm[quotainpercent]" label="@nm[quota]" class="@nm[quotaclass]"/></hbox>
<hbox class="mail-index_vacation"><vbox>
<description id="nm[vacationnotice]" class="@nm[vacationclass]"/>
<description id="nm[vacationrange]" class="@nm[vacationrangeclass]"/></vbox>
</hbox>
<template id="mail.index.spliter" height="100%" template="mail.index.spliter"/>
<iframe frameborder="1" id="extra_iframe" scrolling="auto" disabled="true"/>
</template>
</overlay>