Smarty style changes

29 files changed, 58 insertions, 47 deletions

diff --git a/templates/admin_plugins.tpl b/templates/admin_plugins.tpl
index 45a0091..069e9f3 100755
--- a/templates/admin_plugins.tpl
+++ b/templates/admin_plugins.tpl
@@ -36,7 +36,7 @@
 									<div class="checkbox" for="{$guid}"><label><strong>
 										{if $plugin.is_active == 'x'}
 											[Missing]
-										{elseif $plugin.plugin_type == 'mime' && $guid == $smarty.const.LIBERTY_DEFAULT_MIME_HANDLER}
+										{elseif $plugin.plugin_type == 'mime' and $guid == $smarty.const.LIBERTY_DEFAULT_MIME_HANDLER}
 											<input type="checkbox" checked value="y" disabled>
 											<input type="hidden" name="PLUGINS[{$guid}][]" checked id="{$guid}" value="y">
 										{else}
@@ -51,7 +51,7 @@
 										{if $plugin.is_active == 'y'}<label><input type="radio" value="{$guid}" name="default_format" {if $gBitSystem->getConfig('default_format')==$guid}checked{/if}> <em class="small">{tr}Default{/tr}</em></label>{/if}
 										</div>
 									{/if}
-									{if $plugin.plugin_type == 'mime' && $guid == $smarty.const.LIBERTY_DEFAULT_MIME_HANDLER}<strong>{tr}DEFAULT{/tr}</strong>{/if} {$plugin.description}
+									{if $plugin.plugin_type == 'mime' and $guid == $smarty.const.LIBERTY_DEFAULT_MIME_HANDLER}<strong>{tr}DEFAULT{/tr}</strong>{/if} {$plugin.description}
 									{if !empty($plugin.requirements.output)}
 										{formfeedback hash=$plugin.requirements.output}
 									{/if}
diff --git a/templates/comments.tpl b/templates/comments.tpl
index 963e037..de5a166 100644..100755
--- a/templates/comments.tpl
+++ b/templates/comments.tpl
@@ -1,4 +1,4 @@
-{if $gBitUser->hasPermission('p_liberty_post_comments') || $gBitUser->hasPermission('p_liberty_read_comments')}
+{if $gBitUser->hasPermission('p_liberty_post_comments') or $gBitUser->hasPermission('p_liberty_read_comments')}
 {strip}
 <div class="display comment">
 	{if $comments}
@@ -7,14 +7,14 @@
 	</div>
 	{/if}
 
-	<div class="body"{if !( $post_comment_request || $post_comment_preview )} id="editcomments"{/if}>
+	<div class="body"{if !( $post_comment_request or $post_comment_preview )} id="editcomments"{/if}>
 		<div id="edit_comments" {if $gBitSystem->isFeatureActive('comments_ajax')}style="display:none"{/if}>
 			{include file="bitpackage:liberty/comments_post_inc.tpl" post_title="Post Comment"}
 		</div>
 
 		{include file="bitpackage:liberty/comments_display_option_bar.tpl"}
 
-		{if $gBitSystem->isFeatureActive('comments_ajax') && $gBitUser->hasPermission( 'p_liberty_post_comments' )}
+		{if $gBitSystem->isFeatureActive('comments_ajax') and $gBitUser->hasPermission( 'p_liberty_post_comments' )}
 			<div class="form-group">
 				<input type="submit" class="btn btn-default" name="post_comment_request" value="{tr}Add Comment{/tr}" onclick="LibertyComment.attachForm('comment_{$gContent->mContentId}', '{$gContent->mContentId}', {if $gContent->mContentId}{$gContent->mContentId}{elseif $commentsParentId}{$commentsParentId}{else}null{/if})"/>
 			</div>
diff --git a/templates/comments_post_inc.tpl b/templates/comments_post_inc.tpl
index 7caf4fb..171e898 100755
--- a/templates/comments_post_inc.tpl
+++ b/templates/comments_post_inc.tpl
@@ -1,7 +1,7 @@
-{if !$hide || $post_comment_request || $smarty.request.post_comment_preview}
+{if !$hide or $post_comment_request or $smarty.request.post_comment_preview}
 	<a name="editcomments"></a>
 
