diff --git a/pom.xml b/pom.xml index 91c7748c1d61e80880a259f16aef65f2e4599e02..bf8214e37787fd1bca5ec76df141c1d5de354b1c 100644 --- a/pom.xml +++ b/pom.xml @@ -283,7 +283,7 @@ + url="http://maven.codelibs.org/archive/elasticsearch/plugin/kopf/elasticsearch-kopf-1.5.7.1.zip" /> @@ -296,7 +296,7 @@ + src="${basedir}/target/plugins/elasticsearch-kopf-1.5.7.1.zip" /> diff --git a/src/main/webapp/WEB-INF/view/admin/system/index.jsp b/src/main/webapp/WEB-INF/view/admin/system/index.jsp index 8dfec66165e2ef65591cf8dee1cbfe9f4f8621f7..62628a8be3f99aa2018b0e9ab717cd7b2f0089a9 100644 --- a/src/main/webapp/WEB-INF/view/admin/system/index.jsp +++ b/src/main/webapp/WEB-INF/view/admin/system/index.jsp @@ -13,12 +13,13 @@ -
- +
+
+ diff --git a/src/main/webapp/js/admin/system.js b/src/main/webapp/js/admin/system.js new file mode 100644 index 0000000000000000000000000000000000000000..b5d3cac43e0945855b7435dae3906376f5f4d4be --- /dev/null +++ b/src/main/webapp/js/admin/system.js @@ -0,0 +1,7 @@ +$(function(){ + var $content = $('#content'); + var $contentFrame = $('#contentFrame'); + $contentFrame.load(function(){ + $(this).height($content.height()); + }); +});