管理画面の高さを調整。

diff --git a/widgets/admin_main/include/template/configwidget.tmpl.html b/widgets/admin_main/include/template/configwidget.tmpl.html
index 697e775..dfe01c5 100644 (file)
--- a/widgets/admin_main/include/template/configwidget.tmpl.html
+++ b/widgets/admin_main/include/template/configwidget.tmpl.html
@@ -5,35 +5,29 @@
  *\r
  * @package    Magic3 Framework\r
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>\r
- * @copyright  Copyright 2006-2015 Magic3 Project.\r
+ * @copyright  Copyright 2006-2016 Magic3 Project.\r
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License\r
  * @version    SVN: $Id$\r
  * @link       http://www.magic3.org\r
  */\r
 <patTemplate:tmpl name="_widget">\r
-<iframe id="preview" class="m3adjust" name="preview" src="{URL}" width="100%" height="100%" frameborder="0" scrolling="no" allowtransparency="true">実際の画面</iframe>\r
 <script type="text/javascript">\r
 //<![CDATA[\r
 function m3AdjustWindow()\r
 {\r
-//     var min = $(window).height() -30;\r
-//     m3AdjustHeight(this, min);\r
-       $("#preview").height($("#preview").contents().find("html").height());\r
+       var height = $("#preview").contents().find("html").height();\r
+       if (height < _m3ConfigWindowMinHeight) height = _m3ConfigWindowMinHeight;\r
+       $("#preview").height(height);\r
 }\r
-// ウィンドウサイズの調整\r
 $(function(){\r
        // フルサイズ幅で表示\r
        $('.container').removeClass('container');\r
        \r
-/*     var min = $(window).height() -30;\r
-       $('#preview').load(function(){\r
-               m3AdjustHeight(this, min);\r
-       });\r
-       $('#preview').triggerHandler('load');*/\r
-//     $('#preview').iframeAutoHeight();\r
+       // ウィンドウ高さの調整\r
        var minHeight = $(window).height();\r
        $('#preview').iframeAutoHeight({ minHeight: minHeight });\r
 });\r
 //]]>\r
 </script>\r
+<iframe id="preview" class="m3adjust" name="preview" src="{URL}" width="100%" height="100%" frameborder="0" scrolling="no" allowtransparency="true">実際の画面</iframe>\r
 </patTemplate:tmpl>
\ No newline at end of file

diff --git a/widgets/admin_main/include/template/resbrowse.tmpl.html b/widgets/admin_main/include/template/resbrowse.tmpl.html
index d343ca1..00ebdcf 100644 (file)
--- a/widgets/admin_main/include/template/resbrowse.tmpl.html
+++ b/widgets/admin_main/include/template/resbrowse.tmpl.html
@@ -13,8 +13,8 @@
 <patTemplate:tmpl name="_widget">\r
 <script type="text/javascript">\r
 //<![CDATA[\r
-// ウィンドウサイズの調整\r
 $(function(){\r
+       // ウィンドウサイズの調整\r
        var min = $(window).height() -30;\r
        $('#preview').load(function(){\r
                m3AdjustHeight(this, min);\r