Correct show/hide configration in backend for Article page

t3framework · Jan 31, 2013 · 7768631 · 7768631
1 parent e0044e2
commit 7768631
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/source/plg_system_t3/base/html/com_content/article/default.php b/source/plg_system_t3/base/html/com_content/article/default.php
@@ -15,10 +15,16 @@
 
 // Create shortcuts to some parameters.
 $params		= $this->item->params;
-$images = json_decode($this->item->images);
-$urls = json_decode($this->item->urls);
+$images 	= json_decode($this->item->images);
+$urls 		= json_decode($this->item->urls);
 $canEdit	= $this->item->params->get('access-edit');
 $user		= JFactory::getUser();
+$aInfo 		= (($params->get('show_author') && !empty($this->item->author )) ||
+				($params->get('show_category')) ||
+				($params->get('show_create_date')) ||
+				($params->get('show_parent_category')) ||
+				($params->get('show_publish_date')));
+$exAction	= ($canEdit ||  $params->get('show_print_icon') || $params->get('show_email_icon'));
 ?>
 
 <?php if ($this->params->get('show_page_heading', 1)) : ?>
@@ -46,10 +52,11 @@
 		</header>
 		<?php endif; ?>
 
+		<?php if($aInfo || $exAction) :?>
 		<!-- Aside -->
 		<aside class="article-aside clearfix">
 
-			<?php if (($params->get('show_author') && !empty($this->item->author )) || ($params->get('show_category')) || ($params->get('show_create_date')) || ($params->get('show_parent_category')) || ($params->get('show_publish_date'))) : ?>
+			<?php if ($aInfo) : ?>
 			<dl class="article-info pull-left">
 				<dt class="article-info-term"><?php  echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?></dt>
 
@@ -112,7 +119,7 @@
 			</dl>
 			<?php endif; ?>
 
-			<?php if ($canEdit ||  $params->get('show_print_icon') || $params->get('show_email_icon')) : ?>
+			<?php if ($exAction) : ?>
 				<div class="btn-group pull-right"> <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> <i class="icon-cog"></i> <span class="caret"></span> </a>
 					<ul class="dropdown-menu">
 						<?php if (!$this->print) : ?>
@@ -133,6 +140,7 @@
 			<?php endif; ?>
 		</aside>
 		<!-- //Aside -->
+		<?php endif; ?>
 
 		<?php if (isset ($this->item->toc)) : ?>
 			<?php echo $this->item->toc; ?>