比较文本

查找两个文本文件之间的差异

实时编辑器

隐藏空白更改

折叠未更改行

关闭换行

视图

比对精度

文本样式

语法高亮

Diffchecker Desktop 运行Diffchecker最安全的方式。获取Diffchecker桌面应用：您的差异永远不会离开您的电脑！获取桌面版

Untitled diff

创建于 7年前差异永不过期

107 删除

行
总计
删除

字符
总计
删除

要继续使用此功能，请升级到 Diffchecker Pro 查看价格

103 行

74 添加

行
总计
添加

字符
总计
添加

要继续使用此功能，请升级到 Diffchecker Pro 查看价格

104 行

<h1>

{@module_title}# IF NOT C_ROOT_CATEGORY # - {CATEGORY_NAME}# ENDIF # # IF IS_ADMIN #<a href="{U_EDIT_CATEGORY}" title="${LangLoader::get_message('edit', 'common')}"><i class="fa fa-edit smaller"></i></a># ENDIF #

{@module_title}# IF NOT C_ROOT_CATEGORY # - {CATEGORY_NAME}# ENDIF #

</h1>

# IF IS_ADMIN #<a href="{U_EDIT_CATEGORY}" aria-label="${LangLoader::get_message('edit', 'common')}"><i class="fa fa-edit small" aria-hidden="true" title="${LangLoader::get_message('edit', 'common')}"></i></a># ENDIF #

</div>

</header>

# IF NOT C_VISIBLE #

# INCLUDE NOT_VISIBLE_MESSAGE #

# ENDIF #

# IF C_EDIT #

<h2>

# ENDIF #

# IF C_DELETE #

# IF C_EDIT #

# ENDIF #

</div>

# IF C_DELETE #

# ENDIF #

</span>

# IF C_COMMENTS_ENABLED #

</h2>

# ENDIF #

# IF C_COMMENTS_ENABLED #

# ENDIF #

# IF C_PICTURE #

</header>

# ENDIF #

# IF C_VISIBLE #

# IF C_DISPLAY_DOWNLOAD_LINK #

# IF C_PICTURE #

<i class="fa fa-download" aria-hidden="true"></i> {@download}

</a>

# ENDIF #

# IF C_VISIBLE #

# IF IS_USER_CONNECTED #

# IF C_DISPLAY_DOWNLOAD_LINK #

<i class="fa fa-download"></i> {@download}

</a>

# IF IS_USER_CONNECTED #

</a>

# ENDIF #

# ELSE #

# INCLUDE UNAUTHORIZED_TO_DOWNLOAD_MESSAGE #

# ENDIF #

# ELSE #

# INCLUDE UNAUTHORIZED_TO_DOWNLOAD_MESSAGE #

# ENDIF #

</div>

# ENDIF #

<h6>{@file_infos}</h6>

</div>

<span class="text-strong">${LangLoader::get_message('size', 'common')} : </span><span># IF C_SIZE #{SIZE}# ELSE #${LangLoader::get_message('unknown_size', 'common')}# ENDIF #</span><br/>

<h6>{@file_infos}</h6>

<span class="text-strong">${LangLoader::get_message('form.date.creation', 'common')} : </span><span><time datetime="# IF NOT C_DIFFERED #{DATE_ISO8601}# ELSE #{DIFFERED_START_DATE_ISO8601}# ENDIF #" itemprop="datePublished"># IF NOT C_DIFFERED #{DATE}# ELSE #{DIFFERED_START_DATE}# ENDIF #</time></span><br/>

# IF C_SOFTWARE_VERSION #<span class="text-strong">{@software_version} : </span><span>{SOFTWARE_VERSION}</span><br/># ENDIF #

# IF C_UPDATED_DATE #<span class="text-strong">${LangLoader::get_message('form.date.update', 'common')} : </span><span><time datetime="{UPDATED_DATE_ISO8601}" itemprop="dateModified">{UPDATED_DATE}</time></span><br/># ENDIF #

<span class="infos-options"><span class="text-strong">${LangLoader::get_message('size', 'common')} : </span># IF C_SIZE #{SIZE}# ELSE #${LangLoader::get_message('unknown_size', 'common')}# ENDIF #</span>

