比较文本

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

实时差异

统一差异

折叠行

高亮显示更改

语法高亮

工具

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 7 years agoDiff never expires

行
总计
删除

单词
总计
删除

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

59 行

行
总计
添加

单词
总计
添加

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

226 行

# IF C_ONE_GROUP #

<h1>{@groups}</h1>

<h1>

{@members_list} {@group.of_group} {GROUP_NAME} ({NUMBER_MEMBERS})

# IF C_ADMIN #

# ENDIF #

</h1>

</header>

# IF C_NO_MEMBERS #

<span class="text-strong">{@no_member}</span>

# INCLUDE SELECT_GROUP #

# ELSE #

# START members_list #

# IF members_list.C_AVATAR #<img class="valign-middle" src="{members_list.U_AVATAR}" alt="{members_list.PSEUDO}" title="{members_list.PSEUDO}" /># ENDIF #

</div>

<div class="user-level">{members_list.LEVEL}</div>

<a href="{members_list.U_PROFILE}" class="{members_list.LEVEL_CLASS}" # IF members_list.C_GROUP_COLOR # style="color:{members_list.GROUP_COLOR}" # ENDIF #>{members_list.PSEUDO}</a>

</div>

# IF C_EXTENDED_FIELDS #

# START members_list.extended_fields #

<div class="user-extended-field">{members_list.extended_fields.NAME} : {members_list.extended_fields.VALUE}</div>

# END members_list.extended_fields #

# ENDIF #

</div>

</article>

# END members_list #

# ENDIF #

</div>

<a href="{U_GROUP_LIST}" class="button">{@groups.list}</a>

</div>

</footer>

</section>

# ELSE #

{GROUP_NAME}

# IF C_ADMIN #

# IF C_HAS_GROUP #

# ENDIF #

<span class="groups-list-title">{@groups.select}</span>

</caption>

<thead>

# START group #

<tr>

# IF group.C_GROUP_HAS_IMG #

<th>

{@avatar}

# ELSE #

</th>

<a href="#" id="group-button-{group.GROUP_ID}" class="button group-button group-without-img" title="{@group.view_list_members} {group.GROUP_NAME}" onclick="open_group({group.GROUP_ID});return false;">{group.GROUP_NAME}</a>

<th>

# ENDIF #

{@display_name}

# END group #

</th>

</div>

<th>

# ENDIF #

{@level}

</header>

</th>

</tr>

# IF C_HAS_ADMINS #

</thead>

<tbody>

# START members_list #

<h2>

<tr>

<td>

# IF members_list.C_AVATAR #<img class="valign-middle" src="{members_list.U_AVATAR}" alt="{members_list.PSEUDO}"/># ENDIF #

</td>

</span>

<td>

{@admins.list} <span class="small">({NUMBER_ADMINS})</span>

</h2>

{members_list.PSEUDO}

</header>

</a>

</td>

# START admins_list #

<td>

{members_list.LEVEL}

</td>

</tr>

# END members_list #

# IF admins_list.C_AVATAR #

# IF C_NOT_MEMBERS #

<tr>

# ENDIF #

</div>

<span class="text-strong">{@no_member}</span>

</td>

<div class="user-level">{admins_list.LEVEL}</div>

</tr>

<a href="{admins_list.U_PROFILE}" class="{admins_list.LEVEL_CLASS}" # IF admins_list.C_GROUP_COLOR # style="color:{admins_list.GROUP_COLOR}" # ENDIF #>{admins_list.PSEUDO}</a>

</div>

# IF C_EXTENDED_FIELDS #

# START admins_list.extended_fields #

<div class="user-extended-field">{admins_list.extended_fields.NAME} : {admins_list.extended_fields.VALUE}</div>

# END admins_list.extended_fields #

# ENDIF #

</div>

</article>

# END admins_list #

</div>

</section>

# ENDIF #

# IF C_HAS_MODOS #

<h2>

</span>

{@modos.list} <span class="small">({NUMBER_MODOS})</span>

</h2>

</header>

# START modos_list #

# IF modos_list.C_AVATAR #

# ENDIF #

</div>

<div class="user-level">{modos_list.LEVEL}</div>

<a href="{modos_list.U_PROFILE}" class="{modos_list.LEVEL_CLASS}" # IF modos_list.C_GROUP_COLOR # style="color:{modos_list.GROUP_COLOR}" # ENDIF #>{modos_list.PSEUDO}</a>

</div>

# IF C_EXTENDED_FIELDS #

# START modos_list.extended_fields #

