テキスト比較

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

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

ツール

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

113 lines

Lines
Total
Added

Words
Total
Added

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

116 lines

# INCLUDE forum_top #

<!--

function check_convers(status, id)

{

for(i = 0; i < {NBR_TOPICS}; i++)

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

}

-->

</script>

<h2>

• {U_FORUM_CAT}

<a href="{U_FORUM_CAT}">{FORUM_CAT}</a>

# IF C_PAGINATION #<span class="float-right"># INCLUDE PAGINATION #</span># ENDIF #

</h2>

</header>

<div class="text_small">{L_EXPLAIN_TRACK}</div>

<thead>

<th class="forum-topic">{L_TOPIC}</th>

<th class="forum-topic" title="{L_TOPIC}"><i class="fa fa-file-o hidden-small-screens"></i><span class="hidden-large-screens">{L_TOPIC}</span></th>

<th class="forum-author">{L_AUTHOR}</th>

<th class="forum-author" title="{L_AUTHOR}"><i class="fa fa-user-o hidden-small-screens"></i><span class="hidden-large-screens">{L_AUTHOR}</span></th>

<th class="forum-message-nb">{L_MESSAGE}</th>

<th class="forum-message-nb" title="{L_MESSAGE}"><i class="fa fa-comments-o hidden-small-screens"></i><span class="hidden-large-screens">{L_MESSAGE}</span></th>

<th class="forum-delete"><input type="checkbox" class="valign-middle" onclick="check_convers(this.checked, 'd');"> {L_DELETE}</th>

<th class="forum-delete" title="{L_DELETE}"><input type="checkbox" class="valign-middle" onclick="check_convers(this.checked, 'd');"> <i class="fa fa-delete hidden-small-screens"></i><span class="hidden-large-screens">{L_DELETE}</span></th>

<th class="forum-last-topic">{L_LAST_MESSAGE}</th>

<th class="forum-last-topic" title="{L_LAST_MESSAGE}"><i class="fa fa-clock-o hidden-small-screens"></i><span class="hidden-large-screens">{L_LAST_MESSAGE}</span></th>

</tr>

</thead>

<tbody>

# IF C_NO_TRACKED_TOPICS #

<tr>

<strong>{L_NO_TRACKED_TOPICS}</strong>

</td>

</tr>

# ENDIF #

# START topics #

<tr>

# IF NOT topics.C_HOT_TOPIC #

# ELSE #

# ENDIF #

</td>

{topics.DISPLAY_MSG} {topics.TRACK} # IF C_POLL #<i class="fa fa-tasks"></i># ENDIF #

# IF topics.C_DISPLAY_MSG #<i class="fa fa-msg-display"></i># ENDIF # <i class="fa fa-msg-track"></i> # IF C_POLL #<i class="fa fa-tasks"></i># ENDIF #

</td>

# IF topics.C_PAGINATION #<span class="pagin-forum"># INCLUDE topics.PAGINATION #</span># ENDIF #

{topics.ANCRE} <strong>{topics.TYPE}</strong> <a title="{topics.TITLE}" href="topic{topics.U_TOPIC_VARS}">{topics.L_DISPLAY_MSG} {topics.TITLE}</a>

<a href="{topics.U_ANCRE}" title=""><i class="fa fa-hand-o-right"></i></a> <strong>{topics.TYPE}</strong> <a title="{topics.TITLE}" href="topic{topics.U_TOPIC_VARS}">{topics.L_DISPLAY_MSG} {topics.TITLE}</a>

<br />

<span class="smaller">{topics.DESC}</span>

</td>

{topics.AUTHOR}

# IF topics.C_AUTHOR #

<a href="{topics.U_AUTHOR}" class="small {topics.AUTHOR_LEVEL}"# IF topics.C_GROUP_COLOR # style="color:{topics.GROUP_COLOR}"# ENDIF #>{topics.AUTHOR}</a>

# ELSE #

<em>{topics.L_GUEST}</em>

# ENDIF #

</td>

{topics.MSG}

</td>

{topics.VUS}

</td>

</td>

</td>

</td>

<a href={topics.LAST_MSG_URL} title="{topics.TITLE}"><i class="fa fa-hand-o-right"></i></a> ${LangLoader::get_message('on', 'main')} {topics.LAST_MSG_DATE_FULL}

<br />