-	{if $post_comment_preview && !$preview_override}
+	{if $post_comment_preview and !$preview_override}
 		<h2>{tr}{$post_title} Preview{/tr}</h2>
 		<div class="preview">
 			{include file='bitpackage:liberty/display_comment.tpl' comment=$postComment}
@@ -12,7 +12,7 @@
 		{formfeedback hash=$formfeedback}
 
 
-		{if $post_comment_request || $smarty.request.post_comment_preview|default:false || $gBitSystem->isFeatureActive('comments_ajax')}
+		{if $post_comment_request or $smarty.request.post_comment_preview|default:false or $gBitSystem->isFeatureActive('comments_ajax')}
 			{legend legend=$post_title}
 				<input type="hidden" name="post_comment_reply_id" value="{$post_comment_reply_id}" />
 				<input type="hidden" name="post_comment_id" value="{$post_comment_id}" />
@@ -20,7 +20,7 @@
 
 				{* This is a little extra value for the funky case when bw learns browser has js at the same time a preview is asked for
 				   This will keep comment in non-js mode until previewing is done. Things get messy without this *}
-				{if !$gBitThemes->isJavascriptEnabled() || $no_js_preview == "y"}
+				{if !$gBitThemes->isJavascriptEnabled() or $no_js_preview == "y"}
 					<input type="hidden" name="no_js_preview" value="y" />
 				{/if}
 
@@ -65,7 +65,7 @@
 				{textarea id="commentpost" name="comment_data" rows=$gBitSystem->getConfig('comments_default_post_lines',6) edit=$postComment.data|default:''}
 
 				{* @TODO perm check more accurately should be on root content object *}
-				{if $gBitSystem->isFeatureActive( 'comments_allow_attachments' ) && $gBitUser->hasPermission('p_liberty_attach_attachments') }
+				{if $gBitSystem->isFeatureActive( 'comments_allow_attachments' ) and $gBitUser->hasPermission('p_liberty_attach_attachments') }
 					{* @TODO make edit_storage_list.tpl work with comments attachments - it is nested in edit_storage.tpl - for now bypass it, remove mime code when edit_storage.tpl can be used directly*}
 					{* include file="bitpackage:liberty/edit_storage.tpl" *}
 					{if $gLibertySystem->isPluginActive( $smarty.const.LIBERTY_DEFAULT_MIME_HANDLER )}
diff --git a/templates/content_permissions.tpl b/templates/content_permissions.tpl
index 4120bac..3c3d1ec 100644..100755
--- a/templates/content_permissions.tpl
+++ b/templates/content_permissions.tpl
@@ -10,7 +10,7 @@
 			{formfeedback warning="No Individual permissions set. Global Permissions apply."}
 		{/if}
 
-		{if $contentPerms.assigned || $gBitThemes->isJavascriptEnabled()}
+		{if $contentPerms.assigned or $gBitThemes->isJavascriptEnabled()}
 			{smartlink ititle="Clear all custom content permissions" action=expunge content_id=$gContent->mContentId}
 		{/if}
 
diff --git a/templates/content_role_permissions.tpl b/templates/content_role_permissions.tpl
index 0f215cd..1d82b4c 100644..100755
--- a/templates/content_role_permissions.tpl
+++ b/templates/content_role_permissions.tpl
@@ -10,7 +10,7 @@
 			{formfeedback warning="No Individual permissions set. Global Permissions apply."}
 		{/if}
 
-		{if $contentPerms.assigned || $gBitThemes->isJavascriptEnabled()}
+		{if $contentPerms.assigned or $gBitThemes->isJavascriptEnabled()}
 			{smartlink ititle="Clear all custom content permissions" action=expunge content_id=$gContent->mContentId}
 		{/if}
 
diff --git a/templates/display_comment.tpl b/templates/display_comment.tpl
index ae63af7..4126050 100644..100755
--- a/templates/display_comment.tpl
+++ b/templates/display_comment.tpl
@@ -1,5 +1,5 @@
 {strip}
-{if $comments_style eq 'threaded' && $comment.level}
+{if $comments_style eq 'threaded' and $comment.level}
 	<div class="threaded">
 {else}
 	<div class="">
diff --git a/templates/display_content.tpl b/templates/display_content.tpl
index 690b955..bd63b4f 100644..100755
--- a/templates/display_content.tpl
+++ b/templates/display_content.tpl
@@ -11,7 +11,7 @@
 		<div class="header">
 			<h1>{$gContent->mInfo.title|default:"No Title"}</h1>
 			{* creator_user not yet forced by liberty so check. *}