<span class="text-strong">{@downloads_number} : </span><span>{NUMBER_DOWNLOADS}</span><br/>

<span class="infos-options"><span class="text-strong">${LangLoader::get_message('form.date.creation', 'common')} : </span><time datetime="# IF NOT C_DIFFERED #{DATE_ISO8601}# ELSE #{DIFFERED_START_DATE_ISO8601}# ENDIF #" itemprop="datePublished"># IF NOT C_DIFFERED #{DATE}# ELSE #{DIFFERED_START_DATE}# ENDIF #</time></span>

# IF C_NB_VIEW_ENABLED #<span class="text-strong">{@download.number.view} : </span><span>{NUMBER_VIEW}</span># ENDIF #<br />

# IF C_UPDATED_DATE #<span class="infos-options"><span class="text-strong">${LangLoader::get_message('form.date.update', 'common')} : </span><time datetime="{UPDATED_DATE_ISO8601}" itemprop="dateModified">{UPDATED_DATE}</time></span># ENDIF #

<span class="text-strong">${LangLoader::get_message('category', 'categories-common')} : </span><span><a itemprop="about" class="small" href="{U_CATEGORY}">{CATEGORY_NAME}</a></span><br/>

<span class="infos-options"><span class="text-strong">{@downloads_number} : </span>{NUMBER_DOWNLOADS}</span>

# IF C_KEYWORDS #

# IF C_NB_VIEW_ENABLED #<span class="infos-options"><span class="text-strong">{@download.number.view} : </span>{NUMBER_VIEW}</span># ENDIF #

<span class="infos-options"><span class="text-strong">${LangLoader::get_message('category', 'categories-common')} : </span><a itemprop="about" href="{U_CATEGORY}">{CATEGORY_NAME}</a></span>

# IF C_KEYWORDS #

<span class="text-strong">${LangLoader::get_message('form.keywords', 'common')} : </span>

<span>

# START keywords #

<a itemprop="keywords" href="{keywords.URL}">{keywords.NAME}</a># IF keywords.C_SEPARATOR #, # ENDIF #

<a itemprop="keywords" class="small" href="{keywords.URL}">{keywords.NAME}</a># IF keywords.C_SEPARATOR #, # ENDIF #

# END keywords #

</span>

</span><br/>

# ENDIF #

# IF C_AUTHOR_DISPLAYED #

<span class="text-strong">${LangLoader::get_message('author', 'common')} : </span>

<span>

# IF C_AUTHOR_CUSTOM_NAME #

{AUTHOR_CUSTOM_NAME}

# ELSE #

# IF C_AUTHOR_EXIST #<a itemprop="author" rel="author" class="{USER_LEVEL_CLASS}" href="{U_AUTHOR_PROFILE}" # IF C_USER_GROUP_COLOR # style="color:{USER_GROUP_COLOR}" # ENDIF #>{PSEUDO}</a># ELSE #{PSEUDO}# ENDIF #

# IF C_AUTHOR_EXIST #<a itemprop="author" rel="author" class="small {USER_LEVEL_CLASS}" href="{U_AUTHOR_PROFILE}" # IF C_USER_GROUP_COLOR # style="color:{USER_GROUP_COLOR}" # ENDIF #>{PSEUDO}</a># ELSE #{PSEUDO}# ENDIF #

# ENDIF #

</span><br/>

# ENDIF #

# IF C_COMMENTS_ENABLED #

<span># IF C_COMMENTS # {NUMBER_COMMENTS} # ENDIF # {L_COMMENTS}</span>

# ENDIF #

# IF C_VISIBLE #

# IF C_NOTATION_ENABLED #

<div class="center">{NOTATION}</div>

# ENDIF #

</span>

# ENDIF #

# IF C_COMMENTS_ENABLED #

<span class="infos-options"># IF C_COMMENTS # {NUMBER_COMMENTS} # ENDIF # {L_COMMENTS}</span>

# ENDIF #

# IF C_VISIBLE #

# IF C_NOTATION_ENABLED #

<div class="center">{NOTATION}</div>

# ENDIF #

</div>

# ENDIF #

<div itemprop="text">{CONTENTS}</div>

</div>

<aside>