<i class="fa fa-hand-o-right"></i> <a href={topics.LAST_MSG_URL} title="{topics.TITLE}">{topics.LAST_MSG_DATE_FULL}</a>

${LangLoader::get_message('by', 'main')}

</span>

# IF topics.C_LAST_MSG_GUEST #

<a href="{topics.LAST_MSG_USER_PROFIL}" class="small{topics.LAST_MSG_USER_LEVEL}"{topics.LAST_MSG_USER_GROUP_COLOR} >{topics.LAST_MSG_USER_LOGIN}</a>

# ELSE #

# IF topics.C_LAST_MSG_GUEST #

<em>${LangLoader::get_message('guest', 'main')}</em>

<a href="{topics.LAST_MSG_USER_PROFIL}" class="small {topics.LAST_MSG_USER_LEVEL}"# IF topics.C_LAST_MSG_USER_GROUP_COLOR # style="color:{topics.LAST_MSG_USER_GROUP_COLOR}"# ENDIF #>{topics.LAST_MSG_USER_LOGIN}</a>

# ENDIF #

# ELSE #

<em>${LangLoader::get_message('guest', 'main')}</em>

# ENDIF #

</span>

</td>

</tr>

# END topics #

</tbody>

</table>

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

</div>

• {U_FORUM_CAT}

</span>

# IF C_PAGINATION #<span class="float-right"># INCLUDE PAGINATION #</span><div class="spacer"></div># ENDIF #

</footer>

</article

</form>

# INCLUDE forum_bottom #

保存された差分

原文

ファイルを開く

# INCLUDE forum_top #
		
		<script>
		
		</script>
		
		<form action="track{U_TRACK_ACTION}" method="post">
			<article itemscope="itemscope" itemtype="http://schema.org/Creativework" id="article-forum-track">
				<header>
					<h2>
						&bull; {U_FORUM_CAT}
						# IF C_PAGINATION #<span class="float-right"># INCLUDE PAGINATION #</span># ENDIF #
					</h2>
				</header>
				<div class="content">
					<div class="text_small">{L_EXPLAIN_TRACK}</div>
					
					<table id="table" class="module-table forum-table">
						<thead>
							<tr class="forum-text-column">
								<th class="forum-announce-topic"><i class="fa fa-eye"></i></th>
								<th class="forum-fixed-topic"><i class="fa fa-heart"></i></th>
								<th class="forum-topic">{L_TOPIC}</th>
								<th class="forum-author">{L_AUTHOR}</th>
								<th class="forum-message-nb">{L_MESSAGE}</th>
								<th class="forum-view">{L_VIEW}</th>
								<th class="forum-pm"><input type="checkbox" class="valign-middle" onclick="check_convers(this.checked, 'p');"> {L_PM}</th>
								<th class="forum-mail"><input type="checkbox" class="valign-middle" onclick="check_convers(this.checked, 'm');"> {L_MAIL}</th>
								<th class="forum-delete"><input type="checkbox" class="valign-middle" onclick="check_convers(this.checked, 'd');"> {L_DELETE}</th>
								<th class="forum-last-topic">{L_LAST_MESSAGE}</th>
							</tr>
						</thead>
						<tbody>
							# IF C_NO_TRACKED_TOPICS #
							<tr>
								<td colspan="10">
									<strong>{L_NO_TRACKED_TOPICS}</strong>
								</td>
							</tr>
							# ENDIF #
	
							# START topics #
							<tr>
								<td class="forum-announce-topic">
									# IF NOT topics.C_HOT_TOPIC # 
									<i class="fa {topics.IMG_ANNOUNCE}"></i>
									# ELSE #
									<i class="fa # IF topics.C_BLINK #blink # ENDIF #{topics.IMG_ANNOUNCE}-hot"></i>
									# ENDIF #
								</td>
								<td class="forum-fixed-topic">
									{topics.DISPLAY_MSG} {topics.TRACK} # IF C_POLL #<i class="fa fa-tasks"></i># ENDIF #
								</td>
								<td class="forum-topic">
									# IF topics.C_PAGINATION #<span class="pagin-forum"># INCLUDE topics.PAGINATION #</span># ENDIF #
									{topics.ANCRE} <strong>{topics.TYPE}</strong> <a title="{topics.TITLE}" href="topic{topics.U_TOPIC_VARS}">{topics.L_DISPLAY_MSG} {topics.TITLE}</a>
									<br />
									<span class="smaller">{topics.DESC}</span>
								</td>
								<td class="forum-author">
									{topics.AUTHOR}
								</td>
								<td class="forum-message-nb">
									{topics.MSG}
								</td>
								<td class="forum-view">
									{topics.VUS}
								</td>
								<td class="forum-pm">
									<input type="checkbox" id="p{topics.INCR}" name="p{topics.ID}" {topics.CHECKED_PM}>
								</td>
								<td class="forum-mail">
									<input type="checkbox" id="m{topics.INCR}" name="m{topics.ID}" {topics.CHECKED_MAIL}>
								</td>
								<td class="forum-delete">
									<input type="checkbox" id="d{topics.INCR}" name="d{topics.ID}">
								</td>
								<td class="forum-last-topic">
									<a href={topics.LAST_MSG_URL} title="{topics.TITLE}"><i class="fa fa-hand-o-right"></i></a> ${LangLoader::get_message('on', 'main')} {topics.LAST_MSG_DATE_FULL}
									<br />
									${LangLoader::get_message('by', 'main')}
									# IF topics.C_LAST_MSG_GUEST #
									<a href="{topics.LAST_MSG_USER_PROFIL}" class="small{topics.LAST_MSG_USER_LEVEL}"{topics.LAST_MSG_USER_GROUP_COLOR} >{topics.LAST_MSG_USER_LOGIN}</a>
									# ELSE #
										<em>${LangLoader::get_message('guest', 'main')}</em>
									# ENDIF #
								</td>
							</tr>
							# END topics #
						</tbody>
					</table>
					<div class="center">
						<input type="hidden" name="token" value="{TOKEN}">
						<button type="submit" name="valid" value="true" class="submit">{L_SUBMIT}</button>
					</div>
				</div>
				<footer>
					<span class="float-left">
						&bull; {U_FORUM_CAT}
					</span>
					# IF C_PAGINATION #<span class="float-right"># INCLUDE PAGINATION #</span><div class="spacer"></div># ENDIF #
				</footer>
			</article
		</form>
		
		# INCLUDE forum_bottom #

