Diff
checker
文本
文本
图像
文档
Excel
文件夹
Legal
Enterprise
桌面版
定价
登录
下载 Diffchecker 桌面版
比较文本
查找两个文本文件之间的差异
工具
历史
实时编辑器
折叠未更改行
关闭换行
视图
拆分
统一
比对精度
智能
单词
字符
语法高亮
选择语法
忽略
文本转换
转到第一个差异
编辑输入
Diffchecker Desktop
运行Diffchecker最安全的方式。获取Diffchecker桌面应用:您的差异永远不会离开您的电脑!
获取桌面版
Untitled diff
创建于
7年前
差异永不过期
清除
导出
分享
解释
24 删除
行
总计
删除
字符
总计
删除
要继续使用此功能,请升级到
Diff
checker
Pro
查看价格
93 行
全部复制
29 添加
行
总计
添加
字符
总计
添加
要继续使用此功能,请升级到
Diff
checker
Pro
查看价格
97 行
全部复制
# IF C_USER_LOGIN #
# IF C_USER_LOGIN #
复制
已复制
复制
已复制
# INCLUDE ERROR_MESSAGE #
<section>
# INCLUDE LOGIN_FORM #
<header></header>
<div class="center">
<article class="">
# IF C_REGISTRATION_ENABLED #
# INCLUDE ERROR_MESSAGE #
<a
href="{U_REGISTER}"><i class="fa fa-ticket
"></i> {@registration}</a>
<br />
# INCLUDE LOGIN_FORM #
#
IF C_FB_AUTH_ENABLED
#
<div class="center">
<a class="
social-connect fb
" href="
${relative_url(UserUrlBuilder::connect('fb'))
}" title="
${LangLoader::get_message('facebook-connect', 'user-common')
}">
<i class="fa fa-facebook"></i>
</a>
# IF C_REGISTRATION_ENABLED #
# END
IF #
<a
class="infos-options"
href="{U_REGISTER}"><i class="fa fa-ticket
-alt" aria-hidden="true
"></i> {@registration}</a>
# IF C_GOOGLE_AUTH_ENABLED #
#
START external_auth
#
<a class="social-connect google" href="${relative_url(UserUrlBuilder::connect('google'))}" title="${LangLoader::get_message('google-connect', 'user-common')}"><i class="fa fa-google-plus"></i></a>
<a class="
{external_auth.CSS_CLASS} login-page
" href="
{external_auth.U_CONNECT
}" title="
{external_auth.NAME
}">
{external_auth.IMAGE_HTML}
</a>
# END
external_auth #
# ENDIF #
# ENDIF #
复制
已复制
复制
已复制
# ENDIF #
<div class="spacer"></div>
<div class="spacer"></div>
<a href="{U_FORGET_PASSWORD}"><i class="fa fa-question-circle"
aria-hidden="true"
></i> {L_FORGET_PASSWORD}</a>
<a href="{U_FORGET_PASSWORD}"><i class="fa fa-question-circle"
></i> {L_FORGET_PASSWORD}</a>
</div>
</div>
</article>
<footer></footer>
</section>
# ELSE #
# ELSE #
<div id="global" class="global-maintain">
<div id="global" class="global-maintain">
# IF C_MAINTAIN #
# IF C_MAINTAIN #
<div id="maintain" class="center">
<div id="maintain" class="center">
{L_MAINTAIN}
{L_MAINTAIN}
复制
已复制
复制
已复制
# IF C_DISPLAY_DELAY #
# IF C_DISPLAY_DELAY #
<div class="delay">
<div class="delay">
${LangLoader::get_message('maintain_delay', 'main')}
${LangLoader::get_message('maintain_delay', 'main')}
<div id="release">${LangLoader::get_message('loading', 'main')}...</div>
<div id="release">${LangLoader::get_message('loading', 'main')}...</div>
</div>
</div>
复制
已复制
复制
已复制
<script>
<script>
<!--
<!--
var release_timeout_seconds = 0;
var release_timeout_seconds = 0;
function release(year, month, day, hour, minute, second)
function release(year, month, day, hour, minute, second)
{
{
if(document.getElementById('release'))
if(document.getElementById('release'))
{
{
var sp_day = 86400;
var sp_day = 86400;
var sp_hour = 3600;
var sp_hour = 3600;
var sp_minute = 60;
var sp_minute = 60;
复制
已复制
复制
已复制
now = new Date({MAINTAIN_NOW_FORMAT}+release_timeout_seconds++);
now = new Date({MAINTAIN_NOW_FORMAT}+release_timeout_seconds++);
end = new Date(year, month, day, hour, minute, second);
end = new Date(year, month, day, hour, minute, second);
复制
已复制
复制
已复制
release_time = (end.getTime() - now.getTime())/1000;
release_time = (end.getTime() - now.getTime())/1000;
if( release_time <= 0 )
if( release_time <= 0 )
{
{
document.location.reload();
document.location.reload();
release_time = '0';
release_time = '0';
}
}
else
else
timeout = setTimeout('release('+year+', '+month+', '+day+', '+hour+', '+minute+', '+second+')', 1000);
timeout = setTimeout('release('+year+', '+month+', '+day+', '+hour+', '+minute+', '+second+')', 1000);
复制
已复制
复制
已复制
release_days = Math.floor(release_time/sp_day);
release_days = Math.floor(release_time/sp_day);
release_time -= (release_days * sp_day);
release_time -= (release_days * sp_day);
复制
已复制
复制
已复制
release_hours = Math.floor(release_time/sp_hour);
release_hours = Math.floor(release_time/sp_hour);
release_time -= (release_hours * sp_hour);
release_time -= (release_hours * sp_hour);
复制
已复制
复制
已复制
release_minutes = Math.floor(release_time/sp_minute);
release_minutes = Math.floor(release_time/sp_minute);
release_time -= (release_minutes * sp_minute);
release_time -= (release_minutes * sp_minute);
复制
已复制
复制
已复制
release_seconds = Math.floor(release_time);
release_seconds = Math.floor(release_time);
release_seconds = (release_seconds < 10) ? '0' + release_seconds : release_seconds;
release_seconds = (release_seconds < 10) ? '0' + release_seconds : release_seconds;
复制
已复制
复制
已复制
document.getElementById('release').innerHTML = '<strong>' + release_days + '</strong> ${LangLoader::get_message('days', 'date-common')} <strong>' + release_hours + '</strong> ${LangLoader::get_message('hours', 'date-common')} <strong>' + release_minutes + '</strong> ${LangLoader::get_message('minutes', 'date-common')} <strong>' + release_seconds + '</strong> ${LangLoader::get_message('seconds', 'date-common')}';
document.getElementById('release').innerHTML = '<strong>' + release_days + '</strong> ${LangLoader::get_message('days', 'date-common')} <strong>' + release_hours + '</strong> ${LangLoader::get_message('hours', 'date-common')} <strong>' + release_minutes + '</strong> ${LangLoader::get_message('minutes', 'date-common')} <strong>' + release_seconds + '</strong> ${LangLoader::get_message('seconds', 'date-common')}';
}
}
}
}
release({MAINTAIN_RELEASE_FORMAT});
release({MAINTAIN_RELEASE_FORMAT});
-->
-->
</script>
</script>
# ENDIF #
# ENDIF #
</div>
</div>
# IF NOT C_HAS_ERROR #
# IF NOT C_HAS_ERROR #
<p class="center">
<p class="center">
<a href="" id="connect" onclick="jQuery('#loginForm').toggle();return false;">${LangLoader::get_message('connection', 'user-common')}</a>
<a href="" id="connect" onclick="jQuery('#loginForm').toggle();return false;">${LangLoader::get_message('connection', 'user-common')}</a>
</p>
</p>
复制
已复制
复制
已复制
<script>
<script>
<!--
<!--
jQuery(document).ready(function() {
jQuery(document).ready(function() {
jQuery('#loginForm').hide();
jQuery('#loginForm').hide();
});
});
-->
-->
</script>
</script>
# ENDIF #
# ENDIF #
# ENDIF #
# ENDIF #
# INCLUDE ERROR_MESSAGE #
# INCLUDE ERROR_MESSAGE #
# INCLUDE LOGIN_FORM #
# INCLUDE LOGIN_FORM #
</div>
</div>
# ENDIF #
# ENDIF #
已保存差异
原始文本
打开文件
# IF C_USER_LOGIN # # INCLUDE ERROR_MESSAGE # # INCLUDE LOGIN_FORM # <div class="center"> # IF C_REGISTRATION_ENABLED # <a href="{U_REGISTER}"><i class="fa fa-ticket"></i> {@registration}</a><br /> # IF C_FB_AUTH_ENABLED # <a class="social-connect fb" href="${relative_url(UserUrlBuilder::connect('fb'))}" title="${LangLoader::get_message('facebook-connect', 'user-common')}"><i class="fa fa-facebook"></i></a> # ENDIF # # IF C_GOOGLE_AUTH_ENABLED # <a class="social-connect google" href="${relative_url(UserUrlBuilder::connect('google'))}" title="${LangLoader::get_message('google-connect', 'user-common')}"><i class="fa fa-google-plus"></i></a> # ENDIF # # ENDIF # <div class="spacer"></div> <a href="{U_FORGET_PASSWORD}"><i class="fa fa-question-circle"></i> {L_FORGET_PASSWORD}</a> </div> # ELSE # <div id="global" class="global-maintain"> # IF C_MAINTAIN # <div id="maintain" class="center"> {L_MAINTAIN} # IF C_DISPLAY_DELAY # <div class="delay"> ${LangLoader::get_message('maintain_delay', 'main')} <div id="release">${LangLoader::get_message('loading', 'main')}...</div> </div> <script> <!-- var release_timeout_seconds = 0; function release(year, month, day, hour, minute, second) { if(document.getElementById('release')) { var sp_day = 86400; var sp_hour = 3600; var sp_minute = 60; now = new Date({MAINTAIN_NOW_FORMAT}+release_timeout_seconds++); end = new Date(year, month, day, hour, minute, second); release_time = (end.getTime() - now.getTime())/1000; if( release_time <= 0 ) { document.location.reload(); release_time = '0'; } else timeout = setTimeout('release('+year+', '+month+', '+day+', '+hour+', '+minute+', '+second+')', 1000); release_days = Math.floor(release_time/sp_day); release_time -= (release_days * sp_day); release_hours = Math.floor(release_time/sp_hour); release_time -= (release_hours * sp_hour); release_minutes = Math.floor(release_time/sp_minute); release_time -= (release_minutes * sp_minute); release_seconds = Math.floor(release_time); release_seconds = (release_seconds < 10) ? '0' + release_seconds : release_seconds; document.getElementById('release').innerHTML = '<strong>' + release_days + '</strong> ${LangLoader::get_message('days', 'date-common')} <strong>' + release_hours + '</strong> ${LangLoader::get_message('hours', 'date-common')} <strong>' + release_minutes + '</strong> ${LangLoader::get_message('minutes', 'date-common')} <strong>' + release_seconds + '</strong> ${LangLoader::get_message('seconds', 'date-common')}'; } } release({MAINTAIN_RELEASE_FORMAT}); --> </script> # ENDIF # </div> # IF NOT C_HAS_ERROR # <p class="center"> <a href="" id="connect" onclick="jQuery('#loginForm').toggle();return false;">${LangLoader::get_message('connection', 'user-common')}</a> </p> <script> <!-- jQuery(document).ready(function() { jQuery('#loginForm').hide(); }); --> </script> # ENDIF # # ENDIF # # INCLUDE ERROR_MESSAGE # # INCLUDE LOGIN_FORM # </div> # ENDIF #
更改后文本
打开文件
# IF C_USER_LOGIN # <section> <header></header> <article class=""> # INCLUDE ERROR_MESSAGE # # INCLUDE LOGIN_FORM # <div class="center"> # IF C_REGISTRATION_ENABLED # <a class="infos-options" href="{U_REGISTER}"><i class="fa fa-ticket-alt" aria-hidden="true"></i> {@registration}</a> # START external_auth # <a class="{external_auth.CSS_CLASS} login-page" href="{external_auth.U_CONNECT}" title="{external_auth.NAME}">{external_auth.IMAGE_HTML}</a> # END external_auth # # ENDIF # <div class="spacer"></div> <a href="{U_FORGET_PASSWORD}"><i class="fa fa-question-circle" aria-hidden="true"></i> {L_FORGET_PASSWORD}</a> </div> </article> <footer></footer> </section> # ELSE # <div id="global" class="global-maintain"> # IF C_MAINTAIN # <div id="maintain" class="center"> {L_MAINTAIN} # IF C_DISPLAY_DELAY # <div class="delay"> ${LangLoader::get_message('maintain_delay', 'main')} <div id="release">${LangLoader::get_message('loading', 'main')}...</div> </div> <script> <!-- var release_timeout_seconds = 0; function release(year, month, day, hour, minute, second) { if(document.getElementById('release')) { var sp_day = 86400; var sp_hour = 3600; var sp_minute = 60; now = new Date({MAINTAIN_NOW_FORMAT}+release_timeout_seconds++); end = new Date(year, month, day, hour, minute, second); release_time = (end.getTime() - now.getTime())/1000; if( release_time <= 0 ) { document.location.reload(); release_time = '0'; } else timeout = setTimeout('release('+year+', '+month+', '+day+', '+hour+', '+minute+', '+second+')', 1000); release_days = Math.floor(release_time/sp_day); release_time -= (release_days * sp_day); release_hours = Math.floor(release_time/sp_hour); release_time -= (release_hours * sp_hour); release_minutes = Math.floor(release_time/sp_minute); release_time -= (release_minutes * sp_minute); release_seconds = Math.floor(release_time); release_seconds = (release_seconds < 10) ? '0' + release_seconds : release_seconds; document.getElementById('release').innerHTML = '<strong>' + release_days + '</strong> ${LangLoader::get_message('days', 'date-common')} <strong>' + release_hours + '</strong> ${LangLoader::get_message('hours', 'date-common')} <strong>' + release_minutes + '</strong> ${LangLoader::get_message('minutes', 'date-common')} <strong>' + release_seconds + '</strong> ${LangLoader::get_message('seconds', 'date-common')}'; } } release({MAINTAIN_RELEASE_FORMAT}); --> </script> # ENDIF # </div> # IF NOT C_HAS_ERROR # <p class="center"> <a href="" id="connect" onclick="jQuery('#loginForm').toggle();return false;">${LangLoader::get_message('connection', 'user-common')}</a> </p> <script> <!-- jQuery(document).ready(function() { jQuery('#loginForm').hide(); }); --> </script> # ENDIF # # ENDIF # # INCLUDE ERROR_MESSAGE # # INCLUDE LOGIN_FORM # </div> # ENDIF #
查找差异