<div class="user-extended-field">{modos_list.extended_fields.NAME} : {modos_list.extended_fields.VALUE}</div>

# END modos_list.extended_fields #

# ENDIF #

</div>

</article>

# END modos_list #

</div>

</section>

# ENDIF #

# START group #

<h2>

</span>

<a href="{group.U_GROUP}" class="group-name" title="{@members_list} {@group.of_group} {group.GROUP_NAME}">{group.GROUP_NAME} <span class="small">({group.NUMBER_MEMBERS})</span></a>

# IF C_ADMIN #

# ENDIF #

</h2>

</header>

# IF group.C_HAS_MEMBERS #

# START group.group_members_list #

# IF group.group_members_list.C_AVATAR #

# ENDIF #

</div>

<div class="user-level">{group.group_members_list.LEVEL}</div>

<a href="{group.group_members_list.U_PROFILE}" class="{group.group_members_list.LEVEL_CLASS}" # IF group.group_members_list.C_GROUP_COLOR # style="color:{group.group_members_list.GROUP_COLOR}" # ENDIF #>{group.group_members_list.PSEUDO}</a>

</div>

# IF C_EXTENDED_FIELDS #

# START group.group_members_list.extended_fields #

<div class="user-extended-field">{group.group_members_list.extended_fields.NAME} : {group.group_members_list.extended_fields.VALUE}</div>

# END group.group_members_list.extended_fields #

# ENDIF #

</div>

</article>

# END group.group_members_list #

# ELSE #

{@no_member}

# ENDIF #

</tbody>

</div>

</table>

</section>

# END group #

</div>

</section>

function open_group(myid, mytype)