変更されたテキスト

ファイルを開く

# INCLUDE forum_top #

<form action="track{U_TRACK_ACTION}" method="post">
			<article itemscope="itemscope" itemtype="http://schema.org/Creativework" id="article-forum-track">
				<header>
					<h2>
						<a href="{U_FORUM_CAT}">{FORUM_CAT}</a>
						# IF C_PAGINATION #<span class="float-right"># INCLUDE PAGINATION #</span># ENDIF #
					</h2>
				</header>
				<div class="content">
					<div class="text_small">{L_EXPLAIN_TRACK}</div>

<table id="table" class="module-table forum-table">
						<thead>
							<tr class="forum-text-column">
								<th class="forum-announce-topic"><i class="fa fa-eye"></i></th>
								<th class="forum-fixed-topic"><i class="fa fa-heart"></i></th>
								<th class="forum-topic" title="{L_TOPIC}"><i class="fa fa-file-o hidden-small-screens"></i><span class="hidden-large-screens">{L_TOPIC}</span></th>
								<th class="forum-author" title="{L_AUTHOR}"><i class="fa fa-user-o hidden-small-screens"></i><span class="hidden-large-screens">{L_AUTHOR}</span></th>
								<th class="forum-message-nb" title="{L_MESSAGE}"><i class="fa fa-comments-o hidden-small-screens"></i><span class="hidden-large-screens">{L_MESSAGE}</span></th>
								<th class="forum-view" title="{L_VIEW}"><i class="fa fa-eye hidden-small-screens"></i><span class="hidden-large-screens">{L_VIEW}</span></th>
								<th class="forum-pm" title="{L_PM}"><input type="checkbox" class="valign-middle" onclick="check_convers(this.checked, 'p');"> <i class="fa fa-envelope-o hidden-small-screens"></i><span class="hidden-large-screens">{L_PM}</span></th>
								<th class="forum-mail" title="{L_MAIL}"><input type="checkbox" class="valign-middle" onclick="check_convers(this.checked, 'm');"> <i class="fa fa-at hidden-small-screens"></i><span class="hidden-large-screens">{L_MAIL}</span></th>
								<th class="forum-delete" title="{L_DELETE}"><input type="checkbox" class="valign-middle" onclick="check_convers(this.checked, 'd');"> <i class="fa fa-delete hidden-small-screens"></i><span class="hidden-large-screens">{L_DELETE}</span></th>
								<th class="forum-last-topic" title="{L_LAST_MESSAGE}"><i class="fa fa-clock-o hidden-small-screens"></i><span class="hidden-large-screens">{L_LAST_MESSAGE}</span></th>
							</tr>
						</thead>
						<tbody>
							# IF C_NO_TRACKED_TOPICS #
							<tr>
								<td colspan="10">
									<strong>{L_NO_TRACKED_TOPICS}</strong>
								</td>
							</tr>
							# ENDIF #