-			{if !$preview && !empty($gContent->mInfo.creator_user)}
+			{if !$preview and !empty($gContent->mInfo.creator_user)}
 				<div class="date">
 					{tr}Created by {displayname user=$gContent->mInfo.creator_user user_id=$gContent->mInfo.creator_user_id real_name=$gContent->mInfo.creator_real_name}, Last modification by {displayname user=$gContent->mInfo.modifier_user user_id=$gContent->mInfo.modifier_user_id real_name=$gContent->mInfo.modifier_real_name} on {$gContent->mInfo.last_modified|bit_long_datetime}{/tr}
 				</div>
diff --git a/templates/edit_content_owner_inc.tpl b/templates/edit_content_owner_inc.tpl
index 39aeaa5..6addf58 100644..100755
--- a/templates/edit_content_owner_inc.tpl
+++ b/templates/edit_content_owner_inc.tpl
@@ -1,4 +1,4 @@
-{if $gBitSystem->isFeatureActive('liberty_allow_change_owner') && $gBitUser->hasPermission('p_liberty_edit_content_owner')}
+{if $gBitSystem->isFeatureActive('liberty_allow_change_owner') and $gBitUser->hasPermission('p_liberty_edit_content_owner')}
 	<div class="form-group">
 		{formlabel label="Owner"}
 		{forminput}
