Skip to content

Commit

Permalink
Block party
Browse files Browse the repository at this point in the history 
Signed-off-by: Seth Warburton <seth@internet-inspired.com>
  • Loading branch information
@nternetinspired
nternetinspired committed Sep 30, 2014
1 parent de861e5 commit eb08492
Show file tree
Hide file tree
Showing 8 changed files with 87 additions and 78 deletions.
17 changes: 8 additions & 9 deletions layouts/joomla/content/info_block/author.php
View file
Expand Up @@ -10,12 +10,11 @@
defined('JPATH_BASE') or die;

?>
<dd class="createdby" itemprop="author" itemscope itemtype="http://schema.org/Person">
<?php $author = ($displayData['item']->created_by_alias ? $displayData['item']->created_by_alias : $displayData['item']->author); ?>
<?php $author = '<span itemprop="name">' . $author . '</span>'; ?>
<?php if (!empty($displayData['item']->contact_link ) && $displayData['params']->get('link_author') == true) : ?>
<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $displayData['item']->contact_link, $author, array('itemprop' => 'url'))); ?>
<?php else :?>
<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
<?php endif; ?>
</dd>

<?php $author = ($displayData['item']->created_by_alias ? $displayData['item']->created_by_alias : $displayData['item']->author); ?>
<?php $author = '<span itemprop="name">' . $author . '</span>'; ?>
<?php if (!empty($displayData['item']->contact_link ) && $displayData['params']->get('link_author') == true) : ?>
<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $displayData['item']->contact_link, $author, array('itemprop' => 'url'))); ?>
<?php else :?>
<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
<?php endif; ?>
72 changes: 44 additions & 28 deletions layouts/joomla/content/info_block/block.php
View file
Expand Up @@ -12,49 +12,65 @@
$blockPosition = $displayData['params']->get('info_block_position', 0);

?>
<dl class="article-info muted">

<?php if ($displayData['position'] == 'above' && ($blockPosition == 0 || $blockPosition == 2)
|| $displayData['position'] == 'below' && ($blockPosition == 1)
) : ?>
<dl class="article-info muted">

<dt class="article-info-term">
<?php // TODO: implement info_block_show_title param to hide article info title ?>
<?php if ($displayData['params']->get('info_block_show_title', 1)) : ?>
<?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?>
<?php endif; ?>
</dt>
<?php if ($displayData['position'] == 'above' && ($blockPosition == 0 || $blockPosition == 2)
|| $displayData['position'] == 'below' && ($blockPosition == 1)
) : ?>

<?php if ($displayData['params']->get('show_author') && !empty($displayData['item']->author )) : ?>
<?php echo JLayoutHelper::render('joomla.content.info_block.author', $displayData); ?>
<dt class="article-info-term">
<?php // TODO: implement info_block_show_title param to hide article info title ?>
<?php if ($displayData['params']->get('info_block_show_title', 1)) : ?>
<?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?>
<?php endif; ?>
</dt>

<?php if ($displayData['params']->get('show_author') && !empty($displayData['item']->author )) : ?>
<dd class="createdby" itemprop="author" itemscope itemtype="http://schema.org/Person">
<?php echo JLayoutHelper::render('joomla.content.info_block.author', $displayData); ?>
</dd>
<?php endif; ?>

<?php if ($displayData['params']->get('show_parent_category') && !empty($displayData['item']->parent_slug)) : ?>
<?php if ($displayData['params']->get('show_parent_category') && !empty($displayData['item']->parent_slug)) : ?>
<dd class="parent-category-name">
<?php echo JLayoutHelper::render('joomla.content.info_block.parent_category', $displayData); ?>
<?php endif; ?>
</dd>
<?php endif; ?>

<?php if ($displayData['params']->get('show_category')) : ?>
<?php if ($displayData['params']->get('show_category')) : ?>
<dd class="category-name">
<?php echo JLayoutHelper::render('joomla.content.info_block.category', $displayData); ?>
<?php endif; ?>
</dd>
<?php endif; ?>

<?php if ($displayData['params']->get('show_publish_date')) : ?>
<?php if ($displayData['params']->get('show_publish_date')) : ?>
<dd class="published">
<?php echo JLayoutHelper::render('joomla.content.info_block.publish_date', $displayData); ?>
<?php endif; ?>
</dd>
<?php endif; ?>
<?php endif; ?>

<?php if ($displayData['position'] == 'above' && ($blockPosition == 0)
|| $displayData['position'] == 'below' && ($blockPosition == 1 || $blockPosition == 2)
) : ?>
<?php if ($displayData['params']->get('show_create_date')) : ?>
<?php if ($displayData['position'] == 'above' && ($blockPosition == 0)
|| $displayData['position'] == 'below' && ($blockPosition == 1 || $blockPosition == 2)
) : ?>
<?php if ($displayData['params']->get('show_create_date')) : ?>
<dd class="create">
<?php echo JLayoutHelper::render('joomla.content.info_block.create_date', $displayData); ?>
<?php endif; ?>
</dd>
<?php endif; ?>

<?php if ($displayData['params']->get('show_modify_date')) : ?>
<?php if ($displayData['params']->get('show_modify_date')) : ?>
<dd class="modified">
<?php echo JLayoutHelper::render('joomla.content.info_block.modify_date', $displayData); ?>
<?php endif; ?>
</dd>
<?php endif; ?>

<?php if ($displayData['params']->get('show_hits')) : ?>
<?php if ($displayData['params']->get('show_hits')) : ?>
<dd class="hits">
<?php echo JLayoutHelper::render('joomla.content.info_block.hits', $displayData); ?>
<?php endif; ?>
</dd>
<?php endif; ?>
</dl>
<?php endif; ?>

