Comparer le texte

Trouver la différence entre deux fichiers texte

Affichage

Vue

Éditeur liveMasquer les espacesCacher identiquesSans retour à la ligne

Niveau de précision

Syntaxe

Traitement

Diffchecker Desktop La façon la plus sécurisée d'utiliser Diffchecker. Obtenez l'application Diffchecker Desktop : vos diffs ne quittent jamais votre ordinateur !Obtenir Desktop

Untitled diff

Créé il y a 9 ansLe diff n'expire jamais

2 suppressions

Lignes
Total
Supprimé

Caractères
Total
Supprimé

Pour continuer à utiliser cette fonctionnalité, passez à Diffchecker Pro Voir les prix

365 lignes

2 ajouts

Lignes
Total
Ajouté

Caractères
Total
Ajouté

Pour continuer à utiliser cette fonctionnalité, passez à Diffchecker Pro Voir les prix

365 lignes

# START auth #

<legend>{auth.L_TITLE}</legend>

{L_EXPLAIN_DEFAULT}

<br />

<button type="submit" name="default" value="true" class="submit">{L_DEFAULT}</button>

</p>

<br />

<hr />

<br />

{EXPLAIN_WIKI_GROUPS}

</p>

<label>{L_RESTORE_ARCHIVE}</label>

<div class="form-field"><label>{SELECT_RESTORE_ARCHIVE}</label></div>

</div>

<label>{L_DELETE_ARCHIVE}</label>

<div class="form-field"><label>{SELECT_DELETE_ARCHIVE}</label></div>

</div>

<div class="form-field"><label>{SELECT_EDIT}</label></div>

</div>

<label>{L_DELETE}</label>

<div class="form-field"><label>{SELECT_DELETE}</label></div>

</div>

<label>{L_RENAME}</label>

<div class="form-field"><label>{SELECT_RENAME}</label></div>

</div>

<label>{L_REDIRECT}</label>

<div class="form-field"><label>{SELECT_REDIRECT}</label></div>

</div>

<div class="form-field"><label>{SELECT_MOVE}</label></div>

</div>

<label>{L_STATUS}</label>

<div class="form-field"><label>{SELECT_STATUS}</label></div>

</div>

<div class="form-field"><label>{SELECT_COM}</label></div>

</div>

</fieldset>

<legend>{L_SUBMIT}</legend>

<button type="submit" name="valid" value="true" class="submit">{L_UPDATE}</button>

<button type="reset" value="true">{L_RESET}</button>

</fieldset>

</form>

# END auth #

# START status #

<!--

status = new Array();

# START status.status_array #

status[{status.status_array.ID}] = "{status.status_array.TEXT}";

# END status.status_array #

function show_status()

{

if( document.getElementById('radio_undefined').checked )

change_type(-1);

//Si il s'agit d'un statut pr�d�fini

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)];

}

else if( document.getElementById('id_status').value == 0 )

{

document.getElementById('current_status').innerHTML = "{status.NO_STATUS}";

}

function change_type(id)

