テキスト比較

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

表示

レイアウト

ライブエディター空白の変更を非表示未変更行を折りたたむ折り返しなし

比較精度

構文

処理

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

Untitled diff

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

0 削除

行
合計
削除

文字
合計
削除

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

325 行

4 追加

行
合計
追加

文字
合計
追加

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

325 行

<!--

function check_form_convers(){

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

alert("{L_REQUIRE_RECIPIENT}");

return false;

}

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

alert("{L_REQUIRE_MESSAGE}");

return false;

}

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

alert("{L_REQUIRE_TITLE}");

return false;

}

return true;

}

function check_form_pm(){

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

alert("{L_REQUIRE_MESSAGE}");

return false;

}

return true;

}

function Confirm_pm() {

return confirm("{L_DELETE_MESSAGE}");

}

-->

</script>

# START convers #

<!--

function check_convers(status, id)

{

var i;

for(i = 0; i < {convers.NBR_PM}; i++)

{

if( document.getElementById(id + i) )

document.getElementById(id + i).checked = status;

}

document.getElementById('checkall').checked = status;

document.getElementById('validc').checked = status;

}

-->

</script>

# INCLUDE message_helper #

<h1>{convers.U_PM_BOX}</h1>

</header>

<div class="right">{L_PRIVATE_MSG}: {convers.PM_POURCENT}</div>

<ul>

<li>

<a href="{convers.U_POST_NEW_CONVERS}" class="cssmenu-title"><i class="fa fa-plus"></i> {convers.L_POST_NEW_CONVERS}</a>

</li>

<li>

<a href="{convers.U_MARK_AS_READ}" class="cssmenu-title"><i class="fa fa-eraser"></i> {convers.L_MARK_AS_READ}</a>

</li>

</ul>

</menu>

jQuery("#cssmenu-pmactions").menumaker({

title: "${LangLoader::get_message('form.options', 'common')}",

format: "multitoggle",

breakpoint: 768

});

</script>

<thead>

<tr>

<th>

</th>

<th>

{L_TITLE}

</th>

<th>

{L_PARTICIPANTS}

</th>

<th>

{L_MESSAGE}

</th>

<th>

{L_LAST_MESSAGE}

</th>

</tr>

</thead>

<tfoot>

<tr>

<div class="left"> <input type="checkbox" id="validc" onclick="check_convers(this.checked, 'd');" />  <input type="hidden" name="token" value="{TOKEN}"><button type="submit" name="valid" value="true" class="submit">{L_DELETE}</button></div>

<div class="left"> <input type="checkbox" id="validc" onclick="check_convers(this.checked, 'd');" title="{L_SELECT_ALL_MESSAGES}" />  <input type="hidden" name="token" value="{TOKEN}"><button type="submit" name="valid" value="true" class="submit">{L_DELETE}</button></div>

保存された差分

原文

ファイルを開く

