From cc946b7c3ed1c14150116adf85813c1b54682a15 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Fri, 27 Feb 2015 16:28:51 +0000
Subject: [PATCH] Fix mail sieve rules issues regarding idots and mobile theme

---
 mail/js/app.js                   | 16 +++++++++++++---
 mail/templates/default/index.xet |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index 40e3a42788..8a79381e85 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -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())
 				{
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index 151fababb4..c0281806d8 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -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>