# START topics #
							<tr>
								<td class="forum-announce-topic">
									# IF NOT topics.C_HOT_TOPIC #
									<i class="fa {topics.IMG_ANNOUNCE}"></i>
									# ELSE #
									<i class="fa # IF topics.C_BLINK #blink # ENDIF #{topics.IMG_ANNOUNCE}-hot"></i>
									# ENDIF #
								</td>
								<td class="forum-fixed-topic">
									# IF topics.C_DISPLAY_MSG #<i class="fa fa-msg-display"></i># ENDIF # <i class="fa fa-msg-track"></i> # IF C_POLL #<i class="fa fa-tasks"></i># ENDIF #
								</td>
								<td class="forum-topic">
									# IF topics.C_PAGINATION #<span class="pagin-forum"># INCLUDE topics.PAGINATION #</span># ENDIF #
									<a href="{topics.U_ANCRE}" title=""><i class="fa fa-hand-o-right"></i></a> <strong>{topics.TYPE}</strong> <a title="{topics.TITLE}" href="topic{topics.U_TOPIC_VARS}">{topics.L_DISPLAY_MSG} {topics.TITLE}</a>
									<span class="smaller">{topics.DESC}</span>
								</td>
								<td class="forum-author">
									# IF topics.C_AUTHOR #
									<a href="{topics.U_AUTHOR}" class="small {topics.AUTHOR_LEVEL}"# IF topics.C_GROUP_COLOR # style="color:{topics.GROUP_COLOR}"# ENDIF #>{topics.AUTHOR}</a>
									# ELSE #
									<em>{topics.L_GUEST}</em>
									# ENDIF #
								</td>
								<td class="forum-message-nb">
									{topics.MSG}
								</td>
								<td class="forum-view">
									{topics.VUS}
								</td>
								<td class="forum-pm">
									<input type="checkbox" id="p{topics.INCR}" name="p{topics.ID}" {topics.CHECKED_PM}>
								</td>
								<td class="forum-mail">
									<input type="checkbox" id="m{topics.INCR}" name="m{topics.ID}" {topics.CHECKED_MAIL}>
								</td>
								<td class="forum-delete">
									<input type="checkbox" id="d{topics.INCR}" name="d{topics.ID}">
								</td>
								<td class="forum-last-topic">
									<span class="last-topic-title">
										<i class="fa fa-hand-o-right"></i> <a href={topics.LAST_MSG_URL} title="{topics.TITLE}">{topics.LAST_MSG_DATE_FULL}</a>
									</span>
									<span class="last-topic-user">
										<i class="fa fa-user-o"></i>
										# IF topics.C_LAST_MSG_GUEST #
										<a href="{topics.LAST_MSG_USER_PROFIL}" class="small {topics.LAST_MSG_USER_LEVEL}"# IF topics.C_LAST_MSG_USER_GROUP_COLOR # style="color:{topics.LAST_MSG_USER_GROUP_COLOR}"# ENDIF #>{topics.LAST_MSG_USER_LOGIN}</a>
										# ELSE #
											<em>${LangLoader::get_message('guest', 'main')}</em>
										# ENDIF #
									</span>
								</td>
							</tr>
							# END topics #
						</tbody>
					</table>
					<div class="center">
						<input type="hidden" name="token" value="{TOKEN}">
						<button type="submit" name="valid" value="true" class="submit">{L_SUBMIT}</button>
					</div>
				</div>
				<footer>
					# IF C_PAGINATION #<span class="float-right"># INCLUDE PAGINATION #</span><div class="spacer"></div># ENDIF #
				</footer>
			</article
		</form>

# INCLUDE forum_bottom #