# START convers #
		<script>
		
		</script>
		# INCLUDE message_helper #
		
		<form action="pm{convers.U_USER_ACTION_PM}" method="post" onsubmit="javascript:return Confirm_pm();">
			<section id="module-user-convers">
				<header>
					<h1>{convers.U_PM_BOX}</h1>
				</header>
				<div class="content">
					<div class="right">{L_PRIVATE_MSG}: {convers.PM_POURCENT}</div>
					<br /><br />
					<menu id="cssmenu-pmactions" class="cssmenu cssmenu-group">
						<ul>
							<li>
								<a href="{convers.U_POST_NEW_CONVERS}" class="cssmenu-title"><i class="fa fa-plus"></i> {convers.L_POST_NEW_CONVERS}</a>
							</li>
							<li>
								<a href="{convers.U_MARK_AS_READ}" class="cssmenu-title"><i class="fa fa-eraser"></i> {convers.L_MARK_AS_READ}</a>
							</li>
						</ul>
					</menu>
					<script>
						jQuery("#cssmenu-pmactions").menumaker({
							title: "${LangLoader::get_message('form.options', 'common')}",
							format: "multitoggle",
							breakpoint: 768
						});
					</script>
					<br /><br />
					<table id="table">
						<thead>
							<tr>
								<th>
									<i class="fa fa-envelope"></i>
								</th>
								<th></th>
								<th>
									{L_TITLE}
								</th>
								<th>
									{L_PARTICIPANTS}
								</th>
								<th>
									{L_MESSAGE}
								</th>
								<th>
									{L_LAST_MESSAGE}
								</th>
							</tr>
						</thead>
						<tfoot>
							<tr>
								<th colspan="6">
									<div class="left">&nbsp;<input type="checkbox" id="validc" onclick="check_convers(this.checked, 'd');" /> &nbsp;<input type="hidden" name="token" value="{TOKEN}"><button type="submit" name="valid" value="true" class="submit">{L_DELETE}</button></div>
									# IF convers.C_PAGINATION #<div class="float-right"># INCLUDE convers.PAGINATION #</div># ENDIF #
								</th>
							</tr>
						</tfoot>
						<tbody>
							# START convers.list #
							<tr>
								<td>
									<input type="checkbox" id="d{convers.list.INCR}" name="{convers.list.ID}">
								</td>
								<td class="convers-announce">
									<i class="fa fa-envelope {convers.list.ANNOUNCE}"></i>
								</td>
								<td class="convers-title no-separator">
									{convers.list.ANCRE} <a href="pm{convers.list.U_CONVERS}">{convers.list.TITLE}</a> &nbsp;<span class="smaller">[{convers.list.U_AUTHOR}]</span>
								</td>
								<td>
									{convers.list.U_PARTICIPANTS}
								</td>
								<td>
									{convers.list.MSG}
								</td>
								<td class="smaller">
									{convers.list.U_LAST_MSG}
								</td>
							</tr>
							# END convers.list #
									
							# START convers.no_pm #
							<tr>
								<td colspan="6">
									<span class="text-strong">{convers.no_pm.L_NO_PM}</span>
								</td>
							</tr>
							# END convers.no_pm #
						</tbody>
					</table>
					<br />
					<table class="announce-legend">
						<tr>
							<td> 
								<i class="fa fa-envelope message-announce"></i> {L_READ} 
							</td>
							<td class="no-separator">  
								<i class="fa fa-envelope message-announce-track"></i> {L_TRACK}
							</td>
							<td class="no-separator">  
								<i class="fa fa-envelope message-announce-new"></i> {L_NOT_READ}
							</td>
						</tr>
					</table>
				</div>
				<footer></footer>
			</section>
		</form>
		# END convers #
		
		# START pm #
		<section id="module-user-pm">
			<header>
				<h1>{pm.U_PM_BOX} : {pm.U_TITLE_CONVERS}</h1>
			</header>
			
			<div class="content">
				# IF pm.C_PAGINATION #<div class="float-right"># INCLUDE pm.PAGINATION #</div># ENDIF #
			
			# START pm.msg #
				<article id="article-pm-{pm.msg.ID}" class="article-pm article-several message">
					<div id="m{pm.msg.ID}" class="message-container">

<div class="message-user-infos">
							<div class="message-pseudo">
								# IF pm.msg.C_VISITOR #
									<span>{pm.msg.PSEUDO}</span>
								# ELSE #
									<a href="{pm.msg.U_PROFILE}" class="{pm.msg.LEVEL_CLASS}" # IF pm.msg.C_GROUP_COLOR # style="color:{pm.msg.GROUP_COLOR}" # ENDIF #>
										{pm.msg.PSEUDO}
									</a>
								# ENDIF #
							</div>
							<div class="message-level">{pm.msg.L_LEVEL}</div>
							# IF pm.msg.C_AVATAR #<img src="{pm.msg.USER_AVATAR}" title="{pm.msg.USER_PSEUDO}" alt="{pm.msg.USER_PSEUDO}" class="message-avatar" /># ENDIF #
						</div>

