holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests 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-02-27 16:28:51 +00:00
parent 9ae9ae7274
commit cc946b7c3e
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mail/js/app.js
View File

@ -3508,11 +3508,17 @@ app.classes.mail = AppJS.extend(
'acc_id': acc_id,
'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);
}
else
{
this.loadIframe(url);
}
},
/**
@ -3540,7 +3546,11 @@ app.classes.mail = AppJS.extend(
quotaipercent.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())
{

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

@ -115,6 +115,6 @@
</box>
</vbox>
</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>
</overlay>