Diff
checker
Testo
Testo
Immagini
Documenti
Excel
Cartelle
Legal
Enterprise
Applicazione per desktop
Prezzi
Accedi
Scarica Diffchecker Desktop
Confronta il testo
Trova la differenza tra due file di testo
Strumenti
Cronologia
Editor live
Comprimi invariate
Senza a capo
Layout
Diviso
Unificato
Livello di dettaglio
Intelligente
Parola
Carattere
Evidenziazione sintassi
Scegli sintassi
Ignora
Trasforma testo
Vai alla prima modifica
Modifica input
Diffchecker Desktop
Il modo più sicuro per usare Diffchecker. Ottieni l'app Diffchecker Desktop: i tuoi diff non lasciano mai il tuo computer!
Ottieni Desktop
Untitled diff
Creato
7 anni fa
Il diff non scade mai
Eliminare
Esporta
Condividere
Spiegare
24 rimozioni
Linee
Totale
Rimosso
Caratteri
Totale
Rimosso
Per continuare a utilizzare questa funzione, aggiorna a
Diff
checker
Pro
Visualizza prezzi
93 linee
Copia tutti
29 aggiunte
Linee
Totale
Aggiunto
Caratteri
Totale
Aggiunto
Per continuare a utilizzare questa funzione, aggiorna a
Diff
checker
Pro
Visualizza prezzi
97 linee
Copia tutti
# IF C_USER_LOGIN #
# IF C_USER_LOGIN #
Copia
Copiato
Copia
Copiato
# 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 #
Copia
Copiato
Copia
Copiato
# 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}
Copia
Copiato
Copia
Copiato
# 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>
Copia
Copiato
Copia
Copiato
<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;
Copia
Copiato
Copia
Copiato
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);
Copia
Copiato
Copia
Copiato
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);
Copia
Copiato
Copia
Copiato
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);
Copia
Copiato
Copia
Copiato
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);
Copia
Copiato
Copia
Copiato
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);
Copia
Copiato
Copia
Copiato
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;
Copia
Copiato
Copia
Copiato
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>
Copia
Copiato
Copia
Copiato
<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 #
Diff salvati
Testo originale
Apri file
# 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 #
Testo modificato
Apri file
# 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 #
Trovare la differenza