<div class="message-date">
							<span class="actions">
								<a href="#article-pm-{pm.msg.ID}">\#{pm.msg.ID}</a>
								# IF pm.msg.C_MODERATION_TOOLS #
								<a href="pm.php?edit={pm.msg.ID}" title="{L_EDIT}" class="fa fa-edit"></a>
								<a href="pm.php?del={pm.msg.ID}&amp;token={TOKEN}" title="{L_DELETE}" class="fa fa-delete" data-confirmation="delete-element"></a>
								# ENDIF #
							</span>
							<span>{pm.msg.DATE}</span>
						</div>

<div class="message-message">
							<div class="message-content">{pm.msg.CONTENTS}</div>
						</div>
						
					</div>
				</article>
			# END pm.msg #
			</div>
			<footer>
				# IF pm.C_PAGINATION #<div class="float-right"># INCLUDE pm.PAGINATION #</div># ENDIF #
			</footer>
		</section>
		# END pm #

# START post_pm #
		# INCLUDE message_helper #
		<span id="quote"></span>
		<form action="pm{post_pm.U_PM_ACTION_POST}" method="post" onsubmit="return check_form_msg();" class="post-pm">
			<legend>{L_RESPOND}</legend>
			<div class="form-element-textarea">
				{KERNEL_EDITOR}
				<div class="form-field-textarea">
					<textarea rows="25" cols="66" id="contents" name="contents">{post_pm.CONTENTS}</textarea>
				</div>
			</div>
			<div class="center">
				<input type="hidden" name="token" value="{TOKEN}">
				<button type="submit" name="pm" value="true" class="submit">{L_SUBMIT}</button>
				<button type="button" name="prw" id="prw_pm" onclick="XMLHttpRequest_preview();">{L_PREVIEW}</button>
				<button type="reset" value="true">{L_RESET}</button>
			</div>
		</form>
		# END post_pm #

# START edit_pm #
		<form action="pm{edit_pm.U_ACTION_EDIT}" method="post" onsubmit="return check_form_convers();">
			<section id="module-user-edit-pm">
				<header>
					<h1>{edit_pm.U_PM_BOX}</h1>
				</header>
				<div class="content">
					<div class="fieldset-content">
						<p class="center">{L_REQUIRE}</p>
						<fieldset>
							<legend>{L_EDIT}</legend>
							# START edit_pm.title #
							<div class="form-element">
								<label for="title">* {L_TITLE}</label>
								<div class="form-field"><label><input type="text" maxlength="100" id="title" name="title" value="{edit_pm.title.TITLE}"></label></div>
							</div>
							# END edit_pm.title #
							<div class="form-element-textarea">
								<label for="contents">* {L_MESSAGE}</label>
								{KERNEL_EDITOR}
								<div class="form-field-textarea">
									<textarea rows="25" id="contents" name="contents">{edit_pm.CONTENTS}</textarea>
								</div>
							</div>
						</fieldset>
						
						<div class="center">
							<input type="hidden" name="token" value="{TOKEN}">
							<button type="submit" name="{SUBMIT_NAME}" value="{L_SUBMIT}" class="submit">{L_SUBMIT}</button>
							<button type="button" name="prw" id="prw_pm" onclick="XMLHttpRequest_preview();">{L_PREVIEW}</button>
							<button type="reset" value="true">{L_RESET}</button>
						</div>
					</div>
				</div>
				<footer></footer>
			</section>
		</form>
		# END edit_pm #

