From 3370a18e250b3bebd648c3280c646b645dd1b989 Mon Sep 17 00:00:00 2001
From: zhangxin10 <curtain.xin@gmail.com>
Date: Fri, 25 Dec 2015 14:48:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B1=95=E7=A4=BATraceId?=
 =?UTF-8?q?=E7=9A=84iframe=E8=87=AA=E9=80=82=E5=BA=94=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 skywalking-webui/src/main/webapp/ftl/index.ftl | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/skywalking-webui/src/main/webapp/ftl/index.ftl b/skywalking-webui/src/main/webapp/ftl/index.ftl
index 1c745a999..5ab3d2e37 100644
--- a/skywalking-webui/src/main/webapp/ftl/index.ftl
+++ b/skywalking-webui/src/main/webapp/ftl/index.ftl
@@ -37,13 +37,22 @@
 
 	<div>
 		<div class="text-center" style="height: 700px">
-			<iframe id="showTraceLog" border=2 frameborder=0 width=100%
-				height=100% marginheight=0 marginwidth=0 scrolling=yes src=""></iframe>
+			<iframe id="showTraceLog" width="100%" border=2 frameborder=0 marginheight=0 marginwidth=0 scrolling=yes src="" onLoad="iFrameHeight()"></iframe>
 		</div>
 	</div>
 	<input type="hidden" id="uid" value="${(userInfo?eval).uid!''}">
 	<!-- script references -->
 	<@common.importJavaScript />
 	<script src="${base}/js/webui-0.1.js"></script>
+	<script>
+        function iFrameHeight() {
+            var ifm= document.getElementById("showTraceLog");
+            var subWeb = document.frames ? document.frames["showTraceLog"].document : ifm.contentDocument;
+            if(ifm != null && subWeb != null) {
+                ifm.height = subWeb.body.scrollHeight;
+                ifm.width = subWeb.body.scrollWidth;
+            }
+        }
+	</script>
 </body>
 </html>
\ No newline at end of file