Confronta il testo

Trova la differenza tra due file di testo

Editor live

Comprimi invariate

Senza a capo

Layout

Livello di dettaglio

Evidenziazione sintassi

Diffchecker Desktop Il modo più sicuro per usare Diffchecker. Ottieni l'app Diffchecker Desktop: i tuoi diff non lasciano mai il tuo computer!Ottieni Desktop

Untitled diff

Creato 7 anni faIl diff non scade mai

122 rimozioni

Linee
Totale
Rimosso

Caratteri
Totale
Rimosso

Per continuare a utilizzare questa funzione, aggiorna a Diffchecker Pro Visualizza prezzi

112 linee

91 aggiunte

Linee
Totale
Aggiunto

Caratteri
Totale
Aggiunto

Per continuare a utilizzare questa funzione, aggiorna a Diffchecker Pro Visualizza prezzi

114 linee

<h1>

{@articles}# 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 #

{@articles}# 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 #

</h1>

</div>

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

</header>

# INCLUDE NOT_VISIBLE_MESSAGE #

<h2>

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

# IF C_EDIT #

# ENDIF #

# IF C_DELETE #

# ENDIF #

</span>

</span>

</h2>

# IF C_AUTHOR_DISPLAYED #

# IF C_AUTHOR_CUSTOM_NAME #

# IF C_AUTHOR_DISPLAYED #

{AUTHOR_CUSTOM_NAME}

# ELSE #

# IF C_AUTHOR_CUSTOM_NAME #

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

{AUTHOR_CUSTOM_NAME}

# ENDIF #

# ELSE #

# ENDIF #

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

<i class="fa fa-calendar" aria-hidden="true"></i> <time datetime="# IF NOT C_DIFFERED #{DATE_ISO8601}# ELSE #{PUBLISHING_START_DATE_ISO8601}# ENDIF #" itemprop="datePublished"># IF NOT C_DIFFERED #{DATE}# ELSE #{PUBLISHING_START_DATE}# ENDIF #</time> |

# ENDIF #

 <i class="fa fa-eye" title="{NUMBER_VIEW} {@articles.sort_field.views}"></i> <span title="{NUMBER_VIEW} {@articles.sort_field.views}">{NUMBER_VIEW}</span>

# ENDIF #

# IF C_COMMENTS_ENABLED #

<i class="fa fa-calendar" title="${LangLoader::get_message('date', 'date-common')}"></i> <time datetime="# IF NOT C_DIFFERED #{DATE_ISO8601}# ELSE #{PUBLISHING_START_DATE_ISO8601}# ENDIF #" itemprop="datePublished"># IF NOT C_DIFFERED #{DATE}# ELSE #{PUBLISHING_START_DATE}# ENDIF #</time> |

 | <i class="fa fa-comments-o" aria-hidden="true"></i> <a itemprop="discussionUrl" class="small" href="{U_COMMENTS}"> {L_COMMENTS}</a>

 <i class="fa fa-eye" title="{NUMBER_VIEW} {@articles.sort_field.views}"></i> <span title="{NUMBER_VIEW} {@articles.sort_field.views}">{NUMBER_VIEW}</span>

# ENDIF #

# IF C_COMMENTS_ENABLED #

 | <i class="fa fa-folder-o" aria-hidden="true"></i> <a itemprop="about" class="small" href="{U_CATEGORY}">{CATEGORY_NAME}</a>

 | <i class="fa fa-comment" title="${LangLoader::get_message('comments', 'comments-common')}"></i><a itemprop="discussionUrl" class="small" href="{U_COMMENTS}"> {L_COMMENTS}</a>

# IF C_KEYWORDS #

 | <i title="${LangLoader::get_message('form.keywords', 'common')}" class="fa fa-tags"></i>

# START keywords #

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

# END keywords #

# ENDIF #

</div>

# IF C_HAS_PICTURE #<meta itemprop="thumbnailUrl" content="{PICTURE}"># ENDIF #

# IF C_PAGINATION #

# INCLUDE FORM #

# ENDIF #

# IF PAGE_NAME #

# ENDIF #

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

${ContentSharingActionsMenuService::display()}

<hr />

# IF C_PAGINATION #

# IF C_NEXT_PAGE #

<a href="{U_NEXT_PAGE}">{L_NEXT_TITLE} <i class="fa fa-arrow-right"></i></a>

# ELSE #

# ENDIF #

 | <i class="fa fa-folder" title="${LangLoader::get_message('category', 'categories-common')}"></i> <a itemprop="about" class="small" href="{U_CATEGORY}">{CATEGORY_NAME}</a>

</div>

# IF C_KEYWORDS #

