比较文本

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

实时编辑器

折叠未更改行

关闭换行

视图

比对精度

语法高亮

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

Untitled diff

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

57 删除

行
总计
删除

字符
总计
删除

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

100 行

48 添加

行
总计
添加

字符
总计
添加

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

99 行

{@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 itemprop="name">{TITLE}</span>

{@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>

# IF NOT C_APPROVED #

# INCLUDE NOT_VISIBLE_MESSAGE #

# ENDIF #

# IF C_EDIT #

<h2>

<span itemprop="name">{TITLE}</span>

# ENDIF #

# IF C_DELETE #

# IF C_EDIT #

# ENDIF #

</div>

# IF C_DELETE #

# ENDIF #

<div class="fa fa-user"></div> # IF C_AUTHOR_EXIST #<a itemprop="author" href="{U_AUTHOR_PROFILE}" class="{AUTHOR_LEVEL_CLASS}" # IF C_AUTHOR_GROUP_COLOR # style="color:{AUTHOR_GROUP_COLOR}" # ENDIF #>{AUTHOR}</a># ELSE #{AUTHOR}# ENDIF #

</span>

</div>

</h2>

# IF C_COMMENTS_ENABLED #

</header>

# ENDIF #

# IF C_COMMENTS_ENABLED #

<span class="infos-options"><span class="text-strong">{@calendar.labels.start_date}</span> : <time datetime="{START_DATE_ISO8601}" itemprop="startDate">{START_DATE}</time></span>

<span class="infos-options"><span class="text-strong">{@calendar.labels.end_date}</span> : <time datetime="{END_DATE_ISO8601}" itemprop="endDate">{END_DATE}</time></span>

</p>

# IF C_HAS_PICTURE #

# ENDIF #

# IF C_HAS_PICTURE #<img itemprop="thumbnailUrl" src="{PICTURE}" alt="{TITLE}" /># ENDIF #

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

# IF C_LOCATION #

<span class="text-strong">{@calendar.labels.location}</span> :

<span itemprop="name">{LOCATION}</span>

# IF C_LOCATION_MAP #<div class="location-map">{LOCATION_MAP}</div># ENDIF #

</p>

</div>

# ENDIF #

# IF C_PARTICIPATION_ENABLED #

# IF C_DISPLAY_PARTICIPANTS #

<div>

<span class="text-strong">{@calendar.labels.participants}</span> :

<span>

# IF C_PARTICIPANTS #

# START participant #

<a href="{participant.U_PROFILE}" class="{participant.LEVEL_CLASS}" # IF participant.C_GROUP_COLOR # style="color:{participant.GROUP_COLOR}" # ENDIF #>{participant.DISPLAY_NAME}</a># IF NOT participant.C_LAST_PARTICIPANT #,# ENDIF #

# END participant #

# ELSE #

{@calendar.labels.no_one}

# ENDIF #

</span>

</div>

# ENDIF #

# IF C_PARTICIPATE #

<a href="{U_SUSCRIBE}" class="basic-button">{@calendar.labels.suscribe}</a>

# IF C_MISSING_PARTICIPANTS #

<span class="small text-italic">({L_MISSING_PARTICIPANTS})</span>

# ENDIF #

# IF C_REGISTRATION_DAYS_LEFT #

<span class="small text-italic">{L_REGISTRATION_DAYS_LEFT}</span>

# ENDIF #

# IF C_IS_PARTICIPANT #

<a href="{U_UNSUSCRIBE}" class="basic-button">{@calendar.labels.unsuscribe}</a>

# ELSE #

# IF C_MAX_PARTICIPANTS_REACHED #<span class="small text-italic">{@calendar.labels.max_participants_reached}</span># ENDIF #

# ENDIF #

# IF C_REGISTRATION_CLOSED #<span class="small text-italic">{@calendar.labels.registration_closed}</span># ENDIF #

# ENDIF #

</div>

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

{@calendar.labels.created_by} : # IF C_AUTHOR_EXIST #<a itemprop="author" href="{U_AUTHOR_PROFILE}" class="{AUTHOR_LEVEL_CLASS}" # IF C_AUTHOR_GROUP_COLOR # style="color:{AUTHOR_GROUP_COLOR}" # ENDIF #>{AUTHOR}</a># ELSE #{AUTHOR}# ENDIF #

# IF C_LOCATION #

# IF C_LOCATION_MAP #<div class="location-map">{LOCATION_MAP}</div># ENDIF #

</div>

# ENDIF #

</div>

{@calendar.labels.start_date} : <span class="float-right"><time datetime="{START_DATE_ISO8601}" itemprop="startDate">{START_DATE}</time></span>

<hr>

{@calendar.labels.end_date} : <span class="float-right"><time datetime="{END_DATE_ISO8601}" itemprop="endDate">{END_DATE}</time></span>

# INCLUDE COMMENTS #

</div>

<hr>

# INCLUDE COMMENTS #

</div>

</article>

</div>

</section>

已保存差异

原始文本

打开文件

<section id="module-calendar">
	<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_APPROVED #
			# INCLUDE NOT_VISIBLE_MESSAGE #
		# ENDIF #
		<article itemscope="itemscope" itemtype="http://schema.org/Event" id="article-calendar-{ID}" class="article-calendar# IF C_NEW_CONTENT # new-content# ENDIF #">
			<header>
				<h2>
					<span itemprop="name">{TITLE}</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')}"# IF NOT C_BELONGS_TO_A_SERIE # data-confirmation="delete-element"# ENDIF #><i class="fa fa-delete"></i></a>
						# ENDIF #
					</span>
				</h2>
				
				<a itemprop="url" href="{U_LINK}"></a>
			</header>
			<div class="content">
				<div itemscope="itemscope" itemtype="http://schema.org/CreativeWork">
					<meta itemprop="about" content="{CATEGORY_NAME}">
					# IF C_COMMENTS_ENABLED #
					<meta itemprop="discussionUrl" content="{U_COMMENTS}">
					<meta itemprop="interactionCount" content="{NUMBER_COMMENTS} UserComments">
					# ENDIF #
					# IF C_HAS_PICTURE #<img itemprop="thumbnailUrl" src="{PICTURE}" alt="{TITLE}" /># ENDIF #
					<div itemprop="text">{CONTENTS}</div>
					
					# IF C_LOCATION #
					<div class="spacer"></div>
					<div itemprop="location" itemscope itemtype="http://schema.org/Place">
						<span class="text-strong">{@calendar.labels.location}</span> :
						<span itemprop="name">{LOCATION}</span>
						# IF C_LOCATION_MAP #<div class="location-map">{LOCATION_MAP}</div># ENDIF #
					</div>
					# ENDIF #
					# IF C_PARTICIPATION_ENABLED #
						<div class="spacer"></div>
						# IF C_DISPLAY_PARTICIPANTS #
						<div>
							<span class="text-strong">{@calendar.labels.participants}</span> :
							<span>
								# IF C_PARTICIPANTS #
									# START participant #
										<a href="{participant.U_PROFILE}" class="{participant.LEVEL_CLASS}" # IF participant.C_GROUP_COLOR # style="color:{participant.GROUP_COLOR}" # ENDIF #>{participant.DISPLAY_NAME}</a># IF NOT participant.C_LAST_PARTICIPANT #,# ENDIF #
									# END participant #
								# ELSE #
									{@calendar.labels.no_one}
								# ENDIF #
							</span>
						</div>
						# ENDIF #
						# IF C_PARTICIPATE #
						<a href="{U_SUSCRIBE}" class="basic-button">{@calendar.labels.suscribe}</a>
							# IF C_MISSING_PARTICIPANTS #
							<span class="small text-italic">({L_MISSING_PARTICIPANTS})</span>
							# ENDIF #
							# IF C_REGISTRATION_DAYS_LEFT #
							<div class="spacer"></div>
							<span class="small text-italic">{L_REGISTRATION_DAYS_LEFT}</span>
							# ENDIF #
						# ENDIF #
						# IF C_IS_PARTICIPANT #
						<a href="{U_UNSUSCRIBE}" class="basic-button">{@calendar.labels.unsuscribe}</a>
						# ELSE #
							# IF C_MAX_PARTICIPANTS_REACHED #<span class="small text-italic">{@calendar.labels.max_participants_reached}</span># ENDIF #
						# ENDIF #
						# IF C_REGISTRATION_CLOSED #<span class="small text-italic">{@calendar.labels.registration_closed}</span># ENDIF #
					# ENDIF #
					
					<div class="spacer"></div>
					<div class="event-display-author">
						{@calendar.labels.created_by} : # IF C_AUTHOR_EXIST #<a itemprop="author" href="{U_AUTHOR_PROFILE}" class="{AUTHOR_LEVEL_CLASS}" # IF C_AUTHOR_GROUP_COLOR # style="color:{AUTHOR_GROUP_COLOR}" # ENDIF #>{AUTHOR}</a># ELSE #{AUTHOR}# ENDIF #
					</div>
				</div>
				<div class="event-display-dates">
					{@calendar.labels.start_date} : <span class="float-right"><time datetime="{START_DATE_ISO8601}" itemprop="startDate">{START_DATE}</time></span>
					<div class="spacer"></div>
					{@calendar.labels.end_date} : <span class="float-right"><time datetime="{END_DATE_ISO8601}" itemprop="endDate">{END_DATE}</time></span>
				</div>
				
				<hr>
				
				# INCLUDE COMMENTS #
			</div>
			<footer></footer>
		</article>
	</div>
	<footer></footer>
</section>

更改后文本

打开文件

<section id="module-calendar">
	<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 itemprop="name">{TITLE}</span>
		</h1>
	</header>
	<div itemscope="itemscope" itemtype="http://schema.org/Event" id="article-calendar-{ID}" class="article-calendar# IF C_NEW_CONTENT # new-content# ENDIF #">

# IF NOT C_APPROVED #
			# 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')}"# IF NOT C_BELONGS_TO_A_SERIE # data-confirmation="delete-element"# ENDIF #><i class="fa fa-delete" aria-hidden="true" title="${LangLoader::get_message('delete', 'common')}"></i></a>
			# ENDIF #
		</div>
		<a itemprop="url" href="{U_LINK}"></a>
		<div class="more">
				<div class="fa fa-user"></div> # IF C_AUTHOR_EXIST #<a itemprop="author" href="{U_AUTHOR_PROFILE}" class="{AUTHOR_LEVEL_CLASS}" # IF C_AUTHOR_GROUP_COLOR # style="color:{AUTHOR_GROUP_COLOR}" # ENDIF #>{AUTHOR}</a># ELSE #{AUTHOR}# ENDIF #
		</div>
		<div class="content" itemscope="itemscope" itemtype="http://schema.org/CreativeWork">
			<meta itemprop="about" content="{CATEGORY_NAME}">
			# IF C_COMMENTS_ENABLED #
			<meta itemprop="discussionUrl" content="{U_COMMENTS}">
			<meta itemprop="interactionCount" content="{NUMBER_COMMENTS} UserComments">
			# ENDIF #

<div class="options infos">
					<p class="event-display-dates">
						<span class="infos-options"><span class="text-strong">{@calendar.labels.start_date}</span> : <time datetime="{START_DATE_ISO8601}" itemprop="startDate">{START_DATE}</time></span>
						<span class="infos-options"><span class="text-strong">{@calendar.labels.end_date}</span> : <time datetime="{END_DATE_ISO8601}" itemprop="endDate">{END_DATE}</time></span>
					</p>
					# IF C_HAS_PICTURE #
						<img itemprop="thumbnailUrl" src="{PICTURE}" alt="{TITLE}" title="{TITLE}" />
					# ENDIF #
					# IF C_LOCATION #
					<p itemprop="location" itemscope itemtype="http://schema.org/Place">
						<span class="text-strong">{@calendar.labels.location}</span> :
						<span itemprop="name">{LOCATION}</span>
					</p>
					# ENDIF #
					# IF C_PARTICIPATION_ENABLED #
						<div class="spacer"></div>
						# IF C_DISPLAY_PARTICIPANTS #
						<div>
							<span class="text-strong">{@calendar.labels.participants}</span> :
							<span>
								# IF C_PARTICIPANTS #
									# START participant #
										<a href="{participant.U_PROFILE}" class="{participant.LEVEL_CLASS}" # IF participant.C_GROUP_COLOR # style="color:{participant.GROUP_COLOR}" # ENDIF #>{participant.DISPLAY_NAME}</a># IF NOT participant.C_LAST_PARTICIPANT #,# ENDIF #
									# END participant #
								# ELSE #
									{@calendar.labels.no_one}
								# ENDIF #
							</span>
						</div>
						# ENDIF #
						# IF C_PARTICIPATE #
						<a href="{U_SUSCRIBE}" class="basic-button">{@calendar.labels.suscribe}</a>
							# IF C_MISSING_PARTICIPANTS #
							<span class="small text-italic">({L_MISSING_PARTICIPANTS})</span>
							# ENDIF #
							# IF C_REGISTRATION_DAYS_LEFT #
							<div class="spacer"></div>
							<span class="small text-italic">{L_REGISTRATION_DAYS_LEFT}</span>
							# ENDIF #
						# ENDIF #
						# IF C_IS_PARTICIPANT #
						<a href="{U_UNSUSCRIBE}" class="basic-button">{@calendar.labels.unsuscribe}</a>
						# ELSE #
							# IF C_MAX_PARTICIPANTS_REACHED #<span class="small text-italic">{@calendar.labels.max_participants_reached}</span># ENDIF #
						# ENDIF #
						# IF C_REGISTRATION_CLOSED #<span class="small text-italic">{@calendar.labels.registration_closed}</span># ENDIF #
					# ENDIF #
				</div>

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

# IF C_LOCATION #
					<div class="location-map" itemprop="location" itemscope itemtype="http://schema.org/Place">
						# IF C_LOCATION_MAP #<div class="location-map">{LOCATION_MAP}</div># ENDIF #
					</div>
				# ENDIF #
		</div>
		<hr>

# INCLUDE COMMENTS #
		<footer></footer>
	</div>
	<footer></footer>
</section>