テキスト比較

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

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

Untitled diff

作成日 差分は期限切れになりません
16 削除
364 行
14 追加
360 行
# START auth #
# START auth #
<form action="action.php" method="post" class="fieldset-content">
<form action="action.php" method="post" class="fieldset-content">
<fieldset>
<fieldset>
<legend>{auth.L_TITLE}</legend>
<legend>{auth.L_TITLE}</legend>
<p style="text-align:center">
<p style="text-align:center">
{L_EXPLAIN_DEFAULT}
{L_EXPLAIN_DEFAULT}
<br />
<span class="spacer"></span>
<button type="submit" name="default" value="true" class="submit">{L_DEFAULT}</button>
<button type="submit" name="default" value="true" class="submit">{L_DEFAULT}</button>
</p>
</p>
<br />
<hr />
<hr />
<br />
<p class="center">
<p class="center">
{EXPLAIN_WIKI_GROUPS}
{EXPLAIN_WIKI_GROUPS}
</p>
</p>
<div class="form-element">
<div class="form-element">
<label>{L_RESTORE_ARCHIVE}</label>
<label>{L_RESTORE_ARCHIVE}</label>
<div class="form-field"><label>{SELECT_RESTORE_ARCHIVE}</label></div>
<div class="form-field"><label>{SELECT_RESTORE_ARCHIVE}</label></div>
</div>
</div>
<div class="form-element">
<div class="form-element">
<label>{L_DELETE_ARCHIVE}</label>
<label>{L_DELETE_ARCHIVE}</label>
<div class="form-field"><label>{SELECT_DELETE_ARCHIVE}</label></div>
<div class="form-field"><label>{SELECT_DELETE_ARCHIVE}</label></div>
</div>
</div>
<div class="form-element">
<div class="form-element">
<label>{L_EDIT}</label>
<label>{L_EDIT}</label>
<div class="form-field"><label>{SELECT_EDIT}</label></div>
<div class="form-field"><label>{SELECT_EDIT}</label></div>
</div>
</div>
<div class="form-element">
<div class="form-element">
<label>{L_DELETE}</label>
<label>{L_DELETE}</label>
<div class="form-field"><label>{SELECT_DELETE}</label></div>
<div class="form-field"><label>{SELECT_DELETE}</label></div>
</div>
</div>
<div class="form-element">
<div class="form-element">
<label>{L_RENAME}</label>
<label>{L_RENAME}</label>
<div class="form-field"><label>{SELECT_RENAME}</label></div>
<div class="form-field"><label>{SELECT_RENAME}</label></div>
</div>
</div>
<div class="form-element">
<div class="form-element">
<label>{L_REDIRECT}</label>
<label>{L_REDIRECT}</label>
<div class="form-field"><label>{SELECT_REDIRECT}</label></div>
<div class="form-field"><label>{SELECT_REDIRECT}</label></div>
</div>
</div>
<div class="form-element">
<div class="form-element">
<label>{L_MOVE}</label>
<label>{L_MOVE}</label>
<div class="form-field"><label>{SELECT_MOVE}</label></div>
<div class="form-field"><label>{SELECT_MOVE}</label></div>
</div>
</div>
<div class="form-element">
<div class="form-element">
<label>{L_STATUS}</label>
<label>{L_STATUS}</label>
<div class="form-field"><label>{SELECT_STATUS}</label></div>
<div class="form-field"><label>{SELECT_STATUS}</label></div>
</div>
</div>
<div class="form-element">
<div class="form-element">
<label>{L_COM}</label>
<label>{L_COM}</label>
<div class="form-field"><label>{SELECT_COM}</label></div>
<div class="form-field"><label>{SELECT_COM}</label></div>
</div>
</div>
</fieldset>
</fieldset>
<fieldset class="fieldset-submit">
<fieldset class="fieldset-submit">
<legend>{L_SUBMIT}</legend>
<legend>{L_SUBMIT}</legend>
<button type="submit" name="valid" value="true" class="submit">{L_UPDATE}</button>
<button type="submit" name="valid" value="true" class="submit">{L_UPDATE}</button>
<button type="reset" value="true">{L_RESET}</button>
<button type="reset" value="true">{L_RESET}</button>
<input type="hidden" name="id_auth" value="{auth.ID}">
<input type="hidden" name="id_auth" value="{auth.ID}">
<input type="hidden" name="token" value="{TOKEN}">
<input type="hidden" name="token" value="{TOKEN}">
</fieldset>
</fieldset>
</form>
</form>
# END auth #
# END auth #
# START status #
# START status #
<script>
<script>
<!--
<!--
status = new Array();
status = new Array();
# START status.status_array #
# START status.status_array #
status[{status.status_array.ID}] = "{status.status_array.TEXT}";
status[{status.status_array.ID}] = "{status.status_array.TEXT}";
# END status.status_array #
# END status.status_array #
function show_status()
function show_status()
{
{
if( document.getElementById('radio_undefined').checked )
if( document.getElementById('radio_undefined').checked )
change_type(-1);
change_type(-1);
//Si il s'agit d'un statut pr�d�fini
//Si il s'agit d'un statut pr�d�fini
if( document.getElementById('id_status').value > 0 && status[document.getElementById('id_status').value] != "" )
if( document.getElementById('id_status').value > 0 && status[document.getElementById('id_status').value] != "" )
{
{
document.getElementById('current_status').innerHTML = status[parseInt(document.getElementById('id_status').value)];
document.getElementById('current_status').innerHTML = status[parseInt(document.getElementById('id_status').value)];
}
}
else if( document.getElementById('id_status').value == 0 )
else if( document.getElementById('id_status').value == 0 )
{
{
document.getElementById('current_status').innerHTML = "{status.NO_STATUS}";
document.getElementById('current_status').innerHTML = "{status.NO_STATUS}";
}
}
}
}
function change_type(id)
function change_type(id)
{
{
if( id < 0 )
if( id < 0 )
{
{
document.getElementById('current_status').innerHTML = "{L_UNDEFINED_STATUS}";
document.getElementById('current_status').innerHTML = "{L_UNDEFINED_STATUS}";
document.getElementById('radio_undefined').checked = true;
document.getElementById('radio_undefined').checked = true;
document.getElementById('radio_defined').checked = false;
document.getElementById('radio_defined').checked = false;
document.getElementById('contents').disabled = false;
document.getElementById('contents').disabled = false;
document.getElementById('contents').style.color = "";
document.getElementById('contents').style.color = "";
document.getElementById('id_status').disabled = true;
document.getElementById('id_status').disabled = true;
}
}
else
else
{
{
show_status();
show_status();
document.getElementById('radio_undefined').checked = false;
document.getElementById('radio_undefined').checked = false;
document.getElementById('radio_defined').checked = true;
document.getElementById('radio_defined').checked = true;
document.getElementById('contents').disabled = true;
document.getElementById('contents').disabled = true;
document.getElementById('contents').style.color = "grey";
document.getElementById('contents').style.color = "grey";
document.getElementById('id_status').disabled = false;
document.getElementById('id_status').disabled = false;
}
}
}
}
-->
-->
</script>
</script>
<form action="action.php" method="post" class="fieldset-content">
<form action="action.php" method="post" class="fieldset-content">
<fieldset>
<fieldset>
<legend>{status.L_TITLE}</legend>
<legend>{status.L_TITLE}</legend>
<span class="formatter-blockquote">{L_CURRENT_STATUS} :</span>
<span class="formatter-blockquote">{L_CURRENT_STATUS} :</span>
<div id="current_status" class="blockquote">{status.CURRENT_STATUS}</div>
<div id="current_status" class="blockquote">{status.CURRENT_STATUS}</div>
<br />
<div class="form-element">
<div class="form-element">
<label>{L_STATUS}</label>
<label>{L_STATUS}</label>
<div class="form-field">
<div class="form-field">
<label><input type="radio" name="status" id="radio_defined" value="radio_defined" {status.DEFINED} onclick="javascript: change_type(0);" {status.SELECTED_DEFINED}> {L_DEFINED_STATUS}</label>
<label><input type="radio" name="status" id="radio_defined" value="radio_defined" {status.DEFINED} onclick="javascript: change_type(0);" {status.SELECTED_DEFINED}> {L_DEFINED_STATUS}</label>
<select id="id_status" name="id_status" {status.SELECTED_SELECT} class="nav" onchange="javascript:show_status();">
<select id="id_status" name="id_status" {status.SELECTED_SELECT} class="nav" onchange="javascript:show_status();">
# START status.list #
# START status.list #
<option value="{status.list.ID_STATUS}" {status.list.SELECTED}>{status.list.L_STATUS}</option>
<option value="{status.list.ID_STATUS}" {status.list.SELECTED}>{status.list.L_STATUS}</option>
# END status.list #
# END status.list #
</select>
</select>
<br /><br />
<label class="infos-options"><input type="radio" name="status" id="radio_undefined" value="radio_undefined" {status.UNDEFINED} onclick="javascript: change_type(-1);" {status.SELECTED_UNDEFINED}> {L_UNDEFINED_STATUS}</label>
<label><input type="radio" name="status" id="radio_undefined" value="radio_undefined" {status.UNDEFINED} onclick="javascript: change_type(-1);" {status.SELECTED_UNDEFINED}> {L_UNDEFINED_STATUS}</label>
</div>
</div>
</div>
</div>
<div class="form-element-textarea">
<div class="form-element-textarea">
{KERNEL_EDITOR}
{KERNEL_EDITOR}
<div class="form-field-textarea">
<div class="form-field-textarea">
<textarea rows="15" cols="66" id="contents" name="contents" {status.SELECTED_TEXTAREA}>{status.UNDEFINED_STATUS}</textarea>
<textarea rows="15" cols="66" id="contents" name="contents" {status.SELECTED_TEXTAREA}>{status.UNDEFINED_STATUS}</textarea>
</div>
</div>
</div>
</div>
</fieldset>
</fieldset>
<fieldset class="fieldset-submit">
<fieldset class="fieldset-submit">
<legend>{L_SUBMIT}</legend>
<legend>{L_SUBMIT}</legend>
<input type="hidden" name="id_change_status" value="{status.ID_ARTICLE}">
<input type="hidden" name="id_change_status" value="{status.ID_ARTICLE}">
<input type="hidden" name="token" value="{TOKEN}">
<input type="hidden" name="token" value="{TOKEN}">
<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
<button onclick="XMLHttpRequest_preview();jQuery('#xmlhttprequest_result').fadeOut();" type="button">{L_PREVIEW}</button>
<button onclick="XMLHttpRequest_preview();jQuery('#xmlhttprequest_result').fadeOut();" type="button">{L_PREVIEW}</button>
<button type="reset">{L_RESET}</button>
<button type="reset">{L_RESET}</button>
</fieldset>
</fieldset>
</form>
</form>
# END status #
# END status #
# START move #
# START move #
<script>
<script>
<!--
<!--
var path = '{PICTURES_DATA_PATH}';
var path = '{PICTURES_DATA_PATH}';
var selected_cat = {move.SELECTED_CAT};
var selected_cat = {move.SELECTED_CAT};
-->
-->
</script>
</script>
<script src="{PICTURES_DATA_PATH}/js/wiki.js"></script>
<script src="{PICTURES_DATA_PATH}/js/wiki.js"></script>
# INCLUDE message_helper #
# INCLUDE message_helper #
<form action="action.php" method="post" onsubmit="return check_form_post();" class="fieldset-content">
<form action="action.php" method="post" onsubmit="return check_form_post();" class="fieldset-content">
<fieldset>
<fieldset>
<legend>{move.L_TITLE}</legend>
<legend>{move.L_TITLE}</legend>
<div class="form-element">
<div class="form-element">
<label>{L_CURRENT_CAT}</label>
<label>{L_CURRENT_CAT}</label>
<div class="form-field">
<div class="form-field">
<input type="hidden" name="new_cat" id="id_cat" value="{move.ID_CAT}">
<input type="hidden" name="new_cat" id="id_cat" value="{move.ID_CAT}">
<div id="selected_cat">{move.CURRENT_CAT}</div>
<div id="selected_cat">{move.CURRENT_CAT}</div>
</div>
</div>
</div>
</div>
<div class="form-element explorer">
<div class="form-element explorer">
<label>{L_SELECT_CAT}</label>
<label>{L_SELECT_CAT}</label>
<div class="form-field content">
<div class="form-field content">
<ul>
<ul>
<li>
<li>
<a id="class-0" class="{move.CAT_0}" href="javascript:select_cat(0);"><i class="fa fa-folder"></i> {L_DO_NOT_SELECT_ANY_CAT}</a>
<a id="class-0" class="{move.CAT_0}" href="javascript:select_cat(0);"><i class="fa fa-folder" aria-hidden="true"></i> {L_DO_NOT_SELECT_ANY_CAT}</a>
{move.CATS}
{move.CATS}
</li>
</li>
</ul>
</ul>
</div>
</div>
</div>
</div>
</fieldset>
</fieldset>
<fieldset class="fieldset-submit">
<fieldset class="fieldset-submit">
<legend>{L_SUBMIT}</legend>
<legend>{L_SUBMIT}</legend>
<input type="hidden" name="id_to_move" value="{move.ID_ARTICLE}">
<input type="hidden" name="id_to_move" value="{move.ID_ARTICLE}">
<input type="hidden" name="token" value="{TOKEN}">
<input type="hidden" name="token" value="{TOKEN}">
<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
</fieldset>
</fieldset>
</form>
</form>
# END move #
# END move #
# START rename #
# START rename #
<script>
<script>
<!--
<!--
function check_form_post(){
function check_form_post(){
if(document.getElementById('new_title').value == "") {
if(document.getElementById('new_title').value == "") {
alert("{L_ALERT_TITLE}");
alert("{L_ALERT_TITLE}");
return false;
return false;
}
}
return true;
return true;
}
}
-->
-->
</script>
</script>
# INCLUDE message_helper #
# INCLUDE message_helper #
<form action="action.php" method="post" onsubmit="return check_form_post();" class="fieldset-content">
<form action="action.php" method="post" onsubmit="return check_form_post();" class="fieldset-content">
<fieldset>
<fieldset>
<legend>{rename.L_TITLE}</legend>
<legend>{rename.L_TITLE}</legend>
<p class="center">
<p class="center">
{rename.L_RENAMING_ARTICLE}
{rename.L_RENAMING_ARTICLE}
</p>
</p>
<br />
<div class="form-element">
<div class="form-element">
<label for="new_title">{L_NEW_TITLE}</label>
<label for="new_title">{L_NEW_TITLE}</label>
<div class="form-field"><input type="text" name="new_title" id="new_title" maxlength="250" class="field-large" value="{rename.FORMER_NAME}"></div>
<div class="form-field"><input type="text" name="new_title" id="new_title" maxlength="250" class="field-large" value="{rename.FORMER_NAME}"></div>
</div>
</div>
<div class="form-element">
<div class="form-element">
<label for="create_redirection_while_renaming">{rename.L_CREATE_REDIRECTION}</label>
<label for="create_redirection_while_renaming">{rename.L_CREATE_REDIRECTION}</label>
<div class="form-field"><label><input type="checkbox" name="create_redirection_while_renaming" id="create_redirection_while_renaming" checked="checked"></label></div>
<div class="form-field"><label><input type="checkbox" name="create_redirection_while_renaming" id="create_redirection_while_renaming" checked="checked"></label></div>
</div>
</div>
</fieldset>
</fieldset>
<fieldset class="fieldset-submit">
<fieldset class="fieldset-submit">
<legend>{L_SUBMIT}</legend>
<legend>{L_SUBMIT}</legend>
<input type="hidden" name="id_to_rename" value="{rename.ID_ARTICLE}">
<input type="hidden" name="id_to_rename" value="{rename.ID_ARTICLE}">
<input type="hidden" name="token" value="{TOKEN}">
<input type="hidden" name="token" value="{TOKEN}">
<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
</fieldset>
</fieldset>
</form>
</form>
# END rename #
# END rename #
# START redirect #
# START redirect #
{redirect.L_TITLE}
{redirect.L_TITLE}
<table id="table">
<table id="table">
<thead>
<thead>
<tr>
<tr>
<th>
<th>
{L_REDIRECTION_NAME}
{L_REDIRECTION_NAME}
</th>
</th>
<th>
<th>
{L_REDIRECTION_ACTIONS}
{L_REDIRECTION_ACTIONS}
</th>
</th>
</tr>
</tr>
</thead>
</thead>
Text moved with changes to lines 266-272 (97.5% similarity)
<tfoot>
<tr>
<td colspan="2">
<a href="{U_CREATE_REDIRECTION}" title="{L_CREATE_REDIRECTION}"><i class="fa fa-fast-forward"></i> {L_CREATE_REDIRECTION}</a>
</td>
</tr>
</tfoot>
<tbody>
<tbody>
# START redirect.list #
# START redirect.list #
<tr>
<tr>
<td>
<td>
{redirect.list.REDIRECTION_NAME}
{redirect.list.REDIRECTION_NAME}
</td>
</td>
<td>
<td>
<a href="{redirect.list.U_REDIRECTION_DELETE}" class="fa fa-delete" title="{REDIRECTION_DELETE}" data-confirmation="{L_ALERT_DELETE_REDIRECTION}"></a>
<a href="{redirect.list.U_REDIRECTION_DELETE}" data-confirmation="{L_ALERT_DELETE_REDIRECTION}" aria-label="{REDIRECTION_DELETE}"><i class="fa fa-delete" aria-hidden="true" title="{REDIRECTION_DELETE}"></i></a>
</td>
</td>
</tr>
</tr>
# END redirect.list #
# END redirect.list #
# IF NO_REDIRECTION #
# IF NO_REDIRECTION #
<tr>
<tr>
<td colspan="2">
<td colspan="2">
{L_NO_REDIRECTION}
{L_NO_REDIRECTION}
</td>
</td>
</tr>
</tr>
# ENDIF #
# ENDIF #
</tbody>
</tbody>
Text moved with changes from lines 252-258 (97.5% similarity)
<tfoot>
<tr>
<td colspan="2">
<a href="{U_CREATE_REDIRECTION}" aria-label="{L_CREATE_REDIRECTION}"><i class="fa fa-fast-forward" aria-hidden="true" title="{L_CREATE_REDIRECTION}"></i> {L_CREATE_REDIRECTION}</a>
</td>
</tr>
</tfoot>
</table>
</table>
# END redirect #
# END redirect #
# START create #
# START create #
<script>
<script>
<!--
<!--
function check_form_post(){
function check_form_post(){
if(document.getElementById('title').value == "") {
if(document.getElementById('title').value == "") {
alert("{L_ALERT_TITLE}");
alert("{L_ALERT_TITLE}");
return false;
return false;
}
}
return true;
return true;
}
}
-->
-->
</script>
</script>
# INCLUDE message_helper #
# INCLUDE message_helper #
<form action="action.php" method="post" onsubmit="return check_form_post();" class="fieldset-content">
<form action="action.php" method="post" onsubmit="return check_form_post();" class="fieldset-content">
<fieldset>
<fieldset>
<legend>{create.L_TITLE}</legend>
<legend>{create.L_TITLE}</legend>
<div class="form-element">
<div class="form-element">
<label for="redirection_title">{L_REDIRECTION_NAME}</label>
<label for="redirection_title">{L_REDIRECTION_NAME}</label>
<div class="form-field"><label><input type="text" name="redirection_title" id="redirection_title" maxlength="250" class="field-large" value=""></label></div>
<div class="form-field"><label><input type="text" name="redirection_title" id="redirection_title" maxlength="250" class="field-large" value=""></label></div>
</div>
</div>
</fieldset>
</fieldset>
<fieldset class="fieldset-submit">
<fieldset class="fieldset-submit">
<legend>{L_SUBMIT}</legend>
<legend>{L_SUBMIT}</legend>
<input type="hidden" name="create_redirection" value="{create.ID_ARTICLE}">
<input type="hidden" name="create_redirection" value="{create.ID_ARTICLE}">
<input type="hidden" name="token" value="{TOKEN}">
<input type="hidden" name="token" value="{TOKEN}">
<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
</fieldset>
</fieldset>
</form>
</form>
# END create #
# END create #
# START remove #
# START remove #
<script>
<script>
<!--
<!--
var path = '{PICTURES_DATA_PATH}';
var path = '{PICTURES_DATA_PATH}';
var selected_cat = {remove.SELECTED_CAT};
var selected_cat = {remove.SELECTED_CAT};
-->
-->
</script>
</script>
<script src="{PICTURES_DATA_PATH}/js/wiki.js"></script>
<script src="{PICTURES_DATA_PATH}/js/wiki.js"></script>
# INCLUDE message_helper #
# INCLUDE message_helper #
<form action="action.php" method="post" onsubmit="return confirm('{L_ALERT_REMOVING_CAT}');" class="fieldset-content">
<form action="action.php" method="post" onsubmit="return confirm('{L_ALERT_REMOVING_CAT}');" class="fieldset-content">
<fieldset>
<fieldset>
<legend>{remove.L_TITLE}</legend>
<legend>{remove.L_TITLE}</legend>
<div class="form-element">
<div class="form-element">
<label for="action">{L_EXPLAIN_REMOVE_CAT}</label>
<label for="action">{L_EXPLAIN_REMOVE_CAT}</label>
<div class="form-field">
<div class="form-field">
<label><input id="action" name="action" value="remove_all" type="radio"><strong>&nbsp;{remove.L_REMOVE_ALL_CONTENTS}</strong></label>
<label><input id="action" name="action" value="remove_all" type="radio"><strong>&nbsp;{remove.L_REMOVE_ALL_CONTENTS}</strong></label>
<label><input name="action" value="move_all" type="radio" checked="checked"><strong>&nbsp;{remove.L_MOVE_ALL_CONTENTS}</strong></label>
<label><input name="action" value="move_all" type="radio" checked="checked"><strong>&nbsp;{remove.L_MOVE_ALL_CONTENTS}</strong></label>
</div>
</div>
</div>
</div>
<div class="form-element">
<div class="form-element">
<label>{L_FUTURE_CAT}</label>
<label>{L_FUTURE_CAT}</label>
<div class="form-field">
<div class="form-field">
<input type="hidden" name="report_cat" value="{remove.ID_CAT}" id="id_cat">
<input type="hidden" name="report_cat" value="{remove.ID_CAT}" id="id_cat">
<div id="selected_cat">{remove.CURRENT_CAT}</div>
<div id="selected_cat">{remove.CURRENT_CAT}</div>
</div>
</div>
</div>
</div>
<div class="form-element">
<div class="form-element">
<label>{L_SELECT_CAT}</label>
<label>{L_SELECT_CAT}</label>
<div class="form-field">
<div class="form-field">
<span class="futur-cat-pages"><a href="javascript:select_cat(0);"><i class="fa fa-folder"></i> <span id="class-0" class="{remove.CAT_0}">{L_DO_NOT_SELECT_ANY_CAT}</span></a></span>
<span class="futur-cat-pages"><a href="javascript:select_cat(0);"><i class="fa fa-folder" aria-hidden="true"></i> <span id="class-0" class="{remove.CAT_0}">{L_DO_NOT_SELECT_ANY_CAT}</span></a></span>
<br />
<div class="spacer"></div>
{remove.CATS}
{remove.CATS}
</div>
</div>
</div>
</div>
</fieldset>
</fieldset>
<fieldset class="fieldset-submit">
<fieldset class="fieldset-submit">
<legend>{L_SUBMIT}</legend>
<legend>{L_SUBMIT}</legend>
<input type="hidden" name="id_to_remove" value="{remove.ID_ARTICLE}">
<input type="hidden" name="id_to_remove" value="{remove.ID_ARTICLE}">
<input type="hidden" name="token" value="{TOKEN}">
<input type="hidden" name="token" value="{TOKEN}">
<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
</fieldset>
</fieldset>
</form>
</form>
# END remove #
# END remove #
# IF C_COMMENTS #
# IF C_COMMENTS #
<h1>{TITLE}</h1>
{COMMENTS}
{COMMENTS}
# ENDIF #
# ENDIF #


保存された差分