Compare text

Find the difference between two text files

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

Tools

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Untitled diff

Created 6 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

177 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

# IF redirections #

{L_REDIRECTIONS}

# START redirections #

<thead>

<tr>

<th>

{L_REDIRECTION_TITLE}

</th>

<th>

{L_REDIRECTION_TARGET}

</th>

<th>

{L_ACTIONS}

</th>

</tr>

</thead>

<tbody>

# START redirections.list #

<tr>

<td>

{redirections.list.REDIRECTION_TITLE}

</td>

<td>

{redirections.list.REDIRECTION_TARGET}

</td>

<td>

{redirections.list.ACTIONS}

</td>

</tr>

# END redirections.list #

# IF C_NO_REDIRECTION #

<tr>

{L_NO_REDIRECTION}

</td>

</tr>

# ENDIF #

</tbody>

</table>

# END redirections #

# ENDIF #

# IF redirection #

{L_redirection}

# START redirection #

<thead>

<tr>

<th>

{L_REDIRECTION_TITLE}

</th>

<th>

{L_ACTIONS}

</th>

</tr>

</thead>

Text moved to lines 77-83

<tfoot>

<tr>

<a href="{U_CREATE_REDIRECTION}">{L_CREATE_REDIRECTION}</a>

</td>

</tr>

</tfoot>

<tbody>

# START redirection.list #

<tr>

<td>

{redirection.list.REDIRECTION_TITLE}

</td>

<td>

{redirection.list.ACTIONS}

</td>

</tr>

# END redirection.list #

# IF C_NO_REDIRECTION #

<tr>

{L_NO_REDIRECTION}

</td>

</tr>

# ENDIF #

</tbody>

Text moved from lines 58-64

<tfoot>

<tr>

<a href="{U_CREATE_REDIRECTION}">{L_CREATE_REDIRECTION}</a>

</td>

</tr>

</tfoot>

</table>

# END redirection #

# ENDIF #

# START rename #

# INCLUDE message_helper #

<legend>{L_TITLE}</legend>

<legend><h1>{L_TITLE}</h1></legend>

<p>{L_EXPLAIN_RENAME}</p>

<label for="new_title">{L_NEW_TITLE}</label>

</div>

<label for="create_redirection">{L_CREATE_REDIRECTION}</label>

</div>

</fieldset>

<legend>{L_SUBMIT}</legend>

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

</fieldset>

</form>

# END rename #

# START new #

# INCLUDE message_helper #

<legend>{L_TITLE}</legend>

<legend><h1>{L_TITLE}</h1></legend>

<label for="redirection_name">{L_REDIRECTION_NAME}</label>

</div>

</fieldset>

<legend>{L_SUBMIT}</legend>

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

</fieldset>

</form>

# END new #

# START remove #

<!--

var path = '{PICTURES_DATA_PATH}';

var selected_cat = {remove.SELECTED_CAT};

-->

</script>

# INCLUDE message_helper #

<legend>{L_TITLE}</legend>

<legend><h1>{L_TITLE}</h1></legend>

<label for="action">{L_TITLE}</label>

<label><input id="action" name="action" value="remove_all" type="radio"> {L_REMOVE_ALL_CONTENTS}</label>

<label><input name="action" value="move_all" type="radio" checked="checked"> {L_MOVE_ALL_CONTENTS}</label>

</div>

<label>{L_FUTURE_CAT}</label>

<br />

{remove.CATS}

</div>

</fieldset>

<legend>{L_SUBMIT}</legend>

<button type="submit" value="true" class="submit">{L_SUBMIT}</button>

</fieldset>

</form>

# END remove #

Saved diffs

Original text

Open file

# IF redirections #
	{L_REDIRECTIONS}
	# START redirections #
	<table id="table">
		<thead>
			<tr>
				<th>
					{L_REDIRECTION_TITLE}
				</th>
				<th>
					{L_REDIRECTION_TARGET}
				</th>
				<th>
					{L_ACTIONS}
				</th>
			</tr>
		</thead>
		<tbody>
			# START redirections.list #
			<tr>
				<td>
					{redirections.list.REDIRECTION_TITLE}
				</td>
				<td>
					{redirections.list.REDIRECTION_TARGET}
				</td>
				<td>
					{redirections.list.ACTIONS}
				</td>
			</tr>
			# END redirections.list #
			# IF C_NO_REDIRECTION #
			<tr>
				<td colspan="3">
					{L_NO_REDIRECTION}
				</td>
			</tr>
			# ENDIF #
		</tbody>
	</table>
	# END redirections #
