瀏覽代碼

update kopf

Shinsuke Sugaya 9 年之前
父節點
當前提交
2cbec540b9
共有 3 個文件被更改,包括 12 次插入4 次删除
  1. 2 2
      pom.xml
  2. 3 2
      src/main/webapp/WEB-INF/view/admin/system/index.jsp
  3. 7 0
      src/main/webapp/js/admin/system.js

+ 2 - 2
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>

+ 3 - 2
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>

+ 7 - 0
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());
+    });
+});