Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updates for 3.0

  • Loading branch information...
commit 9cbe32849ba78597eec287581e4820e54452a387 1 parent fa13bfe
@antonydoyle authored
View
165 html/com_content/category/blog.php
@@ -1,112 +1,103 @@
<?php
- /* =====================================================================
-Template: OneWeb for Joomla 2.5
-Author: Seth Warburton - Internet Inspired! - @nternetinspired
-Version: 2.0
-Created: June 2012
-Copyright: Seth Warburton - (C) 2012 - All rights reserved
-Licenses: GNU/GPL v2 or later http://www.gnu.org/licenses/gpl-2.0.html
- DBAD License http://philsturgeon.co.uk/code/dbad-license
-Source: J2.5.1. com_content/views/
-/* ===================================================================== */
+/**
+ * @package Joomla.Site
+ * @subpackage com_content
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
-// no direct access
defined('_JEXEC') or die;
JHtml::addIncludePath(JPATH_COMPONENT.'/helpers');
?>
-<section class="blog <?php echo $this->pageclass_sfx;?>">
-<hgroup>
-<?php if ($this->params->get('show_page_heading', 1)) : ?>
-<header>
- <h1>
- <?php echo $this->escape($this->params->get('page_heading')); ?>
- </h1>
-</header>
-<?php endif; ?>
-<?php if ($this->params->get('show_category_title', 1) or $this->params->get('page_subheading')) : ?>
-<header>
- <h2>
- <?php echo $this->escape($this->params->get('page_subheading')); ?>
+<div class="blog<?php echo $this->pageclass_sfx;?>">
+ <?php if ($this->params->get('show_page_heading', 1)) : ?>
+ <div class="page-header">
+ <h1> <?php echo $this->escape($this->params->get('page_heading')); ?> </h1>
+ </div>
+ <?php endif; ?>
+ <?php if ($this->params->get('show_category_title', 1) or $this->params->get('page_subheading')) : ?>
+ <h2> <?php echo $this->escape($this->params->get('page_subheading')); ?>
<?php if ($this->params->get('show_category_title')) : ?>
- <span class="subheading-category"><?php echo $this->category->title;?></span>
+ <span class="subheading-category"><?php echo $this->category->title;?></span>
<?php endif; ?>
- </h2>
-</header>
-<?php endif; ?>
-</hgroup>
-<?php if ($this->params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
- <section class="category-desc">
- <?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
- <img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
+ </h2>
<?php endif; ?>
- <?php if ($this->params->get('show_description') && $this->category->description) : ?>
- <?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_content.category'); ?>
+ <?php if ($this->params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
+ <div class="category-desc">
+ <?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
+ <img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
+ <?php endif; ?>
+ <?php if ($this->params->get('show_description') && $this->category->description) : ?>
+ <?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_content.category'); ?>
+ <?php endif; ?>
+ <div class="clr"></div>
+ </div>
<?php endif; ?>
- </section>
-<?php endif; ?>
-
-<?php $leadingcount=0 ; ?>
-<?php if (!empty($this->lead_items)) : ?>
-<section class="leading-articles">
- <?php foreach ($this->lead_items as &$item) : ?>
- <article class="article <?php echo $leadingcount; ?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?> clearfix">
+ <?php $leadingcount = 0; ?>
+ <?php if (!empty($this->lead_items)) : ?>
+ <div class="items-leading">
+ <?php foreach ($this->lead_items as &$item) : ?>
+ <div class="leading-<?php echo $leadingcount; ?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?>">
<?php
$this->item = &$item;
echo $this->loadTemplate('item');
?>
- </article>
+ </div>
+ <div class="clearfix"></div>
<?php
$leadingcount++;
?>
- <?php endforeach; ?>
-</section>
-<?php endif; ?>
-
-<?php
- $introcount=(count($this->intro_items));
- $counter=0;
+ <?php endforeach; ?>
+ </div><!-- end items-leading -->
+ <div class="clearfix"></div>
+ <?php endif; ?>
+ <?php
+ $introcount = (count($this->intro_items));
+ $counter = 0;
?>
-<?php if (!empty($this->intro_items)) : ?>
-<section class="intro-articles">
+ <?php if (!empty($this->intro_items)) : ?>
<?php foreach ($this->intro_items as $key => &$item) : ?>
- <article class="article <?php echo $counter; ?> clearfix">
- <?php
+ <?php
+ $key = ($key - $leadingcount) + 1;
+ $rowcount = (((int) $key - 1) % (int) $this->columns) + 1;
+ $row = $counter / $this->columns;
+
+ if ($rowcount == 1) : ?>
+ <div class="items-row cols-<?php echo (int) $this->columns;?> <?php echo 'row-'.$row; ?> row-fluid">
+ <?php endif; ?>
+ <div class="span<?php echo round((12 / $this->columns));?>">
+ <div class="item column-<?php echo $rowcount;?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?>">
+ <?php
$this->item = &$item;
echo $this->loadTemplate('item');
- ?>
- </article>
- <?php $counter++; ?>
+ ?>
+ </div><!-- end item -->
+ <?php $counter++; ?>
+ </div><!-- end spann -->
+ <?php if (($rowcount == $this->columns) or ($counter == $introcount)): ?>
+ </div><!-- end row -->
+ <?php endif; ?>
<?php endforeach; ?>
-</section>
-<?php endif; ?>
-
-<?php if (!empty($this->link_items)) : ?>
- <section class="more-articles">
+ <?php endif; ?>
+
+ <?php if (!empty($this->link_items)) : ?>
+ <div class="items-more">
<?php echo $this->loadTemplate('links'); ?>
- </section>
-<?php endif; ?>
-
-<?php if (!empty($this->children[$this->category->id])&& $this->maxLevel != 0) : ?>
- <section class="cat-children">
- <h3>
-<?php echo JTEXT::_('JGLOBAL_SUBCATEGORIES'); ?>
-</h3>
- <?php echo $this->loadTemplate('children'); ?>
- </section>
+ </div>
<?php endif; ?>
-
-<?php if (($this->params->def('show_pagination', 1) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->get('pages.total') > 1)) : ?>
- <section class="pagination">
- <?php if ($this->params->def('show_pagination_results', 1)) : ?>
- <p class="counter">
- <?php echo $this->pagination->getPagesCounter(); ?>
- </p>
-
- <?php endif; ?>
- <?php echo $this->pagination->getPagesLinks(); ?>
- </section>
-<?php endif; ?>
-
-</section>
+ <?php if (!empty($this->children[$this->category->id])&& $this->maxLevel != 0) : ?>
+ <div class="cat-children">
+ <h3> <?php echo JTEXT::_('JGLOBAL_SUBCATEGORIES'); ?> </h3>
+ <?php echo $this->loadTemplate('children'); ?> </div>
+ <?php endif; ?>
+ <?php if (($this->params->def('show_pagination', 1) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->get('pages.total') > 1)) : ?>
+ <div class="pagination">
+ <?php if ($this->params->def('show_pagination_results', 1)) : ?>
+ <p class="counter pull-right"> <?php echo $this->pagination->getPagesCounter(); ?> </p>
+ <?php endif; ?>
+ <?php echo $this->pagination->getPagesLinks(); ?> </div>
+ <?php endif; ?>
+</div>
View
55 html/com_content/category/blog_children.php
@@ -1,18 +1,18 @@
<?php
/**
- * @package Joomla.Site
- * @subpackage com_content
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE.txt
+ * @package Joomla.Site
+ * @subpackage com_content
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
*/
-// no direct access
defined('_JEXEC') or die;
$class = ' class="first"';
-?>
-<?php if (count($this->children[$this->category->id]) > 0 && $this->maxLevel != 0) : ?>
- <ul>
+
+if (count($this->children[$this->category->id]) > 0 && $this->maxLevel != 0) : ?>
+
<?php foreach($this->children[$this->category->id] as $id => $child) : ?>
<?php
if ($this->params->get('show_empty_categories') || $child->numitems || count($child->getChildren())) :
@@ -20,11 +20,21 @@
$class = ' class="last"';
endif;
?>
- <li<?php echo $class; ?>>
+ <div<?php echo $class; ?>>
<?php $class = ''; ?>
- <span class="item-title"><a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id));?>">
+ <h3 class="page-header item-title"><a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id));?>">
<?php echo $this->escape($child->title); ?></a>
- </span>
+ <?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
+ <span class="badge badge-info tip hasTooltip" title="<?php echo JText::_('COM_CONTENT_NUM_ITEMS'); ?>">
+ <?php echo $child->getNumItems(true); ?>
+ </span>
+ <?php endif; ?>
+
+ <?php if (count($child->getChildren()) > 0) : ?>
+ <a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><i class="icon-plus"></i></a>
+ <?php endif;?>
+
+ </h3>
<?php if ($this->params->get('show_subcat_desc') == 1) :?>
<?php if ($child->description) : ?>
@@ -34,18 +44,9 @@
<?php endif; ?>
<?php endif; ?>
- <?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
- <dl>
- <dt>
- <?php echo JText::_('COM_CONTENT_NUM_ITEMS') ; ?>
- </dt>
- <dd>
- <?php echo $child->getNumItems(true); ?>
- </dd>
- </dl>
- <?php endif ; ?>
-
- <?php if (count($child->getChildren()) > 0):
+ <?php if (count($child->getChildren()) > 0) :?>
+ <div class="collapse fade" id="category-<?php echo $child->id;?>">
+ <?php
$this->children[$child->id] = $child->getChildren();
$this->category = $child;
$this->maxLevel--;
@@ -54,9 +55,11 @@
endif;
$this->category = $child->getParent();
$this->maxLevel++;
- endif; ?>
- </li>
+ ?>
+ </div>
+ <?php endif; ?>
+ </div>
<?php endif; ?>
<?php endforeach; ?>
- </ul>
+
<?php endif;
View
364 html/com_content/category/blog_item.php
@@ -1,147 +1,226 @@
<?php
- /* =====================================================================
-Template: OneWeb for Joomla 2.5
-Author: Seth Warburton - Internet Inspired! - @nternetinspired
-Version: 2.0
-Created: June 2012
-Copyright: Seth Warburton - (C) 2012 - All rights reserved
-Licenses: GNU/GPL v2 or later http://www.gnu.org/licenses/gpl-2.0.html
- DBAD License http://philsturgeon.co.uk/code/dbad-license
-Source: J2.5.1. com_content/views/
-/* ===================================================================== */
-
-// no direct access
+/**
+ * @package Joomla.Site
+ * @subpackage com_content
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
defined('_JEXEC') or die;
// Create a shortcut for params.
$params = &$this->item->params;
$images = json_decode($this->item->images);
-$canEdit = $this->item->params->get('access-edit');
+$canEdit = $this->item->params->get('access-edit');
JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+$info = $this->item->params->get('info_block_position', 0);
JHtml::_('behavior.tooltip');
-JHtml::core();
-
+JHtml::_('behavior.framework');
?>
-<?php if ($this->item->state == 0) : ?>
-<section class="system-unpublished">
-<?php endif; ?>
-<?php if ($params->get('show_title')) : ?>
-<header>
- <h1>
- <?php if ($params->get('link_titles') && $params->get('access-view')) : ?>
- <a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid)); ?>">
- <?php echo $this->escape($this->item->title); ?></a>
- <?php else : ?>
+
+ <?php if ($params->get('show_print_icon') || $params->get('show_email_icon') || $canEdit) : ?>
+ <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 ($params->get('show_print_icon')) : ?>
+ <li class="print-icon"> <?php echo JHtml::_('icon.print_popup', $this->item, $params); ?> </li>
+ <?php endif; ?>
+ <?php if ($params->get('show_email_icon')) : ?>
+ <li class="email-icon"> <?php echo JHtml::_('icon.email', $this->item, $params); ?> </li>
+ <?php endif; ?>
+ <?php if ($canEdit) : ?>
+ <li class="edit-icon"> <?php echo JHtml::_('icon.edit', $this->item, $params); ?> </li>
+ <?php endif; ?>
+ </ul>
+ </div>
+ <?php endif; ?>
+ <?php if ($params->get('show_title') || $this->item->state == 0 || ($params->get('show_author') && !empty($this->item->author ))) : ?>
+ <div class="page-header">
+ <?php if ($params->get('show_title')) : ?>
+ <h2>
+ <?php if ($params->get('link_titles') && $params->get('access-view')) : ?>
+ <a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid)); ?>"> <?php echo $this->escape($this->item->title); ?></a>
+ <?php else : ?>
<?php echo $this->escape($this->item->title); ?>
+ <?php endif; ?>
+ </h2>
<?php endif; ?>
- </h1>
-</header>
-<?php endif; ?>
-<?php if ($params->get('show_print_icon') || $params->get('show_email_icon') || $canEdit) : ?>
- <ul class="actions">
- <?php if ($params->get('show_print_icon')) : ?>
- <li class="print-icon">
- <?php echo JHtml::_('icon.print_popup', $this->item, $params); ?>
- </li>
+
+ <?php if ($this->item->state == 0): ?>
+ <span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
<?php endif; ?>
- <?php if ($params->get('show_email_icon')) : ?>
- <li class="email-icon">
- <?php echo JHtml::_('icon.email', $this->item, $params); ?>
- </li>
+
+ <?php if ($params->get('show_author') && !empty($this->item->author )) : ?>
+ <small class="createdby">
+ <?php $author = $this->item->author; ?>
+ <?php $author = ($this->item->created_by_alias ? $this->item->created_by_alias : $author); ?>
+ <?php if (!empty($this->item->contactid ) && $params->get('link_author') == true) : ?>
+ <?php
+ echo JText::sprintf(
+ 'COM_CONTENT_WRITTEN_BY',
+ JHtml::_('link', JRoute::_('index.php?option=com_contact&view=contact&id='.$this->item->contactid), $author)
+ ); ?>
+ <?php else :?>
+ <?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
<?php endif; ?>
- <?php if ($canEdit) : ?>
- <li class="edit-icon">
- <?php echo JHtml::_('icon.edit', $this->item, $params); ?>
- </li>
+ </small>
<?php endif; ?>
- </ul>
-<?php endif; ?>
-<?php if (!$params->get('show_intro')) : ?>
- <?php echo $this->item->event->afterDisplayTitle; ?>
-<?php endif; ?>
-
-<?php echo $this->item->event->beforeDisplayContent; ?>
-
-<?php // to do not that elegant would be nice to group the params ?>
-
-<?php if (($params->get('show_author')) or ($params->get('show_category')) or ($params->get('show_create_date')) or ($params->get('show_modify_date')) or ($params->get('show_publish_date')) or ($params->get('show_parent_category')) or ($params->get('show_hits'))) : ?>
-<aside class="article-meta">
- <dl class="article-info">
- <dt class="article-info-term"><?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?></dt>
-<?php if ($params->get('show_parent_category') && $this->item->parent_slug != '1:root') : ?>
- <dd class="parent-category-name">
- <?php $title = $this->escape($this->item->parent_title);
- $url = '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->parent_slug)).'">'.$title.'</a>';?>
- <?php if ($params->get('link_parent_category') AND $this->item->parent_slug) : ?>
- <?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
- <?php else : ?>
- <?php echo JText::sprintf('COM_CONTENT_PARENT', $title); ?>
+ </div>
<?php endif; ?>
- </dd>
-<?php endif; ?>
-<?php if ($params->get('show_category')) : ?>
- <dd class="category-name">
- <?php $title = $this->escape($this->item->category_title);
- $url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catid)) . '">' . $title . '</a>'; ?>
- <?php if ($params->get('link_category')) : ?>
- <?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
- <?php else : ?>
- <?php echo JText::sprintf('COM_CONTENT_CATEGORY', $title); ?>
+
+ <?php // to do not that elegant would be nice to group the params ?>
+ <?php $useDefList = (($params->get('show_modify_date')) or ($params->get('show_publish_date'))
+ or ($params->get('show_hits'))); ?>
+ <?php if ($useDefList AND ($info == 0 OR $info == 2)) : ?>
+ <div class="article-info muted">
+ <dl class="article-info">
+ <dt class="article-info-term"><?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?></dt>
+
+ <?php if ($params->get('show_parent_category') && !empty($this->item->parent_slug)) : ?>
+ <dd>
+ <div class="parent-category-name">
+ <?php $title = $this->escape($this->item->parent_title);
+ $url = '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->parent_slug)).'">'.$title.'</a>';?>
+ <?php if ($params->get('link_parent_category') and !empty($this->item->parent_slug)) : ?>
+ <?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
+ <?php else : ?>
+ <?php echo JText::sprintf('COM_CONTENT_PARENT', $title); ?>
+ <?php endif; ?>
+ </div>
+ </dd>
<?php endif; ?>
- </dd>
-<?php endif; ?>
-<?php if ($params->get('show_create_date')) : ?>
- <dd class="create">
- <?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date',$this->item->created, JText::_('DATE_FORMAT_LC2'))); ?>
- </dd>
-<?php endif; ?>
-<?php if ($params->get('show_modify_date')) : ?>
- <dd class="modified">
- <?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date',$this->item->modified, JText::_('DATE_FORMAT_LC2'))); ?>
- </dd>
-<?php endif; ?>
-<?php if ($params->get('show_publish_date')) : ?>
- <dd class="published">
- <?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE', JHtml::_('date',$this->item->publish_up, JText::_('DATE_FORMAT_LC2'))); ?>
- </dd>
-<?php endif; ?>
-<?php if ($params->get('show_author') && !empty($this->item->author )) : ?>
- <dd class="createdby">
- <?php $author = $this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author; ?>
- <?php if (!empty($this->item->contactid) && $params->get('link_author') == true): ?>
- <?php
- $needle = 'index.php?option=com_contact&view=contact&id=' . $this->item->contactid;
- $item = JSite::getMenu()->getItems('link', $needle, true);
- $cntlink = !empty($item) ? $needle . '&Itemid=' . $item->id : $needle;
- ?>
- <?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', JRoute::_($cntlink), $author)); ?>
- <?php else: ?>
- <?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+ <?php if ($params->get('show_category')) : ?>
+ <dd>
+ <div class="category-name">
+ <?php $title = $this->escape($this->item->category_title);
+ $url = '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug)).'">'.$title.'</a>';?>
+ <?php if ($params->get('link_category') and $this->item->catslug) : ?>
+ <?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
+ <?php else : ?>
+ <?php echo JText::sprintf('COM_CONTENT_CATEGORY', $title); ?>
+ <?php endif; ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+
+ <?php if ($params->get('show_publish_date')) : ?>
+ <dd>
+ <div class="published">
+ <i class="icon-calendar"></i> <?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $this->item->publish_up, JText::_('DATE_FORMAT_LC3'))); ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+
+ <?php if ($info == 0): ?>
+ <?php if ($params->get('show_modify_date')) : ?>
+ <dd>
+ <div class="modified">
+ <i class="icon-calendar"></i> <?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC3'))); ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+ <?php if ($params->get('show_create_date')) : ?>
+ <dd>
+ <div class="create">
+ <i class="icon-calendar"></i> <?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC3'))); ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+
+ <?php if ($params->get('show_hits')) : ?>
+ <dd>
+ <div class="hits">
+ <i class="icon-eye-open"></i> <?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $this->item->hits); ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+ <?php endif; ?>
+ </dl>
+ </div>
<?php endif; ?>
- </dd>
-<?php endif; ?>
-<?php if ($params->get('show_hits')) : ?>
- <dd class="hits">
- <?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $this->item->hits); ?>
- </dd>
- <?php endif; ?>
- </dl>
-</aside>
-<?php endif; ?>
-<section class="article-intro">
-<?php if (isset($images->image_intro) and !empty($images->image_intro)) : ?>
+
+ <?php if (!$params->get('show_intro')) : ?>
+ <?php echo $this->item->event->afterDisplayTitle; ?>
+ <?php endif; ?>
+ <?php echo $this->item->event->beforeDisplayContent; ?>
+
+ <?php if (isset($images->image_intro) and !empty($images->image_intro)) : ?>
<?php $imgfloat = (empty($images->float_intro)) ? $params->get('float_intro') : $images->float_intro; ?>
- <figure class="img-intro float<?php echo htmlspecialchars($imgfloat); ?>">
- <img
+ <div class="img-intro-<?php echo htmlspecialchars($imgfloat); ?>"> <img
<?php if ($images->image_intro_caption):
echo 'class="caption"'.' title="' .htmlspecialchars($images->image_intro_caption) .'"';
endif; ?>
- src="<?php echo htmlspecialchars($images->image_intro); ?>" alt="<?php echo htmlspecialchars($images->image_intro_alt); ?>"/>
- </figure>
-<?php endif; ?>
-<?php echo $this->item->introtext; ?>
-</section>
-<?php if ($params->get('show_readmore') && $this->item->readmore) :
+ src="<?php echo htmlspecialchars($images->image_intro); ?>" alt="<?php echo htmlspecialchars($images->image_intro_alt); ?>"/> </div>
+ <?php endif; ?>
+ <?php echo $this->item->introtext; ?>
+
+ <?php if ($useDefList AND ($info == 1 OR $info == 2)) : ?>
+ <div class="article-info muted">
+ <dl class="article-info">
+ <dt class="article-info-term"><?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?></dt>
+
+ <?php if ($info == 1): ?>
+ <?php if ($params->get('show_parent_category') AND !empty($this->item->parent_slug)) : ?>
+ <dd>
+ <div class="parent-category-name">
+ <?php $title = $this->escape($this->item->parent_title);
+ $url = '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->parent_slug)).'">'.$title.'</a>';?>
+ <?php if ($params->get('link_parent_category') and $this->item->parent_slug) : ?>
+ <?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
+ <?php else : ?>
+ <?php echo JText::sprintf('COM_CONTENT_PARENT', $title); ?>
+ <?php endif; ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+ <?php if ($params->get('show_category')) : ?>
+ <dd>
+ <div class="category-name">
+ <?php $title = $this->escape($this->item->category_title);
+ $url = '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($this->item->catslug)).'">'.$title.'</a>';?>
+ <?php if ($params->get('link_category') and $this->item->catslug) : ?>
+ <?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
+ <?php else : ?>
+ <?php echo JText::sprintf('COM_CONTENT_CATEGORY', $title); ?>
+ <?php endif; ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+ <?php if ($params->get('show_publish_date')) : ?>
+ <dd>
+ <div class="published">
+ <i class="icon-calendar"></i> <?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $this->item->publish_up, JText::_('DATE_FORMAT_LC3'))); ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+ <?php endif; ?>
+
+ <?php if ($params->get('show_create_date')) : ?>
+ <dd>
+ <div class="create"><i class="icon-calendar">
+ </i> <?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC3'))); ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+ <?php if ($params->get('show_modify_date')) : ?>
+ <dd>
+ <div class="modified"><i class="icon-calendar">
+ </i> <?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC3'))); ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+ <?php if ($params->get('show_hits')) : ?>
+ <dd>
+ <div class="hits">
+ <i class="icon-eye-open"></i> <?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $this->item->hits); ?>
+ </div>
+ </dd>
+ <?php endif; ?>
+ </dl>
+ </div>
+ <?php endif; ?>
+
+ <?php if ($params->get('show_readmore') && $this->item->readmore) :
if ($params->get('access-view')) :
$link = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid));
else :
@@ -154,28 +233,21 @@
$link->setVar('return', base64_encode($returnURL));
endif;
?>
-<section class="article-readmore">
- <p class="readmore">
- <a href="<?php echo $link; ?>">
- <?php if (!$params->get('access-view')) :
- echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE');
- elseif ($readmore = $this->item->alternative_readmore) :
- echo $readmore;
- if ($params->get('show_readmore_title', 0) != 0) :
- echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit'));
- endif;
- elseif ($params->get('show_readmore_title', 0) == 0) :
- echo JText::sprintf('COM_CONTENT_READ_MORE_TITLE');
- else :
- echo JText::_('COM_CONTENT_READ_MORE');
- echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit'));
- endif; ?></a>
- </p>
-</section>
-<?php endif; ?>
-
-<?php if ($this->item->state == 0) : ?>
-</section>
-<?php endif; ?>
+ <a class="btn" href="<?php echo $link; ?>"> <i class="icon-chevron-right"></i>
+ <?php if (!$params->get('access-view')) :
+ echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE');
+ elseif ($readmore = $this->item->alternative_readmore) :
+ echo $readmore;
+ if ($params->get('show_readmore_title', 0) != 0) :
+ echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit'));
+ endif;
+ elseif ($params->get('show_readmore_title', 0) == 0) :
+ echo JText::sprintf('COM_CONTENT_READ_MORE_TITLE');
+ else :
+ echo JText::_('COM_CONTENT_READ_MORE');
+ echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit'));
+ endif; ?>
+ </a>
+ <?php endif; ?>
<?php echo $this->item->event->afterDisplayContent; ?>
View
16 html/com_content/category/blog_links.php
@@ -1,20 +1,18 @@
<?php
/**
- * @package Joomla.Site
- * @subpackage com_content
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE.txt
+ * @package Joomla.Site
+ * @subpackage com_content
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
*/
-// no direct access
defined('_JEXEC') or die;
?>
<div class="items-more">
-
-<h3><?php echo JText::_('COM_CONTENT_MORE_ARTICLES'); ?></h3>
-<ol>
+<ul class="nav nav-tabs nav-stacked">
<?php
foreach ($this->link_items as &$item) :
?>
@@ -23,5 +21,5 @@
<?php echo $item->title; ?></a>
</li>
<?php endforeach; ?>
-</ol>
+</ul>
</div>
View
48 html/com_content/category/default.php
@@ -1,63 +1,57 @@
<?php
+/**
+ * @package Joomla.Site
+ * @subpackage com_content
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
+ */
- /* =====================================================================
-Template: OneWeb for Joomla 2.5
-Author: Seth Warburton - Internet Inspired! - @nternetinspired
-Version: 2.0
-Created: June 2012
-Copyright: Seth Warburton - (C) 2012 - All rights reserved
-Licenses: GNU/GPL v2 or later http://www.gnu.org/licenses/gpl-2.0.html
- DBAD License http://philsturgeon.co.uk/code/dbad-license
-Source: J2.5.1. com_content/views/
-/* ===================================================================== */
-
-// no direct access
defined('_JEXEC') or die;
+
JHtml::addIncludePath(JPATH_COMPONENT.'/helpers');
+
?>
+<div class="category-list<?php echo $this->pageclass_sfx;?>">
- <?php if ($this->params->get('show_page_heading', 1)) : ?>
- <header>
+ <?php if ($this->params->get('show_page_heading')) : ?>
<h1>
<?php echo $this->escape($this->params->get('page_heading')); ?>
</h1>
- </header>
<?php endif; ?>
- <section class="category-list <?php echo $this->pageclass_sfx;?>">
+
<?php if ($this->params->get('show_category_title', 1) or $this->params->get('page_subheading')) : ?>
- <header>
<h2>
<?php echo $this->escape($this->params->get('page_subheading')); ?>
<?php if ($this->params->get('show_category_title')) : ?>
<span class="subheading-category"><?php echo $this->category->title;?></span>
<?php endif; ?>
</h2>
- </header>
<?php endif; ?>
<?php if ($this->params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
- <section class="category-desc">
+ <div class="category-desc">
<?php if ($this->params->get('show_description_image') && $this->category->getParams()->get('image')) : ?>
<img src="<?php echo $this->category->getParams()->get('image'); ?>"/>
<?php endif; ?>
<?php if ($this->params->get('show_description') && $this->category->description) : ?>
<?php echo JHtml::_('content.prepare', $this->category->description, '', 'com_content.category'); ?>
<?php endif; ?>
- </section>
+ <div class="clr"></div>
+ </div>
<?php endif; ?>
- <section class="cat-items">
+ <div class="cat-items">
<?php echo $this->loadTemplate('articles'); ?>
- </section>
+ </div>
<?php if (!empty($this->children[$this->category->id])&& $this->maxLevel != 0) : ?>
- <section class="cat-children">
- <header>
+ <div class="cat-children">
<h3>
<?php echo JTEXT::_('JGLOBAL_SUBCATEGORIES'); ?>
</h3>
- </header>
+
<?php echo $this->loadTemplate('children'); ?>
- </section>
+ </div>
<?php endif; ?>
-</section>
+</div>
View
179 html/com_content/category/default_articles.php
@@ -1,17 +1,17 @@
<?php
/**
- * @package Joomla.Site
- * @subpackage com_content
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE.txt
+ * @package Joomla.Site
+ * @subpackage com_content
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
*/
-// no direct access
defined('_JEXEC') or die;
JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
JHtml::_('behavior.tooltip');
-JHtml::core();
+JHtml::_('behavior.framework');
// Create some shortcuts.
$params = &$this->item->params;
@@ -28,125 +28,91 @@
<?php else : ?>
-<form action="<?php echo htmlspecialchars(JFactory::getURI()->toString()); ?>" method="post" name="adminForm" id="adminForm">
+<form action="<?php echo htmlspecialchars(JUri::getInstance()->toString()); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
<?php if ($this->params->get('show_headings') || $this->params->get('filter_field') != 'hide' || $this->params->get('show_pagination_limit')) :?>
- <fieldset class="filters">
+ <div class="filters btn-toolbar">
<?php if ($this->params->get('filter_field') != 'hide') :?>
- <legend class="hidelabeltxt">
- <?php echo JText::_('JGLOBAL_FILTER_LABEL'); ?>
- </legend>
-
- <div class="filter-search">
- <label class="filter-search-lbl" for="filter-search"><?php echo JText::_('COM_CONTENT_'.$this->params->get('filter_field').'_FILTER_LABEL').'&#160;'; ?></label>
- <input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_CONTENT_FILTER_SEARCH_DESC'); ?>" />
- </div>
+ <div class="btn-group">
+ <label class="filter-search-lbl element-invisible" for="filter-search"><span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span><?php echo JText::_('COM_CONTENT_'.$this->params->get('filter_field').'_FILTER_LABEL').'&#160;'; ?></label>
+ <input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_CONTENT_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_CONTENT_FILTER_SEARCH_DESC'); ?>" />
+ </div>
<?php endif; ?>
-
<?php if ($this->params->get('show_pagination_limit')) : ?>
- <div class="display-limit">
- <?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>&#160;
- <?php echo $this->pagination->getLimitBox(); ?>
- </div>
+ <div class="btn-group pull-right">
+ <label class="element-invisible">
+ <?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>
+ </label>
+ <?php echo $this->pagination->getLimitBox(); ?>
+ </div>
<?php endif; ?>
- <!-- @TODO add hidden inputs -->
<input type="hidden" name="filter_order" value="" />
<input type="hidden" name="filter_order_Dir" value="" />
<input type="hidden" name="limitstart" value="" />
- </fieldset>
+ <div class="clearfix"></div>
+ </div>
<?php endif; ?>
- <table class="category">
- <?php if ($this->params->get('show_headings')) :?>
- <thead>
- <tr>
- <th class="list-title" id="tableOrdering">
- <?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder) ; ?>
- </th>
-
- <?php if ($date = $this->params->get('list_show_date')) : ?>
- <th class="list-date" id="tableOrdering2">
- <?php if ($date == "created") : ?>
- <?php echo JHtml::_('grid.sort', 'COM_CONTENT_'.$date.'_DATE', 'a.created', $listDirn, $listOrder); ?>
- <?php elseif ($date == "modified") : ?>
- <?php echo JHtml::_('grid.sort', 'COM_CONTENT_'.$date.'_DATE', 'a.modified', $listDirn, $listOrder); ?>
- <?php elseif ($date == "published") : ?>
- <?php echo JHtml::_('grid.sort', 'COM_CONTENT_'.$date.'_DATE', 'a.publish_up', $listDirn, $listOrder); ?>
- <?php endif; ?>
- </th>
- <?php endif; ?>
-
- <?php if ($this->params->get('list_show_author', 1)) : ?>
- <th class="list-author" id="tableOrdering3">
- <?php echo JHtml::_('grid.sort', 'JAUTHOR', 'author', $listDirn, $listOrder); ?>
- </th>
- <?php endif; ?>
-
- <?php if ($this->params->get('list_show_hits', 1)) : ?>
- <th class="list-hits" id="tableOrdering4">
- <?php echo JHtml::_('grid.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
- </th>
- <?php endif; ?>
- </tr>
- </thead>
- <?php endif; ?>
-
- <tbody>
+ <ul class="category list-striped list-condensed">
<?php foreach ($this->items as $i => $article) : ?>
<?php if ($this->items[$i]->state == 0) : ?>
- <tr class="system-unpublished cat-list-row<?php echo $i % 2; ?>">
+ <li class="system-unpublished cat-list-row<?php echo $i % 2; ?>">
<?php else: ?>
- <tr class="cat-list-row<?php echo $i % 2; ?>" >
+ <li class="cat-list-row<?php echo $i % 2; ?>" >
<?php endif; ?>
<?php if (in_array($article->access, $this->user->getAuthorisedViewLevels())) : ?>
-
- <td class="list-title">
+ <?php if ($this->params->get('list_show_hits', 1)) : ?>
+ <span class="list-hits badge badge-info pull-right">
+ <?php echo JText::sprintf('JGLOBAL_HITS_COUNT', $article->hits); ?>
+ </span>
+ <?php endif; ?>
+ <?php if ($article->params->get('access-edit')) : ?>
+ <span class="list-edit pull-left width-50">
+ <?php echo JHtml::_('icon.edit', $article, $params); ?>
+ </span>
+ <?php endif; ?>
+ <strong class="list-title">
<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($article->slug, $article->catid)); ?>">
<?php echo $this->escape($article->title); ?></a>
-
- <?php if ($article->params->get('access-edit')) : ?>
- <ul class="actions">
- <li class="edit-icon">
- <?php echo JHtml::_('icon.edit', $article, $params); ?>
- </li>
- </ul>
- <?php endif; ?>
- </td>
-
- <?php if ($this->params->get('list_show_date')) : ?>
- <td class="list-date">
- <?php echo JHtml::_('date', $article->displayDate, $this->escape(
- $this->params->get('date_format', JText::_('DATE_FORMAT_LC3')))); ?>
- </td>
+ </strong>
+ <?php if ($this->items[$i]->state == 0): ?>
+ <span class="label label-warning">Unpublished</span>
<?php endif; ?>
-
- <?php if ($this->params->get('list_show_author', 1) && !empty($article->author )) : ?>
- <td class="list-author">
- <?php $author = $article->author ?>
- <?php $author = ($article->created_by_alias ? $article->created_by_alias : $author);?>
-
- <?php if (!empty($article->contactid ) && $this->params->get('link_author') == true):?>
- <?php echo JHtml::_(
- 'link',
- JRoute::_('index.php?option=com_contact&view=contact&id='.$article->contactid),
- $author
- ); ?>
-
- <?php else :?>
- <?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+ <br />
+
+ <?php if ($this->params->get('list_show_author', 1)) : ?>
+ <small class="list-author">
+ <?php if(!empty($article->author) || !empty($article->created_by_alias)) : ?>
+ <?php $author = $article->author ?>
+ <?php $author = ($article->created_by_alias ? $article->created_by_alias : $author);?>
+
+ <?php if (!empty($article->contactid ) && $this->params->get('link_author') == true):?>
+ <?php echo JHtml::_(
+ 'link',
+ JRoute::_('index.php?option=com_contact&view=contact&id='.$article->contactid),
+ $author
+ ); ?>
+
+ <?php else :?>
+ <?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+ <?php endif; ?>
+ <?php endif; ?>
+ </small>
<?php endif; ?>
- </td>
- <?php endif; ?>
- <?php if ($this->params->get('list_show_hits', 1)) : ?>
- <td class="list-hits">
- <?php echo $article->hits; ?>
- </td>
+ <?php if ($this->params->get('list_show_date')) : ?>
+ <span class="list-date small pull-right">
+ <?php
+ echo JHtml::_(
+ 'date', $article->displayDate,
+ $this->escape($this->params->get('date_format', JText::_('DATE_FORMAT_LC3')))
+ ); ?>
+ </span>
<?php endif; ?>
<?php else : // Show unauth links. ?>
- <td>
+ <span>
<?php
echo $this->escape($article->title).' : ';
$menu = JFactory::getApplication()->getMenu();
@@ -158,13 +124,12 @@
$fullURL->setVar('return', base64_encode($returnURL));
?>
<a href="<?php echo $fullURL; ?>" class="register">
- <?php echo JText::_( 'COM_CONTENT_REGISTER_TO_READ_MORE' ); ?></a>
- </td>
+ <?php echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE'); ?></a>
+ </span>
<?php endif; ?>
- </tr>
+ </li>
<?php endforeach; ?>
- </tbody>
- </table>
+ </ul>
<?php endif; ?>
<?php // Code to add a link to submit an article. ?>
@@ -174,11 +139,11 @@
<?php // Add pagination links ?>
<?php if (!empty($this->items)) : ?>
- <?php if (($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->get('pages.total') > 1)) : ?>
+ <?php if (($this->params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->pagesTotal > 1)) : ?>
<div class="pagination">
<?php if ($this->params->def('show_pagination_results', 1)) : ?>
- <p class="counter">
+ <p class="counter pull-right">
<?php echo $this->pagination->getPagesCounter(); ?>
</p>
<?php endif; ?>
View
51 html/com_content/category/default_children.php
@@ -1,18 +1,19 @@
<?php
/**
- * @package Joomla.Site
- * @subpackage com_content
- * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
- * @license GNU General Public License version 2 or later; see LICENSE.txt
+ * @package Joomla.Site
+ * @subpackage com_content
+ *
+ * @copyright Copyright (C) 2005 - 2012 Open Source Matters, Inc. All rights reserved.
+ * @license GNU General Public License version 2 or later; see LICENSE.txt
*/
-// no direct access
defined('_JEXEC') or die;
$class = ' class="first"';
+
+JHtml::_('bootstrap.tooltip');
?>
<?php if (count($this->children[$this->category->id]) > 0) : ?>
- <ul>
<?php foreach($this->children[$this->category->id] as $id => $child) : ?>
<?php
if ($this->params->get('show_empty_categories') || $child->getNumItems(true) || count($child->getChildren())) :
@@ -21,11 +22,21 @@
endif;
?>
- <li<?php echo $class; ?>>
+ <div<?php echo $class; ?>>
<?php $class = ''; ?>
- <span class="item-title"><a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id));?>">
+ <h3 class="page-header item-title"><a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id));?>">
<?php echo $this->escape($child->title); ?></a>
- </span>
+ <?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
+ <span class="badge badge-info tip hasTooltip" title="<?php echo JText::_('COM_CONTENT_NUM_ITEMS'); ?>">
+ <?php echo $child->getNumItems(true); ?>
+ </span>
+ <?php endif; ?>
+
+ <?php if (count($child->getChildren()) > 0) : ?>
+ <a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><i class="icon-plus"></i></a>
+ <?php endif;?>
+
+ </h3>
<?php if ($this->params->get('show_subcat_desc') == 1) :?>
<?php if ($child->description) : ?>
<div class="category-desc">
@@ -33,18 +44,10 @@
</div>
<?php endif; ?>
<?php endif; ?>
- <?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
- <dl>
- <dt>
- <?php echo JText::_('COM_CONTENT_NUM_ITEMS') ; ?>
- </dt>
- <dd>
- <?php echo $child->getNumItems(true); ?>
- </dd>
- </dl>
- <?php endif ; ?>
- <?php if (count($child->getChildren()) > 0 ) :
+ <?php if (count($child->getChildren()) > 0) :?>
+ <div class="collapse fade" id="category-<?php echo $child->id;?>">
+ <?php
$this->children[$child->id] = $child->getChildren();
$this->category = $child;
$this->maxLevel--;
@@ -53,9 +56,11 @@
endif;
$this->category = $child->getParent();
$this->maxLevel++;
- endif; ?>
- </li>
+ ?>
+ </div>
+ <?php endif; ?>
+
+ </div>
<?php endif; ?>
<?php endforeach; ?>
- </ul>
<?php endif; ?>
Please sign in to comment.
Something went wrong with that request. Please try again.