Smarty style changes

9 files changed, 13 insertions, 13 deletions

diff --git a/templates/assign_content.tpl b/templates/assign_content.tpl
index 95d4e17..c81d88f 100644..100755
--- a/templates/assign_content.tpl
+++ b/templates/assign_content.tpl
@@ -71,7 +71,7 @@
 				<input type="hidden" name="content_type" value="{$contentSelect}" />
 				<input type="hidden" name="root_structure_id" value="{$smarty.request.root_structure_id}" />
 
-				{if $gBitSystem->isFeatureActive( 'custom_member_sorting' ) && $smarty.request.include eq 'members'}
+				{if $gBitSystem->isFeatureActive( 'custom_member_sorting' ) and $smarty.request.include eq 'members'}
 					{formfeedback warning="Using this insertion method will reset any custom sorting you have done so far."}
 				{/if}
 
@@ -155,7 +155,7 @@
 					<dl>
 						<dt>{counter name=dogEatsPigeon}</dt>
 						<dd>{$pigeon.display_path}
-							{if !empty($pigeon.parsed_data) && $gBitSystem->isFeatureActive('pigeonholes_display_description')}
+							{if !empty($pigeon.parsed_data) and $gBitSystem->isFeatureActive('pigeonholes_display_description')}
 								<br /><small>{$pigeon.parsed_data}</small>
 							{/if}
 						</dd>
@@ -167,7 +167,7 @@
 
 				{if $assignableContent}
 					<div class="form-group">
-						{if $smarty.request.include == 'members' && $listInfo.current_page < $listInfo.total_pages}
+						{if $smarty.request.include == 'members' and $listInfo.current_page < $listInfo.total_pages}
 							<label><input type="checkbox" name="insert_content_and_next" /> {tr}Go To Next Page After Insert{/tr}</label>
 						{/if}
 					</div>
diff --git a/templates/edit_pigeonholes.tpl b/templates/edit_pigeonholes.tpl
index 9f61d55..1b7b0b6 100644..100755
--- a/templates/edit_pigeonholes.tpl
+++ b/templates/edit_pigeonholes.tpl
@@ -90,7 +90,7 @@
 					{/legend}
 				{/jstab}
 
-				{if $gBitSystem->isFeatureActive('pigeonholes_display_description') && $gBitUser->hasPermission('p_liberty_attach_attachments') }
+				{if $gBitSystem->isFeatureActive('pigeonholes_display_description') and $gBitUser->hasPermission('p_liberty_attach_attachments') }
 					{jstab title="Attachments"}
 						<div class=row>
 							{legend legend="Attachments"}
diff --git a/templates/list.tpl b/templates/list.tpl
index 1715944..4d6e3ea 100644..100755
--- a/templates/list.tpl
+++ b/templates/list.tpl
@@ -39,7 +39,7 @@
 			{if $gBitSystem->isFeatureActive('pigeonholes_display_description')}
 				{$item.parsed_data}
 			{/if}
-			{if $gBitSystem->isFeatureActive( 'pigeonholes_display_subtree' ) && count($item.subtree) > 1}
+			{if $gBitSystem->isFeatureActive( 'pigeonholes_display_subtree' ) and count($item.subtree) > 1}
 				{include file="bitpackage:pigeonholes/view_structure_inc.tpl" subtree=$item.subtree no_details=true}
 			{/if}
 			<hr />
diff --git a/templates/section_inc.tpl b/templates/section_inc.tpl
index 9a1b500..7657ee3 100644..100755
--- a/templates/section_inc.tpl
+++ b/templates/section_inc.tpl
@@ -1,7 +1,7 @@
 {strip}
 {assign var=sid value=$subtree[ix].structure_id}
 
-{if $gBitSystem->getConfig('pigeonholes_list_style') == "dynamic" && !$no_details}
+{if $gBitSystem->getConfig('pigeonholes_list_style') == "dynamic" and !$no_details}
 
 	<h3 class="highlight"><a href="{$smarty.const.PIGEONHOLES_PKG_URL}{
 			if $gBitSystem->isFeatureActive('pretty_urls')
@@ -63,7 +63,7 @@
 		</div>
 	{/if}
 
-	{if $subtree[ix].content_id == $smarty.request.content_id || $subtree[ix].structure_id == $smarty.request.structure_id}
+	{if $subtree[ix].content_id == $smarty.request.content_id or $subtree[ix].structure_id == $smarty.request.structure_id}
 		{assign var=current value=1}
 	{else}
 		{assign var=current value=0}
diff --git a/templates/service_edit_mini_inc.tpl b/templates/service_edit_mini_inc.tpl
index 2893b0c..d54a9a8 100644..100755
--- a/templates/service_edit_mini_inc.tpl
+++ b/templates/service_edit_mini_inc.tpl
@@ -1,5 +1,5 @@
 {strip}
