Skip to content

X
XXL-JOB
提交 34569458 authored 作者: xueli.xue's avatar xueli.xue
浏览文件
操作

Rolling log

上级 76794031
隐藏空白字符变更
内嵌 并排
正在显示 包含 10 行增加 和 14 行删除
xxl-job-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
浏览文件 @ 34569458
......@@ -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>
\ No newline at end of file
xxl-job-admin/src/main/webapp/WEB-INF/template/joblog/joblog.detail.ftl
浏览文件 @ 34569458
......@@ -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>
......
xxl-job-admin/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.css.map 100644 → 100755
浏览文件 @ 34569458
This source diff could not be displayed because it is too large. You can view the blob instead.
xxl-job-admin/src/main/webapp/static/adminlte/bootstrap/css/bootstrap.min.css 100644 → 100755
浏览文件 @ 34569458
This source diff could not be displayed because it is too large. You can view the blob instead.
xxl-job-admin/src/main/webapp/static/js/joblog.detail.1.js
浏览文件 @ 34569458
......@@ -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);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论