first commit

components/com_content/content.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+require_once JPATH_COMPONENT.'/helpers/route.php';
+require_once JPATH_COMPONENT.'/helpers/query.php';
+
+$controller = JControllerLegacy::getInstance('Content');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();

components/com_content/controller.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content Component Controller
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.5
+ */
+class ContentController extends JControllerLegacy
+{
+	public function __construct($config = array())
+	{
+		$this->input = JFactory::getApplication()->input;
+
+		// Article frontpage Editor pagebreak proxying:
+		if ($this->input->get('view') === 'article' && $this->input->get('layout') === 'pagebreak')
+		{
+			$config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+		}
+		// Article frontpage Editor article proxying:
+		elseif ($this->input->get('view') === 'articles' && $this->input->get('layout') === 'modal')
+		{
+			JHtml::_('stylesheet', 'system/adminlist.css', array(), true);
+			$config['base_path'] = JPATH_COMPONENT_ADMINISTRATOR;
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to display a view.
+	 *
+	 * @param   boolean			If true, the view output will be cached
+	 * @param   array  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController		This object to support chaining.
+	 * @since   1.5
+	 */
+	public function display($cachable = false, $urlparams = false)
+	{
+		$cachable = true;
+
+		// Set the default view name and format from the Request.
+		// Note we are using a_id to avoid collisions with the router and the return page.
+		// Frontend is a bit messier than the backend.
+		$id    = $this->input->getInt('a_id');
+		$vName = $this->input->getCmd('view', 'categories');
+		$this->input->set('view', $vName);
+
+		$user = JFactory::getUser();
+
+		if ($user->get('id') ||
+			($this->input->getMethod() == 'POST' &&
+				(($vName == 'category' && $this->input->get('layout') != 'blog') || $vName == 'archive' )))
+		{
+			$cachable = false;
+		}
+
+		$safeurlparams = array('catid' => 'INT', 'id' => 'INT', 'cid' => 'ARRAY', 'year' => 'INT', 'month' => 'INT', 'limit' => 'UINT', 'limitstart' => 'UINT',
+			'showall' => 'INT', 'return' => 'BASE64', 'filter' => 'STRING', 'filter_order' => 'CMD', 'filter_order_Dir' => 'CMD', 'filter-search' => 'STRING', 'print' => 'BOOLEAN', 'lang' => 'CMD', 'Itemid' => 'INT');
+
+		// Check for edit form.
+		if ($vName == 'form' && !$this->checkEditId('com_content.edit.article', $id))
+		{
+			// Somehow the person just went to the form - we don't allow that.
+			return JError::raiseError(403, JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
+		}
+
+		parent::display($cachable, $safeurlparams);
+
+		return $this;
+	}
+}

components/com_content/controllers/article.php

@@ -0,0 +1,337 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ */
+class ContentControllerArticle extends JControllerForm
+{
+	/**
+	 * The URL view item variable.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $view_item = 'form';
+
+	/**
+	 * The URL view list variable.
+	 *
+	 * @var    string
+	 * @since  1.6
+	 */
+	protected $view_list = 'categories';
+
+	/**
+	 * Method to add a new record.
+	 *
+	 * @return  mixed  True if the record can be added, a error object if not.
+	 *
+	 * @since   1.6
+	 */
+	public function add()
+	{
+		if (!parent::add())
+		{
+			// Redirect to the return page.
+			$this->setRedirect($this->getReturnPage());
+		}
+	}
+
+	/**
+	 * Method override to check if you can add a new record.
+	 *
+	 * @param   array  $data  An array of input data.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowAdd($data = array())
+	{
+		$user       = JFactory::getUser();
+		$categoryId = JArrayHelper::getValue($data, 'catid', $this->input->getInt('catid'), 'int');
+		$allow      = null;
+
+		if ($categoryId)
+		{
+			// If the category has been passed in the data or URL check it.
+			$allow	= $user->authorise('core.create', 'com_content.category.'.$categoryId);
+		}
+
+		if ($allow === null)
+		{
+			// In the absense of better information, revert to the component permissions.
+			return parent::allowAdd();
+		}
+		else
+		{
+			return $allow;
+		}
+	}
+
+	/**
+	 * Method override to check if you can edit an existing record.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key; default is id.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
+	 */
+	protected function allowEdit($data = array(), $key = 'id')
+	{
+		$recordId = (int) isset($data[$key]) ? $data[$key] : 0;
+		$user     = JFactory::getUser();
+		$userId   = $user->get('id');
+		$asset    = 'com_content.article.' . $recordId;
+
+		// Check general edit permission first.
+		if ($user->authorise('core.edit', $asset))
+		{
+			return true;
+		}
+
+		// Fallback on edit.own.
+		// First test if the permission is available.
+		if ($user->authorise('core.edit.own', $asset))
+		{
+			// Now test the owner is the user.
+			$ownerId = (int) isset($data['created_by']) ? $data['created_by'] : 0;
+			if (empty($ownerId) && $recordId)
+			{
+				// Need to do a lookup from the model.
+				$record = $this->getModel()->getItem($recordId);
+
+				if (empty($record))
+				{
+					return false;
+				}
+
+				$ownerId = $record->created_by;
+			}
+
+			// If the owner matches 'me' then do the test.
+			if ($ownerId == $userId)
+			{
+				return true;
+			}
+		}
+
+		// Since there is no asset tracking, revert to the component permissions.
+		return parent::allowEdit($data, $key);
+	}
+
+	/**
+	 * Method to cancel an edit.
+	 *
+	 * @param   string  $key  The name of the primary key of the URL variable.
+	 *
+	 * @return  boolean  True if access level checks pass, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function cancel($key = 'a_id')
+	{
+		parent::cancel($key);
+
+		// Redirect to the return page.
+		$this->setRedirect($this->getReturnPage());
+	}
+
+	/**
+	 * Method to edit an existing record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key
+	 * (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if access level check and checkout passes, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function edit($key = null, $urlVar = 'a_id')
+	{
+		$result = parent::edit($key, $urlVar);
+
+		return $result;
+	}
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
+	 * @since   1.5
+	 */
+	public function getModel($name = 'form', $prefix = '', $config = array('ignore_request' => true))
+	{
+		$model = parent::getModel($name, $prefix, $config);
+
+		return $model;
+	}
+
+	/**
+	 * Gets the URL arguments to append to an item redirect.
+	 *
+	 * @param   integer  $recordId  The primary key id for the item.
+	 * @param   string   $urlVar    The name of the URL variable for the id.
+	 *
+	 * @return  string	The arguments to append to the redirect URL.
+	 *
+	 * @since   1.6
+	 */
+	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'a_id')
+	{
+		// Need to override the parent method completely.
+		$tmpl   = $this->input->get('tmpl');
+//		$layout = $this->input->get('layout', 'edit');
+		$append = '';
+
+		// Setup redirect info.
+		if ($tmpl)
+		{
+			$append .= '&tmpl='.$tmpl;
+		}
+
+		// TODO This is a bandaid, not a long term solution.
+//		if ($layout)
+//		{
+//			$append .= '&layout=' . $layout;
+//		}
+		$append .= '&layout=edit';
+
+		if ($recordId)
+		{
+			$append .= '&'.$urlVar.'='.$recordId;
+		}
+
+		$itemId	= $this->input->getInt('Itemid');
+		$return	= $this->getReturnPage();
+		$catId  = $this->input->getInt('catid', null, 'get');
+
+		if ($itemId)
+		{
+			$append .= '&Itemid='.$itemId;
+		}
+
+		if ($catId)
+		{
+			$append .= '&catid='.$catId;
+		}
+
+		if ($return)
+		{
+			$append .= '&return='.base64_encode($return);
+		}
+
+		return $append;
+	}
+
+	/**
+	 * Get the return URL.
+	 *
+	 * If a "return" variable has been passed in the request
+	 *
+	 * @return  string	The return URL.
+	 *
+	 * @since   1.6
+	 */
+	protected function getReturnPage()
+	{
+		$return = $this->input->get('return', null, 'base64');
+
+		if (empty($return) || !JUri::isInternal(base64_decode($return)))
+		{
+			return JUri::base();
+		}
+		else
+		{
+			return base64_decode($return);
+		}
+	}
+
+	/**
+	 * Function that allows child controller access to model data after the data has been saved.
+	 *
+	 * @param   JModelLegacy  $model  The data model object.
+	 * @param   array         $validData   The validated data.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function postSaveHook(JModelLegacy $model, $validData = array())
+	{
+		return;
+	}
+
+	/**
+	 * Method to save a record.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   1.6
+	 */
+	public function save($key = null, $urlVar = 'a_id')
+	{
+		$result = parent::save($key, $urlVar);
+
+		// If ok, redirect to the return page.
+		if ($result)
+		{
+			$this->setRedirect($this->getReturnPage());
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to save a vote.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	public function vote()
+	{
+		// Check for request forgeries.
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$user_rating = $this->input->getInt('user_rating', -1);
+
+		if ($user_rating > -1)
+		{
+			$url = $this->input->getString('url', '');
+			$id = $this->input->getInt('id', 0);
+			$viewName = $this->input->getString('view', $this->default_view);
+			$model = $this->getModel($viewName);
+
+			if ($model->storeVote($id, $user_rating))
+			{
+				$this->setRedirect($url, JText::_('COM_CONTENT_ARTICLE_VOTE_SUCCESS'));
+			}
+			else
+			{
+				$this->setRedirect($url, JText::_('COM_CONTENT_ARTICLE_VOTE_FAILURE'));
+			}
+		}
+	}
+}

components/com_content/controllers/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

components/com_content/helpers/association.php

@@ -0,0 +1,69 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JLoader::register('ContentHelper', JPATH_ADMINISTRATOR . '/components/com_content/helpers/content.php');
+JLoader::register('CategoryHelperAssociation', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/association.php');
+
+/**
+ * Content Component Association Helper
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       3.0
+ */
+abstract class ContentHelperAssociation extends CategoryHelperAssociation
+{
+	/**
+	 * Method to get the associations for a given item
+	 *
+	 * @param   integer  $id    Id of the item
+	 * @param   string   $view  Name of the view
+	 *
+	 * @return  array   Array of associations for the item
+	 *
+	 * @since  3.0
+	 */
+
+	public static function getAssociations($id = 0, $view = null)
+	{
+		jimport('helper.route', JPATH_COMPONENT_SITE);
+
+		$app = JFactory::getApplication();
+		$jinput = $app->input;
+		$view = is_null($view) ? $jinput->get('view') : $view;
+		$id = empty($id) ? $jinput->getInt('id') : $id;
+
+		if ($view == 'article')
+		{
+			if ($id)
+			{
+				$associations = JLanguageAssociations::getAssociations('com_content', '#__content', 'com_content.item', $id);
+
+				$return = array();
+
+				foreach ($associations as $tag => $item)
+				{
+					$return[$tag] = ContentHelperRoute::getArticleRoute($item->id, $item->catid, $item->language);
+				}
+
+				return $return;
+			}
+		}
+
+		if ($view == 'category' || $view == 'categories')
+		{
+			return self::getCategoryAssociations($id, 'com_content');
+		}
+
+		return array();
+
+	}
+}

components/com_content/helpers/category.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content Component Category Tree
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.6
+ */
+class ContentCategories extends JCategories
+{
+	public function __construct($options = array())
+	{
+		$options['table'] = '#__content';
+		$options['extension'] = 'com_content';
+
+		parent::__construct($options);
+	}
+}

components/com_content/helpers/icon.php

@@ -0,0 +1,274 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content Component HTML Helper
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.5
+ */
+abstract class JHtmlIcon
+{
+	/**
+	 * Method to generate a link to the create item page for the given category
+	 *
+	 * @param   object     $category  The category information
+	 * @param   JRegistry  $params    The item parameters
+	 * @param   array      $attribs   Optional attributes for the link
+	 * @param   boolean    $legacy    True to use legacy images, false to use icomoon based graphic
+	 *
+	 * @return  string  The HTML markup for the create item link
+	 */
+	public static function create($category, $params, $attribs = array(), $legacy = false)
+	{
+		JHtml::_('bootstrap.tooltip');
+
+		$uri = JUri::getInstance();
+
+		$url = 'index.php?option=com_content&task=article.add&return=' . base64_encode($uri) . '&a_id=0&catid=' . $category->id;
+
+		if ($params->get('show_icons'))
+		{
+			if ($legacy)
+			{
+				$text = JHtml::_('image', 'system/new.png', JText::_('JNEW'), null, true);
+			}
+			else
+			{
+				$text = '<span class="icon-plus"></span>&#160;' . JText::_('JNEW') . '&#160;';
+			}
+		}
+		else
+		{
+			$text = JText::_('JNEW') . '&#160;';
+		}
+
+		// Add the button classes to the attribs array
+		if (isset($attribs['class']))
+		{
+			$attribs['class'] = $attribs['class'] . ' btn btn-primary';
+		}
+		else
+		{
+			$attribs['class'] = 'btn btn-primary';
+		}
+
+		$button = JHtml::_('link', JRoute::_($url), $text, $attribs);
+
+		$output = '<span class="hasTooltip" title="' . JHtml::tooltipText('COM_CONTENT_CREATE_ARTICLE') . '">' . $button . '</span>';
+
+		return $output;
+	}
+
+	/**
+	 * Method to generate a link to the email item page for the given article
+	 *
+	 * @param   object     $article  The article information
+	 * @param   JRegistry  $params   The item parameters
+	 * @param   array      $attribs  Optional attributes for the link
+	 * @param   boolean    $legacy   True to use legacy images, false to use icomoon based graphic
+	 *
+	 * @return  string  The HTML markup for the email item link
+	 */
+	public static function email($article, $params, $attribs = array(), $legacy = false)
+	{
+		require_once JPATH_SITE . '/components/com_mailto/helpers/mailto.php';
+
+		$uri      = JUri::getInstance();
+		$base     = $uri->toString(array('scheme', 'host', 'port'));
+		$template = JFactory::getApplication()->getTemplate();
+		$link     = $base . JRoute::_(ContentHelperRoute::getArticleRoute($article->slug, $article->catid), false);
+		$url      = 'index.php?option=com_mailto&tmpl=component&template=' . $template . '&link=' . MailToHelper::addLink($link);
+
+		$status = 'width=400,height=350,menubar=yes,resizable=yes';
+
+		if ($params->get('show_icons'))
+		{
+			if ($legacy)
+			{
+				$text = JHtml::_('image', 'system/emailButton.png', JText::_('JGLOBAL_EMAIL'), null, true);
+			}
+			else
+			{
+				$text = '<span class="icon-envelope"></span> ' . JText::_('JGLOBAL_EMAIL');
+			}
+		}
+		else
+		{
+			$text = JText::_('JGLOBAL_EMAIL');
+		}
+
+		$attribs['title']   = JText::_('JGLOBAL_EMAIL');
+		$attribs['onclick'] = "window.open(this.href,'win2','" . $status . "'); return false;";
+
+		$output = JHtml::_('link', JRoute::_($url), $text, $attribs);
+
+		return $output;
+	}
+
+	/**
+	 * Display an edit icon for the article.
+	 *
+	 * This icon will not display in a popup window, nor if the article is trashed.
+	 * Edit access checks must be performed in the calling code.
+	 *
+	 * @param   object     $article  The article information
+	 * @param   JRegistry  $params   The item parameters
+	 * @param   array      $attribs  Optional attributes for the link
+	 * @param   boolean    $legacy   True to use legacy images, false to use icomoon based graphic
+	 *
+	 * @return  string	The HTML for the article edit icon.
+	 * @since   1.6
+	 */
+	public static function edit($article, $params, $attribs = array(), $legacy = false)
+	{
+		$user = JFactory::getUser();
+		$uri  = JUri::getInstance();
+
+		// Ignore if in a popup window.
+		if ($params && $params->get('popup'))
+		{
+			return;
+		}
+
+		// Ignore if the state is negative (trashed).
+		if ($article->state < 0)
+		{
+			return;
+		}
+
+		JHtml::_('bootstrap.tooltip');
+
+		// Show checked_out icon if the article is checked out by a different user
+		if (property_exists($article, 'checked_out') && property_exists($article, 'checked_out_time') && $article->checked_out > 0 && $article->checked_out != $user->get('id'))
+		{
+			$checkoutUser = JFactory::getUser($article->checked_out);
+			$button       = JHtml::_('image', 'system/checked_out.png', null, null, true);
+			$date         = JHtml::_('date', $article->checked_out_time);
+			$tooltip      = JText::_('JLIB_HTML_CHECKED_OUT') . ' :: ' . JText::sprintf('COM_CONTENT_CHECKED_OUT_BY', $checkoutUser->name) . ' <br /> ' . $date;
+
+			return '<span class="hasTooltip" title="' . JHtml::tooltipText($tooltip. '', 0) . '">' . $button . '</span>';
+		}
+
+		$url = 'index.php?option=com_content&task=article.edit&a_id=' . $article->id . '&return=' . base64_encode($uri);
+
+		if ($article->state == 0)
+		{
+			$overlib = JText::_('JUNPUBLISHED');
+		}
+		else
+		{
+			$overlib = JText::_('JPUBLISHED');
+		}
+
+		$date   = JHtml::_('date', $article->created);
+		$author = $article->created_by_alias ? $article->created_by_alias : $article->author;
+
+		$overlib .= '&lt;br /&gt;';
+		$overlib .= $date;
+		$overlib .= '&lt;br /&gt;';
+		$overlib .= JText::sprintf('COM_CONTENT_WRITTEN_BY', htmlspecialchars($author, ENT_COMPAT, 'UTF-8'));
+
+		if ($legacy)
+		{
+			$icon = $article->state ? 'edit.png' : 'edit_unpublished.png';
+			$text = JHtml::_('image', 'system/' . $icon, JText::_('JGLOBAL_EDIT'), null, true);
+		}
+		else
+		{
+			$icon = $article->state ? 'edit' : 'eye-close';
+			$text = '<span class="hasTooltip icon-' . $icon . ' tip" title="' . JHtml::tooltipText(JText::_('COM_CONTENT_EDIT_ITEM'), $overlib, 0) . '"></span>&#160;' . JText::_('JGLOBAL_EDIT') . '&#160;';
+		}
+
+		$output = JHtml::_('link', JRoute::_($url), $text, $attribs);
+
+		return $output;
+	}
+
+	/**
+	 * Method to generate a popup link to print an article
+	 *
+	 * @param   object     $article  The article information
+	 * @param   JRegistry  $params   The item parameters
+	 * @param   array      $attribs  Optional attributes for the link
+	 * @param   boolean    $legacy   True to use legacy images, false to use icomoon based graphic
+	 *
+	 * @return  string  The HTML markup for the popup link
+	 */
+	public static function print_popup($article, $params, $attribs = array(), $legacy = false)
+	{
+		$app = JFactory::getApplication();
+		$input = $app->input;
+		$request = $input->request;
+
+		$url  = ContentHelperRoute::getArticleRoute($article->slug, $article->catid);
+		$url .= '&tmpl=component&print=1&layout=default&page=' . @ $request->limitstart;
+
+		$status = 'status=no,toolbar=no,scrollbars=yes,titlebar=no,menubar=no,resizable=yes,width=640,height=480,directories=no,location=no';
+
+		// checks template image directory for image, if non found default are loaded
+		if ($params->get('show_icons'))
+		{
+			if ($legacy)
+			{
+				$text = JHtml::_('image', 'system/printButton.png', JText::_('JGLOBAL_PRINT'), null, true);
+			}
+			else
+			{
+				$text = '<span class="icon-print"></span>&#160;' . JText::_('JGLOBAL_PRINT') . '&#160;';
+			}
+		}
+		else
+		{
+			$text = JText::_('JGLOBAL_PRINT');
+		}
+
+		$attribs['title']   = JText::_('JGLOBAL_PRINT');
+		$attribs['onclick'] = "window.open(this.href,'win2','" . $status . "'); return false;";
+		$attribs['rel']     = 'nofollow';
+
+		return JHtml::_('link', JRoute::_($url), $text, $attribs);
+	}
+
+	/**
+	 * Method to generate a link to print an article
+	 *
+	 * @param   object     $article  Not used, @deprecated for 4.0
+	 * @param   JRegistry  $params   The item parameters
+	 * @param   array      $attribs  Not used, @deprecated for 4.0
+	 * @param   boolean    $legacy   True to use legacy images, false to use icomoon based graphic
+	 *
+	 * @return  string  The HTML markup for the popup link
+	 */
+	public static function print_screen($article, $params, $attribs = array(), $legacy = false)
+	{
+		// Checks template image directory for image, if none found default are loaded
+		if ($params->get('show_icons'))
+		{
+			if ($legacy)
+			{
+				$text = JHtml::_('image', 'system/printButton.png', JText::_('JGLOBAL_PRINT'), null, true);
+			}
+			else
+			{
+				$text = '<span class="icon-print"></span>&#160;' . JText::_('JGLOBAL_PRINT') . '&#160;';
+			}
+		}
+		else
+		{
+			$text = JText::_('JGLOBAL_PRINT');
+		}
+
+		return '<a href="#" onclick="window.print();return false;">' . $text . '</a>';
+	}
+
+}

components/com_content/helpers/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

components/com_content/helpers/query.php

@@ -0,0 +1,267 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content Component Query Helper
+ *
+ * @static
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.5
+ */
+class ContentHelperQuery
+{
+	/**
+	 * Translate an order code to a field for primary category ordering.
+	 *
+	 * @param   string	$orderby	The ordering code.
+	 *
+	 * @return  string	The SQL field(s) to order by.
+	 * @since   1.5
+	 */
+	public static function orderbyPrimary($orderby)
+	{
+		switch ($orderby)
+		{
+			case 'alpha' :
+				$orderby = 'c.path, ';
+				break;
+
+			case 'ralpha' :
+				$orderby = 'c.path DESC, ';
+				break;
+
+			case 'order' :
+				$orderby = 'c.lft, ';
+				break;
+
+			default :
+				$orderby = '';
+				break;
+		}
+
+		return $orderby;
+	}
+
+	/**
+	 * Translate an order code to a field for secondary category ordering.
+	 *
+	 * @param   string	$orderby	The ordering code.
+	 * @param   string	$orderDate	The ordering code for the date.
+	 *
+	 * @return  string	The SQL field(s) to order by.
+	 * @since   1.5
+	 */
+	public static function orderbySecondary($orderby, $orderDate = 'created')
+	{
+		$queryDate = self::getQueryDate($orderDate);
+
+		switch ($orderby)
+		{
+			case 'date' :
+				$orderby = $queryDate;
+				break;
+
+			case 'rdate' :
+				$orderby = $queryDate . ' DESC ';
+				break;
+
+			case 'alpha' :
+				$orderby = 'a.title';
+				break;
+
+			case 'ralpha' :
+				$orderby = 'a.title DESC';
+				break;
+
+			case 'hits' :
+				$orderby = 'a.hits DESC';
+				break;
+
+			case 'rhits' :
+				$orderby = 'a.hits';
+				break;
+
+			case 'order' :
+				$orderby = 'a.ordering';
+				break;
+
+			case 'author' :
+				$orderby = 'author';
+				break;
+
+			case 'rauthor' :
+				$orderby = 'author DESC';
+				break;
+
+			case 'front' :
+				$orderby = 'a.featured DESC, fp.ordering';
+				break;
+
+			default :
+				$orderby = 'a.ordering';
+				break;
+		}
+
+		return $orderby;
+	}
+
+	/**
+	 * Translate an order code to a field for primary category ordering.
+	 *
+	 * @param   string	$orderDate	The ordering code.
+	 *
+	 * @return  string	The SQL field(s) to order by.
+	 * @since   1.6
+	 */
+	public static function getQueryDate($orderDate)
+	{
+		$db = JFactory::getDbo();
+
+		switch ($orderDate)
+		{
+			case 'modified' :
+				$queryDate = ' CASE WHEN a.modified = ' . $db->quote($db->getNullDate()) . ' THEN a.created ELSE a.modified END';
+				break;
+
+			// use created if publish_up is not set
+			case 'published' :
+				$queryDate = ' CASE WHEN a.publish_up = ' . $db->quote($db->getNullDate()) . ' THEN a.created ELSE a.publish_up END ';
+				break;
+
+			case 'created' :
+			default :
+				$queryDate = ' a.created ';
+				break;
+		}
+
+		return $queryDate;
+	}
+
+	/**
+	 * Get join information for the voting query.
+	 *
+	 * @param   JRegistry	$param	An options object for the article.
+	 *
+	 * @return  array  	A named array with "select" and "join" keys.
+	 * @since   1.5
+	 */
+	public static function buildVotingQuery($params=null)
+	{
+		if (!$params)
+		{
+			$params = JComponentHelper::getParams('com_content');
+		}
+
+		$voting = $params->get('show_vote');
+
+		if ($voting)
+		{
+			// calculate voting count
+			$select = ' , ROUND(v.rating_sum / v.rating_count) AS rating, v.rating_count';
+			$join = ' LEFT JOIN #__content_rating AS v ON a.id = v.content_id';
+		}
+		else
+		{
+			$select = '';
+			$join = '';
+		}
+
+		$results = array ('select' => $select, 'join' => $join);
+
+		return $results;
+	}
+
+	/**
+	 * Method to order the intro articles array for ordering
+	 * down the columns instead of across.
+	 * The layout always lays the introtext articles out across columns.
+	 * Array is reordered so that, when articles are displayed in index order
+	 * across columns in the layout, the result is that the
+	 * desired article ordering is achieved down the columns.
+	 *
+	 * @param   array  $articles	Array of intro text articles
+	 * @param   integer	$numColumns	Number of columns in the layout
+	 *
+	 * @return  array  Reordered array to achieve desired ordering down columns
+	 * @since   1.6
+	 */
+	public static function orderDownColumns(&$articles, $numColumns = 1)
+	{
+		$count = count($articles);
+
+		// just return the same array if there is nothing to change
+		if ($numColumns == 1 || !is_array($articles) || $count <= $numColumns)
+		{
+			$return = $articles;
+		}
+		// we need to re-order the intro articles array
+		else {
+			// we need to preserve the original array keys
+			$keys = array_keys($articles);
+
+			$maxRows = ceil($count / $numColumns);
+			$numCells = $maxRows * $numColumns;
+			$numEmpty = $numCells - $count;
+			$index = array();
+
+			// calculate number of empty cells in the array
+
+			// fill in all cells of the array
+			// put -1 in empty cells so we can skip later
+
+			for ($row = 1, $i = 1; $row <= $maxRows; $row++)
+			{
+				for ($col = 1; $col <= $numColumns; $col++)
+				{
+					if ($numEmpty > ($numCells - $i))
+					{
+						// put -1 in empty cells
+						$index[$row][$col] = -1;
+					}
+					else {
+						// put in zero as placeholder
+						$index[$row][$col] = 0;
+					}
+					$i++;
+				}
+			}
+
+			// layout the articles in column order, skipping empty cells
+			$i = 0;
+			for ($col = 1; ($col <= $numColumns) && ($i < $count); $col++)
+			{
+				for ($row = 1; ($row <= $maxRows) && ($i < $count); $row++)
+				{
+					if ($index[$row][$col] != - 1)
+					{
+						$index[$row][$col] = $keys[$i];
+						$i++;
+					}
+				}
+			}
+
+			// now read the $index back row by row to get articles in right row/col
+			// so that they will actually be ordered down the columns (when read by row in the layout)
+			$return = array();
+			$i = 0;
+			for ($row = 1; ($row <= $maxRows) && ($i < $count); $row++)
+			{
+				for ($col = 1; ($col <= $numColumns) && ($i < $count); $col++)
+				{
+					$return[$keys[$i]] = $articles[$index[$row][$col]];
+					$i++;
+				}
+			}
+		}
+		return $return;
+	}
+}

components/com_content/helpers/route.php

@@ -0,0 +1,239 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content Component Route Helper
+ *
+ * @static
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.5
+ */
+abstract class ContentHelperRoute
+{
+	protected static $lookup = array();
+
+	/**
+	 * @param   integer  The route of the content item
+	 */
+	public static function getArticleRoute($id, $catid = 0, $language = 0)
+	{
+		$needles = array(
+			'article'  => array((int) $id)
+		);
+		//Create the link
+		$link = 'index.php?option=com_content&view=article&id='. $id;
+		if ((int) $catid > 1)
+		{
+			$categories = JCategories::getInstance('Content');
+			$category = $categories->get((int) $catid);
+			if ($category)
+			{
+				$needles['category'] = array_reverse($category->getPath());
+				$needles['categories'] = $needles['category'];
+				$link .= '&catid='.$catid;
+			}
+		}
+		if ($language && $language != "*" && JLanguageMultilang::isEnabled())
+		{
+			$db		= JFactory::getDbo();
+			$query	= $db->getQuery(true)
+				->select('a.sef AS sef')
+				->select('a.lang_code AS lang_code')
+				->from('#__languages AS a');
+
+			$db->setQuery($query);
+			$langs = $db->loadObjectList();
+			foreach ($langs as $lang)
+			{
+				if ($language == $lang->lang_code)
+				{
+					$link .= '&lang='.$lang->sef;
+					$needles['language'] = $language;
+				}
+			}
+		}
+
+		if ($item = self::_findItem($needles))
+		{
+			$link .= '&Itemid='.$item;
+		}
+		elseif ($item = self::_findItem())
+		{
+			$link .= '&Itemid='.$item;
+		}
+
+		return $link;
+	}
+
+	public static function getCategoryRoute($catid, $language = 0)
+	{
+		if ($catid instanceof JCategoryNode)
+		{
+			$id = $catid->id;
+			$category = $catid;
+		}
+		else
+		{
+			$id = (int) $catid;
+			$category = JCategories::getInstance('Content')->get($id);
+		}
+
+		if ($id < 1)
+		{
+			$link = '';
+		}
+		else
+		{
+			$link = 'index.php?option=com_content&view=category&id='.$id;
+
+			$needles = array(
+				'category' => array($id)
+			);
+
+			if ($language && $language != "*" && JLanguageMultilang::isEnabled())
+			{
+				$db		= JFactory::getDbo();
+				$query	= $db->getQuery(true)
+					->select('a.sef AS sef')
+					->select('a.lang_code AS lang_code')
+					->from('#__languages AS a');
+
+				$db->setQuery($query);
+				$langs = $db->loadObjectList();
+				foreach ($langs as $lang)
+				{
+					if ($language == $lang->lang_code)
+					{
+						$link .= '&lang='.$lang->sef;
+						$needles['language'] = $language;
+					}
+				}
+			}
+
+			if ($item = self::_findItem($needles))
+			{
+				$link .= '&Itemid='.$item;
+			}
+			else
+			{
+				//Create the link
+				if ($category)
+				{
+					$catids = array_reverse($category->getPath());
+					$needles['category'] = $catids;
+					$needles['categories'] = $catids;
+
+					if ($item = self::_findItem($needles))
+					{
+						$link .= '&Itemid='.$item;
+					}
+					elseif ($item = self::_findItem())
+					{
+						$link .= '&Itemid='.$item;
+					}
+				}
+			}
+		}
+
+		return $link;
+	}
+
+	public static function getFormRoute($id)
+	{
+		//Create the link
+		if ($id)
+		{
+			$link = 'index.php?option=com_content&task=article.edit&a_id='. $id;
+		}
+		else
+		{
+			$link = 'index.php?option=com_content&task=article.edit&a_id=0';
+		}
+
+		return $link;
+	}
+
+	protected static function _findItem($needles = null)
+	{
+		$app		= JFactory::getApplication();
+		$menus		= $app->getMenu('site');
+		$language	= isset($needles['language']) ? $needles['language'] : '*';
+
+		// Prepare the reverse lookup array.
+		if (!isset(self::$lookup[$language]))
+		{
+			self::$lookup[$language] = array();
+
+			$component	= JComponentHelper::getComponent('com_content');
+
+			$attributes = array('component_id');
+			$values = array($component->id);
+
+			if ($language != '*')
+			{
+				$attributes[] = 'language';
+				$values[] = array($needles['language'], '*');
+			}
+
+			$items		= $menus->getItems($attributes, $values);
+
+			foreach ($items as $item)
+			{
+				if (isset($item->query) && isset($item->query['view']))
+				{
+					$view = $item->query['view'];
+					if (!isset(self::$lookup[$language][$view]))
+					{
+						self::$lookup[$language][$view] = array();
+					}
+					if (isset($item->query['id'])) {
+
+						// here it will become a bit tricky
+						// language != * can override existing entries
+						// language == * cannot override existing entries
+						if (!isset(self::$lookup[$language][$view][$item->query['id']]) || $item->language != '*')
+						{
+							self::$lookup[$language][$view][$item->query['id']] = $item->id;
+						}
+					}
+				}
+			}
+		}
+
+		if ($needles)
+		{
+			foreach ($needles as $view => $ids)
+			{
+				if (isset(self::$lookup[$language][$view]))
+				{
+					foreach ($ids as $id)
+					{
+						if (isset(self::$lookup[$language][$view][(int) $id]))
+						{
+							return self::$lookup[$language][$view][(int) $id];
+						}
+					}
+				}
+			}
+		}
+
+		$active = $menus->getActive();
+		if ($active && $active->component == 'com_content' && ($active->language == '*' || !JLanguageMultilang::isEnabled()))
+		{
+			return $active->id;
+		}
+
+		// if not found, return language specific home link
+		$default = $menus->getDefault($language);
+		return !empty($default->id) ? $default->id : null;
+	}
+}

components/com_content/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

components/com_content/metadata.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+</metadata>

components/com_content/models/archive.php

@@ -0,0 +1,165 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+require_once __DIR__ . '/articles.php';
+
+/**
+ * Content Component Archive Model
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.5
+ */
+class ContentModelArchive extends ContentModelArticles
+{
+	/**
+	 * Model context string.
+	 *
+	 * @var		string
+	 */
+	public $_context = 'com_content.archive';
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		parent::populateState();
+
+		$app = JFactory::getApplication();
+
+		// Add archive properties
+		$params = $this->state->params;
+
+		// Filter on archived articles
+		$this->setState('filter.published', 2);
+
+		// Filter on month, year
+		$this->setState('filter.month', $app->input->getInt('month'));
+		$this->setState('filter.year', $app->input->getInt('year'));
+
+		// Optional filter text
+		$this->setState('list.filter', $app->input->getString('filter-search'));
+
+		// Get list limit
+		$itemid = $app->input->get('Itemid', 0, 'int');
+		$limit = $app->getUserStateFromRequest('com_content.archive.list' . $itemid . '.limit', 'limit', $params->get('display_num'), 'uint');
+		$this->setState('list.limit', $limit);
+	}
+
+	/**
+	 * @return  JDatabaseQuery
+	 */
+	protected function getListQuery()
+	{
+		// Set the archive ordering
+		$params = $this->state->params;
+		$articleOrderby = $params->get('orderby_sec', 'rdate');
+		$articleOrderDate = $params->get('order_date');
+
+		// No category ordering
+		$categoryOrderby = '';
+		$secondary = ContentHelperQuery::orderbySecondary($articleOrderby, $articleOrderDate) . ', ';
+		$primary = ContentHelperQuery::orderbyPrimary($categoryOrderby);
+
+		$orderby = $primary . ' ' . $secondary . ' a.created DESC ';
+		$this->setState('list.ordering', $orderby);
+		$this->setState('list.direction', '');
+		// Create a new query object.
+		$query = parent::getListQuery();
+
+			// Add routing for archive
+			//sqlsrv changes
+		$case_when = ' CASE WHEN ';
+		$case_when .= $query->charLength('a.alias', '!=', '0');
+		$case_when .= ' THEN ';
+		$a_id = $query->castAsChar('a.id');
+		$case_when .= $query->concatenate(array($a_id, 'a.alias'), ':');
+		$case_when .= ' ELSE ';
+		$case_when .= $a_id.' END as slug';
+
+		$query->select($case_when);
+
+		$case_when = ' CASE WHEN ';
+		$case_when .= $query->charLength('c.alias', '!=', '0');
+		$case_when .= ' THEN ';
+		$c_id = $query->castAsChar('c.id');
+		$case_when .= $query->concatenate(array($c_id, 'c.alias'), ':');
+		$case_when .= ' ELSE ';
+		$case_when .= $c_id.' END as catslug';
+		$query->select($case_when);
+
+		// Filter on month, year
+		// First, get the date field
+		$queryDate = ContentHelperQuery::getQueryDate($articleOrderDate);
+
+		if ($month = $this->getState('filter.month'))
+		{
+			$query->where('MONTH('. $queryDate . ') = ' . $month);
+		}
+
+		if ($year = $this->getState('filter.year'))
+		{
+			$query->where('YEAR('. $queryDate . ') = ' . $year);
+		}
+
+		//echo nl2br(str_replace('#__','jos_',$query));
+
+		return $query;
+	}
+
+	/**
+	 * Method to get the archived article list
+	 *
+	 * @access public
+	 * @return array
+	 */
+	public function getData()
+	{
+		$app = JFactory::getApplication();
+
+		// Lets load the content if it doesn't already exist
+		if (empty($this->_data))
+		{
+			// Get the page/component configuration
+			$params = $app->getParams();
+
+			// Get the pagination request variables
+			$limit		= $app->input->get('limit', $params->get('display_num', 20), 'uint');
+			$limitstart	= $app->input->get('limitstart', 0, 'uint');
+
+			$query = $this->_buildQuery();
+
+			$this->_data = $this->_getList($query, $limitstart, $limit);
+		}
+
+		return $this->_data;
+	}
+
+	// JModelLegacy override to add alternating value for $odd
+	protected function _getList($query, $limitstart=0, $limit=0)
+	{
+		$result = parent::_getList($query, $limitstart, $limit);
+
+		$odd = 1;
+		foreach ($result as $k => $row)
+		{
+			$result[$k]->odd = $odd;
+			$odd = 1 - $odd;
+		}
+
+		return $result;
+	}
+}

components/com_content/models/article.php

@@ -0,0 +1,356 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content Component Article Model
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.5
+ */
+class ContentModelArticle extends JModelItem
+{
+	/**
+	 * Model context string.
+	 *
+	 * @var        string
+	 */
+	protected $_context = 'com_content.article';
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication('site');
+
+		// Load state from the request.
+		$pk = $app->input->getInt('id');
+		$this->setState('article.id', $pk);
+
+		$offset = $app->input->getUInt('limitstart');
+		$this->setState('list.offset', $offset);
+
+		// Load the parameters.
+		$params = $app->getParams();
+		$this->setState('params', $params);
+
+		// TODO: Tune these values based on other permissions.
+		$user = JFactory::getUser();
+		if ((!$user->authorise('core.edit.state', 'com_content')) && (!$user->authorise('core.edit', 'com_content')))
+		{
+			$this->setState('filter.published', 1);
+			$this->setState('filter.archived', 2);
+		}
+
+		$this->setState('filter.language', JLanguageMultilang::isEnabled());
+	}
+
+	/**
+	 * Method to get article data.
+	 *
+	 * @param   integer    The id of the article.
+	 *
+	 * @return  mixed  Menu item data object on success, false on failure.
+	 */
+	public function getItem($pk = null)
+	{
+		$pk = (!empty($pk)) ? $pk : (int) $this->getState('article.id');
+
+		if ($this->_item === null)
+		{
+			$this->_item = array();
+		}
+
+		if (!isset($this->_item[$pk]))
+		{
+
+			try
+			{
+				$db = $this->getDbo();
+				$query = $db->getQuery(true)
+					->select(
+						$this->getState(
+							'item.select', 'a.id, a.asset_id, a.title, a.alias, a.introtext, a.fulltext, ' .
+							// If badcats is not null, this means that the article is inside an unpublished category
+							// In this case, the state is set to 0 to indicate Unpublished (even if the article state is Published)
+							'CASE WHEN badcats.id is null THEN a.state ELSE 0 END AS state, ' .
+							'a.catid, a.created, a.created_by, a.created_by_alias, ' .
+							// use created if modified is 0
+							'CASE WHEN a.modified = ' . $db->quote($db->getNullDate()) . ' THEN a.created ELSE a.modified END as modified, ' .
+							'a.modified_by, a.checked_out, a.checked_out_time, a.publish_up, a.publish_down, ' .
+							'a.images, a.urls, a.attribs, a.version, a.ordering, ' .
+							'a.metakey, a.metadesc, a.access, a.hits, a.metadata, a.featured, a.language, a.xreference'
+						)
+					);
+				$query->from('#__content AS a');
+
+				// Join on category table.
+				$query->select('c.title AS category_title, c.alias AS category_alias, c.access AS category_access')
+					->join('LEFT', '#__categories AS c on c.id = a.catid');
+
+				// Join on user table.
+				$query->select('u.name AS author')
+					->join('LEFT', '#__users AS u on u.id = a.created_by');
+
+				// Get contact id
+				$subQuery = $db->getQuery(true)
+					->select('MAX(contact.id) AS id')
+					->from('#__contact_details AS contact')
+					->where('contact.published = 1')
+					->where('contact.user_id = a.created_by');
+					// Filter by language
+					if ($this->getState('filter.language'))
+					{
+						$subQuery->where('(contact.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ') OR contact.language IS NULL)');
+					}
+				$query->select('(' . $subQuery . ') as contactid');
+
+				// Filter by language
+				if ($this->getState('filter.language'))
+				{
+					$query->where('a.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+				}
+
+				// Join over the categories to get parent category titles
+				$query->select('parent.title as parent_title, parent.id as parent_id, parent.path as parent_route, parent.alias as parent_alias')
+					->join('LEFT', '#__categories as parent ON parent.id = c.parent_id');
+
+				// Join on voting table
+				$query->select('ROUND(v.rating_sum / v.rating_count, 0) AS rating, v.rating_count as rating_count')
+					->join('LEFT', '#__content_rating AS v ON a.id = v.content_id')
+
+					->where('a.id = ' . (int) $pk);
+
+				// Filter by start and end dates.
+				$nullDate = $db->quote($db->getNullDate());
+				$date = JFactory::getDate();
+
+				$nowDate = $db->quote($date->toSql());
+
+				$query->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+					->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')');
+
+				// Join to check for category published state in parent categories up the tree
+				// If all categories are published, badcats.id will be null, and we just use the article state
+				$subquery = ' (SELECT cat.id as id FROM #__categories AS cat JOIN #__categories AS parent ';
+				$subquery .= 'ON cat.lft BETWEEN parent.lft AND parent.rgt ';
+				$subquery .= 'WHERE parent.extension = ' . $db->quote('com_content');
+				$subquery .= ' AND parent.published <= 0 GROUP BY cat.id)';
+				$query->join('LEFT OUTER', $subquery . ' AS badcats ON badcats.id = c.id');
+
+				// Filter by published state.
+				$published = $this->getState('filter.published');
+				$archived = $this->getState('filter.archived');
+
+				if (is_numeric($published))
+				{
+					$query->where('(a.state = ' . (int) $published . ' OR a.state =' . (int) $archived . ')');
+				}
+
+				$db->setQuery($query);
+
+				$data = $db->loadObject();
+
+				if (empty($data))
+				{
+					return JError::raiseError(404, JText::_('COM_CONTENT_ERROR_ARTICLE_NOT_FOUND'));
+				}
+
+				// Check for published state if filter set.
+				if (((is_numeric($published)) || (is_numeric($archived))) && (($data->state != $published) && ($data->state != $archived)))
+				{
+					return JError::raiseError(404, JText::_('COM_CONTENT_ERROR_ARTICLE_NOT_FOUND'));
+				}
+
+				// Convert parameter fields to objects.
+				$registry = new JRegistry;
+				$registry->loadString($data->attribs);
+
+				$data->params = clone $this->getState('params');
+				$data->params->merge($registry);
+
+				$registry = new JRegistry;
+				$registry->loadString($data->metadata);
+				$data->metadata = $registry;
+
+				// Compute selected asset permissions.
+				$user = JFactory::getUser();
+
+				// Technically guest could edit an article, but lets not check that to improve performance a little.
+				if (!$user->get('guest'))
+				{
+					$userId = $user->get('id');
+					$asset = 'com_content.article.' . $data->id;
+
+					// Check general edit permission first.
+					if ($user->authorise('core.edit', $asset))
+					{
+						$data->params->set('access-edit', true);
+					}
+					// Now check if edit.own is available.
+					elseif (!empty($userId) && $user->authorise('core.edit.own', $asset))
+					{
+						// Check for a valid user and that they are the owner.
+						if ($userId == $data->created_by)
+						{
+							$data->params->set('access-edit', true);
+						}
+					}
+				}
+
+				// Compute view access permissions.
+				if ($access = $this->getState('filter.access'))
+				{
+					// If the access filter has been set, we already know this user can view.
+					$data->params->set('access-view', true);
+				}
+				else
+				{
+					// If no access filter is set, the layout takes some responsibility for display of limited information.
+					$user = JFactory::getUser();
+					$groups = $user->getAuthorisedViewLevels();
+
+					if ($data->catid == 0 || $data->category_access === null)
+					{
+						$data->params->set('access-view', in_array($data->access, $groups));
+					}
+					else
+					{
+						$data->params->set('access-view', in_array($data->access, $groups) && in_array($data->category_access, $groups));
+					}
+				}
+
+				$this->_item[$pk] = $data;
+			}
+			catch (Exception $e)
+			{
+				if ($e->getCode() == 404)
+				{
+					// Need to go thru the error handler to allow Redirect to work.
+					JError::raiseError(404, $e->getMessage());
+				}
+				else
+				{
+					$this->setError($e);
+					$this->_item[$pk] = false;
+				}
+			}
+		}
+
+		return $this->_item[$pk];
+	}
+
+	/**
+	 * Increment the hit counter for the article.
+	 *
+	 * @param   integer  Optional primary key of the article to increment.
+	 *
+	 * @return  boolean  True if successful; false otherwise and internal error set.
+	 */
+	public function hit($pk = 0)
+	{
+		$input = JFactory::getApplication()->input;
+		$hitcount = $input->getInt('hitcount', 1);
+
+		if ($hitcount)
+		{
+			$pk = (!empty($pk)) ? $pk : (int) $this->getState('article.id');
+			$db = $this->getDbo();
+
+			$db->setQuery(
+
+				'UPDATE #__content' .
+					' SET hits = hits + 1' .
+					' WHERE id = ' . (int) $pk
+			);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (RuntimeException $e)
+			{
+				$this->setError($e->getMessage());
+				return false;
+			}
+		}
+		return true;
+	}
+
+	public function storeVote($pk = 0, $rate = 0)
+	{
+		if ($rate >= 1 && $rate <= 5 && $pk > 0)
+		{
+			$userIP = $_SERVER['REMOTE_ADDR'];
+			$db = $this->getDbo();
+
+			$db->setQuery(
+				'SELECT *' .
+					' FROM #__content_rating' .
+					' WHERE content_id = ' . (int) $pk
+			);
+
+			$rating = $db->loadObject();
+
+			if (!$rating)
+			{
+				// There are no ratings yet, so lets insert our rating
+				$db->setQuery(
+					'INSERT INTO #__content_rating ( content_id, lastip, rating_sum, rating_count )' .
+						' VALUES ( ' . (int) $pk . ', ' . $db->quote($userIP) . ', ' . (int) $rate . ', 1 )'
+				);
+
+				try
+				{
+					$db->execute();
+				}
+				catch (RuntimeException $e)
+				{
+					$this->setError($e->getMessage);
+					return false;
+				}
+			}
+			else
+			{
+				if ($userIP != ($rating->lastip))
+				{
+					$db->setQuery(
+						'UPDATE #__content_rating' .
+							' SET rating_count = rating_count + 1, rating_sum = rating_sum + ' . (int) $rate . ', lastip = ' . $db->quote($userIP) .
+							' WHERE content_id = ' . (int) $pk
+					);
+
+					try
+					{
+						$db->execute();
+					}
+					catch (RuntimeException $e)
+					{
+						$this->setError($e->getMessage);
+						return false;
+					}
+				}
+				else
+				{
+					return false;
+				}
+			}
+			return true;
+		}
+		JError::raiseWarning('SOME_ERROR_CODE', JText::sprintf('COM_CONTENT_INVALID_RATING', $rate), "JModelArticle::storeVote($rate)");
+		return false;
+	}
+}

components/com_content/models/articles.php

@@ -0,0 +1,653 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * This models supports retrieving lists of articles.
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.6
+ */
+class ContentModelArticles extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  An optional associative array of configuration settings.
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'title', 'a.title',
+				'alias', 'a.alias',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'catid', 'a.catid', 'category_title',
+				'state', 'a.state',
+				'access', 'a.access', 'access_level',
+				'created', 'a.created',
+				'created_by', 'a.created_by',
+				'ordering', 'a.ordering',
+				'featured', 'a.featured',
+				'language', 'a.language',
+				'hits', 'a.hits',
+				'publish_up', 'a.publish_up',
+				'publish_down', 'a.publish_down',
+				'images', 'a.images',
+				'urls', 'a.urls',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @return  void
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = 'ordering', $direction = 'ASC')
+	{
+		$app = JFactory::getApplication();
+
+		// List state information
+		$value = $app->input->get('limit', $app->getCfg('list_limit', 0), 'uint');
+		$this->setState('list.limit', $value);
+
+		$value = $app->input->get('limitstart', 0, 'uint');
+		$this->setState('list.start', $value);
+
+		$orderCol = $app->input->get('filter_order', 'a.ordering');
+		if (!in_array($orderCol, $this->filter_fields))
+		{
+			$orderCol = 'a.ordering';
+		}
+		$this->setState('list.ordering', $orderCol);
+
+		$listOrder = $app->input->get('filter_order_Dir', 'ASC');
+		if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', '')))
+		{
+			$listOrder = 'ASC';
+		}
+		$this->setState('list.direction', $listOrder);
+
+		$params = $app->getParams();
+		$this->setState('params', $params);
+		$user = JFactory::getUser();
+
+		if ((!$user->authorise('core.edit.state', 'com_content')) && (!$user->authorise('core.edit', 'com_content')))
+		{
+			// filter on published for those who do not have edit or edit.state rights.
+			$this->setState('filter.published', 1);
+		}
+
+		$this->setState('filter.language', JLanguageMultilang::isEnabled());
+
+		// process show_noauth parameter
+		if (!$params->get('show_noauth'))
+		{
+			$this->setState('filter.access', true);
+		}
+		else
+		{
+			$this->setState('filter.access', false);
+		}
+
+		$this->setState('layout', $app->input->get('layout'));
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id    A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 * @since   1.6
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . serialize($this->getState('filter.published'));
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.featured');
+		$id .= ':' . $this->getState('filter.article_id');
+		$id .= ':' . $this->getState('filter.article_id.include');
+		$id .= ':' . serialize($this->getState('filter.category_id'));
+		$id .= ':' . $this->getState('filter.category_id.include');
+		$id .= ':' . serialize($this->getState('filter.author_id'));
+		$id .= ':' . $this->getState('filter.author_id.include');
+		$id .= ':' . serialize($this->getState('filter.author_alias'));
+		$id .= ':' . $this->getState('filter.author_alias.include');
+		$id .= ':' . $this->getState('filter.date_filtering');
+		$id .= ':' . $this->getState('filter.date_field');
+		$id .= ':' . $this->getState('filter.start_date_range');
+		$id .= ':' . $this->getState('filter.end_date_range');
+		$id .= ':' . $this->getState('filter.relative_date');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Get the master query for retrieving a list of articles subject to the model state.
+	 *
+	 * @return  JDatabaseQuery
+	 * @since   1.6
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.id, a.title, a.alias, a.introtext, ' .
+					'a.checked_out, a.checked_out_time, ' .
+					'a.catid, a.created, a.created_by, a.created_by_alias, ' .
+					// use created if modified is 0
+					'CASE WHEN a.modified = ' . $db->quote($db->getNullDate()) . ' THEN a.created ELSE a.modified END as modified, ' .
+					'a.modified_by, uam.name as modified_by_name,' .
+					// use created if publish_up is 0
+					'CASE WHEN a.publish_up = ' . $db->quote($db->getNullDate()) . ' THEN a.created ELSE a.publish_up END as publish_up,' .
+					'a.publish_down, a.images, a.urls, a.attribs, a.metadata, a.metakey, a.metadesc, a.access, ' .
+					'a.hits, a.xreference, a.featured,' . ' ' . $query->length('a.fulltext') . ' AS readmore'
+			)
+		);
+
+		// Process an Archived Article layout
+		if ($this->getState('filter.published') == 2)
+		{
+			// If badcats is not null, this means that the article is inside an archived category
+			// In this case, the state is set to 2 to indicate Archived (even if the article state is Published)
+			$query->select($this->getState('list.select', 'CASE WHEN badcats.id is null THEN a.state ELSE 2 END AS state'));
+		}
+		else
+		{
+			// Process non-archived layout
+			// If badcats is not null, this means that the article is inside an unpublished category
+			// In this case, the state is set to 0 to indicate Unpublished (even if the article state is Published)
+			$query->select($this->getState('list.select', 'CASE WHEN badcats.id is not null THEN 0 ELSE a.state END AS state'));
+		}
+
+		$query->from('#__content AS a');
+
+		// Join over the frontpage articles.
+		if ($this->context != 'com_content.featured')
+		{
+			$query->join('LEFT', '#__content_frontpage AS fp ON fp.content_id = a.id');
+		}
+
+		// Join over the categories.
+		$query->select('c.title AS category_title, c.path AS category_route, c.access AS category_access, c.alias AS category_alias')
+			->join('LEFT', '#__categories AS c ON c.id = a.catid');
+
+		// Join over the users for the author and modified_by names.
+		$query->select("CASE WHEN a.created_by_alias > ' ' THEN a.created_by_alias ELSE ua.name END AS author")
+			->select("ua.email AS author_email")
+
+			->join('LEFT', '#__users AS ua ON ua.id = a.created_by')
+			->join('LEFT', '#__users AS uam ON uam.id = a.modified_by');
+
+		// Get contact id
+		$subQuery = $db->getQuery(true)
+			->select('MAX(contact.id) AS id')
+			->from('#__contact_details AS contact')
+			->where('contact.published = 1')
+			->where('contact.user_id = a.created_by');
+			// Filter by language
+			if ($this->getState('filter.language'))
+			{
+				$subQuery->where('(contact.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ') OR contact.language IS NULL)');
+			}
+		$query->select('(' . $subQuery . ') as contactid');
+
+		// Join over the categories to get parent category titles
+		$query->select('parent.title as parent_title, parent.id as parent_id, parent.path as parent_route, parent.alias as parent_alias')
+			->join('LEFT', '#__categories as parent ON parent.id = c.parent_id');
+
+		// Join on voting table
+		$query->select('ROUND(v.rating_sum / v.rating_count, 0) AS rating, v.rating_count as rating_count')
+			->join('LEFT', '#__content_rating AS v ON a.id = v.content_id');
+
+		// Join to check for category published state in parent categories up the tree
+		$query->select('c.published, CASE WHEN badcats.id is null THEN c.published ELSE 0 END AS parents_published');
+		$subquery = 'SELECT cat.id as id FROM #__categories AS cat JOIN #__categories AS parent ';
+		$subquery .= 'ON cat.lft BETWEEN parent.lft AND parent.rgt ';
+		$subquery .= 'WHERE parent.extension = ' . $db->quote('com_content');
+
+		if ($this->getState('filter.published') == 2)
+		{
+			// Find any up-path categories that are archived
+			// If any up-path categories are archived, include all children in archived layout
+			$subquery .= ' AND parent.published = 2 GROUP BY cat.id ';
+			// Set effective state to archived if up-path category is archived
+			$publishedWhere = 'CASE WHEN badcats.id is null THEN a.state ELSE 2 END';
+		}
+		else
+		{
+			// Find any up-path categories that are not published
+			// If all categories are published, badcats.id will be null, and we just use the article state
+			$subquery .= ' AND parent.published != 1 GROUP BY cat.id ';
+			// Select state to unpublished if up-path category is unpublished
+			$publishedWhere = 'CASE WHEN badcats.id is null THEN a.state ELSE 0 END';
+		}
+		$query->join('LEFT OUTER', '(' . $subquery . ') AS badcats ON badcats.id = c.id');
+
+		// Filter by access level.
+		if ($access = $this->getState('filter.access'))
+		{
+			$user = JFactory::getUser();
+			$groups = implode(',', $user->getAuthorisedViewLevels());
+			$query->where('a.access IN (' . $groups . ')')
+				->where('c.access IN (' . $groups . ')');
+		}
+
+		// Filter by published state
+		$published = $this->getState('filter.published');
+
+		if (is_numeric($published))
+		{
+			// Use article state if badcats.id is null, otherwise, force 0 for unpublished
+			$query->where($publishedWhere . ' = ' . (int) $published);
+		}
+		elseif (is_array($published))
+		{
+			JArrayHelper::toInteger($published);
+			$published = implode(',', $published);
+			// Use article state if badcats.id is null, otherwise, force 0 for unpublished
+			$query->where($publishedWhere . ' IN (' . $published . ')');
+		}
+
+		// Filter by featured state
+		$featured = $this->getState('filter.featured');
+		switch ($featured)
+		{
+			case 'hide':
+				$query->where('a.featured = 0');
+				break;
+
+			case 'only':
+				$query->where('a.featured = 1');
+				break;
+
+			case 'show':
+			default:
+				// Normally we do not discriminate
+				// between featured/unfeatured items.
+				break;
+		}
+
+		// Filter by a single or group of articles.
+		$articleId = $this->getState('filter.article_id');
+
+		if (is_numeric($articleId))
+		{
+			$type = $this->getState('filter.article_id.include', true) ? '= ' : '<> ';
+			$query->where('a.id ' . $type . (int) $articleId);
+		}
+		elseif (is_array($articleId))
+		{
+			JArrayHelper::toInteger($articleId);
+			$articleId = implode(',', $articleId);
+			$type = $this->getState('filter.article_id.include', true) ? 'IN' : 'NOT IN';
+			$query->where('a.id ' . $type . ' (' . $articleId . ')');
+		}
+
+		// Filter by a single or group of categories
+		$categoryId = $this->getState('filter.category_id');
+
+		if (is_numeric($categoryId))
+		{
+			$type = $this->getState('filter.category_id.include', true) ? '= ' : '<> ';
+
+			// Add subcategory check
+			$includeSubcategories = $this->getState('filter.subcategories', false);
+			$categoryEquals = 'a.catid ' . $type . (int) $categoryId;
+
+			if ($includeSubcategories)
+			{
+				$levels = (int) $this->getState('filter.max_category_levels', '1');
+				// Create a subquery for the subcategory list
+				$subQuery = $db->getQuery(true)
+					->select('sub.id')
+					->from('#__categories as sub')
+					->join('INNER', '#__categories as this ON sub.lft > this.lft AND sub.rgt < this.rgt')
+					->where('this.id = ' . (int) $categoryId);
+				if ($levels >= 0)
+				{
+					$subQuery->where('sub.level <= this.level + ' . $levels);
+				}
+
+				// Add the subquery to the main query
+				$query->where('(' . $categoryEquals . ' OR a.catid IN (' . $subQuery->__toString() . '))');
+			}
+			else
+			{
+				$query->where($categoryEquals);
+			}
+		}
+		elseif (is_array($categoryId) && (count($categoryId) > 0))
+		{
+			JArrayHelper::toInteger($categoryId);
+			$categoryId = implode(',', $categoryId);
+			if (!empty($categoryId))
+			{
+				$type = $this->getState('filter.category_id.include', true) ? 'IN' : 'NOT IN';
+				$query->where('a.catid ' . $type . ' (' . $categoryId . ')');
+			}
+		}
+
+		// Filter by author
+		$authorId = $this->getState('filter.author_id');
+		$authorWhere = '';
+
+		if (is_numeric($authorId))
+		{
+			$type = $this->getState('filter.author_id.include', true) ? '= ' : '<> ';
+			$authorWhere = 'a.created_by ' . $type . (int) $authorId;
+		}
+		elseif (is_array($authorId))
+		{
+			JArrayHelper::toInteger($authorId);
+			$authorId = implode(',', $authorId);
+
+			if ($authorId)
+			{
+				$type = $this->getState('filter.author_id.include', true) ? 'IN' : 'NOT IN';
+				$authorWhere = 'a.created_by ' . $type . ' (' . $authorId . ')';
+			}
+		}
+
+		// Filter by author alias
+		$authorAlias = $this->getState('filter.author_alias');
+		$authorAliasWhere = '';
+
+		if (is_string($authorAlias))
+		{
+			$type = $this->getState('filter.author_alias.include', true) ? '= ' : '<> ';
+			$authorAliasWhere = 'a.created_by_alias ' . $type . $db->quote($authorAlias);
+		}
+		elseif (is_array($authorAlias))
+		{
+			$first = current($authorAlias);
+
+			if (!empty($first))
+			{
+				JArrayHelper::toString($authorAlias);
+
+				foreach ($authorAlias as $key => $alias)
+				{
+					$authorAlias[$key] = $db->quote($alias);
+				}
+
+				$authorAlias = implode(',', $authorAlias);
+
+				if ($authorAlias)
+				{
+					$type = $this->getState('filter.author_alias.include', true) ? 'IN' : 'NOT IN';
+					$authorAliasWhere = 'a.created_by_alias ' . $type . ' (' . $authorAlias .
+						')';
+				}
+			}
+		}
+
+		if (!empty($authorWhere) && !empty($authorAliasWhere))
+		{
+			$query->where('(' . $authorWhere . ' OR ' . $authorAliasWhere . ')');
+		}
+		elseif (empty($authorWhere) && empty($authorAliasWhere))
+		{
+			// If both are empty we don't want to add to the query
+		}
+		else
+		{
+			// One of these is empty, the other is not so we just add both
+			$query->where($authorWhere . $authorAliasWhere);
+		}
+
+		// Filter by start and end dates.
+		$nullDate = $db->quote($db->getNullDate());
+		$nowDate = $db->quote(JFactory::getDate()->toSql());
+
+		$query->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+			->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')');
+
+		// Filter by Date Range or Relative Date
+		$dateFiltering = $this->getState('filter.date_filtering', 'off');
+		$dateField = $this->getState('filter.date_field', 'a.created');
+
+		switch ($dateFiltering)
+		{
+			case 'range':
+				$startDateRange = $db->quote($this->getState('filter.start_date_range', $nullDate));
+				$endDateRange = $db->quote($this->getState('filter.end_date_range', $nullDate));
+				$query->where(
+					'(' . $dateField . ' >= ' . $startDateRange . ' AND ' . $dateField .
+						' <= ' . $endDateRange . ')'
+				);
+				break;
+
+			case 'relative':
+				$relativeDate = (int) $this->getState('filter.relative_date', 0);
+				$query->where(
+					$dateField . ' >= DATE_SUB(' . $nowDate . ', INTERVAL ' .
+						$relativeDate . ' DAY)'
+				);
+				break;
+
+			case 'off':
+			default:
+				break;
+		}
+
+		// process the filter for list views with user-entered filters
+		$params = $this->getState('params');
+
+		if ((is_object($params)) && ($params->get('filter_field') != 'hide') && ($filter = $this->getState('list.filter')))
+		{
+			// clean filter variable
+			$filter = JString::strtolower($filter);
+			$hitsFilter = (int) $filter;
+			$filter = $db->quote('%' . $db->escape($filter, true) . '%', false);
+
+			switch ($params->get('filter_field'))
+			{
+				case 'author':
+					$query->where(
+						'LOWER( CASE WHEN a.created_by_alias > ' . $db->quote(' ') .
+							' THEN a.created_by_alias ELSE ua.name END ) LIKE ' . $filter . ' '
+					);
+					break;
+
+				case 'hits':
+					$query->where('a.hits >= ' . $hitsFilter . ' ');
+					break;
+
+				case 'title':
+				default: // default to 'title' if parameter is not valid
+					$query->where('LOWER( a.title ) LIKE ' . $filter);
+					break;
+			}
+		}
+
+		// Filter by language
+		if ($this->getState('filter.language'))
+		{
+			$query->where('a.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')');
+		}
+
+		// Add the list ordering clause.
+		$query->order($this->getState('list.ordering', 'a.ordering') . ' ' . $this->getState('list.direction', 'ASC'));
+
+		return $query;
+	}
+
+	/**
+	 * Method to get a list of articles.
+	 *
+	 * Overriden to inject convert the attribs field into a JParameter object.
+	 *
+	 * @return  mixed  An array of objects on success, false on failure.
+	 * @since   1.6
+	 */
+	public function getItems()
+	{
+		$items = parent::getItems();
+		$user = JFactory::getUser();
+		$userId = $user->get('id');
+		$guest = $user->get('guest');
+		$groups = $user->getAuthorisedViewLevels();
+		$input = JFactory::getApplication()->input;
+
+		// Get the global params
+		$globalParams = JComponentHelper::getParams('com_content', true);
+
+		// Convert the parameter fields into objects.
+		foreach ($items as &$item)
+		{
+			$articleParams = new JRegistry;
+			$articleParams->loadString($item->attribs);
+
+			// Unpack readmore and layout params
+			$item->alternative_readmore = $articleParams->get('alternative_readmore');
+			$item->layout = $articleParams->get('layout');
+
+			$item->params = clone $this->getState('params');
+
+			// For blogs, article params override menu item params only if menu param = 'use_article'
+			// Otherwise, menu item params control the layout
+			// If menu item is 'use_article' and there is no article param, use global
+			if (($input->getString('layout') == 'blog') || ($input->getString('view') == 'featured')
+				|| ($this->getState('params')->get('layout_type') == 'blog')
+			)
+			{
+				// create an array of just the params set to 'use_article'
+				$menuParamsArray = $this->getState('params')->toArray();
+				$articleArray = array();
+
+				foreach ($menuParamsArray as $key => $value)
+				{
+					if ($value === 'use_article')
+					{
+						// if the article has a value, use it
+						if ($articleParams->get($key) != '')
+						{
+							// get the value from the article
+							$articleArray[$key] = $articleParams->get($key);
+						}
+						else
+						{
+							// otherwise, use the global value
+							$articleArray[$key] = $globalParams->get($key);
+						}
+					}
+				}
+
+				// merge the selected article params
+				if (count($articleArray) > 0)
+				{
+					$articleParams = new JRegistry;
+					$articleParams->loadArray($articleArray);
+					$item->params->merge($articleParams);
+				}
+			}
+			else
+			{
+				// For non-blog layouts, merge all of the article params
+				$item->params->merge($articleParams);
+			}
+
+			// get display date
+			switch ($item->params->get('list_show_date'))
+			{
+				case 'modified':
+					$item->displayDate = $item->modified;
+					break;
+
+				case 'published':
+					$item->displayDate = ($item->publish_up == 0) ? $item->created : $item->publish_up;
+					break;
+
+				default:
+				case 'created':
+					$item->displayDate = $item->created;
+					break;
+			}
+
+			// Compute the asset access permissions.
+			// Technically guest could edit an article, but lets not check that to improve performance a little.
+			if (!$guest)
+			{
+				$asset = 'com_content.article.' . $item->id;
+
+				// Check general edit permission first.
+				if ($user->authorise('core.edit', $asset))
+				{
+					$item->params->set('access-edit', true);
+				}
+				// Now check if edit.own is available.
+				elseif (!empty($userId) && $user->authorise('core.edit.own', $asset))
+				{
+					// Check for a valid user and that they are the owner.
+					if ($userId == $item->created_by)
+					{
+						$item->params->set('access-edit', true);
+					}
+				}
+			}
+
+			$access = $this->getState('filter.access');
+
+			if ($access)
+			{
+				// If the access filter has been set, we already have only the articles this user can view.
+				$item->params->set('access-view', true);
+			}
+			else
+			{
+				// If no access filter is set, the layout takes some responsibility for display of limited information.
+				if ($item->catid == 0 || $item->category_access === null)
+				{
+					$item->params->set('access-view', in_array($item->access, $groups));
+				}
+				else
+				{
+					$item->params->set('access-view', in_array($item->access, $groups) && in_array($item->category_access, $groups));
+				}
+			}
+
+			// Get the tags
+			$item->tags = new JHelperTags;
+			$item->tags->getItemTags('com_content.article', $item->id);
+		}
+
+		return $items;
+	}
+
+	public function getStart()
+	{
+		return $this->getState('list.start');
+	}
+}