# INCLUDE COMMENTS #

<div itemprop="text">{CONTENTS}</div>

</aside>

${ContentSharingActionsMenuService::display()}

</article>

</div>

<aside>

# INCLUDE COMMENTS #

</aside>

</div>

</section>

已保存差异

原始文本

打开文件

<section id="module-download">
	<header>
		<h1>
			<a href="{U_SYNDICATION}" title="${LangLoader::get_message('syndication', 'common')}"><i class="fa fa-syndication"></i></a>
			{@module_title}# IF NOT C_ROOT_CATEGORY # - {CATEGORY_NAME}# ENDIF # # IF IS_ADMIN #<a href="{U_EDIT_CATEGORY}" title="${LangLoader::get_message('edit', 'common')}"><i class="fa fa-edit smaller"></i></a># ENDIF #
		</h1>
	</header>
	<div class="content">
		# IF NOT C_VISIBLE #
			# INCLUDE NOT_VISIBLE_MESSAGE #
		# ENDIF #
		<article itemscope="itemscope" itemtype="http://schema.org/CreativeWork" id="article-download-{ID}" class="article-download# IF C_NEW_CONTENT # new-content# ENDIF #">
			<header>
				<h2>
					<span id="name" itemprop="name">{NAME}</span>
					<span class="actions">
						# IF C_EDIT #
							<a href="{U_EDIT}" title="${LangLoader::get_message('edit', 'common')}"><i class="fa fa-edit"></i></a>
						# ENDIF #
						# IF C_DELETE #
							<a href="{U_DELETE}" title="${LangLoader::get_message('delete', 'common')}" data-confirmation="delete-element"><i class="fa fa-delete"></i></a>
						# ENDIF #
					</span>
				</h2>
				
				<meta itemprop="url" content="{U_LINK}">
				<meta itemprop="description" content="${escape(DESCRIPTION)}" />
				# IF C_COMMENTS_ENABLED #
				<meta itemprop="discussionUrl" content="{U_COMMENTS}">
				<meta itemprop="interactionCount" content="{NUMBER_COMMENTS} UserComments">
				# ENDIF #
				
			</header>
			<div class="content">
				<div class="options infos">
					<div class="center">
						# IF C_PICTURE #
							<img src="{U_PICTURE}" alt="{NAME}" itemprop="image" />
							<div class="spacer"></div>
						# ENDIF #
						# IF C_VISIBLE #
							# IF C_DISPLAY_DOWNLOAD_LINK #
								<a href="{U_DOWNLOAD}" class="basic-button">
									<i class="fa fa-download"></i> {@download}
								</a>
								
								# IF IS_USER_CONNECTED #
								<a href="{U_DEADLINK}" class="basic-button alt" title="${LangLoader::get_message('deadlink', 'common')}">
									<i class="fa fa-unlink"></i>
								</a>
								# ENDIF #
							# ELSE #
								# INCLUDE UNAUTHORIZED_TO_DOWNLOAD_MESSAGE #
							# ENDIF #
						# ENDIF #
					</div>
					<h6>{@file_infos}</h6>
					<span class="text-strong">${LangLoader::get_message('size', 'common')} : </span><span># IF C_SIZE #{SIZE}# ELSE #${LangLoader::get_message('unknown_size', 'common')}# ENDIF #</span><br/>
					<span class="text-strong">${LangLoader::get_message('form.date.creation', 'common')} : </span><span><time datetime="# IF NOT C_DIFFERED #{DATE_ISO8601}# ELSE #{DIFFERED_START_DATE_ISO8601}# ENDIF #" itemprop="datePublished"># IF NOT C_DIFFERED #{DATE}# ELSE #{DIFFERED_START_DATE}# ENDIF #</time></span><br/>
					# IF C_UPDATED_DATE #<span class="text-strong">${LangLoader::get_message('form.date.update', 'common')} : </span><span><time datetime="{UPDATED_DATE_ISO8601}" itemprop="dateModified">{UPDATED_DATE}</time></span><br/># ENDIF #
					<span class="text-strong">{@downloads_number} : </span><span>{NUMBER_DOWNLOADS}</span><br/>
					# IF C_NB_VIEW_ENABLED #<span class="text-strong">{@download.number.view} : </span><span>{NUMBER_VIEW}</span># ENDIF #<br />
					<span class="text-strong">${LangLoader::get_message('category', 'categories-common')} : </span><span><a itemprop="about" class="small" href="{U_CATEGORY}">{CATEGORY_NAME}</a></span><br/>
					# IF C_KEYWORDS #
						<span class="text-strong">${LangLoader::get_message('form.keywords', 'common')} : </span>
						<span>
							# START keywords #
								<a itemprop="keywords" class="small" href="{keywords.URL}">{keywords.NAME}</a># IF keywords.C_SEPARATOR #, # ENDIF #
							# END keywords #
						</span><br/>
					# ENDIF #
					# IF C_AUTHOR_DISPLAYED #
						<span class="text-strong">${LangLoader::get_message('author', 'common')} : </span>
						<span>
							# IF C_AUTHOR_CUSTOM_NAME #
								{AUTHOR_CUSTOM_NAME}
							# ELSE #
								# IF C_AUTHOR_EXIST #<a itemprop="author" rel="author" class="small {USER_LEVEL_CLASS}" href="{U_AUTHOR_PROFILE}" # IF C_USER_GROUP_COLOR # style="color:{USER_GROUP_COLOR}" # ENDIF #>{PSEUDO}</a># ELSE #{PSEUDO}# ENDIF #  
							# ENDIF #
						</span><br/>
					# ENDIF #
					# IF C_COMMENTS_ENABLED #
						<span># IF C_COMMENTS # {NUMBER_COMMENTS} # ENDIF # {L_COMMENTS}</span>
					# ENDIF #
					# IF C_VISIBLE #
						# IF C_NOTATION_ENABLED #
							<div class="spacer"></div>
							<div class="center">{NOTATION}</div>
						# ENDIF #
					# ENDIF #
				</div>
				
				<div itemprop="text">{CONTENTS}</div>
			</div>
			<aside>
				# INCLUDE COMMENTS #
			</aside>
			<footer></footer>
		</article>
	</div>
	<footer></footer>