# ENDIF #

# IF redirection #
	{L_redirection}
	# START redirection #
	<table id="table2">
		<thead>
			<tr>
				<th>
					{L_REDIRECTION_TITLE}
				</th>
				<th>
					{L_ACTIONS}
				</th>
			</tr>
		</thead>
		<tfoot>
			<tr>
				<td colspan="2">
					<a href="{U_CREATE_REDIRECTION}">{L_CREATE_REDIRECTION}</a>
				</td>
			</tr>
		</tfoot>
		<tbody>
			# START redirection.list #
			<tr>
				<td>
					{redirection.list.REDIRECTION_TITLE}
				</td>
				<td>
					{redirection.list.ACTIONS}
				</td>
			</tr>
			# END redirection.list #
			# IF C_NO_REDIRECTION #
			<tr>
				<td colspan="2">
					{L_NO_REDIRECTION}
				</td>
			</tr>
			# ENDIF #
		</tbody>
	</table>
	# END redirection #
# ENDIF #

# START rename #
# INCLUDE message_helper #
<form action="action.php" method="post" class="fieldset-content">
	<fieldset>
		<legend>{L_TITLE}</legend>
		<p>{L_EXPLAIN_RENAME}</p>
		<div class="form-element">
			<label for="new_title">{L_NEW_TITLE}</label>
			<div class="form-field">
				<input type="text" id="new_title" name="new_title" value="{FORMER_TITLE}" maxlength="250" class="field-large">
			</div>
		</div>
		<div class="form-element">
			<label for="create_redirection">{L_CREATE_REDIRECTION}</label>
			<div class="form-field"><label><input type="checkbox" name="create_redirection" id="create_redirection"></label></div>
		</div>
		<input type="hidden" name="id_rename" value="{ID_RENAME}">
	</fieldset>
	<fieldset class="fieldset-submit">
		<legend>{L_SUBMIT}</legend>
		<input type="hidden" name="token" value="{TOKEN}">
		<button type="submit" name="" value="true" class="submit">{L_SUBMIT}</button>
	</fieldset>
</form>
# END rename #

# START new #
# INCLUDE message_helper #
<form action="action.php" method="post" class="fieldset-content">
	<fieldset>
		<legend>{L_TITLE}</legend>
		<div class="form-element">
			<label for="redirection_name">{L_REDIRECTION_NAME}</label>
			<div class="form-field">
				<input type="text" name="redirection_name" id="redirection_name" maxlength="250" class="field-large">
			</div>
		</div>
		<input type="hidden" name="id_new" value="{ID_NEW}">
	</fieldset>

<fieldset class="fieldset-submit">
		<legend>{L_SUBMIT}</legend>
		<input type="hidden" name="token" value="{TOKEN}">
		<button type="submit" name="" value="true" class="submit">{L_SUBMIT}</button>
	</fieldset>
</form>
# END new #

# START remove #
<script>

</script>
<script src="{PATH_TO_ROOT}/pages/templates/js/pages.js"></script>

# INCLUDE message_helper #
<form action="action.php" method="post" onsubmit="return confirm('{L_ALERT_REMOVING_CAT}');" class="fieldset-content">
	<fieldset>
		<legend>{L_TITLE}</legend>
		<div class="form-element">
			<label for="action">{L_TITLE}</label>
			<div class="form-field">
				<label><input id="action" name="action" value="remove_all" type="radio"> {L_REMOVE_ALL_CONTENTS}</label>
				<label><input name="action" value="move_all" type="radio" checked="checked"> {L_MOVE_ALL_CONTENTS}</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">
				<span class="futur-cat-pages"><a href="javascript:select_cat(0);"><img src="{PICTURES_DATA_PATH}/images/cat_root.png" alt="cat-root" /> <span id="class-0" class="{remove.CAT_0}">{L_ROOT}</span></a></span>
				<br />
				{remove.CATS}
			</div>
		</div>
	</fieldset>