components/com_content/models/categories.php

@@ -0,0 +1,132 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * This models supports retrieving lists of article categories.
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.6
+ */
+class ContentModelCategories extends JModelList
+{
+	/**
+	 * Model context string.
+	 *
+	 * @var		string
+	 */
+	public $_context = 'com_content.categories';
+
+	/**
+	 * The category context (allows other extensions to derived from this model).
+	 *
+	 * @var		string
+	 */
+	protected $_extension = 'com_content';
+
+	private $_parent = null;
+
+	private $_items = null;
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		$app = JFactory::getApplication();
+		$this->setState('filter.extension', $this->_extension);
+
+		// Get the parent id if defined.
+		$parentId = $app->input->getInt('id');
+		$this->setState('filter.parentId', $parentId);
+
+		$params = $app->getParams();
+		$this->setState('params', $params);
+
+		$this->setState('filter.published',	1);
+		$this->setState('filter.access',	true);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id	A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id	.= ':'.$this->getState('filter.extension');
+		$id	.= ':'.$this->getState('filter.published');
+		$id	.= ':'.$this->getState('filter.access');
+		$id	.= ':'.$this->getState('filter.parentId');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Redefine the function an add some properties to make the styling more easy
+	 *
+	 * @param   bool	$recursive	True if you want to return children recursively.
+	 *
+	 * @return  mixed  An array of data items on success, false on failure.
+	 * @since   1.6
+	 */
+	public function getItems($recursive = false)
+	{
+		if (!count($this->_items))
+		{
+			$app = JFactory::getApplication();
+			$menu = $app->getMenu();
+			$active = $menu->getActive();
+			$params = new JRegistry;
+
+			if ($active)
+			{
+				$params->loadString($active->params);
+			}
+
+			$options = array();
+			$options['countItems'] = $params->get('show_cat_num_articles_cat', 1) || !$params->get('show_empty_categories_cat', 0);
+			$categories = JCategories::getInstance('Content', $options);
+			$this->_parent = $categories->get($this->getState('filter.parentId', 'root'));
+
+			if (is_object($this->_parent))
+			{
+				$this->_items = $this->_parent->getChildren($recursive);
+			}
+			else {
+				$this->_items = false;
+			}
+		}
+
+		return $this->_items;
+	}
+
+	public function getParent()
+	{
+		if (!is_object($this->_parent))
+		{
+			$this->getItems();
+		}
+
+		return $this->_parent;
+	}
+}