<div class="pages-pagination center"># INCLUDE PAGINATION_ARTICLES #</div>

 | <i title="${LangLoader::get_message('form.keywords', 'common')}" class="fa fa-tags"></i>

# START keywords #

# IF C_PREVIOUS_PAGE #

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

<a href="{U_PREVIOUS_PAGE}"><i class="fa fa-arrow-left"></i> {L_PREVIOUS_TITLE}</a>

# END keywords #

# ENDIF #

</div>

# ENDIF #

</div>

<aside>

# IF C_SOURCES #

# IF C_HAS_PICTURE #<meta itemprop="thumbnailUrl" content="{PICTURE}"># ENDIF #

<span>${LangLoader::get_message('form.sources', 'common')}</span> :

</header>

# START sources #

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

# IF C_PAGINATION #

# END sources #

# INCLUDE FORM #

# ENDIF #

# IF PAGE_NAME #

# ENDIF #

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

<hr />

# IF C_PAGINATION #

# IF C_NEXT_PAGE #

<a href="{U_NEXT_PAGE}">{L_NEXT_TITLE} <i class="fa fa-arrow-right"></i></a>

# ELSE #

# ENDIF #

</div>

<div class="pages-pagination center"># INCLUDE PAGINATION_ARTICLES #</div>

# IF C_PREVIOUS_PAGE #

<a href="{U_PREVIOUS_PAGE}"><i class="fa fa-arrow-left"></i> {L_PREVIOUS_TITLE}</a>

# ENDIF #

</div>

# ENDIF #

</div>

<aside>

# ENDIF #

# IF C_SOURCES #

# IF C_DATE_UPDATED #

<div><i>${LangLoader::get_message('form.date.update', 'common')} : <time datetime="{DATE_UPDATED_ISO8601}" itemprop="datePublished">{DATE_UPDATED}</time></i></div>

<span>${LangLoader::get_message('form.sources', 'common')}</span> :

# ENDIF #

# START sources #

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

# IF C_NOTATION_ENABLED #

# END sources #

</div>

{KERNEL_NOTATION}

# ENDIF #

</div>

# IF C_DATE_UPDATED #

# ENDIF #

<div><i>${LangLoader::get_message('form.date.update', 'common')} : <time datetime="{DATE_UPDATED_ISO8601}" itemprop="datePublished">{DATE_UPDATED}</time></i></div>

# ENDIF #

# IF C_COMMENTS_ENABLED #

# INCLUDE COMMENTS #

# IF C_NOTATION_ENABLED #

# ENDIF #

</aside>

{KERNEL_NOTATION}

</div>

# ENDIF #

# IF C_COMMENTS_ENABLED #

# INCLUDE COMMENTS #

# ENDIF #

</aside>

</article>

</div>

</section>

Diff salvati

Testo originale

Apri file