</section>

更改后文本

打开文件

<section id="module-download">
	<header>
		<div class="cat-actions">
			<a href="{U_SYNDICATION}" aria-label="${LangLoader::get_message('syndication', 'common')}"><i class="fa fa-syndication" aria-hidden="true" title="${LangLoader::get_message('syndication', 'common')}"></i></a>
			{@module_title}# IF NOT C_ROOT_CATEGORY # - {CATEGORY_NAME}# ENDIF #
			# IF IS_ADMIN #<a href="{U_EDIT_CATEGORY}" aria-label="${LangLoader::get_message('edit', 'common')}"><i class="fa fa-edit small" aria-hidden="true" title="${LangLoader::get_message('edit', 'common')}"></i></a># ENDIF #
		</div>
		<h1><span id="name" itemprop="name">{NAME}</span></h1>
	</header>
	<div itemscope="itemscope" itemtype="http://schema.org/CreativeWork" id="article-download-{ID}" class="article-download# IF C_NEW_CONTENT # new-content# ENDIF #">

# IF NOT C_VISIBLE #
			# INCLUDE NOT_VISIBLE_MESSAGE #
		# ENDIF #
		<div class="actions">
			# IF C_EDIT #
			<a href="{U_EDIT}" aria-label="${LangLoader::get_message('edit', 'common')}"><i class="fa fa-edit" aria-hidden="true" title="${LangLoader::get_message('edit', 'common')}"></i></a>
			# ENDIF #
			# IF C_DELETE #
			<a href="{U_DELETE}" aria-label="${LangLoader::get_message('delete', 'common')}" data-confirmation="delete-element"><i class="fa fa-delete" aria-hidden="true" title="${LangLoader::get_message('delete', 'common')}"></i></a>
			# ENDIF #
		</div>

<div class="content">
			<div class="options infos">
				<div class="center">
					# IF C_PICTURE #
						<img src="{U_PICTURE}" alt="{NAME}" title="{NAME}" itemprop="image" />
						<div class="spacer"></div>
					# ENDIF #
					# IF C_VISIBLE #
						# IF C_DISPLAY_DOWNLOAD_LINK #
							<a href="{U_DOWNLOAD}" class="basic-button">
								<i class="fa fa-download" aria-hidden="true"></i> {@download}
							</a>

