Reinserting support for the "iframe_height" option. This might be done in a better...
authorjervfors <jervfors@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 7 Feb 2008 11:29:57 +0000 (11:29 +0000)
committerjervfors <jervfors@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 7 Feb 2008 11:29:57 +0000 (11:29 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12923 7612ce4b-ef26-0410-bec9-ea0150e637f0

functions/mime.php
templates/default/css/default.css
templates/default/read_html_iframe.tpl

index ee66d81..c151ecf 100644 (file)
@@ -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');
index c01045b..44fb5dc 100644 (file)
@@ -1068,7 +1068,6 @@ div.htmlIframe {
 }
 
 div.htmlIframe iframe {
-    height: 250px;
     width:100%;
 }
 
index b673b44..addeea9 100644 (file)
@@ -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