# START post_convers #
		<form action="pm.php" method="post" onsubmit="return check_form_convers();">
			<section id="module-user-post-convers">
				<header>
					<h1>{post_convers.U_PM_BOX}</h1>
				</header>
				<div class="content">
					# INCLUDE message_helper #
					
					<div class="fieldset-content">
						<p class="center">{L_REQUIRE}</p>
						<fieldset>
							<legend>{L_POST_NEW_CONVERS}</legend>
							# START post_convers.user_id_dest #
							<div class="form-element">
								<label for="login">* {L_RECIPIENT}</label>
								<div class="form-field">
									<label>
										<input type="text" maxlength="25" id="login" name="login" value="{post_convers.LOGIN}">
										<button type="button" value="{L_SEARCH}" onclick="XMLHttpRequest_search_members('', '{THEME}', 'insert_member', '{L_REQUIRE_RECIPIENT}');">{L_SEARCH}</button>
										<span id="search_img"></span>
									</label>
									<div id="xmlhttprequest-result-search" style="display:none;" class="xmlhttprequest-result-search"></div>
									# START post_convers.user_id_dest.search #
										{post_convers.user_id_dest.search.RESULT}
									# END post_convers.user_id_dest.search #
								</div>
							</div>
							# END post_convers.user_id_dest #
							<div class="form-element">
								<label for="title">* {L_TITLE}</label>
								<div class="form-field"><label><input type="text" maxlength="100" id="title" name="title" value="{post_convers.TITLE}"></label></div>
							</div>
							<div class="form-element-textarea">
								<label for="contents">* {L_MESSAGE}</label>
								{KERNEL_EDITOR}
								<div class="form-field-textarea">
									<textarea rows="25" id="contents" name="contents">{CONTENTS}</textarea>
								</div>
							</div>
						</fieldset>
						
						<div class="center">
							<input type="hidden" name="token" value="{TOKEN}">
							<button type="submit" name="convers" value="true" class="submit">{L_SUBMIT}</button>
							<button type="button" name="prw_convers" id="prw_convers_pm" onclick="XMLHttpRequest_preview();">{L_PREVIEW}</button>
							<button type="reset" value="true">{L_RESET}</button>
						</div>
					</div>
				</div>
				<footer></footer>
			</section>
		</form>
		# END post_convers #

変更されたテキスト

ファイルを開く

# START convers #
		<script>
		
		</script>
		# INCLUDE message_helper #
		
		<form action="pm{convers.U_USER_ACTION_PM}" method="post" onsubmit="javascript:return Confirm_pm();">
			<section id="module-user-convers">
				<header>
					<h1>{convers.U_PM_BOX}</h1>
				</header>
				<div class="content">
					<div class="right">{L_PRIVATE_MSG}: {convers.PM_POURCENT}</div>
					<br /><br />
					<menu id="cssmenu-pmactions" class="cssmenu cssmenu-group">
						<ul>
							<li>
								<a href="{convers.U_POST_NEW_CONVERS}" class="cssmenu-title"><i class="fa fa-plus"></i> {convers.L_POST_NEW_CONVERS}</a>
							</li>
							<li>
								<a href="{convers.U_MARK_AS_READ}" class="cssmenu-title"><i class="fa fa-eraser"></i> {convers.L_MARK_AS_READ}</a>
							</li>
						</ul>
					</menu>
					<script>
						jQuery("#cssmenu-pmactions").menumaker({
							title: "${LangLoader::get_message('form.options', 'common')}",
							format: "multitoggle",
							breakpoint: 768
						});
					</script>
					<br /><br />
					<table id="table">
						<thead>
							<tr>
								<th>
									<i class="fa fa-envelope"></i>
								</th>
								<th></th>
								<th>
									{L_TITLE}
								</th>
								<th>
									{L_PARTICIPANTS}
								</th>
								<th>
									{L_MESSAGE}
								</th>
								<th>
									{L_LAST_MESSAGE}
								</th>
							</tr>
						</thead>
						<tfoot>
							<tr>
								<th colspan="6">
									<div class="left">&nbsp;<input type="checkbox" id="validc" onclick="check_convers(this.checked, 'd');" title="{L_SELECT_ALL_MESSAGES}" /> &nbsp;<input type="hidden" name="token" value="{TOKEN}"><button type="submit" name="valid" value="true" class="submit">{L_DELETE}</button></div>
									# IF convers.C_PAGINATION #<div class="float-right"># INCLUDE convers.PAGINATION #</div># ENDIF #
								</th>
							</tr>
						</tfoot>
						<tbody>
							# START convers.list #
							<tr>
								<td>
									<input type="checkbox" id="d{convers.list.INCR}" name="{convers.list.ID}">
								</td>
								<td class="convers-announce">
									<i class="fa fa-envelope {convers.list.ANNOUNCE}"></i>
								</td>
								<td class="convers-title no-separator">
									{convers.list.ANCRE} <a href="pm{convers.list.U_CONVERS}">{convers.list.TITLE}</a> &nbsp;<span class="smaller">[{convers.list.U_AUTHOR}]</span>
								</td>
								<td>
									{convers.list.U_PARTICIPANTS}
								</td>
								<td>
									{convers.list.MSG}
								</td>
								<td class="smaller">
									{convers.list.U_LAST_MSG}
								</td>
							</tr>
							# END convers.list #
									
							# START convers.no_pm #
							<tr>
								<td colspan="6">
									<span class="text-strong">{convers.no_pm.L_NO_PM}</span>
								</td>
							</tr>
							# END convers.no_pm #
						</tbody>
					</table>
					<br />
					<table class="announce-legend">
						<tr>
							<td> 
								<i class="fa fa-envelope message-announce"></i> {L_READ} 
							</td>
							<td class="no-separator">  
								<i class="fa fa-envelope message-announce-track"></i> {L_TRACK}
							</td>
							<td class="no-separator">  
								<i class="fa fa-envelope message-announce-new"></i> {L_NOT_READ}
							</td>
						</tr>
					</table>
				</div>
				<footer></footer>
			</section>
		</form>
		# END convers #
		
		# START pm #
		<section id="module-user-pm">
			<header>
				<h1>{pm.U_PM_BOX} : {pm.U_TITLE_CONVERS}</h1>
			</header>
			
			<div class="content">
				# IF pm.C_PAGINATION #<div class="float-right"># INCLUDE pm.PAGINATION #</div># ENDIF #
			
			# START pm.msg #
				<article id="article-pm-{pm.msg.ID}" class="article-pm article-several message">
					<div id="m{pm.msg.ID}" class="message-container">