components/com_content/models/category.php

@@ -0,0 +1,471 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * This models supports retrieving a category, the articles associated with the category,
+ * sibling, child and parent categories.
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.5
+ */
+class ContentModelCategory extends JModelList
+{
+	/**
+	 * Category items data
+	 *
+	 * @var array
+	 */
+	protected $_item = null;
+
+	protected $_articles = null;
+
+	protected $_siblings = null;
+
+	protected $_children = null;
+
+	protected $_parent = null;
+
+	/**
+	 * Model context string.
+	 *
+	 * @var		string
+	 */
+	protected $_context = 'com_content.category';
+
+	/**
+	 * The category that applies.
+	 *
+	 * @access	protected
+	 * @var		object
+	 */
+	protected $_category = null;
+
+	/**
+	 * The list of other newfeed categories.
+	 *
+	 * @access	protected
+	 * @var		array
+	 */
+	protected $_categories = null;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  An optional associative array of configuration settings.
+	 * @see     JController
+	 * @since   1.6
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id', 'a.id',
+				'title', 'a.title',
+				'alias', 'a.alias',
+				'checked_out', 'a.checked_out',
+				'checked_out_time', 'a.checked_out_time',
+				'catid', 'a.catid', 'category_title',
+				'state', 'a.state',
+				'access', 'a.access', 'access_level',
+				'created', 'a.created',
+				'created_by', 'a.created_by',
+				'modified', 'a.modified',
+				'ordering', 'a.ordering',
+				'featured', 'a.featured',
+				'language', 'a.language',
+				'hits', 'a.hits',
+				'publish_up', 'a.publish_up',
+				'publish_down', 'a.publish_down',
+				'author', 'a.author'
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * return	void
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		$app = JFactory::getApplication('site');
+		$pk  = $app->input->getInt('id');
+
+		$this->setState('category.id', $pk);
+
+		// Load the parameters. Merge Global and Menu Item params into new object
+		$params = $app->getParams();
+		$menuParams = new JRegistry;
+
+		if ($menu = $app->getMenu()->getActive())
+		{
+			$menuParams->loadString($menu->params);
+		}
+
+		$mergedParams = clone $menuParams;
+		$mergedParams->merge($params);
+
+		$this->setState('params', $mergedParams);
+		$user		= JFactory::getUser();
+				// Create a new query object.
+		$db		= $this->getDbo();
+		$query	= $db->getQuery(true);
+
+		if ((!$user->authorise('core.edit.state', 'com_content')) &&  (!$user->authorise('core.edit', 'com_content'))){
+			// limit to published for people who can't edit or edit.state.
+			$this->setState('filter.published', 1);
+			// Filter by start and end dates.
+			$nullDate = $db->quote($db->getNullDate());
+			$nowDate = $db->quote(JFactory::getDate()->toSQL());
+
+			$query->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+				->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')');
+		}
+		else
+		{
+			$this->setState('filter.published', array(0, 1, 2));
+		}
+
+		// process show_noauth parameter
+		if (!$params->get('show_noauth'))
+		{
+			$this->setState('filter.access', true);
+		}
+		else
+		{
+			$this->setState('filter.access', false);
+		}
+
+		// Optional filter text
+		$this->setState('list.filter', $app->input->getString('filter-search'));
+
+		// filter.order
+		$itemid = $app->input->get('id', 0, 'int') . ':' . $app->input->get('Itemid', 0, 'int');
+		$orderCol = $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.filter_order', 'filter_order', '', 'string');
+		if (!in_array($orderCol, $this->filter_fields))
+		{
+			$orderCol = 'a.ordering';
+		}
+		$this->setState('list.ordering', $orderCol);
+
+		$listOrder = $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.filter_order_Dir',
+			'filter_order_Dir', '', 'cmd');
+		if (!in_array(strtoupper($listOrder), array('ASC', 'DESC', '')))
+		{
+			$listOrder = 'ASC';
+		}
+		$this->setState('list.direction', $listOrder);
+
+		$this->setState('list.start', $app->input->get('limitstart', 0, 'uint'));
+
+		// set limit for query. If list, use parameter. If blog, add blog parameters for limit.
+		if (($app->input->get('layout') == 'blog') || $params->get('layout_type') == 'blog')
+		{
+			$limit = $params->get('num_leading_articles') + $params->get('num_intro_articles') + $params->get('num_links');
+			$this->setState('list.links', $params->get('num_links'));
+		}
+		else
+		{
+			$limit = $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.limit', 'limit', $params->get('display_num'), 'uint');
+		}
+
+		$this->setState('list.limit', $limit);
+
+		// set the depth of the category query based on parameter
+		$showSubcategories = $params->get('show_subcategory_content', '0');
+
+		if ($showSubcategories)
+		{
+			$this->setState('filter.max_category_levels', $params->get('show_subcategory_content', '1'));
+			$this->setState('filter.subcategories', true);
+		}
+
+		$this->setState('filter.language', JLanguageMultilang::isEnabled());
+
+		$this->setState('layout', $app->input->get('layout'));
+
+	}
+
+	/**
+	 * Get the articles in the category
+	 *
+	 * @return  mixed  An array of articles or false if an error occurs.
+	 * @since   1.5
+	 */
+	function getItems()
+	{
+		$limit = $this->getState('list.limit');
+
+		if ($this->_articles === null && $category = $this->getCategory())
+		{
+			$model = JModelLegacy::getInstance('Articles', 'ContentModel', array('ignore_request' => true));
+			$model->setState('params', JFactory::getApplication()->getParams());
+			$model->setState('filter.category_id', $category->id);
+			$model->setState('filter.published', $this->getState('filter.published'));
+			$model->setState('filter.access', $this->getState('filter.access'));
+			$model->setState('filter.language', $this->getState('filter.language'));
+			$model->setState('list.ordering', $this->_buildContentOrderBy());
+			$model->setState('list.start', $this->getState('list.start'));
+			$model->setState('list.limit', $limit);
+			$model->setState('list.direction', $this->getState('list.direction'));
+			$model->setState('list.filter', $this->getState('list.filter'));
+			// filter.subcategories indicates whether to include articles from subcategories in the list or blog
+			$model->setState('filter.subcategories', $this->getState('filter.subcategories'));
+			$model->setState('filter.max_category_levels', $this->setState('filter.max_category_levels'));
+			$model->setState('list.links', $this->getState('list.links'));
+
+			if ($limit >= 0)
+			{
+				$this->_articles = $model->getItems();
+
+				if ($this->_articles === false)
+				{
+					$this->setError($model->getError());
+				}
+			}
+			else
+			{
+				$this->_articles = array();
+			}
+
+			$this->_pagination = $model->getPagination();
+		}
+
+		return $this->_articles;
+	}
+
+	/**
+	 * Build the orderby for the query
+	 *
+	 * @return  string	$orderby portion of query
+	 * @since   1.5
+	 */
+	protected function _buildContentOrderBy()
+	{
+		$app		= JFactory::getApplication('site');
+		$db			= $this->getDbo();
+		$params		= $this->state->params;
+		$itemid		= $app->input->get('id', 0, 'int') . ':' . $app->input->get('Itemid', 0, 'int');
+		$orderCol	= $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.filter_order', 'filter_order', '', 'string');
+		$orderDirn	= $app->getUserStateFromRequest('com_content.category.list.' . $itemid . '.filter_order_Dir', 'filter_order_Dir', '', 'cmd');
+		$orderby	= ' ';
+
+		if (!in_array($orderCol, $this->filter_fields))
+		{
+			$orderCol = null;
+		}
+
+		if (!in_array(strtoupper($orderDirn), array('ASC', 'DESC', '')))
+		{
+			$orderDirn = 'ASC';
+		}
+
+		if ($orderCol && $orderDirn)
+		{
+			$orderby .= $db->escape($orderCol) . ' ' . $db->escape($orderDirn) . ', ';
+		}
+
+		$articleOrderby		= $params->get('orderby_sec', 'rdate');
+		$articleOrderDate	= $params->get('order_date');
+		$categoryOrderby	= $params->def('orderby_pri', '');
+		$secondary			= ContentHelperQuery::orderbySecondary($articleOrderby, $articleOrderDate) . ', ';
+		$primary			= ContentHelperQuery::orderbyPrimary($categoryOrderby);
+
+		$orderby .= $primary . ' ' . $secondary . ' a.created ';
+
+		return $orderby;
+	}
+
+	public function getPagination()
+	{
+		if (empty($this->_pagination))
+		{
+			return null;
+		}
+		return $this->_pagination;
+	}
+
+	/**
+	 * Method to get category data for the current category
+	 *
+	 * @param   integer  An optional ID
+	 *
+	 * @return  object
+	 * @since   1.5
+	 */
+	public function getCategory()
+	{
+		if (!is_object($this->_item))
+		{
+			if ( isset( $this->state->params ) )
+			{
+				$params = $this->state->params;
+				$options = array();
+				$options['countItems'] = $params->get('show_cat_num_articles', 1) || !$params->get('show_empty_categories_cat', 0);
+			}
+			else {
+				$options['countItems'] = 0;
+			}
+
+			$categories = JCategories::getInstance('Content', $options);
+			$this->_item = $categories->get($this->getState('category.id', 'root'));
+
+			// Compute selected asset permissions.
+			if (is_object($this->_item))
+			{
+				$user	= JFactory::getUser();
+				$asset	= 'com_content.category.'.$this->_item->id;
+
+				// Check general create permission.
+				if ($user->authorise('core.create', $asset))
+				{
+					$this->_item->getParams()->set('access-create', true);
+				}
+
+				// TODO: Why aren't we lazy loading the children and siblings?
+				$this->_children = $this->_item->getChildren();
+				$this->_parent = false;
+
+				if ($this->_item->getParent())
+				{
+					$this->_parent = $this->_item->getParent();
+				}
+
+				$this->_rightsibling = $this->_item->getSibling();
+				$this->_leftsibling = $this->_item->getSibling(false);
+			}
+			else {
+				$this->_children = false;
+				$this->_parent = false;
+			}
+		}
+
+		return $this->_item;
+	}
+
+	/**
+	 * Get the parent category.
+	 *
+	 * @param   integer  An optional category id. If not supplied, the model state 'category.id' will be used.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 * @since   1.6
+	 */
+	public function getParent()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_parent;
+	}
+
+	/**
+	 * Get the left sibling (adjacent) categories.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 * @since   1.6
+	 */
+	function &getLeftSibling()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_leftsibling;
+	}
+
+	/**
+	 * Get the right sibling (adjacent) categories.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 * @since   1.6
+	 */
+	function &getRightSibling()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		return $this->_rightsibling;
+	}
+
+	/**
+	 * Get the child categories.
+	 *
+	 * @param   integer  An optional category id. If not supplied, the model state 'category.id' will be used.
+	 *
+	 * @return  mixed  An array of categories or false if an error occurs.
+	 * @since   1.6
+	 */
+	function &getChildren()
+	{
+		if (!is_object($this->_item))
+		{
+			$this->getCategory();
+		}
+
+		// Order subcategories
+		if (count($this->_children))
+		{
+			$params = $this->getState()->get('params');
+			if ($params->get('orderby_pri') == 'alpha' || $params->get('orderby_pri') == 'ralpha')
+			{
+				jimport('joomla.utilities.arrayhelper');
+				JArrayHelper::sortObjects($this->_children, 'title', ($params->get('orderby_pri') == 'alpha') ? 1 : -1);
+			}
+		}
+
+		return $this->_children;
+	}
+
+	/**
+	 * Increment the hit counter for the category.
+	 *
+	 * @param   int  $pk  Optional primary key of the category to increment.
+	 *
+	 * @return  boolean True if successful; false otherwise and internal error set.
+	 */
+	public function hit($pk = 0)
+	{
+		// Initialise variables.
+		$pk = (!empty($pk)) ? $pk : (int) $this->getState('category.id');
+
+		$db = $this->getDbo();
+		$query = $db->getQuery(true)
+			->update('#__categories')
+			->set('hits = hits + 1')
+			->where('id = ' . (int) $pk);
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+		}
+		catch (RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+			return false;
+		}
+
+		return true;
+	}
+}

components/com_content/models/featured.php

