Reinserting support for the "iframe_height" option. This might be done in a better...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12923 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/mime.php b/functions/mime.php
index ee66d81e56e3810fc573b00ba48e607d45af014e..c151ecf6f5cb2d6d30c52a7426fad33f3827ccc0 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -421,6 +421,7 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma
 
                 global $oTemplate;
                 $oTemplate->assign('iframe_url', $iframeurl);
+                $oTemplate->assign('iframe_height', $iframe_height);
                 $oTemplate->assign('html_body', $html_body);
 
                 $body = $oTemplate->fetch('read_html_iframe.tpl');

diff --git a/templates/default/css/default.css b/templates/default/css/default.css
index c01045b23621bf5b78c8261a9ea54049cc9052e3..44fb5dc82748bddc4fd5931506cedbafc9aa20d7 100644 (file)
--- a/templates/default/css/default.css
+++ b/templates/default/css/default.css
@@ -1068,7 +1068,6 @@ div.htmlIframe {
 }
 
 div.htmlIframe iframe {
-    height: 250px;
     width:100%;
 }
 

diff --git a/templates/default/read_html_iframe.tpl b/templates/default/read_html_iframe.tpl
index b673b446f1908d457063cae291fe8862f6a27bb1..addeea93d09203f67d2eb1af0061b38808525dfd 100644 (file)
--- a/templates/default/read_html_iframe.tpl
+++ b/templates/default/read_html_iframe.tpl
@@ -24,7 +24,7 @@ extract($t);
 ?>
 <div class="htmlIframe">
 <?php echo _("Viewing HTML formatted email"); ?>
-<iframe name="message_frame" src="<?php echo $iframe_url; ?>" frameborder="1" marginwidth="0" marginheight="0" scrolling="auto">
+<iframe name="message_frame" src="<?php echo $iframe_url; ?>" frameborder="1" marginwidth="0" marginheight="0" scrolling="auto" height="<?php echo $iframe_height; ?>">
 <?php echo $html_body; ?>
 </iframe>
 </div>
\ No newline at end of file