{

var myclass = 'selected';

var mytype = (typeof mytype !== 'undefined') ? mytype : 2;

if ((jQuery('#list-members-container-' + myid).hasClass(myclass) && mytype == 2 ) || mytype == 0)

{

if (typeof myid == 'number')

jQuery('#group-button-' + myid).removeClass(myclass);

jQuery('#list-members-container-' + myid).removeClass('reorder-top');

jQuery('#list-members-container-' + myid).removeClass(myclass);

}

else {

if (typeof myid == 'number')

jQuery('#group-button-' + myid).addClass(myclass);

if (mytype == 2)

jQuery('#list-members-container-' + myid).addClass('reorder-top');

jQuery('#list-members-container-' + myid).addClass(myclass);

}

</script>

# ENDIF #

已保存差异

原始文本

打开文件

<section id="module-user-groups-list">
	<header>
		<h1>{@groups}</h1>
	</header>
	<div class="content">
		
		<div class="options user-group-select">
			# INCLUDE SELECT_GROUP #
		</div>

<table id="table">
			<caption>
				{GROUP_NAME}
				# IF C_ADMIN #
					<a href="{U_ADMIN_GROUPS}" class="fa fa-edit"></a>
				# ENDIF #
			</caption>
			<thead>
				<tr>
					<th>
						{@avatar}
					</th>
					<th>
						{@display_name}
					</th>
					<th>
						{@level}
					</th>
				</tr>
			</thead>
			<tbody>
				# START members_list #
				<tr>
					<td>
						# IF members_list.C_AVATAR #<img class="valign-middle" src="{members_list.U_AVATAR}" alt="{members_list.PSEUDO}"/># ENDIF #
					</td>
					<td>
						<a href="{members_list.U_PROFILE}" class="{members_list.LEVEL_CLASS}" # IF members_list.C_GROUP_COLOR # style="color:{members_list.GROUP_COLOR}" # ENDIF #>
							{members_list.PSEUDO}
						</a>
					</td>
					<td>
						{members_list.LEVEL}
					</td>
				</tr>
				# END members_list #
				# IF C_NOT_MEMBERS #
				<tr>
					<td colspan="4">
						<span class="text-strong">{@no_member}</span>
					</td>
				</tr>
				# ENDIF #
			</tbody>
		</table>
	</div>
	<footer></footer>
</section>

更改后文本

打开文件

# IF C_ONE_GROUP #
<section id="module-user-group-list">
	<header>
		<h1>
			{@members_list} {@group.of_group} {GROUP_NAME} ({NUMBER_MEMBERS})
			# IF C_ADMIN #
				<a href="{U_ADMIN_GROUPS}" aria-label="${LangLoader::get_message('edit', 'common')}"><i class="fa fa-edit" aria-hidden="true" title="${LangLoader::get_message('edit', 'common')}"></i></a>
			# ENDIF #
			</h1>
	</header>
	<div class="content elements-container">
		# IF C_NO_MEMBERS #
		<span class="text-strong">{@no_member}</span>
		# ELSE #
			# START members_list #
			<article class="block user-card">
				<header></header>
				<div class="content">
					<div class="avatar-container">
					# IF members_list.C_AVATAR #<img class="valign-middle" src="{members_list.U_AVATAR}" alt="{members_list.PSEUDO}" title="{members_list.PSEUDO}" /># ENDIF #
					</div>
					<div class="infos-container">
						<div class="user-level">{members_list.LEVEL}</div>
						<div class="user-pseudo">
							<a href="{members_list.U_PROFILE}" class="{members_list.LEVEL_CLASS}" # IF members_list.C_GROUP_COLOR # style="color:{members_list.GROUP_COLOR}" # ENDIF #>{members_list.PSEUDO}</a>
						</div>

# IF C_EXTENDED_FIELDS #
					# START members_list.extended_fields #
						<div class="user-extended-field">{members_list.extended_fields.NAME} : {members_list.extended_fields.VALUE}</div>

# END members_list.extended_fields #
					# ENDIF #
					</div>
				</div>
				<footer></footer>
			</article>
			# END members_list #
		# ENDIF #
	</div>
	<footer>
		<div class="center">
			<a href="{U_GROUP_LIST}" class="button">{@groups.list}</a>
		</div>
	</footer>
</section>

# ELSE #

<section id="module-user-groups-list" class="groups-list-container">
	<header>
		# IF C_HAS_GROUP #
		<span class="groups-list-title">{@groups.select}</span>
		<div class="groups-list-select">
		# START group #
			# IF group.C_GROUP_HAS_IMG #
			<a href="#" id="group-button-{group.GROUP_ID}" class="group-button group-has-img" title="{@group.view_list_members} {group.GROUP_NAME}" onclick="open_group({group.GROUP_ID});return false;"><img alt="{group.GROUP_NAME}" src="{group.U_GROUP_IMG}" /></a>
			# ELSE #
			<a href="#" id="group-button-{group.GROUP_ID}" class="button group-button group-without-img" title="{@group.view_list_members} {group.GROUP_NAME}" onclick="open_group({group.GROUP_ID});return false;">{group.GROUP_NAME}</a>
			# ENDIF #
		# END group #
		</div>
		# ENDIF #
	</header>
	<div class="content group-container">
		# IF C_HAS_ADMINS #
		<section id="list-members-container-admin" class="list-admins-container list-members-container selected">
			<header>
				<h2>
					<span class="list-members-container-action">
						<a href="" onclick="open_group('admin', 0);return false;" title="{@group.hide_list_members}" class="action-less"><i class="fa fa-minus"></i></a>
						<a href="" onclick="open_group('admin', 1);return false;" title="{@group.view_list_members}" class="action-more"><i class="fa fa-plus"></i></a>
					</span>
					{@admins.list} <span class="small">({NUMBER_ADMINS})</span>
				</h2>
			</header>
			<div class="content elements-container">
				# START admins_list #
				<article class="block user-card">
					<header></header>
					<div class="content">
						<div class="avatar-container">
							# IF admins_list.C_AVATAR #
							<img class="valign-middle" src="{admins_list.U_AVATAR}" alt="{admins_list.PSEUDO}" title="{admins_list.PSEUDO}" />
							# ENDIF #
						</div>
						<div class="infos-container">
							<div class="user-level">{admins_list.LEVEL}</div>
							<div class="user-pseudo">
								<a href="{admins_list.U_PROFILE}" class="{admins_list.LEVEL_CLASS}" # IF admins_list.C_GROUP_COLOR # style="color:{admins_list.GROUP_COLOR}" # ENDIF #>{admins_list.PSEUDO}</a>
							</div>

# IF C_EXTENDED_FIELDS #
							# START admins_list.extended_fields #
							<div class="user-extended-field">{admins_list.extended_fields.NAME} : {admins_list.extended_fields.VALUE}</div>
							# END admins_list.extended_fields #
							# ENDIF #
						</div>
					</div>
					<footer></footer>
				</article>
				# END admins_list #
			</div>
			<footer></footer>
		</section>
		# ENDIF #
		# IF C_HAS_MODOS #
		<section id="list-members-container-modo" class="list-modos-container list-members-container selected">
			<header>
				<h2>
					<span class="list-members-container-action">
						<a href="" onclick="open_group('modo', 0);return false;" title="{@group.hide_list_members}" class="action-less"><i class="fa fa-minus"></i></a>
						<a href="" onclick="open_group('modo', 1);return false;" title="{@group.view_list_members}" class="action-more"><i class="fa fa-plus"></i></a>
					</span>
					{@modos.list} <span class="small">({NUMBER_MODOS})</span>
				</h2>
			</header>
			<div class="content elements-container">
				# START modos_list #
				<article class="block user-card">
					<header></header>
					<div class="content">
						<div class="avatar-container">
							# IF modos_list.C_AVATAR #
							<img class="valign-middle" src="{modos_list.U_AVATAR}" alt="{modos_list.PSEUDO}" title="{modos_list.PSEUDO}" />
							# ENDIF #
						</div>
						<div class="infos-container">
							<div class="user-level">{modos_list.LEVEL}</div>
							<div class="user-pseudo">
								<a href="{modos_list.U_PROFILE}" class="{modos_list.LEVEL_CLASS}" # IF modos_list.C_GROUP_COLOR # style="color:{modos_list.GROUP_COLOR}" # ENDIF #>{modos_list.PSEUDO}</a>
							</div>

# IF C_EXTENDED_FIELDS #
							# START modos_list.extended_fields #
							<div class="user-extended-field">{modos_list.extended_fields.NAME} : {modos_list.extended_fields.VALUE}</div>
							# END modos_list.extended_fields #
							# ENDIF #
						</div>
					</div>
					<footer></footer>
				</article>
				# END modos_list #
			</div>
			<footer></footer>
		</section>
		# ENDIF #

# START group #
		<section id="list-members-container-{group.GROUP_ID}" class="list-group-container list-members-container">
			<header>
				<h2>
					<span class="list-members-container-action">
						<a href="" onclick="open_group({group.GROUP_ID}, 0);return false;" title="{@group.hide_list_members}" class="action-less"><i class="fa fa-minus"></i></a>
						<a href="" onclick="open_group({group.GROUP_ID}, 1);return false;" title="{@group.view_list_members}" class="action-more"><i class="fa fa-plus"></i></a>
					</span>
					<a href="{group.U_GROUP}" class="group-name" title="{@members_list} {@group.of_group} {group.GROUP_NAME}">{group.GROUP_NAME} <span class="small">({group.NUMBER_MEMBERS})</span></a>
					# IF C_ADMIN #
						<a href="{group.U_ADMIN_GROUPS}" title="${LangLoader::get_message('edit', 'common')}"><i class="fa fa-edit"></i></a>
					# ENDIF #
				</h2>
			</header>
			<div class="content elements-container">
				# IF group.C_HAS_MEMBERS #
					# START group.group_members_list #
						<article class="block user-card">
							<header></header>
							<div class="content">
								<div class="avatar-container">
									# IF group.group_members_list.C_AVATAR #
									<img class="valign-middle" src="{group.group_members_list.U_AVATAR}" alt="{group.group_members_list.PSEUDO}" title="{group.group_members_list.PSEUDO}" />
									# ENDIF #
								</div>
								<div class="infos-container">
									<div class="user-level">{group.group_members_list.LEVEL}</div>
									<div class="user-pseudo">
										<a href="{group.group_members_list.U_PROFILE}" class="{group.group_members_list.LEVEL_CLASS}" # IF group.group_members_list.C_GROUP_COLOR # style="color:{group.group_members_list.GROUP_COLOR}" # ENDIF #>{group.group_members_list.PSEUDO}</a>
									</div>

# IF C_EXTENDED_FIELDS #
									# START group.group_members_list.extended_fields #
									<div class="user-extended-field">{group.group_members_list.extended_fields.NAME} : {group.group_members_list.extended_fields.VALUE}</div>
									# END group.group_members_list.extended_fields #
									# ENDIF #
								</div>
							</div>
							<footer></footer>
						</article>
					# END group.group_members_list #
				# ELSE #
					{@no_member}
				# ENDIF #
			</div>
			<footer></footer>
		</section>
		# END group #
	</div>
	<footer></footer>
</section>

if ((jQuery('#list-members-container-' + myid).hasClass(myclass) && mytype == 2 ) || mytype == 0)
	{
		if (typeof myid == 'number')
			jQuery('#group-button-' + myid).removeClass(myclass);
		jQuery('#list-members-container-' + myid).removeClass('reorder-top');
		jQuery('#list-members-container-' + myid).removeClass(myclass);

}
	else {
		if (typeof myid == 'number')
			jQuery('#group-button-' + myid).addClass(myclass);
		if (mytype == 2)
			jQuery('#list-members-container-' + myid).addClass('reorder-top');
		jQuery('#list-members-container-' + myid).addClass(myclass);
	}
}
</script>

# ENDIF #