テキスト比較

2 つのテキスト ファイルの違いを見つける

ライブエディター
未変更行を折りたたむ
折り返しなし
レイアウト
比較精度
シンタックスハイライト

Untitled diff

作成日 差分は期限切れになりません
24 削除
93 行
29 追加
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 #
# ENDIF #
<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 #


保存された差分