テキスト比較

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

ライブエディター

未変更行を折りたたむ

折り返しなし

レイアウト

比較精度

シンタックスハイライト

Diffchecker Desktop Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手：あなたの差分はコンピューターから出ることはありません！Desktopを入手

Untitled diff

作成日 7 年前差分は期限切れになりません

7 削除

行
合計
削除

文字
合計
削除

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

129 行

15 追加

行
合計
追加

文字
合計
追加

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

138 行

<!--

var path = '{PICTURES_DATA_PATH}';

var selected_cat = {SELECTED_CAT};

function check_form_post(){

if(document.getElementById('title').value == "") {

alert("{L_ALERT_TITLE}");

return false;

}

if(document.getElementById('contents').value == "") {

alert("{L_ALERT_CONTENTS}");

return false;

}

return true;

}

-->

</script>

# START preview #

<h1>{L_PREVIEWING}: {preview.TITLE}</h1>

</header>

# START preview.menu #

<div class="wiki-summary-title">{L_TABLE_OF_CONTENTS}</div>

{preview.menu.MENU}

</div>

# END preview.menu #

{preview.CONTENTS}

</div>

</article>

</section>

# END preview #

# INCLUDE message_helper #

<p class="center">{L_REQUIRE}</p>

<legend>{TITLE}</legend>

# START create #

<label for="title">* {L_TITLE_FIELD}</label>

</div>

<label>{L_CURRENT_CAT}</label>

<div id="selected_cat">{CURRENT_CAT}</div>

</div>

<ul>

<li><a class="{CAT_0}" id="class-0" href="javascript:select_cat(0);"><i class="fa fa-folder"></i>{L_DO_NOT_SELECT_ANY_CAT}</a>

<li><a class="{CAT_0}" id="class-0" href="javascript:select_cat(0);"><i class="fa fa-folder" aria-hidden="true"></i>{L_DO_NOT_SELECT_ANY_CAT}</a>

<ul>

# START create.list #

# IF create.list.C_SUB_CAT #

</a>

<a id="class-{create.list.ID}" href="javascript:select_cat({create.list.ID});">{create.list.TITLE}</a>

# ELSE #

<a id="class-{create.list.ID}" href="javascript:select_cat({create.list.ID});"><i class="fa fa-folder"></i>{create.list.TITLE}</a>

<a id="class-{create.list.ID}" href="javascript:select_cat({create.list.ID});"><i class="fa fa-folder" aria-hidden="true"></i>{create.list.TITLE}</a>

# ENDIF #

</li>

# END create.list #

{CAT_LIST}

</ul>

</li>

</ul>

</div>

# END create #

<label for="contents">* {L_CONTENTS}</label>

# INCLUDE post_js_tools #

{KERNEL_EDITOR}

<textarea rows="25" id="contents" name="contents">{CONTENTS}</textarea>

</div>

# IF C_EDIT #

<br />

<label>{L_CHANGE_REASON_LABEL}</label>

<textarea maxlength="100" rows="2" id="change_reason" name="change_reason">{CHANGE_REASON}</textarea>

</div>

# ENDIF #

# IF C_VERIF_CODE #

<label for="captcha">* ${LangLoader::get_message('form.captcha', 'common')}</label>

{VERIF_CODE}

</div>

<!--