diff --git a/templates/edit_content_status_inc.tpl b/templates/edit_content_status_inc.tpl
index 014f04d..ac72340 100644..100755
--- a/templates/edit_content_status_inc.tpl
+++ b/templates/edit_content_status_inc.tpl
@@ -1,7 +1,7 @@
-{if $gBitSystem->isFeatureActive( 'liberty_display_status' ) && 
-	$gBitSystem->isFeatureActive( 'liberty_display_status_menu' ) && 
+{if $gBitSystem->isFeatureActive( 'liberty_display_status' ) and 
+	$gBitSystem->isFeatureActive( 'liberty_display_status_menu' ) and 
 	$gContent->getAvailableContentStatuses() &&
-	($gBitUser->hasPermission('p_liberty_edit_content_status') || $gBitUser->hasPermission('p_liberty_edit_all_status'))
+	($gBitUser->hasPermission('p_liberty_edit_content_status') or $gBitUser->hasPermission('p_liberty_edit_all_status'))
 	}
 	<div class="form-group">
 		{formlabel label="Status" for="content_status_id"}
diff --git a/templates/edit_format.tpl b/templates/edit_format.tpl
index 72baf94..6ea2201 100644..100755
--- a/templates/edit_format.tpl
+++ b/templates/edit_format.tpl
@@ -1,6 +1,6 @@
 {strip}
 {* comment or content @TODO pass in as a var in includes *}
-{if ( $post_comment_request || $post_comment_preview || $gBitSystem->isFeatureActive('comments_ajax') ) && $gComment}
+{if ( $post_comment_request or $post_comment_preview or $gBitSystem->isFeatureActive('comments_ajax') ) and $gComment}
 	{assign var=contentObject value=$gComment}
 {else}
 	{assign var=contentObject value=$gContent}
@@ -16,7 +16,7 @@
 			{/if}
 			<select name="i18n[lang_code]" id="lang_code">
 				{foreach from=$translationsList key=codeKey item=lang}
-					<option value="{$codeKey}" {if $smarty.request.i18n.lang_code==$codeKey || $langCode==$codeKey || ($codeKey==$gBitSystem->getConfig('bitlanguage') && !$smarty.request.i18n.lang_code && !$langCode)}selected="selected" {/if}>{$lang.native_name}</option>
+					<option value="{$codeKey}" {if $smarty.request.i18n.lang_code==$codeKey or $langCode==$codeKey or ($codeKey==$gBitSystem->getConfig('bitlanguage') and !$smarty.request.i18n.lang_code and !$langCode)}selected="selected" {/if}>{$lang.native_name}</option>
 				{/foreach}
 			</select>
 			{formhelp note="The language of this page"}
@@ -36,7 +36,7 @@
 		{assign var=singleplugin value=$plugin}
 	{/if}
 {/foreach}
-{if $numformat > 1 || $format_options}
+{if $numformat > 1 or $format_options}
 	<div class="form-group">
 		{formfeedback error=$errors.format}
 		{formlabel label="Content Format"}
@@ -70,9 +70,9 @@
 					{/if}
 					{if $plugin.plugin_guid == "tikiwiki"}
 						{if !$gBitSystem->isFeatureActive('content_force_allow_html')}
-							{if $gBitUser->hasPermission( 'p_liberty_enter_html' ) || $gBitSystem->isFeatureActive('content_allow_html')}
+							{if $gBitUser->hasPermission( 'p_liberty_enter_html' ) or $gBitSystem->isFeatureActive('content_allow_html')}
 								<label class="inline-block checkbox"><input type="checkbox" name="preferences[content_enter_html]" value="y" id="{$textarea_id}-html" {if $contentObject->mPrefs.content_enter_html}{if $gBitSystem->isPackageActive('ckeditor')}contenteditable="true"{/if} checked="checked" {/if} {*if $gBitSystem->isPackageActive('ckeditor')}onclick="if($(this).is(':checked')) createCkEditor('{$textarea_id}'); else destroyCkEditor('{$textarea_id}');{/if*}"/> {tr}Allow HTML{/tr}</label>
-							{elseif is_object($contentObject) && $contentObject->getPreference( 'content_enter_html' )}
+							{elseif is_object($contentObject) and $contentObject->getPreference( 'content_enter_html' )}
 								[ {tr}HTML will remain as HTML{/tr} ]
 							{else}
 								[ {tr}HTML will be escaped{/tr} ]
@@ -104,7 +104,7 @@
 	<input type="hidden" name="{$format_guid_variable|default:"format_guid"}" value="{if $numformat eq 1}{$singleplugin.edit_field|default:false}{else}{$gBitSystem->getConfig('default_format','tikiwiki')}{/if}" />
 {/if}
 
-{if $gBitSystem->isPackageActive('ckeditor') && ($formatGuid=='bithtml')}{* || (is_object($contentObject) && $formatGuid=='tikiwiki' && $contentObject->getPreference('content_enter_html')))} *}
+{if $gBitSystem->isPackageActive('ckeditor') and ($formatGuid=='bithtml')}{* or (is_object($contentObject) and $formatGuid=='tikiwiki' and $contentObject->getPreference('content_enter_html')))} *}
 <script>
 $(document).ready( function() {
 createCkEditor('{$textarea_id}');
diff --git a/templates/edit_services_inc.tpl b/templates/edit_services_inc.tpl
index dd94388..b2f9778 100644..100755
--- a/templates/edit_services_inc.tpl
+++ b/templates/edit_services_inc.tpl
@@ -1,6 +1,6 @@
 {if !empty($translateFrom)}
 	{foreach from=$gLibertySystem->mServices item=service key=service_guid}
-		{if $service.services.$serviceFile && (empty($gContent) || $gContent->hasService( $service_guid ))}
+		{if !empty($service.services.$serviceFile) and (empty($gContent) or $gContent->hasService( $service_guid ))}
 			{if strpos($serviceFile,'mini')}<div class="service">{/if}
 				{include file=$service.services.$serviceFile edit_content_status_tpl=$edit_content_status_tpl}
 			{if strpos($serviceFile,'mini')}</div>{/if}
diff --git a/templates/edit_storage.tpl b/templates/edit_storage.tpl
index 435b0f1..fca825c 100644..100755
--- a/templates/edit_storage.tpl
+++ b/templates/edit_storage.tpl
@@ -18,7 +18,7 @@
 
 	{* this condition is a temporary hack to disable ajax uploads on new content to avoid bogus entires in liberty_attachments.
 	 * we all want to see this working asap and are thinking of the best way to fix this - xing - Wednesday Nov 14, 2007   18:38:18 CET *}
-	{if $gBitSystem->getConfig('liberty_attachment_style') != 'ajax' || $gContent->isValid()}
+	{if $gBitSystem->getConfig('liberty_attachment_style') != 'ajax' or $gContent->isValid()}
 
 		{if $gBitUser->hasPermission('p_liberty_attach_attachments') }
 			{foreach from=$gLibertySystem->mPlugins item=plugin key=guid}
diff --git a/templates/edit_storage_list.tpl b/templates/edit_storage_list.tpl
index eaedc7f..04ca73c 100644..100755
--- a/templates/edit_storage_list.tpl
+++ b/templates/edit_storage_list.tpl
@@ -64,9 +64,9 @@ window.attachmentUrls["{$storage.attachment_id}"]["original"] = "{$storage.sourc
 						</div>
 					</div>
 					<div class="col-xs-1">
-						{if $gBitUser->isAdmin() || ($storage.user_id == $gBitUser->mUserId) }
+						{if $gBitUser->isAdmin() or ($storage.user_id == $gBitUser->mUserId) }
 							{capture name=urlArgs}{$attachmentBaseArgs}content_id={$gContent->mContentId}{if empty($gContent->mContentId)}{foreach from=$gContent->mStorage key=key item=val}&amp;STORAGE[existing][{$val.attachment_id}]={$val.attachment_id}{/foreach}{/if}{/capture}
-							{if $libertyUploader || $gBitSystem->getConfig('liberty_attachment_style') == 'ajax'}
+							{if $libertyUploader or $gBitSystem->getConfig('liberty_attachment_style') == 'ajax'}
 								<a href="javascript:void(0);" onclick="
 									BitAjax.updater('edit_storage_list_tab_{$form_id}', '{$smarty.const.LIBERTY_PKG_URL}ajax_edit_storage.php', '{$smarty.capture.urlArgs}&amp;deleteAttachment={$attachmentId}&amp;form_id={$form_id}');
 									BitAjax.updater('edit_storage_list_{$form_id}', '{$smarty.const.LIBERTY_PKG_URL}ajax_edit_storage.php', '{$smarty.capture.urlArgs}&amp;form_id={$form_id}');">
diff --git a/templates/help_format_tikiwiki_inc.tpl b/templates/help_format_tikiwiki_inc.tpl
index 41e08ed..bff0302 100644..100755
--- a/templates/help_format_tikiwiki_inc.tpl
+++ b/templates/help_format_tikiwiki_inc.tpl
@@ -55,7 +55,7 @@
 			</tr>
 			<tr>
 				<td><pre><code>
-					| Value || Value || Value ...<br />
+					| Value or Value or Value ...<br />
 					| optional parameters | value | optional parameters | value |
 				</code></pre></td>
 				<td>Multiple Cells on one line</td>
diff --git a/templates/list_content.tpl b/templates/list_content.tpl
index 827900f..b1354f4 100644..100755
--- a/templates/list_content.tpl
+++ b/templates/list_content.tpl
@@ -8,7 +8,7 @@
 			<div class="input-append pull-right">
 			{html_options onchange="submit();" options=$contentTypes name=content_type_guid id=content_type selected=$contentSelect}
 
-			{if $gBitSystem->isFeatureActive( 'liberty_display_status' ) && $gBitUser->hasPermission( 'p_liberty_view_all_status' )}
+			{if $gBitSystem->isFeatureActive( 'liberty_display_status' ) and $gBitUser->hasPermission( 'p_liberty_view_all_status' )}
 				{html_options options=$content_statuses values=$content_statuses name=content_status_id id=content_status_id class="input-xs" selected=$smarty.request.content_status_id|default:''}
 				{formhelp note="Limit selection to a given status."}
 			{/if}
diff --git a/templates/list_content_inc.tpl b/templates/list_content_inc.tpl
index 15c5dd2..edf0043 100755
--- a/templates/list_content_inc.tpl
+++ b/templates/list_content_inc.tpl
@@ -13,7 +13,7 @@
 <form id="bulkcontentform" action="{$smarty.const.LIBERTY_PKG_URL}list_content.php?{$smarty.server.QUERY_STRING}" method="POST">
 {/if}
 
-{assign var=showStatus value=($gBitSystem->isFeatureActive( 'liberty_display_status' ) && $gBitUser->hasPermission( 'p_liberty_view_all_status' ))}
+{assign var=showStatus value=($gBitSystem->isFeatureActive( 'liberty_display_status' ) and $gBitUser->hasPermission( 'p_liberty_view_all_status' ))}
 <table class="table data clear">
 	<caption>{tr}Available Content{/tr} <span class="total">[ {$listInfo.total_records} ]</span></caption>
 	<tr>
diff --git a/templates/mime/audio/attachment.tpl b/templates/mime/audio/attachment.tpl
index 844e71a..08f6400 100644..100755
--- a/templates/mime/audio/attachment.tpl
+++ b/templates/mime/audio/attachment.tpl
@@ -1,5 +1,5 @@
 {strip}
-{if $wrapper.output == 'desc' || $wrapper.output == 'description'}
+{if $wrapper.output == 'desc' or $wrapper.output == 'description'}
 	{if $attachment.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url|default:$attachment.display_url}">{/if}
 		{$wrapper.description_parsed|default:$attachment.filename}
 	{if $attachment.display_url}</a>{/if}
diff --git a/templates/mime/audio/player.tpl b/templates/mime/audio/player.tpl
index 18701f3..a37fc2e 100644..100755
--- a/templates/mime/audio/player.tpl
+++ b/templates/mime/audio/player.tpl
@@ -13,7 +13,7 @@
 	{/if}
 	<div id="{$id}"><a href="http://www.macromedia.com/go/getflashplayer">Get the Flash Player</a> to see this video.</div>
 	<script>/* <![CDATA[ */
-		{if !$attachment.thumbnail_is_mime && $attachment.thumbnail_url.medium}
+		{if !$attachment.thumbnail_is_mime and $attachment.thumbnail_url.medium}
 			var so = new SWFObject('{$smarty.const.UTIL_PKG_URL}javascript/flv_player/mediaplayer.swf','mpl','{$width}','{$height}','7');
 			so.addVariable("image","{$attachment.thumbnail_url.medium}");
 		{else}
diff --git a/templates/mime/default/attachment.tpl b/templates/mime/default/attachment.tpl
index f5272c8..b31c677 100644..100755
--- a/templates/mime/default/attachment.tpl
+++ b/templates/mime/default/attachment.tpl
@@ -1,5 +1,5 @@
 {strip}
-{if $wrapper.output == 'desc' || $wrapper.output == 'description'}
+{if $wrapper.output == 'desc' or $wrapper.output == 'description'}
 	{if $attachment.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url|default:$attachment.display_url}">{/if}
 		{$wrapper.description_parsed|default:$attachment.filename|strip_tags}
 	{if $attachment.display_url}</a>{/if}
@@ -7,9 +7,9 @@
 	<{$wrapper.wrapper|default:'span'} class="{$wrapper.class|default:'att-plugin'}"{if $wrapper.style} style="{$wrapper.style|default:'display:inline-block'}{/if}">
 		{if $wrapper.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url}">{/if}
 			{if $thumbsize == 'original'}
-				<img class="img-responsive" src="{$attachment.source_url}" alt="{$wrapper.alt|default:$wrapper.description|default:$attachment.filename|replace:"\r":""|replace:"\n":" "|escape}" title="{$wrapper.description|default:$wrapper.alt|default:$attachment.filename|replace:"\r":""|replace:"\n":" "|escape}" {if !empty($height) || !empty($width)} style="{if !empty($height)}height:{$height};{/if}{if !empty($width)}width:{$width}{/if}"{/if} />
+				<img class="img-responsive" src="{$attachment.source_url}" alt="{$wrapper.alt|default:$wrapper.description|default:$attachment.filename|replace:"\r":""|replace:"\n":" "|escape}" title="{$wrapper.description|default:$wrapper.alt|default:$attachment.filename|replace:"\r":""|replace:"\n":" "|escape}" {if !empty($height) or !empty($width)} style="{if !empty($height)}height:{$height};{/if}{if !empty($width)}width:{$width}{/if}"{/if} />
 			{elseif $attachment.thumbnail_url.$thumbsize}
-				<img class="img-responsive" src="{$attachment.thumbnail_url.$thumbsize}" alt="{$wrapper.alt|default:$wrapper.description|default:$attachment.filename|replace:"\r":""|replace:"\n":" "|escape}" title="{$wrapper.description|default:$wrapper.alt|default:$attachment.filename|replace:"\r":""|replace:"\n":" "|escape}" {if !empty($height) || !empty($width)} style="{if !empty($height)}height:{$height};{/if}{if !empty($width)}width:{$width}{/if}"{/if}/>
+				<img class="img-responsive" src="{$attachment.thumbnail_url.$thumbsize}" alt="{$wrapper.alt|default:$wrapper.description|default:$attachment.filename|replace:"\r":""|replace:"\n":" "|escape}" title="{$wrapper.description|default:$wrapper.alt|default:$attachment.filename|replace:"\r":""|replace:"\n":" "|escape}" {if !empty($height) or !empty($width)} style="{if !empty($height)}height:{$height};{/if}{if !empty($width)}width:{$width}{/if}"{/if}/>
 			{/if}
 			{if $wrapper.description_parsed}
 				<div class="caption">{$wrapper.description_parsed}</div>
diff --git a/templates/mime/image/admin.tpl b/templates/mime/image/admin.tpl
index ffeabcd..8da6d45 100644..100755
--- a/templates/mime/image/admin.tpl
+++ b/templates/mime/image/admin.tpl
@@ -8,14 +8,14 @@
 	<div class="body">
 		{form legend="Image specific settings"}
 			{foreach from=$settings key=feature item=output}
-				{if $feature == 'mime_image_panoramas' && $image_processor_warning}
+				{if $feature == 'mime_image_panoramas' and $image_processor_warning}
 					{formfeedback warning="This feature is only available when using the magickwand image processor."}
 				{/if}
 				<div class="form-group">
 					{formlabel label=`$output.label` for=$feature}
 					{forminput}
 						{if $output.type == 'checkbox'}
-							{if $feature == 'mime_image_panoramas' && $image_processor_warning}
+							{if $feature == 'mime_image_panoramas' and $image_processor_warning}
 								{html_checkboxes name="$feature" values="y" labels=false id=$feature disabled="disabled"}
 							{else}
 								{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
diff --git a/templates/mime/image/attachment.tpl b/templates/mime/image/attachment.tpl
index 96451db..b9713de 100644..100755
--- a/templates/mime/image/attachment.tpl
+++ b/templates/mime/image/attachment.tpl
@@ -1,6 +1,6 @@
 {strip}
 {if $attachment.thumbnail_url.panorama}
-	{if $wrapper.output == 'desc' || $wrapper.output == 'description'}
+	{if $wrapper.output == 'desc' or $wrapper.output == 'description'}
 		{if $attachment.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url|default:$attachment.display_url}">{/if}
 			{$wrapper.description_parsed|default:$attachment.filename}
 		{if $attachment.display_url}</a>{/if}
diff --git a/templates/mime/pdfx/view.tpl b/templates/mime/pdfx/view.tpl
new file mode 100755
index 0000000..bac144a
--- /dev/null
+++ b/templates/mime/pdfx/view.tpl
@@ -0,0 +1,11 @@
+{strip}
+{if !empty($attachment.source_file)}
+    <div id="pdf-container" style="width: 100%; height: 600px;"></div>
+        <script>PDFObject.embed("{$smarty.const.BIT_ROOT_URI}{$attachment.source_url}", "#pdf-container");</script>
+	</div>
+
+	{include file="bitpackage:liberty/mime_meta_inc.tpl"}
+{else}
+	{include file=$gLibertySystem->getMimeTemplate('view', $smarty.const.LIBERTY_DEFAULT_MIME_HANDLER)}
+{/if}
+{/strip}
diff --git a/templates/mime_meta_inc.tpl b/templates/mime_meta_inc.tpl
index 2bb3235..88b0329 100644..100755
--- a/templates/mime_meta_inc.tpl
+++ b/templates/mime_meta_inc.tpl
@@ -6,7 +6,7 @@
 	{/forminput}
 </div>
 
-{if $display && $attachment.display_url}
+{if $display and $attachment.display_url}
 	<div class="form-group">
 		{formlabel label="View" for=""}
 		{forminput}
diff --git a/templates/mime_view.tpl b/templates/mime_view.tpl
index 36f8a1f..deaec4b 100644..100755
--- a/templates/mime_view.tpl
+++ b/templates/mime_view.tpl
@@ -9,7 +9,7 @@
 			{include file=$view_template preferences=$attachment.preferences}
 		{/legend}
 
-		{if ( $gBitUser->isAdmin() || $gBitUser->mUserId == $attachment.user_id ) && $edit_template}
+		{if ( $gBitUser->isAdmin() or $gBitUser->mUserId == $attachment.user_id ) and $edit_template}
 			{form legend="Edit File Details"}
 				{formfeedback hash=$feedback}
 				{include file=$edit_template preferences=$attachment.preferences}
diff --git a/templates/plugins/data_quote.tpl b/templates/plugins/data_quote.tpl
index 861ad7a..65a5927 100644..100755
--- a/templates/plugins/data_quote.tpl
+++ b/templates/plugins/data_quote.tpl
@@ -4,7 +4,7 @@
 		{tr}In{/tr} <a href="{$quote.cite_url}" title="{$quote.title}">{$quote.title}</a> ({$quote.created|reltime:short})
 	{/if}
 	
-	{if $quote.user_url && $quote.user_display_name}
+	{if $quote.user_url and $quote.user_display_name}
 		<a href="{$quote.user_url}" title="{$quote.user_display_name}">{$quote.user_display_name}</a>
 	{else}
 		{$quote.login}
diff --git a/templates/service_content_body_inc.tpl b/templates/service_content_body_inc.tpl
index 776b7d4..23cb496 100644..100755
--- a/templates/service_content_body_inc.tpl
+++ b/templates/service_content_body_inc.tpl
@@ -1,4 +1,4 @@
-{if $gBitSystem->isFeatureActive( 'liberty_display_status' ) && ($gBitUser->hasPermission('p_liberty_edit_content_status') || $gBitUser->hasPermission('p_liberty_edit_all_status')) && !is_null($serviceHash.content_status_id) && $serviceHash.content_status_id != 50}
+{if $gBitSystem->isFeatureActive( 'liberty_display_status' ) and ($gBitUser->hasPermission('p_liberty_edit_content_status') or $gBitUser->hasPermission('p_liberty_edit_all_status')) and !is_null($serviceHash.content_status_id) and $serviceHash.content_status_id != 50}
 	{assign var=contentStatusId value=$serviceHash.content_status_id}
 	<p class="liberty_status">{booticon iname="fa-triangle-exclamation" iexplain="Warning"} {tr}The status of this content is{/tr} <strong>{$gContent->getContentStatusName($contentStatusId)}</strong>.</p>
 {/if}{$gContent->mInfo.content_status_name}
diff --git a/templates/service_content_edit_tab_inc.tpl b/templates/service_content_edit_tab_inc.tpl
index 667ebc5..a416c21 100644..100755
--- a/templates/service_content_edit_tab_inc.tpl
+++ b/templates/service_content_edit_tab_inc.tpl
@@ -1,3 +1,3 @@
-{if $gBitSystem->isFeatureActive( 'site_edit_help' ) && $display_help_tab == 1} {* $display_help_tab is set in {textarea} plugin *}
+{if $gBitSystem->isFeatureActive( 'site_edit_help' ) and $display_help_tab == 1} {* $display_help_tab is set in {textarea} plugin *}
 	{include file="bitpackage:liberty/edit_help_inc.tpl"}
 {/if}
diff --git a/templates/service_content_icon_inc.tpl b/templates/service_content_icon_inc.tpl
index 6ec6ef6..c3944df 100644..100755
--- a/templates/service_content_icon_inc.tpl
+++ b/templates/service_content_icon_inc.tpl
@@ -1,8 +1,8 @@
 {strip}
 {if !empty($gContent)}
-	{if $gBitSystem->isFeatureActive( 'liberty_cache' ) && $gContent && $gContent->isCached( $serviceHash.content_id ) && $gBitUser->hasPermission( 'p_users_view_icons_and_tools' )}
+	{if $gBitSystem->isFeatureActive( 'liberty_cache' ) and $gContent and $gContent->isCached( $serviceHash.content_id ) and $gBitUser->hasPermission( 'p_users_view_icons_and_tools' )}
 		{assign var=url value=$gContent->getDisplayUrl()|default:$serviceHash.display_url}
-		{if (not empty($url)) && strstr($url, "?") }
+		{if (not empty($url)) and strstr($url, "?") }
 			{assign var="amp" value="&amp;"}
 		{else}
 			{assign var="amp" value="?"}
diff --git a/templates/structure_edit.tpl b/templates/structure_edit.tpl
index 8f57736..2f256bf 100644..100755
--- a/templates/structure_edit.tpl
+++ b/templates/structure_edit.tpl
@@ -77,7 +77,7 @@ console.log( childNode );
 			if (xml.attributes.length > 0) {
 				for (var j = 0; j < xml.attributes.length; j++) {
 					var attribute = xml.attributes.item(j);
-					if( attribute.nodeName == "structure_id" || attribute.nodeName == "content_id" ) {
+					if( attribute.nodeName == "structure_id" or attribute.nodeName == "content_id" ) {
 						obj[attribute.nodeName] = attribute.value;
 					}
 				}