{

if( id < 0 )

{

document.getElementById('current_status').innerHTML = "{L_UNDEFINED_STATUS}";

document.getElementById('radio_undefined').checked = true;

document.getElementById('radio_defined').checked = false;

document.getElementById('contents').disabled = false;

document.getElementById('contents').style.color = "";

document.getElementById('id_status').disabled = true;

}

else

{

Différences enregistrées

Texte d'origine

Ouvrir un fichier

# START auth #
		<form action="action.php" method="post" class="fieldset-content">
			<fieldset>
				<legend>{auth.L_TITLE}</legend>
				<p style="text-align:center">
					{L_EXPLAIN_DEFAULT}
					<br />
					<button type="submit" name="default" value="true" class="submit">{L_DEFAULT}</button>
				</p>
				<br />
				<hr />
				<br />
				<p class="center">
					{EXPLAIN_WIKI_GROUPS}
				</p>
				<div class="form-element">
					<label>{L_RESTORE_ARCHIVE}</label>
					<div class="form-field"><label>{SELECT_RESTORE_ARCHIVE}</label></div>
				</div>
				<div class="form-element">
					<label>{L_DELETE_ARCHIVE}</label>
					<div class="form-field"><label>{SELECT_DELETE_ARCHIVE}</label></div>
				</div>
				<div class="form-element">
					<label>{L_EDIT}</label>
					<div class="form-field"><label>{SELECT_EDIT}</label></div>
				</div>
				<div class="form-element">
					<label>{L_DELETE}</label>
					<div class="form-field"><label>{SELECT_DELETE}</label></div>
				</div>
				<div class="form-element">
					<label>{L_RENAME}</label>
					<div class="form-field"><label>{SELECT_RENAME}</label></div>
				</div>
				<div class="form-element">
					<label>{L_REDIRECT}</label>
					<div class="form-field"><label>{SELECT_REDIRECT}</label></div>
				</div>
				<div class="form-element">
					<label>{L_MOVE}</label>
					<div class="form-field"><label>{SELECT_MOVE}</label></div>
				</div>
				<div class="form-element">
					<label>{L_STATUS}</label>
					<div class="form-field"><label>{SELECT_STATUS}</label></div>
				</div>
				<div class="form-element">
					<label>{L_COM}</label>
					<div class="form-field"><label>{SELECT_COM}</label></div>
				</div>
			</fieldset>
			
			<fieldset class="fieldset-submit">
				<legend>{L_SUBMIT}</legend>
				<button type="submit" name="valid" value="true" class="submit">{L_UPDATE}</button>
				<button type="reset" value="true">{L_RESET}</button>
				<input type="hidden" name="id_auth" value="{auth.ID}">
				<input type="hidden" name="token" value="{TOKEN}">
			</fieldset>
		</form>
		# END auth #

# START status #
		<script>
		
		</script>

<form action="action.php" method="post" class="fieldset-content">
			<fieldset>
				<legend>{status.L_TITLE}</legend>
				
				<span class="formatter-blockquote">{L_CURRENT_STATUS} :</span>
				<div id="current_status" class="blockquote">{status.CURRENT_STATUS}</div>

<br />
				<div class="form-element">
					<label>{L_STATUS}</label>
					<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>
						<select id="id_status" name="id_status" {status.SELECTED_SELECT} class="nav" onchange="javascript:show_status();">
						# START status.list #
							<option value="{status.list.ID_STATUS}" {status.list.SELECTED}>{status.list.L_STATUS}</option>
						# END status.list #
						</select>
						<br /><br />
						<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 class="form-element-textarea">
					{KERNEL_EDITOR}
					<div class="form-field-textarea">
						<textarea rows="15" cols="66" id="contents" name="contents" {status.SELECTED_TEXTAREA}>{status.UNDEFINED_STATUS}</textarea>
					</div>
				</div>
			</fieldset>
			<fieldset class="fieldset-submit">
				<legend>{L_SUBMIT}</legend>
				<input type="hidden" name="id_change_status" value="{status.ID_ARTICLE}">
				<input type="hidden" name="token" value="{TOKEN}">
				<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
				<button onclick="XMLHttpRequest_preview();jQuery('#xmlhttprequest_result').fadeOut();" type="button">{L_PREVIEW}</button>
				<button type="reset">{L_RESET}</button>
			</fieldset>
		</form>
		# END status #

# START move #

# INCLUDE message_helper #
		
		<form action="action.php" method="post" onsubmit="return check_form_post();" class="fieldset-content">
			<fieldset>
				<legend>{move.L_TITLE}</legend>
				<div class="form-element">
					<label>{L_CURRENT_CAT}</label>
					<div class="form-field">
						<input type="hidden" name="new_cat" id="id_cat" value="{move.ID_CAT}">
						<div id="selected_cat">{move.CURRENT_CAT}</div>
					</div>
				</div>
				<div class="form-element explorer">
					<label>{L_SELECT_CAT}</label>
					<div class="form-field content">
						<ul>
							<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>
								{move.CATS}
							</li>
						</ul>
					</div>
				</div>
			</fieldset>
			
			<fieldset class="fieldset-submit">
				<legend>{L_SUBMIT}</legend>
				<input type="hidden" name="id_to_move" value="{move.ID_ARTICLE}">
				<input type="hidden" name="token" value="{TOKEN}">
				<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
			</fieldset>
		</form>
		# END move #

# START rename #
		<script>
		
		</script>
		# INCLUDE message_helper #
		
		<form action="action.php" method="post" onsubmit="return check_form_post();" class="fieldset-content">
			<fieldset>
				<legend>{rename.L_TITLE}</legend>
				<p class="center">
					{rename.L_RENAMING_ARTICLE}
				</p>
				<br />
				<div class="form-element">
					<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>
				<div class="form-element">
					<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>
			</fieldset>
			
			<fieldset class="fieldset-submit">
				<legend>{L_SUBMIT}</legend>
				<input type="hidden" name="id_to_rename" value="{rename.ID_ARTICLE}">
				<input type="hidden" name="token" value="{TOKEN}">
				<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
			</fieldset>
		</form>
		# END rename #

# START redirect #
		{redirect.L_TITLE}
		<table id="table">
			<thead>
				<tr>
					<th>
						{L_REDIRECTION_NAME}
					</th>
					<th>
						{L_REDIRECTION_ACTIONS}
					</th>
				</tr>
			</thead>
			<tfoot>
				<tr>
					<th colspan="2">
						<a href="{U_CREATE_REDIRECTION}" title="{L_CREATE_REDIRECTION}"><i class="fa fa-fast-forward"></i> {L_CREATE_REDIRECTION}</a>
					</th>
				</tr>
			</tfoot>
			<tbody>
				# START redirect.list #
				<tr>
					<td>
						{redirect.list.REDIRECTION_NAME}
					</td>
					<td>
						<a href="{redirect.list.U_REDIRECTION_DELETE}" class="fa fa-delete" title="{REDIRECTION_DELETE}" data-confirmation="{L_ALERT_DELETE_REDIRECTION}"></a>
					</td>
				</tr>
				# END redirect.list #
				# IF NO_REDIRECTION #
				<tr>
					<td colspan="2">
						{L_NO_REDIRECTION}
					</td>
				</tr>
				# ENDIF #
			</tbody>
		</table>
		# END redirect #

# START create #
		<script>
		
		</script>
		# INCLUDE message_helper #
		
		<form action="action.php" method="post" onsubmit="return check_form_post();" class="fieldset-content">
			<fieldset>
				<legend>{create.L_TITLE}</legend>
				<div class="form-element">
					<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>
			</fieldset>
			
			<fieldset class="fieldset-submit">
				<legend>{L_SUBMIT}</legend>
				<input type="hidden" name="create_redirection" value="{create.ID_ARTICLE}">
				<input type="hidden" name="token" value="{TOKEN}">
				<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
			</fieldset>
		</form>
		# END create #

# START remove #
		<script>
		
		</script>
		<script src="{PICTURES_DATA_PATH}/js/wiki.js"></script>

# INCLUDE message_helper #
				
		<form action="action.php" method="post" onsubmit="return confirm('{L_ALERT_REMOVING_CAT}');" class="fieldset-content">
			<fieldset>
				<legend>{remove.L_TITLE}</legend>
				<div class="form-element">
					<label for="action">{L_EXPLAIN_REMOVE_CAT}</label>
					<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 name="action" value="move_all" type="radio" checked="checked"><strong>&nbsp;{remove.L_MOVE_ALL_CONTENTS}</strong></label>
					</div>
				</div>
				<div class="form-element">
					<label>{L_FUTURE_CAT}</label>
					<div class="form-field">
						<input type="hidden" name="report_cat" value="{remove.ID_CAT}" id="id_cat">
						<div id="selected_cat">{remove.CURRENT_CAT}</div>
					</div>
				</div>
				<div class="form-element">
					<label>{L_SELECT_CAT}</label>
					<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>
						<br />
						{remove.CATS}
					</div>
				</div>
			</fieldset>
			
			<fieldset class="fieldset-submit">
				<legend>{L_SUBMIT}</legend>
				<input type="hidden" name="id_to_remove" value="{remove.ID_ARTICLE}">
				<input type="hidden" name="token" value="{TOKEN}">
				<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
			</fieldset>
		</form>
		# END remove #

# IF C_COMMENTS #
		{COMMENTS}
		# ENDIF #

Texte modifié

Ouvrir un fichier

# START move #

# INCLUDE message_helper #
		
		<form action="action.php" method="post" onsubmit="return check_form_post();" class="fieldset-content">
			<fieldset>
				<legend>{move.L_TITLE}</legend>
				<div class="form-element">
					<label>{L_CURRENT_CAT}</label>
					<div class="form-field">
						<input type="hidden" name="new_cat" id="id_cat" value="{move.ID_CAT}">
						<div id="selected_cat">{move.CURRENT_CAT}</div>
					</div>
				</div>
				<div class="form-element explorer">
					<label>{L_SELECT_CAT}</label>
					<div class="form-field content">
						<ul>
							<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>
								{move.CATS}
							</li>
						</ul>
					</div>
				</div>
			</fieldset>
			
			<fieldset class="fieldset-submit">
				<legend>{L_SUBMIT}</legend>
				<input type="hidden" name="id_to_move" value="{move.ID_ARTICLE}">
				<input type="hidden" name="token" value="{TOKEN}">
				<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
			</fieldset>
		</form>
		# END move #

# START remove #
		<script>
		
		</script>
		<script src="{PICTURES_DATA_PATH}/js/wiki.js"></script>

# INCLUDE message_helper #
				
		<form action="action.php" method="post" onsubmit="return confirm('{L_ALERT_REMOVING_CAT}');" class="fieldset-content">
			<fieldset>
				<legend>{remove.L_TITLE}</legend>
				<div class="form-element">
					<label for="action">{L_EXPLAIN_REMOVE_CAT}</label>
					<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 name="action" value="move_all" type="radio" checked="checked"><strong>&nbsp;{remove.L_MOVE_ALL_CONTENTS}</strong></label>
					</div>
				</div>
				<div class="form-element">
					<label>{L_FUTURE_CAT}</label>
					<div class="form-field">
						<input type="hidden" name="report_cat" value="{remove.ID_CAT}" id="id_cat">
						<div id="selected_cat">{remove.CURRENT_CAT}</div>
					</div>
				</div>
				<div class="form-element">
					<label>{L_SELECT_CAT}</label>
					<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>
						<br />
						{remove.CATS}
					</div>
				</div>
			</fieldset>
			
			<fieldset class="fieldset-submit">
				<legend>{L_SUBMIT}</legend>
				<input type="hidden" name="id_to_remove" value="{remove.ID_ARTICLE}">
				<input type="hidden" name="token" value="{TOKEN}">
				<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
			</fieldset>
		</form>
		# END remove #

# IF C_COMMENTS #
		{COMMENTS}
		# ENDIF #