@@ -0,0 +1,142 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+require_once __DIR__ . '/articles.php';
+
+/**
+ * Frontpage Component Model
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.5
+ */
+class ContentModelFeatured extends ContentModelArticles
+{
+	/**
+	 * Model context string.
+	 *
+	 * @var		string
+	 */
+	public $_context = 'com_content.frontpage';
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState($ordering = null, $direction = null)
+	{
+		parent::populateState($ordering, $direction);
+
+		$input = JFactory::getApplication()->input;
+		$user  = JFactory::getUser();
+
+		// List state information
+		$limitstart = $input->getUInt('limitstart', 0);
+		$this->setState('list.start', $limitstart);
+
+		$params = $this->state->params;
+		$limit = $params->get('num_leading_articles') + $params->get('num_intro_articles') + $params->get('num_links');
+		$this->setState('list.limit', $limit);
+		$this->setState('list.links', $params->get('num_links'));
+
+		$this->setState('filter.frontpage', true);
+
+		if ((!$user->authorise('core.edit.state', 'com_content')) &&  (!$user->authorise('core.edit', 'com_content'))){
+			// filter on published for those who do not have edit or edit.state rights.
+			$this->setState('filter.published', 1);
+		}
+		else
+		{
+			$this->setState('filter.published', array(0, 1, 2));
+		}
+
+		// check for category selection
+		if ($params->get('featured_categories') && implode(',', $params->get('featured_categories')) == true)
+		{
+			$featuredCategories = $params->get('featured_categories');
+			$this->setState('filter.frontpage.categories', $featuredCategories);
+		}
+	}
+
+	/**
+	 * Method to get a list of articles.
+	 *
+	 * @return  mixed  An array of objects on success, false on failure.
+	 */
+	public function getItems()
+	{
+		$params = clone $this->getState('params');
+		$limit = $params->get('num_leading_articles') + $params->get('num_intro_articles') + $params->get('num_links');
+		if ($limit > 0)
+		{
+			$this->setState('list.limit', $limit);
+			return parent::getItems();
+		}
+		return array();
+
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id	A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= $this->getState('filter.frontpage');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * @return  JDatabaseQuery
+	 */
+	protected function getListQuery()
+	{
+		// Set the blog ordering
+		$params = $this->state->params;
+		$articleOrderby = $params->get('orderby_sec', 'rdate');
+		$articleOrderDate = $params->get('order_date');
+		$categoryOrderby = $params->def('orderby_pri', '');
+		$secondary = ContentHelperQuery::orderbySecondary($articleOrderby, $articleOrderDate) . ', ';
+		$primary = ContentHelperQuery::orderbyPrimary($categoryOrderby);
+
+		$orderby = $primary . ' ' . $secondary . ' a.created DESC ';
+		$this->setState('list.ordering', $orderby);
+		$this->setState('list.direction', '');
+		// Create a new query object.
+		$query = parent::getListQuery();
+
+		// Filter by frontpage.
+		if ($this->getState('filter.frontpage'))
+		{
+			$query->join('INNER', '#__content_frontpage AS fp ON fp.content_id = a.id');
+		}
+
+		// Filter by categories
+		if (is_array($featuredCategories = $this->getState('filter.frontpage.categories')))
+		{
+			$query->where('a.catid IN (' . implode(',', $featuredCategories) . ')');
+		}
+
+		return $query;
+	}
+}

components/com_content/models/form.php

@@ -0,0 +1,177 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Base this model on the backend version.
+require_once JPATH_ADMINISTRATOR.'/components/com_content/models/article.php';
+
+/**
+ * Content Component Article Model
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.5
+ */
+class ContentModelForm extends ContentModelArticle
+{
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @since   1.6
+	 */
+	protected function populateState()
+	{
+		$app = JFactory::getApplication();
+
+		// Load state from the request.
+		$pk = $app->input->getInt('a_id');
+		$this->setState('article.id', $pk);
+
+		$this->setState('article.catid', $app->input->getInt('catid'));
+
+		$return = $app->input->get('return', null, 'base64');
+		$this->setState('return_page', base64_decode($return));
+
+		// Load the parameters.
+		$params	= $app->getParams();
+		$this->setState('params', $params);
+
+		$this->setState('layout', $app->input->get('layout'));
+	}
+
+	/**
+	 * Method to get article data.
+	 *
+	 * @param   integer	The id of the article.
+	 *
+	 * @return  mixed  Content item data object on success, false on failure.
+	 */
+	public function getItem($itemId = null)
+	{
+
+		$itemId = (int) (!empty($itemId)) ? $itemId : $this->getState('article.id');
+
+		// Get a row instance.
+		$table = $this->getTable();
+
+		// Attempt to load the row.
+		$return = $table->load($itemId);
+
+		// Check for a table object error.
+		if ($return === false && $table->getError())
+		{
+			$this->setError($table->getError());
+			return false;
+		}
+
+		$properties = $table->getProperties(1);
+		$value = JArrayHelper::toObject($properties, 'JObject');
+
+		// Convert attrib field to Registry.
+		$value->params = new JRegistry;
+		$value->params->loadString($value->attribs);
+
+		// Compute selected asset permissions.
+		$user	= JFactory::getUser();
+		$userId	= $user->get('id');
+		$asset	= 'com_content.article.'. $value->id;
+
+		// Check general edit permission first.
+		if ($user->authorise('core.edit', $asset))
+		{
+			$value->params->set('access-edit', true);
+		}
+		// Now check if edit.own is available.
+		elseif (!empty($userId) && $user->authorise('core.edit.own', $asset))
+		{
+			// Check for a valid user and that they are the owner.
+			if ($userId == $value->created_by)
+			{
+				$value->params->set('access-edit', true);
+			}
+		}
+
+		// Check edit state permission.
+		if ($itemId)
+		{
+			// Existing item
+			$value->params->set('access-change', $user->authorise('core.edit.state', $asset));
+		}
+		else
+		{
+			// New item.
+			$catId = (int) $this->getState('article.catid');
+
+			if ($catId)
+			{
+				$value->params->set('access-change', $user->authorise('core.edit.state', 'com_content.category.'.$catId));
+				$value->catid = $catId;
+			}
+			else
+			{
+				$value->params->set('access-change', $user->authorise('core.edit.state', 'com_content'));
+			}
+		}
+
+		$value->articletext = $value->introtext;
+		if (!empty($value->fulltext))
+		{
+			$value->articletext .= '<hr id="system-readmore" />'.$value->fulltext;
+		}
+
+		// Convert the metadata field to an array.
+		$registry = new JRegistry;
+		$registry->loadString($value->metadata);
+		$value->metadata = $registry->toArray();
+
+		if ($itemId)
+		{
+			$value->tags = new JHelperTags;
+			$value->tags->getTagIds($value->id, 'com_content.article');
+			$value->metadata['tags'] = $value->tags;
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Get the return URL.
+	 *
+	 * @return  string	The return URL.
+	 * @since   1.6
+	 */
+	public function getReturnPage()
+	{
+		return base64_encode($this->getState('return_page'));
+	}
+
+	/**
+	 * Method to save the form data.
+	 *
+	 * @param   array  $data  The form data.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   3.2
+	 */
+	public function save($data)
+	{
+		// Prevent deleting multilang associations
+		$app = JFactory::getApplication();
+		$assoc = isset($app->item_associations) ? $app->item_associations : 0;
+		$app->item_associations = 0;
+		$result = parent::save($data);
+		$app->item_associations = $assoc;
+
+		return $result;
+	}
+}

components/com_content/models/forms/article.xml

@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset addfieldpath="/administrator/components/com_categories/models/fields">
+		<field
+			id="id"
+			name="id"
+			type="hidden"
+			class="inputbox"
+			label="COM_CONTENT_ID_LABEL"
+			size="10"
+			default="0"
+			readonly="true" />
+
+		<field
+			name="asset_id"
+			type="hidden"
+			filter="unset" />
+
+		<field
+			id="title"
+			name="title"
+			type="text"
+			label="JGLOBAL_TITLE"
+			description="JFIELD_TITLE_DESC"
+			class="inputbox"
+			size="30"
+			required="true" />
+
+		<field
+			id="alias"
+			name="alias"
+			type="text"
+			label="JFIELD_ALIAS_LABEL"
+			description="JFIELD_ALIAS_DESC"
+			class="inputbox"
+			size="45" />
+
+		<field
+			name="articletext"
+			type="editor"
+			buttons="true"
+			label="CONTENT_TEXT_LABEL"
+			description="CONTENT_TEXT_DESC"
+			class="inputbox"
+			filter="JComponentHelper::filterText"
+			asset_id="com_content"
+		/>
+
+		<field
+			id="state"
+			name="state"
+			type="list"
+			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
+			class="inputbox"
+			size="1"
+			default="1">
+			<option
+				value="1">
+				JPUBLISHED</option>
+			<option
+				value="0">
+				JUNPUBLISHED</option>
+			<option
+				value="2">
+				JARCHIVED</option>
+			<option
+				value="-2">
+				JTRASHED</option>
+		</field>
+
+		<field
+			id="featured"
+			name="featured"
+			type="list"
+			label="JGLOBAL_FIELD_FEATURED_LABEL"
+			description="JGLOBAL_FIELD_FEATURED_DESC"
+			class="inputbox"
+			default="0"
+		>
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
+
+		<field
+			id="catid"
+			name="catid"
+			type="categoryedit"
+			extension="com_content"
+			label="JCATEGORY"
+			description="JFIELD_CATEGORY_DESC"
+			class="inputbox"
+			required="true">
+		</field>
+
+		<field
+			id="created"
+			name="created"
+			type="calendar"
+			filter="unset" />
+
+		<field
+			id="created_by"
+			name="created_by"
+			type="text"
+			filter="unset" />
+
+		<field
+			id="created_by_alias"
+			name="created_by_alias"
+			type="text"
+			label="JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL"
+			description="JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC"
+			class="inputbox"
+			size="20" />
+
+		<field
+			id="publish_up"
+			name="publish_up"
+			type="calendar"
+			label="JGLOBAL_FIELD_PUBLISH_UP_LABEL"
+			description="JGLOBAL_FIELD_PUBLISH_UP_DESC"
+			class="inputbox"
+			format="%Y-%m-%d %H:%M:%S"
+			size="22"
+			filter="user_utc" />
+
+		<field
+			id="publish_down"
+			name="publish_down"
+			type="calendar"
+			label="JGLOBAL_FIELD_PUBLISH_DOWN_LABEL"
+			description="JGLOBAL_FIELD_PUBLISH_DOWN_DESC"
+			class="inputbox"
+			format="%Y-%m-%d %H:%M:%S"
+			size="22"
+			filter="user_utc" />
+
+		<field
+			name="language"
+			type="contentlanguage"
+			label="JFIELD_LANGUAGE_LABEL"
+			description="JFIELD_LANGUAGE_DESC"
+			class="inputbox">
+			<option value="*">JALL</option>
+		</field>
+
+		<field name="tags" 
+			type="tag"
+			label="JTAG"
+			description="JTAG_DESC"
+			class="inputbox span12 small"
+			multiple="true"
+		>
+		</field>
+
+		<field
+			id="metakey"
+			name="metakey"
+			type="textarea"
+			label="JFIELD_META_KEYWORDS_LABEL"
+			description="JFIELD_META_KEYWORDS_DESC"
+			class="inputbox"
+			rows="5"
+			cols="50" />
+
+		<field
+			id="metadesc"
+			name="metadesc"
+			type="textarea"
+			label="JFIELD_META_DESCRIPTION_LABEL"
+			description="JFIELD_META_DESCRIPTION_DESC"
+			class="inputbox"
+			rows="5"
+			cols="50" />
+
+
+		<field
+			id="access"
+			name="access"
+			type="accesslevel"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			class="inputbox"
+			size="1" />
+	</fieldset>
+		<fields name="images">
+		<fieldset name="image-intro">
+			<field
+				name="image_intro"
+				type="media"
+				label="COM_CONTENT_FIELD_INTRO_LABEL"
+				description="COM_CONTENT_FIELD_INTRO_DESC" />
+			<field name="image_intro_alt"
+				type="text"
+				label="COM_CONTENT_FIELD_IMAGE_ALT_LABEL"
+				description="COM_CONTENT_FIELD_IMAGE_ALT_DESC"
+				class="inputbox"
+				size="20" />
+			<field name="image_intro_caption"
+				type="text"
+				label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
+				description="COM_CONTENT_FIELD_IMAGE_CAPTION_DESC"
+				class="inputbox"
+				size="20" />
+			<field
+				name="float_intro"
+				type="list"
+				label="COM_CONTENT_FLOAT_INTRO_LABEL"
+				description="COM_CONTENT_FLOAT_DESC">
+					<option value="">JGLOBAL_USE_GLOBAL</option>
+					<option value="right">COM_CONTENT_RIGHT</option>
+					<option value="left">COM_CONTENT_LEFT</option>
+			</field>
+			</fieldset>
+			<fieldset name="image-full">
+			<field
+				name="image_fulltext"
+				type="media"
+				label="COM_CONTENT_FIELD_FULL_LABEL"
+				description="COM_CONTENT_FIELD_FULL_DESC" />
+			<field name="image_fulltext_alt"
+				type="text"
+				label="COM_CONTENT_FIELD_IMAGE_ALT_LABEL"
+				description="COM_CONTENT_FIELD_IMAGE_ALT_DESC"
+				class="inputbox"
+				size="20" />
+			<field name="image_fulltext_caption"
+				type="text"
+				label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
+				description="COM_CONTENT_FIELD_IMAGE_CAPTION_DESC"
+				class="inputbox"
+				size="20" />
+			<field
+				name="float_fulltext"
+				type="list"
+				label="COM_CONTENT_FLOAT_FULLTEXT_LABEL"
+				description="COM_CONTENT_FLOAT_DESC">
+					<option value="">JGLOBAL_USE_GLOBAL</option>
+					<option value="right">COM_CONTENT_RIGHT</option>
+					<option value="left">COM_CONTENT_LEFT</option>
+			</field>
+			</fieldset>
+		</fields>
+		<fields name="urls">
+			<field
+				name="urla"
+				type="url"
+				validate="url"
+				label="COM_CONTENT_FIELD_URLA_LABEL"
+				description="COM_CONTENT_FIELD_URL_DESC" />
+			<field name="urlatext"
+				type="text"
+				label="COM_CONTENT_FIELD_URLA_LINK_TEXT_LABEL"
+				description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
+				class="inputbox"
+				size="20" />
+			<field
+				name="targeta"
+				type="hidden"
+			 />
+
+			<field
+				name="urlb"
+				type="url"
+				validate="url"
+				label="COM_CONTENT_FIELD_URLB_LABEL"
+				description="COM_CONTENT_FIELD_URL_DESC" />
+			<field name="urlbtext"
+				type="text"
+				label="COM_CONTENT_FIELD_URLB_LINK_TEXT_LABEL"
+				description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
+				class="inputbox"
+				size="20" />
+			<field
+				name="targetb"
+				type="hidden"
+				 />
+			<field
+				name="urlc"
+				type="url"
+				validate="url"
+				label="COM_CONTENT_FIELD_URLC_LABEL"
+				description="COM_CONTENT_FIELD_URL_DESC" />
+			<field
+				name="urlctext"
+				type="text"
+				label="COM_CONTENT_FIELD_URLC_LINK_TEXT_LABEL"
+				description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
+				class="inputbox"
+				size="20" />
+			<field
+				name="targetc"
+				type="hidden"
+				 />
+		</fields>
+		<fields name="metadata">
+			<fieldset name="jmetadata"
+				label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
+		
+					<field name="robots"
+						type="hidden"
+						filter="unset"
+						label="JFIELD_METADATA_ROBOTS_LABEL"
+						description="JFIELD_METADATA_ROBOTS_DESC"
+						labelclass="control-label"
+						>
+						<option value="">JGLOBAL_USE_GLOBAL</option>
+						<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
+						<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
+						<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
+						<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
+					</field>
+		
+					<field name="author" 
+						type="hidden"
+						filter="unset"
+						label="JAUTHOR" 
+						description="JFIELD_METADATA_AUTHOR_DESC"
+						size="20" 
+						labelclass="control-label" 
+					/>
+	
+					<field name="rights" 
+						type="hidden" 
+						label="JFIELD_META_RIGHTS_LABEL"
+						filter="unset"
+						description="JFIELD_META_RIGHTS_DESC" 
+						required="false" 
+						labelclass="control-label" 
+					/>
+	
+					<field name="xreference" 
+						type="hidden"
+						filter="unset"
+						label="COM_CONTENT_FIELD_XREFERENCE_LABEL"
+						description="COM_CONTENT_FIELD_XREFERENCE_DESC"
+						class="inputbox"
+						size="20" 
+						labelclass="control-label" />
+	
+			</fieldset>
+		</fields>
+
+</form>

components/com_content/models/forms/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

components/com_content/models/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

components/com_content/router.php

@@ -0,0 +1,403 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Build the route for the com_content component
+ *
+ * @return  array  An array of URL arguments
+ * @return  array  The URL arguments to use to assemble the subsequent URL.
+ * @since    1.5
+ */
+function ContentBuildRoute(&$query)
+{
+	$segments = array();
+
+	// get a menu item based on Itemid or currently active
+	$app = JFactory::getApplication();
+	$menu = $app->getMenu();
+	$params = JComponentHelper::getParams('com_content');
+	$advanced = $params->get('sef_advanced_link', 0);
+
+	// we need a menu item.  Either the one specified in the query, or the current active one if none specified
+	if (empty($query['Itemid']))
+	{
+		$menuItem = $menu->getActive();
+		$menuItemGiven = false;
+	}
+	else
+	{
+		$menuItem = $menu->getItem($query['Itemid']);
+		$menuItemGiven = true;
+	}
+
+	// check again
+	if ($menuItemGiven && isset($menuItem) && $menuItem->component != 'com_content')
+	{
+		$menuItemGiven = false;
+		unset($query['Itemid']);
+	}
+
+	if (isset($query['view']))
+	{
+		$view = $query['view'];
+	}
+	else
+	{
+		// we need to have a view in the query or it is an invalid URL
+		return $segments;
+	}
+
+	// are we dealing with an article or category that is attached to a menu item?
+	if (($menuItem instanceof stdClass) && $menuItem->query['view'] == $query['view'] && isset($query['id']) && $menuItem->query['id'] == (int) $query['id'])
+	{
+		unset($query['view']);
+
+		if (isset($query['catid']))
+		{
+			unset($query['catid']);
+		}
+
+		if (isset($query['layout']))
+		{
+			unset($query['layout']);
+		}
+
+		unset($query['id']);
+
+		return $segments;
+	}
+
+	if ($view == 'category' || $view == 'article')
+	{
+		if (!$menuItemGiven)
+		{
+			$segments[] = $view;
+		}
+
+		unset($query['view']);
+
+		if ($view == 'article')
+		{
+			if (isset($query['id']) && isset($query['catid']) && $query['catid'])
+			{
+				$catid = $query['catid'];
+				// Make sure we have the id and the alias
+				if (strpos($query['id'], ':') === false)
+				{
+					$db = JFactory::getDbo();
+					$dbQuery = $db->getQuery(true)
+						->select('alias')
+						->from('#__content')
+						->where('id=' . (int) $query['id']);
+					$db->setQuery($dbQuery);
+					$alias = $db->loadResult();
+					$query['id'] = $query['id'] . ':' . $alias;
+				}
+			}
+			else
+			{
+				// we should have these two set for this view.  If we don't, it is an error
+				return $segments;
+			}
+		}
+		else
+		{
+			if (isset($query['id']))
+			{
+				$catid = $query['id'];
+			}
+			else
+			{
+				// we should have id set for this view.  If we don't, it is an error
+				return $segments;
+			}
+		}
+
+		if ($menuItemGiven && isset($menuItem->query['id']))
+		{
+			$mCatid = $menuItem->query['id'];
+		}
+		else
+		{
+			$mCatid = 0;
+		}
+
+		$categories = JCategories::getInstance('Content');
+		$category = $categories->get($catid);
+
+		if (!$category)
+		{
+			// we couldn't find the category we were given.  Bail.
+			return $segments;
+		}
+
+		$path = array_reverse($category->getPath());
+
+		$array = array();
+
+		foreach ($path as $id)
+		{
+			if ((int) $id == (int) $mCatid)
+			{
+				break;
+			}
+
+			list($tmp, $id) = explode(':', $id, 2);
+
+			$array[] = $id;
+		}
+
+		$array = array_reverse($array);
+
+		if (!$advanced && count($array))
+		{
+			$array[0] = (int) $catid . ':' . $array[0];
+		}
+
+		$segments = array_merge($segments, $array);
+
+		if ($view == 'article')
+		{
+			if ($advanced)
+			{
+				list($tmp, $id) = explode(':', $query['id'], 2);
+			}
+			else
+			{
+				$id = $query['id'];
+			}
+			$segments[] = $id;
+		}
+		unset($query['id']);
+		unset($query['catid']);
+	}
+
+	if ($view == 'archive')
+	{
+		if (!$menuItemGiven)
+		{
+			$segments[] = $view;
+			unset($query['view']);
+		}
+
+		if (isset($query['year']))
+		{
+			if ($menuItemGiven)
+			{
+				$segments[] = $query['year'];
+				unset($query['year']);
+			}
+		}
+
+		if (isset($query['year']) && isset($query['month']))
+		{
+			if ($menuItemGiven)
+			{
+				$segments[] = $query['month'];
+				unset($query['month']);
+			}
+		}
+	}
+
+	// if the layout is specified and it is the same as the layout in the menu item, we
+	// unset it so it doesn't go into the query string.
+	if (isset($query['layout']))
+	{
+		if ($menuItemGiven && isset($menuItem->query['layout']))
+		{
+			if ($query['layout'] == $menuItem->query['layout'])
+			{
+				unset($query['layout']);
+			}
+		}
+		else
+		{
+			if ($query['layout'] == 'default')
+			{
+				unset($query['layout']);
+			}
+		}
+	}
+
+	return $segments;
+}
+
+/**
+ * Parse the segments of a URL.
+ *
+ * @return  array  The segments of the URL to parse.
+ *
+ * @return  array  The URL attributes to be used by the application.
+ * @since    1.5
+ */
+function ContentParseRoute($segments)
+{
+	$vars = array();
+
+	//Get the active menu item.
+	$app = JFactory::getApplication();
+	$menu = $app->getMenu();
+	$item = $menu->getActive();
+	$params = JComponentHelper::getParams('com_content');
+	$advanced = $params->get('sef_advanced_link', 0);
+	$db = JFactory::getDbo();
+
+	// Count route segments
+	$count = count($segments);
+
+	// Standard routing for articles.  If we don't pick up an Itemid then we get the view from the segments
+	// the first segment is the view and the last segment is the id of the article or category.
+	if (!isset($item))
+	{
+		$vars['view'] = $segments[0];
+		$vars['id'] = $segments[$count - 1];
+
+		return $vars;
+	}
+
+	// if there is only one segment, then it points to either an article or a category
+	// we test it first to see if it is a category.  If the id and alias match a category
+	// then we assume it is a category.  If they don't we assume it is an article
+	if ($count == 1)
+	{
+		// we check to see if an alias is given.  If not, we assume it is an article
+		if (strpos($segments[0], ':') === false)
+		{
+			$vars['view'] = 'article';
+			$vars['id'] = (int) $segments[0];
+			return $vars;
+		}
+
+		list($id, $alias) = explode(':', $segments[0], 2);
+
+		// first we check if it is a category
+		$category = JCategories::getInstance('Content')->get($id);
+
+		if ($category && $category->alias == $alias)
+		{
+			$vars['view'] = 'category';
+			$vars['id'] = $id;
+
+			return $vars;
+		}
+		else
+		{
+			$query = 'SELECT alias, catid FROM #__content WHERE id = ' . (int) $id;
+			$db->setQuery($query);
+			$article = $db->loadObject();
+
+			if ($article)
+			{
+				if ($article->alias == $alias)
+				{
+					$vars['view'] = 'article';
+					$vars['catid'] = (int) $article->catid;
+					$vars['id'] = (int) $id;
+
+					return $vars;
+				}
+			}
+		}
+	}
+
+	// if there was more than one segment, then we can determine where the URL points to
+	// because the first segment will have the target category id prepended to it.  If the
+	// last segment has a number prepended, it is an article, otherwise, it is a category.
+	if (!$advanced)
+	{
+		$cat_id = (int) $segments[0];
+
+		$article_id = (int) $segments[$count - 1];
+
+		if ($article_id > 0)
+		{
+			$vars['view'] = 'article';
+			$vars['catid'] = $cat_id;
+			$vars['id'] = $article_id;
+		}
+		else
+		{
+			$vars['view'] = 'category';
+			$vars['id'] = $cat_id;
+		}
+
+		return $vars;
+	}
+
+	// we get the category id from the menu item and search from there
+	$id = $item->query['id'];
+	$category = JCategories::getInstance('Content')->get($id);
+
+	if (!$category)
+	{
+		JError::raiseError(404, JText::_('COM_CONTENT_ERROR_PARENT_CATEGORY_NOT_FOUND'));
+		return $vars;
+	}
+
+	$categories = $category->getChildren();
+	$vars['catid'] = $id;
+	$vars['id'] = $id;
+	$found = 0;
+
+	foreach ($segments as $segment)
+	{
+		$segment = str_replace(':', '-', $segment);
+
+		foreach ($categories as $category)
+		{
+			if ($category->alias == $segment)
+			{
+				$vars['id'] = $category->id;
+				$vars['catid'] = $category->id;
+				$vars['view'] = 'category';
+				$categories = $category->getChildren();
+				$found = 1;
+				break;
+			}
+		}
+
+		if ($found == 0)
+		{
+			if ($advanced)
+			{
+				$db = JFactory::getDbo();
+				$query = $db->getQuery(true)
+					->select($db->quoteName('id'))
+					->from('#__content')
+					->where($db->quoteName('catid') . ' = ' . (int) $vars['catid'])
+					->where($db->quoteName('alias') . ' = ' . $db->quote($db->quote($segment)));
+				$db->setQuery($query);
+				$cid = $db->loadResult();
+			}
+			else
+			{
+				$cid = $segment;
+			}
+
+			$vars['id'] = $cid;
+
+			if ($item->query['view'] == 'archive' && $count != 1)
+			{
+				$vars['year'] = $count >= 2 ? $segments[$count - 2] : null;
+				$vars['month'] = $segments[$count - 1];
+				$vars['view'] = 'archive';
+			}
+			else
+			{
+				$vars['view'] = 'article';
+			}
+		}
+
+		$found = 0;
+	}
+
+	return $vars;
+}

components/com_content/views/archive/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

components/com_content/views/archive/metadata.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<view title="Archive">
+		<message><![CDATA[TYPEARCHLAYDESC]]></message>
+	</view>
+</metadata>

components/com_content/views/archive/tmpl/default.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+
+JHtml::_('behavior.caption');
+?>
+<div class="archive<?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; ?>
+<form id="adminForm" action="<?php echo JRoute::_('index.php')?>" method="post" class="form-inline">
+	<fieldset class="filters">
+	<div class="filter-search alert alert-info">
+		<?php if ($this->params->get('filter_field') != 'hide') : ?>
+		<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->filter); ?>" class="inputbox span2" onchange="document.getElementById('adminForm').submit();" />
+		<?php endif; ?>
+
+		<?php echo $this->form->monthField; ?>
+		<?php echo $this->form->yearField; ?>
+		<?php echo $this->form->limitField; ?>
+
+	</div>
+	<button type="submit" class="btn btn-primary"><?php echo JText::_('JGLOBAL_FILTER_BUTTON'); ?></button>
+	<input type="hidden" name="view" value="archive" />
+	<input type="hidden" name="option" value="com_content" />
+	<input type="hidden" name="limitstart" value="0" />
+	</fieldset>
+
+	<?php echo $this->loadTemplate('items'); ?>
+</form>
+</div>

components/com_content/views/archive/tmpl/default.xml

@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="com_content_archive_view_default_title" option="com_content_archive_view_default_option">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_ARTICLE_ARCHIVED"
+		/>
+		<message>
+			<![CDATA[com_content_archive_view_default_desc]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the parameters object for the layout. -->
+	<fields name="params">
+
+		<!-- Basic options. -->
+		<fieldset name="basic" label="JGLOBAL_ARCHIVE_OPTIONS"
+		>
+
+			<field name="orderby_sec" type="list"
+				default="alpha"
+				description="JGLOBAL_ARTICLE_ORDER_DESC"
+				label="JGLOBAL_ARTICLE_ORDER_LABEL"
+		>
+				<option value="date">JGLOBAL_OLDEST_FIRST</option>
+				<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="author">JGLOBAL_AUTHOR_ALPHABETICAL</option>
+				<option value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL</option>
+				<option value="hits">JGLOBAL_MOST_HITS</option>
+				<option value="rhits">JGLOBAL_LEAST_HITS</option>
+				<option value="order">JGLOBAL_ARTICLE_MANAGER_ORDER</option>
+			</field>
+
+			<field name="order_date" type="list"
+				default="created"
+				description="JGLOBAL_ORDERING_DATE_DESC"
+				label="JGLOBAL_ORDERING_DATE_LABEL"
+			>
+				<option value="created">JGLOBAL_Created</option>
+				<option value="modified">JGLOBAL_Modified</option>
+				<option value="published">JPUBLISHED</option>
+			</field>
+
+			<field name="display_num" type="list"
+				default="5"
+				description="JGLOBAL_NUMBER_ITEMS_LIST_DESC"
+				label="JGLOBAL_NUMBER_ITEMS_LIST_LABEL"
+			>
+				<option value="5">J5</option>
+				<option value="10">J10</option>
+				<option value="15">J15</option>
+				<option value="20">J20</option>
+				<option value="25">J25</option>
+				<option value="30">J30</option>
+				<option value="50">J50</option>
+				<option value="100">J100</option>
+				<option value="0">JALL</option>
+			</field>
+
+			<field
+				name="filter_field"
+				type="list"
+				default=""
+				description="JGLOBAL_FILTER_FIELD_DESC"
+				label="JGLOBAL_FILTER_FIELD_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="hide">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="introtext_limit" type="text" default="100"
+					label="JGLOBAL_ARCHIVE_ARTICLES_FIELD_INTROTEXTLIMIT_LABEL"
+					description="JGLOBAL_ARCHIVE_ARTICLES_FIELD_INTROTEXTLIMIT_DESC" />
+
+		</fieldset>
+
+		<!-- Articles options. -->
+		<fieldset name="articles"
+			label="COM_CONTENT_ATTRIBS_ARTICLE_SETTINGS_LABEL"
+		>
+
+			<field name="show_intro" type="list"
+				description="JGLOBAL_SHOW_INTRO_DESC"
+				label="JGLOBAL_SHOW_INTRO_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="info_block_position"
+				type="list"
+				default=""
+				label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
+				description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC">
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
+				<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
+				<option value="2">COM_CONTENT_FIELD_OPTION_SPLIT</option>
+			</field>
+
+			<field name="show_category" type="list"
+				description="JGLOBAL_SHOW_CATEGORY_DESC"
+				label="JGLOBAL_SHOW_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="link_category" type="list"
+				description="JGLOBAL_LINK_CATEGORY_DESC"
+				label="JGLOBAL_LINK_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JNo</option>
+				<option value="1">JYes</option>
+			</field>
+
+			<field
+				name="show_parent_category"
+				type="list"
+				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
+				description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC">
+				<option	value="">JGLOBAL_USE_GLOBAL</option>
+				<option	value="0">JHIDE</option>
+				<option	value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="link_parent_category"
+				type="list"
+				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
+				description="JGLOBAL_LINK_PARENT_CATEGORY_DESC">
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option	value="0">JNO</option>
+				<option	value="1">JYES</option>
+			</field>
+
+			<field name="link_titles" type="list"
+				description="JGLOBAL_LINKED_TITLES_DESC"
+				label="JGLOBAL_LINKED_TITLES_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field name="show_author" type="list"
+				description="JGLOBAL_SHOW_AUTHOR_DESC"
+				label="JGLOBAL_SHOW_AUTHOR_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+			name="link_author"
+			type="list"
+			label="JGLOBAL_LINK_AUTHOR_LABEL"
+			description="JGLOBAL_LINK_AUTHOR_DESC"
+			>
+				<option	value="">JGLOBAL_USE_GLOBAL</option>
+				<option	value="0">JNO</option>
+				<option	value="1">JYES</option>
+			</field>
+
+			<field name="show_create_date" type="list"
+				description="JGLOBAL_SHOW_CREATE_DATE_DESC"
+				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_modify_date" type="list"
+				description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
+				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_publish_date" type="list"
+				description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
+				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+
+			<field name="show_item_navigation" type="list"
+				description="JGLOBAL_SHOW_NAVIGATION_DESC"
+				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_hits" type="list"
+				description="JGLOBAL_SHOW_HITS_DESC"
+				label="JGLOBAL_SHOW_HITS_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+		</fieldset>
+
+	</fields>
+</metadata>

components/com_content/views/archive/tmpl/default_items.php

@@ -0,0 +1,190 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+$params = $this->params;
+?>
+
+<div id="archive-items">
+	<?php foreach ($this->items as $i => $item) : ?>
+		<?php $info = $item->params->get('info_block_position', 0); ?>
+		<div class="row<?php echo $i % 2; ?>">
+			<div class="page-header">
+				<h2>
+					<?php if ($params->get('link_titles')) : ?>
+						<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catslug)); ?>"> <?php echo $this->escape($item->title); ?></a>
+					<?php else: ?>
+						<?php echo $this->escape($item->title); ?>
+					<?php endif; ?>
+				</h2>
+				<?php if ($params->get('show_author') && !empty($item->author )) : ?>
+					<div class="createdby">
+					<?php $author = $item->author; ?>
+					<?php $author = ($item->created_by_alias ? $item->created_by_alias : $author); ?>
+						<?php if (!empty($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='.$item->contactid), $author)
+							); ?>
+						<?php else :?>
+							<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+						<?php endif; ?>
+					</div>
+				<?php endif; ?>
+			</div>
+		<?php $useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date')
+			|| $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category')); ?>
+		<?php if ($useDefList && ($info == 0 || $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($item->parent_slug)) : ?>
+					<dd>
+						<div class="parent-category-name">
+							<?php	$title = $this->escape($item->parent_title);
+							$url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($item->parent_slug)).'">' . $title . '</a>'; ?>
+							<?php if ($params->get('link_parent_category') && !empty($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($item->category_title);
+							$url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($item->catslug)).'">' . $title . '</a>'; ?>
+							<?php if ($params->get('link_category') && $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">
+							<span class="icon-calendar"></span> <?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $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">
+								<span class="icon-calendar"></span> <?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $item->modified, JText::_('DATE_FORMAT_LC3'))); ?>
+							</div>
+						</dd>
+					<?php endif; ?>
+					<?php if ($params->get('show_create_date')) : ?>
+						<dd>
+							<div class="create">
+								<span class="icon-calendar"></span> <?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC3'))); ?>
+							</div>
+						</dd>
+					<?php endif; ?>
+
+					<?php if ($params->get('show_hits')) : ?>
+						<dd>
+							<div class="hits">
+								<span class="icon-eye-open"></span> <?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $item->hits); ?>
+							</div>
+						</dd>
+					<?php endif; ?>
+				<?php endif; ?>
+				</dl>
+			</div>
+		<?php endif; ?>
+
+		<?php if ($params->get('show_intro')) :?>
+			<div class="intro"> <?php echo JHtml::_('string.truncateComplex', $item->introtext, $params->get('introtext_limit')); ?> </div>
+		<?php endif; ?>
+
+		<?php if ($useDefList && ($info == 1 || $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') && !empty($item->parent_slug)) : ?>
+						<dd>
+							<div class="parent-category-name">
+								<?php	$title = $this->escape($item->parent_title);
+								$url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($item->parent_slug)) . '">' . $title . '</a>';?>
+							<?php if ($params->get('link_parent_category') && $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($item->category_title);
+								$url = '<a href="' . JRoute::_(ContentHelperRoute::getCategoryRoute($item->catslug)) . '">' . $title . '</a>'; ?>
+								<?php if ($params->get('link_category') && $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">
+								<span class="icon-calendar"></span> <?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $item->publish_up, JText::_('DATE_FORMAT_LC3'))); ?>
+							</div>
+						</dd>
+					<?php endif; ?>
+				<?php endif; ?>
+
+				<?php if ($params->get('show_create_date')) : ?>
+					<dd>
+						<div class="create"><span class="icon-calendar">
+							</span> <?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $item->modified, JText::_('DATE_FORMAT_LC3'))); ?>
+						</div>
+					</dd>
+				<?php endif; ?>
+				<?php if ($params->get('show_modify_date')) : ?>
+					<dd>
+						<div class="modified"><span class="icon-calendar">
+							</span> <?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $item->modified, JText::_('DATE_FORMAT_LC3'))); ?>
+						</div>
+					</dd>
+				<?php endif; ?>
+				<?php if ($params->get('show_hits')) : ?>
+					<dd>
+						<div class="hits">
+							<span class="icon-eye-open"></span> <?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $item->hits); ?>
+						</div>
+					</dd>
+				<?php endif; ?>
+			</dl>
+		</div>
+		<?php endif; ?>
+	</div>
+	<?php endforeach; ?>
+</div>
+<div class="pagination">
+	<p class="counter"> <?php echo $this->pagination->getPagesCounter(); ?> </p>
+	<?php echo $this->pagination->getPagesLinks(); ?>
+</div>

components/com_content/views/archive/tmpl/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

components/com_content/views/archive/view.html.php