# IF IS_USER_CONNECTED #
							<a href="{U_DEADLINK}" class="basic-button alt" aria-label="${LangLoader::get_message('deadlink', 'common')}">
								<i class="fa fa-unlink" aria-hidden="true" title="${LangLoader::get_message('deadlink', 'common')}"></i>
							</a>
							# ENDIF #
						# ELSE #
							# INCLUDE UNAUTHORIZED_TO_DOWNLOAD_MESSAGE #
						# ENDIF #
					# ENDIF #
				</div>
				<h6>{@file_infos}</h6>
				# IF C_SOFTWARE_VERSION #<span class="text-strong">{@software_version} : </span><span>{SOFTWARE_VERSION}</span><br/># ENDIF #
				<span class="infos-options"><span class="text-strong">${LangLoader::get_message('size', 'common')} : </span># IF C_SIZE #{SIZE}# ELSE #${LangLoader::get_message('unknown_size', 'common')}# ENDIF #</span>
				<span class="infos-options"><span class="text-strong">${LangLoader::get_message('form.date.creation', 'common')} : </span><time datetime="# IF NOT C_DIFFERED #{DATE_ISO8601}# ELSE #{DIFFERED_START_DATE_ISO8601}# ENDIF #" itemprop="datePublished"># IF NOT C_DIFFERED #{DATE}# ELSE #{DIFFERED_START_DATE}# ENDIF #</time></span>
				# IF C_UPDATED_DATE #<span class="infos-options"><span class="text-strong">${LangLoader::get_message('form.date.update', 'common')} : </span><time datetime="{UPDATED_DATE_ISO8601}" itemprop="dateModified">{UPDATED_DATE}</time></span># ENDIF #
				<span class="infos-options"><span class="text-strong">{@downloads_number} : </span>{NUMBER_DOWNLOADS}</span>
				# IF C_NB_VIEW_ENABLED #<span class="infos-options"><span class="text-strong">{@download.number.view} : </span>{NUMBER_VIEW}</span># ENDIF #
				<span class="infos-options"><span class="text-strong">${LangLoader::get_message('category', 'categories-common')} : </span><a itemprop="about" href="{U_CATEGORY}">{CATEGORY_NAME}</a></span>
				# IF C_KEYWORDS #
					<span class="infos-options">
						<span class="text-strong">${LangLoader::get_message('form.keywords', 'common')} : </span>
						# START keywords #
							<a itemprop="keywords" href="{keywords.URL}">{keywords.NAME}</a># IF keywords.C_SEPARATOR #, # ENDIF #
						# END keywords #
					</span>
				# ENDIF #
				# IF C_AUTHOR_DISPLAYED #

<span class="infos-options">
						<span class="text-strong">${LangLoader::get_message('author', 'common')} : </span>
						# IF C_AUTHOR_CUSTOM_NAME #
							{AUTHOR_CUSTOM_NAME}
						# ELSE #
							# IF C_AUTHOR_EXIST #<a itemprop="author" rel="author" class="{USER_LEVEL_CLASS}" href="{U_AUTHOR_PROFILE}" # IF C_USER_GROUP_COLOR # style="color:{USER_GROUP_COLOR}" # ENDIF #>{PSEUDO}</a># ELSE #{PSEUDO}# ENDIF #
						# ENDIF #
					</span>
				# ENDIF #
				# IF C_COMMENTS_ENABLED #
					<span class="infos-options"># IF C_COMMENTS # {NUMBER_COMMENTS} # ENDIF # {L_COMMENTS}</span>
				# ENDIF #
				# IF C_VISIBLE #
					# IF C_NOTATION_ENABLED #
						<div class="center">{NOTATION}</div>
					# ENDIF #
				# ENDIF #
			</div>

<div itemprop="text">{CONTENTS}</div>
			<div class="spacer"></div>
			${ContentSharingActionsMenuService::display()}
		</div>
		<aside>
			# INCLUDE COMMENTS #
		</aside>
		<footer></footer>
	</div>
	<footer></footer>
</section>