Version 4.1.2

2025-12-19 05:32:19 -08:00
1 parent 3ba79295ee
commit 28bd025b35
@@ -1,32 +1,370 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <theme name="Default" author_name="Invision Power Services, Inc" author_url="http://www.invisionpower.com">
- <template template_key="database_category_articles_entry" template_title="entry" template_desc="" template_location="database" template_group="category_articles" template_params="$record, $database" template_app="" template_type="template"><![CDATA[<article class='cCmsCategoryFeaturedEntry {{if $record->hidden()}}ipsModerated{{endif}}'>
+ <template template_key="database_category_2_column_first_featured_entry" template_title="entry" template_desc="" template_location="database" template_group="category_2_column_first_featured" template_params="$record, $database, $id" template_app="" template_type="template"><![CDATA[{{$size = ( $id ) ? 'tiny' : 'small';}}
+<div class='{{if $id}}ipsGrid_span6{{else}}ipsGrid_span12{{endif}}'>
+	<article class='cCmsCategoryFeaturedEntry {{if $record->hidden()}}ipsModerated{{endif}}'>
+		<header class='ipsPhotoPanel ipsPhotoPanel_notPhone ipsPhotoPanel_{$size} ipsSpacer_bottom'>
+			{template="userPhoto" app="core" params="$record->author(), $size" group="global"}
+			<div> 
+				<h2 class='ipsType_pageTitle'>
+					{{if $record->prefix()}}
+					{template="prefix" group="global" app="core" params="$record->prefix( TRUE ), $record->prefix()"}
+					{{endif}}
+					<a href="{$record->url()}" title="{lang="read_more_about" sprintf="$record->_title"}">
+						{{if $record->unread()}}
+						<span class='ipsItemStatus' data-ipsTooltip title="{lang="cms_unread_record"}"><i class="fa fa-circle"></i></span>
+						{{endif}}
+						{wordbreak="$record->_title"}
+					</a>
+					{{if $record->mapped('pinned') || $record->mapped('featured') || $record->hidden() === -1 || $record->hidden() === 1}}
+					{{if $record->hidden() === -1}}
+					<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{$record->hiddenBlurb()}'><i class='fa fa-eye-slash'></i></span>
+					{{elseif $record->hidden() === 1}}
+					<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{lang="pending_approval"}'><i class='fa fa-warning'></i></span>
+					{{endif}}
+					{{if $record->mapped('pinned')}}
+					<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_positive" data-ipsTooltip title='{lang="pinned"}'><i class='fa fa-thumb-tack'></i></span>
+					{{endif}}
+					{{if $record->mapped('featured')}}
+					<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_positive" data-ipsTooltip title='{lang="featured"}'><i class='fa fa-star'></i></span>
+					{{endif}}
+					{{endif}}
+				</h2>
+				<p class='ipsType_light ipsType_reset cmsInformation'>
+					{lang="cms_byline" htmlsprintf="$record->author()->link(), $record->container()->url(), $record->container()->_title"}{datetime="$record->record_publish_date"}
+				</p>
+			</div>
+		</header>
+		{{if count( $record->customFieldsForDisplay('listing') )}}
+			<div class='ipsDataItem_meta'>
+			{{foreach $record->customFieldsForDisplay('listing') as $fieldId => $fieldValue}}
+				{{if $fieldValue}}
+					{$fieldValue|raw}
+				{{endif}}
+			{{endforeach}}
+			</div>
+		{{endif}}
+		<section class='ipsType_normal ipsType_richText ipsType_break ipsSpacer_both' data-ipsTruncate data-ipsTruncate-size='7 lines' data-ipsTruncate-type='remove'>
+			{{if $record->record_image}}
+			<div class="cCmsRecord_image">
+				<img class="ipsImage" src="{file="$record->record_image" extension="cms_Records"}">
+			</div>
+			{{endif}}
+	
+			{$record->truncated()|raw}
+		</section>
+		{{if count( $record->tags() )}}
+			{template="tags" group="global" app="core" params="$record->tags()"}
+		{{endif}}
+		<ul class='ipsList_inline'>
+			<li><strong><a href='{$record->url()}' title="{lang="read_more_about" sprintf="$record->name"}">{lang="read_more"}</a></strong></li>
+			{{if $record::database()->options['reviews']}}
+			<li>{template="rating" app="core" params="'small', $record->averageReviewRating(), \IPS\Settings::i()->reviews_rating_out_of" group="global"}</li>
+			{{endif}}
+			<li><a href='{$record->url()}#comments' title='{lang="view_comments"}'><i class='fa fa-comment'></i> {lang="num_comments" pluralize="$record->record_comments"}</a></li>
+			<li class='ipsType_light'>{lang="num_views_with_number" pluralize="$record->record_views"}</li>
+		</ul>
+	</article>
+</div>]]></template>
+ <template template_key="database_category_2_column_first_featured_index" template_title="index" template_desc="" template_location="database" template_group="category_2_column_first_featured" template_params="$database, $articles, $url, $pagination" template_app="" template_type="template"><![CDATA[<div class='ipsPageHeader ipsClearfix ipsSpacer_bottom'>
+	{{if $database->use_categories}}
+	<div class='ipsPos_right ipsResponsive_noFloat'>
+		<a href="{$url->setQueryString('show', 'categories')}" class="ipsButton ipsButton_medium ipsButton_fullWidth ipsButton_link"><i class="fa fa-folder-open"></i> {lang="cms_show_categories"}</a>
+	</div>
+	{{endif}}
+	<h1 class='ipsType_pageTitle'>{$database->_title}</h1>
+	{{if $database->_description}}
+		<div class='ipsPageHeader_info ipsType_light'>
+			{$database->_description}
+		</div>
+	{{endif}}
+</div>
+
+{{if $database->can('add') or \IPS\Member::loggedIn()->member_id}}
+	<ul class="ipsToolList ipsToolList_horizontal ipsClearfix ipsSpacer_both ipsResponsive_hidePhone">
+		{{if $database->can('add')}}
+			<li class='ipsToolList_primaryAction'>
+				<a class="ipsButton ipsButton_medium ipsButton_important ipsButton_fullWidth" {{if $database->use_categories}}data-ipsDialog="1" data-ipsDialog-size="narrow" data-ipsDialog-title="{lang="cms_select_category"}"{{endif}} href="{$url->setQueryString( array( 'do' => 'form', 'd' => \IPS\cms\Databases\Dispatcher::i()->databaseId ) )}">{lang="cms_add_new_record_button" sprintf="$database->recordWord( 1 )"}</a>
+			</li>
+		{{endif}}
+	</ul>
+{{endif}}
+
+<hr class='ipsHr'>
+<section class='ipsType_normal ipsSpacer_both'>
+	{{if count($articles)}}
+		{{foreach $articles as $id => $record}}
+			{{if $id == 0}}
+				<div class='ipsGrid ipsGrid_collapsePhone'>
+				{template="entry" app="cms" location="database" group="category_2_column_first_featured" params="$record, $database, 0"}
+				</div>
+			{{else}}
+				{{if $id % 2}}
+					<div class='ipsGrid ipsGrid_collapsePhone cmsCategory2col'>
+				{{endif}}
+				{template="entry" app="cms" location="database" group="category_2_column_first_featured" params="$record, $database, $id"}
+				{{if  $id % 2 == 0}}
+					</div>
+				{{endif}}
+			{{endif}}
+		{{endforeach}}
+	{{endif}}
+</section>
+{{if $database->featured_settings['pagination'] and ( $pagination['pages'] > 1 )}}
+	{template="pagination" app="core" location="global" group="global" params="$url, $pagination['pages'], $pagination['page'], $database->featured_settings['perpage'], TRUE, 'page'"}
+{{endif}}]]></template>
+ <template template_key="database_category_2_column_image_feature_entry" template_title="entry" template_desc="" template_location="database" template_group="category_2_column_image_feature" template_params="$record, $database, $id" template_app="" template_type="template"><![CDATA[<div class='ipsGrid_span6'>
+	<article class='cCmsCategoryFeaturedEntry {{if $record->hidden()}}ipsModerated{{endif}} cms2ColImageFeature'>
+		{{if $record->record_image}}
+			<div class="cCmsRecord_image">
+				<a href="{$record->url()}" title="{lang="read_more_about" sprintf="$record->_title"}"><img class="ipsImage" src="{file="$record->record_image" extension="cms_Records"}"></a>
+			</div>
+		{{endif}}
+		{{if $record->prefix()}}
+			{template="prefix" group="global" app="core" params="$record->prefix( TRUE ), $record->prefix()"}
+		{{endif}}
+		<h2 class='ipsType_pageTitle'><a href="{$record->url()}" title="{lang="read_more_about" sprintf="$record->_title"}">
+			{wordbreak="$record->_title"}
+		</a></h2>
+	</article>
+</div>]]></template>
+ <template template_key="database_category_2_column_image_feature_index" template_title="index" template_desc="" template_location="database" template_group="category_2_column_image_feature" template_params="$database, $articles, $url, $pagination" template_app="" template_type="template"><![CDATA[<div class='ipsPageHeader ipsClearfix ipsSpacer_bottom'>
+	{{if $database->use_categories}}
+	<div class='ipsPos_right ipsResponsive_noFloat'>
+		<a href="{$url->setQueryString('show', 'categories')}" class="ipsButton ipsButton_medium ipsButton_fullWidth ipsButton_link"><i class="fa fa-folder-open"></i> {lang="cms_show_categories"}</a>
+	</div>
+	{{endif}}
+	<h1 class='ipsType_pageTitle'>{$database->_title}</h1>
+	{{if $database->_description}}
+		<div class='ipsPageHeader_info ipsType_light'>
+			{$database->_description}
+		</div>
+	{{endif}}
+</div>
+
+{{if $database->can('add') or \IPS\Member::loggedIn()->member_id}}
+	<ul class="ipsToolList ipsToolList_horizontal ipsClearfix ipsSpacer_both ipsResponsive_hidePhone">
+		{{if $database->can('add')}}
+			<li class='ipsToolList_primaryAction'>
+				<a class="ipsButton ipsButton_medium ipsButton_important ipsButton_fullWidth" {{if $database->use_categories}}data-ipsDialog="1" data-ipsDialog-size="narrow" data-ipsDialog-title="{lang="cms_select_category"}"{{endif}} href="{$url->setQueryString( array( 'do' => 'form', 'd' => \IPS\cms\Databases\Dispatcher::i()->databaseId ) )}">{lang="cms_add_new_record_button" sprintf="$database->recordWord( 1 )"}</a>
+			</li>
+		{{endif}}
+	</ul>
+{{endif}}
+
+<hr class='ipsHr'>
+<section class='ipsType_normal ipsSpacer_both'>
+	{{if count($articles)}}
+		{{foreach $articles as $id => $record}}
+				{{if $id % 2 == 0}}
+					<div class='ipsGrid ipsGrid_collapsePhone'>
+				{{endif}}
+				{template="entry" app="cms" location="database" group="category_2_column_image_feature" params="$record, $database, $id"}
+				{{if $id % 2 == 1}}
+					</div>
+				{{endif}}
+		{{endforeach}}
+	{{endif}}
+</section>
+{{if $database->featured_settings['pagination'] and ( $pagination['pages'] > 1 )}}
+	{template="pagination" app="core" location="global" group="global" params="$url, $pagination['pages'], $pagination['page'], $database->featured_settings['perpage'], TRUE, 'page'"}
+{{endif}}]]></template>
+ <template template_key="database_category_3_column_first_featured_entry" template_title="entry" template_desc="" template_location="database" template_group="category_3_column_first_featured" template_params="$record, $database, $id" template_app="" template_type="template"><![CDATA[<div class='{{if $id}}ipsGrid_span4{{else}}ipsGrid_span12{{endif}}'>
+	<article class='cCmsCategoryFeaturedEntry {{if $record->hidden()}}ipsModerated{{endif}}'>
+		<header class='{{if $id === 0}}ipsPhotoPanel ipsPhotoPanel_notPhone ipsPhotoPanel_small{{endif}} ipsSpacer_bottom'>
+			{{if $id === 0}}{template="userPhoto" app="core" params="$record->author(), 'small'" group="global"}{{endif}}
+			<div> 
+				<h2 class='ipsType_pageTitle'>
+					{{if $record->prefix()}}
+					{template="prefix" group="global" app="core" params="$record->prefix( TRUE ), $record->prefix()"}
+					{{endif}}
+					<a href="{$record->url()}" title="{lang="read_more_about" sprintf="$record->_title"}">
+						{{if $record->unread()}}
+						<span class='ipsItemStatus' data-ipsTooltip title="{lang="cms_unread_record"}"><i class="fa fa-circle"></i></span>
+						{{endif}}
+						{wordbreak="$record->_title"}
+					</a>
+					{{if $record->mapped('pinned') || $record->mapped('featured') || $record->hidden() === -1 || $record->hidden() === 1}}
+					{{if $record->hidden() === -1}}
+					<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{$record->hiddenBlurb()}'><i class='fa fa-eye-slash'></i></span>
+					{{elseif $record->hidden() === 1}}
+					<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{lang="pending_approval"}'><i class='fa fa-warning'></i></span>
+					{{endif}}
+					{{if $record->mapped('pinned')}}
+					<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_positive" data-ipsTooltip title='{lang="pinned"}'><i class='fa fa-thumb-tack'></i></span>
+					{{endif}}
+					{{if $record->mapped('featured')}}
+					<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_positive" data-ipsTooltip title='{lang="featured"}'><i class='fa fa-star'></i></span>
+					{{endif}}
+					{{endif}}
+				</h2>
+				<p class='ipsType_light ipsType_reset cmsInformation'>
+					{lang="cms_byline" htmlsprintf="$record->author()->link(), $record->container()->url(), $record->container()->_title"}{datetime="$record->record_publish_date"}
+				</p>
+			</div>
+		</header>
+		{{if count( $record->customFieldsForDisplay('listing') )}}
+			<div class='ipsDataItem_meta'>
+			{{foreach $record->customFieldsForDisplay('listing') as $fieldId => $fieldValue}}
+				{{if $fieldValue}}
+					{$fieldValue|raw}
+				{{endif}}
+			{{endforeach}}
+			</div>
+		{{endif}}
+		<section class='ipsType_normal ipsType_richText ipsType_break ipsSpacer_both' data-ipsTruncate data-ipsTruncate-size='7 lines' data-ipsTruncate-type='remove'>
+			{{if $record->record_image}}
+			<div class="cCmsRecord_image">
+				<img class="ipsImage" src="{file="$record->record_image" extension="cms_Records"}">
+			</div>
+			{{endif}}
+	
+			{$record->truncated()|raw}
+		</section>
+		{{if count( $record->tags() )}}
+			{template="tags" group="global" app="core" params="$record->tags()"}
+		{{endif}}
+		<ul class='ipsList_inline'>
+			<li><strong><a href='{$record->url()}' title="{lang="read_more_about" sprintf="$record->name"}">{lang="read_more"}</a></strong></li>
+			{{if $record::database()->options['reviews']}}
+			<li>{template="rating" app="core" params="'small', $record->averageReviewRating(), \IPS\Settings::i()->reviews_rating_out_of" group="global"}</li>
+			{{endif}}
+			<li><a href='{$record->url()}#comments' title='{lang="view_comments"}'><i class='fa fa-comment'></i> {lang="num_comments" pluralize="$record->record_comments"}</a></li>
+			<li class='ipsType_light'>{lang="num_views_with_number" pluralize="$record->record_views"}</li>
+		</ul>
+	</article>
+</div>]]></template>
+ <template template_key="database_category_3_column_first_featured_index" template_title="index" template_desc="" template_location="database" template_group="category_3_column_first_featured" template_params="$database, $articles, $url, $pagination" template_app="" template_type="template"><![CDATA[<div class='ipsPageHeader ipsClearfix ipsSpacer_bottom'>
+	{{if $database->use_categories}}
+	<div class='ipsPos_right ipsResponsive_noFloat'>
+		<a href="{$url->setQueryString('show', 'categories')}" class="ipsButton ipsButton_medium ipsButton_fullWidth ipsButton_link"><i class="fa fa-folder-open"></i> {lang="cms_show_categories"}</a>
+	</div>
+	{{endif}}
+	<h1 class='ipsType_pageTitle'>{$database->_title}</h1>
+	{{if $database->_description}}
+		<div class='ipsPageHeader_info ipsType_light'>
+			{$database->_description}
+		</div>
+	{{endif}}
+</div>
+
+{{if $database->can('add') or \IPS\Member::loggedIn()->member_id}}
+	<ul class="ipsToolList ipsToolList_horizontal ipsClearfix ipsSpacer_both ipsResponsive_hidePhone">
+		{{if $database->can('add')}}
+			<li class='ipsToolList_primaryAction'>
+				<a class="ipsButton ipsButton_medium ipsButton_important ipsButton_fullWidth" {{if $database->use_categories}}data-ipsDialog="1" data-ipsDialog-size="narrow" data-ipsDialog-title="{lang="cms_select_category"}"{{endif}} href="{$url->setQueryString( array( 'do' => 'form', 'd' => \IPS\cms\Databases\Dispatcher::i()->databaseId ) )}">{lang="cms_add_new_record_button" sprintf="$database->recordWord( 1 )"}</a>
+			</li>
+		{{endif}}
+	</ul>
+{{endif}}
+
+<hr class='ipsHr'>
+<section class='ipsType_normal ipsSpacer_both'>
+	{{if count($articles)}}
+		{{foreach $articles as $id => $record}}
+			{{if $id == 0}}
+				<div class='ipsGrid ipsGrid_collapsePhone'>
+				{template="entry" app="cms" location="database" group="category_3_column_first_featured" params="$record, $database, 0"}
+				</div>
+			{{else}}
+				{{if ($id - 1) % 3 == 0}}
+					<div class='ipsGrid ipsGrid_collapsePhone cmsCategory3col'>
+				{{endif}}
+				{template="entry" app="cms" location="database" group="category_3_column_first_featured" params="$record, $database, $id"}
+				{{if ($id - 1) % 3 == 2}}
+					</div>
+				{{endif}}
+			{{endif}}
+		{{endforeach}}
+	{{endif}}
+</section>
+{{if $database->featured_settings['pagination'] and ( $pagination['pages'] > 1 )}}
+	{template="pagination" app="core" location="global" group="global" params="$url, $pagination['pages'], $pagination['page'], $database->featured_settings['perpage'], TRUE, 'page'"}
+{{endif}}]]></template>
+ <template template_key="database_category_3_column_image_feature_entry" template_title="entry" template_desc="" template_location="database" template_group="category_3_column_image_feature" template_params="$record, $database, $id" template_app="" template_type="template"><![CDATA[<div class='ipsGrid_span4'>
+	<article class='cCmsCategoryFeaturedEntry {{if $record->hidden()}}ipsModerated{{endif}} cms3ColImageFeature'>
+		{{if $record->record_image}}
+			<div class="cCmsRecord_image">
+				<a href="{$record->url()}" title="{lang="read_more_about" sprintf="$record->_title"}"><img class="ipsImage" src="{file="$record->record_image" extension="cms_Records"}"></a>
+			</div>
+		{{endif}}
+		{{if $record->prefix()}}
+			{template="prefix" group="global" app="core" params="$record->prefix( TRUE ), $record->prefix()"}
+		{{endif}}
+		<h2 class='ipsType_pageTitle'><a href="{$record->url()}" title="{lang="read_more_about" sprintf="$record->_title"}">
+		{wordbreak="$record->_title"}
+		</a></h2>
+	</article>
+</div>]]></template>
+ <template template_key="database_category_3_column_image_feature_index" template_title="index" template_desc="" template_location="database" template_group="category_3_column_image_feature" template_params="$database, $articles, $url, $pagination" template_app="" template_type="template"><![CDATA[<div class='ipsPageHeader ipsClearfix ipsSpacer_bottom'>
+	{{if $database->use_categories}}
+	<div class='ipsPos_right ipsResponsive_noFloat'>
+		<a href="{$url->setQueryString('show', 'categories')}" class="ipsButton ipsButton_medium ipsButton_fullWidth ipsButton_link"><i class="fa fa-folder-open"></i> {lang="cms_show_categories"}</a>
+	</div>
+	{{endif}}
+	<h1 class='ipsType_pageTitle'>{$database->_title}</h1>
+	{{if $database->_description}}
+		<div class='ipsPageHeader_info ipsType_light'>
+			{$database->_description}
+		</div>
+	{{endif}}
+</div>
+
+{{if $database->can('add') or \IPS\Member::loggedIn()->member_id}}
+	<ul class="ipsToolList ipsToolList_horizontal ipsClearfix ipsSpacer_both ipsResponsive_hidePhone">
+		{{if $database->can('add')}}
+			<li class='ipsToolList_primaryAction'>
+				<a class="ipsButton ipsButton_medium ipsButton_important ipsButton_fullWidth" {{if $database->use_categories}}data-ipsDialog="1" data-ipsDialog-size="narrow" data-ipsDialog-title="{lang="cms_select_category"}"{{endif}} href="{$url->setQueryString( array( 'do' => 'form', 'd' => \IPS\cms\Databases\Dispatcher::i()->databaseId ) )}">{lang="cms_add_new_record_button" sprintf="$database->recordWord( 1 )"}</a>
+			</li>
+		{{endif}}
+	</ul>
+{{endif}}
+
+<hr class='ipsHr'>
+<section class='ipsType_normal ipsSpacer_both'>
+	{{if count($articles)}}
+		{{foreach $articles as $id => $record}}
+				{{if $id % 3 == 0}}
+					<div class='ipsGrid ipsGrid_collapsePhone'>
+				{{endif}}
+				{template="entry" app="cms" location="database" group="category_3_column_image_feature" params="$record, $database, $id"}
+				{{if $id % 3 == 2}}
+					</div>
+				{{endif}}
+		{{endforeach}}
+	{{endif}}
+</section>
+{{if $database->featured_settings['pagination'] and ( $pagination['pages'] > 1 )}}
+	{template="pagination" app="core" location="global" group="global" params="$url, $pagination['pages'], $pagination['page'], $database->featured_settings['perpage'], TRUE, 'page'"}
+{{endif}}]]></template>
+ <template template_key="database_category_articles_entry" template_title="entry" template_desc="" template_location="database" template_group="category_articles" template_params="$record, $database" template_app="" template_type="template"><![CDATA[<article class='cCmsCategoryFeaturedEntry ipsClear ipsClearfix {{if $record->hidden()}}ipsModerated{{endif}}'>
 	<header class='ipsPhotoPanel ipsPhotoPanel_notPhone ipsPhotoPanel_small ipsSpacer_bottom'>
 		{template="userPhoto" app="core" params="$record->author()" group="global"}
 		<div> 
 			<h2 class='ipsType_pageTitle'>
 				{{if $record->prefix()}}
-				{template="prefix" group="global" app="core" params="$record->prefix( TRUE ), $record->prefix()"}
+					{template="prefix" group="global" app="core" params="$record->prefix( TRUE ), $record->prefix()"}
 				{{endif}}
+				{{if $record->mapped('pinned') || $record->mapped('featured') || $record->hidden() === -1 || $record->hidden() === 1}}
+					{{if $record->hidden() === -1}}
+					<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{$record->hiddenBlurb()}'><i class='fa fa-eye-slash'></i></span>
+					{{elseif $record->hidden() === 1}}
+					<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{lang="pending_approval"}'><i class='fa fa-warning'></i></span>
+					{{endif}}
+					{{if $record->mapped('pinned')}}
+					<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_positive" data-ipsTooltip title='{lang="pinned"}'><i class='fa fa-thumb-tack'></i></span>
+					{{endif}}
+					{{if $record->mapped('featured')}}
+					<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_positive" data-ipsTooltip title='{lang="featured"}'><i class='fa fa-star'></i></span>
+					{{endif}}
+				{{endif}}
+				
 				<a href="{$record->url()}" title="{lang="read_more_about" sprintf="$record->_title"}">
 					{{if $record->unread()}}
 					<span class='ipsItemStatus' data-ipsTooltip title="{lang="cms_unread_record"}"><i class="fa fa-circle"></i></span>
 					{{endif}}
 					{wordbreak="$record->_title"}
 				</a>
-				{{if $record->mapped('pinned') || $record->mapped('featured') || $record->hidden() === -1 || $record->hidden() === 1}}
-				{{if $record->hidden() === -1}}
-				<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{$record->hiddenBlurb()}'><i class='fa fa-eye-slash'></i></span>
-				{{elseif $record->hidden() === 1}}
-				<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{lang="pending_approval"}'><i class='fa fa-warning'></i></span>
-				{{endif}}
-				{{if $record->mapped('pinned')}}
-				<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_positive" data-ipsTooltip title='{lang="pinned"}'><i class='fa fa-thumb-tack'></i></span>
-				{{endif}}
-				{{if $record->mapped('featured')}}
-				<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_positive" data-ipsTooltip title='{lang="featured"}'><i class='fa fa-star'></i></span>
-				{{endif}}
-				{{endif}}
 			</h2>
 			<p class='ipsType_light ipsType_reset'>
 				{lang="cms_byline" htmlsprintf="$record->author()->link(), $record->container()->url(), $record->container()->_title"}{datetime="$record->record_publish_date"}
@@ -42,26 +380,37 @@
 		{{endforeach}}
 		</div>
 	{{endif}}
-	<section class='ipsType_normal ipsType_richText ipsType_break ipsSpacer_both' data-ipsTruncate data-ipsTruncate-size='7 lines' data-ipsTruncate-type='remove'>
+	<div {{if $record->record_image}}class='ipsColumns ipsColumns_collapsePhone'{{endif}}>
 		{{if $record->record_image}}
-		<div class="cCmsRecord_image">
-			<img class="ipsImage" src="{file="$record->record_image" extension="cms_Records"}">
-		</div>
+			<div class='ipsColumn ipsColumn_medium'>
+				<div class="cCmsRecord_image">
+					<img class="ipsImage" src="{file="$record->_record_image_thumb" extension="cms_Records"}">
+				</div>
+			</div>
+			<div class='ipsColumn ipsColumn_fluid'>
 		{{endif}}

-		{$record->truncated()|raw}
-	</section>
-	{{if count( $record->tags() )}}
-		{template="tags" group="global" app="core" params="$record->tags()"}
-	{{endif}}
-	<ul class='ipsList_inline'>
-		<li><strong><a href='{$record->url()}' title="{lang="read_more_about" sprintf="$record->name"}">{lang="read_more"}</a></strong></li>
-		{{if $record::database()->options['reviews']}}
-		<li>{template="rating" app="core" params="'small', $record->averageReviewRating(), \IPS\Settings::i()->reviews_rating_out_of" group="global"}</li>
+				<section class='ipsType_normal ipsType_richText ipsType_break ipsSpacer_bottom' data-ipsTruncate data-ipsTruncate-size='7 lines' data-ipsTruncate-type='remove'>
+					{$record->truncated()|raw}
+				</section>
+
+				{{if count( $record->tags() )}}
+					{template="tags" group="global" app="core" params="$record->tags()"}
+				{{endif}}
+				<ul class='ipsList_inline ipsClear'>
+					<li><strong><a href='{$record->url()}' title="{lang="read_more_about" sprintf="$record->name"}">{lang="read_more"}</a></strong></li>
+					{{if $record::database()->options['reviews']}}
+					<li>{template="rating" app="core" params="'small', $record->averageReviewRating(), \IPS\Settings::i()->reviews_rating_out_of" group="global"}</li>
+					{{endif}}
+					<li><a href='{$record->url()}#comments' title='{lang="view_comments"}'><i class='fa fa-comment'></i> {lang="num_comments" pluralize="$record->record_comments"}</a></li>
+					<li class='ipsType_light'>{lang="num_views_with_number" pluralize="$record->record_views"}</li>
+				</ul>
+
+		{{if $record->record_image}}
+			</div>
 		{{endif}}
-		<li><a href='{$record->url()}#comments' title='{lang="view_comments"}'><i class='fa fa-comment'></i> {lang="num_comments" pluralize="$record->record_comments"}</a></li>
-		<li class='ipsType_light'>{lang="num_views_with_number" pluralize="$record->record_views"}</li>
-	</ul>
+	</div>
+	
 </article>]]></template>
 <template template_key="database_category_articles_index" template_title="index" template_desc="" template_location="database" template_group="category_articles" template_params="$database, $articles, $url, $pagination" template_app="" template_type="template"><![CDATA[<div class='ipsPageHeader ipsClearfix ipsSpacer_bottom'>
 	{{if $database->use_categories}}
@@ -137,7 +486,7 @@
 			{{if $lastPost}}
 				<li>{template="userPhoto" app="core" group="global" params="$lastPost['author'], 'tiny'"}</li>
 				<li><a href="{$lastPost['record_url']}" class='ipsType_break ipsContained' title='{$lastPost['record_title']}'>{truncate="$lastPost['record_title']" length="30"}</a></li>
-				<li>{lang="byline_nodate" htmlsprintf="$lastPost['author']->link()"}</li>
+				<li class='ipsType_blendLinks'>{lang="byline_nodate" htmlsprintf="$lastPost['author']->link()"}</li>
 				<li data-short="1 dy" class="ipsType_light"><a href='{$lastPost['record_url']->setQueryString( 'do', 'getLastComment' )}' title='{lang="get_last_post"}' class='ipsType_blendLinks'>{datetime="$lastPost['date']"}</a></li>
 			{{else}}
 				<li class='ipsType_light ipsResponsive_showDesktop'>{lang="content_categories_index_no_records" sprintf="\IPS\cms\Databases::load( $category->database_id )->recordWord()"}</li>
@@ -190,14 +539,20 @@
 </html>]]></template>
 <template template_key="database_display_comment" template_title="comment" template_desc="" template_location="database" template_group="display" template_params="$item, $comment, $editorName, $app, $type, $class=''" template_app="" template_type="template"><![CDATA[{{$itemIdField = $item::$databaseColumnId; $idField = $comment::$databaseColumnId;}}
 <div id='comment-{$comment->$idField}_wrap' data-controller='core.front.core.comment' data-commentApp='{$app}' data-commentType='{$type}' data-commentID="{$comment->$idField}" data-quoteData='{expression="json_encode( array('userid' => $comment->author()->member_id, 'username' => $comment->author()->name, 'timestamp' => $comment->mapped('date'), 'contentapp' => $app, 'contenttype' => $type, 'contentclass' => $class, 'contentid' => $item->$itemIdField, 'contentcommentid' => $comment->$idField) )"}' class='cPost_content ipsComment_content ipsType_medium {{if $comment->hidden()}}ipsModerated{{endif}} ipsFaded_withHover'>
+	{{if in_array( 'IPS\Content\Reputation', class_implements( $comment ) ) and settings.reputation_highlight and $comment->reputation() >= settings.reputation_highlight}}
+		<strong class='ipsComment_popularFlag' data-ipsTooltip title='{lang="this_is_a_popular_comment"}'><i class='fa fa-heart'></i></strong>
+	{{endif}}
 	
 	<div class='ipsComment_header ipsPhotoPanel ipsPhotoPanel_mini ipsPhotoPanel_notPhone'>
 		{template="userPhoto" app="core" group="global" params="$comment->author(), 'mini', $comment->warningRef()"}
 		<div>
 			<p class='ipsPos_right ipsType_reset ipsType_blendLinks'>
-				<a href='{$comment->item()->url()->setQueryString( array( 'do' => 'findComment', 'comment' => $comment->id ) )}' data-ipsTooltip title='{lang="share_this_comment"}' data-ipsMenu data-ipsMenu-closeOnClick='false' id='elShareComment_{$comment->id}'><i class='fa fa-share-alt'></i></a>
+				<a href='{$comment->item()->url()->setQueryString( array( 'do' => 'findComment', 'comment' => $comment->id ) )}' data-ipsTooltip title='{lang="share_this_comment"}' data-ipsMenu data-ipsMenu-closeOnClick='false' id='elShareComment_{$comment->id}' data-role='shareComment'><i class='fa fa-share-alt'></i></a>
 				{{if count( $item->commentMultimodActions() )}}
-				<input type="checkbox" name="multimod[{$comment->$idField}]" value="1" data-role="moderation" data-actions="{{if $comment->canSplit()}}split merge{{endif}} {{if $comment->hidden() === -1 AND $comment->canUnhide()}}unhide{{elseif $comment->hidden() === 1 AND $comment->canUnhide()}}approve{{elseif $comment->canHide()}}hide{{endif}} {{if $comment->canDelete()}}delete{{endif}}" data-state='{{if $comment->tableStates()}}{$comment->tableStates()}{{endif}}'>
+				<span class='ipsCustomInput'>
+					<input type="checkbox" name="multimod[{$comment->$idField}]" value="1" data-role="moderation" data-actions="{{if $comment->canSplit()}}split merge{{endif}} {{if $comment->hidden() === -1 AND $comment->canUnhide()}}unhide{{elseif $comment->hidden() === 1 AND $comment->canUnhide()}}approve{{elseif $comment->canHide()}}hide{{endif}} {{if $comment->canDelete()}}delete{{endif}}" data-state='{{if $comment->tableStates()}}{$comment->tableStates()}{{endif}}'>
+					<span></span>
+				</span>
 				{{endif}}
 			</p>
 			<h3 class='ipsComment_author ipsType_blendLinks'>
@@ -205,7 +560,7 @@
 				{template="reputationBadge" group="global" app="core" params="$comment->author()"}
 			</h3>
 			<p class='ipsComment_meta ipsType_light ipsType_medium'>
-				{$comment->dateLine()|raw}
+				<a href='{$comment->item()->url()->setQueryString( array( 'do' => 'findComment', 'comment' => $comment->id ) )}' class='ipsType_blendLinks' title='{lang="share_this_comment"}'>{$comment->dateLine()|raw}</a>
 				{{if $comment->editLine()}}
 					({lang="edited_lc"})
 				{{endif}}
@@ -222,11 +577,7 @@
 			{{endif}}
 		</div>
 	</div>
-	<div class='ipsAreaBackground_reset ipsPad'>
-		{{if in_array( 'IPS\Content\Reputation', class_implements( $comment ) ) and settings.reputation_highlight and $comment->reputation() >= settings.reputation_highlight}}
-			<strong class='ipsComment_popularFlag' data-ipsTooltip title='{lang="this_is_a_popular_comment"}'><i class='fa fa-star'></i></strong>
-		{{endif}}
-		
+	<div class='ipsAreaBackground_reset ipsPad'>		
 		<div data-role='commentContent' class='ipsType_normal ipsType_richText ipsType_break ipsContained' data-controller='core.front.core.lightboxedImages'>
 			{{if $comment->hidden() === 1 && $comment->author()->member_id == \IPS\Member::loggedIn()->member_id}}
 				<strong class='ipsType_medium ipsType_warning'><i class='fa fa-info-circle'></i> {lang="comment_awaiting_approval"}</strong>
@@ -340,7 +691,7 @@
 <article itemscope itemtype="http://schema.org/Comment" id='elComment_{$comment->$idField}' class='ipsComment {{if $otherClasses}}{$otherClasses}{{endif}} {{if in_array( 'IPS\Content\Reputation', class_implements( $comment ) ) and settings.reputation_highlight and $comment->reputation() >= settings.reputation_highlight}}ipsComment_popular{{endif}} ipsComment_parent ipsClearfix ipsClear {{if $comment->isIgnored()}}ipsHide{{endif}} {{if $comment->hidden()}}ipsModerated{{endif}}'>
 	{template="comment" group="display" location="database" app="cms" params="$item, $comment, $item::$formLangPrefix . 'comment', $item::$application, $item::$module, $itemClassSafe"}
 </article>]]></template>
- <template template_key="database_display_comments" template_title="comments" template_desc="" template_location="database" template_group="display" template_params="$record" template_app="" template_type="template"><![CDATA[<div data-controller='core.front.core.commentFeed' data-commentsType='comments' data-baseURL='{$record->url()}' {{if $record->isLastPage()}}data-lastPage{{endif}} data-feedID='records{$record::$customDatabaseId}-{$record->_id}' id='comments'>
+ <template template_key="database_display_comments" template_title="comments" template_desc="" template_location="database" template_group="display" template_params="$record" template_app="" template_type="template"><![CDATA[<div data-controller='core.front.core.commentFeed' {{if settings.auto_polling_enabled}}data-autoPoll{{endif}} data-commentsType='comments' data-baseURL='{$record->url()}' {{if $record->isLastPage()}}data-lastPage{{endif}} data-feedID='records{$record::$customDatabaseId}-{$record->_id}' id='comments'>
 	<br>
 	{{if $record->commentPageCount() > 1}}
 		{$record->commentPagination( array( 'tab' ) )|raw}
@@ -374,7 +725,7 @@
 		<div class='ipsAreaBackground ipsPad' data-role='replyArea'>
 			{{if $record->commentForm()}}
 				{{if $record->locked()}}
-					<p class='ipsType_reset ipsType_warning ipsComposeArea_warning ipsSpacer_bottom ipsSpacer_half'><i class='fa fa-info-circle'></i> {lang="cms_locked_can_comment"}</p>
+					<p class='ipsType_reset ipsType_warning ipsComposeArea_warning ipsSpacer_bottom ipsSpacer_half'><i class='fa fa-info-circle'></i> {lang="cms_locked_can_comment" sprintf="$record::database()->recordWord(1)"}</p>
 				{{endif}}
 				{$record->commentForm()|raw}
 			{{else}}
@@ -407,7 +758,8 @@
 		{{if $record->prefix()}}
 			{template="prefix" group="global" app="core" params="$record->prefix( TRUE ), $record->prefix()"}
 		{{endif}}
-		{{if $record->locked()}}<i class='fa fa-lock'></i> {{endif}}{wordbreak="$record->_title"}
+		{{if $record->locked()}}<i class='fa fa-lock'></i> {{endif}}
+
 		{{if $record->isFutureDate() || $record->mapped('pinned') || $record->mapped('featured') || $record->hidden() === -1 || $record->hidden() === 1}}
 			{{if $record->isFutureDate()}}
 				<span class="ipsBadge ipsBadge_icon ipsBadge_warning" data-ipsTooltip title='{$record->futureDateBlurb()}'><i class='fa fa-clock-o'></i></span>
@@ -423,6 +775,8 @@
 				<span class="ipsBadge ipsBadge_icon ipsBadge_positive" data-ipsTooltip title='{lang="featured"}'><i class='fa fa-star'></i></span>
 			{{endif}}
 		{{endif}}
+		
+		{wordbreak="$record->_title"}
 	</h1>
 	
 	{{if $record::database()->options['reviews']}}
@@ -451,7 +805,7 @@
 		</p>
 		<ul class='ipsList_inline'>
 			<li>{datetime="$record->record_publish_date"}</li>
-			{{foreach $record->customFieldsForDisplay('display') as $fieldId => $fieldValue}}
+			{{foreach $record->customFieldsForDisplay('display_top') as $fieldId => $fieldValue}}
 				{{if $fieldValue}}
 					{$fieldValue|raw}
 				{{endif}}
@@ -468,17 +822,23 @@
 	<div class='ipsClearfix'>
 		{{if $record->record_image}}
 			<div class="cCmsRecord_image">
-				<img class="ipsImage" src="{file="$record->record_image" extension="cms_Records"}">
+				<img class="ipsImage" src="{file="$record->_record_image_thumb" extension="cms_Records"}">
 			</div>
 		{{endif}}
-
 		<section class="ipsType_richText ipsType_normal" data-controller='core.front.core.lightboxedImages'>{$record->_content|raw}</section>
 		
 		{{if $record->editLine()}}
 			{$record->editLine()|raw}
 		{{endif}}
 	</div>
-		
+	{{if $bottomFields = $record->customFieldsForDisplay('display_bottom')}}
+		<hr class='ipsHr ipsClear ipsClearfix'>
+		{{foreach $bottomFields as $fieldId => $fieldValue}}
+			{{if $fieldValue}}
+				{$fieldValue|raw}
+			{{endif}}
+		{{endforeach}}
+	{{endif}}	
 	<hr class='ipsHr ipsClear ipsClearfix'>

 	{{if $record instanceof \IPS\Content\Reputation and settings.reputation_enabled}}
@@ -593,11 +953,11 @@
 ]]></template>
 <template template_key="database_display_recordEditLine" template_title="recordEditLine" template_desc="" template_location="database" template_group="display" template_params="$record" template_app="" template_type="template"><![CDATA[
 <span class='ipsType_reset ipsType_medium ipsType_light' data-excludequote>
-	<strong>{lang="date_edited" htmlsprintf="\IPS\DateTime::ts( $record->record_edit_time )->html(FALSE), htmlentities( $record->record_edit_member_name, ENT_QUOTES | \IPS\HTMLENTITIES, 'UTF-8', FALSE )"}</strong>
+	<strong>{lang="date_edited" htmlsprintf="\IPS\DateTime::ts( $record->record_edit_time )->html(FALSE), htmlspecialchars( $record->record_edit_member_name, ENT_QUOTES | \IPS\HTMLENTITIES, 'UTF-8', FALSE )"}</strong>
 	{{if $record->edit_reason}}
 		<br>{$record->edit_reason}
 	{{endif}}
-	{{if \IPS\Settings::i()->edit_log == 2 and ( \IPS\Settings::i()->edit_log_public or \IPS\Member::loggedIn()->modPermission('can_view_editlog') )}}
+	{{if $record->database()->revisions and \IPS\Settings::i()->edit_log == 2 and ( \IPS\Settings::i()->edit_log_public or \IPS\Member::loggedIn()->modPermission('can_view_editlog') )}}
 		<a href='{$record->url('revisions')}' data-ipsDialog data-ipsDialog-title="{lang="content_view_revisions"}" title="{lang="content_edit_view_revisions"}">{lang="content_edit_view_revisions"}</a>
 		{{if !$record->record_edit_show AND \IPS\Member::loggedIn()->modPermission('can_view_editlog')}}
 		<br>{lang="comment_edit_show_anyways"}
@@ -609,9 +969,12 @@
 		{template="userPhoto" app="core" group="global" params="$review->author(), 'small', $review->warningRef(), 'ipsPos_left'"}
 		<div>
 			<p class='ipsPos_right ipsType_reset ipsType_blendLinks'>
-				<a href='{$review->item()->url()->setQueryString( array( 'do' => 'findReview', 'review' => $review->id ) )}' data-ipsTooltip title='{lang="share_this_review"}' data-ipsMenu data-ipsMenu-closeOnClick='false' id='elShareComment_{$review->id}'><i class='fa fa-share-alt'></i></a>
+				<a href='{$review->item()->url()->setQueryString( array( 'do' => 'findReview', 'review' => $review->id ) )}' data-ipsTooltip title='{lang="share_this_review"}' data-ipsMenu data-ipsMenu-closeOnClick='false' id='elShareComment_{$review->id}' data-role='shareComment'><i class='fa fa-share-alt'></i></a>
 				{{if count( $item->reviewMultimodActions() )}}
-					<input type="checkbox" name="multimod[{$review->id}]" value="1" data-role="moderation" data-actions="{{if $review->hidden() === -1 AND $review->canUnhide()}}unhide{{elseif $review->hidden() === 1 AND $review->canUnhide()}}approve{{elseif $review->canHide()}}hide{{endif}} {{if $review->canDelete()}}delete{{endif}}" data-state='{{if $review->tableStates()}}{$review->tableStates()}{{endif}}'>
+					<span class='ipsCustomInput'>
+						<input type="checkbox" name="multimod[{$review->id}]" value="1" data-role="moderation" data-actions="{{if $review->hidden() === -1 AND $review->canUnhide()}}unhide{{elseif $review->hidden() === 1 AND $review->canUnhide()}}approve{{elseif $review->canHide()}}hide{{endif}} {{if $review->canDelete()}}delete{{endif}}" data-state='{{if $review->tableStates()}}{$review->tableStates()}{{endif}}'>
+						<span></span>
+					</span>
 				{{endif}}
 			</p>
 			<h3 class="ipsComment_author ipsType_blendLinks">
@@ -643,7 +1006,7 @@
 		</div>
 	</div>
 	<div class='ipsPad'>
-		<div id="review-{$review->id}" data-role="commentContent" class="ipsType_richText ipsType_break ipsContained" itemprop="reviewBody" data-controller='core.front.core.lightboxedImages'>
+		<div id="review-{$review->id}" data-role="commentContent" class="ipsType_richText ipsType_normal ipsType_break ipsContained" itemprop="reviewBody" data-controller='core.front.core.lightboxedImages'>
 			{$review->content()|raw}
 		</div>

@@ -734,7 +1097,7 @@
 		{template="review" location="database" group="display" app="cms" params="$item, $review, $item::$formLangPrefix . 'review', $item::$application, $item::$module"}
 	</article>
 {{endif}}]]></template>
- <template template_key="database_display_reviews" template_title="reviews" template_desc="" template_location="database" template_group="display" template_params="$record" template_app="" template_type="template"><![CDATA[<div data-controller='core.front.core.commentFeed' data-commentsType='reviews' data-baseURL='{$record->url()}' {{if $record->isLastPage('reviews')}}data-lastPage{{endif}} data-feedID='records{$record::$customDatabaseId}-{$record->id}-reviews' id='reviews'>
+ <template template_key="database_display_reviews" template_title="reviews" template_desc="" template_location="database" template_group="display" template_params="$record" template_app="" template_type="template"><![CDATA[<div data-controller='core.front.core.commentFeed' {{if settings.auto_polling_enabled}}data-autoPoll{{endif}} data-commentsType='reviews' data-baseURL='{$record->url()}' {{if $record->isLastPage('reviews')}}data-lastPage{{endif}} data-feedID='records{$record::$customDatabaseId}-{$record->id}-reviews' id='reviews'>
 	{{if $record->canReview()}}
 		{{if $record->locked()}}
 			<strong class='ipsType_warning'><i class='fa fa-info-circle'></i> {lang="item_locked_can_review"}</strong>
@@ -756,8 +1119,8 @@
 		{{endif}}
 	{{endif}}
 	{{if count( $record->reviews() )}}
-		<hr class='ipsHr'>
-		<div class="ipsClearfix ipsSpacer_both">
+		{{if !$record->hasReviewed()}}<hr class='ipsHr'>{{endif}}
+		<div class="ipsClearfix ipsSpacer_bottom">
 			{{if $record->reviewPageCount() > 1}}
 				<div class="ipsPos_left ipsResponsive_noFloat">
 					{$record->reviewPagination( array( 'tab', 'sort' ) )|raw}
@@ -795,10 +1158,13 @@
 				{$record->reviewPagination( array( 'tab', 'sort' ) )|raw}
 			</div>
 		{{endif}}
+	{{elseif !$record->canReview()}}
+		<p class="ipsType_normal ipsType_light ipsType_reset" data-role="noReviews">{lang="no_reviews"}</p>
 	{{endif}}
 </div>]]></template>
 <template template_key="database_form_recordForm" template_title="recordForm" template_desc="" template_location="database" template_group="form" template_params="$record, $category, $database, $page, $title, $hasModOptions, $id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class=''" template_app="" template_type="template"><![CDATA[{{$modOptions = array( 'create_record_state', 'record_expiry_date', 'record_pinned', 'record_allow_comments', 'record_comment_cutoff', 'record_meta_keywords', 'record_meta_description' );}}
 {template="pageHeader" if="!\IPS\Request::i()->isAjax()" group="global" app="core" params="\IPS\Member::loggedIn()->language()->addToStack( $title )"}
+<div id="elCmsPageWrap" data-pageid="{$page->id}">
 <form accept-charset='utf-8' class="ipsForm {$class}" data-ipsForm="true" action="{$action}" method="post" {{if $uploadField}}enctype="multipart/form-data"{{endif}}>
 	<input type="hidden" name="{$id}_submitted" value="1">
 	{{foreach $hiddenValues as $k => $v}}
@@ -905,7 +1271,7 @@
 						</div>
 						<div class='ipsColumn ipsColumn_wide'>
 							<div class='ipsPad ipsAreaBackground_light'>
-							<h3 class='ipsType_sectionHead'>{lang="topic_moderator_options"}</h3>
+							<h3 class='ipsType_sectionHead'>{lang="cms_moderator_options"}</h3>
 								<ul class='ipsForm ipsForm_vertical ipsSpacer_top'>
 									{{foreach $elements as $collection}}
 										{{foreach $collection as $inputName => $input}}
@@ -941,7 +1307,8 @@
 			<button type='submit' class='ipsButton ipsButton_large ipsButton_primary'>{lang="content_record_form_save"}</button>
 		</div>
 	</div>
-</form>]]></template>
+</form>
+</div>]]></template>
 <template template_key="database_listing_categoryFooter" template_title="categoryFooter" template_desc="" template_location="database" template_group="listing" template_params="$category, $table, $activeFilters" template_app="" template_type="template"><![CDATA[
 {{if ! \IPS\Request::i()->isAjax() AND ! isset( \IPS\Request::i()->advancedSearchForm ) AND $category->show_records}}
 	<ul class="ipsToolList ipsToolList_horizontal ipsClearfix ipsSpacer_both ipsResponsive_showPhone ipsResponsive_block">
@@ -1205,6 +1572,24 @@
 				{{if $row->locked()}}
 					<i class='fa fa-lock' data-ipsTooltip title='{lang="content_locked_record"}'></i>
 				{{endif}}
+
+				{{if $row->isFutureDate() || $row->mapped('pinned') || $row->mapped('featured') || $row->hidden() === -1 || $row->hidden() === 1}}
+					<span>
+						{{if $row->isFutureDate()}}
+							<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{$row->futureDateBlurb()}'><i class='fa fa-clock-o'></i></span>
+						{{elseif $row->hidden() === -1}}
+							<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{$row->hiddenBlurb()}'><i class='fa fa-eye-slash'></i></span>
+						{{elseif $row->hidden() === 1}}
+							<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{lang="pending_approval"}'><i class='fa fa-warning'></i></span>
+						{{endif}}							
+						{{if $row->mapped('pinned')}}
+							<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_positive" data-ipsTooltip title='{lang="pinned"}'><i class='fa fa-thumb-tack'></i></span>
+						{{endif}}
+						{{if $row->mapped('featured')}}
+							<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_positive" data-ipsTooltip title='{lang="featured"}'><i class='fa fa-star'></i></span>
+						{{endif}}
+					</span>
+				{{endif}}
 									
 				{{if $row->prefix()}}
 					{template="prefix" group="global" app="core" params="$row->prefix( TRUE ), $row->prefix()"}
@@ -1214,23 +1599,7 @@
 					{{if $row->_title}}{$row->_title}{{else}}<em class="ipsType_light">{lang="content_deleted"}</em>{{endif}}
 				</a>
 			</h4>
-			{{if $row->isFutureDate() || $row->mapped('pinned') || $row->mapped('featured') || $row->hidden() === -1 || $row->hidden() === 1}}
-				<span>
-					{{if $row->isFutureDate()}}
-						<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{$row->futureDateBlurb()}'><i class='fa fa-clock-o'></i></span>
-					{{elseif $row->hidden() === -1}}
-						<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{$row->hiddenBlurb()}'><i class='fa fa-eye-slash'></i></span>
-					{{elseif $row->hidden() === 1}}
-						<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_warning" data-ipsTooltip title='{lang="pending_approval"}'><i class='fa fa-warning'></i></span>
-					{{endif}}							
-					{{if $row->mapped('pinned')}}
-						<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_positive" data-ipsTooltip title='{lang="pinned"}'><i class='fa fa-thumb-tack'></i></span>
-					{{endif}}
-					{{if $row->mapped('featured')}}
-						<span class="ipsBadge ipsBadge_icon ipsBadge_small ipsBadge_positive" data-ipsTooltip title='{lang="featured"}'><i class='fa fa-star'></i></span>
-					{{endif}}
-				</span>
-			{{endif}}
+			
 			{{if $row->commentPageCount() > 1}}
 				{$row->commentPagination( array(), 'miniPagination' )|raw}
 			{{endif}}
@@ -1243,8 +1612,8 @@
 				{{endforeach}}
 				</div>
 			{{endif}}
-			<div class='ipsDataItem_meta'>
-				<p class='ipsType_reset ipsType_light'>{lang="byline" sprintf="$row->author()->name"}{datetime="$row->_publishDate"}</p>
+			<div class='ipsDataItem_meta ipsType_blendLinks'>
+				<p class='ipsType_reset ipsType_light'>{lang="byline" htmlsprintf="$row->author()->link( $row->warningRef() )"}{datetime="$row->_publishDate"}</p>
 			</div>
 		</div>
 		<ul class='ipsDataItem_stats'>
@@ -1266,7 +1635,7 @@
 				</li>
 			{{endif}}
 		</ul>
-		<ul class='ipsDataItem_lastPoster ipsDataItem_withPhoto'>
+		<ul class='ipsDataItem_lastPoster ipsDataItem_withPhoto ipsType_blendLinks'>
 			{{if $row::database()->options['comments'] or $row::database()->options['reviews']}}
 				<li>
 					{{if $row->mapped('num_comments')}}
@@ -1284,7 +1653,7 @@
 				</li>
 				
 				<li class="ipsType_light">
-					<a href='{$row->url( 'getLastComment' )}' title='{lang="get_last_post"}' class='ipsType_blendLinks'>
+					<a href='{$row->url( 'getLastComment' )}' title='{lang="get_last_post"}'>
 						{{if $row->mapped('num_comments')}}{datetime="$row->mapped('last_comment')"}{{else}}{datetime="$row->mapped('date')"}{{endif}}
 					</a>
 				</li>
@@ -1304,11 +1673,16 @@
 		</ul>
 		{{if $table and $table->canModerate()}}
 			<div class='ipsDataItem_modCheck'>
-				<input type='checkbox' data-role='moderation' name="moderate[{$row->$idField}]" data-actions="{expression="implode( ' ', $table->multimodActions( $row ) )"}" data-state='{{if $row->tableStates()}}{$row->tableStates()}{{endif}}'>
+				<span class='ipsCustomInput'>
+					<input type='checkbox' data-role='moderation' name="moderate[{$row->$idField}]" data-actions="{expression="implode( ' ', $table->multimodActions( $row ) )"}" data-state='{{if $row->tableStates()}}{$row->tableStates()}{{endif}}'>
+					<span></span>
+				</span>
 			</div>
 		{{endif}}
 	</li>
 {{endforeach}}]]></template>
+ <template template_key="database_listing_rssItemWithImage" template_title="rssItemWithImage" template_desc="" template_location="database" template_group="listing" template_params="$content, $image" template_app="" template_type="template"><![CDATA[<p><img src="{file="$image" extension="cms_Records"}" /></p>
+{$content|raw}]]></template>
 <template template_key="page_page_builder_single_column" template_title="single_column" template_desc="" template_location="page" template_group="page_builder" template_params="$page, $widgets" template_app="" template_type="template"><![CDATA[<div>
 	{template="widgetContainer" group="pages" app="cms" params="'col1', $widgets, 'horizontal'"}
 </div>]]></template>