@@ -0,0 +1,160 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Content component
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.5
+ */
+class ContentViewArchive extends JViewLegacy
+{
+	protected $state = null;
+
+	protected $item = null;
+
+	protected $items = null;
+
+	protected $pagination = null;
+
+	public function display($tpl = null)
+	{
+		$user		= JFactory::getUser();
+
+		$state 		= $this->get('State');
+		$items 		= $this->get('Items');
+		$pagination	= $this->get('Pagination');
+
+		// Get the page/component configuration
+		$params = &$state->params;
+
+		foreach ($items as $item)
+		{
+			$item->catslug = ($item->category_alias) ? ($item->catid . ':' . $item->category_alias) : $item->catid;
+			$item->parent_slug = ($item->parent_alias) ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
+
+			// No link for ROOT category
+			if ($item->parent_alias == 'root')
+			{
+				$item->parent_slug = null;
+			}
+		}
+
+		$form = new stdClass;
+		// Month Field
+		$months = array(
+			'' => JText::_('COM_CONTENT_MONTH'),
+			'01' => JText::_('JANUARY_SHORT'),
+			'02' => JText::_('FEBRUARY_SHORT'),
+			'03' => JText::_('MARCH_SHORT'),
+			'04' => JText::_('APRIL_SHORT'),
+			'05' => JText::_('MAY_SHORT'),
+			'06' => JText::_('JUNE_SHORT'),
+			'07' => JText::_('JULY_SHORT'),
+			'08' => JText::_('AUGUST_SHORT'),
+			'09' => JText::_('SEPTEMBER_SHORT'),
+			'10' => JText::_('OCTOBER_SHORT'),
+			'11' => JText::_('NOVEMBER_SHORT'),
+			'12' => JText::_('DECEMBER_SHORT')
+		);
+		$form->monthField = JHtml::_(
+			'select.genericlist',
+			$months,
+			'month',
+			array(
+				'list.attr' => 'size="1" class="inputbox"',
+				'list.select' => $state->get('filter.month'),
+				'option.key' => null
+			)
+		);
+		// Year Field
+		$years = array();
+		$years[] = JHtml::_('select.option', null, JText::_('JYEAR'));
+		for ($i = 2000; $i <= 2020; $i++)
+		{
+			$years[] = JHtml::_('select.option', $i, $i);
+		}
+		$form->yearField = JHtml::_(
+			'select.genericlist',
+			$years,
+			'year',
+			array('list.attr' => 'size="1" class="inputbox"', 'list.select' => $state->get('filter.year'))
+		);
+		$form->limitField = $pagination->getLimitBox();
+
+		//Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
+
+		$this->filter     = $state->get('list.filter');
+		$this->form       = &$form;
+		$this->items      = &$items;
+		$this->params     = &$params;
+		$this->user       = &$user;
+		$this->pagination = &$pagination;
+
+		$this->_prepareDocument();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 */
+	protected function _prepareDocument()
+	{
+		$app		= JFactory::getApplication();
+		$menus		= $app->getMenu();
+		$title 		= null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('JGLOBAL_ARTICLES'));
+		}
+
+		$title = $this->params->get('page_title', '');
+		if (empty($title))
+		{
+			$title = $app->getCfg('sitename');
+		}
+		elseif ($app->getCfg('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->getCfg('sitename'), $title);
+		}
+		elseif ($app->getCfg('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->getCfg('sitename'));
+		}
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+	}
+}

components/com_content/views/article/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

components/com_content/views/article/metadata.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<view
+		title="Article">
+		<message><![CDATA[TYPEARTICLAYDESC]]></message>
+	</view>
+</metadata>

components/com_content/views/article/tmpl/default.php

@@ -0,0 +1,294 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+
+// Create shortcuts to some parameters.
+$params  = $this->item->params;
+$images  = json_decode($this->item->images);
+$urls    = json_decode($this->item->urls);
+$canEdit = $params->get('access-edit');
+$user    = JFactory::getUser();
+$info    = $params->get('info_block_position', 0);
+JHtml::_('behavior.caption');
+
+?>
+<div class="item-page<?php echo $this->pageclass_sfx?>">
+	<?php if ($this->params->get('show_page_heading') && $params->get('show_title')) : ?>
+	<div class="page-header">
+		<h1> <?php echo $this->escape($this->params->get('page_heading')); ?> </h1>
+	</div>
+	<?php endif;
+if (!empty($this->item->pagination) && $this->item->pagination && !$this->item->paginationposition && $this->item->paginationrelative)
+{
+	echo $this->item->pagination;
+}
+?>
+	<?php if ($params->get('show_title') || $params->get('show_author')) : ?>
+	<div class="page-header">
+		<h2>
+			<?php if ($this->item->state == 0) : ?>
+				<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+			<?php endif; ?>
+			<?php if ($params->get('show_title')) : ?>
+				<?php if ($params->get('link_titles') && !empty($this->item->readmore_link)) : ?>
+					<a href="<?php echo $this->item->readmore_link; ?>"> <?php echo $this->escape($this->item->title); ?></a>
+				<?php else : ?>
+					<?php echo $this->escape($this->item->title); ?>
+				<?php endif; ?>
+			<?php endif; ?>
+		</h2>
+	</div>
+	<?php endif; ?>
+	<?php if (!$this->print) : ?>
+		<?php if ($canEdit || $params->get('show_print_icon') || $params->get('show_email_icon')) : ?>
+		<div class="btn-group pull-right">
+			<a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> <span class="icon-cog"></span> <span class="caret"></span> </a>
+			<?php // Note the actions class is deprecated. Use dropdown-menu instead. ?>
+			<ul class="dropdown-menu actions">
+				<?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 else : ?>
+		<div class="pull-right">
+		<?php echo JHtml::_('icon.print_screen', $this->item, $params); ?>
+		</div>
+	<?php endif; ?>
+<?php $useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date')
+	|| $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author')); ?>
+	<?php if ($useDefList && ($info == 0 || $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_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;
+						$menu = JFactory::getApplication()->getMenu();
+						$item = $menu->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 endif; ?>
+				</dd>
+			<?php endif; ?>
+			<?php if ($params->get('show_parent_category') && !empty($this->item->parent_slug)) : ?>
+				<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') && !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; ?>
+				</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->catslug)) . '">' . $title . '</a>';?>
+					<?php if ($params->get('link_category') && $this->item->catslug) : ?>
+						<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
+					<?php else : ?>
+						<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $title); ?>
+					<?php endif; ?>
+				</dd>
+			<?php endif; ?>
+
+			<?php if ($params->get('show_publish_date')) : ?>
+				<dd class="published">
+					<span class="icon-calendar"></span> <?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $this->item->publish_up, JText::_('DATE_FORMAT_LC3'))); ?>
+				</dd>
+			<?php endif; ?>
+
+			<?php if ($info == 0) : ?>
+				<?php if ($params->get('show_modify_date')) : ?>
+					<dd class="modified">
+						<span class="icon-calendar"></span> <?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC3'))); ?>
+					</dd>
+				<?php endif; ?>
+				<?php if ($params->get('show_create_date')) : ?>
+					<dd class="create">
+						<span class="icon-calendar"></span> <?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $this->item->created, JText::_('DATE_FORMAT_LC3'))); ?>
+					</dd>
+				<?php endif; ?>
+
+				<?php if ($params->get('show_hits')) : ?>
+					<dd class="hits">
+						<span class="icon-eye-open"></span> <?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $this->item->hits); ?>
+					</dd>
+				<?php endif; ?>
+			<?php endif; ?>
+			</dl>
+		</div>
+	<?php endif; ?>
+
+	<?php if ($params->get('show_tags', 1) && !empty($this->item->tags)) : ?>
+		<?php $this->item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
+
+		<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
+	<?php endif; ?>
+
+	<?php if (!$params->get('show_intro')) : echo $this->item->event->afterDisplayTitle; endif; ?>
+	<?php echo $this->item->event->beforeDisplayContent; ?>
+
+	<?php if (isset($urls) && ((!empty($urls->urls_position) && ($urls->urls_position == '0')) || ($params->get('urls_position') == '0' && empty($urls->urls_position)))
+		|| (empty($urls->urls_position) && (!$params->get('urls_position')))) : ?>
+	<?php echo $this->loadTemplate('links'); ?>
+	<?php endif; ?>
+	<?php if ($params->get('access-view')):?>
+	<?php if (isset($images->image_fulltext) && !empty($images->image_fulltext)) : ?>
+	<?php $imgfloat = (empty($images->float_fulltext)) ? $params->get('float_fulltext') : $images->float_fulltext; ?>
+	<div class="pull-<?php echo htmlspecialchars($imgfloat); ?> item-image"> <img
+	<?php if ($images->image_fulltext_caption):
+		echo 'class="caption"'.' title="' .htmlspecialchars($images->image_fulltext_caption) . '"';
+	endif; ?>
+	src="<?php echo htmlspecialchars($images->image_fulltext); ?>" alt="<?php echo htmlspecialchars($images->image_fulltext_alt); ?>"/> </div>
+	<?php endif; ?>
+	<?php
+	if (!empty($this->item->pagination) && $this->item->pagination && !$this->item->paginationposition && !$this->item->paginationrelative):
+		echo $this->item->pagination;
+	endif;
+	?>
+	<?php if (isset ($this->item->toc)) :
+		echo $this->item->toc;
+	endif; ?>
+	<?php echo $this->item->text; ?>
+
+	<?php if ($useDefList && ($info == 1 || $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_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;
+						$menu = JFactory::getApplication()->getMenu();
+						$item = $menu->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 endif; ?>
+					</dd>
+				<?php endif; ?>
+				<?php if ($params->get('show_parent_category') && !empty($this->item->parent_slug)) : ?>
+					<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') && $this->item->parent_slug) : ?>
+							<?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
+						<?php else : ?>
+							<?php echo JText::sprintf('COM_CONTENT_PARENT', $title); ?>
+						<?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->catslug)) . '">' . $title . '</a>';?>
+						<?php if ($params->get('link_category') && $this->item->catslug) : ?>
+							<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
+						<?php else : ?>
+							<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $title); ?>
+						<?php endif; ?>
+					</dd>
+				<?php endif; ?>
+				<?php if ($params->get('show_publish_date')) : ?>
+					<dd class="published">
+						<span class="icon-calendar"></span>
+						<?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $this->item->publish_up, JText::_('DATE_FORMAT_LC3'))); ?>
+					</dd>
+				<?php endif; ?>
+			<?php endif; ?>
+
+			<?php if ($params->get('show_create_date')) : ?>
+				<dd class="create">
+					<span class="icon-calendar"></span>
+					<?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $this->item->created, JText::_('DATE_FORMAT_LC3'))); ?>
+				</dd>
+			<?php endif; ?>
+			<?php if ($params->get('show_modify_date')) : ?>
+				<dd class="modified">
+					<span class="icon-calendar"></span>
+					<?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC3'))); ?>
+				</dd>
+			<?php endif; ?>
+			<?php if ($params->get('show_hits')) : ?>
+				<dd class="hits">
+					<span class="icon-eye-open"></span> <?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $this->item->hits); ?>
+				</dd>
+			<?php endif; ?>
+			</dl>
+		</div>
+	<?php endif; ?>
+
+	<?php
+if (!empty($this->item->pagination) && $this->item->pagination && $this->item->paginationposition && !$this->item->paginationrelative):
+	echo $this->item->pagination;
+?>
+	<?php endif; ?>
+	<?php if (isset($urls) && ((!empty($urls->urls_position) && ($urls->urls_position == '1')) || ($params->get('urls_position') == '1'))) : ?>
+	<?php echo $this->loadTemplate('links'); ?>
+	<?php endif; ?>
+	<?php // Optional teaser intro text for guests ?>
+	<?php elseif ($params->get('show_noauth') == true && $user->get('guest')) : ?>
+	<?php echo $this->item->introtext; ?>
+	<?php //Optional link to let them register to see the whole article. ?>
+	<?php if ($params->get('show_readmore') && $this->item->fulltext != null) :
+		$link1 = JRoute::_('index.php?option=com_users&view=login');
+		$link = new JUri($link1);?>
+	<p class="readmore">
+		<a href="<?php echo $link; ?>">
+		<?php $attribs = json_decode($this->item->attribs); ?>
+		<?php
+		if ($attribs->alternative_readmore == null) :
+			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>
+	<?php endif; ?>
+	<?php endif; ?>
+	<?php
+if (!empty($this->item->pagination) && $this->item->pagination && $this->item->paginationposition && $this->item->paginationrelative) :
+	echo $this->item->pagination;
+?>
+	<?php endif; ?>
+	<?php echo $this->item->event->afterDisplayContent; ?> </div>

components/com_content/views/article/tmpl/default.xml