<section id="module-articles">
	<header>
		<h1>
			<a href="{U_SYNDICATION}" title="${LangLoader::get_message('syndication', 'common')}"><i class="fa fa-syndication"></i></a>
			{@articles}# 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">
		# INCLUDE NOT_VISIBLE_MESSAGE #
		<article itemscope="itemscope" itemtype="http://schema.org/Article" id="article-articles-{ID}" class="article-articles# IF C_NEW_CONTENT # new-content# ENDIF #">
			<header>
				<h2>
					<span itemprop="name">{TITLE}</span>
					<span class="actions">
						# IF C_EDIT #
							<a href="{U_EDIT_ARTICLE}" title="${LangLoader::get_message('edit', 'common')}"><i class="fa fa-edit"></i></a>
						# ENDIF #
						# IF C_DELETE #
							<a href="{U_DELETE_ARTICLE}" title="${LangLoader::get_message('delete', 'common')}" data-confirmation="delete-element"><i class="fa fa-delete"></i></a>
						# ENDIF #
							<a href="{U_PRINT_ARTICLE}" title="${LangLoader::get_message('printable_version', 'main')}" target="blank"><i class="fa fa-print"></i></a>
					</span>
				</h2>
				
				<div class="more">
					# IF C_AUTHOR_DISPLAYED #
					<i class="fa fa-user" title="${LangLoader::get_message('author', 'common')}"></i>
						# IF C_AUTHOR_CUSTOM_NAME #
							{AUTHOR_CUSTOM_NAME}
						# ELSE #							
							# IF C_AUTHOR_EXIST #<a itemprop="author" href="{U_AUTHOR}" class="{USER_LEVEL_CLASS}" # IF C_USER_GROUP_COLOR # style="color:{USER_GROUP_COLOR}"# ENDIF #>&nbsp;{PSEUDO}&nbsp;</a># ELSE #{PSEUDO}# ENDIF #|&nbsp;
						# ENDIF #
					# ENDIF #
					<i class="fa fa-calendar" title="${LangLoader::get_message('date', 'date-common')}"></i>&nbsp;<time datetime="# IF NOT C_DIFFERED #{DATE_ISO8601}# ELSE #{PUBLISHING_START_DATE_ISO8601}# ENDIF #" itemprop="datePublished"># IF NOT C_DIFFERED #{DATE}# ELSE #{PUBLISHING_START_DATE}# ENDIF #</time>&nbsp;|
					&nbsp;<i class="fa fa-eye" title="{NUMBER_VIEW} {@articles.sort_field.views}"></i>&nbsp;<span title="{NUMBER_VIEW} {@articles.sort_field.views}">{NUMBER_VIEW}</span>
					# IF C_COMMENTS_ENABLED #
						&nbsp;|&nbsp;<i class="fa fa-comment" title="${LangLoader::get_message('comments', 'comments-common')}"></i><a itemprop="discussionUrl" class="small" href="{U_COMMENTS}">&nbsp;{L_COMMENTS}</a>
					# ENDIF #
					&nbsp;|&nbsp;<i class="fa fa-folder" title="${LangLoader::get_message('category', 'categories-common')}"></i>&nbsp;<a itemprop="about" class="small" href="{U_CATEGORY}">{CATEGORY_NAME}</a>
					# IF C_KEYWORDS #
					&nbsp;|&nbsp;<i title="${LangLoader::get_message('form.keywords', 'common')}" class="fa fa-tags"></i> 
						# START keywords #
							<a itemprop="keywords" href="{keywords.URL}">{keywords.NAME}</a># IF keywords.C_SEPARATOR #, # ENDIF #
						# END keywords #
					# ENDIF #
				</div>
				
				<meta itemprop="url" content="{U_ARTICLE}">
				<meta itemprop="description" content="${escape(DESCRIPTION)}">
				<meta itemprop="datePublished" content="# IF NOT C_DIFFERED #{DATE_ISO8601}# ELSE #{PUBLISHING_START_DATE_ISO8601}# ENDIF #">
				<meta itemprop="discussionUrl" content="{U_COMMENTS}">
				# IF C_HAS_PICTURE #<meta itemprop="thumbnailUrl" content="{PICTURE}"># ENDIF #
				<meta itemprop="interactionCount" content="{NUMBER_COMMENTS} UserComments">
			</header>
			<div class="content">
				# IF C_PAGINATION #
					# INCLUDE FORM #
					<div class="spacer"></div>
				# ENDIF #
				# IF PAGE_NAME #
					<h2 class="title page_name">{PAGE_NAME}</h2>
				# ENDIF #
					<div itemprop="text">{CONTENTS}</div>
	
				<hr />
	
				# IF C_PAGINATION #
					<div class="pages-pagination right">
						# IF C_NEXT_PAGE #
						<a href="{U_NEXT_PAGE}">{L_NEXT_TITLE} <i class="fa fa-arrow-right"></i></a>
						# ELSE #
						&nbsp;
						# ENDIF #
					</div>
					<div class="pages-pagination center"># INCLUDE PAGINATION_ARTICLES #</div>
					<div class="pages-pagination">
						# IF C_PREVIOUS_PAGE #
						<a href="{U_PREVIOUS_PAGE}"><i class="fa fa-arrow-left"></i> {L_PREVIOUS_TITLE}</a>
						# ENDIF #
					</div>
				# ENDIF #
				<div class="spacer"></div>
			</div>
			<aside>
				# IF C_SOURCES #
				<div id="articles-sources-container">
					<span>${LangLoader::get_message('form.sources', 'common')}</span> :
					# START sources #
					<a itemprop="isBasedOnUrl" href="{sources.URL}" class="small">{sources.NAME}</a># IF sources.C_SEPARATOR #, # ENDIF #
					# END sources #
				</div>
				# ENDIF #
				# IF C_DATE_UPDATED #
				<div><i>${LangLoader::get_message('form.date.update', 'common')} : <time datetime="{DATE_UPDATED_ISO8601}" itemprop="datePublished">{DATE_UPDATED}</time></i></div>
				# ENDIF #
				<div class="spacer"></div>
				# IF C_NOTATION_ENABLED #
				<div class="left smaller">
					{KERNEL_NOTATION}
				</div>
				# ENDIF #
				<div class="spacer"></div>
				# IF C_COMMENTS_ENABLED #
					# INCLUDE COMMENTS #
				# ENDIF #
			</aside>
			<footer></footer>
		</article>
	</div>
	<footer></footer>
</section>

Testo modificato

Apri file

<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>
			{@articles}# 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>

# INCLUDE NOT_VISIBLE_MESSAGE #