-{if $editPigeonholesEnabled && $gBitUser->hasPermission( 'p_pigeonholes_insert_member' )}
+{if $editPigeonholesEnabled and $gBitUser->hasPermission( 'p_pigeonholes_insert_member' )}
 	<div class="form-group">
 		{formlabel label="Categorize" for="pigeonholes"}
 		{if $pigeonPathList|@count ne 0}
diff --git a/templates/service_edit_tab_inc.tpl b/templates/service_edit_tab_inc.tpl
index fc71787..fa986c4 100644..100755
--- a/templates/service_edit_tab_inc.tpl
+++ b/templates/service_edit_tab_inc.tpl
@@ -1,5 +1,5 @@
 {strip}
-{if $editPigeonholesEnabled && $gBitUser->hasPermission( 'p_pigeonholes_insert_member' )}
+{if $editPigeonholesEnabled and $gBitUser->hasPermission( 'p_pigeonholes_insert_member' )}
 	{jstab title="Categorize"}
 		{legend legend="Categorize"}
 			{include file="bitpackage:pigeonholes/service_edit_mini_inc.tpl"}
diff --git a/templates/service_nav_path_inc.tpl b/templates/service_nav_path_inc.tpl
index ef64c17..17d5675 100644..100755
--- a/templates/service_nav_path_inc.tpl
+++ b/templates/service_nav_path_inc.tpl
@@ -1,5 +1,5 @@
 {strip}
-{if $gBitSystem->isFeatureActive( 'pigeonholes_display_path' ) && $pigeonData}
+{if $gBitSystem->isFeatureActive( 'pigeonholes_display_path' ) and $pigeonData}
 	<div class="structurebar pigeonholesbar">
 		{foreach from=$pigeonData item=pigeonItem}
 			<span class="path">{$pigeonItem.display_path}
diff --git a/templates/service_view_members_inc.tpl b/templates/service_view_members_inc.tpl
index 4014392..4ace457 100644..100755
--- a/templates/service_view_members_inc.tpl
+++ b/templates/service_view_members_inc.tpl
@@ -28,7 +28,7 @@
 					{foreach from=$pigeonItem.members item=member name=members}
 						{assign var=ctg1 value=$member.content_type_guid}
 
-						{if $ctg1 ne $ctg2 && $gBitSystem->isFeatureActive( 'pigeonholes_display_content_type' )}{if $ctg2}<br />{/if}{$gLibertySystem->getContentTypeName($ctg1)}:&nbsp;{/if}
+						{if $ctg1 ne $ctg2 and $gBitSystem->isFeatureActive( 'pigeonholes_display_content_type' )}{if $ctg2}<br />{/if}{$gLibertySystem->getContentTypeName($ctg1)}:&nbsp;{/if}
 
 						{if !$gBitSystem->getConfig('pigeonholes_limit_member_number') or $member_count lt $gBitSystem->getConfig('pigeonholes_limit_member_number')}
 							{if $serviceHash.content_id == $member.content_id}<strong>{/if}
diff --git a/templates/view_table_inc.tpl b/templates/view_table_inc.tpl
index 96c845e..0fbfbff 100644..100755
--- a/templates/view_table_inc.tpl
+++ b/templates/view_table_inc.tpl
@@ -4,7 +4,7 @@
 		<a name="members"></a>
 		<h2>{$gContent->getTitle()}</h2>
 		<p>
-			{if !empty($pigeonItem.parsed_data) && $gBitSystem->isFeatureActive('pigeonholes_display_description')}
+			{if !empty($pigeonItem.parsed_data) and $gBitSystem->isFeatureActive('pigeonholes_display_description')}
 				{$pigeonItem.parsed_data}
 				<br />
 			{/if}
@@ -25,7 +25,7 @@
 								<li>
 									{assign var=size value=$gBitSystem->getConfig('pigeonholes_member_thumb')}
 									<a href="{$member.display_url}">
-										{if $gBitSystem->isFeatureActive( 'pigeonholes_member_thumb' ) && $member.thumbnail_url.$size}
+										{if $gBitSystem->isFeatureActive( 'pigeonholes_member_thumb' ) and $member.thumbnail_url.$size}
 											<img src="{$member.thumbnail_url.$size}" alt="{$member.title|escape}" title="{$member.title|escape}" /><br />
 										{/if}
 										{$member.title|escape}{if $gBitSystem->isFeatureActive( 'pigeonholes_display_content_type' )} &nbsp; <small>{tr}{$member.content_name}{/tr}</small>{/if}