<fieldset class="fieldset-submit">
		<legend>{L_SUBMIT}</legend>
		<input type="hidden" name="token" value="{TOKEN}">
		<input type="hidden" name="del_cat" value="{remove.ID_ARTICLE}">
		<button type="submit" value="true" class="submit">{L_SUBMIT}</button>
	</fieldset>
</form>
# END remove #

Changed text

Open file

# IF redirection #
	{L_redirection}
	# START redirection #
	<table id="table2">
		<thead>
			<tr>
				<th>
					{L_REDIRECTION_TITLE}
				</th>
				<th>
					{L_ACTIONS}
				</th>
			</tr>
		</thead>
		<tbody>
			# START redirection.list #
			<tr>
				<td>
					{redirection.list.REDIRECTION_TITLE}
				</td>
				<td>
					{redirection.list.ACTIONS}
				</td>
			</tr>
			# END redirection.list #
			# IF C_NO_REDIRECTION #
			<tr>
				<td colspan="2">
					{L_NO_REDIRECTION}
				</td>
			</tr>
			# ENDIF #
		</tbody>
		<tfoot>
			<tr>
				<td colspan="2">
					<a href="{U_CREATE_REDIRECTION}">{L_CREATE_REDIRECTION}</a>
				</td>
			</tr>
		</tfoot>
	</table>
	# END redirection #
# ENDIF #

# START rename #
# INCLUDE message_helper #
<form action="action.php" method="post" class="fieldset-content">
	<fieldset>
		<legend><h1>{L_TITLE}</h1></legend>
		<p>{L_EXPLAIN_RENAME}</p>
		<div class="form-element">
			<label for="new_title">{L_NEW_TITLE}</label>
			<div class="form-field">
				<input type="text" id="new_title" name="new_title" value="{FORMER_TITLE}" maxlength="250" class="field-large">
			</div>
		</div>
		<div class="form-element">
			<label for="create_redirection">{L_CREATE_REDIRECTION}</label>
			<div class="form-field"><label><input type="checkbox" name="create_redirection" id="create_redirection"></label></div>
		</div>
		<input type="hidden" name="id_rename" value="{ID_RENAME}">
	</fieldset>
	<fieldset class="fieldset-submit">
		<legend>{L_SUBMIT}</legend>
		<input type="hidden" name="token" value="{TOKEN}">
		<button type="submit" name="" value="true" class="submit">{L_SUBMIT}</button>
	</fieldset>
</form>
# END rename #

# START new #
# INCLUDE message_helper #
<form action="action.php" method="post" class="fieldset-content">
	<fieldset>
		<legend><h1>{L_TITLE}</h1></legend>
		<div class="form-element">
			<label for="redirection_name">{L_REDIRECTION_NAME}</label>
			<div class="form-field">
				<input type="text" name="redirection_name" id="redirection_name" maxlength="250" class="field-large">
			</div>
		</div>
		<input type="hidden" name="id_new" value="{ID_NEW}">
	</fieldset>

# START remove #
<script>

</script>
<script src="{PATH_TO_ROOT}/pages/templates/js/pages.js"></script>

# INCLUDE message_helper #
<form action="action.php" method="post" onsubmit="return confirm('{L_ALERT_REMOVING_CAT}');" class="fieldset-content">
	<fieldset>
		<legend><h1>{L_TITLE}</h1></legend>
		<div class="form-element">
			<label for="action">{L_TITLE}</label>
			<div class="form-field">
				<label><input id="action" name="action" value="remove_all" type="radio"> {L_REMOVE_ALL_CONTENTS}</label>
				<label><input name="action" value="move_all" type="radio" checked="checked"> {L_MOVE_ALL_CONTENTS}</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">
				<span class="futur-cat-pages"><a href="javascript:select_cat(0);"><img src="{PICTURES_DATA_PATH}/images/cat_root.png" alt="cat-root" title="cat-root" /> <span id="class-0" class="{remove.CAT_0}">{L_ROOT}</span></a></span>
				<div class="spacer"></div>
				{remove.CATS}
			</div>
		</div>
	</fieldset>