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

Avoid collision of template ids for mail splitter templates

Browse Source
This commit is contained in:
Hadi Nategh 2016-08-02 12:32:57 +02:00
parent 7dde8d0938
commit b96a40f49f
3 changed files with 6 additions and 6 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

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

2
mail/js/app.js
View File

@ -3845,7 +3845,7 @@ app.classes.mail = AppJS.extend(
*/
loadIframe: function (_url, _iFrame)
{
var mailSplitter = this.et2.getWidgetById('mail.index.spliter');
var mailSplitter = this.et2.getWidgetById('splitter');
var quotaipercent = this.et2.getWidgetById('nm[quotainpercent]');
var iframe = _iFrame || this.et2.getWidgetById('extra_iframe');
if (typeof iframe != 'undefined' && iframe)

6
mail/templates/default/index.xet
View File

@ -2,7 +2,7 @@
<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
<!-- $Id$ -->
<overlay>
<template id="mail.index.spliter" height="100%" template="" lang="" group="0" version="1.9.001">
<template id="mail.index.splitter" 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" header_left="mail.index.add" header_right="mail.index.header_right"/>
<vbox id="mailPreview" width="100%">
@ -69,7 +69,7 @@
</vbox>
</split>
</template>
<template id="mail.index.nospliter" template="" lang="" group="0" version="1.9.001">
<template id="mail.index.nosplitter" template="" lang="" group="0" version="1.9.001">
<nextmatch id="nm" onselect="app.mail.mail_preview" template="mail.index.rows" header_left="mail.index.add" header_right="mail.index.header_right"/>
</template>
<template id="mail.index.rows" template="" lang="" group="0" version="1.9.001">
@ -130,7 +130,7 @@
</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"/>
<template id="mail.index.spliter" height="100%" template="mail.index.spliter"/>
<template id="splitter" height="100%" template="mail.index.splitter"/>
<iframe frameborder="1" id="extra_iframe" scrolling="auto" disabled="true"/>
</template>
</overlay>