@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="com_content_article_view_default_title" option="com_content_article_view_default_option">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_ARTICLE_SINGLE_ARTICLE"
+		/>
+		<message>
+			<![CDATA[com_content_article_view_default_desc]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request"
+			addfieldpath="/administrator/components/com_content/models/fields">
+
+			<field name="id" type="modal_article"
+				label="COM_CONTENT_FIELD_SELECT_ARTICLE_LABEL"
+				required="true"
+				edit="true"
+				clear="false"
+				description="COM_CONTENT_FIELD_SELECT_ARTICLE_DESC"
+			/>
+		</fieldset>
+	</fields>
+
+	<!-- Add fields to the parameters object for the layout. -->
+	<fields name="params">
+
+		<!-- Basic options. -->
+		<fieldset name="basic"
+			label="COM_CONTENT_ATTRIBS_ARTICLE_SETTINGS_LABEL">
+
+		<field
+			name="show_title"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_SHOW_TITLE_LABEL"
+			description="JGLOBAL_SHOW_TITLE_DESC">
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="link_titles"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_LINKED_TITLES_LABEL"
+			description="JGLOBAL_LINKED_TITLES_DESC">
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option	value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
+
+		<field 
+			name="show_intro" 
+			type="radio"
+			class="btn-group"
+			description="JGLOBAL_SHOW_INTRO_DESC"
+			label="JGLOBAL_SHOW_INTRO_LABEL">
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="info_block_position"
+			type="radio"
+			class="btn-group"
+			label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
+			description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC">
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
+			<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
+			<option value="2">COM_CONTENT_FIELD_OPTION_SPLIT</option>
+		</field>
+
+
+		<field
+			name="show_category"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_SHOW_CATEGORY_LABEL"
+			description="JGLOBAL_SHOW_CATEGORY_DESC">
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option	value="0">JHIDE</option>
+			<option	value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="link_category"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_LINK_CATEGORY_LABEL"
+			description="JGLOBAL_LINK_CATEGORY_DESC">
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option	value="0">JNO</option>
+			<option	value="1">JYES</option>
+		</field>
+
+		<field
+			name="show_parent_category"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
+			description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC">
+			<option	value="">JGLOBAL_USE_GLOBAL</option>
+			<option	value="0">JHIDE</option>
+			<option	value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="link_parent_category"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
+			description="JGLOBAL_LINK_PARENT_CATEGORY_DESC">
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option	value="0">JNO</option>
+			<option	value="1">JYES</option>
+		</field>
+
+		<field
+			name="show_author"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_SHOW_AUTHOR_LABEL"
+			description="JGLOBAL_SHOW_AUTHOR_DESC">
+			<option	value="">JGLOBAL_USE_GLOBAL</option>
+			<option	value="0">JHIDE</option>
+			<option	value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="link_author"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_LINK_AUTHOR_LABEL"
+			description="JGLOBAL_LINK_AUTHOR_DESC">
+			<option	value="">JGLOBAL_USE_GLOBAL</option>
+			<option	value="0">JNO</option>
+			<option	value="1">JYES</option>
+		</field>
+
+		<field
+			name="show_create_date"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
+			description="JGLOBAL_SHOW_CREATE_DATE_DESC">
+			<option	value="">JGLOBAL_USE_GLOBAL</option>
+			<option	value="0">JHIDE</option>
+			<option	value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="show_modify_date"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
+			description="JGLOBAL_SHOW_MODIFY_DATE_DESC">
+			<option	value="">JGLOBAL_USE_GLOBAL</option>
+			<option	value="0">JHIDE</option>
+			<option	value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="show_publish_date"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
+			description="JGLOBAL_SHOW_PUBLISH_DATE_DESC">
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option	value="0">JHIDE</option>
+			<option	value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="show_item_navigation"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_SHOW_NAVIGATION_LABEL"
+			description="JGLOBAL_SHOW_NAVIGATION_DESC">
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option	value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="show_vote"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_SHOW_VOTE_LABEL"
+			description="JGLOBAL_SHOW_VOTE_DESC">
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option	value="1">JSHOW</option>
+		</field>
+
+		<field name="show_tags" 
+			type="radio"
+			class="btn-group"
+			label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL"
+			description="COM_CONTENT_FIELD_SHOW_TAGS_DESC">
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="show_icons"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_SHOW_ICONS_LABEL"
+			description="JGLOBAL_SHOW_ICONS_DESC">
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option	value="0">JHIDE</option>
+			<option	value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="show_print_icon"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
+			description="JGLOBAL_SHOW_PRINT_ICON_DESC">
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option	value="0">JHIDE</option>
+			<option	value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="show_email_icon"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_SHOW_EMAIL_ICON_LABEL"
+			description="JGLOBAL_SHOW_EMAIL_ICON_DESC">
+			<option	value="">JGLOBAL_USE_GLOBAL</option>
+			<option	value="0">JHIDE</option>
+			<option	value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="show_hits"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_SHOW_HITS_LABEL"
+			description="JGLOBAL_SHOW_HITS_DESC">
+			<option	value="">JGLOBAL_USE_GLOBAL</option>
+			<option	value="0">JHIDE</option>
+			<option	value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="show_tags"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_SHOW_TAGS_LABEL"
+			description="JGLOBAL_SHOW_TAGS_DESC">
+			<option	value="">JGLOBAL_USE_GLOBAL</option>
+			<option	value="0">JHIDE</option>
+			<option	value="1">JSHOW</option>
+		</field>
+
+		<field
+			name="show_noauth"
+			type="radio"
+			class="btn-group"
+			label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
+			description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC">
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
+		<field
+			name="urls_position"
+			type="radio"
+			class="btn-group"
+		    	label="COM_CONTENT_FIELD_URLSPOSITION_LABEL"
+			description="COM_CONTENT_FIELD_URLSPOSITION_DESC">
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
+			<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
+		</field>
+		</fieldset>
+	</fields>
+</metadata>

components/com_content/views/article/tmpl/default_links.php

@@ -0,0 +1,79 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Create shortcut
+$urls = json_decode($this->item->urls);
+
+// Create shortcuts to some parameters.
+$params = $this->item->params;
+if ($urls && (!empty($urls->urla) || !empty($urls->urlb) || !empty($urls->urlc))) :
+?>
+<div class="content-links">
+	<ul class="nav nav-tabs nav-stacked">
+		<?php
+			$urlarray = array(
+			array($urls->urla, $urls->urlatext, $urls->targeta, 'a'),
+			array($urls->urlb, $urls->urlbtext, $urls->targetb, 'b'),
+			array($urls->urlc, $urls->urlctext, $urls->targetc, 'c')
+			);
+			foreach ($urlarray as $url) :
+				$link = $url[0];
+				$label = $url[1];
+				$target = $url[2];
+				$id = $url[3];
+
+				if ( ! $link) :
+					continue;
+				endif;
+
+				// If no label is present, take the link
+				$label = ($label) ? $label : $link;
+
+				// If no target is present, use the default
+				$target = $target ? $target : $params->get('target'.$id);
+				?>
+			<li class="content-links-<?php echo $id; ?>">
+				<?php
+					// Compute the correct link
+
+					switch ($target)
+					{
+						case 1:
+							// open in a new window
+							echo '<a href="'. htmlspecialchars($link) .'" target="_blank"  rel="nofollow">'.
+								htmlspecialchars($label) .'</a>';
+							break;
+
+						case 2:
+							// open in a popup window
+							$attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=600,height=600';
+							echo "<a href=\"" . htmlspecialchars($link) . "\" onclick=\"window.open(this.href, 'targetWindow', '".$attribs."'); return false;\">".
+								htmlspecialchars($label).'</a>';
+							break;
+						case 3:
+							// open in a modal window
+							JHtml::_('behavior.modal', 'a.modal');
+							echo '<a class="modal" href="'.htmlspecialchars($link).'"  rel="{handler: \'iframe\', size: {x:600, y:600}}">'.
+								htmlspecialchars($label) . ' </a>';
+							break;
+
+						default:
+							// open in parent window
+							echo '<a href="'.  htmlspecialchars($link) . '" rel="nofollow">'.
+								htmlspecialchars($label) . ' </a>';
+							break;
+					}
+				?>
+				</li>
+		<?php endforeach; ?>
+	</ul>
+</div>
+<?php endif; ?>

components/com_content/views/article/tmpl/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

components/com_content/views/article/view.html.php

@@ -0,0 +1,301 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML Article View class for the Content component
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.5
+ */
+class ContentViewArticle extends JViewLegacy
+{
+	protected $item;
+
+	protected $params;
+
+	protected $print;
+
+	protected $state;
+
+	protected $user;
+
+	public function display($tpl = null)
+	{
+		$app		= JFactory::getApplication();
+		$user		= JFactory::getUser();
+		$dispatcher	= JEventDispatcher::getInstance();
+
+		$this->item		= $this->get('Item');
+		$this->print	= $app->input->getBool('print');
+		$this->state	= $this->get('State');
+		$this->user		= $user;
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseWarning(500, implode("\n", $errors));
+			return false;
+		}
+
+		// Create a shortcut for $item.
+		$item = $this->item;
+		$item->tagLayout = new JLayoutFile('joomla.content.tags');
+
+		// Add router helpers.
+		$item->slug			= $item->alias ? ($item->id.':'.$item->alias) : $item->id;
+		$item->catslug		= $item->category_alias ? ($item->catid.':'.$item->category_alias) : $item->catid;
+		$item->parent_slug	= $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
+
+		// No link for ROOT category
+		if ($item->parent_alias == 'root')
+		{
+			$item->parent_slug = null;
+		}
+
+		// TODO: Change based on shownoauth
+		$item->readmore_link = JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catslug));
+
+		// Merge article params. If this is single-article view, menu params override article params
+		// Otherwise, article params override menu item params
+		$this->params = $this->state->get('params');
+		$active = $app->getMenu()->getActive();
+		$temp = clone ($this->params);
+
+		// Check to see which parameters should take priority
+		if ($active)
+		{
+			$currentLink = $active->link;
+
+			// If the current view is the active item and an article view for this article, then the menu item params take priority
+			if (strpos($currentLink, 'view=article') && (strpos($currentLink, '&id='.(string) $item->id)))
+			{
+				// Load layout from active query (in case it is an alternative menu item)
+				if (isset($active->query['layout']))
+				{
+					$this->setLayout($active->query['layout']);
+				}
+				// Check for alternative layout of article
+				elseif ($layout = $item->params->get('article_layout'))
+				{
+					$this->setLayout($layout);
+				}
+
+				// $item->params are the article params, $temp are the menu item params
+				// Merge so that the menu item params take priority
+				$item->params->merge($temp);
+			}
+			else
+			{
+				// Current view is not a single article, so the article params take priority here
+				// Merge the menu item params with the article params so that the article params take priority
+				$temp->merge($item->params);
+				$item->params = $temp;
+
+				// Check for alternative layouts (since we are not in a single-article menu item)
+				// Single-article menu item layout takes priority over alt layout for an article
+				if ($layout = $item->params->get('article_layout'))
+				{
+					$this->setLayout($layout);
+				}
+			}
+		}
+		else
+		{
+			// Merge so that article params take priority
+			$temp->merge($item->params);
+			$item->params = $temp;
+
+			// Check for alternative layouts (since we are not in a single-article menu item)
+			// Single-article menu item layout takes priority over alt layout for an article
+			if ($layout = $item->params->get('article_layout'))
+			{
+				$this->setLayout($layout);
+			}
+		}
+
+		$offset = $this->state->get('list.offset');
+
+		// Check the view access to the article (the model has already computed the values).
+		if ($item->params->get('access-view') != true && (($item->params->get('show_noauth') != true &&  $user->get('guest') )))
+		{
+			JError::raiseWarning(403, JText::_('JERROR_ALERTNOAUTHOR'));
+			return;
+		}
+
+		if ($item->params->get('show_intro', '1') == '1')
+		{
+			$item->text = $item->introtext.' '.$item->fulltext;
+		}
+		elseif ($item->fulltext)
+		{
+			$item->text = $item->fulltext;
+		}
+		else
+		{
+			$item->text = $item->introtext;
+		}
+
+		$item->tags = new JHelperTags;
+		$item->tags->getItemTags('com_content.article', $this->item->id);
+
+		// Process the content plugins.
+
+		JPluginHelper::importPlugin('content');
+		$dispatcher->trigger('onContentPrepare', array ('com_content.article', &$item, &$this->params, $offset));
+
+		$item->event = new stdClass;
+		$results = $dispatcher->trigger('onContentAfterTitle', array('com_content.article', &$item, &$this->params, $offset));
+		$item->event->afterDisplayTitle = trim(implode("\n", $results));
+
+		$results = $dispatcher->trigger('onContentBeforeDisplay', array('com_content.article', &$item, &$this->params, $offset));
+		$item->event->beforeDisplayContent = trim(implode("\n", $results));
+
+		$results = $dispatcher->trigger('onContentAfterDisplay', array('com_content.article', &$item, &$this->params, $offset));
+		$item->event->afterDisplayContent = trim(implode("\n", $results));
+
+		// Increment the hit counter of the article.
+		if (!$this->params->get('intro_only') && $offset == 0)
+		{
+			$model = $this->getModel();
+			$model->hit();
+		}
+
+		//Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($this->item->params->get('pageclass_sfx'));
+
+		$this->_prepareDocument();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 */
+	protected function _prepareDocument()
+	{
+		$app		= JFactory::getApplication();
+		$menus		= $app->getMenu();
+		$pathway	= $app->getPathway();
+		$title		= null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('JGLOBAL_ARTICLES'));
+		}
+
+		$title = $this->params->get('page_title', '');
+
+		$id = (int) @$menu->query['id'];
+
+		// if the menu item does not concern this article
+		if ($menu && ($menu->query['option'] != 'com_content' || $menu->query['view'] != 'article' || $id != $this->item->id))
+		{
+			// If this is not a single article menu item, set the page title to the article title
+			if ($this->item->title)
+			{
+				$title = $this->item->title;
+			}
+			$path = array(array('title' => $this->item->title, 'link' => ''));
+			$category = JCategories::getInstance('Content')->get($this->item->catid);
+
+			while ($category && ($menu->query['option'] != 'com_content' || $menu->query['view'] == 'article' || $id != $category->id) && $category->id > 1)
+			{
+				$path[] = array('title' => $category->title, 'link' => ContentHelperRoute::getCategoryRoute($category->id));
+				$category = $category->getParent();
+			}
+			$path = array_reverse($path);
+
+			foreach ($path as $item)
+			{
+				$pathway->addItem($item['title'], $item['link']);
+			}
+		}
+
+		// Check for empty title and add site name if param is set
+		if (empty($title))
+		{
+			$title = $app->getCfg('sitename');
+		}
+		elseif ($app->getCfg('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->getCfg('sitename'), $title);
+		}
+		elseif ($app->getCfg('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->getCfg('sitename'));
+		}
+
+		if (empty($title))
+		{
+			$title = $this->item->title;
+		}
+		$this->document->setTitle($title);
+
+		if ($this->item->metadesc)
+		{
+			$this->document->setDescription($this->item->metadesc);
+		}
+		elseif (!$this->item->metadesc && $this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->item->metakey)
+		{
+			$this->document->setMetadata('keywords', $this->item->metakey);
+		}
+		elseif (!$this->item->metakey && $this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+
+		if ($app->getCfg('MetaAuthor') == '1')
+		{
+			$this->document->setMetaData('author', $this->item->author);
+		}
+
+		$mdata = $this->item->metadata->toArray();
+
+		foreach ($mdata as $k => $v)
+		{
+			if ($v)
+			{
+				$this->document->setMetadata($k, $v);
+			}
+		}
+
+		// If there is a pagebreak heading or title, add it to the page title
+		if (!empty($this->item->page_title))
+		{
+			$this->item->title = $this->item->title . ' - ' . $this->item->page_title;
+			$this->document->setTitle($this->item->page_title . ' - ' . JText::sprintf('PLG_CONTENT_PAGEBREAK_PAGE_NUM', $this->state->get('list.offset') + 1));
+		}
+
+		if ($this->print)
+		{
+			$this->document->setMetaData('robots', 'noindex, nofollow');
+		}
+	}
+}

components/com_content/views/categories/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

components/com_content/views/categories/tmpl/default.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+JHtml::_('behavior.caption');
+echo JLayoutHelper::render('joomla.content.categories_default', $this);
+echo $this->loadTemplate('items');
+?>
+</div>

components/com_content/views/categories/tmpl/default.xml

@@ -0,0 +1,626 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONTENT_CATEGORIES_VIEW_DEFAULT_TITLE" option="COM_CONTENT_CATEGORIES_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORIES"
+		/>
+		<message>
+			<![CDATA[COM_CONTENT_CATEGORIES_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request"
+		 >
+			<field name="id" type="category"
+				description="JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_DESC"
+				extension="com_content"
+				label="JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL"
+				show_root="true"
+				required="true"
+			/>
+		</fieldset>
+	</fields>
+
+	<!-- Add fields to the parameters object for the layout. -->
+<fields name="params">
+<fieldset name="basic" label="JGLOBAL_CATEGORIES_OPTIONS">
+
+			<field name="show_base_description" type="list"
+				label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
+				description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="categories_description" type="textarea"
+				description="JGLOBAL_FIELD_CATEGORIES_DESC_DESC"
+				label="JGLOBAL_FIELD_CATEGORIES_DESC_LABEL"
+				cols="25"
+				rows="5"
+			/>
+			<field name="maxLevelcat" type="list"
+				description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="-1">JALL</option>
+				<option value="1">J1</option>
+				<option value="2">J2</option>
+				<option value="3">J3</option>
+				<option value="4">J4</option>
+				<option value="5">J5</option>
+			</field>
+
+			<field name="show_empty_categories_cat" type="list"
+
+				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+				description="COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_subcat_desc_cat" type="list"
+
+			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_cat_num_articles_cat" type="list"
+				label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
+				description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+</fieldset>
+
+<fieldset name="category" label="JGLOBAL_CATEGORY_OPTIONS">
+			<field name="spacer3" type="spacer" class="text"
+			label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+			/>
+
+			<field name="show_category_title" type="list"
+				label="JGLOBAL_SHOW_CATEGORY_TITLE"
+				description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_description" type="list"
+				description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_description_image" type="list"
+				description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="maxLevel" type="list"
+				description="JGLOBAL_MAXLEVEL_DESC"
+				label="JGLOBAL_MAXLEVEL_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="-1">JALL</option>
+				<option value="0">JNONE</option>
+				<option value="1">J1</option>
+				<option value="2">J2</option>
+				<option value="3">J3</option>
+				<option value="4">J4</option>
+				<option value="5">J5</option>
+			</field>
+
+			<field name="show_empty_categories" type="list"
+				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+				description="COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_no_articles" type="list"
+				label="COM_CONTENT_NO_ARTICLES_LABEL"
+				description="COM_CONTENT_NO_ARTICLES_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_subcat_desc"
+			type="list"
+			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_cat_num_articles" type="list"
+				label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
+				description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+</fieldset>
+<fieldset name="blog" label="JGLOBAL_BLOG_LAYOUT_OPTIONS">
+				<field name="spacer4" type="spacer" class="text"
+				label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+			/>
+
+			<field name="num_leading_articles" type="text"
+				default="1"
+				description="JGLOBAL_NUM_LEADING_ARTICLES_DESC"
+				label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
+				size="3"
+			/>
+
+			<field name="num_intro_articles" type="text"
+				default="4"
+				description="JGLOBAL_NUM_INTRO_ARTICLES_DESC"
+				label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
+				size="3"
+			/>
+
+			<field name="num_columns" type="text"
+				default="2"
+				description="JGLOBAL_NUM_COLUMNS_DESC"
+				label="JGLOBAL_NUM_COLUMNS_LABEL"
+				size="3"
+			/>
+
+			<field name="num_links" type="text"
+				default="4"
+				description="JGLOBAL_NUM_LINKS_DESC"
+				label="JGLOBAL_NUM_LINKS_LABEL"
+				size="3"
+			/>
+
+			<field name="multi_column_order" type="list"
+				description="JGLOBAL_MULTI_COLUMN_ORDER_DESC"
+				label="JGLOBAL_MULTI_COLUMN_ORDER_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JGLOBAL_DOWN</option>
+				<option value="1">JGLOBAL_ACROSS</option>
+			</field>
+
+			<field name="subcategories" type="spacer" class="spacer"
+					label="JGLOBAL_SUBSLIDER_BLOG_EXTENDED_LABEL"
+			/>
+
+		<field name="show_subcategory_content" type="list"
+
+				description="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_DESC"
+				label="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL"
+			>
+
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JNONE</option>
+				<option value="-1">JALL</option>
+				<option value="1">J1</option>
+				<option value="2">J2</option>
+				<option value="3">J3</option>
+				<option value="4">J4</option>
+				<option value="5">J5</option>
+			</field>
+
+			<field
+			name="spacer5"
+			type="spacer"
+			hr="true"
+			/>
+
+			<field name="orderby_pri" type="list"
+				description="JGLOBAL_CATEGORY_ORDER_DESC"
+				label="JGLOBAL_CATEGORY_ORDER_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="none">JGLOBAL_NO_ORDER</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
+			</field>
+
+			<field name="orderby_sec" type="list"
+				description="JGLOBAL_ARTICLE_ORDER_DESC"
+				label="JGLOBAL_ARTICLE_ORDER_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="front">COM_CONTENT_FEATURED_ORDER</option>
+				<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
+				<option value="date">JGLOBAL_OLDEST_FIRST</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="author">JGLOBAL_AUTHOR_ALPHABETICAL</option>
+				<option value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL</option>
+				<option value="hits">JGLOBAL_MOST_HITS</option>
+				<option value="rhits">JGLOBAL_LEAST_HITS</option>
+				<option value="order">JGLOBAL_ORDERING</option>
+			</field>
+
+			<field name="order_date" type="list"
+				description="JGLOBAL_ORDERING_DATE_DESC"
+				label="JGLOBAL_ORDERING_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="created">JGLOBAL_CREATED</option>
+				<option value="modified">JGLOBAL_MODIFIED</option>
+				<option value="published">JPUBLISHED</option>
+			</field>
+
+			<field name="show_pagination" type="list"
+				description="JGLOBAL_PAGINATION_DESC"
+				label="JGLOBAL_PAGINATION_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
+
+			<field name="show_pagination_results" type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC">
+
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+
+</fieldset>
+
+
+<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS" >
+			<field name="spacer6" type="spacer" class="text"
+					label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+			/>
+
+			<field name="show_pagination_limit" type="list"
+				description="JGLOBAL_DISPLAY_SELECT_DESC"
+				label="JGLOBAL_DISPLAY_SELECT_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="filter_field" type="list"
+				description="JGLOBAL_FILTER_FIELD_DESC"
+				label="JGLOBAL_FILTER_FIELD_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="hide">JHIDE</option>
+				<option value="title">JGLOBAL_TITLE</option>
+				<option value="author">JAUTHOR</option>
+				<option value="hits">JGLOBAL_HITS</option>
+			</field>
+
+			<field name="show_headings" type="list"
+				description="JGLOBAL_SHOW_HEADINGS_DESC"
+				label="JGLOBAL_SHOW_HEADINGS_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="list_show_date" type="list"
+				description="JGLOBAL_SHOW_DATE_DESC"
+				label="JGLOBAL_SHOW_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="created">JGLOBAL_CREATED</option>
+				<option value="modified">JGLOBAL_MODIFIED</option>
+				<option value="published">JPUBLISHED</option>
+			</field>
+
+			<field name="date_format" type="text"
+				description="JGLOBAL_DATE_FORMAT_DESC"
+				label="JGLOBAL_DATE_FORMAT_LABEL"
+				size="15"
+			/>
+
+             <field name="list_show_hits" type="list"
+				description="JGLOBAL_LIST_HITS_DESC"
+				label="JGLOBAL_LIST_HITS_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="list_show_author" type="list"
+				description="JGLOBAL_LIST_AUTHOR_DESC"
+				label="JGLOBAL_LIST_AUTHOR_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_pagination" type="list"
+				description="JGLOBAL_PAGINATION_DESC"
+				label="JGLOBAL_PAGINATION_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
+
+			<field name="show_pagination_results" type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC">
+
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+		</field>
+		<field name="display_num" type="list"
+				default="10"
+				description="JGLOBAL_NUMBER_ITEMS_LIST_DESC"
+				label="JGLOBAL_NUMBER_ITEMS_LIST_LABEL">
+				<option value="5">J5</option>
+				<option value="10">J10</option>
+				<option value="15">J15</option>
+				<option value="20">J20</option>
+				<option value="25">J25</option>
+				<option value="30">J30</option>
+				<option value="50">J50</option>
+				<option value="100">J100</option>
+				<option value="0">JALL</option>
+		</field>
+
+	</fieldset>
+
+	<fieldset name="article" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
+			<field name="show_title" type="list"
+				description="JGLOBAL_SHOW_TITLE_DESC"
+				label="JGLOBAL_SHOW_TITLE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="link_titles" type="list"
+				description="JGLOBAL_LINKED_TITLES_DESC"
+				label="JGLOBAL_LINKED_TITLES_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field name="show_intro" type="list"
+				description="JGLOBAL_SHOW_INTRO_DESC"
+				label="JGLOBAL_SHOW_INTRO_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_category" type="list"
+				description="JGLOBAL_SHOW_CATEGORY_DESC"
+				label="JGLOBAL_SHOW_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="link_category" type="list"
+				description="JGLOBAL_LINK_CATEGORY_DESC"
+				label="JGLOBAL_LINK_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JNo</option>
+				<option value="1">JYes</option>
+			</field>
+
+			<field name="show_parent_category" type="list"
+				description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"
+				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="link_parent_category" type="list"
+				description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"
+				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JNo</option>
+				<option value="1">JYes</option>
+			</field>
+
+			<field name="show_author" type="list"
+				description="JGLOBAL_Show_Author_Desc"
+				label="JGLOBAL_Show_Author_Label"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="link_author" type="list"
+				description="JGLOBAL_Link_Author_Desc"
+				label="JGLOBAL_Link_Author_Label"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JNo</option>
+				<option value="1">JYes</option>
+			</field>
+
+			<field name="show_create_date" type="list"
+				description="JGLOBAL_Show_Create_Date_Desc"
+				label="JGLOBAL_Show_Create_Date_Label"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_modify_date" type="list"
+				description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
+				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_publish_date" type="list"
+				description="JGLOBAL_Show_Publish_Date_Desc"
+				label="JGLOBAL_Show_Publish_Date_Label"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_item_navigation" type="list"
+				description="JGLOBAL_SHOW_NAVIGATION_DESC"
+				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+			name="show_vote"
+			type="list"
+			label="JGLOBAL_SHOW_VOTE_LABEL"
+			description="JGLOBAL_SHOW_VOTE_DESC"
+		>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option	value="1">JSHOW</option>
+		</field>
+
+			<field
+				name="show_readmore"
+				type="list"
+				description="JGLOBAL_SHOW_READMORE_DESC"
+				label="JGLOBAL_SHOW_READMORE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_readmore_title"
+				type="list"
+				label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
+				description="JGLOBAL_SHOW_READMORE_TITLE_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_icons" type="list"
+				description="JGLOBAL_SHOW_ICONS_DESC"
+				label="JGLOBAL_SHOW_ICONS_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_print_icon" type="list"
+				description="JGLOBAL_SHOW_PRINT_ICON_DESC"
+				label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_email_icon" type="list"
+				description="JGLOBAL_SHOW_EMAIL_ICON_DESC"
+				label="JGLOBAL_SHOW_EMAIL_ICON_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_hits" type="list"
+				description="JGLOBAL_SHOW_HITS_DESC"
+				label="JGLOBAL_SHOW_HITS_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+			name="show_noauth"
+			type="list"
+			label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
+			description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC">
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+		</field>
+	</fieldset>
+	<fieldset name="integration"
+		>
+
+			<field name="show_feed_link" type="list"
+				description="JGLOBAL_SHOW_FEED_LINK_DESC"
+				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="feed_summary" type="list"
+				description="JGLOBAL_FEED_SUMMARY_DESC"
+				label="JGLOBAL_FEED_SUMMARY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JGLOBAL_INTRO_TEXT</option>
+				<option value="1">JGLOBAL_FULL_TEXT</option>
+			</field>
+		</fieldset>
+</fields>
+</metadata>

components/com_content/views/categories/tmpl/default_items.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$class = ' class="first"';
+JHtml::_('bootstrap.tooltip');
+$lang	= JFactory::getLanguage();
+
+if (count($this->items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) :
+?>
+	<?php foreach($this->items[$this->parent->id] as $id => $item) : ?>
+		<?php
+		if ($this->params->get('show_empty_categories_cat') || $item->numitems || count($item->getChildren())) :
+		if (!isset($this->items[$this->parent->id][$id + 1]))
+		{
+			$class = ' class="last"';
+		}
+		?>
+		<div <?php echo $class; ?> >
+		<?php $class = ''; ?>
+			<h3 class="page-header item-title">
+				<a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($item->id));?>">
+				<?php echo $this->escape($item->title); ?></a>
+				<?php if ($this->params->get('show_cat_num_articles_cat') == 1) :?>
+					<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::tooltipText('COM_CONTENT_NUM_ITEMS'); ?>">
+						<?php echo $item->numitems; ?>
+					</span>
+				<?php endif; ?>
+				<?php if (count($item->getChildren()) > 0) : ?>
+					<a href="#category-<?php echo $item->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
+				<?php endif;?>
+			</h3>
+			<?php if ($this->params->get('show_description_image') && $item->getParams()->get('image')) : ?>
+				<img src="<?php echo $item->getParams()->get('image'); ?>"/>
+			<?php endif; ?>
+			<?php if ($this->params->get('show_subcat_desc_cat') == 1) :?>
+				<?php if ($item->description) : ?>
+					<div class="category-desc">
+						<?php echo JHtml::_('content.prepare', $item->description, '', 'com_content.categories'); ?>
+					</div>
+				<?php endif; ?>
+			<?php endif; ?>
+
+			<?php if (count($item->getChildren()) > 0) :?>
+				<div class="collapse fade" id="category-<?php echo $item->id;?>">
+				<?php
+				$this->items[$item->id] = $item->getChildren();
+				$this->parent = $item;
+				$this->maxLevelcat--;
+				echo $this->loadTemplate('items');
+				$this->parent = $item->getParent();
+				$this->maxLevelcat++;
+				?>
+				</div>
+			<?php endif; ?>
+		</div>
+		<?php endif; ?>
+	<?php endforeach; ?>
+<?php endif; ?>

components/com_content/views/categories/tmpl/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

components/com_content/views/categories/view.html.php

@@ -0,0 +1,124 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Content categories view.
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.5
+ */
+class ContentViewCategories extends JViewLegacy
+{
+	protected $state = null;
+
+	protected $item = null;
+
+	protected $items = null;
+
+	/**
+	 * Display the view
+	 *
+	 * @return  mixed  False on error, null otherwise.
+	 */
+	public function display($tpl = null)
+	{
+		$state		= $this->get('State');
+		$items		= $this->get('Items');
+		$parent		= $this->get('Parent');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseWarning(500, implode("\n", $errors));
+			return false;
+		}
+
+		if ($items === false)
+		{
+			JError::raiseError(404, JText::_('COM_CONTENT_ERROR_CATEGORY_NOT_FOUND'));
+			return false;
+		}
+
+		if ($parent == false)
+		{
+			JError::raiseError(404, JText::_('COM_CONTENT_ERROR_PARENT_CATEGORY_NOT_FOUND'));
+			return false;
+		}
+
+		$params = &$state->params;
+
+		$items = array($parent->id => $items);
+
+		//Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
+
+		$this->maxLevelcat = $params->get('maxLevelcat', -1);
+		$this->params = &$params;
+		$this->parent = &$parent;
+		$this->items  = &$items;
+
+		$this->_prepareDocument();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 */
+	protected function _prepareDocument()
+	{
+		$app	= JFactory::getApplication();
+		$menus	= $app->getMenu();
+		$title	= null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('JGLOBAL_ARTICLES'));
+		}
+		$title = $this->params->get('page_title', '');
+		if (empty($title))
+		{
+			$title = $app->getCfg('sitename');
+		}
+		elseif ($app->getCfg('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->getCfg('sitename'), $title);
+		}
+		elseif ($app->getCfg('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->getCfg('sitename'));
+		}
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+	}
+}

components/com_content/views/category/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

components/com_content/views/category/metadata.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<view
+		title="Category">
+		<message><![CDATA[TYPECATEGLAYDESC]]></message>
+	</view>
+</metadata>

components/com_content/views/category/tmpl/blog.php

@@ -0,0 +1,109 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers');
+
+JHtml::_('behavior.caption');
+?>
+<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>
+		<?php endif; ?>
+	</h2>
+	<?php endif; ?>
+
+	<?php if ($this->params->get('show_tags', 1) && !empty($this->category->tags->itemTags)) : ?>
+		<?php $this->category->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
+		<?php echo $this->category->tagLayout->render($this->category->tags->itemTags); ?>
+	<?php endif; ?>
+
+	<?php if ($this->params->get('show_description', 1) || $this->params->def('show_description_image', 1)) : ?>
+	<div class="category-desc clearfix">
+		<?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>
+	<?php endif; ?>
+	<?php $leadingcount = 0; ?>
+	<?php if (!empty($this->lead_items)) : ?>
+	<div class="items-leading clearfix">
+		<?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');
+			?>
+		</div>
+		<?php
+			$leadingcount++;
+		?>
+		<?php endforeach; ?>
+	</div><!-- end items-leading -->
+	<?php endif; ?>
+	<?php
+	$introcount = (count($this->intro_items));
+	$counter = 0;
+?>
+	<?php if (!empty($this->intro_items)) : ?>
+	<?php foreach ($this->intro_items as $key => &$item) : ?>
+	<?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 clearfix">
+		<?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');
+				?>
+				</div><!-- end item -->
+				<?php $counter++; ?>
+			</div><!-- end span -->
+			<?php if (($rowcount == $this->columns) or ($counter == $introcount)) : ?>
+		</div><!-- end row -->
+			<?php endif; ?>
+	<?php endforeach; ?>
+	<?php endif; ?>
+
+	<?php if (!empty($this->link_items)) : ?>
+	<div class="items-more">
+	<?php echo $this->loadTemplate('links'); ?>
+	</div>
+	<?php endif; ?>
+	<?php if (!empty($this->children[$this->category->id])&& $this->maxLevel != 0) : ?>
+	<div class="cat-children">
+	<?php if ($this->params->get('show_category_heading_title_text', 1) == 1) : ?>
+		<h3> <?php echo JTEXT::_('JGLOBAL_SUBCATEGORIES'); ?> </h3>
+	<?php endif; ?>
+		<?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>

components/com_content/views/category/tmpl/blog.xml

@@ -0,0 +1,502 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONTENT_CATEGORY_VIEW_BLOG_TITLE" option="COM_CONTENT_CATEGORY_VIEW_BLOG_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORY_BLOG"
+		/>
+		<message>
+			<![CDATA[COM_CONTENT_CATEGORY_VIEW_BLOG_DESC]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request"
+		 >
+
+			<field name="id" type="category"
+				description="JGLOBAL_CHOOSE_CATEGORY_DESC"
+				extension="com_content"
+				label="JGLOBAL_CHOOSE_CATEGORY_LABEL"
+				required="true"
+			/>
+		</fieldset>
+	</fields>
+
+	<!-- Add fields to the parameters object for the layout. -->
+<fields name="params">
+<fieldset name="basic" label="JGLOBAL_CATEGORY_OPTIONS">
+
+			<field name="layout_type"
+				type="hidden"
+				default="blog"
+			/>
+		  	<field name="show_category_heading_title_text"
+				type="list"
+ 				label="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+		</field>
+			<field name="show_category_title" type="list"
+				label="JGLOBAL_SHOW_CATEGORY_TITLE"
+				description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_description" type="list"
+				description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_description_image" type="list"
+				description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="maxLevel" type="list"
+				description="JGLOBAL_MAXLEVEL_DESC"
+				label="JGLOBAL_MAXLEVEL_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="-1">JALL</option>
+				<option value="0">JNONE</option>
+				<option value="1">J1</option>
+				<option value="2">J2</option>
+				<option value="3">J3</option>
+				<option value="4">J4</option>
+				<option value="5">J5</option>
+			</field>
+
+			<field name="show_empty_categories" type="list"
+				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+				description="COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_no_articles" type="list"
+				label="COM_CONTENT_NO_ARTICLES_LABEL"
+				description="COM_CONTENT_NO_ARTICLES_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_subcat_desc" type="list"
+			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_cat_num_articles" type="list"
+				label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
+				description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="page_subheading" type="text"
+				description="JGLOBAL_SUBHEADING_DESC"
+				label="JGLOBAL_SUBHEADING_LABEL"
+				size="20"
+			/>
+
+</fieldset>
+
+<fieldset name="advanced" label="JGLOBAL_BLOG_LAYOUT_OPTIONS">
+
+			<field name="bloglayout" type="spacer" class="text"
+					label="JGLOBAL_SUBSLIDER_BLOG_LAYOUT_LABEL"
+			/>
+
+
+			<field name="num_leading_articles" type="text"
+				description="JGLOBAL_NUM_LEADING_ARTICLES_DESC"
+				label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
+				size="3"
+			/>
+
+			<field name="num_intro_articles" type="text"
+				description="JGLOBAL_NUM_INTRO_ARTICLES_DESC"
+				label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
+				size="3"
+			/>
+
+			<field name="num_columns" type="text"
+				description="JGLOBAL_NUM_COLUMNS_DESC"
+				label="JGLOBAL_NUM_COLUMNS_LABEL"
+				size="3"
+			/>
+
+			<field name="num_links" type="text"
+				description="JGLOBAL_NUM_LINKS_DESC"
+				label="JGLOBAL_NUM_LINKS_LABEL"
+				size="3"
+			/>
+
+			<field name="multi_column_order" type="list"
+				description="JGLOBAL_MULTI_COLUMN_ORDER_DESC"
+				label="JGLOBAL_MULTI_COLUMN_ORDER_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JGLOBAL_DOWN</option>
+				<option value="1">JGLOBAL_ACROSS</option>
+			</field>
+			<field name="subcategories" type="spacer" class="spacer"
+					label="JGLOBAL_SUBSLIDER_BLOG_EXTENDED_LABEL"
+			/>
+
+		<field name="show_subcategory_content" type="list"
+
+				description="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_DESC"
+				label="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JNONE</option>
+				<option value="-1">JALL</option>
+				<option value="1">J1</option>
+				<option value="2">J2</option>
+				<option value="3">J3</option>
+				<option value="4">J4</option>
+				<option value="5">J5</option>
+			</field>
+
+			<field
+			name="spacer1"
+			type="spacer"
+			hr="true"
+			/>
+
+			<field name="orderby_pri" type="list"
+				description="JGLOBAL_CATEGORY_ORDER_DESC"
+				label="JGLOBAL_CATEGORY_ORDER_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="none">JGLOBAL_NO_ORDER</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
+			</field>
+
+			<field name="orderby_sec" type="list"
+				description="JGLOBAL_ARTICLE_ORDER_DESC"
+				label="JGLOBAL_ARTICLE_ORDER_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="front">COM_CONTENT_FEATURED_ORDER</option>
+				<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
+				<option value="date">JGLOBAL_OLDEST_FIRST</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="author">JGLOBAL_AUTHOR_ALPHABETICAL</option>
+				<option value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL</option>
+				<option value="hits">JGLOBAL_MOST_HITS</option>
+				<option value="rhits">JGLOBAL_LEAST_HITS</option>
+				<option value="order">JGLOBAL_ORDERING</option>
+			</field>
+
+			<field name="order_date" type="list"
+				description="JGLOBAL_ORDERING_DATE_DESC"
+				label="JGLOBAL_ORDERING_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="created">JGLOBAL_CREATED</option>
+				<option value="modified">JGLOBAL_MODIFIED</option>
+				<option value="published">JPUBLISHED</option>
+			</field>
+
+			<field name="show_pagination" type="list"
+				description="JGLOBAL_PAGINATION_DESC"
+				label="JGLOBAL_PAGINATION_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
+
+			<field name="show_pagination_results" type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC">
+
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+</fieldset>
+
+<fieldset name="article" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
+			<field name="show_title" type="list"
+				description="JGLOBAL_SHOW_TITLE_DESC"
+				label="JGLOBAL_SHOW_TITLE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="link_titles" type="list"
+				description="JGLOBAL_LINKED_TITLES_DESC"
+				label="JGLOBAL_LINKED_TITLES_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field name="show_intro" type="list"
+				description="JGLOBAL_SHOW_INTRO_DESC"
+				label="JGLOBAL_SHOW_INTRO_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="info_block_position"
+				type="list"
+				default=""
+				label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
+				description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC">
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
+				<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
+				<option value="2">COM_CONTENT_FIELD_OPTION_SPLIT</option>
+			</field>
+
+			<field name="show_category" type="list"
+				description="JGLOBAL_SHOW_CATEGORY_DESC"
+				label="JGLOBAL_SHOW_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="link_category" type="list"
+				description="JGLOBAL_LINK_CATEGORY_DESC"
+				label="JGLOBAL_LINK_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field name="show_parent_category" type="list"
+				description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"
+				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="link_parent_category" type="list"
+				description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"
+				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field name="show_author" type="list"
+				description="JGLOBAL_SHOW_AUTHOR_DESC"
+				label="JGLOBAL_SHOW_AUTHOR_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="link_author" type="list"
+				description="JGLOBAL_LINK_AUTHOR_DESC"
+				label="JGLOBAL_LINK_AUTHOR_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNo</option>
+				<option value="1">JYes</option>
+			</field>
+
+			<field name="show_create_date" type="list"
+				description="JGLOBAL_SHOW_CREATE_DATE_DESC"
+				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_modify_date" type="list"
+				description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
+				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_publish_date" type="list"
+				description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
+				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_item_navigation" type="list"
+				description="JGLOBAL_SHOW_NAVIGATION_DESC"
+				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+
+			<field
+			name="show_vote" type="list"
+			label="JGLOBAL_SHOW_VOTE_LABEL"
+			description="JGLOBAL_SHOW_VOTE_DESC"
+		>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+			<option value="0">JHIDE</option>
+			<option	value="1">JSHOW</option>
+		</field>
+
+			<field
+				name="show_readmore"
+				type="list"
+				description="JGLOBAL_SHOW_READMORE_DESC"
+				label="JGLOBAL_SHOW_READMORE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_readmore_title"
+				type="list"
+				label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
+				description="JGLOBAL_SHOW_READMORE_TITLE_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_icons" type="list"
+				description="JGLOBAL_SHOW_ICONS_DESC"
+				label="JGLOBAL_SHOW_ICONS_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_print_icon" type="list"
+				description="JGLOBAL_SHOW_PRINT_ICON_DESC"
+				label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_email_icon" type="list"
+				description="JGLOBAL_Show_Email_Icon_Desc"
+				label="JGLOBAL_Show_Email_Icon_Label"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_hits" type="list"
+				description="JGLOBAL_SHOW_HITS_DESC"
+				label="JGLOBAL_SHOW_HITS_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_noauth" type="list"
+				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
+				label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+</fieldset>
+		<fieldset name="integration"
+		>
+
+			<field name="show_feed_link" type="list"
+				description="JGLOBAL_SHOW_FEED_LINK_DESC"
+				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="feed_summary" type="list"
+				description="JGLOBAL_FEED_SUMMARY_DESC"
+				label="JGLOBAL_FEED_SUMMARY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JGLOBAL_INTRO_TEXT</option>
+				<option value="1">JGLOBAL_FULL_TEXT</option>
+			</field>
+		</fieldset>
+</fields>
+</metadata>

components/com_content/views/category/tmpl/blog_children.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+
+$lang	= JFactory::getLanguage();
+$class = ' class="first"';
+
+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())) :
+			if (!isset($this->children[$this->category->id][$id + 1])) :
+				$class = ' class="last"';
+			endif;
+		?>
+		<div<?php echo $class; ?>>
+			<?php $class = ''; ?>
+			<?php if ($lang->isRTL()) : ?>
+			<h3 class="page-header item-title">
+				<?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
+					<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::tooltipText('COM_CONTENT_NUM_ITEMS'); ?>">
+						<?php echo $child->getNumItems(true); ?>
+					</span>
+				<?php endif; ?>
+				<a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id)); ?>">
+				<?php echo $this->escape($child->title); ?></a>
+
+				<?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"><span class="icon-plus"></span></a>
+				<?php endif;?>
+			</h3>
+			<?php else : ?>
+			<h3 class="page-header item-title"><a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id));?>">
+				<?php echo $this->escape($child->title); ?></a>
+				<?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
+					<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::tooltipText('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"><span class="icon-plus"></span></a>
+				<?php endif;?>
+			<?php endif;?>
+			</h3>
+
+			<?php if ($this->params->get('show_subcat_desc') == 1) : ?>
+			<?php if ($child->description) : ?>
+				<div class="category-desc">
+					<?php echo JHtml::_('content.prepare', $child->description, '', 'com_content.category'); ?>
+				</div>
+			<?php endif; ?>
+			<?php endif; ?>
+
+			<?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--;
+				if ($this->maxLevel != 0) :
+					echo $this->loadTemplate('children');
+				endif;
+				$this->category = $child->getParent();
+				$this->maxLevel++;
+				?>
+			</div>
+			<?php endif; ?>
+		</div>
+		<?php endif; ?>
+	<?php endforeach; ?>
+
+<?php endif;

components/com_content/views/category/tmpl/blog_item.php

@@ -0,0 +1,79 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;?>
+<?php
+// Create a shortcut for params.
+$params = $this->item->params;
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+$canEdit = $this->item->params->get('access-edit');
+JHtml::_('behavior.framework');
+?>
+<?php if ($this->item->state == 0) : ?>
+	<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+<?php endif; ?>
+
+<?php echo JLayoutHelper::render('joomla.content.blog_style_default_item_title', $this->item); ?>
+
+<?php echo JLayoutHelper::render('joomla.content.icons', array('params' => $params, 'item' => $this->item, 'print' => false)); ?>
+
+<?php // Todo Not that elegant would be nice to group the params ?>
+<?php $useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date')
+	|| $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author') ); ?>
+
+<?php if ($useDefList) : ?>
+	<?php echo JLayoutHelper::render('joomla.content.info_block.block', array('item' => $this->item, 'params' => $params, 'position' => 'above')); ?>
+<?php endif; ?>
+
+<?php echo JLayoutHelper::render('joomla.content.intro_image', $this->item); ?>
+
+
+<?php if (!$params->get('show_intro')) : ?>
+	<?php echo $this->item->event->afterDisplayTitle; ?>
+<?php endif; ?>
+<?php echo $this->item->event->beforeDisplayContent; ?> <?php echo $this->item->introtext; ?>
+
+<?php if ($useDefList) : ?>
+	<?php echo JLayoutHelper::render('joomla.content.info_block.block', array('item' => $this->item, 'params' => $params, 'position' => 'below')); ?>
+<?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 :
+		$menu = JFactory::getApplication()->getMenu();
+		$active = $menu->getActive();
+		$itemId = $active->id;
+		$link1 = JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId);
+		$returnURL = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid));
+		$link = new JUri($link1);
+		$link->setVar('return', base64_encode($returnURL));
+	endif; ?>
+
+	<p class="readmore"><a class="btn" href="<?php echo $link; ?>"> <span class="icon-chevron-right"></span>
+
+	<?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>
+
+<?php endif; ?>
+
+<?php echo $this->item->event->afterDisplayContent; ?>

components/com_content/views/category/tmpl/blog_links.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+
+
+<div class="items-more">
+<ol class="nav nav-tabs nav-stacked">
+<?php
+	foreach ($this->link_items as &$item) :
+?>
+	<li>
+		<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catid)); ?>">
+			<?php echo $item->title; ?></a>
+	</li>
+<?php endforeach; ?>
+</ol>
+</div>

components/com_content/views/category/tmpl/default.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers');
+
+JHtml::_('behavior.caption');
+?>
+<div class="category-list<?php echo $this->pageclass_sfx;?>">
+
+<?php
+$this->subtemplatename = 'articles';
+echo JLayoutHelper::render('joomla.content.category_default', $this);
+?>
+
+</div>

components/com_content/views/category/tmpl/default.xml