<span class="actions">
			# IF C_EDIT #
			<a href="{U_EDIT_ARTICLE}" 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_ARTICLE}" 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 #
		</span>

<div class="more">
			# IF C_AUTHOR_DISPLAYED #
			<i class="fa fa-user-o" aria-hidden="true"></i>
				# IF C_AUTHOR_CUSTOM_NAME #
					{AUTHOR_CUSTOM_NAME}
				# ELSE #
					# IF C_AUTHOR_EXIST #<a itemprop="author" href="{U_AUTHOR}" class="{USER_LEVEL_CLASS}" # IF C_USER_GROUP_COLOR # style="color:{USER_GROUP_COLOR}"# ENDIF #>&nbsp;{PSEUDO}&nbsp;</a># ELSE #{PSEUDO}# ENDIF #|&nbsp;
				# ENDIF #
			# ENDIF #
			<i class="fa fa-calendar" aria-hidden="true"></i>&nbsp;<time datetime="# IF NOT C_DIFFERED #{DATE_ISO8601}# ELSE #{PUBLISHING_START_DATE_ISO8601}# ENDIF #" itemprop="datePublished"># IF NOT C_DIFFERED #{DATE}# ELSE #{PUBLISHING_START_DATE}# ENDIF #</time>&nbsp;|
			&nbsp;<i class="fa fa-eye" title="{NUMBER_VIEW} {@articles.sort_field.views}"></i>&nbsp;<span title="{NUMBER_VIEW} {@articles.sort_field.views}">{NUMBER_VIEW}</span>
			# IF C_COMMENTS_ENABLED #
				&nbsp;|&nbsp;<i class="fa fa-comments-o" aria-hidden="true"></i> <a itemprop="discussionUrl" class="small" href="{U_COMMENTS}">&nbsp;{L_COMMENTS}</a>
			# ENDIF #
			&nbsp;|&nbsp;<i class="fa fa-folder-o" aria-hidden="true"></i>&nbsp;<a itemprop="about" class="small" href="{U_CATEGORY}">{CATEGORY_NAME}</a>
			# IF C_KEYWORDS #
			&nbsp;|&nbsp;<i title="${LangLoader::get_message('form.keywords', 'common')}" class="fa fa-tags"></i>
				# START keywords #
					<a itemprop="keywords" href="{keywords.URL}">{keywords.NAME}</a># IF keywords.C_SEPARATOR #, # ENDIF #
				# END keywords #
			# ENDIF #
		</div>

<div class="content">
			# IF C_PAGINATION #
				# INCLUDE FORM #
				<div class="spacer"></div>
			# ENDIF #

# IF PAGE_NAME #
				<h2 class="title page_name">{PAGE_NAME}</h2>
			# ENDIF #

<div itemprop="text">{CONTENTS}</div>
			
			${ContentSharingActionsMenuService::display()}

<hr />

# IF C_PAGINATION #
				<div class="pages-pagination right">
					# IF C_NEXT_PAGE #
					<a href="{U_NEXT_PAGE}">{L_NEXT_TITLE} <i class="fa fa-arrow-right"></i></a>
					# ELSE #
					&nbsp;
					# ENDIF #
				</div>
				<div class="pages-pagination center"># INCLUDE PAGINATION_ARTICLES #</div>
				<div class="pages-pagination">
					# IF C_PREVIOUS_PAGE #
					<a href="{U_PREVIOUS_PAGE}"><i class="fa fa-arrow-left"></i> {L_PREVIOUS_TITLE}</a>
					# ENDIF #
				</div>
			# ENDIF #
			<div class="spacer"></div>
		</div>
		<aside>
			# IF C_SOURCES #
			<div id="articles-sources-container">
				<span>${LangLoader::get_message('form.sources', 'common')}</span> :
				# START sources #
				<a itemprop="isBasedOnUrl" href="{sources.URL}" class="small" rel="nofollow">{sources.NAME}</a># IF sources.C_SEPARATOR #, # ENDIF #
				# END sources #
			</div>
			# ENDIF #
			# IF C_DATE_UPDATED #
			<div><i>${LangLoader::get_message('form.date.update', 'common')} : <time datetime="{DATE_UPDATED_ISO8601}" itemprop="datePublished">{DATE_UPDATED}</time></i></div>
			# ENDIF #
			<div class="spacer"></div>
			# IF C_NOTATION_ENABLED #
			<div class="left smaller">
				{KERNEL_NOTATION}
			</div>
			# ENDIF #
			<div class="spacer"></div>
			# IF C_COMMENTS_ENABLED #
				# INCLUDE COMMENTS #
			# ENDIF #
		</aside>
		<footer></footer>
	</div>
	<footer></footer>
</section>