extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-20 05:31:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix mail sieve rules issues regarding idots and mobile theme

Browse Source
This commit is contained in:
Hadi Nategh 2015-03-03 09:30:29 +00:00
parent da7840a580
commit e3ebdd8402
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mail/js/app.js
View File

@ -3458,10 +3458,16 @@ app.classes.mail = AppJS.extend(
'ajax': 'true' 'ajax': 'true'
}); });
if (!this.loadIframe(url)) // an ugly hack for idots to show up sieve rules not in an iframe
// but as new link, better to remove it after get rid of idots template
if (typeof window.framework == 'undefined')
{ {
this.egw.open_link(url); this.egw.open_link(url);
} }
else
{
this.loadIframe(url);
}
}, },
/** /**
@ -3489,7 +3495,11 @@ app.classes.mail = AppJS.extend(
quotaipercent.set_disabled(!!_url); quotaipercent.set_disabled(!!_url);
iframe.set_disabled(!_url); iframe.set_disabled(!_url);
} }
else if (iframe.id == "extra_iframe") // extra_iframe used for showing up sieve rules
// need some special handling for mobile device
// as we wont have splitter, and also a fix for
// iframe with display none
if (iframe.id == "extra_iframe")
{ {
if (egwIsMobile()) if (egwIsMobile())
{ {

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

@ -115,6 +115,6 @@
</box> </box>
</vbox> </vbox>
</split> </split>
<iframe frameborder="1" height="100%" id="extra_iframe" scrolling="auto" width="100%" disabled="true"/> <iframe frameborder="1" id="extra_iframe" scrolling="auto" disabled="true"/>
</template> </template>
</overlay> </overlay>