@@ -0,0 +1,483 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONTENT_CATEGORY_VIEW_DEFAULT_TITLE" option="COM_CONTENT_CATEGORY_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_ARTICLE_CATEGORY_LIST"
+		/>
+		<message>
+			<![CDATA[COM_CONTENT_CATEGORY_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+
+	<!-- Add fields to the request variables for the layout. -->
+	<fields name="request">
+		<fieldset name="request"
+		>
+
+			<field name="id" type="category"
+				description="JGLOBAL_CHOOSE_CATEGORY_DESC"
+				extension="com_content"
+				label="JGLOBAL_CHOOSE_CATEGORY_LABEL"
+				required="true"
+			/>
+		</fieldset>
+	</fields>
+
+	<!-- Add fields to the parameters object for the layout. -->
+<fields name="params">
+<fieldset name="basic" label="JGLOBAL_CATEGORY_OPTIONS">
+
+			<field name="show_category_title" type="list"
+				label="JGLOBAL_SHOW_CATEGORY_TITLE"
+				description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_description" type="list"
+				description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_description_image" type="list"
+				description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="maxLevel" type="list"
+				description="JGLOBAL_MAXLEVEL_DESC"
+				label="JGLOBAL_MAXLEVEL_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="-1">JALL</option>
+				<option value="0">JNONE</option>
+				<option value="1">J1</option>
+				<option value="2">J2</option>
+				<option value="3">J3</option>
+				<option value="4">J4</option>
+				<option value="5">J5</option>
+			</field>
+
+			<field name="show_empty_categories" type="list"
+				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+				description="COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_no_articles" type="list"
+				label="COM_CONTENT_NO_ARTICLES_LABEL"
+				description="COM_CONTENT_NO_ARTICLES_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field name="show_category_heading_title"
+					type="list"
+ 					label="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_LABEL"
+					description="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_DESC">
+					<option value="">JGLOBAL_USE_GLOBAL</option>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+			</field>
+			<field name="show_subcat_desc" type="list"
+			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_cat_num_articles" type="list"
+				label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL"
+				description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="page_subheading" type="text"
+				description="JGLOBAL_SUBHEADING_DESC"
+				label="JGLOBAL_SUBHEADING_LABEL"
+				size="20"
+			/>
+
+</fieldset>
+
+<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
+
+			<field name="show_pagination_limit" type="list"
+				description="JGLOBAL_DISPLAY_SELECT_DESC"
+				label="JGLOBAL_DISPLAY_SELECT_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="filter_field" type="list"
+				description="JGLOBAL_FILTER_FIELD_DESC"
+				label="JGLOBAL_FILTER_FIELD_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="hide">JHIDE</option>
+				<option value="title">JGLOBAL_TITLE</option>
+				<option value="author">JAUTHOR</option>
+				<option value="hits">JGLOBAL_HITS</option>
+			</field>
+
+			<field name="show_headings" type="list"
+				description="JGLOBAL_SHOW_HEADINGS_DESC"
+				label="JGLOBAL_SHOW_HEADINGS_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="list_show_date" type="list"
+				description="JGLOBAL_SHOW_DATE_DESC"
+				label="JGLOBAL_SHOW_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="created">JGLOBAL_CREATED</option>
+				<option value="modified">JGLOBAL_MODIFIED</option>
+				<option value="published">JPUBLISHED</option>
+			</field>
+
+			<field name="date_format" type="text"
+				description="JGLOBAL_DATE_FORMAT_DESC"
+				label="JGLOBAL_DATE_FORMAT_LABEL"
+				size="15"
+			/>
+
+			<field name="list_show_hits" type="list"
+				description="JGLOBAL_LIST_HITS_DESC"
+				label="JGLOBAL_LIST_HITS_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="list_show_author" type="list"
+				description="JGLOBAL_LIST_AUTHOR_DESC"
+				label="JGLOBAL_LIST_AUTHOR_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+			name="spacer1"
+			type="spacer"
+			hr="true"
+			/>
+
+			<field name="orderby_pri" type="list"
+				description="JGLOBAL_CATEGORY_ORDER_DESC"
+				label="JGLOBAL_CATEGORY_ORDER_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="none">JGLOBAL_NO_ORDER</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
+			</field>
+
+			<field name="orderby_sec" type="list"
+				description="JGLOBAL_ARTICLE_ORDER_DESC"
+				label="JGLOBAL_ARTICLE_ORDER_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="front">COM_CONTENT_FEATURED_ORDER</option>
+				<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
+				<option value="date">JGLOBAL_OLDEST_FIRST</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="author">JGLOBAL_AUTHOR_ALPHABETICAL</option>
+				<option value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL</option>
+				<option value="hits">JGLOBAL_MOST_HITS</option>
+				<option value="rhits">JGLOBAL_LEAST_HITS</option>
+				<option value="order">JGLOBAL_ORDERING</option>
+			</field>
+
+			<field name="order_date" type="list"
+				description="JGLOBAL_ORDERING_DATE_DESC"
+				label="JGLOBAL_ORDERING_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="created">JGLOBAL_CREATED</option>
+				<option value="modified">JGLOBAL_MODIFIED</option>
+				<option value="published">JPUBLISHED</option>
+			</field>
+
+			<field name="show_pagination" type="list"
+				description="JGLOBAL_PAGINATION_DESC"
+				label="JGLOBAL_PAGINATION_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
+
+			<field name="show_pagination_results" type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC">
+
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+		</field>
+		<field name="display_num" type="list"
+				default="10"
+				description="JGLOBAL_NUMBER_ITEMS_LIST_DESC"
+				label="JGLOBAL_NUMBER_ITEMS_LIST_LABEL">
+				<option value="5">J5</option>
+				<option value="10">J10</option>
+				<option value="15">J15</option>
+				<option value="20">J20</option>
+				<option value="25">J25</option>
+				<option value="30">J30</option>
+				<option value="50">J50</option>
+				<option value="100">J100</option>
+				<option value="0">JALL</option>
+		</field>
+
+</fieldset>
+
+<fieldset name="article" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
+			<field name="show_title" type="list"
+				description="JGLOBAL_SHOW_TITLE_DESC"
+				label="JGLOBAL_SHOW_TITLE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="link_titles" type="list"
+				description="JGLOBAL_LINKED_TITLES_DESC"
+				label="JGLOBAL_LINKED_TITLES_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field name="show_intro" type="list"
+				description="JGLOBAL_SHOW_INTRO_DESC"
+				label="JGLOBAL_SHOW_INTRO_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_category" type="list"
+				description="JGLOBAL_SHOW_CATEGORY_DESC"
+				label="JGLOBAL_SHOW_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="link_category" type="list"
+				description="JGLOBAL_LINK_CATEGORY_DESC"
+				label="JGLOBAL_LINK_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field name="show_parent_category" type="list"
+				description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"
+				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="link_parent_category" type="list"
+				description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"
+				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field name="show_author" type="list"
+				description="JGLOBAL_SHOW_AUTHOR_DESC"
+				label="JGLOBAL_SHOW_AUTHOR_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="link_author" type="list"
+				description="JGLOBAL_LINK_AUTHOR_DESC"
+				label="JGLOBAL_LINK_AUTHOR_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JNo</option>
+				<option value="1">JYes</option>
+			</field>
+
+			<field name="show_create_date" type="list"
+				description="JGLOBAL_SHOW_CREATE_DATE_DESC"
+				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_modify_date" type="list"
+				description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
+				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_publish_date" type="list"
+				description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
+				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_item_navigation" type="list"
+				description="JGLOBAL_SHOW_NAVIGATION_DESC"
+				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+			<field
+			name="show_vote" type="list"
+			label="JGLOBAL_SHOW_VOTE_LABEL"
+			description="JGLOBAL_SHOW_VOTE_DESC"
+		>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option	value="1">JSHOW</option>
+		</field>
+
+			<field
+				name="show_readmore"
+				type="list"
+				description="JGLOBAL_SHOW_READMORE_DESC"
+				label="JGLOBAL_SHOW_READMORE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_readmore_title"
+				type="list"
+				label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
+				description="JGLOBAL_SHOW_READMORE_TITLE_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_icons" type="list"
+				description="JGLOBAL_SHOW_ICONS_DESC"
+				label="JGLOBAL_SHOW_ICONS_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_print_icon" type="list"
+				description="JGLOBAL_SHOW_PRINT_ICON_DESC"
+				label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_email_icon" type="list"
+				description="JGLOBAL_SHOW_EMAIL_ICON_DESC"
+				label="JGLOBAL_SHOW_EMAIL_ICON_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_hits" type="list"
+				description="JGLOBAL_SHOW_HITS_DESC"
+				label="JGLOBAL_SHOW_HITS_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_noauth" type="list"
+				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
+				label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+</fieldset>
+		<fieldset name="integration"
+		>
+
+			<field name="show_feed_link" type="list"
+				description="JGLOBAL_SHOW_FEED_LINK_DESC"
+				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="feed_summary" type="list"
+				description="JGLOBAL_FEED_SUMMARY_DESC"
+				label="JGLOBAL_FEED_SUMMARY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JGLOBAL_INTRO_TEXT</option>
+				<option value="1">JGLOBAL_FULL_TEXT</option>
+			</field>
+		</fieldset>
+</fields>
+</metadata>

components/com_content/views/category/tmpl/default_articles.php

@@ -0,0 +1,207 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+
+JHtml::_('behavior.framework');
+
+// Create some shortcuts.
+$params		= &$this->item->params;
+$n			= count($this->items);
+$listOrder	= $this->escape($this->state->get('list.ordering'));
+$listDirn	= $this->escape($this->state->get('list.direction'));
+
+// check for at least one editable article
+$isEditable = false;
+if (!empty($this->items))
+{
+	foreach ($this->items as $article)
+	{
+		if ($article->params->get('access-edit'))
+		{
+			$isEditable = true;
+			break;
+		}
+	}
+}
+?>
+
+<?php if (empty($this->items)) : ?>
+
+	<?php if ($this->params->get('show_no_articles', 1)) : ?>
+	<p><?php echo JText::_('COM_CONTENT_NO_ARTICLES'); ?></p>
+	<?php endif; ?>
+
+<?php else : ?>
+
+<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 btn-toolbar clearfix">
+		<?php if ($this->params->get('filter_field') != 'hide') :?>
+			<div class="btn-group">
+				<label class="filter-search-lbl element-invisible" 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'); ?>" placeholder="<?php echo JText::_('COM_CONTENT_'.$this->params->get('filter_field').'_FILTER_LABEL'); ?>" />
+			</div>
+		<?php endif; ?>
+		<?php if ($this->params->get('show_pagination_limit')) : ?>
+			<div class="btn-group pull-right">
+				<label for="limit" class="element-invisible">
+					<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>
+				</label>
+				<?php echo $this->pagination->getLimitBox(); ?>
+			</div>
+		<?php endif; ?>
+
+		<input type="hidden" name="filter_order" value="" />
+		<input type="hidden" name="filter_order_Dir" value="" />
+		<input type="hidden" name="limitstart" value="" />
+		<input type="hidden" name="task" value="" />
+	</fieldset>
+	<?php endif; ?>
+
+	<table class="category table table-striped table-bordered table-hover">
+		<?php if ($this->params->get('show_headings')) : ?>
+		<thead>
+			<tr>
+				<th id="categorylist_header_title">
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+				</th>
+				<?php if ($date = $this->params->get('list_show_date')) : ?>
+					<th id="categorylist_header_date">
+						<?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')) : ?>
+					<th id="categorylist_header_author">
+						<?php echo JHtml::_('grid.sort', 'JAUTHOR', 'author', $listDirn, $listOrder); ?>
+					</th>
+				<?php endif; ?>
+				<?php if ($this->params->get('list_show_hits')) : ?>
+					<th id="categorylist_header_hits">
+						<?php echo JHtml::_('grid.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
+					</th>
+				<?php endif; ?>
+				<?php if ($isEditable) : ?>
+					<th id="categorylist_header_edit"><?php echo JText::_('COM_CONTENT_EDIT_ITEM'); ?></th>
+				<?php endif; ?>
+			</tr>
+		</thead>
+		<?php endif; ?>
+		<tbody>
+			<?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; ?>">
+				<?php else: ?>
+				<tr class="cat-list-row<?php echo $i % 2; ?>" >
+				<?php endif; ?>
+					<td headers="categorylist_header_title" class="list-title">
+						<?php if (in_array($article->access, $this->user->getAuthorisedViewLevels())) : ?>
+							<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($article->slug, $article->catid)); ?>">
+								<?php echo $this->escape($article->title); ?>
+							</a>
+						<?php else: ?>
+							<?php
+							echo $this->escape($article->title).' : ';
+							$menu		= JFactory::getApplication()->getMenu();
+							$active		= $menu->getActive();
+							$itemId		= $active->id;
+							$link = JRoute::_('index.php?option=com_users&view=login&Itemid='.$itemId);
+							$returnURL = JRoute::_(ContentHelperRoute::getArticleRoute($article->slug));
+							$fullURL = new JUri($link);
+							$fullURL->setVar('return', base64_encode($returnURL));
+							?>
+							<a href="<?php echo $fullURL; ?>" class="register">
+								<?php echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE'); ?>
+							</a>
+						<?php endif; ?>
+						<?php if ($article->state == 0) : ?>
+							<span class="list-published label label-warning">
+								<?php echo JText::_('JUNPUBLISHED'); ?>
+							</span>
+						<?php endif; ?>
+					</td>
+					<?php if ($this->params->get('list_show_date')) : ?>
+						<td headers="categorylist_header_date" class="list-date small">
+							<?php
+							echo JHtml::_(
+								'date', $article->displayDate,
+								$this->escape($this->params->get('date_format', JText::_('DATE_FORMAT_LC3')))
+							); ?>
+						</td>
+					<?php endif; ?>
+					<?php if ($this->params->get('list_show_author', 1)) : ?>
+						<td headers="categorylist_header_author" 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; ?>
+						</td>
+					<?php endif; ?>
+					<?php if ($this->params->get('list_show_hits', 1)) : ?>
+						<td headers="categorylist_header_hits" class="list-hits">
+							<span class="badge badge-info">
+								<?php echo JText::sprintf('JGLOBAL_HITS_COUNT', $article->hits); ?>
+							</span>
+						</td>
+					<?php endif; ?>
+					<?php if ($isEditable) : ?>
+						<td headers="categorylist_header_edit" class="list-edit">
+							<?php if ($article->params->get('access-edit')) : ?>
+								<?php echo JHtml::_('icon.edit', $article, $params); ?>
+							<?php endif; ?>
+						</td>
+					<?php endif; ?>
+				</tr>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
+<?php endif; ?>
+
+<?php // Code to add a link to submit an article. ?>
+<?php if ($this->category->getParams()->get('access-create')) : ?>
+	<?php echo JHtml::_('icon.create', $this->category, $this->category->params); ?>
+<?php  endif; ?>
+
+<?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->pagesTotal > 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; ?>
+</form>
+<?php  endif; ?>

components/com_content/views/category/tmpl/default_children.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('bootstrap.tooltip');
+
+$lang	= JFactory::getLanguage();
+$class = ' class="first"';
+?>
+
+<?php if (count($this->children[$this->category->id]) > 0) : ?>
+	<?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
+		<?php
+		if ($this->params->get('show_empty_categories') || $child->getNumItems(true) || count($child->getChildren())) :
+			if (!isset($this->children[$this->category->id][$id + 1])) :
+				$class = ' class="last"';
+			endif;
+		?>
+
+		<div<?php echo $class; ?>>
+			<?php $class = ''; ?>
+			<?php if ($lang->isRTL()) : ?>
+			<h3 class="page-header item-title">
+				<?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
+					<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::tooltipText('COM_CONTENT_NUM_ITEMS'); ?>">
+						<?php echo $child->getNumItems(true); ?>
+					</span>
+				<?php endif; ?>
+				<a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id));?>">
+				<?php echo $this->escape($child->title); ?></a>
+
+				<?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"><span class="icon-plus"></span></a>
+				<?php endif;?>
+			</h3>
+			<?php else : ?>
+			<h3 class="page-header item-title"><a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id));?>">
+				<?php echo $this->escape($child->title); ?></a>
+				<?php if ( $this->params->get('show_cat_num_articles', 1)) : ?>
+					<span class="badge badge-info tip hasTooltip" title="<?php echo JHtml::tooltipText('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"><span class="icon-plus"></span></a>
+				<?php endif;?>
+			<?php endif;?>
+			</h3>
+			<?php if ($this->params->get('show_subcat_desc') == 1) :?>
+				<?php if ($child->description) : ?>
+					<div class="category-desc">
+						<?php echo JHtml::_('content.prepare', $child->description, '', 'com_content.category'); ?>
+					</div>
+				<?php endif; ?>
+			<?php endif; ?>
+
+			<?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--;
+				if ($this->maxLevel != 0) :
+					echo $this->loadTemplate('children');
+				endif;
+				$this->category = $child->getParent();
+				$this->maxLevel++;
+				?>
+			</div>
+			<?php endif; ?>
+
+		</div>
+		<?php endif; ?>
+	<?php endforeach; ?>
+<?php endif; ?>

components/com_content/views/category/tmpl/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

components/com_content/views/category/view.feed.php

@@ -0,0 +1,89 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Content component
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.5
+ */
+class ContentViewCategory extends JViewLegacy
+{
+	public function display($tpl = null)
+	{
+		$app       = JFactory::getApplication();
+		$doc       = JFactory::getDocument();
+		$params    = $app->getParams();
+		$feedEmail = $app->getCfg('feed_email', 'author');
+		$siteEmail = $app->getCfg('mailfrom');
+
+		// Get some data from the model
+		$app->input->set('limit', $app->getCfg('feed_limit'));
+		$category = $this->get('Category');
+		$rows     = $this->get('Items');
+
+		$doc->link = JRoute::_(ContentHelperRoute::getCategoryRoute($category->id));
+
+		foreach ($rows as $row)
+		{
+			// Strip html from feed item title
+			$title = $this->escape($row->title);
+			$title = html_entity_decode($title, ENT_COMPAT, 'UTF-8');
+
+			// Compute the article slug
+			$row->slug = $row->alias ? ($row->id . ':' . $row->alias) : $row->id;
+
+			// Url link to article
+			$link = JRoute::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid));
+
+			// Get row fulltext
+			$db = JFactory::getDbo();
+			$query = 'SELECT' .$db->quoteName('fulltext'). 'FROM #__content WHERE id ='.$row->id;
+			$db->setQuery($query);
+			$row->fulltext = $db->loadResult();
+
+			// Get description, author and date
+			$description = ($params->get('feed_summary', 0) ? $row->introtext.$row->fulltext : $row->introtext);
+			$author = $row->created_by_alias ? $row->created_by_alias : $row->author;
+			@$date = ($row->publish_up ? date('r', strtotime($row->publish_up)) : '');
+
+			// Load individual item creator class
+			$item           = new JFeedItem;
+			$item->title    = $title;
+			$item->link     = $link;
+			$item->date     = $date;
+			$item->category = $row->category_title;
+			$item->author   = $author;
+
+			if ($feedEmail == 'site')
+			{
+				$item->authorEmail = $siteEmail;
+			}
+			elseif ($feedEmail === 'author')
+			{
+				$item->authorEmail = $row->author_email;
+			}
+
+			// Add readmore link to description if introtext is shown, show_readmore is true and fulltext exists
+			if (!$params->get('feed_summary', 0) && $params->get('feed_show_readmore', 0) && $row->fulltext)
+			{
+				$description .= '<p class="feed-readmore"><a target="_blank" href ="' . $item->link . '">' . JText::_('COM_CONTENT_FEED_READMORE') . '</a></p>';
+			}
+
+			// Load item description and add div
+			$item->description	= '<div class="feed-description">'.$description.'</div>';
+
+			// Loads item info into rss array
+			$doc->addItem($item);
+		}
+	}
+}

components/com_content/views/category/view.html.php

@@ -0,0 +1,320 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML View class for the Content component
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.5
+ */
+class ContentViewCategory extends JViewLegacy
+{
+	protected $state;
+
+	protected $items;
+
+	protected $category;
+
+	protected $children;
+
+	protected $pagination;
+
+	protected $lead_items = array();
+
+	protected $intro_items = array();
+
+	protected $link_items = array();
+
+	protected $columns = 1;
+
+	public function display($tpl = null)
+	{
+		$app	= JFactory::getApplication();
+
+		// Get some data from the models
+		$state		= $this->get('State');
+		$params		= $state->params;
+		$items		= $this->get('Items');
+		$category	= $this->get('Category');
+		$children	= $this->get('Children');
+		$parent		= $this->get('Parent');
+		$pagination = $this->get('Pagination');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseError(500, implode("\n", $errors));
+			return false;
+		}
+
+		if ($category == false)
+		{
+			return JError::raiseError(404, JText::_('JGLOBAL_CATEGORY_NOT_FOUND'));
+		}
+
+		if ($parent == false)
+		{
+			return JError::raiseError(404, JText::_('JGLOBAL_CATEGORY_NOT_FOUND'));
+		}
+
+		// Setup the category parameters.
+		$cparams = $category->getParams();
+		$category->params = clone($params);
+		$category->params->merge($cparams);
+
+		// Check whether category access level allows access.
+		$user	= JFactory::getUser();
+		$groups	= $user->getAuthorisedViewLevels();
+		if (!in_array($category->access, $groups))
+		{
+			return JError::raiseError(403, JText::_('JERROR_ALERTNOAUTHOR'));
+		}
+
+		// PREPARE THE DATA
+		// Get the metrics for the structural page layout.
+		$numLeading	= $params->def('num_leading_articles', 1);
+		$numIntro	= $params->def('num_intro_articles', 4);
+		$numLinks	= $params->def('num_links', 4);
+
+		// Compute the article slugs and prepare introtext (runs content plugins).
+		for ($i = 0, $n = count($items); $i < $n; $i++)
+		{
+			$item = &$items[$i];
+			$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
+
+			$item->parent_slug = ($item->parent_alias) ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
+
+			// No link for ROOT category
+			if ($item->parent_alias == 'root')
+			{
+				$item->parent_slug = null;
+			}
+
+			$item->catslug		= $item->category_alias ? ($item->catid.':'.$item->category_alias) : $item->catid;
+			$item->event = new stdClass;
+
+			$dispatcher = JEventDispatcher::getInstance();
+
+			// Old plugins: Ensure that text property is available
+			if (!isset($item->text))
+			{
+				$item->text = $item->introtext;
+			}
+
+			JPluginHelper::importPlugin('content');
+			$dispatcher->trigger('onContentPrepare', array ('com_content.category', &$item, &$this->params, 0));
+
+			// Old plugins: Use processed text as introtext
+			$item->introtext = $item->text;
+
+			$results = $dispatcher->trigger('onContentAfterTitle', array('com_content.category', &$item, &$item->params, 0));
+			$item->event->afterDisplayTitle = trim(implode("\n", $results));
+
+			$results = $dispatcher->trigger('onContentBeforeDisplay', array('com_content.category', &$item, &$item->params, 0));
+			$item->event->beforeDisplayContent = trim(implode("\n", $results));
+
+			$results = $dispatcher->trigger('onContentAfterDisplay', array('com_content.category', &$item, &$item->params, 0));
+			$item->event->afterDisplayContent = trim(implode("\n", $results));
+		}
+
+		// Check for layout override only if this is not the active menu item
+		// If it is the active menu item, then the view and category id will match
+		$active	= $app->getMenu()->getActive();
+		if ((!$active) || ((strpos($active->link, 'view=category') === false) || (strpos($active->link, '&id=' . (string) $category->id) === false)))
+		{
+			// Get the layout from the merged category params
+			if ($layout = $category->params->get('category_layout'))
+			{
+				$this->setLayout($layout);
+			}
+		}
+		// At this point, we are in a menu item, so we don't override the layout
+		elseif (isset($active->query['layout']))
+		{
+			// We need to set the layout from the query in case this is an alternative menu item (with an alternative layout)
+			$this->setLayout($active->query['layout']);
+		}
+
+		// For blog layouts, preprocess the breakdown of leading, intro and linked articles.
+		// This makes it much easier for the designer to just interrogate the arrays.
+		if (($params->get('layout_type') == 'blog') || ($this->getLayout() == 'blog'))
+		{
+			$max = count($items);
+
+			// The first group is the leading articles.
+			$limit = $numLeading;
+			for ($i = 0; $i < $limit && $i < $max; $i++)
+			{
+				$this->lead_items[$i] = &$items[$i];
+			}
+
+			// The second group is the intro articles.
+			$limit = $numLeading + $numIntro;
+			// Order articles across, then down (or single column mode)
+			for ($i = $numLeading; $i < $limit && $i < $max; $i++)
+			{
+				$this->intro_items[$i] = &$items[$i];
+			}
+
+			$this->columns = max(1, $params->def('num_columns', 1));
+			$order = $params->def('multi_column_order', 1);
+
+			if ($order == 0 && $this->columns > 1)
+			{
+				// call order down helper
+				$this->intro_items = ContentHelperQuery::orderDownColumns($this->intro_items, $this->columns);
+			}
+
+			$limit = $numLeading + $numIntro + $numLinks;
+			// The remainder are the links.
+			for ($i = $numLeading + $numIntro; $i < $limit && $i < $max;$i++)
+			{
+					$this->link_items[$i] = &$items[$i];
+			}
+		}
+
+		$children = array($category->id => $children);
+
+		//Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
+
+		$this->maxLevel = $params->get('maxLevel', -1);
+		$this->state      = &$state;
+		$this->items      = &$items;
+		$this->category   = &$category;
+		$this->children   = &$children;
+		$this->params     = &$params;
+		$this->parent     = &$parent;
+		$this->pagination = &$pagination;
+		$this->user       = &$user;
+
+		// Increment the category hit counter
+		$model = $this->getModel();
+		$model->hit();
+
+		$this->category->tags = new JHelperTags;
+		$this->category->tags->getItemTags('com_content.category', $this->category->id);
+
+		$this->_prepareDocument();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 */
+	protected function _prepareDocument()
+	{
+		$app		= JFactory::getApplication();
+		$menus		= $app->getMenu();
+		$pathway	= $app->getPathway();
+		$title		= null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('JGLOBAL_ARTICLES'));
+		}
+
+		$id = (int) @$menu->query['id'];
+
+		if ($menu && ($menu->query['option'] != 'com_content' || $menu->query['view'] == 'article' || $id != $this->category->id))
+		{
+			$path = array(array('title' => $this->category->title, 'link' => ''));
+			$category = $this->category->getParent();
+
+			while (($menu->query['option'] != 'com_content' || $menu->query['view'] == 'article' || $id != $category->id) && $category->id > 1)
+			{
+				$path[] = array('title' => $category->title, 'link' => ContentHelperRoute::getCategoryRoute($category->id));
+				$category = $category->getParent();
+			}
+
+			$path = array_reverse($path);
+
+			foreach ($path as $item)
+			{
+				$pathway->addItem($item['title'], $item['link']);
+			}
+		}
+
+		$title = $this->params->get('page_title', '');
+		if (empty($title))
+		{
+			$title = $app->getCfg('sitename');
+		}
+		elseif ($app->getCfg('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->getCfg('sitename'), $title);
+		}
+		elseif ($app->getCfg('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->getCfg('sitename'));
+		}
+
+		$this->document->setTitle($title);
+
+		if ($this->category->metadesc)
+		{
+			$this->document->setDescription($this->category->metadesc);
+		}
+		elseif (!$this->category->metadesc && $this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->category->metakey)
+		{
+			$this->document->setMetadata('keywords', $this->category->metakey);
+		}
+		elseif (!$this->category->metakey && $this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+
+		if ($app->getCfg('MetaAuthor') == '1')
+		{
+			$this->document->setMetaData('author', $this->category->getMetadata()->get('author'));
+		}
+
+		$mdata = $this->category->getMetadata()->toArray();
+
+		foreach ($mdata as $k => $v)
+		{
+			if ($v)
+			{
+				$this->document->setMetadata($k, $v);
+			}
+		}
+
+		// Add feed links
+		if ($this->params->get('show_feed_link', 1))
+		{
+			$link = '&format=feed&limitstart=';
+			$attribs = array('type' => 'application/rss+xml', 'title' => 'RSS 2.0');
+			$this->document->addHeadLink(JRoute::_($link . '&type=rss'), 'alternate', 'rel', $attribs);
+			$attribs = array('type' => 'application/atom+xml', 'title' => 'Atom 1.0');
+			$this->document->addHeadLink(JRoute::_($link . '&type=atom'), 'alternate', 'rel', $attribs);
+		}
+	}
+}

components/com_content/views/featured/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

components/com_content/views/featured/metadata.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<view title="Frontpage">
+		<message><![CDATA[TYPEFRONTLAYDESC]]></message>
+	</view>
+</metadata>

components/com_content/views/featured/tmpl/default.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
+
+JHtml::_('behavior.caption');
+
+// If the page class is defined, add to class as suffix.
+// It will be a separate class if the user starts it with a space
+?>
+<div class="blog-featured<?php echo $this->pageclass_sfx;?>">
+<?php if ($this->params->get('show_page_heading') != 0) : ?>
+<div class="page-header">
+	<h1>
+	<?php echo $this->escape($this->params->get('page_heading')); ?>
+	</h1>
+</div>
+<?php endif; ?>
+
+<?php $leadingcount = 0; ?>
+<?php if (!empty($this->lead_items)) : ?>
+<div class="items-leading clearfix">
+	<?php foreach ($this->lead_items as &$item) : ?>
+		<div class="leading-<?php echo $leadingcount; ?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?> clearfix">
+			<?php
+				$this->item = &$item;
+				echo $this->loadTemplate('item');
+			?>
+		</div>
+		<?php
+			$leadingcount++;
+		?>
+	<?php endforeach; ?>
+</div>
+<?php endif; ?>
+<?php
+	$introcount = (count($this->intro_items));
+	$counter = 0;
+?>
+<?php if (!empty($this->intro_items)) : ?>
+	<?php foreach ($this->intro_items as $key => &$item) : ?>
+
+		<?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="item column-<?php echo $rowcount;?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?> span<?php echo round((12 / $this->columns));?>">
+			<?php
+					$this->item = &$item;
+					echo $this->loadTemplate('item');
+			?>
+			</div>
+			<?php $counter++; ?>
+
+			<?php if (($rowcount == $this->columns) or ($counter == $introcount)) : ?>
+
+		</div>
+		<?php endif; ?>
+
+	<?php endforeach; ?>
+<?php endif; ?>
+
+<?php if (!empty($this->link_items)) : ?>
+	<div class="items-more">
+	<?php echo $this->loadTemplate('links'); ?>
+	</div>
+<?php endif; ?>
+
+<?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 pull-right">
+				<?php echo $this->pagination->getPagesCounter(); ?>
+			</p>
+		<?php  endif; ?>
+				<?php echo $this->pagination->getPagesLinks(); ?>
+	</div>
+<?php endif; ?>
+
+</div>

components/com_content/views/featured/tmpl/default.xml

@@ -0,0 +1,377 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONTENT_FEATURED_VIEW_DEFAULT_TITLE" option="COM_CONTENT_FEATURED_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_ARTICLE_FEATURED"
+		/>
+		<message>
+			<![CDATA[COM_CONTENT_CATEGORY_VIEW_FEATURED_DESC]]>
+		</message>
+	</layout>
+
+<!-- Add fields to the parameters object for the layout. -->
+<fields name="params">
+<fieldset name="advanced" label="COM_MENUS_LAYOUT_FEATURED_OPTIONS">
+			<field
+			name="featured_categories"
+			type="category"
+			extension="com_content"
+			multiple="true"
+			size="10"
+			default=""
+			label="COM_CONTENT_FEATURED_CATEGORIES_LABEL"
+			description="COM_CONTENT_FEATURED_CATEGORIES_DESC" >
+			<option value="">JOPTION_ALL_CATEGORIES</option>
+			</field>
+
+			<field name="layout_type"
+				type="hidden"
+				default="blog"
+			/>
+			<field name="bloglayout" type="spacer" class="text"
+					label="JGLOBAL_SUBSLIDER_BLOG_LAYOUT_LABEL"
+			/>
+
+			<field name="num_leading_articles" type="text"
+				description="JGLOBAL_NUM_LEADING_ARTICLES_DESC"
+				label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL"
+				size="3"
+			/>
+
+			<field name="num_intro_articles" type="text"
+				description="JGLOBAL_NUM_INTRO_ARTICLES_DESC"
+				label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL"
+				size="3"
+			/>
+
+			<field name="num_columns" type="text"
+				description="JGLOBAL_NUM_COLUMNS_DESC"
+				label="JGLOBAL_NUM_COLUMNS_LABEL"
+				size="3"
+			/>
+
+			<field name="num_links" type="text"
+				description="JGLOBAL_NUM_LINKS_DESC"
+				label="JGLOBAL_NUM_LINKS_LABEL"
+				size="3"
+			/>
+
+			<field name="multi_column_order" type="list"
+				description="JGLOBAL_MULTI_COLUMN_ORDER_DESC"
+				label="JGLOBAL_MULTI_COLUMN_ORDER_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JGLOBAL_Down</option>
+				<option value="1">JGLOBAL_Across</option>
+			</field>
+
+			<field name="orderby_pri" type="list"
+				description="JGLOBAL_CATEGORY_ORDER_DESC"
+				label="JGLOBAL_CATEGORY_ORDER_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="none">JGLOBAL_No_Order</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="order">JGLOBAL_CATEGORY_MANAGER_ORDER</option>
+			</field>
+
+			<field name="orderby_sec" type="list"
+				description="JGLOBAL_ARTICLE_ORDER_DESC"
+				label="JGLOBAL_ARTICLE_ORDER_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="front">COM_CONTENT_FEATURED_ORDER</option>
+				<option value="rdate">JGLOBAL_MOST_RECENT_FIRST</option>
+				<option value="date">JGLOBAL_OLDEST_FIRST</option>
+				<option value="alpha">JGLOBAL_TITLE_ALPHABETICAL</option>
+				<option value="ralpha">JGLOBAL_TITLE_REVERSE_ALPHABETICAL</option>
+				<option value="author">JGLOBAL_AUTHOR_ALPHABETICAL</option>
+				<option value="rauthor">JGLOBAL_AUTHOR_REVERSE_ALPHABETICAL</option>
+				<option value="hits">JGLOBAL_MOST_HITS</option>
+				<option value="rhits">JGLOBAL_LEAST_HITS</option>
+				<option value="order">JGLOBAL_ORDERING</option>
+			</field>
+
+			<field name="order_date" type="list"
+				description="JGLOBAL_ORDERING_DATE_DESC"
+				label="JGLOBAL_ORDERING_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="created">JGLOBAL_CREATED</option>
+				<option value="modified">JGLOBAL_MODIFIED</option>
+				<option value="published">JPUBLISHED</option>
+			</field>
+
+			<field name="show_pagination" type="list"
+				description="JGLOBAL_PAGINATION_DESC"
+				label="JGLOBAL_PAGINATION_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+				<option value="2">JGLOBAL_AUTO</option>
+			</field>
+
+			<field name="show_pagination_results" type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC">
+
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+
+</fieldset>
+
+<fieldset name="article" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
+			<field name="show_title" type="list"
+				description="JGLOBAL_SHOW_TITLE_DESC"
+				label="JGLOBAL_SHOW_TITLE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="link_titles" type="list"
+				description="JGLOBAL_LINKED_TITLES_DESC"
+				label="JGLOBAL_LINKED_TITLES_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNo</option>
+				<option value="1">JYes</option>
+			</field>
+
+			<field name="show_intro" type="list"
+				description="JGLOBAL_SHOW_INTRO_DESC"
+				label="JGLOBAL_SHOW_INTRO_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="info_block_position"
+				type="list"
+				default=""
+				label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL"
+				description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC">
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
+				<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
+				<option value="2">COM_CONTENT_FIELD_OPTION_SPLIT</option>
+			</field>
+
+			<field name="show_category" type="list"
+				description="JGLOBAL_SHOW_CATEGORY_DESC"
+				label="JGLOBAL_SHOW_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="link_category" type="list"
+				description="JGLOBAL_LINK_CATEGORY_DESC"
+				label="JGLOBAL_LINK_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNo</option>
+				<option value="1">JYes</option>
+			</field>
+
+			<field name="show_parent_category" type="list"
+				description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"
+				label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="link_parent_category" type="list"
+				description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"
+				label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field name="show_author" type="list"
+				description="JGLOBAL_SHOW_AUTHOR_DESC"
+				label="JGLOBAL_SHOW_AUTHOR_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="link_author" type="list"
+				description="JGLOBAL_LINK_AUTHOR_DESC"
+				label="JGLOBAL_LINK_AUTHOR_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNo</option>
+				<option value="1">JYes</option>
+			</field>
+
+			<field name="show_create_date" type="list"
+				description="JGLOBAL_SHOW_CREATE_DATE_DESC"
+				label="JGLOBAL_SHOW_CREATE_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_modify_date" type="list"
+				description="JGLOBAL_SHOW_MODIFY_DATE_DESC"
+				label="JGLOBAL_SHOW_MODIFY_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_publish_date" type="list"
+				description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"
+				label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_item_navigation" type="list"
+				description="JGLOBAL_SHOW_NAVIGATION_DESC"
+				label="JGLOBAL_SHOW_NAVIGATION_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+			name="show_vote" type="list"
+			label="JGLOBAL_SHOW_VOTE_LABEL"
+			description="JGLOBAL_SHOW_VOTE_DESC"
+		>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+			<option value="0">JHIDE</option>
+			<option	value="1">JSHOW</option>
+		</field>
+
+			<field
+				name="show_readmore"
+				type="list"
+				description="JGLOBAL_SHOW_READMORE_DESC"
+				label="JGLOBAL_SHOW_READMORE_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_readmore_title"
+				type="list"
+				label="JGLOBAL_SHOW_READMORE_TITLE_LABEL"
+				description="JGLOBAL_SHOW_READMORE_TITLE_DESC"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_icons" type="list"
+				description="JGLOBAL_SHOW_ICONS_DESC"
+				label="JGLOBAL_SHOW_ICONS_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_print_icon" type="list"
+				description="JGLOBAL_SHOW_PRINT_ICON_DESC"
+				label="JGLOBAL_SHOW_PRINT_ICON_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_email_icon" type="list"
+				description="JGLOBAL_SHOW_EMAIL_ICON_DESC"
+				label="JGLOBAL_SHOW_EMAIL_ICON_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_hits" type="list"
+				description="JGLOBAL_SHOW_HITS_DESC"
+				label="JGLOBAL_SHOW_HITS_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="show_noauth" type="list"
+				description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"
+				label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="use_article">COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS</option>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+</fieldset>
+		<fieldset name="integration"
+		>
+
+			<field name="show_feed_link" type="list"
+				description="JGLOBAL_SHOW_FEED_LINK_DESC"
+				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field name="feed_summary" type="list"
+				description="JGLOBAL_FEED_SUMMARY_DESC"
+				label="JGLOBAL_FEED_SUMMARY_LABEL"
+			>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JGLOBAL_INTRO_TEXT</option>
+				<option value="1">JGLOBAL_FULL_TEXT</option>
+			</field>
+		</fieldset>
+</fields>
+</metadata>

components/com_content/views/featured/tmpl/default_item.php

@@ -0,0 +1,265 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 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');
+$info    = $this->item->params->get('info_block_position', 0);
+
+?>
+
+<?php if ($this->item->state == 0) : ?>
+	<div class="system-unpublished">
+<?php endif; ?>
+
+<?php if ($params->get('show_title')) : ?>
+	<h2 class="item-title">
+	<?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; ?>
+
+<?php if ($this->item->state == 0) : ?>
+	<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+<?php endif; ?>
+
+<?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="#" role="button"> <span class="icon-cog"></span> <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 // Todo Not that elegant would be nice to group the params ?>
+<?php $useDefList = ($params->get('show_modify_date') || $params->get('show_publish_date') || $params->get('show_create_date')
+	|| $params->get('show_hits') || $params->get('show_category') || $params->get('show_parent_category') || $params->get('show_author') ); ?>
+
+<?php if ($useDefList && ($info == 0 ||  $info == 2)) : ?>
+	<dl class="article-info  muted">
+		<dt class="article-info-term">
+		<?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?>
+		</dt>
+
+		<?php if ($params->get('show_author') && !empty($this->item->author )) : ?>
+			<dd 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; ?>
+			</dd>
+		<?php endif; ?>
+
+		<?php if ($params->get('show_parent_category') && !empty($this->item->parent_slug)) : ?>
+			<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') && !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; ?>
+			</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->catslug)).'">'.$title.'</a>';?>
+				<?php if ($params->get('link_category') && $this->item->catslug) : ?>
+					<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
+				<?php else : ?>
+					<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $title); ?>
+				<?php endif; ?>
+			</dd>
+		<?php endif; ?>
+
+		<?php if ($params->get('show_publish_date')) : ?>
+			<dd class="published">
+				<span class="icon-calendar"></span> <?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $this->item->publish_up, JText::_('DATE_FORMAT_LC3'))); ?>
+			</dd>
+		<?php endif; ?>
+
+		<?php if ($info == 0) : ?>
+			<?php if ($params->get('show_modify_date')) : ?>
+				<dd class="modified">
+				<span class="icon-calendar"></span>
+				<?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC3'))); ?>
+				</dd>
+			<?php endif; ?>
+
+			<?php if ($params->get('show_create_date')) : ?>
+				<dd class="create">
+					<span class="icon-calendar"></span>
+					<?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $this->item->created, JText::_('DATE_FORMAT_LC3'))); ?>
+				</dd>
+			<?php endif; ?>
+
+			<?php if ($params->get('show_hits')) : ?>
+				<dd class="hits">
+					<span class="icon-eye-open"></span>
+					<?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $this->item->hits); ?>
+				</dd>
+			<?php endif; ?>
+
+		<?php endif; ?>
+	</dl>
+<?php endif; ?>
+
+<?php if (isset($images->image_intro) && !empty($images->image_intro)) : ?>
+	<?php $imgfloat = (empty($images->float_intro)) ? $params->get('float_intro') : $images->float_intro; ?>
+	<div class="pull-<?php echo htmlspecialchars($imgfloat); ?> item-image"> <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); ?>"/> </div>
+<?php endif; ?>
+
+<?php if (!$params->get('show_intro')) : ?>
+	<?php echo $this->item->event->afterDisplayTitle; ?>
+<?php endif; ?>
+<?php echo $this->item->event->beforeDisplayContent; ?> <?php echo $this->item->introtext; ?>
+
+<?php if ($useDefList && ($info == 1 ||  $info == 2)) : ?>
+	<dl class="article-info muted">
+		<dt class="article-info-term">
+			<?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?>
+		</dt>
+		<?php if ($info == 1) : ?>
+			<?php if ($params->get('show_author') && !empty($this->item->author )) : ?>
+				<dd 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; ?>
+				</dd>
+			<?php endif; ?>
+
+			<?php if ($params->get('show_parent_category') && !empty($this->item->parent_slug)) : ?>
+				<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') && $this->item->parent_slug) : ?>
+						<?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
+					<?php else : ?>
+						<?php echo JText::sprintf('COM_CONTENT_PARENT', $title); ?>
+					<?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->catslug)).'">'.$title.'</a>';?>
+					<?php if ($params->get('link_category') && $this->item->catslug) : ?>
+						<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
+					<?php else : ?>
+						<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $title); ?>
+					<?php endif; ?>
+				</dd>
+			<?php endif; ?>
+
+			<?php if ($params->get('show_publish_date')) : ?>
+				<dd class="published">
+					<span class="icon-calendar"></span> <?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $this->item->publish_up, JText::_('DATE_FORMAT_LC3'))); ?>
+				</dd>
+			<?php endif; ?>
+		<?php endif; ?>
+
+		<?php if ($params->get('show_create_date')) : ?>
+			<dd class="create">
+				<span class="icon-calendar"></span> <?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $this->item->created, JText::_('DATE_FORMAT_LC3'))); ?>
+			</dd>
+		<?php endif; ?>
+
+		<?php if ($params->get('show_modify_date')) : ?>
+			<dd class="modified">
+				<span class="icon-calendar"></span>
+				<?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $this->item->modified, JText::_('DATE_FORMAT_LC3'))); ?>
+			</dd>
+		<?php endif; ?>
+
+		<?php if ($params->get('show_hits')) : ?>
+			<dd class="hits">
+				<span class="icon-eye-open"></span> <?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $this->item->hits); ?>
+			</dd>
+		<?php endif; ?>
+	</dl>
+
+	<?php if ($this->params->get('show_tags', 1)) : ?>
+		<?php $this->item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
+		<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
+	<?php endif; ?>
+
+<?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 :
+		$menu = JFactory::getApplication()->getMenu();
+		$active = $menu->getActive();
+		$itemId = $active->id;
+		$link1 = JRoute::_('index.php?option=com_users&view=login&Itemid=' . $itemId);
+		$returnURL = JRoute::_(ContentHelperRoute::getArticleRoute($this->item->slug, $this->item->catid));
+		$link = new JUri($link1);
+		$link->setVar('return', base64_encode($returnURL));
+	endif; ?>
+
+	<p class="readmore"><a class="btn" href="<?php echo $link; ?>"> <span class="icon-chevron-right"></span>
+
+	<?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>
+
+<?php endif; ?>
+
+<?php if ($this->item->state == 0) : ?>
+</div>
+<?php endif; ?>
+
+<?php echo $this->item->event->afterDisplayContent; ?>

