Initial commit
This commit is contained in:
@@ -0,0 +1,86 @@
|
||||
<include file="Inc:head"/>
|
||||
<div class="container-fluid">
|
||||
|
||||
<div id=view></div>
|
||||
|
||||
<div class="version_mark">
|
||||
<div class="version_mark_1">当前代码</div>
|
||||
<div class="version_mark_2">{:date("Y-m-d H:i:s",$history[addtime])}修改</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
|
||||
|
||||
|
||||
<include file="Inc/foot"/>
|
||||
<!--代码编辑器插件-->
|
||||
<link rel="stylesheet" type="text/css" href="/Public/Admin/codemirror/lib/codemirror.css">
|
||||
<link rel="stylesheet" href="/Public/Admin/codemirror/theme/abcdef.css">
|
||||
<link rel="stylesheet" href="/Public/Admin/codemirror/doc/docs.css">
|
||||
<link rel="stylesheet" href="/Public/Admin/codemirror/addon/merge/merge.css">
|
||||
|
||||
<script src="/Public/Admin/codemirror/lib/codemirror.js"></script>
|
||||
<script src="/Public/Admin/codemirror/mode/xml/xml.js"></script>
|
||||
<script src="/Public/Admin/codemirror/addon/merge/merge.js"></script>
|
||||
<script src="/Public/Admin/codemirror/lib/diff_match_patch.js"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
var value, orig1, orig2, dv, panes = 2, highlight = true, connect = null, collapse = false;
|
||||
function initUI() {
|
||||
if (value == null) return;
|
||||
var target = document.getElementById("view");
|
||||
target.innerHTML = "";
|
||||
dv = CodeMirror.MergeView(target, {
|
||||
value: value,
|
||||
origLeft: panes == 3 && !collapse && !connect ? orig1 : null,
|
||||
orig: orig2,
|
||||
lineNumbers: true,
|
||||
mode: "text/html",
|
||||
highlightDifferences: highlight,
|
||||
connect: connect,
|
||||
collapseIdentical: collapse
|
||||
});
|
||||
}
|
||||
|
||||
function toggleDifferences() {
|
||||
dv.setShowDifferences(highlight = !highlight);
|
||||
}
|
||||
|
||||
window.onload = function() {
|
||||
$.get("{:U('get_now_content',array('template_id'=>$_GET[template_id],'history_id'=>$_GET[history_id]))}",function(result){
|
||||
value=result.info.now_content;
|
||||
orig1=result.info.now_content;
|
||||
orig2=result.info.history_content;
|
||||
initUI();
|
||||
},"json");
|
||||
|
||||
|
||||
|
||||
};
|
||||
|
||||
function mergeViewHeight(mergeView) {
|
||||
function editorHeight(editor) {
|
||||
if (!editor) return 0;
|
||||
return editor.getScrollInfo().height;
|
||||
}
|
||||
return Math.max(editorHeight(mergeView.leftOriginal()),
|
||||
editorHeight(mergeView.editor()),
|
||||
editorHeight(mergeView.rightOriginal()));
|
||||
}
|
||||
|
||||
function resize(mergeView) {
|
||||
var height = mergeViewHeight(mergeView);
|
||||
for(;;) {
|
||||
if (mergeView.leftOriginal())
|
||||
mergeView.leftOriginal().setSize(null, height);
|
||||
mergeView.editor().setSize(null, height);
|
||||
if (mergeView.rightOriginal())
|
||||
mergeView.rightOriginal().setSize(null, height);
|
||||
|
||||
var newHeight = mergeViewHeight(mergeView);
|
||||
if (newHeight >= height) break;
|
||||
else height = newHeight;
|
||||
}
|
||||
mergeView.wrap.style.height = 500 + "px";
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,53 @@
|
||||
<include file="Inc:head"/>
|
||||
<div class="container-fluid" style="min-height:300px;">
|
||||
|
||||
|
||||
<div style="text-align:right; float:right"></div>
|
||||
|
||||
<div class="row-fluid">
|
||||
<div class="span12">
|
||||
<div class="widget-box">
|
||||
<div class="widget-content nopadding">
|
||||
|
||||
<table class="table table-bordered table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>修改时间</th>
|
||||
<th>修改者</th>
|
||||
<th>操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<foreach name="data" item="v" >
|
||||
<tr>
|
||||
<td style="text-align: center;">{:date("Y-m-d H:i:s",$v[addtime])}</td>
|
||||
<td style="text-align: center;">{$v.username}</td>
|
||||
<td class="center">
|
||||
<a href="{:U('differ',array('template_id'=>$v[template_id],'history_id'=>$v[id]))}" target="_blank" class="btn btn-primary btn-mini">比差异</a>
|
||||
<button class="btn btn-danger btn-mini" onclick="go_history(this)" content="{$v.content}">还原</button>
|
||||
</td>
|
||||
</tr>
|
||||
</foreach>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<include file="Inc/foot"/>
|
||||
<script language="javascript">
|
||||
function go_history(obj){
|
||||
if(confirm("您确定要还原吗?")==false){
|
||||
return;
|
||||
}
|
||||
var content=$(obj).attr("content");
|
||||
parent.$('#template_editor').val(content);
|
||||
parent.updateCode();
|
||||
parent.layer.closeAll();
|
||||
}
|
||||
</script>
|
||||
Reference in New Issue
Block a user