8 gadus atpakaļ · 3456945860
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
@@ -170,12 +170,12 @@
 
				 

			
 
				 <#macro commonFooter >

			
 
				 	<footer class="main-footer">

			
 
				+        Powered by <b>XXL-JOB</b> 1.6

			
 
				 		<div class="pull-right hidden-xs">

			
 
				-			<b>Version</b> 1.6

			
 
				+            <strong>Copyright &copy; 2015-${.now?string('yyyy')} &nbsp;

			
 
				+                <a href="https://github.com/xuxueli/xxl-job" target="_blank" >github</a>&nbsp;

			
 
				+                <a href="http://my.oschina.net/xuxueli/blog/690978" target="_blank" >oschina</a>

			
 
				+            </strong><!-- All rights reserved. -->

			
 
				 		</div>

			
 
				-		<strong>Copyright &copy; 2015-${.now?string('yyyy')} &nbsp;

			
 
				-			<a href="https://github.com/xuxueli/xxl-job" target="_blank" >github</a>&nbsp;

			
 
				-			<a href="http://my.oschina.net/xuxueli/blog/690978" target="_blank" >oschina</a>

			
 
				-		</strong><!-- All rights reserved. -->

			
 
				 	</footer>

			
 
				 </#macro>
			
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl
@@ -4,10 +4,6 @@
 
				     <title>任务调度中心</title>
			
 
				 <#import "/common/common.macro.ftl" as netCommon>
			
 
				 <@netCommon.commonStyle />
			
 
				-    <style>
			
 
				-        html{  background-color: whitesmoke;  }
			
 
				-        .skin-blue .wrapper {  background-color: whitesmoke;  }
			
 
				-    </style>
			
 
				 </head>
			
 
				 <body class="hold-transition skin-blue layout-top-nav">
			
 
				 
			
@@ -47,11 +43,11 @@
 
				         </nav>
			
 
				     </header>
			
 
				 
			
 
				-    <div>
			
 
				-        <pre>
			
 
				+    <div class="content-wrapper" >
			
 
				+        <pre style="font-size:12px;position: absolute; height:100%;width:100%;" id="logConsolePre" >
			
 
				             <div id="logConsole"></div>
			
 
				             <li class="fa fa-refresh fa-spin" style="font-size: 20px;float: left;" id="logConsoleRunning" ></li>
			
 
				-            <div style="margin-top: 50px;" ></div>
			
 
				+            <div><hr><i class="fa fa-fw fa-hand-pointer-o"></i><hr></div>
			
 
				         </pre>
			
 
				     </div>
			
 
				 
			
--- a/xxl-job-admin/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map
+++ b/xxl-job-admin/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map
--- a/xxl-job-admin/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css
+++ b/xxl-job-admin/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css
--- a/xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js
@@ -58,7 +58,8 @@ $(function() {
 
				                     pullFailCount = 0;
			
 
				 
			
 
				                     // scroll to bottom
			
 
				-                    scrollTo(0, document.body.scrollHeight);
			
 
				+                    //scrollTo(0, document.body.scrollHeight);
			
 
				+                    $('#logConsolePre').scrollTop( document.body.scrollHeight + 300 );
			
 
				 
			
 
				                 } else {
			
 
				                     console.log('pullLog fail:'+data.msg);