From 2cbec540b96a9184e3d1b7bb1d432bd76c5fd1ff Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@yahoo.co.jp>
Date: Sat, 17 Oct 2015 14:25:35 +0900
Subject: [PATCH] update kopf
---
pom.xml | 4 ++--
src/main/webapp/WEB-INF/view/admin/system/index.jsp | 5 +++--
src/main/webapp/js/admin/system.js | 7 +++++++
3 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 src/main/webapp/js/admin/system.js
diff --git a/pom.xml b/pom.xml
index 91c7748c1..bf8214e37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,7 +283,7 @@
<url
url="${maven.release.repo.url}/org/codelibs/elasticsearch-langfield/1.7.0/elasticsearch-langfield-1.7.0.zip" />
<url
- url="http://maven.codelibs.org/archive/elasticsearch/plugin/kopf/elasticsearch-kopf-1.5.7.zip" />
+ url="http://maven.codelibs.org/archive/elasticsearch/plugin/kopf/elasticsearch-kopf-1.5.7.1.zip" />
</get>
<delete dir="${basedir}/plugins" />
<mkdir dir="${basedir}/plugins" />
@@ -296,7 +296,7 @@
<unzip dest="${basedir}/plugins/langfield"
src="${basedir}/target/plugins/elasticsearch-langfield-1.7.0.zip" />
<unzip dest="${basedir}/plugins/kopf"
- src="${basedir}/target/plugins/elasticsearch-kopf-1.5.7.zip" />
+ src="${basedir}/target/plugins/elasticsearch-kopf-1.5.7.1.zip" />
</tasks>
</configuration>
<goals>
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 8dfec6616..62628a8be 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 @@
<jsp:param name="menuType" value="system" />
</jsp:include>
- <div class="content-wrapper">
- <iframe src="<%=request.getContextPath()%>/admin/server/_plugin/kopf/" width="100%" height="800" seamless></iframe>
+ <div id="content" class="content-wrapper">
+ <iframe id="contentFrame" src="<%=request.getContextPath()%>/admin/server/_plugin/kopf/" width="100%" height="400" seamless></iframe>
</div>
<jsp:include page="/WEB-INF/view/common/admin/footer.jsp"></jsp:include>
</div>
<jsp:include page="/WEB-INF/view/common/admin/foot.jsp"></jsp:include>
+ <script src="${f:url('/js/admin/system.js')}" type="text/javascript"></script>
</body>
</html>
diff --git a/src/main/webapp/js/admin/system.js b/src/main/webapp/js/admin/system.js
new file mode 100644
index 000000000..b5d3cac43
--- /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());
+ });
+});
--
GitLab