</dl>
17 changes: 8 additions & 9 deletions layouts/joomla/content/info_block/category.php
View file
Expand Up @@ -10,12 +10,11 @@
defined('JPATH_BASE') or die;

?>
<dd class="category-name">
<?php $title = $this->escape($displayData['item']->category_title); ?>
<?php if ($displayData['params']->get('link_category') && $displayData['item']->catslug) : ?>
<?php $url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($displayData['item']->catslug)) . '" itemprop="genre">' . $title . '</a>'; ?>
<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
<?php else : ?>
<?php echo JText::sprintf('COM_CONTENT_CATEGORY', '<span itemprop="genre">' . $title . '</span>'); ?>
<?php endif; ?>
</dd>

<?php $title = $this->escape($displayData['item']->category_title); ?>
<?php if ($displayData['params']->get('link_category') && $displayData['item']->catslug) : ?>
<?php $url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($displayData['item']->catslug)) . '" itemprop="genre">' . $title . '</a>'; ?>
<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
<?php else : ?>
<?php echo JText::sprintf('COM_CONTENT_CATEGORY', '<span itemprop="genre">' . $title . '</span>'); ?>
<?php endif; ?>
11 changes: 5 additions & 6 deletions layouts/joomla/content/info_block/create_date.php
View file
Expand Up @@ -10,9 +10,8 @@
defined('JPATH_BASE') or die;

?>
<dd class="create">
<span class="icon-calendar"></span>
<time datetime="<?php echo JHtml::_('date', $displayData['item']->created, 'c'); ?>" itemprop="dateCreated">
<?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $displayData['item']->created, JText::_('DATE_FORMAT_LC3'))); ?>
</time>
</dd>

<span class="icon-calendar"></span>
<time datetime="<?php echo JHtml::_('date', $displayData['item']->created, 'c'); ?>" itemprop="dateCreated">
<?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $displayData['item']->created, JText::_('DATE_FORMAT_LC3'))); ?>
</time>
9 changes: 4 additions & 5 deletions layouts/joomla/content/info_block/hits.php
View file
Expand Up @@ -10,8 +10,7 @@
defined('JPATH_BASE') or die;

?>
<dd class="hits">
<span class="icon-eye-open"></span>
<meta itemprop="interactionCount" content="UserPageVisits:<?php echo $displayData['item']->hits; ?>" />
<?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $displayData['item']->hits); ?>
</dd>

<span class="icon-eye-open"></span>
<meta itemprop="interactionCount" content="UserPageVisits:<?php echo $displayData['item']->hits; ?>" />
<?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $displayData['item']->hits); ?>
11 changes: 5 additions & 6 deletions layouts/joomla/content/info_block/modify_date.php
View file
Expand Up @@ -10,9 +10,8 @@
defined('JPATH_BASE') or die;

?>
<dd class="modified">
<span class="icon-calendar"></span>
<time datetime="<?php echo JHtml::_('date', $displayData['item']->modified, 'c'); ?>" itemprop="dateModified">
<?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $displayData['item']->modified, JText::_('DATE_FORMAT_LC3'))); ?>
</time>
</dd>

<span class="icon-calendar"></span>
<time datetime="<?php echo JHtml::_('date', $displayData['item']->modified, 'c'); ?>" itemprop="dateModified">
<?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $displayData['item']->modified, JText::_('DATE_FORMAT_LC3'))); ?>
</time>
17 changes: 8 additions & 9 deletions layouts/joomla/content/info_block/parent_category.php
View file
Expand Up @@ -10,12 +10,11 @@
defined('JPATH_BASE') or die;

?>
<dd class="parent-category-name">
<?php $title = $this->escape($displayData['item']->parent_title); ?>
<?php if ($displayData['params']->get('link_parent_category') && !empty($displayData['item']->parent_slug)) : ?>
<?php $url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($displayData['item']->parent_slug)) . '" itemprop="genre">' . $title . '</a>'; ?>
<?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
<?php else : ?>
<?php echo JText::sprintf('COM_CONTENT_PARENT', '<span itemprop="genre">' . $title . '</span>'); ?>
<?php endif; ?>
</dd>

<?php $title = $this->escape($displayData['item']->parent_title); ?>
<?php if ($displayData['params']->get('link_parent_category') && !empty($displayData['item']->parent_slug)) : ?>
<?php $url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($displayData['item']->parent_slug)) . '" itemprop="genre">' . $title . '</a>'; ?>
<?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
<?php else : ?>
<?php echo JText::sprintf('COM_CONTENT_PARENT', '<span itemprop="genre">' . $title . '</span>'); ?>
<?php endif; ?>
11 changes: 5 additions & 6 deletions layouts/joomla/content/info_block/publish_date.php
View file
Expand Up @@ -9,9 +9,8 @@

defined('JPATH_BASE') or die;
?>
<dd class="published">
<span class="icon-calendar"></span>
<time datetime="<?php echo JHtml::_('date', $displayData['item']->publish_up, 'c'); ?>" itemprop="datePublished">
<?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $displayData['item']->publish_up, JText::_('DATE_FORMAT_LC3'))); ?>
</time>
</dd>

<span class="icon-calendar"></span>
<time datetime="<?php echo JHtml::_('date', $displayData['item']->publish_up, 'c'); ?>" itemprop="datePublished">
<?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $displayData['item']->publish_up, JText::_('DATE_FORMAT_LC3'))); ?>
</time>

0 comments on commit eb08492

Please sign in to comment.