Skip to content

Commit

Permalink
Rolling log
Browse files Browse the repository at this point in the history
  • Loading branch information
xueli.xue committed Mar 25, 2017
1 parent 7679403 commit 3456945
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand Down Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion xxl-job-admin/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map
100644 → 100755

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions xxl-job-admin/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css
100644 → 100755

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 3456945

Please sign in to comment.