jQuery(document).ready(function() {

jQuery('button[name="submit"]').click(function()

jQuery('button[name="submit"]').on('click', function()

{

if(!jQuery('#captcha').val() && !jQuery('#g-recaptcha-response').val()) {

alert(${escapejs(LangLoader::get_message('captcha.validation_error', 'status-messages-common'))});

return false;

}

});

-->

</script>

# ENDIF #

</fieldset>

<legend>{L_SUBMIT}</legend>

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

<button type="submit" name="preview" value="preview">{L_PREVIEW}</button>

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

</fieldset>

</form>

保存された差分

原文

ファイルを開く

# START preview #
		<article>
			<header>
				<h1>{L_PREVIEWING}: {preview.TITLE}</h1>
			</header>
			<div class="content" id="preview">
				# START preview.menu #
					<div class="wiki-summary">
						<div class="wiki-summary-title">{L_TABLE_OF_CONTENTS}</div>
						{preview.menu.MENU}
					</div>
				# END preview.menu #
				<br /><br />
				{preview.CONTENTS}
			</div>
			<footer></footer>
		</article>
		# END preview #
		
		# INCLUDE message_helper #
		
		<form action="{TARGET}" method="post" onsubmit="return check_form_post();" class="fieldset-content wiki-edit">
			<p class="center">{L_REQUIRE}</p>
			<fieldset>
				<legend>{TITLE}</legend>
				# START create #
				<div class="form-element">
					<label for="title">* {L_TITLE_FIELD}</label>
					<div class="form-field"><label><input type="text" id="title" name="title" maxlength="250" class="field-large" value="{ARTICLE_TITLE}"></label></div>
				</div>
				<div class="form-element">
					<label>{L_CURRENT_CAT}</label>
					<div class="form-field">
						<input type="hidden" name="id_cat" id="id_cat" value="{ID_CAT}"/>
						<div id="selected_cat">{CURRENT_CAT}</div>
					</div>
				</div>
				<div class="form-element">
					<label>{L_CAT}</label>
					<div class="explorer inline">
						<div class="cats">
							<div class="content">
								<ul>
									<li><a class="{CAT_0}" id="class-0" href="javascript:select_cat(0);"><i class="fa fa-folder"></i>{L_DO_NOT_SELECT_ANY_CAT}</a>
										<ul>
											# START create.list #
											<li class="sub">
												# IF create.list.C_SUB_CAT #
												<a class="parent" href="javascript:show_wiki_cat_contents({create.list.ID}, 1);" title="${LangLoader::get_message('display', 'common')}">
													<i class="fa fa-plus-square-o" id="img-subfolder-{create.list.ID}"></i>
													<i class="fa fa-folder" id ="img-folder-{create.list.ID}"></i>
												</a>
												<a id="class-{create.list.ID}" href="javascript:select_cat({create.list.ID});">{create.list.TITLE}</a>
												# ELSE #
												<a id="class-{create.list.ID}" href="javascript:select_cat({create.list.ID});"><i class="fa fa-folder"></i>{create.list.TITLE}</a>
												# ENDIF #
												<span id="cat-{create.list.ID}"></span>
											</li>
											# END create.list #
											{CAT_LIST}
										</ul>
									</li>
								</ul>
							</div>
						</div>
					</div>
				</div>
				# END create #
				<div class="form-element-textarea">
					<label for="contents">* {L_CONTENTS}</label>
					# INCLUDE post_js_tools #
					{KERNEL_EDITOR}
					<div class="form-field-textarea">
						<textarea rows="25" id="contents" name="contents">{CONTENTS}</textarea>
					</div>
				</div>
				# IF C_VERIF_CODE #
				<div class="form-element">
					<label for="captcha">* ${LangLoader::get_message('form.captcha', 'common')}</label>
					<div class="form-field">
						{VERIF_CODE}
					</div>
				</div>
				<script>
				
				</script>
				# ENDIF #
				
			</fieldset>
			<fieldset class="fieldset-submit">
				<legend>{L_SUBMIT}</legend>
				<input type="hidden" name="is_cat" value="{IS_CAT}">
				<input type="hidden" name="id_edit" value="{ID_EDIT}">
				<input type="hidden" name="token" value="{TOKEN}">
				<button type="submit" name="submit" class="submit">{L_SUBMIT}</button>
				<button type="submit" name="preview" value="preview">{L_PREVIEW}</button>
				<button type="reset">{L_RESET}</button>
			</fieldset>
		</form>

変更されたテキスト

ファイルを開く

if(document.getElementById('title').value == "") {
					alert("{L_ALERT_TITLE}");
					return false;
				}
				if(document.getElementById('contents').value == "") {
					alert("{L_ALERT_CONTENTS}");
					return false;
				}
				return true;
			}
		-->
		</script>

# START preview #
		<section>
			<header>
				<h1>{L_PREVIEWING}: {preview.TITLE}</h1>
			</header>
			<div class="content" id="preview">
				# START preview.menu #
					<div class="wiki-summary">
						<div class="wiki-summary-title">{L_TABLE_OF_CONTENTS}</div>
						{preview.menu.MENU}
					</div>
				# END preview.menu #
				<br /><br />
				{preview.CONTENTS}
			</div>
			<footer></footer>
		</section>
		# END preview #

# INCLUDE message_helper #

<form action="{TARGET}" method="post" onsubmit="return check_form_post();" class="fieldset-content wiki-edit">
			<p class="center">{L_REQUIRE}</p>
			<fieldset>
				<legend>{TITLE}</legend>
				# START create #
				<div class="form-element">
					<label for="title">* {L_TITLE_FIELD}</label>
					<div class="form-field"><label><input type="text" id="title" name="title" maxlength="250" class="field-large" value="{ARTICLE_TITLE}"></label></div>
				</div>
				<div class="form-element">
					<label>{L_CURRENT_CAT}</label>
					<div class="form-field">
						<input type="hidden" name="id_cat" id="id_cat" value="{ID_CAT}"/>
						<div id="selected_cat">{CURRENT_CAT}</div>
					</div>
				</div>
				<div class="form-element">
					<label>{L_CAT}</label>
					<div class="explorer inline">
						<div class="cats">
							<div class="content">
								<ul>
									<li><a class="{CAT_0}" id="class-0" href="javascript:select_cat(0);"><i class="fa fa-folder" aria-hidden="true"></i>{L_DO_NOT_SELECT_ANY_CAT}</a>
										<ul>
											# START create.list #
											<li class="sub">
												# IF create.list.C_SUB_CAT #
												<a class="parent" href="javascript:show_wiki_cat_contents({create.list.ID}, 1);" title="${LangLoader::get_message('display', 'common')}">
													<i class="fa fa-plus-square-o" id="img-subfolder-{create.list.ID}"></i>
													<i class="fa fa-folder" id ="img-folder-{create.list.ID}"></i>
												</a>
												<a id="class-{create.list.ID}" href="javascript:select_cat({create.list.ID});">{create.list.TITLE}</a>
												# ELSE #
												<a id="class-{create.list.ID}" href="javascript:select_cat({create.list.ID});"><i class="fa fa-folder" aria-hidden="true"></i>{create.list.TITLE}</a>
												# ENDIF #
												<span id="cat-{create.list.ID}"></span>
											</li>
											# END create.list #
											{CAT_LIST}
										</ul>
									</li>
								</ul>
							</div>
						</div>
					</div>
				</div>
				# END create #
				<div class="form-element-textarea">
					<label for="contents">* {L_CONTENTS}</label>
					# INCLUDE post_js_tools #
					{KERNEL_EDITOR}
					<div class="form-field-textarea">
						<textarea rows="25" id="contents" name="contents">{CONTENTS}</textarea>
					</div>
				</div>

# IF C_EDIT #
				<br />
				<div class="form-element-textarea">
					<label>{L_CHANGE_REASON_LABEL}</label>
					<textarea maxlength="100" rows="2" id="change_reason" name="change_reason">{CHANGE_REASON}</textarea>
				</div>
				# ENDIF #

# IF C_VERIF_CODE #
				<div class="form-element">
					<label for="captcha">* ${LangLoader::get_message('form.captcha', 'common')}</label>
					<div class="form-field">
						{VERIF_CODE}
					</div>
				</div>
				<script>
				
				</script>
				# ENDIF #

</fieldset>
			<fieldset class="fieldset-submit">
				<legend>{L_SUBMIT}</legend>
				<input type="hidden" name="is_cat" value="{IS_CAT}">
				<input type="hidden" name="id_edit" value="{ID_EDIT}">
				<input type="hidden" name="token" value="{TOKEN}">
				<button type="submit" name="submit" class="submit">{L_SUBMIT}</button>
				<button type="submit" name="preview" value="preview">{L_PREVIEW}</button>
				<button type="reset">{L_RESET}</button>
			</fieldset>
		</form>