components/com_content/views/featured/tmpl/default_links.php

@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<ol class="nav nav-tabs nav-stacked">
+<?php foreach ($this->link_items as &$item) : ?>
+	<li>
+		<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catslug)); ?>">
+			<?php echo $item->title; ?></a>
+	</li>
+<?php endforeach; ?>
+</ol>

components/com_content/views/featured/tmpl/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

components/com_content/views/featured/view.feed.php

@@ -0,0 +1,94 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Frontpage View class
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.5
+ */
+class ContentViewFeatured extends JViewLegacy
+{
+	public function display($tpl = null)
+	{
+		// Parameters
+		$app       = JFactory::getApplication();
+		$doc       = JFactory::getDocument();
+		$params    = $app->getParams();
+		$feedEmail = $app->getCfg('feed_email', 'author');
+		$siteEmail = $app->getCfg('mailfrom');
+
+		$doc->link	= JRoute::_('index.php?option=com_content&view=featured');
+
+		// Get some data from the model
+		$app->input->set('limit', $app->getCfg('feed_limit'));
+		$categories = JCategories::getInstance('Content');
+		$rows       = $this->get('Items');
+		foreach ($rows as $row)
+		{
+			// strip html from feed item title
+			$title = $this->escape($row->title);
+			$title = html_entity_decode($title, ENT_COMPAT, 'UTF-8');
+
+			// Compute the article slug
+			$row->slug = $row->alias ? ($row->id . ':' . $row->alias) : $row->id;
+
+			// Url link to article
+			$link = JRoute::_(ContentHelperRoute::getArticleRoute($row->slug, $row->catid));
+
+			// Get row fulltext
+			$db = JFactory::getDbo();
+			$query = 'SELECT' .$db->quoteName('fulltext'). 'FROM #__content WHERE id ='.$row->id;
+			$db->setQuery($query);
+			$row->fulltext = $db->loadResult();
+
+			$description	= ($params->get('feed_summary', 0) ? $row->introtext.$row->fulltext : $row->introtext);
+			$author			= $row->created_by_alias ? $row->created_by_alias : $row->author;
+
+			// Load individual item creator class
+			$item				= new JFeedItem;
+			$item->title		= $title;
+			$item->link			= $link;
+			$item->date			= $row->publish_up;
+			$item->category		= array();
+			$item->category[]	= JText::_('JFEATURED'); // All featured articles are categorized as "Featured"
+			for ($item_category = $categories->get($row->catid); $item_category !== null; $item_category = $item_category->getParent())
+			{
+				if ($item_category->id > 1) { // Only add non-root categories
+					$item->category[] = $item_category->title;
+				}
+			}
+
+			$item->author 		= $author;
+			if ($feedEmail == 'site')
+			{
+				$item->authorEmail = $siteEmail;
+			}
+			elseif ($feedEmail === 'author')
+			{
+				$item->authorEmail = $row->author_email;
+			}
+
+			// Add readmore link to description if introtext is shown, show_readmore is true and fulltext exists
+			if (!$params->get('feed_summary', 0) && $params->get('feed_show_readmore', 0) && $row->fulltext)
+			{
+				$description .= '<p class="feed-readmore"><a target="_blank" href ="' . $item->link . '">' . JText::_('COM_CONTENT_FEED_READMORE') . '</a></p>';
+			}
+
+			// Load item description and add div
+			$item->description	= '<div class="feed-description">'.$description.'</div>';
+
+			// Loads item info into rss array
+			$doc->addItem($item);
+		}
+	}
+}

components/com_content/views/featured/view.html.php

@@ -0,0 +1,211 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Frontpage View class
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.5
+ */
+class ContentViewFeatured extends JViewLegacy
+{
+	protected $state = null;
+
+	protected $item = null;
+
+	protected $items = null;
+
+	protected $pagination = null;
+
+	protected $lead_items = array();
+
+	protected $intro_items = array();
+
+	protected $link_items = array();
+
+	protected $columns = 1;
+
+	/**
+	 * Display the view
+	 *
+	 * @return  mixed  False on error, null otherwise.
+	 */
+	public function display($tpl = null)
+	{
+		$user = JFactory::getUser();
+
+		$state 		= $this->get('State');
+		$items 		= $this->get('Items');
+		$pagination	= $this->get('Pagination');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseWarning(500, implode("\n", $errors));
+			return false;
+		}
+
+		$params = &$state->params;
+
+		// PREPARE THE DATA
+
+		// Get the metrics for the structural page layout.
+		$numLeading = $params->def('num_leading_articles', 1);
+		$numIntro = $params->def('num_intro_articles', 4);
+
+		// Compute the article slugs and prepare introtext (runs content plugins).
+		foreach ($items as &$item)
+		{
+			$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
+			$item->catslug = ($item->category_alias) ? ($item->catid . ':' . $item->category_alias) : $item->catid;
+			$item->parent_slug = ($item->parent_alias) ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
+
+			// No link for ROOT category
+			if ($item->parent_alias == 'root')
+			{
+				$item->parent_slug = null;
+			}
+
+			$item->event = new stdClass;
+
+			$dispatcher = JEventDispatcher::getInstance();
+
+			// Old plugins: Ensure that text property is available
+			if (!isset($item->text))
+			{
+				$item->text = $item->introtext;
+			}
+			JPluginHelper::importPlugin('content');
+			$dispatcher->trigger('onContentPrepare', array ('com_content.featured', &$item, &$this->params, 0));
+
+			// Old plugins: Use processed text as introtext
+			$item->introtext = $item->text;
+
+			$results = $dispatcher->trigger('onContentAfterTitle', array('com_content.featured', &$item, &$item->params, 0));
+			$item->event->afterDisplayTitle = trim(implode("\n", $results));
+
+			$results = $dispatcher->trigger('onContentBeforeDisplay', array('com_content.featured', &$item, &$item->params, 0));
+			$item->event->beforeDisplayContent = trim(implode("\n", $results));
+
+			$results = $dispatcher->trigger('onContentAfterDisplay', array('com_content.featured', &$item, &$item->params, 0));
+			$item->event->afterDisplayContent = trim(implode("\n", $results));
+		}
+
+		// Preprocess the breakdown of leading, intro and linked articles.
+		// This makes it much easier for the designer to just interogate the arrays.
+		$max = count($items);
+
+		// The first group is the leading articles.
+		$limit = $numLeading;
+		for ($i = 0; $i < $limit && $i < $max; $i++)
+		{
+			$this->lead_items[$i] = &$items[$i];
+		}
+
+		// The second group is the intro articles.
+		$limit = $numLeading + $numIntro;
+		// Order articles across, then down (or single column mode)
+		for ($i = $numLeading; $i < $limit && $i < $max; $i++)
+		{
+			$this->intro_items[$i] = &$items[$i];
+		}
+
+		$this->columns = max(1, $params->def('num_columns', 1));
+		$order = $params->def('multi_column_order', 1);
+
+		if ($order == 0 && $this->columns > 1)
+		{
+			// call order down helper
+			$this->intro_items = ContentHelperQuery::orderDownColumns($this->intro_items, $this->columns);
+		}
+
+		// The remainder are the links.
+		for ($i = $numLeading + $numIntro; $i < $max; $i++)
+		{
+			$this->link_items[$i] = &$items[$i];
+		}
+
+		//Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
+
+		$this->params     = &$params;
+		$this->items      = &$items;
+		$this->pagination = &$pagination;
+		$this->user       = &$user;
+
+		$this->_prepareDocument();
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 */
+	protected function _prepareDocument()
+	{
+		$app		= JFactory::getApplication();
+		$menus		= $app->getMenu();
+		$title 		= null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('JGLOBAL_ARTICLES'));
+		}
+
+		$title = $this->params->get('page_title', '');
+		if (empty($title))
+		{
+			$title = $app->getCfg('sitename');
+		}
+		elseif ($app->getCfg('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->getCfg('sitename'), $title);
+		}
+		elseif ($app->getCfg('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->getCfg('sitename'));
+		}
+		$this->document->setTitle($title);
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+
+		// Add feed links
+		if ($this->params->get('show_feed_link', 1))
+		{
+			$link = '&format=feed&limitstart=';
+			$attribs = array('type' => 'application/rss+xml', 'title' => 'RSS 2.0');
+			$this->document->addHeadLink(JRoute::_($link . '&type=rss'), 'alternate', 'rel', $attribs);
+			$attribs = array('type' => 'application/atom+xml', 'title' => 'Atom 1.0');
+			$this->document->addHeadLink(JRoute::_($link . '&type=atom'), 'alternate', 'rel', $attribs);
+		}
+	}
+}

components/com_content/views/form/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

components/com_content/views/form/metadata.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<view title="Form">
+		<message><![CDATA[TYPEARTICLAYDESC]]></message>
+	</view>
+</metadata>

components/com_content/views/form/tmpl/edit.php

@@ -0,0 +1,342 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.keepalive');
+JHtml::_('behavior.calendar');
+JHtml::_('behavior.formvalidation');
+JHtml::_('formbehavior.chosen', 'select');
+
+// Create shortcut to parameters.
+$params = $this->state->get('params');
+//$images = json_decode($this->item->images);
+//$urls = json_decode($this->item->urls);
+
+// This checks if the editor config options have ever been saved. If they haven't they will fall back to the original settings.
+$editoroptions = isset($params->show_publishing_options);
+if (!$editoroptions)
+{
+	$params->show_urls_images_frontend = '0';
+}
+?>
+
+<script type="text/javascript">
+	Joomla.submitbutton = function(task)
+	{
+		if (task == 'article.cancel' || document.formvalidator.isValid(document.id('adminForm')))
+		{
+			<?php echo $this->form->getField('articletext')->save(); ?>
+			Joomla.submitform(task);
+		}
+	}
+</script>
+<div class="edit item-page<?php echo $this->pageclass_sfx; ?>">
+	<?php if ($params->get('show_page_heading', 1)) : ?>
+	<div class="page-header">
+		<h1>
+			<?php echo $this->escape($params->get('page_heading')); ?>
+		</h1>
+	</div>
+	<?php endif; ?>
+
+	<form action="<?php echo JRoute::_('index.php?option=com_content&a_id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate form-vertical">
+		<div class="btn-toolbar">
+			<div class="btn-group">
+				<button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('article.save')">
+					<span class="icon-ok"></span>&#160;<?php echo JText::_('JSAVE') ?>
+				</button>
+			</div>
+			<div class="btn-group">
+				<button type="button" class="btn" onclick="Joomla.submitbutton('article.cancel')">
+					<span class="icon-cancel"></span>&#160;<?php echo JText::_('JCANCEL') ?>
+				</button>
+			</div>
+		</div>
+		<fieldset>
+			<ul class="nav nav-tabs">
+				<li class="active"><a href="#editor" data-toggle="tab"><?php echo JText::_('JEDITOR') ?></a></li>
+				<?php if ($params->get('show_urls_images_frontend') ) : ?>
+				<li><a href="#images" data-toggle="tab"><?php echo JText::_('COM_CONTENT_IMAGES_AND_URLS') ?></a></li>
+				<?php endif; ?>
+				<li><a href="#publishing" data-toggle="tab"><?php echo JText::_('COM_CONTENT_PUBLISHING') ?></a></li>
+				<li><a href="#language" data-toggle="tab"><?php echo JText::_('JFIELD_LANGUAGE_LABEL') ?></a></li>
+				<li><a href="#metadata" data-toggle="tab"><?php echo JText::_('COM_CONTENT_METADATA') ?></a></li>
+			</ul>
+
+			<div class="tab-content">
+				<div class="tab-pane active" id="editor">
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('title'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('title'); ?>
+						</div>
+					</div>
+
+					<?php if (is_null($this->item->id)) : ?>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('alias'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('alias'); ?>
+						</div>
+					</div>
+					<?php endif; ?>
+
+					<?php echo $this->form->getInput('articletext'); ?>
+				</div>
+				<?php if ($params->get('show_urls_images_frontend')): ?>
+				<div class="tab-pane" id="images">
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('image_intro', 'images'); ?>
+							<?php echo $this->form->getInput('image_intro', 'images'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('image_intro_alt', 'images'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('image_intro_alt', 'images'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('image_intro_caption', 'images'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('image_intro_caption', 'images'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('float_intro', 'images'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('float_intro', 'images'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('image_fulltext', 'images'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('image_fulltext', 'images'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('image_fulltext_alt', 'images'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('image_fulltext_alt', 'images'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('image_fulltext_caption', 'images'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('image_fulltext_caption', 'images'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('float_fulltext', 'images'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('float_fulltext', 'images'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('urla', 'urls'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('urla', 'urls'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('urlatext', 'urls'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('urlatext', 'urls'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="controls">
+							<?php echo $this->form->getInput('targeta', 'urls'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('urlb', 'urls'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('urlb', 'urls'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('urlbtext', 'urls'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('urlbtext', 'urls'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="controls">
+							<?php echo $this->form->getInput('targetb', 'urls'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('urlc', 'urls'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('urlc', 'urls'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('urlctext', 'urls'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('urlctext', 'urls'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="controls">
+							<?php echo $this->form->getInput('targetc', 'urls'); ?>
+						</div>
+					</div>
+				</div>
+				<?php endif; ?>
+				<div class="tab-pane" id="publishing">
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('catid'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('catid'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('tags'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('tags'); ?>
+						</div>
+					</div>
+
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('created_by_alias'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('created_by_alias'); ?>
+						</div>
+					</div>
+					<?php if ($this->item->params->get('access-change')) : ?>
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $this->form->getLabel('state'); ?>
+							</div>
+							<div class="controls">
+								<?php echo $this->form->getInput('state'); ?>
+							</div>
+						</div>
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $this->form->getLabel('featured'); ?>
+							</div>
+							<div class="controls">
+								<?php echo $this->form->getInput('featured'); ?>
+							</div>
+						</div>
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $this->form->getLabel('publish_up'); ?>
+							</div>
+							<div class="controls">
+								<?php echo $this->form->getInput('publish_up'); ?>
+							</div>
+						</div>
+						<div class="control-group">
+							<div class="control-label">
+								<?php echo $this->form->getLabel('publish_down'); ?>
+							</div>
+							<div class="controls">
+								<?php echo $this->form->getInput('publish_down'); ?>
+							</div>
+						</div>
+					<?php endif; ?>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('access'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('access'); ?>
+						</div>
+					</div>
+					<?php if (is_null($this->item->id)):?>
+						<div class="control-group">
+							<div class="control-label">
+							</div>
+							<div class="controls">
+								<?php echo JText::_('COM_CONTENT_ORDERING'); ?>
+							</div>
+						</div>
+					<?php endif; ?>
+				</div>
+				<div class="tab-pane" id="language">
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('language'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('language'); ?>
+						</div>
+					</div>
+				</div>
+				<div class="tab-pane" id="metadata">
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('metadesc'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('metadesc'); ?>
+						</div>
+					</div>
+					<div class="control-group">
+						<div class="control-label">
+							<?php echo $this->form->getLabel('metakey'); ?>
+						</div>
+						<div class="controls">
+							<?php echo $this->form->getInput('metakey'); ?>
+						</div>
+					</div>
+
+					<input type="hidden" name="task" value="" />
+					<input type="hidden" name="return" value="<?php echo $this->return_page; ?>" />
+					<?php if ($this->params->get('enable_category', 0) == 1) :?>
+					<input type="hidden" name="jform[catid]" value="<?php echo $this->params->get('catid', 1); ?>" />
+					<?php endif; ?>
+				</div>
+			</div>
+			<?php echo JHtml::_('form.token'); ?>
+		</fieldset>
+	</form>
+</div>

components/com_content/views/form/tmpl/edit.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<layout title="COM_CONTENT_FORM_VIEW_DEFAULT_TITLE" option="COM_CONTENT_FORM_VIEW_DEFAULT_OPTION">
+		<help
+			key = "JHELP_MENUS_MENU_ITEM_ARTICLE_CREATE"
+		/>
+		<message>
+			<![CDATA[COM_CONTENT_FORM_VIEW_DEFAULT_DESC]]>
+		</message>
+	</layout>
+	<fields name="params">
+		<fieldset name="basic">
+			<field name="enable_category"
+				type="radio"
+				class="btn-group"
+				default="0"
+				label="COM_CONTENT_CREATE_ARTICLE_CATEGORY_LABEL"
+				description="COM_CONTENT_CREATE_ARTICLE_CATEGORY_DESC">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+			</field>
+			<field name="catid"
+				type="category"
+				label="JGLOBAL_CHOOSE_CATEGORY_LABEL"
+				extension="com_content"
+				description="JGLOBAL_CHOOSE_CATEGORY_DESC" />
+		</fieldset>
+	</fields>
+</metadata>

components/com_content/views/form/tmpl/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>

components/com_content/views/form/view.html.php

@@ -0,0 +1,145 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * HTML Article View class for the Content component
+ *
+ * @package     Joomla.Site
+ * @subpackage  com_content
+ * @since       1.5
+ */
+class ContentViewForm extends JViewLegacy
+{
+	protected $form;
+
+	protected $item;
+
+	protected $return_page;
+
+	protected $state;
+
+	public function display($tpl = null)
+	{
+		$user		= JFactory::getUser();
+
+		// Get model data.
+		$this->state		= $this->get('State');
+		$this->item			= $this->get('Item');
+		$this->form			= $this->get('Form');
+		$this->return_page	= $this->get('ReturnPage');
+
+		if (empty($this->item->id))
+		{
+			$authorised = $user->authorise('core.create', 'com_content') || (count($user->getAuthorisedCategories('com_content', 'core.create')));
+		}
+		else
+		{
+			$authorised = $this->item->params->get('access-edit');
+		}
+
+		if ($authorised !== true)
+		{
+			JError::raiseError(403, JText::_('JERROR_ALERTNOAUTHOR'));
+			return false;
+		}
+
+		$this->item->tags = new JHelperTags;
+		if (!empty($this->item->id))
+		{
+			$this->item->tags->getItemTags('com_content.article.', $this->item->id);
+		}
+		if (!empty($this->item) && isset($this->item->id))
+		{
+			$this->item->images = json_decode($this->item->images);
+			$this->item->urls = json_decode($this->item->urls);
+
+			$tmp = new stdClass;
+			$tmp->images = $this->item->images;
+			$tmp->urls = $this->item->urls;
+			$this->form->bind($tmp);
+		}
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			JError::raiseWarning(500, implode("\n", $errors));
+			return false;
+		}
+
+		// Create a shortcut to the parameters.
+		$params	= &$this->state->params;
+
+		//Escape strings for HTML output
+		$this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx'));
+
+		$this->params = $params;
+		$this->user   = $user;
+
+		if ($params->get('enable_category') == 1)
+		{
+			$this->form->setFieldAttribute('catid', 'default', $params->get('catid', 1));
+			$this->form->setFieldAttribute('catid', 'readonly', 'true');
+		}
+		$this->_prepareDocument();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Prepares the document
+	 */
+	protected function _prepareDocument()
+	{
+		$app		= JFactory::getApplication();
+		$menus		= $app->getMenu();
+		$title 		= null;
+
+		// Because the application sets a default page title,
+		// we need to get it from the menu item itself
+		$menu = $menus->getActive();
+		if ($menu)
+		{
+			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
+		}
+		else
+		{
+			$this->params->def('page_heading', JText::_('COM_CONTENT_FORM_EDIT_ARTICLE'));
+		}
+
+		$title = $this->params->def('page_title', JText::_('COM_CONTENT_FORM_EDIT_ARTICLE'));
+		if ($app->getCfg('sitename_pagetitles', 0) == 1)
+		{
+			$title = JText::sprintf('JPAGETITLE', $app->getCfg('sitename'), $title);
+		}
+		elseif ($app->getCfg('sitename_pagetitles', 0) == 2)
+		{
+			$title = JText::sprintf('JPAGETITLE', $title, $app->getCfg('sitename'));
+		}
+		$this->document->setTitle($title);
+
+		$pathway = $app->getPathWay();
+		$pathway->addItem($title, '');
+
+		if ($this->params->get('menu-meta_description'))
+		{
+			$this->document->setDescription($this->params->get('menu-meta_description'));
+		}
+
+		if ($this->params->get('menu-meta_keywords'))
+		{
+			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
+		}
+
+		if ($this->params->get('robots'))
+		{
+			$this->document->setMetadata('robots', $this->params->get('robots'));
+		}
+	}
+}

components/com_content/views/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>