# START post_convers #
		<form action="pm.php" method="post" onsubmit="return check_form_convers();">
			<section id="module-user-post-convers">
				<header>
					<h1>{post_convers.U_PM_BOX}</h1>
				</header>
				<div class="content">
					# INCLUDE message_helper #
					
					<div class="fieldset-content">
						<p class="center">{L_REQUIRE}</p>
						<fieldset>
							<legend>{L_POST_NEW_CONVERS}</legend>
							# START post_convers.user_id_dest #
							<div class="form-element">
								<label for="login">* {L_RECIPIENT}</label>
								<div class="form-field">
									<label>
										<input type="text" maxlength="25" id="login" name="login" value="{post_convers.LOGIN}">
										<button type="button" value="{L_SEARCH}" onclick="XMLHttpRequest_search_members('', '{THEME}', 'insert_member', '{L_REQUIRE_RECIPIENT}');">{L_SEARCH}</button>
										<span id="search_img"></span>
									</label>
									<div id="xmlhttprequest-result-search" style="display: none;" class="xmlhttprequest-result-search"></div>
									# START post_convers.user_id_dest.search #
										{post_convers.user_id_dest.search.RESULT}
									# END post_convers.user_id_dest.search #
								</div>
							</div>
							# END post_convers.user_id_dest #
							<div class="form-element">
								<label for="title">* {L_TITLE}</label>
								<div class="form-field"><label><input type="text" maxlength="100" id="title" name="title" value="{post_convers.TITLE}"></label></div>
							</div>
							<div class="form-element-textarea">
								<label for="contents">* {L_MESSAGE}</label>
								{KERNEL_EDITOR}
								<div class="form-field-textarea">
									<textarea rows="25" id="contents" name="contents">{CONTENTS}</textarea>
								</div>
							</div>
						</fieldset>
						
						<div class="center">
							<input type="hidden" name="token" value="{TOKEN}">
							<button type="submit" name="convers" value="true" class="submit">{L_SUBMIT}</button>
							<button type="button" name="prw_convers" id="prw_convers_pm" onclick="XMLHttpRequest_preview();">{L_PREVIEW}</button>
							<button type="reset" value="true">{L_RESET}</button>
						</div>
					</div>
				</div>
				<footer></footer>
			</section>
		</form>
		# END post_convers #