From 0fbc25ab044153a4a83e4be995bfd42af4ec83b4 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Mon, 9 Jan 2017 12:38:12 +0100
Subject: [PATCH 01/35] Merge Associations rewrite

---
 .../components/com_associations/access.xml    |   8 +
 .../com_associations/associations.php         |  40 ++
 .../com_associations/associations.xml         |  30 +
 .../components/com_associations/config.xml    |  16 +
 .../com_associations/controller.php           |  26 +
 .../controllers/association.php               |  92 ++++
 .../controllers/associations.php              |  73 +++
 .../com_associations/helpers/associations.php | 505 +++++++++++++++++
 .../layouts/joomla/searchtools/default.php    |  38 ++
 .../joomla/searchtools/default/bar.php        |  40 ++
 .../com_associations/models/association.php   |  36 ++
 .../com_associations/models/associations.php  | 521 ++++++++++++++++++
 .../models/fields/itemlanguage.php            | 116 ++++
 .../models/fields/itemtype.php                |  62 +++
 .../models/fields/modalassociation.php        | 105 ++++
 .../models/forms/association.xml              |  21 +
 .../models/forms/filter_associations.xml      | 107 ++++
 .../views/association/tmpl/edit.php           |  73 +++
 .../views/association/view.html.php           | 202 +++++++
 .../views/associations/tmpl/default.php       | 174 ++++++
 .../views/associations/tmpl/modal.php         | 162 ++++++
 .../views/associations/view.html.php          | 224 ++++++++
 .../com_content/helpers/associations.php      | 181 ++++++
 .../com_menus/helpers/associations.php        | 159 ++++++
 .../language/en-GB/en-GB.com_associations.ini |  49 ++
 .../en-GB/en-GB.com_associations.sys.ini      |   7 +
 layouts/joomla/content/associations.php       |   2 +-
 .../joomla/association/extension/helper.php   | 256 +++++++++
 .../association/extension/interface.php       |  27 +
 media/com_associations/css/sidebyside.css     |  75 +++
 .../js/sidebyside-uncompressed.js             | 301 ++++++++++
 media/com_associations/js/sidebyside.js       |   1 +
 32 files changed, 3728 insertions(+), 1 deletion(-)
 create mode 100644 administrator/components/com_associations/access.xml
 create mode 100644 administrator/components/com_associations/associations.php
 create mode 100644 administrator/components/com_associations/associations.xml
 create mode 100644 administrator/components/com_associations/config.xml
 create mode 100644 administrator/components/com_associations/controller.php
 create mode 100644 administrator/components/com_associations/controllers/association.php
 create mode 100644 administrator/components/com_associations/controllers/associations.php
 create mode 100644 administrator/components/com_associations/helpers/associations.php
 create mode 100644 administrator/components/com_associations/layouts/joomla/searchtools/default.php
 create mode 100644 administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php
 create mode 100644 administrator/components/com_associations/models/association.php
 create mode 100644 administrator/components/com_associations/models/associations.php
 create mode 100644 administrator/components/com_associations/models/fields/itemlanguage.php
 create mode 100644 administrator/components/com_associations/models/fields/itemtype.php
 create mode 100644 administrator/components/com_associations/models/fields/modalassociation.php
 create mode 100644 administrator/components/com_associations/models/forms/association.xml
 create mode 100644 administrator/components/com_associations/models/forms/filter_associations.xml
 create mode 100644 administrator/components/com_associations/views/association/tmpl/edit.php
 create mode 100644 administrator/components/com_associations/views/association/view.html.php
 create mode 100644 administrator/components/com_associations/views/associations/tmpl/default.php
 create mode 100644 administrator/components/com_associations/views/associations/tmpl/modal.php
 create mode 100644 administrator/components/com_associations/views/associations/view.html.php
 create mode 100644 administrator/components/com_content/helpers/associations.php
 create mode 100644 administrator/components/com_menus/helpers/associations.php
 create mode 100644 administrator/language/en-GB/en-GB.com_associations.ini
 create mode 100644 administrator/language/en-GB/en-GB.com_associations.sys.ini
 create mode 100644 libraries/joomla/association/extension/helper.php
 create mode 100644 libraries/joomla/association/extension/interface.php
 create mode 100644 media/com_associations/css/sidebyside.css
 create mode 100644 media/com_associations/js/sidebyside-uncompressed.js
 create mode 100644 media/com_associations/js/sidebyside.js

diff --git a/administrator/components/com_associations/access.xml b/administrator/components/com_associations/access.xml
new file mode 100644
index 0000000000000..e6fd1ec5258d2
--- /dev/null
+++ b/administrator/components/com_associations/access.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<access component="com_associations">
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+		<action name="core.options" title="JACTION_OPTIONS" description="JACTION_OPTIONS_COMPONENT_DESC" />
+		<action name="core.manage" title="JACTION_MANAGE" description="JACTION_MANAGE_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/administrator/components/com_associations/associations.php b/administrator/components/com_associations/associations.php
new file mode 100644
index 0000000000000..2c199cef7031e
--- /dev/null
+++ b/administrator/components/com_associations/associations.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2016 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.tabstate');
+
+if (!JFactory::getUser()->authorise('core.manage', 'com_associations'))
+{
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+}
+
+JLoader::register('AssociationsHelper', __DIR__ . '/helpers/associations.php');
+
+// Check if user has permission to access the component item type.
+$itemtype = JFactory::getApplication()->input->get('itemtype', '', 'string');
+
+if ($itemtype !== '')
+{
+	list($extensionName, $typeName) = explode('.', $itemtype);
+
+	if (! AssociationsHelper::hasSupport($extensionName))
+	{
+		throw new Exception(JText::_('COM_ASSOCIATIONS_COMPONENT_NOT_SUPPORTED') . ' ' . $itemType->realcomponent, 404);
+	}
+
+	if (!JFactory::getUser()->authorise('core.manage', $extensionName))
+	{
+		throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
+	}
+}
+
+$controller = JControllerLegacy::getInstance('Associations');
+$controller->execute(JFactory::getApplication()->input->get('task'));
+$controller->redirect();
diff --git a/administrator/components/com_associations/associations.xml b/administrator/components/com_associations/associations.xml
new file mode 100644
index 0000000000000..082bab1233824
--- /dev/null
+++ b/administrator/components/com_associations/associations.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension type="component" version="3.7" method="upgrade">
+	<name>com_associations</name>
+	<author>Joomla! Project</author>
+	<creationDate>September 2016</creationDate>
+	<copyright>(C) 2005 - 2016 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>__DEPLOY_VERSION__</version>
+	<description>COM_ASSOCIATIONS_XML_DESCRIPTION</description>
+	<administration>
+		<menu img="class:associations">COM_ASSOCIATIONS</menu>
+		<files folder="admin">
+			<filename>access.xml</filename>
+			<filename>config.xml</filename>
+			<filename>associations.php</filename>
+			<filename>controller.php</filename>
+			<folder>controllers</folder>
+			<folder>helpers</folder>
+			<folder>layouts</folder>
+			<folder>models</folder>
+			<folder>views</folder>
+		</files>
+		<languages folder="admin">
+			<language tag="en-GB">language/en-GB.com_associations.ini</language>
+			<language tag="en-GB">language/en-GB.com_associations.sys.ini</language>
+		</languages>
+	</administration>
+</extension>
diff --git a/administrator/components/com_associations/config.xml b/administrator/components/com_associations/config.xml
new file mode 100644
index 0000000000000..20f40eb6d9887
--- /dev/null
+++ b/administrator/components/com_associations/config.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<config>
+	<fieldset
+		name="permissions"
+		label="JCONFIG_PERMISSIONS_LABEL"
+		description="JCONFIG_PERMISSIONS_DESC" >
+		<field
+			name="rules"
+			type="rules"
+			label="JCONFIG_PERMISSIONS_LABEL"
+			filter="rules"
+			validate="rules"
+			component="com_associations"
+			section="component" />
+	</fieldset>
+</config>
diff --git a/administrator/components/com_associations/controller.php b/administrator/components/com_associations/controller.php
new file mode 100644
index 0000000000000..dd8e767dcd8e4
--- /dev/null
+++ b/administrator/components/com_associations/controller.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Component Controller
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AssociationsController extends JControllerLegacy
+{
+	/**
+	 * @var     string  The default view.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $default_view = 'associations';
+
+}
diff --git a/administrator/components/com_associations/controllers/association.php b/administrator/components/com_associations/controllers/association.php
new file mode 100644
index 0000000000000..2489d5feebff2
--- /dev/null
+++ b/administrator/components/com_associations/controllers/association.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2016 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('AssociationsHelper', JPATH_ADMINISTRATOR . '/components/com_associations/helpers/associations.php');
+
+/**
+ * Association edit controller class.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AssociationsControllerAssociation extends JControllerForm
+{
+	/**
+	 * 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   __DEPLOY_VERSION__
+	 */
+	public function edit($key = null, $urlVar = null)
+	{
+		$input = JFactory::getApplication()->input;
+
+		list($extensionName, $typeName) = explode('.', $input->get('itemtype'));
+
+		$id = $input->get('id', 0);
+
+		// Check if reference item can be edited.
+		if (!AssociationsHelper::allowEdit($extensionName, $typeName, $id))
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED'), 'error');
+			$this->setRedirect(JRoute::_('index.php?option=com_associations&view=associations', false));
+
+			return false;
+		}
+
+		return parent::display();
+	}
+
+	/**
+	 * Method for canceling the edit action
+	 *
+	 * @param   string  $key  The name of the primary key of the URL variable.
+	 *
+	 * @return  void.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function cancel($key = null)
+	{
+		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
+
+		$input = JFactory::getApplication()->input;
+
+		list($extensionName, $typeName) = explode('.', $input->get('itemtype'));
+
+		$id = $input->get('id', 0);
+
+		// Only check in, if component item type allows to check out.
+		if (AssociationsHelper::typeSupportsCheckout($extensionName, $typeName))
+		{
+			$ids      = array();
+			$targetId = $this->input->get('target-id', '', 'string');
+
+			if ($targetId !== '')
+			{
+				$ids = array_unique(explode(',', $targetId));
+			}
+
+			$ids[] = $id;
+
+			foreach ($ids as $key => $id)
+			{
+				AssociationsHelper::getItem($extensionName, $typeName, $id)->checkin();
+			}
+		}
+
+		$this->setRedirect(JRoute::_('index.php?option=com_associations&view=associations', false));
+	}
+}
diff --git a/administrator/components/com_associations/controllers/associations.php b/administrator/components/com_associations/controllers/associations.php
new file mode 100644
index 0000000000000..332a05dd5aa46
--- /dev/null
+++ b/administrator/components/com_associations/controllers/associations.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined("_JEXEC") or die("Restricted access");
+
+JLoader::register('AssociationsHelper', JPATH_ADMINISTRATOR . '/components/com_associations/helpers/associations.php');
+
+/**
+ * Associations controller class.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AssociationsControllerAssociations extends JControllerAdmin
+{
+	/**
+	 * The URL view list variable.
+	 *
+	 * @var    string
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $view_list = 'associations';
+
+	/**
+	 * Proxy for getModel.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  The array of possible config values. Optional.
+	 *
+	 * @return  JModel
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getModel($name = 'Associations', $prefix = 'AssociationsModel', $config = array('ignore_request' => true))
+	{
+		return parent::getModel($name, $prefix, $config);
+	}
+
+	/**
+	 * Method to purge the associations table.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function purge()
+	{
+		$model = $this->getModel('associations');
+		$model->purge();
+		$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false));
+	}
+
+	/**
+	 * Method to delete the orphans from the associations table.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function clean()
+	{
+		$model = $this->getModel('associations');
+		$model->clean();
+		$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false));
+	}
+}
diff --git a/administrator/components/com_associations/helpers/associations.php b/administrator/components/com_associations/helpers/associations.php
new file mode 100644
index 0000000000000..55ec3af62c378
--- /dev/null
+++ b/administrator/components/com_associations/helpers/associations.php
@@ -0,0 +1,505 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Registry\Registry;
+
+/**
+ * Associations component helper.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AssociationsHelper extends JHelperContent
+{
+	/**
+	 * var       array   $extensionsSupport  Array of Registry objects of extensions
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	public static $extensionsSupport = null;
+
+	/**
+	 * var       array   $supportedExtensionsList  List of extensions name with support
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	public static $supportedExtensionsList = array();
+
+	/**
+	 * Get the associated items for an item
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 * @param   string  $typeName       The item type
+	 * @param   int     $itemId         The id of item for which we need the associated items
+	 *
+	 * @return  array
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	public static function getAssociationList($extensionName, $typeName, $itemId)
+	{
+		if (! self::hasSupport($extensionName))
+		{
+			return array();
+		}
+
+		// Get the extension specific helper method
+		$helper = self::getExtensionHelper($extensionName);
+
+		$items = $helper->getAssociationList($typeName, $itemId);
+
+		return $items;
+	}
+
+	/**
+	 * Get the the instance of the extension helper class
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 *
+	 * @return  HelperClass|null
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	public static function getExtensionHelper($extensionName)
+	{
+		if (! self::hasSupport($extensionName))
+		{
+			return null;
+		}
+
+		$support = self::$extensionsSupport[$extensionName];
+
+		return $support->get('helper');
+	}
+
+	/**
+	 * Get item information
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 * @param   string  $typeName       The item type
+	 * @param   int     $itemId         The id of item for which we need the associated items
+	 *
+	 * @return  JTable|null
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	public static function getItem($extensionName, $typeName, $itemId)
+	{
+		if (! self::hasSupport($extensionName))
+		{
+			return array();
+		}
+
+		// Get the extension specific helper method
+		$helper = self::getExtensionHelper($extensionName);
+
+		$item = $helper->getItem($typeName, $itemId);
+
+		return $item;
+	}
+
+	/**
+	 * Check if extension supports associations
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 *
+	 * @return bool
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	public static function hasSupport($extensionName)
+	{
+		if (is_null(self::$extensionsSupport))
+		{
+			self::getSupportedExtensions();
+		}
+
+		return in_array($extensionName, self::$supportedExtensionsList);
+	}
+
+	/**
+	 * Get the extension specific helper class name
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 *
+	 * @return bool
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	private static function getExtensionHelperClassName($extensionName)
+	{
+		$realName = self::getExtensionRealName($extensionName);
+
+		return ucfirst($realName) . 'AssociationsHelper';
+	}
+
+	/**
+	 * Get the real extension name. This means without com_
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 *
+	 * @return string
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	private static function getExtensionRealName($extensionName)
+	{
+		return strpos($extensionName, 'com_') === false ? $extensionName : substr($extensionName, 4);
+	}
+
+	/**
+	 * Get the associated language edit links Html.
+	 *
+	 * @param   string   $extensionName  Extension Name
+	 * @param   string   $typeName       ItemType
+	 * @param   integer  $itemId         Item id.
+	 * @param   string   $itemLanguage   Item language code.
+	 * @param   boolean  $addLink        True for adding edit links. False for just text.
+	 * @param   boolean  $allLanguages   True for showing all content languages. False only languages with associations.
+	 *
+	 * @return string The language HTML
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	public static function getAssociationHtmlList($extensionName, $typeName, $itemId, $itemLanguage, $addLink = true, $allLanguages = true)
+	{
+		// Get the associations list for this item.
+		$items = self::getAssociationList($extensionName, $typeName, $itemId);
+
+		// Get all content languages.
+		$languages = self::getContentLanguages();
+
+		$canEditReference = self::allowEdit($extensionName, $typeName, $itemId);
+		$canCreate        = self::allowAdd($extensionName, $typeName);
+
+		// Create associated items list.
+		foreach ($languages as $langCode => $language)
+		{
+			// Don't do for the reference language.
+			if ($langCode == $itemLanguage)
+			{
+				continue;
+			}
+
+			// Don't show languages without associations, if we don't want to show them.
+			if (!$allLanguages && !isset($items[$langCode]))
+			{
+				continue;
+			}
+
+			// Get html parameters.
+			if (isset($items[$langCode]))
+			{
+				$title       = '<br/><br/>' . $items[$langCode]['title'];
+				$additional  = '';
+
+				if (isset($items[$langCode]['category_title']))
+				{
+					$additional = '<br/>' . JText::_('JCATEGORY') . ': ' . $items[$langCode]['category_title'];
+				}
+				elseif (isset($items[$langCode]['menu_title']))
+				{
+					$additional = '<br/>' . JText::_('COM_ASSOCIATIONS_HEADING_MENUTYPE') . ': ' . $items[$langCode]['menu_title'];
+				}
+
+				$additional .= $addLink ? '<br/><br/>' . JText::_('COM_ASSOCIATIONS_EDIT_ASSOCIATION') : '';
+				$labelClass  = 'label';
+				$target      = $langCode . ':' . $items[$langCode]['id'] . ':edit';
+				$allow       = $canEditReference && self::allowEdit($extensionName, $typeName, $items[$langCode]['id']);
+			}
+			else
+			{
+				$items[$langCode] = array();
+
+				$title      = '<br/><br/>' . JText::_('COM_ASSOCIATIONS_NO_ASSOCIATION');
+				$additional = $addLink ? '<br/><br/>' . JText::_('COM_ASSOCIATIONS_ADD_NEW_ASSOCIATION') : '';
+				$labelClass = 'label label-warning';
+				$target     = $langCode . ':0:add';
+				$allow      = $canCreate;
+			}
+
+			// Generate item Html.
+			$options   = array(
+				'option'   => 'com_associations',
+				'view'     => 'association',
+				'layout'   => 'edit',
+				'itemtype' => $extensionName . '.' . $typeName,
+				'task'     => 'association.edit',
+				'id'       => $itemId,
+				'target'   => $target,
+			);
+			$url       = JRoute::_('index.php?' . http_build_query($options));
+			$text      = strtoupper($language->sef);
+			$langImage = JHtml::_('image', 'mod_languages/' . $language->image . '.gif', $language->title, array('title' => $language->title), true);
+			$tooltip   = implode(' ', array($langImage, $language->title, $title, $additional));
+
+			$items[$langCode]['link'] = JHtml::_('tooltip', $tooltip, null, null, $text, $allow && $addLink ? $url : '', null, 'hasTooltip ' . $labelClass);
+		}
+
+		return JLayoutHelper::render('joomla.content.associations', $items);
+	}
+
+	/**
+	 * Get all extensions with associations support.
+	 *
+	 * @return  array  The extensions.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public static function getSupportedExtensions()
+	{
+		if (! is_null(self::$extensionsSupport))
+		{
+			return self::$extensionsSupport;
+		}
+
+		self::$extensionsSupport = array();
+
+		$extensions = self::getEnabledExtensions();
+
+		foreach ($extensions as $extension)
+		{
+			$support = self::getSupportedExtension($extension->element);
+
+			if ($support->get('associationssupport') === true)
+			{
+				self::$supportedExtensionsList[] = $extension->element;
+			}
+
+			self::$extensionsSupport[$extension->element] = $support;
+		}
+
+		return self::$extensionsSupport;
+	}
+
+	/**
+	 * Get item context based on the item key.
+	 *
+	 * @param   string  $extensionName  The extension identifier.
+	 *
+	 * @return  Joomla\Registry\Registry  The item properties.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public static function getSupportedExtension($extensionName)
+	{
+		$result = new Registry;
+
+		$result->def('component', $extensionName);
+		$result->def('associationssupport', false);
+		$result->def('helper', null);
+
+		// Check if associations helper exists
+		if (! file_exists(JPATH_ADMINISTRATOR . '/components/' . $extensionName . '/helpers/associations.php'))
+		{
+			return $result;
+		}
+
+		require_once JPATH_ADMINISTRATOR . '/components/' . $extensionName . '/helpers/associations.php';
+
+		$componentAssociationsHelperClassName = self::getExtensionHelperClassName($extensionName);
+
+		if (! class_exists($componentAssociationsHelperClassName, false))
+		{
+			return $result;
+		}
+
+		// Create an instance of the helper class
+		$helper = new $componentAssociationsHelperClassName;
+		$result->set('helper', $helper);
+
+		if ($helper->hasAssociationsSupport() === false)
+		{
+			return $result;
+		}
+
+		$result->set('associationssupport', true);
+
+		// Get the translated titles.
+		$languagePath = JPATH_ADMINISTRATOR . '/components/' . $extensionName;
+		$lang         = JFactory::getLanguage();
+
+		$lang->load($extensionName . '.sys', JPATH_ADMINISTRATOR);
+		$lang->load($extensionName . '.sys', $languagePath);
+		$lang->load($extensionName, JPATH_ADMINISTRATOR);
+		$lang->load($extensionName, $languagePath);
+
+		$result->def('title', JText::_(strtoupper($extensionName)));
+
+		// Get the supported types
+		$types = $helper->getItemTypes();
+
+		$rTypes = array();
+
+		foreach ($types as $typeName)
+		{
+			$details     = $helper->getType($typeName);
+			$context     = 'component';
+			$title       = $helper->getTypeTitle($typeName);
+			$languageKey = $typeName;
+
+			if ($typeName === 'category')
+			{
+				$languageKey = strtoupper($extensionName) . '_CATEGORIES';
+				$context     = 'category';
+			}
+
+			if ($lang->hasKey(strtoupper($extensionName . '_' . $title . 'S')))
+			{
+				$languageKey = strtoupper($extensionName . '_' . $title . 'S');
+			}
+
+			$title = $lang->hasKey($languageKey) ? JText::_($languageKey) : JText::_('ITEMS');
+
+			$rType = new Registry;
+
+			$rType->def('name', $typeName);
+			$rType->def('details', $details);
+			$rType->def('title', $title);
+			$rType->def('context', $context);
+
+			$rTypes[$typeName] = $rType;
+		}
+
+		$result->def('types', $rTypes);
+
+		return $result;
+	}
+
+	/**
+	 * Get all installed and enabled extensions
+	 *
+	 * @return  mixed
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	private static function getEnabledExtensions()
+	{
+		$db = JFactory::getDbo();
+
+		$query = $db->getQuery(true)
+			->select('*')
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('type') . ' = ' . $db->quote('component'))
+			->where($db->quoteName('enabled') . ' = 1');
+
+		$db->setQuery($query);
+
+		return $db->loadObjectList();
+	}
+
+	/**
+	 * Get all the content languages.
+	 *
+	 * @return  array  Array of objects all content languages by language code.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public static function getContentLanguages()
+	{
+		$db = JFactory::getDbo();
+
+		// Get all content languages.
+		$query = $db->getQuery(true)
+			->select($db->quoteName(array('sef', 'lang_code', 'image', 'title', 'published')))
+			->from($db->quoteName('#__languages'))
+			->order($db->quoteName('ordering') . ' ASC');
+
+		$db->setQuery($query);
+
+		return $db->loadObjectList('lang_code');
+	}
+
+	/**
+	 * Get the associated items for an item
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 * @param   string  $typeName       The item type
+	 * @param   int     $itemId         The id of item for which we need the associated items
+	 *
+	 * @return  bool
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	public static function allowEdit($extensionName, $typeName, $itemId)
+	{
+		if (! self::hasSupport($extensionName))
+		{
+			return false;
+		}
+
+		// Get the extension specific helper method
+		$helper= self::getExtensionHelper($extensionName);
+
+		if (method_exists($helper, 'allowEdit'))
+		{
+			return $helper->allowEdit($typeName, $itemId);
+		}
+
+		$user = JFactory::getUser();
+
+		return $user->authorise('core.edit', $extensionName);
+	}
+
+	/**
+	 * Check if user is allowed to create items.
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 * @param   string  $typeName       The item type
+	 *
+	 * @return  boolean  True on allowed.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public static function allowAdd($extensionName, $typeName)
+	{
+		if (! self::hasSupport($extensionName))
+		{
+			return false;
+		}
+
+		// Get the extension specific helper method
+		$helper= self::getExtensionHelper($extensionName);
+
+		if (method_exists($helper, 'allowAdd'))
+		{
+			return $helper->allowAdd($typeName);
+		}
+
+		$user = JFactory::getUser();
+
+		return $user->authorise('core.create', $extensionName);
+	}
+
+	/**
+	 * Check if the type supports checkout
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 * @param   string  $typeName       The item type
+	 *
+	 * @return  boolean  True on allowed.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public static function typeSupportsCheckout($extensionName, $typeName)
+	{
+		if (! self::hasSupport($extensionName))
+		{
+			return false;
+		}
+
+		// Get the extension specific helper method
+		$helper = self::getExtensionHelper($extensionName);
+
+		$support = $helper->getTypeSupport($typeName);
+
+		return ! empty($support['checkout']);
+	}
+}
diff --git a/administrator/components/com_associations/layouts/joomla/searchtools/default.php b/administrator/components/com_associations/layouts/joomla/searchtools/default.php
new file mode 100644
index 0000000000000..e58e551374b6d
--- /dev/null
+++ b/administrator/components/com_associations/layouts/joomla/searchtools/default.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+// Receive overridable options
+$data['options'] = !empty($data['options']) ? $data['options'] : array();
+
+if ($data['view'] instanceof AssociationsViewAssociations)
+{
+	JFactory::getDocument()->addStyleDeclaration("
+		/* Fixed filter field in search bar */
+		.js-stools .js-stools-selector {
+			float: left;
+			margin-right: 10px;
+			min-width: 220px;
+		}
+		html[dir=rtl] .js-stools .js-stools-selector {
+			float: right;
+			margin-left: 10px
+			margin-right: 0;
+		}
+		.js-stools .js-stools-container-bar .js-stools-selector .chzn-container {
+			padding: 3px 0;
+		}
+	");
+}
+
+// Display the main joomla layout
+echo JLayoutHelper::render('joomla.searchtools.default', $data, null, array('component' => 'none'));
diff --git a/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php b/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php
new file mode 100644
index 0000000000000..91ec2e0c8f80e
--- /dev/null
+++ b/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+if ($data['view'] instanceof AssociationsViewAssociations)
+{
+	$app = JFactory::getApplication();
+
+	// We will get the component item type and language filters & remove it from the form filters.
+	if ($app->input->get('forcedItemType', '', 'string') == '')
+	{
+		$itemTypeField = $data['view']->filterForm->getField('itemtype');
+?>
+	<div class="js-stools-field-filter js-stools-selector">
+		<?php echo $itemTypeField->input; ?>
+	</div>
+<?php
+	}
+	if ($app->input->get('forcedLanguage', '', 'cmd') == '')
+	{
+		$languageField = $data['view']->filterForm->getField('language');
+?>
+	<div class="js-stools-field-filter js-stools-selector">
+		<?php echo $languageField->input; ?>
+	</div>
+<?php
+	}
+}
+
+// Display the main joomla layout
+echo JLayoutHelper::render('joomla.searchtools.default.bar', $data, null, array('component' => 'none'));
diff --git a/administrator/components/com_associations/models/association.php b/administrator/components/com_associations/models/association.php
new file mode 100644
index 0000000000000..d90a792501c85
--- /dev/null
+++ b/administrator/components/com_associations/models/association.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Methods supporting a list of article records.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AssociationsModelAssociation extends JModelList
+{
+	/**
+	 * Method to get the record form.
+	 *
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
+	 *
+	 * @return  mixed  A JForm object on success, false on failure
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getForm($data = array(), $loadData = true)
+	{
+		// Get the form.
+		$form = $this->loadForm('com_associations.association', 'association', array('control' => 'jform', 'load_data' => $loadData));
+
+		return !empty($form) ? $form : false;
+	}
+}
diff --git a/administrator/components/com_associations/models/associations.php b/administrator/components/com_associations/models/associations.php
new file mode 100644
index 0000000000000..a32796a5617b1
--- /dev/null
+++ b/administrator/components/com_associations/models/associations.php
@@ -0,0 +1,521 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Methods supporting a list of article records.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AssociationsModelAssociations extends JModelList
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 * @see     JController
+	 */
+	public function __construct($config = array())
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'id',
+				'title',
+				'ordering',
+				'itemtype',
+				'language',
+				'association',
+				'menutype', 'menutype_title',
+				'level',
+				'state',
+				'category_id', 'category_title',
+				'access', 'access_level',
+			);
+		}
+
+		parent::__construct($config);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected function populateState($ordering = 'ordering', $direction = 'asc')
+	{
+		$app = JFactory::getApplication();
+
+		$forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
+		$forcedItemType = $app->input->get('forcedItemType', '', 'string');
+
+		// Adjust the context to support modal layouts.
+		if ($layout = $app->input->get('layout'))
+		{
+			$this->context .= '.' . $layout;
+		}
+
+		// Adjust the context to support forced languages.
+		if ($forcedLanguage)
+		{
+			$this->context .= '.' . $forcedLanguage;
+		}
+
+		// Adjust the context to support forced component item types.
+		if ($forcedItemType)
+		{
+			$this->context .= '.' . $forcedItemType;
+		}
+
+		$this->setState('itemtype', $this->getUserStateFromRequest($this->context . '.itemtype', 'itemtype', '', 'string'));
+		$this->setState('language', $this->getUserStateFromRequest($this->context . '.language', 'language', '', 'string'));
+
+		$this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string'));
+		$this->setState('filter.state', $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state', '', 'cmd'));
+		$this->setState('filter.category_id', $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id', '', 'cmd'));
+		$this->setState('filter.menutype', $this->getUserStateFromRequest($this->context . '.filter.menutype', 'filter_menutype', '', 'string'));
+		$this->setState('filter.access', $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', '', 'string'));
+		$this->setState('filter.level', $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level', '', 'cmd'));
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+
+		// Force a language.
+		if (!empty($forcedLanguage))
+		{
+			$this->setState('language', $forcedLanguage);
+		}
+
+		// Force a component item type.
+		if (!empty($forcedItemType))
+		{
+			$this->setState('itemtype', $forcedItemType);
+		}
+	}
+
+	/**
+	 * 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  __DEPLOY_VERSION__
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('itemtype');
+		$id .= ':' . $this->getState('language');
+		$id .= ':' . $this->getState('filter.search');
+		$id .= ':' . $this->getState('filter.state');
+		$id .= ':' . $this->getState('filter.category_id');
+		$id .= ':' . $this->getState('filter.menutype');
+		$id .= ':' . $this->getState('filter.access');
+		$id .= ':' . $this->getState('filter.level');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  JDatabaseQuery
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected function getListQuery()
+	{
+		$type     = null;
+
+		list($extensionName, $typeName) = explode('.', $this->state->get('itemtype'));
+
+		$extension = AssociationsHelper::getSupportedExtension($extensionName);
+
+		$types = $extension->get('types');
+
+		if (array_key_exists($typeName, $types))
+		{
+			$type = $types[$typeName];
+		}
+
+		if (is_null($type))
+		{
+			return false;
+		}
+
+		// Create a new query object.
+		$user     = JFactory::getUser();
+		$db       = $this->getDbo();
+		$query    = $db->getQuery(true);
+
+		$details = $type->get('details');
+
+		if (! array_key_exists('support', $details))
+		{
+			return false;
+		}
+
+		$support = $details['support'];
+
+		if (! array_key_exists('fields', $details))
+		{
+			return false;
+		}
+
+		$fields = $details['fields'];
+
+		// Main query.
+		$query->select($db->qn($fields['id'], 'id'))
+			->select($db->qn($fields['title'], 'title'))
+			->select($db->qn($fields['alias'], 'alias'));
+
+		if (! array_key_exists('tables', $details))
+		{
+			return false;
+		}
+
+		$tables = $details['tables'];
+
+		foreach ($tables as $key => $table)
+		{
+			$query->from($db->qn($table, $key));
+		}
+
+		if (! array_key_exists('joins', $details))
+		{
+			return false;
+		}
+
+		$joins = $details['joins'];
+
+		foreach ($joins as $join)
+		{
+			$query->join($join['type'], $db->qn($join['condition']));
+		}
+
+		// Join over the language.
+		$query->select($db->qn($fields['language'], 'language'))
+			->select($db->qn('l.title', 'language_title'))
+			->select($db->qn('l.image', 'language_image'))
+			->join('LEFT', $db->qn('#__languages', 'l') . ' ON ' . $db->qn('l.lang_code') . ' = ' . $db->qn($fields['language']));
+
+		// Join over the associations.
+		$query->select('COUNT(' . $db->qn('asso2.id') . ') > 1 AS ' . $db->qn('association'))
+			->join(
+				'LEFT',
+				$db->qn('#__associations', 'asso') . ' ON ' . $db->qn('asso.id') . ' = ' . $db->qn($fields['id'])
+				. ' AND ' . $db->qn('asso.context') . ' = ' . $db->quote($extensionName . '.' . 'item')
+			)
+			->join('LEFT', $db->qn('#__associations', 'asso2') . ' ON ' . $db->qn('asso2.key') . ' = ' . $db->qn('asso.key'));
+
+		// Prepare the group by clause.
+		$groupby = array(
+			$fields['id'],
+			$fields['title'],
+			$fields['language'],
+			'l.title',
+			'l.image',
+		);
+
+		// Select author for ACL checks.
+		if (! empty($fields['created_user_id']))
+		{
+			$query->select($db->qn($fields['created_user_id'], 'created_user_id'));
+		}
+
+		// Select checked out data for check in checkins.
+		if (! empty($fields['checked_out']) && ! empty($fields['checked_out_time']))
+		{
+			$query->select($db->qn($fields['checked_out'], 'checked_out'))
+				->select($db->qn($fields['checked_out_time'], 'checked_out_time'));
+
+			// Join over the users.
+			$query->select($db->qn('u.name', 'editor'))
+				->join('LEFT', $db->qn('#__users', 'u') . ' ON ' . $db->qn('u.id') . ' = ' . $db->qn($fields['checked_out']));
+
+			$groupby[] = 'u.name';
+		}
+
+		// If component item type supports ordering, select the ordering also.
+		if (! empty($fields['ordering']))
+		{
+			$query->select($db->qn($fields['ordering'], 'ordering'));
+		}
+
+		// If component item type supports state, select the item state also.
+		if (! empty($fields['state']))
+		{
+			$query->select($db->qn($fields['state'], 'state'));
+		}
+
+		// If component item type supports level, select the level also.
+		if (! empty($fields['level']))
+		{
+			$query->select($db->qn($fields['level'], 'level'));
+		}
+
+		// If component item type supports categories, select the category also.
+		if (! empty($fields['catid']))
+		{
+			$query->select($db->qn($fields['catid'], 'catid'));
+
+			// Join over the categories.
+			$query->select($db->qn('c.title', 'category_title'))
+				->join('LEFT', $db->qn('#__categories', 'c') . ' ON ' . $db->qn('c.id') . ' = ' . $db->qn($fields['catid']));
+
+			$groupby[] = 'c.title';
+		}
+
+		// If component item type supports menu type, select the menu type also.
+		if (!empty($fields['menutype']))
+		{
+			$query->select($db->qn($fields['menutype'], 'menutype'));
+
+			// Join over the menu types.
+			$query->select($db->qn('mt.title', 'menutype_title'))
+				->select($db->qn('mt.id', 'menutypeid'))
+				->join('LEFT', $db->qn('#__menu_types', 'mt') . ' ON ' . $db->qn('mt.menutype') . ' = ' . $db->qn($fields['menutype']));
+
+			$groupby[] = 'mt.title';
+			$groupby[] = 'mt.id';
+		}
+
+		// If component item type supports access level, select the access level also.
+		if (array_key_exists('acl', $support) && $support['acl'] == true && ! empty($fields['access']))
+		{
+			$query->select($db->qn($fields['access'], 'access'));
+
+			// Join over the access levels.
+			$query->select($db->qn('ag.title', 'access_level'))
+				->join('LEFT', $db->qn('#__viewlevels', 'ag') . ' ON ' . $db->qn('ag.id') . ' = ' . $db->qn($fields['access']));
+
+			$groupby[] = 'ag.title';
+
+			// Implement View Level Access.
+			if (!$user->authorise('core.admin', $extension))
+			{
+				$query->where($fields['access'] . ' IN (' . implode(',', $user->getAuthorisedViewLevels()) . ')');
+			}
+		}
+
+		// If component item type is menus we need to remove the root item and the administrator menu.
+		if ($extension === 'com_menus')
+		{
+			$query->where($db->qn($fields['id']) . ' > 1')
+				->where($db->qn('a.client_id') . ' = 0');
+		}
+		// If component item type is categories we need to remove all other component categories.
+		elseif ($extension === 'com_categories')
+		{
+			$query->where($db->qn('a.extension') . ' = ' . $db->quote('X'));
+		}
+
+		// Filter on the language.
+		if ($language = $this->getState('language'))
+		{
+			$query->where($db->qn($fields['language']) . ' = ' . $db->quote($language));
+		}
+
+		// Filter by item state.
+		$state = $this->getState('filter.state');
+
+		if (is_numeric($state))
+		{
+			$query->where($db->qn($fields['state']) . ' = ' . (int) $state);
+		}
+		elseif ($state === '')
+		{
+			$query->where($db->qn($fields['state']) . ' IN (0, 1)');
+		}
+
+		// Filter on the category.
+		$baselevel = 1;
+
+		if ($categoryId = $this->getState('filter.category_id'))
+		{
+			$categoryTable = JTable::getInstance('Category', 'JTable');
+			$categoryTable->load($categoryId);
+			$baselevel = (int) $categoryTable->level;
+
+			$query->where($db->qn('c.lft') . ' >= ' . (int) $categoryTable->lft)
+				->where($db->qn('c.rgt') . ' <= ' . (int) $categoryTable->rgt);
+		}
+
+		// Filter on the level.
+		if ($level = $this->getState('filter.level'))
+		{
+			$tableAlias = in_array($extension, array('com_menus', 'com_categories')) ? 'a' : 'c';
+			$query->where($db->qn($tableAlias . '.level') . ' <= ' . ((int) $level + (int) $baselevel - 1));
+		}
+
+		// Filter by menu type.
+		if ($menutype = $this->getState('filter.menutype'))
+		{
+			$query->where($fields['menutype'] . ' = ' . $db->quote($menutype));
+		}
+
+		// Filter by access level.
+		if ($access = $this->getState('filter.access'))
+		{
+			$query->where($fields['access'] . ' = ' . (int) $access);
+		}
+
+		// Filter by search in name.
+		if ($search = $this->getState('filter.search'))
+		{
+			if (stripos($search, 'id:') === 0)
+			{
+				$query->where($db->qn($fields['id']) . ' = ' . (int) substr($search, 3));
+			}
+			else
+			{
+				$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+				$query->where('(' . $db->qn($fields['title']) . ' LIKE ' . $search
+					. ' OR ' . $db->qn($fields['alias']) . ' LIKE ' . $search . ')');
+			}
+		}
+
+		// Add the group by clause
+		$query->group($db->qn($groupby));
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering') . ' ' . $this->getState('list.direction')));
+
+		return $query;
+	}
+
+	/**
+	 * Delete associations from #__associations table.
+	 *
+	 * @param   string  $context  The associations context. Empty for all.
+	 * @param   string  $key      The associations key. Empty for all.
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function purge($context = '', $key = '')
+	{
+		$db  = $this->getDbo();
+		$app = JFactory::getApplication();
+
+		$query = $db->getQuery(true)->delete($db->qn('#__associations'));
+
+		// Filter by associations context.
+		if ($context)
+		{
+			$query->where($db->qn('context') . ' = ' . $db->quote($context));
+		}
+
+		// Filter by key.
+		if ($key)
+		{
+			$query->where($db->qn('key') . ' = ' . $db->quote($key));
+		}
+
+		$db->setQuery($query);
+
+		try
+		{
+			$db->execute();
+		}
+		catch (JDatabaseExceptionExecuting $e)
+		{
+			$app->enqueueMessage(JText::_('COM_ASSOCIATIONS_PURGE_FAILED'), 'error');
+
+			return false;
+		}
+
+		$app->enqueueMessage(JText::_((int) $db->getAffectedRows() > 0 ? 'COM_ASSOCIATIONS_PURGE_SUCCESS' : 'COM_ASSOCIATIONS_PURGE_NONE'), 'message');
+
+		return true;
+	}
+
+	/**
+	 * Delete orphans from the #__associations table.
+	 *
+	 * @param   string  $context  The associations context. Empty for all.
+	 * @param   string  $key      The associations key. Empty for all.
+	 *
+	 * @return  boolean  True on success
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function clean($context = '', $key = '')
+	{
+		$db  = $this->getDbo();
+		$app = JFactory::getApplication();
+
+		$query = $db->getQuery(true)
+			->select($db->qn('key') . ', COUNT(*)')
+			->from($db->qn('#__associations'))
+			->group($db->qn('key'))
+			->having('COUNT(*) = 1');
+
+		// Filter by associations context.
+		if ($context)
+		{
+			$query->where($db->qn('context') . ' = ' . $db->quote($context));
+		}
+
+		// Filter by key.
+		if ($key)
+		{
+			$query->where($db->qn('key') . ' = ' . $db->quote($key));
+		}
+
+		$db->setQuery($query);
+
+		$assocKeys = $db->loadObjectList();
+
+		$count = 0;
+
+		// We have orphans. Let's delete them.
+		foreach ($assocKeys as $value)
+		{
+			$query->clear()
+				->delete($db->qn('#__associations'))
+				->where($db->qn('key') . ' = ' . $db->quote($value->key));
+
+			$db->setQuery($query);
+
+			try
+			{
+				$db->execute();
+			}
+			catch (JDatabaseExceptionExecuting $e)
+			{
+				$app->enqueueMessage(JText::_('COM_ASSOCIATIONS_DELETE_ORPHANS_FAILED'), 'error');
+
+				return false;
+			}
+
+			$count += (int) $db->getAffectedRows();
+		}
+
+		$app->enqueueMessage(JText::_($count > 0 ? 'COM_ASSOCIATIONS_DELETE_ORPHANS_SUCCESS' : 'COM_ASSOCIATIONS_DELETE_ORPHANS_NONE'), 'message');
+
+		return true;
+	}
+}
diff --git a/administrator/components/com_associations/models/fields/itemlanguage.php b/administrator/components/com_associations/models/fields/itemlanguage.php
new file mode 100644
index 0000000000000..a49eb636b0b5c
--- /dev/null
+++ b/administrator/components/com_associations/models/fields/itemlanguage.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JLoader::register('AssociationsHelper', JPATH_ADMINISTRATOR . '/components/com_associations/helpers/associations.php');
+
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Form Field class for the Joomla Framework.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class JFormFieldItemLanguage extends JFormFieldList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var        string
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $type = 'ItemLanguage';
+
+	/**
+	 * Method to get the field options.
+	 *
+	 * @return  array  The field option objects.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function getOptions()
+	{
+		$input = JFactory::getApplication()->input;
+
+		list($extensionName, $typeName) = explode('.', $input->get('itemtype'));
+
+		$extension = AssociationsHelper::getSupportedExtension($extensionName);
+		$types     = $extension->get('types');
+
+		if (array_key_exists($typeName, $types))
+		{
+			$type = $types[$typeName];
+		}
+
+		$details = $type->get('details');
+
+		if (array_key_exists('fields', $details))
+		{
+			$fields = $details['fields'];
+		}
+
+		$languageField = substr($fields['language'], 2);
+		$referenceId   = $input->get('id', 0, 'int');
+		$reference     = ArrayHelper::fromObject(AssociationsHelper::getItem($extensionName, $typeName, $referenceId));
+		$referenceLang = $reference[$languageField];
+
+		// Get item associations given ID and item type
+		$associations = AssociationsHelper::getAssociationList($extensionName, $typeName, $referenceId);
+
+		// Check if user can create items in this component item type.
+		$canCreate = AssociationsHelper::allowAdd($extensionName, $typeName);
+
+		// Gets existing languages.
+		$existingLanguages = AssociationsHelper::getContentLanguages();
+
+		$options = array();
+
+		// Each option has the format "<lang>|<id>", example: "en-GB|1"
+		foreach ($existingLanguages as $langCode => $language)
+		{
+			// If language code is equal to reference language we don't need it.
+			if ($language->lang_code == $referenceLang)
+			{
+				continue;
+			}
+
+			$options[$langCode]       = new stdClass;
+			$options[$langCode]->text = $language->title;
+
+			// If association exists in this language.
+			if (isset($associations[$language->lang_code]))
+			{
+				$itemId                    = (int) $associations[$language->lang_code]['id'];
+				$options[$langCode]->value = $language->lang_code . ':' . $itemId . ':edit';
+
+				 // Check if user does have permission to edit the associated item.
+				$canEdit = AssociationsHelper::allowEdit($extensionName, $typeName, $itemId);
+
+				// ToDo: Do an additional check to check if user can edit a checked out item (if component item type supports it).
+				$canCheckout = true;
+
+				// Disable language if user is not allowed to edit the item associated to it.
+				$options[$langCode]->disable = !($canEdit && $canCheckout);
+			}
+			else
+			{
+				// New item, id = 0 and disabled if user is not allowed to create new items.
+				$options[$langCode]->value   = $language->lang_code . ':0:add';
+
+				// Disable language if user is not allowed to create items.
+				$options[$langCode]->disable = !$canCreate;
+			}
+		}
+
+		return array_merge(parent::getOptions(), $options);
+	}
+}
diff --git a/administrator/components/com_associations/models/fields/itemtype.php b/administrator/components/com_associations/models/fields/itemtype.php
new file mode 100644
index 0000000000000..45d01e7aae237
--- /dev/null
+++ b/administrator/components/com_associations/models/fields/itemtype.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+defined('JPATH_BASE') or die;
+
+JLoader::register('AssociationsHelper', JPATH_ADMINISTRATOR . '/components/com_associations/helpers/associations.php');
+
+JFormHelper::loadFieldClass('groupedlist');
+
+/**
+ * A drop down containing all component item types that implement associations.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class JFormFieldItemType extends JFormFieldGroupedList
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $type = 'ItemType';
+	
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  array  The field option objects as a nested array in groups.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 * @throws  UnexpectedValueException
+	 */
+	protected function getGroups()
+	{
+		$options   = array();
+		$extensions = AssociationsHelper::getSupportedExtensions();
+
+		foreach ($extensions as $extension)
+		{
+			if ($extension->get('associationssupport') === true)
+			{
+				foreach ($extension->get('types') as $type)
+				{
+					$context =  $extension->get('component') . '.' . $type->get('name');
+					$options[$extension->get('title')][] = JHtml::_('select.option', $context, $type->get('title'));
+				}
+			}
+		}
+
+		// Sort by alpha order.
+		ksort($options, SORT_NATURAL);
+
+		// Add options to parent array.
+		return array_merge(parent::getGroups(), $options);
+	}
+}
diff --git a/administrator/components/com_associations/models/fields/modalassociation.php b/administrator/components/com_associations/models/fields/modalassociation.php
new file mode 100644
index 0000000000000..be7f594c316b7
--- /dev/null
+++ b/administrator/components/com_associations/models/fields/modalassociation.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Supports a modal item picker.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class JFormFieldModalAssociation extends JFormField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var     string
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $type = 'Modal_Association';
+
+	/**
+	 * Method to get the field input markup.
+	 *
+	 * @return  string  The field input markup.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function getInput()
+	{
+		// The active item id field.
+		$value = (int) $this->value > 0 ? (int) $this->value : '';
+
+		// Build the script.
+		$script = array();
+
+		// Select button script
+		$script[] = '	function jSelectAssociation_' . $this->id . '(id) {';
+		$script[] = '       target = document.getElementById("target-association");';
+		$script[] = '		document.getElementById("target-association").src = target.getAttribute("data-editurl") + '
+								. '"&task=" + target.getAttribute("data-item") + ".edit" + "&id=" + id';
+		$script[] = '		jQuery("#associationSelect' . $this->id . 'Modal").modal("hide");';
+		$script[] = '	}';
+
+		// Add the script to the document head.
+		JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
+
+		// Setup variables for display.
+		$html = array();
+
+		$linkAssociations = 'index.php?option=com_associations&amp;view=associations&amp;layout=modal&amp;tmpl=component'
+			. '&amp;forcedItemType=' . JFactory::getApplication()->input->get('itemtype', '', 'string') . '&amp;function=jSelectAssociation_' . $this->id;
+
+		$linkAssociations .= "&amp;forcedLanguage=' + document.getElementById('target-association').getAttribute('data-language') + '";
+
+		$urlSelect = $linkAssociations . '&amp;' . JSession::getFormToken() . '=1';
+
+		// Select custom association button
+		$html[] = '<a'
+			. ' id="select-change"'
+			. ' class="btn' . ($value ? '' : ' hidden') . '"'
+			. ' data-toggle="modal"'
+			. ' data-select="' . JText::_('COM_ASSOCIATIONS_SELECT_TARGET') . '"'
+			. ' data-change="' . JText::_('COM_ASSOCIATIONS_CHANGE_TARGET') . '"'
+			. ' role="button"'
+			. ' href="#associationSelect' . $this->id . 'Modal">'
+			. '<span class="icon-file"></span>'
+			. '<span id="select-change-text"></span>'
+			. '</a>';
+
+		// Clear association button
+		$html[] = '<button'
+ 				. ' class="btn' . ($value ? '' : ' hidden') . '"'
+ 				. ' onclick="return Joomla.submitbutton(\'undo-association\');"'
+ 				. ' id="remove-assoc">'
+ 				. '<span class="icon-remove"></span>' . JText::_('JCLEAR')
+ 				. '</button>';
+
+		$html[] = '<input type="hidden" id="' . $this->id . '_id" name="' . $this->name . '" value="' . $value . '" />';
+
+		// Select custom association modal
+		$html[] = JHtml::_(
+			'bootstrap.renderModal',
+			'associationSelect' . $this->id . 'Modal',
+			array(
+				'title'       => JText::_('COM_ASSOCIATIONS_SELECT_TARGET'),
+				'backdrop'    => 'static',
+				'url'         => $urlSelect,
+				'height'      => '400px',
+				'width'       => '800px',
+				'bodyHeight'  => '70',
+				'modalWidth'  => '80',
+				'footer'      => '<button type="button" class="btn" data-dismiss="modal" aria-hidden="true">'
+						. JText::_("JLIB_HTML_BEHAVIOR_CLOSE") . '</button>',
+			)
+		);
+
+		return implode("\n", $html);
+	}
+}
diff --git a/administrator/components/com_associations/models/forms/association.xml b/administrator/components/com_associations/models/forms/association.xml
new file mode 100644
index 0000000000000..9e8d880e22984
--- /dev/null
+++ b/administrator/components/com_associations/models/forms/association.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fieldset>
+		<field
+			name="itemlanguage"
+			type="itemlanguage"
+			label="COM_ASSOCIATIONS_ITEM_FIELD_LANGUAGE_LABEL"
+			description="COM_ASSOCIATIONS_ITEM_FIELD_LANGUAGE_DESC"
+			>
+			<option value="">COM_ASSOCIATIONS_SELECT_TARGET_LANGUAGE</option>
+		</field>
+
+		<field
+			name="modalassociation"
+			type="modalassociation"
+		/>
+	</fieldset>
+
+	<fields name="params">
+	</fields>
+</form>
diff --git a/administrator/components/com_associations/models/forms/filter_associations.xml b/administrator/components/com_associations/models/forms/filter_associations.xml
new file mode 100644
index 0000000000000..72d2c980c8afc
--- /dev/null
+++ b/administrator/components/com_associations/models/forms/filter_associations.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<field
+		name="itemtype"
+		type="itemtype"
+		label="COM_ASSOCIATIONS_COMPONENT_SELECTOR_LABEL"
+		description="COM_ASSOCIATIONS_COMPONENT_SELECTOR_DESC"
+		onchange="jQuery('select[id^=\'filter_\']').val('');jQuery('select[id^=\'list_\']').val('');this.form.submit();"
+		>
+		<option value="">COM_ASSOCIATIONS_FILTER_SELECT_ITEM_TYPE</option>
+	</field>
+	<field
+		name="language"
+		type="contentlanguage"
+		label="JOPTION_FILTER_LANGUAGE"
+		description="JOPTION_FILTER_LANGUAGE_DESC"
+		onchange="this.form.submit();"
+		>
+		<option value="">JOPTION_SELECT_LANGUAGE</option>
+	</field>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_ASSOCIATIONS_FILTER_SEARCH_LABEL"
+			description="COM_ASSOCIATIONS_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			name="state"
+			type="status"
+			label="JOPTION_FILTER_PUBLISHED"
+			description="JOPTION_FILTER_PUBLISHED_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			name="category_id"
+			type="category"
+			label="JOPTION_FILTER_CATEGORY"
+			description="JOPTION_FILTER_CATEGORY_DESC"
+			published="0,1,2"
+			extension="dynamic"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_CATEGORY</option>
+		</field>
+		<field
+			name="menutype"
+			type="menu"
+			label="COM_ASSOCIATIONS_FILTER_MENUTYPE_LABEL"
+			description="COM_ASSOCIATIONS_FILTER_MENUTYPE_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">COM_ASSOCIATIONS_SELECT_MENU</option>
+		</field>
+		<field
+			name="access"
+			type="accesslevel"
+			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_ACCESS</option>
+		</field>
+		<field
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			onchange="this.form.submit();"
+			>
+			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+		</field>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			default="ordering ASC"
+			onchange="this.form.submit();"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="state ASC">JSTATUS_ASC</option>
+			<option value="state DESC">JSTATUS_DESC</option>
+			<option value="title ASC">JGLOBAL_TITLE_ASC</option>
+			<option value="title DESC">JGLOBAL_TITLE_DESC</option>
+			<option value="access_level ASC">JGRID_HEADING_ACCESS_ASC</option>
+			<option value="access_level DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			default="25"
+			class="input-mini"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/administrator/components/com_associations/views/association/tmpl/edit.php b/administrator/components/com_associations/views/association/tmpl/edit.php
new file mode 100644
index 0000000000000..51454d113a514
--- /dev/null
+++ b/administrator/components/com_associations/views/association/tmpl/edit.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2016 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.formvalidator');
+JHtml::_('behavior.keepalive');
+JHtml::_('formbehavior.chosen', 'select');
+
+JHtml::_('script', 'com_associations/sidebyside.js', false, true);
+JHtml::_('stylesheet', 'com_associations/sidebyside.css', array(), true);
+
+$input   = $this->app->input;
+$options = array(
+			'layout'            => $input->get('layout', '', 'string'),
+			'itemtype'          => $this->itemtype,
+			'id'                => $this->referenceId,
+		);
+?>
+<button id="toogle-left-panel" class="btn btn-small" 
+		data-show-reference="<?php echo JText::_('COM_ASSOCIATIONS_EDIT_SHOW_REFERENCE'); ?>"
+		data-hide-reference="<?php echo JText::_('COM_ASSOCIATIONS_EDIT_HIDE_REFERENCE'); ?>"><?php echo JText::_('COM_ASSOCIATIONS_EDIT_HIDE_REFERENCE'); ?>
+</button>
+
+<form action="<?php echo JRoute::_('index.php?option=com_associations&view=association&' . http_build_query($options)); ?>" method="post" name="adminForm" id="adminForm" data-associatedview="<?php echo $this->type->get('name'); ?>">
+
+	<div class="sidebyside">
+
+		<div class="outer-panel" id="left-panel">
+			<div class="inner-panel">
+				<h3><?php echo JText::_('COM_ASSOCIATIONS_REFERENCE_ITEM'); ?></h3>
+				<iframe id="reference-association" name="reference-association"
+					src="<?php echo JRoute::_($this->editUri . '&task=' . $this->type->get('name') . '.edit&id=' . (int) $this->referenceId); ?>"
+					height="400" width="400"
+					data-action="edit"
+					data-item="<?php echo $this->type->get('name'); ?>"
+					data-id="<?php echo $this->referenceId; ?>"
+					data-language="<?php echo $this->referenceLanguage; ?>"
+					data-editurl="<?php echo JRoute::_($this->editUri); ?>">
+				</iframe>
+			</div>
+		</div>
+		<div class="outer-panel" id="right-panel">
+			<div class="inner-panel">
+				<div class="language-selector">
+					<h3 class="target-text"><?php echo JText::_('COM_ASSOCIATIONS_ASSOCIATED_ITEM'); ?></h3>
+					<?php echo $this->form->getInput('modalassociation'); ?>
+					<?php echo $this->form->getInput('itemlanguage'); ?>
+				</div>
+				<iframe id="target-association" name="target-association"
+					src="<?php echo $this->defaultTargetSrc; ?>"
+					height="400" width="400"
+					data-action="<?php echo $this->targetAction; ?>"
+					data-item="<?php echo $this->type->get('name'); ?>"
+					data-id="<?php echo $this->targetId; ?>"
+					data-language="<?php echo $this->targetLanguage; ?>"
+					data-editurl="<?php echo JRoute::_($this->editUri); ?>">
+				</iframe>
+			</div>
+		</div>
+
+	</div>
+
+	<input type="hidden" name="task" value=""/>
+	<input type="hidden" name="target-id" id="target-id" value=""/>
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/administrator/components/com_associations/views/association/view.html.php b/administrator/components/com_associations/views/association/view.html.php
new file mode 100644
index 0000000000000..c4ce0ea7d22c3
--- /dev/null
+++ b/administrator/components/com_associations/views/association/view.html.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * View class for a list of articles.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AssociationsViewAssociation extends JViewLegacy
+{
+	/**
+	 * An array of items
+	 *
+	 * @var  array
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var  JPagination
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected $state;
+
+	/**
+	 * Selected item type properties.
+	 *
+	 * @var  Registry
+	 *
+	 * @since __DEPLOY_VERSION__
+	 */
+	public $itemType = null;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function display($tpl = null)
+	{
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		$this->app   = JFactory::getApplication();
+
+		$this->form  = $this->get('Form');
+		$input       = $this->app->input;
+
+		$this->referenceId = $input->get('id', 0, 'int');
+
+		list($extensionName, $typeName) = explode('.', $input->get('itemtype'));
+
+		$extension = AssociationsHelper::getSupportedExtension($extensionName);
+
+		$types = $extension->get('types');
+
+		if (array_key_exists($typeName, $types))
+		{
+			$this->type = $types[$typeName];
+		}
+
+		$this->itemtype = $extensionName . '.' . $typeName;
+
+		$details = $this->type->get('details');
+
+		if (array_key_exists('fields', $details))
+		{
+			$fields = $details['fields'];
+		}
+
+		$languageField = substr($fields['language'], 2);
+		$referenceId   = $input->get('id', 0, 'int');
+		$reference     = ArrayHelper::fromObject(AssociationsHelper::getItem($extensionName, $typeName, $referenceId));
+
+		$this->referenceLanguage = $reference[$languageField];
+
+		$options = array(
+			'option'    => $typeName === 'category' ? 'com_categories' : $extensionName,
+			'view'      => $typeName,
+			'extension' => $extensionName,
+			'tmpl'      => 'component',
+		);
+
+		// Reference and target edit links.
+		$this->editUri = 'index.php?' . http_build_query($options);
+
+		// Get target language.
+		$this->targetId         = '0';
+		$this->targetLanguage   = '';
+		$this->defaultTargetSrc = '';
+		$this->targetAction     = '';
+
+		if ($target = $input->get('target', '', 'string'))
+		{
+			$matches = preg_split("#[\:]+#", $target);
+			$this->targetAction     = $matches[2];
+			$this->targetId         = $matches[1];
+			$this->targetLanguage   = $matches[0];
+			$task                   = $typeName . '.' . $this->targetAction;
+			$this->defaultTargetSrc = JRoute::_($this->editUri . '&task= ' . $task . ' &id=' . (int) $this->targetId);
+			$this->form->setValue('itemlanguage', '', $this->targetLanguage . ':' . $this->targetId . ':' . $this->targetAction);
+		}
+
+		/*
+		* @todo Review later
+		*/
+
+		// We don't need toolbar in the modal window.
+		if ($this->getLayout() !== 'modal')
+		{
+			$this->addToolbar();
+			$this->sidebar = JHtmlSidebar::render();
+		}
+		else
+		{
+			// In article associations modal we need to remove language filter if forcing a language.
+			// We also need to change the category filter to show show categories with All or the forced language.
+			if ($forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'CMD'))
+			{
+				// If the language is forced we can't allow to select the language, so transform the language selector filter into an hidden field.
+				$languageXml = new SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
+				$this->filterForm->setField($languageXml, 'filter', true);
+
+				// Also, unset the active language filter so the search tools is not open by default with this filter.
+				unset($this->activeFilters['language']);
+
+				// One last changes needed is to change the category filter to just show categories with All language or with the forced language.
+				$this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter');
+			}
+		}
+
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function addToolbar()
+	{
+		// Hide main menu.
+		JFactory::getApplication()->input->set('hidemainmenu', 1);
+
+		JToolbarHelper::title(JText::sprintf('COM_ASSOCIATIONS_TITLE_EDIT', 'componentTitle', 'title'), 'contract');
+
+		$bar = JToolbar::getInstance('toolbar');
+
+		$bar->appendButton(
+			'Custom', '<button onclick="Joomla.submitbutton(\'reference\')"'
+			. 'class="btn btn-small btn-success"><span class="icon-apply icon-white"></span>'
+			. JText::_('COM_ASSOCIATIONS_SAVE_REFERENCE') . '</button>', 'reference'
+		);
+
+		$bar->appendButton(
+			'Custom', '<button onclick="Joomla.submitbutton(\'target\')"'
+			. 'class="btn btn-small btn-success"><span class="icon-apply icon-white"></span>'
+			. JText::_('COM_ASSOCIATIONS_SAVE_TARGET') . '</button>', 'target'
+		);
+
+		JToolBarHelper::custom('copy', 'copy.png', '', 'COM_ASSOCIATIONS_COPY_REFERENCE', false);
+
+		JToolbarHelper::cancel('association.cancel', 'JTOOLBAR_CLOSE');
+		JToolbarHelper::help('JGLOBAL_HELP');
+
+		JHtmlSidebar::setAction('index.php?option=com_associations');
+	}
+}
diff --git a/administrator/components/com_associations/views/associations/tmpl/default.php b/administrator/components/com_associations/views/associations/tmpl/default.php
new file mode 100644
index 0000000000000..7943bff2f4d26
--- /dev/null
+++ b/administrator/components/com_associations/views/associations/tmpl/default.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2016 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('AssociationsHelper', JPATH_ADMINISTRATOR . '/components/com_associations/helpers/associations.php');
+
+JHtml::_('jquery.framework');
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$listOrder        = $this->escape($this->state->get('list.ordering'));
+$listDirn         = $this->escape($this->state->get('list.direction'));
+$canManageCheckin = JFactory::getUser()->authorise('core.manage', 'com_checkin');
+$colSpan          = 5;
+$iconStates       = array(
+	-2 => 'icon-trash',
+	0  => 'icon-unpublish',
+	1  => 'icon-publish',
+	2  => 'icon-archive',
+);
+
+JText::script('COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT');
+
+JFactory::getDocument()->addScriptDeclaration('
+	Joomla.submitbutton = function(pressbutton)
+	{
+		if (pressbutton == "associations.purge")
+		{
+			if (confirm(Joomla.JText._("COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT")))
+			{
+				Joomla.submitform(pressbutton);
+			}
+			else
+			{
+				return false;
+			}
+		}
+		else
+		{
+			Joomla.submitform(pressbutton);
+		}
+	};
+');
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_associations&view=associations'); ?>" method="post" name="adminForm" id="adminForm">
+
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+
+<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => !is_null($this->itemType)))); ?>
+	<?php if (empty($this->items)) : ?>
+		<div class="alert alert-no-items">
+			<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+		</div>
+	<?php else : ?>
+		<table class="table table-striped" id="associationsList">
+			<thead>
+				<tr>
+					<?php if (! empty($this->typeSupports['state'])) : ?>
+						<th width="1%" class="center nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'state', $listDirn, $listOrder); $colSpan++; ?>
+						</th>
+					<?php endif; ?>
+					<th class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'title', $listDirn, $listOrder); ?>
+					</th>
+					<th width="15%" class="nowrap">
+						<?php echo JText::_('JGRID_HEADING_LANGUAGE'); ?>
+					</th>
+					<th width="5%" class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'COM_ASSOCIATIONS_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
+					</th>
+					<?php if (! empty($this->typeFields['menutype'])) : ?>
+						<th width="10%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_ASSOCIATIONS_HEADING_MENUTYPE', 'menutype_title', $listDirn, $listOrder); $colSpan++; ?>
+						</th>
+					<?php endif; ?>
+					<?php if (! empty($this->typeFields['access'])) : ?>
+						<th width="5%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); $colSpan++; ?>
+						</th>
+					<?php endif; ?>
+					<th width="1%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'id', $listDirn, $listOrder); ?>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="<?php echo $colSpan; ?>">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+			<?php foreach ($this->items as $i => $item) :
+				$canCheckin = true;
+				$canEdit    = AssociationsHelper::allowEdit($this->extensionName, $this->typeName, $item->id);
+				$canCheckin = $canManageCheckin || AssociationsHelper::typeSupportsCheckout($this->extensionName, $this->typeName);
+				?>
+				<tr class="row<?php echo $i % 2; ?>">
+					<?php if (! empty($this->typeSupports['state'])) : ?>
+						<td class="center">
+							<span class="<?php echo $iconStates[$this->escape($item->state)]; ?>"></span>
+						</td>
+					<?php endif; ?>
+					<td class="nowrap has-context">
+						<?php if (isset($item->level)) : ?>
+							<?php echo JLayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level)); ?>
+						<?php endif; ?>
+						<?php if (isset($item->checked_out) && $item->checked_out) : ?>
+							<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'associations.', $canCheckin); ?>
+						<?php endif; ?>
+						<?php if ($canEdit) : ?>
+							<a href="<?php echo JRoute::_($this->editUri . '&id=' . (int) $item->id); ?>">
+							<?php echo $this->escape($item->title); ?></a>
+						<?php else : ?>
+							<span title="<?php echo JText::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"><?php echo $this->escape($item->title); ?></span>
+						<?php endif; ?>
+						<?php if (! empty($this->typeFields['alias'])) : ?>
+							<span class="small">
+								<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+							</span>
+						<?php endif; ?>
+						<?php if (! empty($this->typeFields['catid'])) : ?>
+							<div class="small">
+								<?php echo JText::_('JCATEGORY') . ": " . $this->escape($item->category_title); ?>
+							</div>
+						<?php endif; ?>
+					</td>
+					<td class="small">
+						<?php echo $item->language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . '&nbsp;' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
+					</td>
+					<td>
+						<?php echo AssociationsHelper::getAssociationHtmlList($this->extensionName, $this->typeName, (int) $item->id, $item->language); ?>
+					</td>
+					<?php if (! empty($this->typeFields['menutype'])) : ?>
+						<td class="small">
+							<?php echo $this->escape($item->menutype_title); ?>
+						</td>
+					<?php endif; ?>
+					<?php if (! empty($this->typeFields['access'])) : ?>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+					<?php endif; ?>
+					<td class="hidden-phone">
+						<?php echo $item->id; ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</tbody>
+		</table>
+
+	<?php endif; ?>
+
+		<input type="hidden" name="task" value=""/>
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/administrator/components/com_associations/views/associations/tmpl/modal.php b/administrator/components/com_associations/views/associations/tmpl/modal.php
new file mode 100644
index 0000000000000..8ed89e8a6ca4b
--- /dev/null
+++ b/administrator/components/com_associations/views/associations/tmpl/modal.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+
+if ($app->isSite())
+{
+	JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN'));
+}
+
+JHtml::_('jquery.framework');
+JHtml::_('bootstrap.tooltip');
+JHtml::_('behavior.multiselect');
+JHtml::_('formbehavior.chosen', 'select');
+
+$function   = $app->input->getCmd('function', 'jSelectAssociation');
+$listOrder  = $this->escape($this->state->get('list.ordering'));
+$listDirn   = $this->escape($this->state->get('list.direction'));
+$colSpan    = 4;
+$iconStates = array(
+	-2 => 'icon-trash',
+	0  => 'icon-unpublish',
+	1  => 'icon-publish',
+	2  => 'icon-archive',
+);
+
+$app->getDocument()->addScriptDeclaration(
+	"jQuery(document).ready(function($) {
+		// Run function on parent window.
+		$('.select-link').on('click', function() {
+			if (self != top)
+			{
+				window.parent." . $function . "(this.getAttribute('data-id'));
+			}
+		});
+	});"
+);
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_associations&view=associations&layout=modal&tmpl=component&function=' . $function . '&' . JSession::getFormToken() . '=1');
+ ?>" method="post" name="adminForm" id="adminForm">
+
+<?php if (!empty( $this->sidebar)) : ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif;?>
+
+<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+	<?php if (empty($this->items)) : ?>
+		<div class="alert alert-no-items">
+			<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+		</div>
+	<?php else : ?>
+		<table class="table table-striped" id="associationsList">
+			<thead>
+				<tr>
+					<?php if (! empty($this->typeSupports['state'])) : ?>
+						<th width="1%" class="center nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'state', $listDirn, $listOrder); $colSpan++; ?>
+						</th>
+					<?php endif; ?>
+					<th class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'title', $listDirn, $listOrder); ?>
+					</th>
+					<th width="15%" class="nowrap">
+						<?php echo JText::_('JGRID_HEADING_LANGUAGE'); ?>
+					</th>
+					<th width="5%" class="nowrap">
+						<?php echo JHtml::_('searchtools.sort', 'COM_ASSOCIATIONS_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
+					</th>
+					<?php if (! empty($this->typeFields['menutype'])) : ?>
+						<th width="10%" class="nowrap">
+							<?php echo JHtml::_('searchtools.sort', 'COM_ASSOCIATIONS_HEADING_MENUTYPE', 'menutype_title', $listDirn, $listOrder); $colSpan++; ?>
+						</th>
+					<?php endif; ?>
+					<?php if (! empty($this->typeSupports['acl'])) : ?>
+						<th width="5%" class="nowrap hidden-phone">
+							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); $colSpan++; ?>
+						</th>
+					<?php endif; ?>
+					<th width="1%" class="nowrap hidden-phone">
+						<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'id', $listDirn, $listOrder); ?>
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td colspan="<?php echo $colSpan; ?>">
+						<?php echo $this->pagination->getListFooter(); ?>
+					</td>
+				</tr>
+			</tfoot>
+			<tbody>
+			<?php foreach ($this->items as $i => $item) :
+				?>
+				<tr class="row<?php echo $i % 2; ?>">
+					<?php if (! empty($this->typeSupports['state'])) : ?>
+						<td class="center">
+							<span class="<?php echo $iconStates[$this->escape($item->state)]; ?>"></span>
+						</td>
+					<?php endif; ?>
+					<td class="nowrap has-context">
+						<?php if (isset($item->level)) : ?>
+							<?php echo JLayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level)); ?>
+						<?php endif; ?>
+						<a class="select-link" href="javascript:void(0);" data-id="<?php echo $item->id; ?>"><?php echo $this->escape($item->title); ?></a>
+						<?php if (! empty($this->typeFields['alias'])) : ?>
+							<span class="small">
+								<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+							</span>
+						<?php endif; ?>
+						<?php if (! empty($this->typeFields['catid'])) : ?>
+							<div class="small">
+								<?php echo JText::_('JCATEGORY') . ": " . $this->escape($item->category_title); ?>
+							</div>
+						<?php endif; ?>
+					</td>
+					<td class="small">
+						<?php echo $item->language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . '&nbsp;' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
+					</td>
+					<td>
+						<?php if (true || $item->association) : ?>
+							<?php echo AssociationsHelper::getAssociationHtmlList($this->extensionName, $this->typeName, (int) $item->id, $item->language, false); ?>
+						<?php endif; ?>
+					</td>
+					<?php if (! empty($this->typeFields['menutype'])) : ?>
+						<td class="small">
+							<?php echo $this->escape($item->menutype_title); ?>
+						</td>
+					<?php endif; ?>
+					<?php if (! empty($this->typeSupports['acl'])) : ?>
+						<td class="small hidden-phone">
+							<?php echo $this->escape($item->access_level); ?>
+						</td>
+					<?php endif; ?>
+					<td class="hidden-phone">
+						<?php echo $item->id; ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</tbody>
+		</table>
+
+	<?php endif; ?>
+
+		<input type="hidden" name="task" value=""/>
+		<input type="hidden" name="forcedItemType" value="<?php echo $app->input->get('forcedItemType', '', 'string'); ?>" />
+		<input type="hidden" name="forcedLanguage" value="<?php echo $app->input->get('forcedLanguage', '', 'cmd'); ?>" />
+		<?php echo JHtml::_('form.token'); ?>
+	</div>
+</form>
diff --git a/administrator/components/com_associations/views/associations/view.html.php b/administrator/components/com_associations/views/associations/view.html.php
new file mode 100644
index 0000000000000..d8c9d29f4eae5
--- /dev/null
+++ b/administrator/components/com_associations/views/associations/view.html.php
@@ -0,0 +1,224 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_associations
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * View class for a list of articles.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class AssociationsViewAssociations extends JViewLegacy
+{
+	/**
+	 * An array of items
+	 *
+	 * @var  array
+	 *
+	 * @since __DEPLOY_VERSION__
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var  JPagination
+	 *
+	 * @since __DEPLOY_VERSION__
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state
+	 *
+	 * @var  object
+	 *
+	 * @since __DEPLOY_VERSION__
+	 */
+	protected $state;
+
+	/**
+	 * Selected item type properties.
+	 *
+	 * @var  Registry
+	 *
+	 * @since __DEPLOY_VERSION__
+	 */
+	public $itemType = null;
+
+	/**
+	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function display($tpl = null)
+	{
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+
+		if (!JLanguageAssociations::isEnabled())
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('COM_ASSOCIATIONS_ERROR_NO_ASSOC'), 'warning');
+		}
+		elseif ($this->state->get('itemtype') == '' || $this->state->get('language') == '')
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('COM_ASSOCIATIONS_NOTICE_NO_SELECTORS'), 'notice');
+		}
+		else
+		{
+			$type = null;
+
+			list($extensionName, $typeName) = explode('.', $this->state->get('itemtype'));
+
+			$extension = AssociationsHelper::getSupportedExtension($extensionName);
+
+			$types = $extension->get('types');
+
+			if (array_key_exists($typeName, $types))
+			{
+				$type = $types[$typeName];
+			}
+
+			$this->itemType = $type;
+
+			if (is_null($type))
+			{
+				JFactory::getApplication()->enqueueMessage(JText::_('COM_ASSOCIATIONS_ERROR_NO_TYPE'), 'warning');
+			}
+			else
+			{
+				$this->extensionName = $extensionName;
+				$this->typeName      = $typeName;
+				$this->typeSupports  = array();
+				$this->typeFields    = array();
+
+				$details = $type->get('details');
+
+				if (array_key_exists('support', $details))
+				{
+					$support = $details['support'];
+					$this->typeSupports = $support;
+				}
+
+				if (array_key_exists('fields', $details))
+				{
+					$fields = $details['fields'];
+					$this->typeFields = $fields;
+				}
+
+				// Dynamic filter form.
+				// This selectors doesn't have to activate the filter bar.
+				unset($this->activeFilters['itemtype']);
+				unset($this->activeFilters['language']);
+
+				// Remove filters options depending on selected type.
+				if (empty($support['state']))
+				{
+					unset($this->activeFilters['state']);
+					$this->filterForm->removeField('state', 'filter');
+				}
+				if ($type !== 'category')
+				{
+					unset($this->activeFilters['category_id']);
+					$this->filterForm->removeField('category_id', 'filter');
+				}
+				if ($extension !== 'com_menu')
+				{
+					unset($this->activeFilters['menutype']);
+					$this->filterForm->removeField('menutype', 'filter');
+				}
+				if (! in_array($extension, array('com_categories', 'com_menus')))
+				{
+					unset($this->activeFilters['level']);
+					$this->filterForm->removeField('level', 'filter');
+				}
+				if (empty($support['acl']))
+				{
+					unset($this->activeFilters['access']);
+					$this->filterForm->removeField('access', 'filter');
+				}
+
+				// Add extension attribute to category filter.
+				if (empty($support['catid']))
+				{
+					$this->filterForm->setFieldAttribute('category_id', 'extension', $extension, 'filter');
+				}
+
+				$this->items      = $this->get('Items');
+				$this->pagination = $this->get('Pagination');
+
+				$linkParameters = array(
+					'layout'     => 'edit',
+					'itemtype'   => $extensionName . '.' . $typeName,
+					'task'       => 'association.edit',
+				);
+
+				$this->editUri = 'index.php?option=com_associations&view=association&' . http_build_query($linkParameters);
+			}
+		}
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new Exception(implode("\n", $errors), 500);
+
+			return false;
+		}
+
+		$this->addToolbar();
+
+		// Will add sidebar if needed $this->sidebar = JHtmlSidebar::render();
+		parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function addToolbar()
+	{
+		$user = JFactory::getUser();
+
+		if (isset($this->itemType))
+		{
+			JToolbarHelper::title(
+				JText::sprintf(
+					'COM_ASSOCIATIONS_TITLE_LIST', JText::_($this->extensionName), JText::_($this->typeName)
+				), 'contract'
+			);
+		}
+		else
+		{
+			JToolbarHelper::title(JText::_('COM_ASSOCIATIONS_TITLE_LIST_SELECT'), 'contract');
+		}
+	
+		if ($user->authorise('core.admin', 'com_associations') || $user->authorise('core.options', 'com_associations'))
+		{
+			if (!isset($this->typeName))
+			{
+				JToolbarHelper::custom('associations.purge', 'purge', 'purge', 'COM_ASSOCIATIONS_PURGE', false, false);
+				JToolbarHelper::custom('associations.clean', 'refresh', 'refresh', 'COM_ASSOCIATIONS_DELETE_ORPHANS', false, false);
+			}
+			JToolbarHelper::preferences('com_associations');
+		}
+
+		/*
+		 * @todo Help page
+		*/
+		JToolbarHelper::help('JGLOBAL_HELP');
+	}
+}
diff --git a/administrator/components/com_content/helpers/associations.php b/administrator/components/com_content/helpers/associations.php
new file mode 100644
index 0000000000000..cfad7fbaa9e5b
--- /dev/null
+++ b/administrator/components/com_content/helpers/associations.php
@@ -0,0 +1,181 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Content associations helper.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class ContentAssociationsHelper extends JAssociationExtensionHelper
+{
+	/**
+	 * var       array   $extension  The extension name
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	protected $extension = 'com_content';
+
+	/**
+	 * var       array   $itemTypes  Array of item types
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	protected $itemTypes = array('article', 'category');
+
+	/**
+	 * var       boolean   $associationsSupport  Has the extension association support
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	protected $associationsSupport = true;
+
+	/**
+	 * Get the associated items for an item
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  array
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+
+	public function getAssociations($typeName, $id)
+	{
+		$type = $this->getType($typeName);
+
+		$context    = $this->extension . '.item';
+		$catidField = 'catid';
+
+		if ($typeName === 'category')
+		{
+			$context    = 'com_categories.item';
+			$catidField = '';
+		}
+
+		// Get the associations.
+		$associations = JLanguageAssociations::getAssociations(
+			$this->extension,
+			$type['tables']['a'],
+			$context,
+			$id,
+			'id',
+			'alias',
+			$catidField
+		);
+
+		return $associations;
+	}
+
+	/**
+	 * Get item information
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  JTable|null
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	public function getItem($typeName, $id)
+	{
+		if (empty($id))
+		{
+			return null;
+		}
+
+		$table = null;
+
+		switch ($typeName)
+		{
+			case 'article':
+				$table = JTable::getInstance('content');
+				break;
+
+			case 'category':
+				$table = JTable::getInstance('category');
+				break;
+		}
+
+		if (is_null($table))
+		{
+			return null;
+		}
+
+		$table->load($id);
+
+		return $table;
+	}
+
+	/**
+	 * Get information about the type
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of item types
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function getType($typeName = '')
+	{
+		$fields  = $this->getFieldsTemplate();
+		$tables  = array();
+		$joins   = array();
+		$support = $this->getSupportTemplate();
+		$title   = '';
+
+		if (in_array($typeName, $this->itemTypes))
+		{
+
+			switch ($typeName)
+			{
+				case 'article':
+
+					$support['state'] = true;
+					$support['acl'] = true;
+					$support['checkout'] = true;
+
+					$tables = array(
+						'a' => '#__content'
+					);
+					$title = 'article';
+					break;
+
+				case 'category':
+					$fields['created_user_id'] = 'a.created_user_id';
+					$fields['ordering'] = 'a.lft';
+					$fields['level'] = 'a.level';
+					$fields['catid'] = '';
+					$fields['state'] = 'a.published';
+
+					$support['state'] = true;
+					$support['acl'] = true;
+					$support['checkout'] = true;
+
+					$tables = array(
+						'a' => '#__categories'
+					);
+					$title = 'category';
+					break;
+			}
+		}
+
+		return array(
+			'fields'  => $fields,
+			'support' => $support,
+			'tables'  => $tables,
+			'joins'   => $joins,
+			'title'   => $title
+		);
+	}
+}
diff --git a/administrator/components/com_menus/helpers/associations.php b/administrator/components/com_menus/helpers/associations.php
new file mode 100644
index 0000000000000..44525efe92484
--- /dev/null
+++ b/administrator/components/com_menus/helpers/associations.php
@@ -0,0 +1,159 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Menu associations helper.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class MenusAssociationsHelper extends JAssociationExtensionHelper
+{
+	/**
+	 * var       array   $extension  The extension name
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	protected $extension = 'com_menus';
+
+	/**
+	 * var       array   $itemTypes  Array of item types
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	protected $itemTypes = array('item');
+
+	/**
+	 * var       boolean   $associationsSupport  Has the extension association support
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	protected $associationsSupport = true;
+
+	/**
+	 * Get the associated items for an item
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  array
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+
+	public function getAssociations($typeName, $id)
+	{
+		$type = $this->getType($typeName);
+
+		$context    = $this->extension . '.item';
+
+		// Get the associations.
+		$associations = JLanguageAssociations::getAssociations(
+			$this->extension,
+			$type['tables']['a'],
+			$context,
+			$id,
+			'id',
+			'alias',
+			''
+		);
+
+		return $associations;
+	}
+
+	/**
+	 * Get item information
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  JTable|null
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	public function getItem($typeName, $id)
+	{
+		if (empty($id))
+		{
+			return null;
+		}
+
+		$table = null;
+
+		switch ($typeName)
+		{
+			case 'item':
+				$table = JTable::getInstance('menu');
+				break;
+		}
+
+		if (is_null($table))
+		{
+			return null;
+		}
+
+		$table->load($id);
+
+		return $table;
+	}
+
+	/**
+	 * Get information about the type
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of item types
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function getType($typeName = '')
+	{
+		$fields  = $this->getFieldsTemplate();
+		$tables  = array();
+		$joins   = array();
+		$support = $this->getSupportTemplate();
+		$title   = '';
+
+		if (in_array($typeName, $this->itemTypes))
+		{
+
+			switch ($typeName)
+			{
+				case 'item':
+					$fields['ordering'] = 'a.lft';
+					$fields['level'] = 'a.level';
+					$fields['catid'] = '';
+					$fields['state'] = 'a.published';
+					$fields['created_user_id'] = '';
+
+					$support['state'] = true;
+					$support['acl'] = true;
+					$support['checkout'] = true;
+
+					$tables = array(
+						'a' => '#__menu'
+					);
+
+					$title = 'menu';
+					break;
+			}
+		}
+
+		return array(
+			'fields'  => $fields,
+			'support' => $support,
+			'tables'  => $tables,
+			'joins'   => $joins,
+			'title'   => $title
+		);
+	}
+}
diff --git a/administrator/language/en-GB/en-GB.com_associations.ini b/administrator/language/en-GB/en-GB.com_associations.ini
new file mode 100644
index 0000000000000..f251d5df4a03f
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.com_associations.ini
@@ -0,0 +1,49 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_ASSOCIATIONS="Multilingual Associations"
+COM_ASSOCIATIONS_ADD_NEW_ASSOCIATION="Add new association"
+COM_ASSOCIATIONS_ASSOCIATED_ITEM="Target"
+COM_ASSOCIATIONS_CHANGE_TARGET="Change Target"
+COM_ASSOCIATIONS_COMPONENT_NOT_SUPPORTED="The following component doesn't support associations:"
+COM_ASSOCIATIONS_COMPONENT_SELECTOR_DESC="Select a component from this list"
+COM_ASSOCIATIONS_COMPONENT_SELECTOR_LABEL="Select component"
+COM_ASSOCIATIONS_CONFIGURATION="Multilingual Associations: Options"
+COM_ASSOCIATIONS_COPY_REFERENCE="Copy Reference to Target"
+COM_ASSOCIATIONS_DELETE_ORPHANS="Delete Orphans"
+COM_ASSOCIATIONS_DELETE_ORPHANS_FAILED="Failed to delete orphans."
+COM_ASSOCIATIONS_DELETE_ORPHANS_NONE="There were no orphans to delete."
+COM_ASSOCIATIONS_DELETE_ORPHANS_SUCCESS="All orphans have been deleted."
+COM_ASSOCIATIONS_EDIT_ASSOCIATION="Edit association"
+COM_ASSOCIATIONS_EDIT_HIDE_REFERENCE="Hide Reference"
+COM_ASSOCIATIONS_EDIT_SHOW_REFERENCE="Show Reference"
+COM_ASSOCIATIONS_ERROR_NO_ASSOC="The Multilingual Associations component can't be used if the site is not set as multilingual and/or Items Associations is not enabled in the Language Filter plugin."
+COM_ASSOCIATIONS_FILTER_MENUTYPE_DESC="Select a Menu"
+COM_ASSOCIATIONS_FILTER_MENUTYPE_LABEL="Menu"
+COM_ASSOCIATIONS_FILTER_SEARCH_DESC="Search an item by it's title"
+COM_ASSOCIATIONS_FILTER_SEARCH_LABEL="Search item"
+COM_ASSOCIATIONS_FILTER_SELECT_ITEM_TYPE="- Select Item Type -"
+COM_ASSOCIATIONS_HEADING_ASSOCIATION="Associations"
+COM_ASSOCIATIONS_HEADING_MENUTYPE="Menu"
+COM_ASSOCIATIONS_HEADING_MENUTYPE_ASC="Menu ascending"
+COM_ASSOCIATIONS_HEADING_MENUTYPE_DESC="Menu descending"
+COM_ASSOCIATIONS_NO_ASSOCIATION="There is no association for this language"
+COM_ASSOCIATIONS_NOTICE_NO_SELECTORS="Please select an Item Type and a reference language to view the associations."
+COM_ASSOCIATIONS_PURGE="Delete All Associations"
+COM_ASSOCIATIONS_PURGE_CONFIRM_PROMPT="Are you sure you want to delete all associations? Confirming will permanently delete them!"
+COM_ASSOCIATIONS_PURGE_FAILED="Failed to delete all associations."
+COM_ASSOCIATIONS_PURGE_NONE="There were no associations to delete."
+COM_ASSOCIATIONS_PURGE_SUCCESS="All associations have been deleted."
+COM_ASSOCIATIONS_REFERENCE_ITEM="Reference"
+COM_ASSOCIATIONS_SAVE_REFERENCE="Save Reference"
+COM_ASSOCIATIONS_SAVE_TARGET="Save Target"
+COM_ASSOCIATIONS_SELECT_MENU="- Select Menu -"
+COM_ASSOCIATIONS_SELECT_TARGET="Select Target"
+COM_ASSOCIATIONS_SELECT_TARGET_LANGUAGE="- Select Target Language -"
+COM_ASSOCIATIONS_TITLE="Associations"
+COM_ASSOCIATIONS_TITLE_EDIT="Multilingual Associations: Edit Associations (%1s &gt; %2s)"
+COM_ASSOCIATIONS_TITLE_LIST="Multilingual Associations (%1s &gt; %2s)"
+COM_ASSOCIATIONS_TITLE_LIST_SELECT="Multilingual Associations: Select Item Type and Language"
+COM_ASSOCIATIONS_XML_DESCRIPTION="Improved multilingual content management component"
diff --git a/administrator/language/en-GB/en-GB.com_associations.sys.ini b/administrator/language/en-GB/en-GB.com_associations.sys.ini
new file mode 100644
index 0000000000000..e9846cdcd5aa3
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.com_associations.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+COM_ASSOCIATIONS="Multilingual Associations"
+COM_ASSOCIATIONS_XML_DESCRIPTION="Improved multilingual content management component"
\ No newline at end of file
diff --git a/layouts/joomla/content/associations.php b/layouts/joomla/content/associations.php
index 578d161317f1d..1af8a02ca76bf 100644
--- a/layouts/joomla/content/associations.php
+++ b/layouts/joomla/content/associations.php
@@ -15,7 +15,7 @@
 	<ul class="item-associations">
 		<?php foreach ($items as $id => $item) : ?>
 			<li>
-				<?php echo $item->link; ?>
+				<?php echo is_array($item) ? $item['link'] : $item->link; ?>
 			</li>
 		<?php endforeach; ?>
 	</ul>
diff --git a/libraries/joomla/association/extension/helper.php b/libraries/joomla/association/extension/helper.php
new file mode 100644
index 0000000000000..7d961aa0a9252
--- /dev/null
+++ b/libraries/joomla/association/extension/helper.php
@@ -0,0 +1,256 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Association
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+use Joomla\Utilities\ArrayHelper;
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Association Extension Helper
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+abstract class JAssociationExtensionHelper  implements JAssociationExtensionInterface
+{
+	/**
+	 * var       array   $extension  The extension name
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	protected $extension = 'com_??';
+
+	/**
+	 * var       array   $itemTypes  Array of item types
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	protected $itemTypes = array();
+
+	/**
+	 * var       boolean   $associationsSupport  Has the extension association support
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	protected $associationsSupport = false;
+
+	/**
+	 * Checks if the extension supports associations
+	 *
+	 * @return  boolean  Supports the extension associations
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function hasAssociationsSupport()
+	{
+		return $this->associationsSupport;
+	}
+
+	/**
+	 * Get the item types
+	 *
+	 * @return  array  Array of item types
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function getItemTypes()
+	{
+		return $this->itemTypes;
+	}
+
+	/**
+	 * Get the associated items for an item
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $itemId    The id of item for which we need the associated items
+	 *
+	 * @return  array
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	public function getAssociationList($typeName, $itemId)
+	{
+		$items = array();
+
+		$associations = $this->getAssociations($typeName, $itemId);
+
+		foreach ($associations as $key => $association)
+		{
+			$items[$key] = ArrayHelper::fromObject($this->getItem($typeName, (int) $association->id), false);
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Get information about the type
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of item types
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function getType($typeName = '')
+	{
+		$fields  = $this->getFieldsTemplate();
+		$tables  = array();
+		$joins   = array();
+		$support = $this->getSupportTemplate();
+		$title   = '';
+
+		return array(
+			'fields'  => $fields,
+			'support' => $support,
+			'tables'  => $tables,
+			'joins'   => $joins,
+			'title'   => $title
+		);
+	}
+
+	/**
+	 * Get information about the fields the type provides
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of support information
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function getTypeFields($typeName)
+	{
+		return $this->getTypeInformation($typeName, 'fields');
+	}
+
+	/**
+	 * Get information about the fields the type provides
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of support information
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function getTypeSupport($typeName)
+	{
+		return $this->getTypeInformation($typeName, 'support');
+	}
+
+	/**
+	 * Get information about the tables the type use
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of support information
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function getTypeTables($typeName)
+	{
+		return $this->getTypeInformation($typeName, 'tables');
+	}
+
+	/**
+	 * Get information about the table joins for the type
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of support information
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function getTypeJoins($typeName)
+	{
+		return $this->getTypeInformation($typeName, 'joins');
+	}
+
+	/**
+	 * Get the type title
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of support information
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function getTypeTitle($typeName)
+	{
+		$type = $this->getType($typeName);
+
+		if (! array_key_exists('title', $type))
+		{
+			return '';
+		}
+
+		return $type['title'];
+	}
+
+	/**
+	 * Get information about the type
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   string  $part      part of the information
+	 *
+	 * @return array Array of support information
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	private function getTypeInformation($typeName, $part = 'support')
+	{
+		$type = $this->getType($typeName);
+
+		if (! array_key_exists($part, $type))
+		{
+			return array();
+		}
+
+		return $type[$part];
+	}
+
+	/**
+	 * Get default values for support array
+	 *
+	 * @return  array
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected function getSupportTemplate()
+	{
+		return array(
+			'state'    => false,
+			'acl'      => false,
+			'checkout' => false
+		);
+	}
+
+	/**
+	 * Get default values for fields array
+	 *
+	 * @return  array
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected function getFieldsTemplate()
+	{
+		return array(
+			'id'                  => 'a.id',
+			'title'               => 'a.title',
+			'alias'               => 'a.alias',
+			'ordering'            => 'a.ordering',
+			'menutype'            => '',
+			'level'               => '',
+			'catid'               => 'a.catid',
+			'language'            => 'a.language',
+			'access'              => 'a.access',
+			'state'               => 'a.state',
+			'created_user_id'     => 'a.created_by',
+			'checked_out_user_id' => 'a.checked_out',
+			'checked_out_time'    => 'a.checked_out_time'
+		);
+	}
+}
diff --git a/libraries/joomla/association/extension/interface.php b/libraries/joomla/association/extension/interface.php
new file mode 100644
index 0000000000000..8d194e5bb22b6
--- /dev/null
+++ b/libraries/joomla/association/extension/interface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Platform
+ * @subpackage  Association
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('JPATH_PLATFORM') or die;
+
+/**
+ * Association Extension Interface for the helper classes
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+interface JAssociationExtensionInterface
+{
+	/**
+	 * Checks if the extension supports associations
+	 *
+	 * @return  boolean  Supports the extension associations
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function hasAssociationsSupport();
+}
diff --git a/media/com_associations/css/sidebyside.css b/media/com_associations/css/sidebyside.css
new file mode 100644
index 0000000000000..ecbd11694cf46
--- /dev/null
+++ b/media/com_associations/css/sidebyside.css
@@ -0,0 +1,75 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+.sidebyside .outer-panel {
+	float: left;
+	width: 50%;
+}
+
+.sidebyside #left-panel .inner-panel {
+	padding: 0 10px 0 0;
+}
+
+.sidebyside #right-panel .inner-panel {
+	padding: 0 0 0 10px;
+}
+
+.sidebyside .full-width {
+	float: none !important;
+	width: 100% !important;
+}
+
+.sidebyside .full-width .inner-panel {
+	padding: 0 !important;
+}
+
+#reference-association, #target-association {
+	width: 100%;
+	height: 1500px;
+	overflow-y: auto;
+	border: 0 !important;
+}
+
+.target-text {
+	float: left;
+	width: 30%;
+}
+
+/* RTL overrides */
+html[dir=rtl] .sidebyside .outer-panel {
+	float: right;
+}
+
+html[dir=rtl] .sidebyside #left-panel .inner-panel {
+	padding: 0 0 0 10px;
+}
+
+html[dir=rtl] .sidebyside #right-panel .inner-panel {
+	padding: 0 10px 0 0;
+}
+
+html[dir=rtl] .sidebyside .full-width .inner-panel {
+	padding: 0 !important;
+}
+
+html[dir=rtl] .target-text {
+	float: right;
+}
+
+/* Responsive layout */
+@media (max-width: 767px) {
+	.sidebyside .outer-panel {
+		float: none;
+		width: 100%;
+	}
+
+	.sidebyside #left-panel .inner-panel {
+		padding: 0;
+	}
+
+	.sidebyside #right-panel .inner-panel {
+		padding: 0;
+	}
+}
diff --git a/media/com_associations/js/sidebyside-uncompressed.js b/media/com_associations/js/sidebyside-uncompressed.js
new file mode 100644
index 0000000000000..8a8c87a0ae633
--- /dev/null
+++ b/media/com_associations/js/sidebyside-uncompressed.js
@@ -0,0 +1,301 @@
+/**
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+jQuery(document).ready(function($) {
+	$('#toolbar-target').hide();
+	$('#toolbar-copy').hide();
+
+	// Save button actions, replacing the default Joomla.submitbutton() with custom function.
+	Joomla.submitbutton = function(task)
+	{
+		// Using close button, normal joomla submit.
+		if (task == 'association.cancel')
+		{
+			Joomla.submitform(task);
+		}
+		else if(task == 'copy')
+		{
+			window.frames['reference-association'].Joomla.submitbutton(document.getElementById('adminForm').getAttribute('data-associatedview') + '.save2copy');
+		}
+		// Undo association
+		else if (task == 'undo-association')
+		{
+			var reference     = document.getElementById('reference-association');
+			var target        = document.getElementById('target-association');
+			var referenceId   = reference.getAttribute('data-id');
+			var referenceLang = reference.getAttribute('data-language').replace(/-/,'_');
+			var targetId      = target.getAttribute('data-id');
+			var targetLang    = target.getAttribute('data-language').replace(/-/,'_');
+			reference         = $(reference).contents();
+			target            = $(target).contents();
+			
+			// Remove it on the reference
+			// - For modal association selectors.
+			reference.find('#jform_associations_' + targetLang + '_id').val('');
+			reference.find('#jform_associations_' + targetLang + '_name').val('');
+			
+			// - For chosen association selectors (menus).
+			reference.find('#jform_associations_' + targetLang + '_chzn').remove();
+			reference.find('#jform_associations_' + targetLang).val('').change().chosen();
+			
+			var lang = '';
+
+			// Remove it on the target
+			$('#jform_itemlanguage option').each(function()
+			{
+				lang = $(this).val().split('|')[0];
+				if (typeof lang !== 'undefined')
+				{
+					lang = lang.replace(/-/,'_');
+					// - For modal association selectors.
+					target.find('#jform_associations_' + lang + '_id').val('');
+					// - For chosen association selectors (menus).
+					target.find('#jform_associations_' + lang + '_chzn').remove();
+					target.find('#jform_associations_' + lang).val('').change().chosen();
+				}
+			});
+			
+			// Same as above but reference language is not in the selector
+			// - For modal association selectors.
+			target.find('#jform_associations_' + referenceLang + '_id').val('');
+			target.find('#jform_associations_' + referenceLang + '_name').val('');
+			
+			// - For chosen association selectors (menus).
+			target.find('#jform_associations_' + referenceLang + '_chzn').remove();
+			target.find('#jform_associations_' + referenceLang).val('').change().chosen();
+			
+			// Reset switcher after removing association
+			var currentSwitcher = $('#jform_itemlanguage').val();
+			var currentLang = targetLang.replace(/_/,'-');
+			$('#jform_itemlanguage option[value=\"' + currentSwitcher + '\"]').val(currentLang + ':0:add');
+			$('#jform_itemlanguage').val('').change();
+			$('#jform_itemlanguage').trigger('liszt:updated');
+
+			// Save one of the items to confirm action
+			Joomla.submitbutton('reference');
+		}
+		// Saving target or reference, send the save action to the target/reference iframe.
+		else
+		{
+			// We need to re-enable the language field to save.
+
+			$('#' + task + '-association').contents().find('#jform_language').attr('disabled', false);
+			window.frames[task + '-association'].Joomla.submitbutton(document.getElementById('adminForm').getAttribute('data-associatedview') + '.apply');
+		}
+
+		return false;
+	}
+
+	// Preload Joomla loading layer.
+	Joomla.loadingLayer('load');
+
+	// Attach behaviour to toggle button.
+	$('body').on('click', '#toogle-left-panel', function()
+	{
+		var referenceHide = this.getAttribute('data-hide-reference');
+		var referenceShow = this.getAttribute('data-show-reference');
+
+		if ($(this).text() === referenceHide)
+		{
+			$(this).text(referenceShow);
+		}
+		else
+		{
+			$(this).text(referenceHide);
+		}
+		
+		$('#left-panel').toggle();
+		$('#right-panel').toggleClass('full-width');
+	});
+
+	// Attach behaviour to language selector change event.
+	$('body').on('change', '#jform_itemlanguage', function() {
+		var target   = document.getElementById('target-association');
+		var selected = $(this).val();
+
+		// Populate the data attributes and load the the edit page in target frame.
+		if (selected != '' && typeof selected !== 'undefined')
+		{
+			target.setAttribute('data-action', selected.split(':')[2]);
+			target.setAttribute('data-id', selected.split(':')[1]);
+			target.setAttribute('data-language', selected.split(':')[0]);
+
+			// Iframe load start, show Joomla loading layer.
+			Joomla.loadingLayer('show');
+
+			// Load the target frame.
+			target.src = target.getAttribute('data-editurl') + '&task=' + target.getAttribute('data-item') + '.' + target.getAttribute('data-action') + '&id=' + target.getAttribute('data-id');
+		}
+		// Reset the data attributes and no item to load.
+		else
+		{
+			$('#toolbar-target').hide();
+			$('#toolbar-copy').hide();
+			$('#select-change').addClass("hidden");
+			$('#remove-assoc').addClass("hidden");
+
+			target.setAttribute('data-action', '');
+			target.setAttribute('data-id', '0');
+			target.setAttribute('data-language', '');
+			target.src = '';
+		}
+	});
+
+	// Attach behaviour to reference frame load event.
+	$('#reference-association').on('load', function() {
+		// If copy button used
+		if ($(this).contents().find('#jform_id').val() !== this.getAttribute('data-id'))
+		{
+			var target = document.getElementById('target-association');
+			target.src = target.getAttribute('data-editurl') + '&task=' + target.getAttribute('data-item') + '.edit' + '&id=' + $(this).contents().find('#jform_id').val();
+			this.src   = this.getAttribute('data-editurl') + '&task=' + this.getAttribute('data-item') + '.edit' + '&id=' + this.getAttribute('data-id');
+		}
+
+		var reference = $(this).contents();
+
+		// Disable language field.
+		reference.find('#jform_language_chzn').remove();
+		reference.find('#jform_language').attr('disabled', true).chosen();
+
+		// Remove modal buttons on the reference
+		reference.find('#associations').find('.btn').remove();
+		
+		var parse = '';
+
+		$('#jform_itemlanguage option').each(function()
+		{
+			parse = $(this).val().split(':');
+
+			if (typeof parse[0] !== 'undefined')
+			{
+				// - For modal association selectors.
+				langAssociation = parse[0].replace(/-/,'_');
+				if (reference.find('#jform_associations_' + langAssociation + '_id').val() == '')
+				{
+					reference.find('#jform_associations_' + langAssociation + '_name')
+						.val(document.getElementById('reference-association').getAttribute('data-no-assoc'));
+				}
+			}
+		});
+
+		// Iframe load finished, hide Joomla loading layer.
+		Joomla.loadingLayer('hide');
+	});
+
+	// Attach behaviour to target frame load event.
+	$('#target-association').on('load', function() {
+		// We need to check if we are not loading a blank iframe.
+		if (this.getAttribute('src') != '')
+		{
+			$('#toolbar-target').show();
+			$('#toolbar-copy').show();
+			$('#select-change').removeClass("hidden");
+
+			var targetLanguage       = this.getAttribute('data-language');
+			var targetId             = this.getAttribute('data-id');
+			var targetLoadedId       = $(this).contents().find('#jform_id').val() || '0';
+
+			// Hide associations tab.
+			$(this).contents().find('a[href=\"#associations\"]').parent().hide();
+
+			// Always show General tab first if associations tab is selected on the reference
+			if ($(this).contents().find('#associations').hasClass('active'))
+			{
+				$(this).contents().find('a[href=\"#associations\"]').parent().removeClass('active');
+				$(this).contents().find('#associations').removeClass('active');
+
+				$(this).contents().find('.nav-tabs').find('li').first().addClass('active');
+				$(this).contents().find('.tab-content').find('.tab-pane').first().addClass('active');
+			}
+
+			// Update language field with the selected language and them disable it.
+			$(this).contents().find('#jform_language_chzn').remove();
+			$(this).contents().find('#jform_language').val(targetLanguage).change().attr('disabled', true).chosen();
+
+			// If we are creating a new association (before save) we need to add the new association.
+			if (targetLoadedId == '0')
+			{
+				document.getElementById('select-change-text').innerHTML =  document.getElementById('select-change').getAttribute('data-select');
+			}
+			// If we are editing a association.
+			else 
+			{
+				// Show change language button
+				document.getElementById('select-change-text').innerHTML =  document.getElementById('select-change').getAttribute('data-change');
+				$('#remove-assoc').removeClass("hidden");
+
+				// Add the id to list of items to check in on close.
+				var currentIdList = document.getElementById('target-id').value;
+				var updatedList   = currentIdList == '' ? targetLoadedId : currentIdList + ',' + targetLoadedId;
+				document.getElementById('target-id').value = updatedList;
+
+				// If we created a new association (after save).
+				if (targetLoadedId != targetId)
+				{
+					// Refresh the language selector with the new id (used after save).
+					$('#jform_itemlanguage option[value^=\"' + targetLanguage + ':' + targetId + ':add\"]').val(targetLanguage + ':' + targetLoadedId + ':edit');
+
+					// Update main frame data-id attribute (used after save).
+					this.setAttribute('data-id', targetLoadedId);
+					this.setAttribute('data-action', 'edit');
+				}
+
+				// Update the reference item associations tab.
+				var reference     = document.getElementById('reference-association');
+				var languageCode  = targetLanguage.replace(/-/, '_');
+				var title         = $(this).contents().find('#jform_title').val()
+
+				// - For modal association selectors.
+				$(reference).contents().find('#jform_associations_' + languageCode + '_id').val(targetLoadedId);
+				$(reference).contents().find('#jform_associations_' + languageCode + '_name').val(title);
+
+				// - For chosen association selectors (menus).
+				$(reference).contents().find('#jform_associations_' + languageCode + '_chzn').remove();
+				$(reference).contents().find('#jform_associations_' + languageCode).append('<option value=\"'+ targetLoadedId + '\">' + title + '</option>');
+				$(reference).contents().find('#jform_associations_' + languageCode).val(targetLoadedId).change().chosen();
+			}
+
+			// Update the target item associations tab.
+			var reference    = document.getElementById('reference-association');
+			var referenceId  = reference.getAttribute('data-id');
+			var languageCode = reference.getAttribute('data-language').replace(/-/, '_');
+			var title        = $(reference).contents().find('#jform_title').val();
+			var target       = $(this).contents();
+
+			// - For modal association selectors.
+			target.find('#jform_associations_' + languageCode + '_id').val(referenceId);
+			target.find('#jform_associations_' + languageCode + '_name').val(title);
+
+			// - For chosen association selectors (menus).
+			target.find('#jform_associations_' + languageCode + '_chzn').remove();
+			var chznField = target.find('#jform_associations_' + languageCode);
+			chznField.append('<option value=\"'+ referenceId + '\">' + title + '</option>');
+			chznField.val(referenceId).change().chosen();
+
+			var parse, langAssociation;
+
+			$('#jform_itemlanguage option').each(function()
+			{
+				parse = $(this).val().split(':');
+
+				if (typeof parse[1] !== 'undefined' && parse[1] !== '0')
+				{
+					// - For modal association selectors.
+					langAssociation = parse[0].replace(/-/,'_');
+					target.find('#jform_associations_' + langAssociation + '_id').val(parse[1]);
+
+					// - For chosen association selectors (menus).
+					target.find('#jform_associations_' + langAssociation + '_chzn').remove();
+					chznField = target.find('#jform_associations_' + langAssociation);
+					chznField.append('<option value=\"'+ parse[1] + '\"></option>');
+					chznField.val(parse[1]).change().chosen();
+				}
+			});
+
+			// Iframe load finished, hide Joomla loading layer.
+			Joomla.loadingLayer('hide');
+		}
+	});
+});
diff --git a/media/com_associations/js/sidebyside.js b/media/com_associations/js/sidebyside.js
new file mode 100644
index 0000000000000..89e3c7484dcfc
--- /dev/null
+++ b/media/com_associations/js/sidebyside.js
@@ -0,0 +1 @@
+jQuery(document).ready(function(a){a("#toolbar-target").hide(),a("#toolbar-copy").hide(),Joomla.submitbutton=function(b){if("association.cancel"==b)Joomla.submitform(b);else if("copy"==b)window.frames["reference-association"].Joomla.submitbutton(document.getElementById("adminForm").getAttribute("data-associatedview")+".save2copy");else if("undo-association"==b){var c=document.getElementById("reference-association"),d=document.getElementById("target-association"),f=(c.getAttribute("data-id"),c.getAttribute("data-language").replace(/-/,"_")),h=(d.getAttribute("data-id"),d.getAttribute("data-language").replace(/-/,"_"));c=a(c).contents(),d=a(d).contents(),c.find("#jform_associations_"+h+"_id").val(""),c.find("#jform_associations_"+h+"_name").val(""),c.find("#jform_associations_"+h+"_chzn").remove(),c.find("#jform_associations_"+h).val("").change().chosen();var i="";a("#jform_itemlanguage option").each(function(){i=a(this).val().split("|")[0],"undefined"!=typeof i&&(i=i.replace(/-/,"_"),d.find("#jform_associations_"+i+"_id").val(""),d.find("#jform_associations_"+i+"_chzn").remove(),d.find("#jform_associations_"+i).val("").change().chosen())}),d.find("#jform_associations_"+f+"_id").val(""),d.find("#jform_associations_"+f+"_name").val(""),d.find("#jform_associations_"+f+"_chzn").remove(),d.find("#jform_associations_"+f).val("").change().chosen();var j=a("#jform_itemlanguage").val(),k=h.replace(/_/,"-");a('#jform_itemlanguage option[value="'+j+'"]').val(k+":0:add"),a("#jform_itemlanguage").val("").change(),a("#jform_itemlanguage").trigger("liszt:updated"),Joomla.submitbutton("reference")}else a("#"+b+"-association").contents().find("#jform_language").attr("disabled",!1),window.frames[b+"-association"].Joomla.submitbutton(document.getElementById("adminForm").getAttribute("data-associatedview")+".apply");return!1},Joomla.loadingLayer("load"),a("body").on("click","#toogle-left-panel",function(){var b=this.getAttribute("data-hide-reference"),c=this.getAttribute("data-show-reference");a(this).text()===b?a(this).text(c):a(this).text(b),a("#left-panel").toggle(),a("#right-panel").toggleClass("full-width")}),a("body").on("change","#jform_itemlanguage",function(){var b=document.getElementById("target-association"),c=a(this).val();""!=c&&"undefined"!=typeof c?(b.setAttribute("data-action",c.split(":")[2]),b.setAttribute("data-id",c.split(":")[1]),b.setAttribute("data-language",c.split(":")[0]),Joomla.loadingLayer("show"),b.src=b.getAttribute("data-editurl")+"&task="+b.getAttribute("data-item")+"."+b.getAttribute("data-action")+"&id="+b.getAttribute("data-id")):(a("#toolbar-target").hide(),a("#toolbar-copy").hide(),a("#select-change").addClass("hidden"),a("#remove-assoc").addClass("hidden"),b.setAttribute("data-action",""),b.setAttribute("data-id","0"),b.setAttribute("data-language",""),b.src="")}),a("#reference-association").on("load",function(){if(a(this).contents().find("#jform_id").val()!==this.getAttribute("data-id")){var b=document.getElementById("target-association");b.src=b.getAttribute("data-editurl")+"&task="+b.getAttribute("data-item")+".edit&id="+a(this).contents().find("#jform_id").val(),this.src=this.getAttribute("data-editurl")+"&task="+this.getAttribute("data-item")+".edit&id="+this.getAttribute("data-id")}var c=a(this).contents();c.find("#jform_language_chzn").remove(),c.find("#jform_language").attr("disabled",!0).chosen(),c.find("#associations").find(".btn").remove();var d="";a("#jform_itemlanguage option").each(function(){d=a(this).val().split(":"),"undefined"!=typeof d[0]&&(langAssociation=d[0].replace(/-/,"_"),""==c.find("#jform_associations_"+langAssociation+"_id").val()&&c.find("#jform_associations_"+langAssociation+"_name").val(document.getElementById("reference-association").getAttribute("data-no-assoc")))}),Joomla.loadingLayer("hide")}),a("#target-association").on("load",function(){if(""!=this.getAttribute("src")){a("#toolbar-target").show(),a("#toolbar-copy").show(),a("#select-change").removeClass("hidden");var b=this.getAttribute("data-language"),c=this.getAttribute("data-id"),d=a(this).contents().find("#jform_id").val()||"0";if(a(this).contents().find('a[href="#associations"]').parent().hide(),a(this).contents().find("#associations").hasClass("active")&&(a(this).contents().find('a[href="#associations"]').parent().removeClass("active"),a(this).contents().find("#associations").removeClass("active"),a(this).contents().find(".nav-tabs").find("li").first().addClass("active"),a(this).contents().find(".tab-content").find(".tab-pane").first().addClass("active")),a(this).contents().find("#jform_language_chzn").remove(),a(this).contents().find("#jform_language").val(b).change().attr("disabled",!0).chosen(),"0"==d)document.getElementById("select-change-text").innerHTML=document.getElementById("select-change").getAttribute("data-select");else{document.getElementById("select-change-text").innerHTML=document.getElementById("select-change").getAttribute("data-change"),a("#remove-assoc").removeClass("hidden");var e=document.getElementById("target-id").value,f=""==e?d:e+","+d;document.getElementById("target-id").value=f,d!=c&&(a('#jform_itemlanguage option[value^="'+b+":"+c+':add"]').val(b+":"+d+":edit"),this.setAttribute("data-id",d),this.setAttribute("data-action","edit"));var g=document.getElementById("reference-association"),h=b.replace(/-/,"_"),i=a(this).contents().find("#jform_title").val();a(g).contents().find("#jform_associations_"+h+"_id").val(d),a(g).contents().find("#jform_associations_"+h+"_name").val(i),a(g).contents().find("#jform_associations_"+h+"_chzn").remove(),a(g).contents().find("#jform_associations_"+h).append('<option value="'+d+'">'+i+"</option>"),a(g).contents().find("#jform_associations_"+h).val(d).change().chosen()}var g=document.getElementById("reference-association"),j=g.getAttribute("data-id"),h=g.getAttribute("data-language").replace(/-/,"_"),i=a(g).contents().find("#jform_title").val(),k=a(this).contents();k.find("#jform_associations_"+h+"_id").val(j),k.find("#jform_associations_"+h+"_name").val(i),k.find("#jform_associations_"+h+"_chzn").remove();var l=k.find("#jform_associations_"+h);l.append('<option value="'+j+'">'+i+"</option>"),l.val(j).change().chosen();var m,n;a("#jform_itemlanguage option").each(function(){m=a(this).val().split(":"),"undefined"!=typeof m[1]&&"0"!==m[1]&&(n=m[0].replace(/-/,"_"),k.find("#jform_associations_"+n+"_id").val(m[1]),k.find("#jform_associations_"+n+"_chzn").remove(),l=k.find("#jform_associations_"+n),l.append('<option value="'+m[1]+'"></option>'),l.val(m[1]).change().chosen())}),Joomla.loadingLayer("hide")}})});
\ No newline at end of file

From f341aad9c1f2ce2d958ef46d59ae75fe1571b997 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Mon, 9 Jan 2017 16:38:48 +0100
Subject: [PATCH 02/35] updated searchtool with the new way

---
 .../layouts/joomla/searchtools/default.php    | 38 -------------------
 .../models/forms/filter_associations.xml      |  2 +
 .../views/associations/tmpl/default.php       |  2 +-
 3 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 administrator/components/com_associations/layouts/joomla/searchtools/default.php

diff --git a/administrator/components/com_associations/layouts/joomla/searchtools/default.php b/administrator/components/com_associations/layouts/joomla/searchtools/default.php
deleted file mode 100644
index e58e551374b6d..0000000000000
--- a/administrator/components/com_associations/layouts/joomla/searchtools/default.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  Layout
- *
- * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('JPATH_BASE') or die;
-
-$data = $displayData;
-
-// Receive overridable options
-$data['options'] = !empty($data['options']) ? $data['options'] : array();
-
-if ($data['view'] instanceof AssociationsViewAssociations)
-{
-	JFactory::getDocument()->addStyleDeclaration("
-		/* Fixed filter field in search bar */
-		.js-stools .js-stools-selector {
-			float: left;
-			margin-right: 10px;
-			min-width: 220px;
-		}
-		html[dir=rtl] .js-stools .js-stools-selector {
-			float: right;
-			margin-left: 10px
-			margin-right: 0;
-		}
-		.js-stools .js-stools-container-bar .js-stools-selector .chzn-container {
-			padding: 3px 0;
-		}
-	");
-}
-
-// Display the main joomla layout
-echo JLayoutHelper::render('joomla.searchtools.default', $data, null, array('component' => 'none'));
diff --git a/administrator/components/com_associations/models/forms/filter_associations.xml b/administrator/components/com_associations/models/forms/filter_associations.xml
index 72d2c980c8afc..f66f0f91588e6 100644
--- a/administrator/components/com_associations/models/forms/filter_associations.xml
+++ b/administrator/components/com_associations/models/forms/filter_associations.xml
@@ -5,6 +5,7 @@
 		type="itemtype"
 		label="COM_ASSOCIATIONS_COMPONENT_SELECTOR_LABEL"
 		description="COM_ASSOCIATIONS_COMPONENT_SELECTOR_DESC"
+		filtermode="selector"
 		onchange="jQuery('select[id^=\'filter_\']').val('');jQuery('select[id^=\'list_\']').val('');this.form.submit();"
 		>
 		<option value="">COM_ASSOCIATIONS_FILTER_SELECT_ITEM_TYPE</option>
@@ -13,6 +14,7 @@
 		name="language"
 		type="contentlanguage"
 		label="JOPTION_FILTER_LANGUAGE"
+		filtermode="selector"
 		description="JOPTION_FILTER_LANGUAGE_DESC"
 		onchange="this.form.submit();"
 		>
diff --git a/administrator/components/com_associations/views/associations/tmpl/default.php b/administrator/components/com_associations/views/associations/tmpl/default.php
index 7943bff2f4d26..13dcd056fc78a 100644
--- a/administrator/components/com_associations/views/associations/tmpl/default.php
+++ b/administrator/components/com_associations/views/associations/tmpl/default.php
@@ -61,7 +61,7 @@
 	<div id="j-main-container">
 <?php endif;?>
 
-<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => !is_null($this->itemType)))); ?>
+<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 	<?php if (empty($this->items)) : ?>
 		<div class="alert alert-no-items">
 			<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>

From 79d95a5aaa63cb9e59f5f654d05ca775e2c93c92 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Mon, 9 Jan 2017 16:48:46 +0100
Subject: [PATCH 03/35] udpated edit view title

---
 .../com_associations/views/association/view.html.php         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/administrator/components/com_associations/views/association/view.html.php b/administrator/components/com_associations/views/association/view.html.php
index c4ce0ea7d22c3..478f61d2d4147 100644
--- a/administrator/components/com_associations/views/association/view.html.php
+++ b/administrator/components/com_associations/views/association/view.html.php
@@ -82,6 +82,9 @@ public function display($tpl = null)
 
 		list($extensionName, $typeName) = explode('.', $input->get('itemtype'));
 
+		$this->extensionName = $extensionName;
+		$this->typeName      = $typeName;
+
 		$extension = AssociationsHelper::getSupportedExtension($extensionName);
 
 		$types = $extension->get('types');
@@ -176,7 +179,7 @@ protected function addToolbar()
 		// Hide main menu.
 		JFactory::getApplication()->input->set('hidemainmenu', 1);
 
-		JToolbarHelper::title(JText::sprintf('COM_ASSOCIATIONS_TITLE_EDIT', 'componentTitle', 'title'), 'contract');
+		JToolbarHelper::title(JText::sprintf('COM_ASSOCIATIONS_TITLE_EDIT', JText::_($this->extensionName), JText::_($this->typeName)), 'contract');
 
 		$bar = JToolbar::getInstance('toolbar');
 

From 7cf3996b621684a65660e12772cb409c48e6a913 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 10 Jan 2017 09:00:10 +0100
Subject: [PATCH 04/35] added contact associationshelper class

---
 .../com_contact/helpers/associations.php      | 185 ++++++++++++++++++
 1 file changed, 185 insertions(+)
 create mode 100644 administrator/components/com_contact/helpers/associations.php

diff --git a/administrator/components/com_contact/helpers/associations.php b/administrator/components/com_contact/helpers/associations.php
new file mode 100644
index 0000000000000..588661fafb0e2
--- /dev/null
+++ b/administrator/components/com_contact/helpers/associations.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JTable::addIncludePath(__DIR__ . '/../tables');
+
+/**
+ * Content associations helper.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class ContactAssociationsHelper extends JAssociationExtensionHelper
+{
+	/**
+	 * var       array   $extension  The extension name
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	protected $extension = 'com_contact';
+
+	/**
+	 * var       array   $itemTypes  Array of item types
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	protected $itemTypes = array('contact', 'category');
+
+	/**
+	 * var       boolean   $associationsSupport  Has the extension association support
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	protected $associationsSupport = true;
+
+	/**
+	 * Get the associated items for an item
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  array
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+
+	public function getAssociations($typeName, $id)
+	{
+		$type = $this->getType($typeName);
+
+		$context    = $this->extension . '.item';
+		$catidField = 'catid';
+
+		if ($typeName === 'category')
+		{
+			$context    = 'com_categories.item';
+			$catidField = '';
+		}
+
+		// Get the associations.
+		$associations = JLanguageAssociations::getAssociations(
+			$this->extension,
+			$type['tables']['a'],
+			$context,
+			$id,
+			'id',
+			'alias',
+			$catidField
+		);
+
+		return $associations;
+	}
+
+	/**
+	 * Get item information
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  JTable|null
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	public function getItem($typeName, $id)
+	{
+		if (empty($id))
+		{
+			return null;
+		}
+
+		$table = null;
+
+		switch ($typeName)
+		{
+			case 'contact':
+				$table = JTable::getInstance('contact', 'ContactTable');
+				break;
+
+			case 'category':
+				$table = JTable::getInstance('category');
+				break;
+		}
+
+		if (empty($table))
+		{
+			return null;
+		}
+
+		$table->load($id);
+
+		return $table;
+	}
+
+	/**
+	 * Get information about the type
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of item types
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function getType($typeName = '')
+	{
+		$fields  = $this->getFieldsTemplate();
+		$tables  = array();
+		$joins   = array();
+		$support = $this->getSupportTemplate();
+		$title   = '';
+
+		if (in_array($typeName, $this->itemTypes))
+		{
+
+			switch ($typeName)
+			{
+				case 'contact':
+					$fields['title'] = 'a.name';
+					$fields['state'] = 'a.published';
+
+					$support['state'] = true;
+					$support['acl'] = true;
+					$support['checkout'] = true;
+
+					$tables = array(
+						'a' => '#__contact_details'
+					);
+					$title = 'contact';
+					break;
+
+				case 'category':
+					$fields['created_user_id'] = 'a.created_user_id';
+					$fields['ordering'] = 'a.lft';
+					$fields['level'] = 'a.level';
+					$fields['catid'] = '';
+					$fields['state'] = 'a.published';
+
+					$support['state'] = true;
+					$support['acl'] = true;
+					$support['checkout'] = true;
+
+					$tables = array(
+						'a' => '#__categories'
+					);
+					$title = 'category';
+					break;
+			}
+		}
+
+		return array(
+			'fields'  => $fields,
+			'support' => $support,
+			'tables'  => $tables,
+			'joins'   => $joins,
+			'title'   => $title
+		);
+	}
+}

From c1ebda1315fa9688a2265e74e515b322b83770bf Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 10 Jan 2017 09:00:24 +0100
Subject: [PATCH 05/35] temp fix

---
 .../components/com_associations/helpers/associations.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/administrator/components/com_associations/helpers/associations.php b/administrator/components/com_associations/helpers/associations.php
index 55ec3af62c378..3aba5229ffa12 100644
--- a/administrator/components/com_associations/helpers/associations.php
+++ b/administrator/components/com_associations/helpers/associations.php
@@ -173,6 +173,11 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
 		// Get the associations list for this item.
 		$items = self::getAssociationList($extensionName, $typeName, $itemId);
 
+		// Todo: move to a helper function
+		$helper         = self::getExtensionHelper($extensionName);
+		$typeFields     = $helper->getTypeFields($typeName);
+		$titleFieldName = substr($typeFields['title'], 2);
+
 		// Get all content languages.
 		$languages = self::getContentLanguages();
 
@@ -197,7 +202,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
 			// Get html parameters.
 			if (isset($items[$langCode]))
 			{
-				$title       = '<br/><br/>' . $items[$langCode]['title'];
+				$title       = '<br/><br/>' . $items[$langCode][$titleFieldName];
 				$additional  = '';
 
 				if (isset($items[$langCode]['category_title']))

From b6624914ed3f614002b59dccc721815ee648fc49 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 10 Jan 2017 09:15:35 +0100
Subject: [PATCH 06/35] fix for category filter

---
 .../components/com_associations/models/associations.php    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/administrator/components/com_associations/models/associations.php b/administrator/components/com_associations/models/associations.php
index a32796a5617b1..831d7a67df9d3 100644
--- a/administrator/components/com_associations/models/associations.php
+++ b/administrator/components/com_associations/models/associations.php
@@ -325,10 +325,11 @@ protected function getListQuery()
 			$query->where($db->qn($fields['id']) . ' > 1')
 				->where($db->qn('a.client_id') . ' = 0');
 		}
-		// If component item type is categories we need to remove all other component categories.
-		elseif ($extension === 'com_categories')
+
+		// If component item type is category we need to remove all other component categories.
+		if ($typeName === 'category')
 		{
-			$query->where($db->qn('a.extension') . ' = ' . $db->quote('X'));
+			$query->where($db->qn('a.extension') . ' = ' . $db->quote($extensionName));
 		}
 
 		// Filter on the language.

From f7c85a5f40d99336963c5e6f9f40a9dc23f3d9be Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 10 Jan 2017 09:25:00 +0100
Subject: [PATCH 07/35] added newsfeeds associations helper

---
 .../com_newsfeeds/helpers/associations.php    | 185 ++++++++++++++++++
 1 file changed, 185 insertions(+)
 create mode 100644 administrator/components/com_newsfeeds/helpers/associations.php

diff --git a/administrator/components/com_newsfeeds/helpers/associations.php b/administrator/components/com_newsfeeds/helpers/associations.php
new file mode 100644
index 0000000000000..30f397e3b3839
--- /dev/null
+++ b/administrator/components/com_newsfeeds/helpers/associations.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+JTable::addIncludePath(__DIR__ . '/../tables');
+
+/**
+ * Content associations helper.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class NewsfeedsAssociationsHelper extends JAssociationExtensionHelper
+{
+	/**
+	 * var       array   $extension  The extension name
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	protected $extension = 'com_newsfeeds';
+
+	/**
+	 * var       array   $itemTypes  Array of item types
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	protected $itemTypes = array('newsfeed', 'category');
+
+	/**
+	 * var       boolean   $associationsSupport  Has the extension association support
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	protected $associationsSupport = true;
+
+	/**
+	 * Get the associated items for an item
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  array
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+
+	public function getAssociations($typeName, $id)
+	{
+		$type = $this->getType($typeName);
+
+		$context    = $this->extension . '.item';
+		$catidField = 'catid';
+
+		if ($typeName === 'category')
+		{
+			$context    = 'com_categories.item';
+			$catidField = '';
+		}
+
+		// Get the associations.
+		$associations = JLanguageAssociations::getAssociations(
+			$this->extension,
+			$type['tables']['a'],
+			$context,
+			$id,
+			'id',
+			'alias',
+			$catidField
+		);
+
+		return $associations;
+	}
+
+	/**
+	 * Get item information
+	 *
+	 * @param   string  $typeName  The item type
+	 * @param   int     $id        The id of item for which we need the associated items
+	 *
+	 * @return  JTable|null
+	 *
+	 * @since    __DEPLOY_VERSION__
+	 */
+	public function getItem($typeName, $id)
+	{
+		if (empty($id))
+		{
+			return null;
+		}
+
+		$table = null;
+
+		switch ($typeName)
+		{
+			case 'contact':
+				$table = JTable::getInstance('Newsfeed', 'NewsfeedsTable');
+				break;
+
+			case 'category':
+				$table = JTable::getInstance('category');
+				break;
+		}
+
+		if (empty($table))
+		{
+			return null;
+		}
+
+		$table->load($id);
+
+		return $table;
+	}
+
+	/**
+	 * Get information about the type
+	 *
+	 * @param   string  $typeName  The item type
+	 *
+	 * @return  array  Array of item types
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function getType($typeName = '')
+	{
+		$fields  = $this->getFieldsTemplate();
+		$tables  = array();
+		$joins   = array();
+		$support = $this->getSupportTemplate();
+		$title   = '';
+
+		if (in_array($typeName, $this->itemTypes))
+		{
+
+			switch ($typeName)
+			{
+				case 'newsfeed':
+					$fields['title'] = 'a.name';
+					$fields['state'] = 'a.published';
+
+					$support['state'] = true;
+					$support['acl'] = true;
+					$support['checkout'] = true;
+
+					$tables = array(
+						'a' => '#__newsfeeds'
+					);
+					$title = 'newsfeed';
+					break;
+
+				case 'category':
+					$fields['created_user_id'] = 'a.created_user_id';
+					$fields['ordering'] = 'a.lft';
+					$fields['level'] = 'a.level';
+					$fields['catid'] = '';
+					$fields['state'] = 'a.published';
+
+					$support['state'] = true;
+					$support['acl'] = true;
+					$support['checkout'] = true;
+
+					$tables = array(
+						'a' => '#__categories'
+					);
+					$title = 'category';
+					break;
+			}
+		}
+
+		return array(
+			'fields'  => $fields,
+			'support' => $support,
+			'tables'  => $tables,
+			'joins'   => $joins,
+			'title'   => $title
+		);
+	}
+}

From 04958860ad7707e07fc31d250a3ce8d104a5e245 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 10 Jan 2017 09:30:26 +0100
Subject: [PATCH 08/35] CAPS for params

---
 administrator/components/com_contact/helpers/associations.php | 4 ++--
 administrator/components/com_content/helpers/associations.php | 4 ++--
 .../components/com_newsfeeds/helpers/associations.php         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/administrator/components/com_contact/helpers/associations.php b/administrator/components/com_contact/helpers/associations.php
index 588661fafb0e2..0550a2f8fb567 100644
--- a/administrator/components/com_contact/helpers/associations.php
+++ b/administrator/components/com_contact/helpers/associations.php
@@ -101,11 +101,11 @@ public function getItem($typeName, $id)
 		switch ($typeName)
 		{
 			case 'contact':
-				$table = JTable::getInstance('contact', 'ContactTable');
+				$table = JTable::getInstance('Contact', 'ContactTable');
 				break;
 
 			case 'category':
-				$table = JTable::getInstance('category');
+				$table = JTable::getInstance('Category');
 				break;
 		}
 
diff --git a/administrator/components/com_content/helpers/associations.php b/administrator/components/com_content/helpers/associations.php
index cfad7fbaa9e5b..f1e9da2713e07 100644
--- a/administrator/components/com_content/helpers/associations.php
+++ b/administrator/components/com_content/helpers/associations.php
@@ -99,11 +99,11 @@ public function getItem($typeName, $id)
 		switch ($typeName)
 		{
 			case 'article':
-				$table = JTable::getInstance('content');
+				$table = JTable::getInstance('Content');
 				break;
 
 			case 'category':
-				$table = JTable::getInstance('category');
+				$table = JTable::getInstance('Category');
 				break;
 		}
 
diff --git a/administrator/components/com_newsfeeds/helpers/associations.php b/administrator/components/com_newsfeeds/helpers/associations.php
index 30f397e3b3839..6a61334315948 100644
--- a/administrator/components/com_newsfeeds/helpers/associations.php
+++ b/administrator/components/com_newsfeeds/helpers/associations.php
@@ -105,7 +105,7 @@ public function getItem($typeName, $id)
 				break;
 
 			case 'category':
-				$table = JTable::getInstance('category');
+				$table = JTable::getInstance('Category');
 				break;
 		}
 

From ebe4afc494dddf776ebabc38de688abd9115bc1f Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 10 Jan 2017 09:47:04 +0100
Subject: [PATCH 09/35] lang tag and added a helper function

---
 .../com_associations/helpers/associations.php | 31 ++++++++++++++++---
 .../joomla/association/extension/helper.php   | 30 ++++++++++++++++++
 2 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/administrator/components/com_associations/helpers/associations.php b/administrator/components/com_associations/helpers/associations.php
index 3aba5229ffa12..2d42eff54403f 100644
--- a/administrator/components/com_associations/helpers/associations.php
+++ b/administrator/components/com_associations/helpers/associations.php
@@ -173,10 +173,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
 		// Get the associations list for this item.
 		$items = self::getAssociationList($extensionName, $typeName, $itemId);
 
-		// Todo: move to a helper function
-		$helper         = self::getExtensionHelper($extensionName);
-		$typeFields     = $helper->getTypeFields($typeName);
-		$titleFieldName = substr($typeFields['title'], 2);
+		$titleFieldName = self::getTypeFieldName($extensionName, $typeName, 'title');
 
 		// Get all content languages.
 		$languages = self::getContentLanguages();
@@ -361,7 +358,7 @@ public static function getSupportedExtension($extensionName)
 				$languageKey = strtoupper($extensionName . '_' . $title . 'S');
 			}
 
-			$title = $lang->hasKey($languageKey) ? JText::_($languageKey) : JText::_('ITEMS');
+			$title = $lang->hasKey($languageKey) ? JText::_($languageKey) : JText::_('COM_ASSOCIATIONS_ITEMS');
 
 			$rType = new Registry;
 
@@ -507,4 +504,28 @@ public static function typeSupportsCheckout($extensionName, $typeName)
 
 		return ! empty($support['checkout']);
 	}
+
+	/**
+	 * Get a table field name for a type
+	 *
+	 * @param   string  $extensionName  The extension name with com_
+	 * @param   string  $typeName       The item type
+	 * @param   string  $fieldName      The item type
+	 *
+	 * @return  boolean  True on allowed.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public static function getTypeFieldName($extensionName, $typeName, $fieldName)
+	{
+		if (! self::hasSupport($extensionName))
+		{
+			return false;
+		}
+
+		// Get the extension specific helper method
+		$helper = self::getExtensionHelper($extensionName);
+
+		return $helper->getTypeFieldName($typeName, $fieldName);
+	}
 }
diff --git a/libraries/joomla/association/extension/helper.php b/libraries/joomla/association/extension/helper.php
index 7d961aa0a9252..49dc1a6c2bba0 100644
--- a/libraries/joomla/association/extension/helper.php
+++ b/libraries/joomla/association/extension/helper.php
@@ -212,6 +212,36 @@ private function getTypeInformation($typeName, $part = 'support')
 		return $type[$part];
 	}
 
+	/**
+	 * Get a table field name for a type
+	 *
+	 * @param   string  $typeName       The item type
+	 * @param   string  $fieldName      The item type
+	 *
+	 * @return  string
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public function getTypeFieldName($typeName, $fieldName)
+	{
+		$fields = $this->getTypeFields($typeName);
+
+		if (! array_key_exists($fieldName, $fields))
+		{
+			return '';
+		}
+
+		$tmp = $fields[$fieldName];
+		$pos = strpos($tmp, '.');
+
+		if ($pos === false)
+		{
+			return $tmp;
+		}
+
+		return substr($tmp, $pos + 1);
+	}
+
 	/**
 	 * Get default values for support array
 	 *

From 00eb70b0957dbe0ad362a527c0c83ca24d7bc20c Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 10 Jan 2017 10:17:23 +0100
Subject: [PATCH 10/35] added land tags

---
 administrator/language/en-GB/en-GB.com_associations.ini | 1 +
 administrator/language/en-GB/en-GB.com_contact.ini      | 1 +
 administrator/language/en-GB/en-GB.com_menus.ini        | 7 ++++---
 administrator/language/en-GB/en-GB.com_newsfeeds.ini    | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_associations.ini b/administrator/language/en-GB/en-GB.com_associations.ini
index f251d5df4a03f..95cd0ee122f5d 100644
--- a/administrator/language/en-GB/en-GB.com_associations.ini
+++ b/administrator/language/en-GB/en-GB.com_associations.ini
@@ -29,6 +29,7 @@ COM_ASSOCIATIONS_HEADING_ASSOCIATION="Associations"
 COM_ASSOCIATIONS_HEADING_MENUTYPE="Menu"
 COM_ASSOCIATIONS_HEADING_MENUTYPE_ASC="Menu ascending"
 COM_ASSOCIATIONS_HEADING_MENUTYPE_DESC="Menu descending"
+COM_ASSOCIATIONS_ITEMS="Items"
 COM_ASSOCIATIONS_NO_ASSOCIATION="There is no association for this language"
 COM_ASSOCIATIONS_NOTICE_NO_SELECTORS="Please select an Item Type and a reference language to view the associations."
 COM_ASSOCIATIONS_PURGE="Delete All Associations"
diff --git a/administrator/language/en-GB/en-GB.com_contact.ini b/administrator/language/en-GB/en-GB.com_contact.ini
index e58d9bdb19fd9..6c5feccb97f0f 100644
--- a/administrator/language/en-GB/en-GB.com_contact.ini
+++ b/administrator/language/en-GB/en-GB.com_contact.ini
@@ -20,6 +20,7 @@ COM_CONTACT_CONTACT_DETAILS="Details"
 COM_CONTACT_CONTACT_DISPLAY_DETAILS="Display options for the individual contact page."
 COM_CONTACT_CONTACT_SETTINGS_LABEL="Contact Options"
 COM_CONTACT_CONTACT_VIEW_DEFAULT_DESC="This links to the contact information for one contact."
+COM_CONTACT_CONTACTS="Contact Items"
 COM_CONTACT_DETAILS="Contact Information"
 COM_CONTACT_EDIT_CONTACT="Edit Contact"
 COM_CONTACT_EDIT_DETAILS="Edit contact information displayed on an individual page."
diff --git a/administrator/language/en-GB/en-GB.com_menus.ini b/administrator/language/en-GB/en-GB.com_menus.ini
index fd62d4f5a8373..4a5442d843117 100644
--- a/administrator/language/en-GB/en-GB.com_menus.ini
+++ b/administrator/language/en-GB/en-GB.com_menus.ini
@@ -133,6 +133,7 @@ COM_MENUS_ITEMS_SET_HOME_0="No menu item set to home."
 COM_MENUS_ITEMS_SET_HOME_1="1 menu item successfully set to home."
 COM_MENUS_ITEMS_SET_HOME_MORE="%d menu items successfully set to home."
 COM_MENUS_ITEMS_UNSET_HOME="1 menu item successfully unset to home."
+COM_MENUS_LABEL_HIDDEN="Hidden"
 COM_MENUS_LAYOUT_FEATURED_OPTIONS="Layout"
 COM_MENUS_LAYOUT_MENUTYPE_OPTIONS_LABEL="Menu Type"
 COM_MENUS_LINKTYPE_OPTIONS_LABEL="Link Type"
@@ -145,13 +146,11 @@ COM_MENUS_MENU_MENUTYPE_LABEL="Menu Type"
 COM_MENUS_MENU_SAVE_SUCCESS="Menu successfully saved"
 COM_MENUS_MENU_SEARCH_FILTER="Search in Title or Menu type"
 COM_MENUS_MENU_SPRINTF="Menu: %s"
-COM_MENUS_TYPE_SYSTEM="System Links"
+COM_MENUS_MENUS="Menu items"
 COM_MENUS_MENU_TITLE_DESC="The title of the menu to display in the Administrator Menubar and lists."
 COM_MENUS_MENU_TYPE_NOT_ALLOWED="This is a reserved menutype."
 COM_MENUS_MENUS_FILTER_SEARCH_DESC="Search in title and menu type."
 COM_MENUS_MENUS_FILTER_SEARCH_LABEL="Search Menus"
-COM_MENUS_PAGE_OPTIONS_LABEL="Page Display"
-COM_MENUS_LABEL_HIDDEN="Hidden"
 ; in the following string
 ; %1$s is for module title, %2$s is for access-title, %3$s is for position
 COM_MENUS_MODULE_ACCESS_POSITION="%1$s <small>(%2$s in %3$s)</small>"
@@ -176,6 +175,7 @@ COM_MENUS_NEW_MENUITEM="New Menu Item"
 COM_MENUS_NO_ITEM_SELECTED="No menu items selected."
 COM_MENUS_NO_MENUS_SELECTED="No menu selected."
 COM_MENUS_OPTION_SELECT_LEVEL="- Select Max Levels -"
+COM_MENUS_PAGE_OPTIONS_LABEL="Page Display"
 COM_MENUS_REQUEST_FIELDSET_LABEL="Required Settings"
 COM_MENUS_SAVE_SUCCESS="Menu item successfully saved."
 COM_MENUS_SELECT_A_MENUITEM="Select a Menu Item"
@@ -198,6 +198,7 @@ COM_MENUS_TYPE_HEADING="Menu Heading"
 COM_MENUS_TYPE_HEADING_DESC="A heading for use within menus, useful when separating menus with a separator."
 COM_MENUS_TYPE_SEPARATOR="Text Separator"
 COM_MENUS_TYPE_SEPARATOR_DESC="A text separator."
+COM_MENUS_TYPE_SYSTEM="System Links"
 COM_MENUS_TYPE_UNEXISTING="Component '%s' does not exist."
 COM_MENUS_TYPE_UNKNOWN="Unknown"
 COM_MENUS_VIEW_EDIT_ITEM_TITLE="Menus: Edit Item"
diff --git a/administrator/language/en-GB/en-GB.com_newsfeeds.ini b/administrator/language/en-GB/en-GB.com_newsfeeds.ini
index adcc0aad9b756..dd1e3cdef50c3 100644
--- a/administrator/language/en-GB/en-GB.com_newsfeeds.ini
+++ b/administrator/language/en-GB/en-GB.com_newsfeeds.ini
@@ -115,6 +115,7 @@ COM_NEWSFEEDS_N_ITEMS_TRASHED_1="News feed successfully trashed."
 COM_NEWSFEEDS_N_ITEMS_UNPUBLISHED="%d news feeds successfully unpublished."
 COM_NEWSFEEDS_N_ITEMS_UNPUBLISHED_1="News feed successfully unpublished."
 COM_NEWSFEEDS_NEW_NEWSFEED="New News Feed"
+COM_NEWSFEEDS_NEWSFEEDS="Newsfeeds"
 COM_NEWSFEEDS_NO_ITEM_SELECTED="No news feeds selected."
 COM_NEWSFEEDS_NONE="None"
 COM_NEWSFEEDS_NUM_ARTICLES_HEADING="# Articles"

From a54d3f7a8411387a996b1a29b165aae2a17ee6f9 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 10 Jan 2017 10:20:21 +0100
Subject: [PATCH 11/35] code style fix

---
 libraries/joomla/association/extension/helper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/joomla/association/extension/helper.php b/libraries/joomla/association/extension/helper.php
index 49dc1a6c2bba0..6d3af05182bf1 100644
--- a/libraries/joomla/association/extension/helper.php
+++ b/libraries/joomla/association/extension/helper.php
@@ -215,8 +215,8 @@ private function getTypeInformation($typeName, $part = 'support')
 	/**
 	 * Get a table field name for a type
 	 *
-	 * @param   string  $typeName       The item type
-	 * @param   string  $fieldName      The item type
+	 * @param   string  $typeName   The item type
+	 * @param   string  $fieldName  The item type
 	 *
 	 * @return  string
 	 *

From f7ebff90344da168cbb46a3bcfffdbeb6bd54e93 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 10 Jan 2017 10:41:38 +0100
Subject: [PATCH 12/35] better title in associations view

---
 .../views/associations/view.html.php              | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_associations/views/associations/view.html.php b/administrator/components/com_associations/views/associations/view.html.php
index d8c9d29f4eae5..e2278b37d4e3f 100644
--- a/administrator/components/com_associations/views/associations/view.html.php
+++ b/administrator/components/com_associations/views/associations/view.html.php
@@ -193,11 +193,22 @@ protected function addToolbar()
 	{
 		$user = JFactory::getUser();
 
-		if (isset($this->itemType))
+		if (isset($this->typeName) && isset($this->extensionName))
 		{
+
+			$helper = AssociationsHelper::getExtensionHelper($this->extensionName);
+			$title  = $helper->getTypeTitle($this->typeName);
+
+			$languageKey = strtoupper($this->extensionName . '_' . $title . 'S');
+
+			if ($this->typeName === 'category')
+			{
+				$languageKey = strtoupper($this->extensionName) . '_CATEGORIES';
+			}
+
 			JToolbarHelper::title(
 				JText::sprintf(
-					'COM_ASSOCIATIONS_TITLE_LIST', JText::_($this->extensionName), JText::_($this->typeName)
+					'COM_ASSOCIATIONS_TITLE_LIST', JText::_($this->extensionName), JText::_($languageKey)
 				), 'contract'
 			);
 		}

From 87a3138d67758d94c78312ffc064162f71501a4b Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 10 Jan 2017 10:43:45 +0100
Subject: [PATCH 13/35] better title

---
 .../com_associations/views/association/view.html.php | 12 +++++++++++-
 .../views/associations/view.html.php                 |  1 -
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_associations/views/association/view.html.php b/administrator/components/com_associations/views/association/view.html.php
index 478f61d2d4147..07e56af4b9fbc 100644
--- a/administrator/components/com_associations/views/association/view.html.php
+++ b/administrator/components/com_associations/views/association/view.html.php
@@ -179,7 +179,17 @@ protected function addToolbar()
 		// Hide main menu.
 		JFactory::getApplication()->input->set('hidemainmenu', 1);
 
-		JToolbarHelper::title(JText::sprintf('COM_ASSOCIATIONS_TITLE_EDIT', JText::_($this->extensionName), JText::_($this->typeName)), 'contract');
+		$helper = AssociationsHelper::getExtensionHelper($this->extensionName);
+		$title  = $helper->getTypeTitle($this->typeName);
+
+		$languageKey = strtoupper($this->extensionName . '_' . $title . 'S');
+
+		if ($this->typeName === 'category')
+		{
+			$languageKey = strtoupper($this->extensionName) . '_CATEGORIES';
+		}
+
+		JToolbarHelper::title(JText::sprintf('COM_ASSOCIATIONS_TITLE_EDIT', JText::_($this->extensionName), JText::_($languageKey)), 'contract');
 
 		$bar = JToolbar::getInstance('toolbar');
 
diff --git a/administrator/components/com_associations/views/associations/view.html.php b/administrator/components/com_associations/views/associations/view.html.php
index e2278b37d4e3f..81fc381d251e1 100644
--- a/administrator/components/com_associations/views/associations/view.html.php
+++ b/administrator/components/com_associations/views/associations/view.html.php
@@ -195,7 +195,6 @@ protected function addToolbar()
 
 		if (isset($this->typeName) && isset($this->extensionName))
 		{
-
 			$helper = AssociationsHelper::getExtensionHelper($this->extensionName);
 			$title  = $helper->getTypeTitle($this->typeName);
 

From 100fb42b8aecb2dc0ec1e53c80597bfe09750cfb Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 10 Jan 2017 12:50:10 +0100
Subject: [PATCH 14/35] use the usual naming

---
 administrator/language/en-GB/en-GB.com_contact.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/en-GB.com_contact.ini b/administrator/language/en-GB/en-GB.com_contact.ini
index 6c5feccb97f0f..8440e4ff585c2 100644
--- a/administrator/language/en-GB/en-GB.com_contact.ini
+++ b/administrator/language/en-GB/en-GB.com_contact.ini
@@ -20,7 +20,7 @@ COM_CONTACT_CONTACT_DETAILS="Details"
 COM_CONTACT_CONTACT_DISPLAY_DETAILS="Display options for the individual contact page."
 COM_CONTACT_CONTACT_SETTINGS_LABEL="Contact Options"
 COM_CONTACT_CONTACT_VIEW_DEFAULT_DESC="This links to the contact information for one contact."
-COM_CONTACT_CONTACTS="Contact Items"
+COM_CONTACT_CONTACTS="Contact"
 COM_CONTACT_DETAILS="Contact Information"
 COM_CONTACT_EDIT_CONTACT="Edit Contact"
 COM_CONTACT_EDIT_DETAILS="Edit contact information displayed on an individual page."

From 7b0b75f2a02b690ef39cc3b3aa5096917cb795a8 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Tue, 10 Jan 2017 14:55:04 +0100
Subject: [PATCH 15/35] fix language tag, thanks to brian teeman and twitter
 :-)

---
 administrator/language/en-GB/en-GB.com_associations.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/en-GB.com_associations.ini b/administrator/language/en-GB/en-GB.com_associations.ini
index 95cd0ee122f5d..a0657bdfd4366 100644
--- a/administrator/language/en-GB/en-GB.com_associations.ini
+++ b/administrator/language/en-GB/en-GB.com_associations.ini
@@ -22,7 +22,7 @@ COM_ASSOCIATIONS_EDIT_SHOW_REFERENCE="Show Reference"
 COM_ASSOCIATIONS_ERROR_NO_ASSOC="The Multilingual Associations component can't be used if the site is not set as multilingual and/or Items Associations is not enabled in the Language Filter plugin."
 COM_ASSOCIATIONS_FILTER_MENUTYPE_DESC="Select a Menu"
 COM_ASSOCIATIONS_FILTER_MENUTYPE_LABEL="Menu"
-COM_ASSOCIATIONS_FILTER_SEARCH_DESC="Search an item by it's title"
+COM_ASSOCIATIONS_FILTER_SEARCH_DESC="Search an item by its title"
 COM_ASSOCIATIONS_FILTER_SEARCH_LABEL="Search item"
 COM_ASSOCIATIONS_FILTER_SELECT_ITEM_TYPE="- Select Item Type -"
 COM_ASSOCIATIONS_HEADING_ASSOCIATION="Associations"

From f50ad7885aaf592e01902de6784d581e60e435eb Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Tue, 10 Jan 2017 22:51:08 +0100
Subject: [PATCH 16/35] initial review

---
 .../com_associations/associations.php         |  3 +-
 .../com_associations/associations.xml         |  2 +-
 .../components/com_associations/config.xml    |  3 +-
 .../com_associations/controller.php           |  4 +-
 .../controllers/association.php               | 14 +--
 .../controllers/associations.php              |  6 +-
 .../com_associations/helpers/associations.php | 91 +++++++++----------
 .../joomla/searchtools/default/bar.php        | 44 ++++-----
 .../com_associations/models/associations.php  | 70 +++++++-------
 .../models/fields/itemlanguage.php            |  7 +-
 .../models/fields/itemtype.php                |  6 +-
 .../models/fields/modalassociation.php        | 12 +--
 .../models/forms/association.xml              |  2 +-
 .../models/forms/filter_associations.xml      | 23 +++--
 .../views/association/tmpl/edit.php           | 13 +--
 .../views/association/view.html.php           | 29 +++---
 .../views/associations/tmpl/default.php       | 27 +++---
 .../views/associations/tmpl/modal.php         | 19 ++--
 .../views/associations/view.html.php          | 22 ++---
 19 files changed, 188 insertions(+), 209 deletions(-)

diff --git a/administrator/components/com_associations/associations.php b/administrator/components/com_associations/associations.php
index 2c199cef7031e..e9aa67f8e8336 100644
--- a/administrator/components/com_associations/associations.php
+++ b/administrator/components/com_associations/associations.php
@@ -8,6 +8,7 @@
  */
 
 defined('_JEXEC') or die;
+
 JHtml::_('behavior.tabstate');
 
 if (!JFactory::getUser()->authorise('core.manage', 'com_associations'))
@@ -24,7 +25,7 @@
 {
 	list($extensionName, $typeName) = explode('.', $itemtype);
 
-	if (! AssociationsHelper::hasSupport($extensionName))
+	if (!AssociationsHelper::hasSupport($extensionName))
 	{
 		throw new Exception(JText::_('COM_ASSOCIATIONS_COMPONENT_NOT_SUPPORTED') . ' ' . $itemType->realcomponent, 404);
 	}
diff --git a/administrator/components/com_associations/associations.xml b/administrator/components/com_associations/associations.xml
index 082bab1233824..2e058c522c09b 100644
--- a/administrator/components/com_associations/associations.xml
+++ b/administrator/components/com_associations/associations.xml
@@ -2,7 +2,7 @@
 <extension type="component" version="3.7" method="upgrade">
 	<name>com_associations</name>
 	<author>Joomla! Project</author>
-	<creationDate>September 2016</creationDate>
+	<creationDate>Januar 2017</creationDate>
 	<copyright>(C) 2005 - 2016 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/administrator/components/com_associations/config.xml b/administrator/components/com_associations/config.xml
index 20f40eb6d9887..1074b48ec73fb 100644
--- a/administrator/components/com_associations/config.xml
+++ b/administrator/components/com_associations/config.xml
@@ -11,6 +11,7 @@
 			filter="rules"
 			validate="rules"
 			component="com_associations"
-			section="component" />
+			section="component"
+		/>
 	</fieldset>
 </config>
diff --git a/administrator/components/com_associations/controller.php b/administrator/components/com_associations/controller.php
index dd8e767dcd8e4..a70159e56d8b2 100644
--- a/administrator/components/com_associations/controller.php
+++ b/administrator/components/com_associations/controller.php
@@ -17,7 +17,9 @@
 class AssociationsController extends JControllerLegacy
 {
 	/**
-	 * @var     string  The default view.
+	 * The default view.
+	 *
+	 * @var     string
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
diff --git a/administrator/components/com_associations/controllers/association.php b/administrator/components/com_associations/controllers/association.php
index 2489d5feebff2..3b50827e5be77 100644
--- a/administrator/components/com_associations/controllers/association.php
+++ b/administrator/components/com_associations/controllers/association.php
@@ -31,11 +31,9 @@ class AssociationsControllerAssociation extends JControllerForm
 	 */
 	public function edit($key = null, $urlVar = null)
 	{
-		$input = JFactory::getApplication()->input;
+		list($extensionName, $typeName) = explode('.', $this->input->get('itemtype'));
 
-		list($extensionName, $typeName) = explode('.', $input->get('itemtype'));
-
-		$id = $input->get('id', 0);
+		$id = $this->input->get('id', 0);
 
 		// Check if reference item can be edited.
 		if (!AssociationsHelper::allowEdit($extensionName, $typeName, $id))
@@ -62,11 +60,7 @@ public function cancel($key = null)
 	{
 		JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));
 
-		$input = JFactory::getApplication()->input;
-
-		list($extensionName, $typeName) = explode('.', $input->get('itemtype'));
-
-		$id = $input->get('id', 0);
+		list($extensionName, $typeName) = explode('.', $this->input->get('itemtype'));
 
 		// Only check in, if component item type allows to check out.
 		if (AssociationsHelper::typeSupportsCheckout($extensionName, $typeName))
@@ -79,7 +73,7 @@ public function cancel($key = null)
 				$ids = array_unique(explode(',', $targetId));
 			}
 
-			$ids[] = $id;
+			$ids[] = $this->input->get('id', 0);
 
 			foreach ($ids as $key => $id)
 			{
diff --git a/administrator/components/com_associations/controllers/associations.php b/administrator/components/com_associations/controllers/associations.php
index 332a05dd5aa46..5012e2e838a16 100644
--- a/administrator/components/com_associations/controllers/associations.php
+++ b/administrator/components/com_associations/controllers/associations.php
@@ -52,8 +52,7 @@ public function getModel($name = 'Associations', $prefix = 'AssociationsModel',
 	 */
 	public function purge()
 	{
-		$model = $this->getModel('associations');
-		$model->purge();
+		$this->getModel('associations')->purge();
 		$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false));
 	}
 
@@ -66,8 +65,7 @@ public function purge()
 	 */
 	public function clean()
 	{
-		$model = $this->getModel('associations');
-		$model->clean();
+		$this->getModel('associations')->clean();
 		$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false));
 	}
 }
diff --git a/administrator/components/com_associations/helpers/associations.php b/administrator/components/com_associations/helpers/associations.php
index 2d42eff54403f..9e0252667f1a5 100644
--- a/administrator/components/com_associations/helpers/associations.php
+++ b/administrator/components/com_associations/helpers/associations.php
@@ -19,16 +19,20 @@
 class AssociationsHelper extends JHelperContent
 {
 	/**
-	 * var       array   $extensionsSupport  Array of Registry objects of extensions
+	 * Array of Registry objects of extensions
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * var      array   $extensionsSupport
+	 *
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public static $extensionsSupport = null;
 
 	/**
-	 * var       array   $supportedExtensionsList  List of extensions name with support
+	 * List of extensions name with support
+	 *
+	 * var      array   $supportedExtensionsList
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public static $supportedExtensionsList = array();
 
@@ -41,11 +45,11 @@ class AssociationsHelper extends JHelperContent
 	 *
 	 * @return  array
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public static function getAssociationList($extensionName, $typeName, $itemId)
 	{
-		if (! self::hasSupport($extensionName))
+		if (!self::hasSupport($extensionName))
 		{
 			return array();
 		}
@@ -53,9 +57,8 @@ public static function getAssociationList($extensionName, $typeName, $itemId)
 		// Get the extension specific helper method
 		$helper = self::getExtensionHelper($extensionName);
 
-		$items = $helper->getAssociationList($typeName, $itemId);
+		return $helper->getAssociationList($typeName, $itemId);
 
-		return $items;
 	}
 
 	/**
@@ -65,11 +68,11 @@ public static function getAssociationList($extensionName, $typeName, $itemId)
 	 *
 	 * @return  HelperClass|null
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public static function getExtensionHelper($extensionName)
 	{
-		if (! self::hasSupport($extensionName))
+		if (!self::hasSupport($extensionName))
 		{
 			return null;
 		}
@@ -88,11 +91,11 @@ public static function getExtensionHelper($extensionName)
 	 *
 	 * @return  JTable|null
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public static function getItem($extensionName, $typeName, $itemId)
 	{
-		if (! self::hasSupport($extensionName))
+		if (!self::hasSupport($extensionName))
 		{
 			return array();
 		}
@@ -100,9 +103,7 @@ public static function getItem($extensionName, $typeName, $itemId)
 		// Get the extension specific helper method
 		$helper = self::getExtensionHelper($extensionName);
 
-		$item = $helper->getItem($typeName, $itemId);
-
-		return $item;
+		return $helper->getItem($typeName, $itemId);
 	}
 
 	/**
@@ -110,9 +111,9 @@ public static function getItem($extensionName, $typeName, $itemId)
 	 *
 	 * @param   string  $extensionName  The extension name with com_
 	 *
-	 * @return bool
+	 * @return  bool
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public static function hasSupport($extensionName)
 	{
@@ -129,9 +130,9 @@ public static function hasSupport($extensionName)
 	 *
 	 * @param   string  $extensionName  The extension name with com_
 	 *
-	 * @return bool
+	 * @return  bool
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	private static function getExtensionHelperClassName($extensionName)
 	{
@@ -145,9 +146,9 @@ private static function getExtensionHelperClassName($extensionName)
 	 *
 	 * @param   string  $extensionName  The extension name with com_
 	 *
-	 * @return string
+	 * @return  string
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	private static function getExtensionRealName($extensionName)
 	{
@@ -164,9 +165,9 @@ private static function getExtensionRealName($extensionName)
 	 * @param   boolean  $addLink        True for adding edit links. False for just text.
 	 * @param   boolean  $allLanguages   True for showing all content languages. False only languages with associations.
 	 *
-	 * @return string The language HTML
+	 * @return  string   The language HTML
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public static function getAssociationHtmlList($extensionName, $typeName, $itemId, $itemLanguage, $addLink = true, $allLanguages = true)
 	{
@@ -237,6 +238,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
 				'id'       => $itemId,
 				'target'   => $target,
 			);
+
 			$url       = JRoute::_('index.php?' . http_build_query($options));
 			$text      = strtoupper($language->sef);
 			$langImage = JHtml::_('image', 'mod_languages/' . $language->image . '.gif', $language->title, array('title' => $language->title), true);
@@ -253,11 +255,11 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
 	 *
 	 * @return  array  The extensions.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public static function getSupportedExtensions()
 	{
-		if (! is_null(self::$extensionsSupport))
+		if (!is_null(self::$extensionsSupport))
 		{
 			return self::$extensionsSupport;
 		}
@@ -288,7 +290,7 @@ public static function getSupportedExtensions()
 	 *
 	 * @return  Joomla\Registry\Registry  The item properties.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public static function getSupportedExtension($extensionName)
 	{
@@ -299,7 +301,7 @@ public static function getSupportedExtension($extensionName)
 		$result->def('helper', null);
 
 		// Check if associations helper exists
-		if (! file_exists(JPATH_ADMINISTRATOR . '/components/' . $extensionName . '/helpers/associations.php'))
+		if (!file_exists(JPATH_ADMINISTRATOR . '/components/' . $extensionName . '/helpers/associations.php'))
 		{
 			return $result;
 		}
@@ -308,7 +310,7 @@ public static function getSupportedExtension($extensionName)
 
 		$componentAssociationsHelperClassName = self::getExtensionHelperClassName($extensionName);
 
-		if (! class_exists($componentAssociationsHelperClassName, false))
+		if (!class_exists($componentAssociationsHelperClassName, false))
 		{
 			return $result;
 		}
@@ -336,8 +338,7 @@ public static function getSupportedExtension($extensionName)
 		$result->def('title', JText::_(strtoupper($extensionName)));
 
 		// Get the supported types
-		$types = $helper->getItemTypes();
-
+		$types  = $helper->getItemTypes();
 		$rTypes = array();
 
 		foreach ($types as $typeName)
@@ -380,7 +381,7 @@ public static function getSupportedExtension($extensionName)
 	 *
 	 * @return  mixed
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	private static function getEnabledExtensions()
 	{
@@ -402,7 +403,7 @@ private static function getEnabledExtensions()
 	 *
 	 * @return  array  Array of objects all content languages by language code.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public static function getContentLanguages()
 	{
@@ -428,11 +429,11 @@ public static function getContentLanguages()
 	 *
 	 * @return  bool
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public static function allowEdit($extensionName, $typeName, $itemId)
 	{
-		if (! self::hasSupport($extensionName))
+		if (!self::hasSupport($extensionName))
 		{
 			return false;
 		}
@@ -445,9 +446,7 @@ public static function allowEdit($extensionName, $typeName, $itemId)
 			return $helper->allowEdit($typeName, $itemId);
 		}
 
-		$user = JFactory::getUser();
-
-		return $user->authorise('core.edit', $extensionName);
+		return JFactory::getUser()->authorise('core.edit', $extensionName);
 	}
 
 	/**
@@ -458,11 +457,11 @@ public static function allowEdit($extensionName, $typeName, $itemId)
 	 *
 	 * @return  boolean  True on allowed.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public static function allowAdd($extensionName, $typeName)
 	{
-		if (! self::hasSupport($extensionName))
+		if (!self::hasSupport($extensionName))
 		{
 			return false;
 		}
@@ -475,9 +474,7 @@ public static function allowAdd($extensionName, $typeName)
 			return $helper->allowAdd($typeName);
 		}
 
-		$user = JFactory::getUser();
-
-		return $user->authorise('core.create', $extensionName);
+		return JFactory::getUser()->authorise('core.create', $extensionName);
 	}
 
 	/**
@@ -488,11 +485,11 @@ public static function allowAdd($extensionName, $typeName)
 	 *
 	 * @return  boolean  True on allowed.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public static function typeSupportsCheckout($extensionName, $typeName)
 	{
-		if (! self::hasSupport($extensionName))
+		if (!self::hasSupport($extensionName))
 		{
 			return false;
 		}
@@ -502,7 +499,7 @@ public static function typeSupportsCheckout($extensionName, $typeName)
 
 		$support = $helper->getTypeSupport($typeName);
 
-		return ! empty($support['checkout']);
+		return !empty($support['checkout']);
 	}
 
 	/**
@@ -514,11 +511,11 @@ public static function typeSupportsCheckout($extensionName, $typeName)
 	 *
 	 * @return  boolean  True on allowed.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public static function getTypeFieldName($extensionName, $typeName, $fieldName)
 	{
-		if (! self::hasSupport($extensionName))
+		if (!self::hasSupport($extensionName))
 		{
 			return false;
 		}
diff --git a/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php b/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php
index 91ec2e0c8f80e..9d9001b19a512 100644
--- a/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php
+++ b/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php
@@ -11,30 +11,22 @@
 
 $data = $displayData;
 
-if ($data['view'] instanceof AssociationsViewAssociations)
-{
-	$app = JFactory::getApplication();
-
-	// We will get the component item type and language filters & remove it from the form filters.
-	if ($app->input->get('forcedItemType', '', 'string') == '')
-	{
-		$itemTypeField = $data['view']->filterForm->getField('itemtype');
-?>
-	<div class="js-stools-field-filter js-stools-selector">
-		<?php echo $itemTypeField->input; ?>
-	</div>
-<?php
-	}
-	if ($app->input->get('forcedLanguage', '', 'cmd') == '')
-	{
-		$languageField = $data['view']->filterForm->getField('language');
 ?>
-	<div class="js-stools-field-filter js-stools-selector">
-		<?php echo $languageField->input; ?>
-	</div>
-<?php
-	}
-}
-
-// Display the main joomla layout
-echo JLayoutHelper::render('joomla.searchtools.default.bar', $data, null, array('component' => 'none'));
+<?php if ($data['view'] instanceof AssociationsViewAssociations) : ?>
+	<?php $app = JFactory::getApplication(); ?>
+	<?php // We will get the component item type and language filters & remove it from the form filters. ?>
+	<?php if ($app->input->get('forcedItemType', '', 'string') == '') : ?>
+		<?php $itemTypeField = $data['view']->filterForm->getField('itemtype'); ?>
+		<div class="js-stools-field-filter js-stools-selector">
+			<?php echo $itemTypeField->input; ?>
+		</div>
+	<?php endif; ?>
+	<?php if ($app->input->get('forcedLanguage', '', 'cmd') == '') : ?>
+		<?php $languageField = $data['view']->filterForm->getField('language'); ?>
+		<div class="js-stools-field-filter js-stools-selector">
+			<?php echo $languageField->input; ?>
+		</div>
+	<?php endif; ?>
+<?php endif; ?>
+<?php // Display the main joomla layout ?>
+<?php echo JLayoutHelper::render('joomla.searchtools.default.bar', $data, null, array('component' => 'none')); ?>
diff --git a/administrator/components/com_associations/models/associations.php b/administrator/components/com_associations/models/associations.php
index 831d7a67df9d3..24684a1cf8f74 100644
--- a/administrator/components/com_associations/models/associations.php
+++ b/administrator/components/com_associations/models/associations.php
@@ -21,7 +21,8 @@ class AssociationsModelAssociations extends JModelList
 	 *
 	 * @param   array  $config  An optional associative array of configuration settings.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
+	 *
 	 * @see     JController
 	 */
 	public function __construct($config = array())
@@ -35,11 +36,14 @@ public function __construct($config = array())
 				'itemtype',
 				'language',
 				'association',
-				'menutype', 'menutype_title',
+				'menutype',
+				'menutype_title',
 				'level',
 				'state',
-				'category_id', 'category_title',
-				'access', 'access_level',
+				'category_id',
+				'category_title',
+				'access',
+				'access_level',
 			);
 		}
 
@@ -60,13 +64,11 @@ public function __construct($config = array())
 	 */
 	protected function populateState($ordering = 'ordering', $direction = 'asc')
 	{
-		$app = JFactory::getApplication();
-
-		$forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
-		$forcedItemType = $app->input->get('forcedItemType', '', 'string');
+		$forcedLanguage = $this->app->input->get('forcedLanguage', '', 'cmd');
+		$forcedItemType = $this->app->input->get('forcedItemType', '', 'string');
 
 		// Adjust the context to support modal layouts.
-		if ($layout = $app->input->get('layout'))
+		if ($layout = $this->app->input->get('layout'))
 		{
 			$this->context .= '.' . $layout;
 		}
@@ -120,7 +122,7 @@ protected function populateState($ordering = 'ordering', $direction = 'asc')
 	 *
 	 * @return  string  A store id.
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	protected function getStoreId($id = '')
 	{
@@ -142,17 +144,16 @@ protected function getStoreId($id = '')
 	 *
 	 * @return  JDatabaseQuery
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	protected function getListQuery()
 	{
-		$type     = null;
+		$type = null;
 
 		list($extensionName, $typeName) = explode('.', $this->state->get('itemtype'));
 
 		$extension = AssociationsHelper::getSupportedExtension($extensionName);
-
-		$types = $extension->get('types');
+		$types     = $extension->get('types');
 
 		if (array_key_exists($typeName, $types))
 		{
@@ -171,14 +172,14 @@ protected function getListQuery()
 
 		$details = $type->get('details');
 
-		if (! array_key_exists('support', $details))
+		if (!array_key_exists('support', $details))
 		{
 			return false;
 		}
 
 		$support = $details['support'];
 
-		if (! array_key_exists('fields', $details))
+		if (!array_key_exists('fields', $details))
 		{
 			return false;
 		}
@@ -190,7 +191,7 @@ protected function getListQuery()
 			->select($db->qn($fields['title'], 'title'))
 			->select($db->qn($fields['alias'], 'alias'));
 
-		if (! array_key_exists('tables', $details))
+		if (!array_key_exists('tables', $details))
 		{
 			return false;
 		}
@@ -202,7 +203,7 @@ protected function getListQuery()
 			$query->from($db->qn($table, $key));
 		}
 
-		if (! array_key_exists('joins', $details))
+		if (!array_key_exists('joins', $details))
 		{
 			return false;
 		}
@@ -239,13 +240,13 @@ protected function getListQuery()
 		);
 
 		// Select author for ACL checks.
-		if (! empty($fields['created_user_id']))
+		if (!empty($fields['created_user_id']))
 		{
 			$query->select($db->qn($fields['created_user_id'], 'created_user_id'));
 		}
 
 		// Select checked out data for check in checkins.
-		if (! empty($fields['checked_out']) && ! empty($fields['checked_out_time']))
+		if (!empty($fields['checked_out']) && !empty($fields['checked_out_time']))
 		{
 			$query->select($db->qn($fields['checked_out'], 'checked_out'))
 				->select($db->qn($fields['checked_out_time'], 'checked_out_time'));
@@ -258,25 +259,25 @@ protected function getListQuery()
 		}
 
 		// If component item type supports ordering, select the ordering also.
-		if (! empty($fields['ordering']))
+		if (!empty($fields['ordering']))
 		{
 			$query->select($db->qn($fields['ordering'], 'ordering'));
 		}
 
 		// If component item type supports state, select the item state also.
-		if (! empty($fields['state']))
+		if (!empty($fields['state']))
 		{
 			$query->select($db->qn($fields['state'], 'state'));
 		}
 
 		// If component item type supports level, select the level also.
-		if (! empty($fields['level']))
+		if (!empty($fields['level']))
 		{
 			$query->select($db->qn($fields['level'], 'level'));
 		}
 
 		// If component item type supports categories, select the category also.
-		if (! empty($fields['catid']))
+		if (!empty($fields['catid']))
 		{
 			$query->select($db->qn($fields['catid'], 'catid'));
 
@@ -302,7 +303,7 @@ protected function getListQuery()
 		}
 
 		// If component item type supports access level, select the access level also.
-		if (array_key_exists('acl', $support) && $support['acl'] == true && ! empty($fields['access']))
+		if (array_key_exists('acl', $support) && $support['acl'] == true && !empty($fields['access']))
 		{
 			$query->select($db->qn($fields['access'], 'access'));
 
@@ -313,14 +314,14 @@ protected function getListQuery()
 			$groupby[] = 'ag.title';
 
 			// Implement View Level Access.
-			if (!$user->authorise('core.admin', $extension))
+			if (!$user->authorise('core.admin', $extensionName))
 			{
 				$query->where($fields['access'] . ' IN (' . implode(',', $user->getAuthorisedViewLevels()) . ')');
 			}
 		}
 
 		// If component item type is menus we need to remove the root item and the administrator menu.
-		if ($extension === 'com_menus')
+		if ($extensionName === 'com_menus')
 		{
 			$query->where($db->qn($fields['id']) . ' > 1')
 				->where($db->qn('a.client_id') . ' = 0');
@@ -366,7 +367,7 @@ protected function getListQuery()
 		// Filter on the level.
 		if ($level = $this->getState('filter.level'))
 		{
-			$tableAlias = in_array($extension, array('com_menus', 'com_categories')) ? 'a' : 'c';
+			$tableAlias = in_array($extensionName, array('com_menus', 'com_categories')) ? 'a' : 'c';
 			$query->where($db->qn($tableAlias . '.level') . ' <= ' . ((int) $level + (int) $baselevel - 1));
 		}
 
@@ -418,9 +419,7 @@ protected function getListQuery()
 	 */
 	public function purge($context = '', $key = '')
 	{
-		$db  = $this->getDbo();
-		$app = JFactory::getApplication();
-
+		$db    = $this->getDbo();
 		$query = $db->getQuery(true)->delete($db->qn('#__associations'));
 
 		// Filter by associations context.
@@ -443,12 +442,12 @@ public function purge($context = '', $key = '')
 		}
 		catch (JDatabaseExceptionExecuting $e)
 		{
-			$app->enqueueMessage(JText::_('COM_ASSOCIATIONS_PURGE_FAILED'), 'error');
+			$this->app->enqueueMessage(JText::_('COM_ASSOCIATIONS_PURGE_FAILED'), 'error');
 
 			return false;
 		}
 
-		$app->enqueueMessage(JText::_((int) $db->getAffectedRows() > 0 ? 'COM_ASSOCIATIONS_PURGE_SUCCESS' : 'COM_ASSOCIATIONS_PURGE_NONE'), 'message');
+		$this->app->enqueueMessage(JText::_((int) $db->getAffectedRows() > 0 ? 'COM_ASSOCIATIONS_PURGE_SUCCESS' : 'COM_ASSOCIATIONS_PURGE_NONE'), 'message');
 
 		return true;
 	}
@@ -466,7 +465,6 @@ public function purge($context = '', $key = '')
 	public function clean($context = '', $key = '')
 	{
 		$db  = $this->getDbo();
-		$app = JFactory::getApplication();
 
 		$query = $db->getQuery(true)
 			->select($db->qn('key') . ', COUNT(*)')
@@ -507,7 +505,7 @@ public function clean($context = '', $key = '')
 			}
 			catch (JDatabaseExceptionExecuting $e)
 			{
-				$app->enqueueMessage(JText::_('COM_ASSOCIATIONS_DELETE_ORPHANS_FAILED'), 'error');
+				$this->app->enqueueMessage(JText::_('COM_ASSOCIATIONS_DELETE_ORPHANS_FAILED'), 'error');
 
 				return false;
 			}
@@ -515,7 +513,7 @@ public function clean($context = '', $key = '')
 			$count += (int) $db->getAffectedRows();
 		}
 
-		$app->enqueueMessage(JText::_($count > 0 ? 'COM_ASSOCIATIONS_DELETE_ORPHANS_SUCCESS' : 'COM_ASSOCIATIONS_DELETE_ORPHANS_NONE'), 'message');
+		$this->app->enqueueMessage(JText::_($count > 0 ? 'COM_ASSOCIATIONS_DELETE_ORPHANS_SUCCESS' : 'COM_ASSOCIATIONS_DELETE_ORPHANS_NONE'), 'message');
 
 		return true;
 	}
diff --git a/administrator/components/com_associations/models/fields/itemlanguage.php b/administrator/components/com_associations/models/fields/itemlanguage.php
index a49eb636b0b5c..d1b5e21996879 100644
--- a/administrator/components/com_associations/models/fields/itemlanguage.php
+++ b/administrator/components/com_associations/models/fields/itemlanguage.php
@@ -12,7 +12,6 @@
 use Joomla\Utilities\ArrayHelper;
 
 JLoader::register('AssociationsHelper', JPATH_ADMINISTRATOR . '/components/com_associations/helpers/associations.php');
-
 JFormHelper::loadFieldClass('list');
 
 /**
@@ -25,8 +24,8 @@ class JFormFieldItemLanguage extends JFormFieldList
 	/**
 	 * The form field type.
 	 *
-	 * @var        string
-	 * @since   __DEPLOY_VERSION__
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
 	 */
 	protected $type = 'ItemLanguage';
 
@@ -104,7 +103,7 @@ protected function getOptions()
 			else
 			{
 				// New item, id = 0 and disabled if user is not allowed to create new items.
-				$options[$langCode]->value   = $language->lang_code . ':0:add';
+				$options[$langCode]->value = $language->lang_code . ':0:add';
 
 				// Disable language if user is not allowed to create items.
 				$options[$langCode]->disable = !$canCreate;
diff --git a/administrator/components/com_associations/models/fields/itemtype.php b/administrator/components/com_associations/models/fields/itemtype.php
index 45d01e7aae237..d077f711d7530 100644
--- a/administrator/components/com_associations/models/fields/itemtype.php
+++ b/administrator/components/com_associations/models/fields/itemtype.php
@@ -9,7 +9,6 @@
 defined('JPATH_BASE') or die;
 
 JLoader::register('AssociationsHelper', JPATH_ADMINISTRATOR . '/components/com_associations/helpers/associations.php');
-
 JFormHelper::loadFieldClass('groupedlist');
 
 /**
@@ -34,11 +33,12 @@ class JFormFieldItemType extends JFormFieldGroupedList
 	 * @return  array  The field option objects as a nested array in groups.
 	 *
 	 * @since   __DEPLOY_VERSION__
+	 *
 	 * @throws  UnexpectedValueException
 	 */
 	protected function getGroups()
 	{
-		$options   = array();
+		$options    = array();
 		$extensions = AssociationsHelper::getSupportedExtensions();
 
 		foreach ($extensions as $extension)
@@ -47,7 +47,7 @@ protected function getGroups()
 			{
 				foreach ($extension->get('types') as $type)
 				{
-					$context =  $extension->get('component') . '.' . $type->get('name');
+					$context = $extension->get('component') . '.' . $type->get('name');
 					$options[$extension->get('title')][] = JHtml::_('select.option', $context, $type->get('title'));
 				}
 			}
diff --git a/administrator/components/com_associations/models/fields/modalassociation.php b/administrator/components/com_associations/models/fields/modalassociation.php
index be7f594c316b7..ee3f593095c9b 100644
--- a/administrator/components/com_associations/models/fields/modalassociation.php
+++ b/administrator/components/com_associations/models/fields/modalassociation.php
@@ -40,12 +40,12 @@ protected function getInput()
 		$script = array();
 
 		// Select button script
-		$script[] = '	function jSelectAssociation_' . $this->id . '(id) {';
-		$script[] = '       target = document.getElementById("target-association");';
-		$script[] = '		document.getElementById("target-association").src = target.getAttribute("data-editurl") + '
-								. '"&task=" + target.getAttribute("data-item") + ".edit" + "&id=" + id';
-		$script[] = '		jQuery("#associationSelect' . $this->id . 'Modal").modal("hide");';
-		$script[] = '	}';
+		$script[] = 'function jSelectAssociation_' . $this->id . '(id) {';
+		$script[] = '   target = document.getElementById("target-association");';
+		$script[] = '   document.getElementById("target-association").src = target.getAttribute("data-editurl") + '
+						. '"&task=" + target.getAttribute("data-item") + ".edit" + "&id=" + id';
+		$script[] = '	jQuery("#associationSelect' . $this->id . 'Modal").modal("hide");';
+		$script[] = '}';
 
 		// Add the script to the document head.
 		JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
diff --git a/administrator/components/com_associations/models/forms/association.xml b/administrator/components/com_associations/models/forms/association.xml
index 9e8d880e22984..89add5542b210 100644
--- a/administrator/components/com_associations/models/forms/association.xml
+++ b/administrator/components/com_associations/models/forms/association.xml
@@ -6,7 +6,7 @@
 			type="itemlanguage"
 			label="COM_ASSOCIATIONS_ITEM_FIELD_LANGUAGE_LABEL"
 			description="COM_ASSOCIATIONS_ITEM_FIELD_LANGUAGE_DESC"
-			>
+		>
 			<option value="">COM_ASSOCIATIONS_SELECT_TARGET_LANGUAGE</option>
 		</field>
 
diff --git a/administrator/components/com_associations/models/forms/filter_associations.xml b/administrator/components/com_associations/models/forms/filter_associations.xml
index f66f0f91588e6..fb2199975e28a 100644
--- a/administrator/components/com_associations/models/forms/filter_associations.xml
+++ b/administrator/components/com_associations/models/forms/filter_associations.xml
@@ -7,9 +7,10 @@
 		description="COM_ASSOCIATIONS_COMPONENT_SELECTOR_DESC"
 		filtermode="selector"
 		onchange="jQuery('select[id^=\'filter_\']').val('');jQuery('select[id^=\'list_\']').val('');this.form.submit();"
-		>
+	>
 		<option value="">COM_ASSOCIATIONS_FILTER_SELECT_ITEM_TYPE</option>
 	</field>
+
 	<field
 		name="language"
 		type="contentlanguage"
@@ -17,9 +18,10 @@
 		filtermode="selector"
 		description="JOPTION_FILTER_LANGUAGE_DESC"
 		onchange="this.form.submit();"
-		>
+	>
 		<option value="">JOPTION_SELECT_LANGUAGE</option>
 	</field>
+
 	<fields name="filter">
 		<field
 			name="search"
@@ -28,15 +30,17 @@
 			description="COM_ASSOCIATIONS_FILTER_SEARCH_DESC"
 			hint="JSEARCH_FILTER"
 		/>
+
 		<field
 			name="state"
 			type="status"
 			label="JOPTION_FILTER_PUBLISHED"
 			description="JOPTION_FILTER_PUBLISHED_DESC"
 			onchange="this.form.submit();"
-			>
+		>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
+
 		<field
 			name="category_id"
 			type="category"
@@ -45,27 +49,30 @@
 			published="0,1,2"
 			extension="dynamic"
 			onchange="this.form.submit();"
-			>
+		>
 			<option value="">JOPTION_SELECT_CATEGORY</option>
 		</field>
+
 		<field
 			name="menutype"
 			type="menu"
 			label="COM_ASSOCIATIONS_FILTER_MENUTYPE_LABEL"
 			description="COM_ASSOCIATIONS_FILTER_MENUTYPE_DESC"
 			onchange="this.form.submit();"
-			>
+		>
 			<option value="">COM_ASSOCIATIONS_SELECT_MENU</option>
 		</field>
+
 		<field
 			name="access"
 			type="accesslevel"
 			label="JOPTION_FILTER_ACCESS"
 			description="JOPTION_FILTER_ACCESS_DESC"
 			onchange="this.form.submit();"
-			>
+		>
 			<option value="">JOPTION_SELECT_ACCESS</option>
 		</field>
+
 		<field
 			name="level"
 			type="integer"
@@ -75,7 +82,7 @@
 			last="10"
 			step="1"
 			onchange="this.form.submit();"
-			>
+		>
 			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
 		</field>
 	</fields>
@@ -86,7 +93,7 @@
 			type="list"
 			default="ordering ASC"
 			onchange="this.form.submit();"
-			>
+		>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="state ASC">JSTATUS_ASC</option>
 			<option value="state DESC">JSTATUS_DESC</option>
diff --git a/administrator/components/com_associations/views/association/tmpl/edit.php b/administrator/components/com_associations/views/association/tmpl/edit.php
index 51454d113a514..1930bf1b191b8 100644
--- a/administrator/components/com_associations/views/association/tmpl/edit.php
+++ b/administrator/components/com_associations/views/association/tmpl/edit.php
@@ -16,11 +16,10 @@
 JHtml::_('script', 'com_associations/sidebyside.js', false, true);
 JHtml::_('stylesheet', 'com_associations/sidebyside.css', array(), true);
 
-$input   = $this->app->input;
 $options = array(
-			'layout'            => $input->get('layout', '', 'string'),
-			'itemtype'          => $this->itemtype,
-			'id'                => $this->referenceId,
+			'layout'   => $this->app->input->get('layout', '', 'string'),
+			'itemtype' => $this->itemtype,
+			'id'       => $this->referenceId,
 		);
 ?>
 <button id="toogle-left-panel" class="btn btn-small" 
@@ -29,9 +28,7 @@
 </button>
 
 <form action="<?php echo JRoute::_('index.php?option=com_associations&view=association&' . http_build_query($options)); ?>" method="post" name="adminForm" id="adminForm" data-associatedview="<?php echo $this->type->get('name'); ?>">
-
 	<div class="sidebyside">
-
 		<div class="outer-panel" id="left-panel">
 			<div class="inner-panel">
 				<h3><?php echo JText::_('COM_ASSOCIATIONS_REFERENCE_ITEM'); ?></h3>
@@ -67,7 +64,7 @@
 
 	</div>
 
-	<input type="hidden" name="task" value=""/>
-	<input type="hidden" name="target-id" id="target-id" value=""/>
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="target-id" id="target-id" value="" />
 	<?php echo JHtml::_('form.token'); ?>
 </form>
diff --git a/administrator/components/com_associations/views/association/view.html.php b/administrator/components/com_associations/views/association/view.html.php
index 07e56af4b9fbc..6ecec84a59057 100644
--- a/administrator/components/com_associations/views/association/view.html.php
+++ b/administrator/components/com_associations/views/association/view.html.php
@@ -21,36 +21,36 @@ class AssociationsViewAssociation extends JViewLegacy
 	/**
 	 * An array of items
 	 *
-	 * @var  array
+	 * @var    array
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since  __DEPLOY_VERSION__
 	 */
 	protected $items;
 
 	/**
 	 * The pagination object
 	 *
-	 * @var  JPagination
+	 * @var    JPagination
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since  __DEPLOY_VERSION__
 	 */
 	protected $pagination;
 
 	/**
 	 * The model state
 	 *
-	 * @var  object
+	 * @var    object
 	 *
-	 * @since   __DEPLOY_VERSION__
+	 * @since  __DEPLOY_VERSION__
 	 */
 	protected $state;
 
 	/**
 	 * Selected item type properties.
 	 *
-	 * @var  Registry
+	 * @var    Registry
 	 *
-	 * @since __DEPLOY_VERSION__
+	 * @since  __DEPLOY_VERSION__
 	 */
 	public $itemType = null;
 
@@ -73,10 +73,9 @@ public function display($tpl = null)
 			return false;
 		}
 
-		$this->app   = JFactory::getApplication();
-
-		$this->form  = $this->get('Form');
-		$input       = $this->app->input;
+		$this->app  = JFactory::getApplication();
+		$this->form = $this->get('Form');
+		$input      = $this->app->input;
 
 		$this->referenceId = $input->get('id', 0, 'int');
 
@@ -86,8 +85,7 @@ public function display($tpl = null)
 		$this->typeName      = $typeName;
 
 		$extension = AssociationsHelper::getSupportedExtension($extensionName);
-
-		$types = $extension->get('types');
+		$types     = $extension->get('types');
 
 		if (array_key_exists($typeName, $types))
 		{
@@ -95,8 +93,7 @@ public function display($tpl = null)
 		}
 
 		$this->itemtype = $extensionName . '.' . $typeName;
-
-		$details = $this->type->get('details');
+		$details        = $this->type->get('details');
 
 		if (array_key_exists('fields', $details))
 		{
diff --git a/administrator/components/com_associations/views/associations/tmpl/default.php b/administrator/components/com_associations/views/associations/tmpl/default.php
index 13dcd056fc78a..1690367692d49 100644
--- a/administrator/components/com_associations/views/associations/tmpl/default.php
+++ b/administrator/components/com_associations/views/associations/tmpl/default.php
@@ -20,7 +20,8 @@
 $listDirn         = $this->escape($this->state->get('list.direction'));
 $canManageCheckin = JFactory::getUser()->authorise('core.manage', 'com_checkin');
 $colSpan          = 5;
-$iconStates       = array(
+
+$iconStates = array(
 	-2 => 'icon-trash',
 	0  => 'icon-unpublish',
 	1  => 'icon-publish',
@@ -51,7 +52,6 @@
 ');
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_associations&view=associations'); ?>" method="post" name="adminForm" id="adminForm">
-
 <?php if (!empty( $this->sidebar)) : ?>
 	<div id="j-sidebar-container" class="span2">
 		<?php echo $this->sidebar; ?>
@@ -60,7 +60,6 @@
 <?php else : ?>
 	<div id="j-main-container">
 <?php endif;?>
-
 <?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 	<?php if (empty($this->items)) : ?>
 		<div class="alert alert-no-items">
@@ -70,7 +69,7 @@
 		<table class="table table-striped" id="associationsList">
 			<thead>
 				<tr>
-					<?php if (! empty($this->typeSupports['state'])) : ?>
+					<?php if (!empty($this->typeSupports['state'])) : ?>
 						<th width="1%" class="center nowrap">
 							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'state', $listDirn, $listOrder); $colSpan++; ?>
 						</th>
@@ -84,12 +83,12 @@
 					<th width="5%" class="nowrap">
 						<?php echo JHtml::_('searchtools.sort', 'COM_ASSOCIATIONS_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
 					</th>
-					<?php if (! empty($this->typeFields['menutype'])) : ?>
+					<?php if (!empty($this->typeFields['menutype'])) : ?>
 						<th width="10%" class="nowrap">
 							<?php echo JHtml::_('searchtools.sort', 'COM_ASSOCIATIONS_HEADING_MENUTYPE', 'menutype_title', $listDirn, $listOrder); $colSpan++; ?>
 						</th>
 					<?php endif; ?>
-					<?php if (! empty($this->typeFields['access'])) : ?>
+					<?php if (!empty($this->typeFields['access'])) : ?>
 						<th width="5%" class="nowrap hidden-phone">
 							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); $colSpan++; ?>
 						</th>
@@ -113,7 +112,7 @@
 				$canCheckin = $canManageCheckin || AssociationsHelper::typeSupportsCheckout($this->extensionName, $this->typeName);
 				?>
 				<tr class="row<?php echo $i % 2; ?>">
-					<?php if (! empty($this->typeSupports['state'])) : ?>
+					<?php if (!empty($this->typeSupports['state'])) : ?>
 						<td class="center">
 							<span class="<?php echo $iconStates[$this->escape($item->state)]; ?>"></span>
 						</td>
@@ -131,12 +130,12 @@
 						<?php else : ?>
 							<span title="<?php echo JText::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"><?php echo $this->escape($item->title); ?></span>
 						<?php endif; ?>
-						<?php if (! empty($this->typeFields['alias'])) : ?>
+						<?php if (!empty($this->typeFields['alias'])) : ?>
 							<span class="small">
 								<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
 							</span>
 						<?php endif; ?>
-						<?php if (! empty($this->typeFields['catid'])) : ?>
+						<?php if (!empty($this->typeFields['catid'])) : ?>
 							<div class="small">
 								<?php echo JText::_('JCATEGORY') . ": " . $this->escape($item->category_title); ?>
 							</div>
@@ -148,12 +147,12 @@
 					<td>
 						<?php echo AssociationsHelper::getAssociationHtmlList($this->extensionName, $this->typeName, (int) $item->id, $item->language); ?>
 					</td>
-					<?php if (! empty($this->typeFields['menutype'])) : ?>
+					<?php if (!empty($this->typeFields['menutype'])) : ?>
 						<td class="small">
 							<?php echo $this->escape($item->menutype_title); ?>
 						</td>
 					<?php endif; ?>
-					<?php if (! empty($this->typeFields['access'])) : ?>
+					<?php if (!empty($this->typeFields['access'])) : ?>
 						<td class="small hidden-phone">
 							<?php echo $this->escape($item->access_level); ?>
 						</td>
@@ -165,10 +164,8 @@
 				<?php endforeach; ?>
 			</tbody>
 		</table>
-
 	<?php endif; ?>
-
-		<input type="hidden" name="task" value=""/>
-		<?php echo JHtml::_('form.token'); ?>
+	<input type="hidden" name="task" value=""/>
+	<?php echo JHtml::_('form.token'); ?>
 	</div>
 </form>
diff --git a/administrator/components/com_associations/views/associations/tmpl/modal.php b/administrator/components/com_associations/views/associations/tmpl/modal.php
index 8ed89e8a6ca4b..b245a17a58f06 100644
--- a/administrator/components/com_associations/views/associations/tmpl/modal.php
+++ b/administrator/components/com_associations/views/associations/tmpl/modal.php
@@ -11,7 +11,7 @@
 
 $app = JFactory::getApplication();
 
-if ($app->isSite())
+if ($app->isClient('site'))
 {
 	JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN'));
 }
@@ -55,7 +55,6 @@
 <?php else : ?>
 	<div id="j-main-container">
 <?php endif;?>
-
 <?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 	<?php if (empty($this->items)) : ?>
 		<div class="alert alert-no-items">
@@ -65,7 +64,7 @@
 		<table class="table table-striped" id="associationsList">
 			<thead>
 				<tr>
-					<?php if (! empty($this->typeSupports['state'])) : ?>
+					<?php if (!empty($this->typeSupports['state'])) : ?>
 						<th width="1%" class="center nowrap">
 							<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'state', $listDirn, $listOrder); $colSpan++; ?>
 						</th>
@@ -79,12 +78,12 @@
 					<th width="5%" class="nowrap">
 						<?php echo JHtml::_('searchtools.sort', 'COM_ASSOCIATIONS_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
 					</th>
-					<?php if (! empty($this->typeFields['menutype'])) : ?>
+					<?php if (!empty($this->typeFields['menutype'])) : ?>
 						<th width="10%" class="nowrap">
 							<?php echo JHtml::_('searchtools.sort', 'COM_ASSOCIATIONS_HEADING_MENUTYPE', 'menutype_title', $listDirn, $listOrder); $colSpan++; ?>
 						</th>
 					<?php endif; ?>
-					<?php if (! empty($this->typeSupports['acl'])) : ?>
+					<?php if (!empty($this->typeSupports['acl'])) : ?>
 						<th width="5%" class="nowrap hidden-phone">
 							<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'access_level', $listDirn, $listOrder); $colSpan++; ?>
 						</th>
@@ -105,7 +104,7 @@
 			<?php foreach ($this->items as $i => $item) :
 				?>
 				<tr class="row<?php echo $i % 2; ?>">
-					<?php if (! empty($this->typeSupports['state'])) : ?>
+					<?php if (!empty($this->typeSupports['state'])) : ?>
 						<td class="center">
 							<span class="<?php echo $iconStates[$this->escape($item->state)]; ?>"></span>
 						</td>
@@ -115,12 +114,12 @@
 							<?php echo JLayoutHelper::render('joomla.html.treeprefix', array('level' => $item->level)); ?>
 						<?php endif; ?>
 						<a class="select-link" href="javascript:void(0);" data-id="<?php echo $item->id; ?>"><?php echo $this->escape($item->title); ?></a>
-						<?php if (! empty($this->typeFields['alias'])) : ?>
+						<?php if (!empty($this->typeFields['alias'])) : ?>
 							<span class="small">
 								<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
 							</span>
 						<?php endif; ?>
-						<?php if (! empty($this->typeFields['catid'])) : ?>
+						<?php if (!empty($this->typeFields['catid'])) : ?>
 							<div class="small">
 								<?php echo JText::_('JCATEGORY') . ": " . $this->escape($item->category_title); ?>
 							</div>
@@ -134,12 +133,12 @@
 							<?php echo AssociationsHelper::getAssociationHtmlList($this->extensionName, $this->typeName, (int) $item->id, $item->language, false); ?>
 						<?php endif; ?>
 					</td>
-					<?php if (! empty($this->typeFields['menutype'])) : ?>
+					<?php if (!empty($this->typeFields['menutype'])) : ?>
 						<td class="small">
 							<?php echo $this->escape($item->menutype_title); ?>
 						</td>
 					<?php endif; ?>
-					<?php if (! empty($this->typeSupports['acl'])) : ?>
+					<?php if (!empty($this->typeSupports['acl'])) : ?>
 						<td class="small hidden-phone">
 							<?php echo $this->escape($item->access_level); ?>
 						</td>
diff --git a/administrator/components/com_associations/views/associations/view.html.php b/administrator/components/com_associations/views/associations/view.html.php
index 81fc381d251e1..b7c108094f873 100644
--- a/administrator/components/com_associations/views/associations/view.html.php
+++ b/administrator/components/com_associations/views/associations/view.html.php
@@ -19,36 +19,36 @@ class AssociationsViewAssociations extends JViewLegacy
 	/**
 	 * An array of items
 	 *
-	 * @var  array
+	 * @var   array
 	 *
-	 * @since __DEPLOY_VERSION__
+	 * @since  __DEPLOY_VERSION__
 	 */
 	protected $items;
 
 	/**
 	 * The pagination object
 	 *
-	 * @var  JPagination
+	 * @var    JPagination
 	 *
-	 * @since __DEPLOY_VERSION__
+	 * @since  __DEPLOY_VERSION__
 	 */
 	protected $pagination;
 
 	/**
 	 * The model state
 	 *
-	 * @var  object
+	 * @var    object
 	 *
-	 * @since __DEPLOY_VERSION__
+	 * @since  __DEPLOY_VERSION__
 	 */
 	protected $state;
 
 	/**
 	 * Selected item type properties.
 	 *
-	 * @var  Registry
+	 * @var    Registry
 	 *
-	 * @since __DEPLOY_VERSION__
+	 * @since  __DEPLOY_VERSION__
 	 */
 	public $itemType = null;
 
@@ -133,12 +133,12 @@ public function display($tpl = null)
 					unset($this->activeFilters['category_id']);
 					$this->filterForm->removeField('category_id', 'filter');
 				}
-				if ($extension !== 'com_menu')
+				if ($extensionName !== 'com_menu')
 				{
 					unset($this->activeFilters['menutype']);
 					$this->filterForm->removeField('menutype', 'filter');
 				}
-				if (! in_array($extension, array('com_categories', 'com_menus')))
+				if (!in_array($extensionName, array('com_categories', 'com_menus')))
 				{
 					unset($this->activeFilters['level']);
 					$this->filterForm->removeField('level', 'filter');
@@ -152,7 +152,7 @@ public function display($tpl = null)
 				// Add extension attribute to category filter.
 				if (empty($support['catid']))
 				{
-					$this->filterForm->setFieldAttribute('category_id', 'extension', $extension, 'filter');
+					$this->filterForm->setFieldAttribute('category_id', 'extension', $extensionName, 'filter');
 				}
 
 				$this->items      = $this->get('Items');

From b2fda8a8a8563b9f7a52100e95aafaa163b79b9e Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Tue, 10 Jan 2017 22:58:32 +0100
Subject: [PATCH 17/35] on simple change

---
 .../components/com_associations/controllers/associations.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_associations/controllers/associations.php b/administrator/components/com_associations/controllers/associations.php
index 5012e2e838a16..6bd4d186dc10f 100644
--- a/administrator/components/com_associations/controllers/associations.php
+++ b/administrator/components/com_associations/controllers/associations.php
@@ -7,7 +7,7 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined("_JEXEC") or die("Restricted access");
+defined('_JEXEC') or die;
 
 JLoader::register('AssociationsHelper', JPATH_ADMINISTRATOR . '/components/com_associations/helpers/associations.php');
 

From 67d60001ef4680fc86318b28e877134d5577ec61 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Tue, 10 Jan 2017 23:00:06 +0100
Subject: [PATCH 18/35] on simple change 2

---
 .../components/com_associations/controllers/associations.php    | 2 +-
 .../com_associations/layouts/joomla/searchtools/default/bar.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_associations/controllers/associations.php b/administrator/components/com_associations/controllers/associations.php
index 6bd4d186dc10f..93efcafb6755d 100644
--- a/administrator/components/com_associations/controllers/associations.php
+++ b/administrator/components/com_associations/controllers/associations.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  com_content
+ * @subpackage  com_associations
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
diff --git a/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php b/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php
index 9d9001b19a512..2c2bf13c8adb5 100644
--- a/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php
+++ b/administrator/components/com_associations/layouts/joomla/searchtools/default/bar.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  Layout
+ * @subpackage  com_associations
  *
  * @copyright   Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

From 90f763956e5ebfe1bc7f6fde73667ec9d5126f37 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Tue, 10 Jan 2017 23:03:12 +0100
Subject: [PATCH 19/35] simple

---
 administrator/components/com_associations/controller.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/administrator/components/com_associations/controller.php b/administrator/components/com_associations/controller.php
index a70159e56d8b2..da3f9ed60e9fe 100644
--- a/administrator/components/com_associations/controller.php
+++ b/administrator/components/com_associations/controller.php
@@ -24,5 +24,4 @@ class AssociationsController extends JControllerLegacy
 	 * @since   __DEPLOY_VERSION__
 	 */
 	protected $default_view = 'associations';
-
 }

From f5ce2609639dc1b902d279dbe26d3611e398cbc8 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Tue, 10 Jan 2017 23:33:24 +0100
Subject: [PATCH 20/35] some more helper changes

---
 .../com_contact/helpers/associations.php      | 28 +++++++----
 .../com_content/helpers/associations.php      | 26 ++++++----
 .../com_menus/helpers/associations.php        | 26 ++++++----
 .../com_newsfeeds/helpers/associations.php    | 19 ++++---
 .../joomla/association/extension/helper.php   | 50 +++++++++++--------
 .../association/extension/interface.php       |  2 +-
 6 files changed, 92 insertions(+), 59 deletions(-)

diff --git a/administrator/components/com_contact/helpers/associations.php b/administrator/components/com_contact/helpers/associations.php
index 0550a2f8fb567..ec28ad98ca6d4 100644
--- a/administrator/components/com_contact/helpers/associations.php
+++ b/administrator/components/com_contact/helpers/associations.php
@@ -21,23 +21,29 @@
 class ContactAssociationsHelper extends JAssociationExtensionHelper
 {
 	/**
-	 * var       array   $extension  The extension name
+	 * The extension name
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @var     array   $extension
+	 *
+	 * @since   __DEPLOY_VERSION__
 	 */
 	protected $extension = 'com_contact';
 
 	/**
-	 * var       array   $itemTypes  Array of item types
+	 * Array of item types
+	 *
+	 * @var     array   $itemTypes
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	protected $itemTypes = array('contact', 'category');
 
 	/**
-	 * var       boolean   $associationsSupport  Has the extension association support
+	 * Has the extension association support
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @var     boolean   $associationsSupport
+	 *
+	 * @since   __DEPLOY_VERSION__
 	 */
 	protected $associationsSupport = true;
 
@@ -49,9 +55,8 @@ class ContactAssociationsHelper extends JAssociationExtensionHelper
 	 *
 	 * @return  array
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
-
 	public function getAssociations($typeName, $id)
 	{
 		$type = $this->getType($typeName);
@@ -87,7 +92,7 @@ public function getAssociations($typeName, $id)
 	 *
 	 * @return  JTable|null
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public function getItem($typeName, $id)
 	{
@@ -126,7 +131,7 @@ public function getItem($typeName, $id)
 	 *
 	 * @return  array  Array of item types
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public function getType($typeName = '')
 	{
@@ -138,7 +143,6 @@ public function getType($typeName = '')
 
 		if (in_array($typeName, $this->itemTypes))
 		{
-
 			switch ($typeName)
 			{
 				case 'contact':
@@ -152,6 +156,7 @@ public function getType($typeName = '')
 					$tables = array(
 						'a' => '#__contact_details'
 					);
+
 					$title = 'contact';
 					break;
 
@@ -169,6 +174,7 @@ public function getType($typeName = '')
 					$tables = array(
 						'a' => '#__categories'
 					);
+
 					$title = 'category';
 					break;
 			}
diff --git a/administrator/components/com_content/helpers/associations.php b/administrator/components/com_content/helpers/associations.php
index f1e9da2713e07..0d7c66f02074a 100644
--- a/administrator/components/com_content/helpers/associations.php
+++ b/administrator/components/com_content/helpers/associations.php
@@ -19,23 +19,29 @@
 class ContentAssociationsHelper extends JAssociationExtensionHelper
 {
 	/**
-	 * var       array   $extension  The extension name
+	 * The extension name
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @var     array   $extension
+	 *
+	 * @since   __DEPLOY_VERSION__
 	 */
 	protected $extension = 'com_content';
 
 	/**
-	 * var       array   $itemTypes  Array of item types
+	 * Array of item types
+	 *
+	 * @var     array   $itemTypes
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	protected $itemTypes = array('article', 'category');
 
 	/**
-	 * var       boolean   $associationsSupport  Has the extension association support
+	 * Has the extension association support
+	 *
+	 * @var     boolean   $associationsSupport
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	protected $associationsSupport = true;
 
@@ -47,7 +53,7 @@ class ContentAssociationsHelper extends JAssociationExtensionHelper
 	 *
 	 * @return  array
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 
 	public function getAssociations($typeName, $id)
@@ -85,7 +91,7 @@ public function getAssociations($typeName, $id)
 	 *
 	 * @return  JTable|null
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public function getItem($typeName, $id)
 	{
@@ -124,7 +130,7 @@ public function getItem($typeName, $id)
 	 *
 	 * @return  array  Array of item types
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public function getType($typeName = '')
 	{
@@ -148,6 +154,7 @@ public function getType($typeName = '')
 					$tables = array(
 						'a' => '#__content'
 					);
+
 					$title = 'article';
 					break;
 
@@ -165,6 +172,7 @@ public function getType($typeName = '')
 					$tables = array(
 						'a' => '#__categories'
 					);
+
 					$title = 'category';
 					break;
 			}
diff --git a/administrator/components/com_menus/helpers/associations.php b/administrator/components/com_menus/helpers/associations.php
index 44525efe92484..082e17c06bce3 100644
--- a/administrator/components/com_menus/helpers/associations.php
+++ b/administrator/components/com_menus/helpers/associations.php
@@ -19,23 +19,29 @@
 class MenusAssociationsHelper extends JAssociationExtensionHelper
 {
 	/**
-	 * var       array   $extension  The extension name
+	 * The extension name
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @var     array   $extension
+	 *
+	 * @since   __DEPLOY_VERSION__
 	 */
 	protected $extension = 'com_menus';
 
 	/**
-	 * var       array   $itemTypes  Array of item types
+	 * Array of item types
+	 *
+	 * @var     array   $itemTypes
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	protected $itemTypes = array('item');
 
 	/**
-	 * var       boolean   $associationsSupport  Has the extension association support
+	 * Has the extension association support
+	 *
+	 * @var     boolean   $associationsSupport
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	protected $associationsSupport = true;
 
@@ -47,14 +53,14 @@ class MenusAssociationsHelper extends JAssociationExtensionHelper
 	 *
 	 * @return  array
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 
 	public function getAssociations($typeName, $id)
 	{
 		$type = $this->getType($typeName);
 
-		$context    = $this->extension . '.item';
+		$context = $this->extension . '.item';
 
 		// Get the associations.
 		$associations = JLanguageAssociations::getAssociations(
@@ -78,7 +84,7 @@ public function getAssociations($typeName, $id)
 	 *
 	 * @return  JTable|null
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public function getItem($typeName, $id)
 	{
@@ -113,7 +119,7 @@ public function getItem($typeName, $id)
 	 *
 	 * @return  array  Array of item types
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public function getType($typeName = '')
 	{
diff --git a/administrator/components/com_newsfeeds/helpers/associations.php b/administrator/components/com_newsfeeds/helpers/associations.php
index 6a61334315948..76d7a7740ffee 100644
--- a/administrator/components/com_newsfeeds/helpers/associations.php
+++ b/administrator/components/com_newsfeeds/helpers/associations.php
@@ -21,21 +21,27 @@
 class NewsfeedsAssociationsHelper extends JAssociationExtensionHelper
 {
 	/**
-	 * var       array   $extension  The extension name
+	 * The extension name
+	 *
+	 * @var       array   $extension
 	 *
 	 * @since    __DEPLOY_VERSION__
 	 */
 	protected $extension = 'com_newsfeeds';
 
 	/**
-	 * var       array   $itemTypes  Array of item types
+	 * Array of item types
+	 *
+	 * @var       array   $itemTypes
 	 *
 	 * @since    __DEPLOY_VERSION__
 	 */
 	protected $itemTypes = array('newsfeed', 'category');
 
 	/**
-	 * var       boolean   $associationsSupport  Has the extension association support
+	 * Has the extension association support
+	 *
+	 * @var       boolean   $associationsSupport
 	 *
 	 * @since    __DEPLOY_VERSION__
 	 */
@@ -49,7 +55,7 @@ class NewsfeedsAssociationsHelper extends JAssociationExtensionHelper
 	 *
 	 * @return  array
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 
 	public function getAssociations($typeName, $id)
@@ -87,7 +93,7 @@ public function getAssociations($typeName, $id)
 	 *
 	 * @return  JTable|null
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public function getItem($typeName, $id)
 	{
@@ -126,7 +132,7 @@ public function getItem($typeName, $id)
 	 *
 	 * @return  array  Array of item types
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public function getType($typeName = '')
 	{
@@ -169,6 +175,7 @@ public function getType($typeName = '')
 					$tables = array(
 						'a' => '#__categories'
 					);
+
 					$title = 'category';
 					break;
 			}
diff --git a/libraries/joomla/association/extension/helper.php b/libraries/joomla/association/extension/helper.php
index 6d3af05182bf1..adea5107a6f91 100644
--- a/libraries/joomla/association/extension/helper.php
+++ b/libraries/joomla/association/extension/helper.php
@@ -19,23 +19,29 @@
 abstract class JAssociationExtensionHelper  implements JAssociationExtensionInterface
 {
 	/**
-	 * var       array   $extension  The extension name
+	 * The extension name
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @var     array  $extension
+	 *
+	 * @since   __DEPLOY_VERSION__
 	 */
 	protected $extension = 'com_??';
 
 	/**
-	 * var       array   $itemTypes  Array of item types
+	 * Array of item types
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @var     array  $itemTypes
+	 *
+	 * @since   __DEPLOY_VERSION__
 	 */
 	protected $itemTypes = array();
 
 	/**
-	 * var       boolean   $associationsSupport  Has the extension association support
+	 * Has the extension association support
 	 *
-	 * @since    __DEPLOY_VERSION__
+	 * @var     boolean  $associationsSupport
+	 *
+	 * @since   __DEPLOY_VERSION__
 	 */
 	protected $associationsSupport = false;
 
@@ -44,7 +50,7 @@ abstract class JAssociationExtensionHelper  implements JAssociationExtensionInte
 	 *
 	 * @return  boolean  Supports the extension associations
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public function hasAssociationsSupport()
 	{
@@ -69,7 +75,7 @@ public function getItemTypes()
 	 * @param   string  $typeName  The item type
 	 * @param   int     $itemId    The id of item for which we need the associated items
 	 *
-	 * @return  array
+	 * @return   array
 	 *
 	 * @since    __DEPLOY_VERSION__
 	 */
@@ -94,7 +100,7 @@ public function getAssociationList($typeName, $itemId)
 	 *
 	 * @return  array  Array of item types
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public function getType($typeName = '')
 	{
@@ -120,7 +126,7 @@ public function getType($typeName = '')
 	 *
 	 * @return  array  Array of support information
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public function getTypeFields($typeName)
 	{
@@ -134,7 +140,7 @@ public function getTypeFields($typeName)
 	 *
 	 * @return  array  Array of support information
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public function getTypeSupport($typeName)
 	{
@@ -148,7 +154,7 @@ public function getTypeSupport($typeName)
 	 *
 	 * @return  array  Array of support information
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public function getTypeTables($typeName)
 	{
@@ -162,7 +168,7 @@ public function getTypeTables($typeName)
 	 *
 	 * @return  array  Array of support information
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public function getTypeJoins($typeName)
 	{
@@ -176,13 +182,13 @@ public function getTypeJoins($typeName)
 	 *
 	 * @return  array  Array of support information
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public function getTypeTitle($typeName)
 	{
 		$type = $this->getType($typeName);
 
-		if (! array_key_exists('title', $type))
+		if (!array_key_exists('title', $type))
 		{
 			return '';
 		}
@@ -196,15 +202,15 @@ public function getTypeTitle($typeName)
 	 * @param   string  $typeName  The item type
 	 * @param   string  $part      part of the information
 	 *
-	 * @return array Array of support information
+	 * @return  array Array of support information
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	private function getTypeInformation($typeName, $part = 'support')
 	{
 		$type = $this->getType($typeName);
 
-		if (! array_key_exists($part, $type))
+		if (!array_key_exists($part, $type))
 		{
 			return array();
 		}
@@ -220,13 +226,13 @@ private function getTypeInformation($typeName, $part = 'support')
 	 *
 	 * @return  string
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public function getTypeFieldName($typeName, $fieldName)
 	{
 		$fields = $this->getTypeFields($typeName);
 
-		if (! array_key_exists($fieldName, $fields))
+		if (!array_key_exists($fieldName, $fields))
 		{
 			return '';
 		}
@@ -247,7 +253,7 @@ public function getTypeFieldName($typeName, $fieldName)
 	 *
 	 * @return  array
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	protected function getSupportTemplate()
 	{
@@ -263,7 +269,7 @@ protected function getSupportTemplate()
 	 *
 	 * @return  array
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	protected function getFieldsTemplate()
 	{
diff --git a/libraries/joomla/association/extension/interface.php b/libraries/joomla/association/extension/interface.php
index 8d194e5bb22b6..692dd80bca6f7 100644
--- a/libraries/joomla/association/extension/interface.php
+++ b/libraries/joomla/association/extension/interface.php
@@ -21,7 +21,7 @@ interface JAssociationExtensionInterface
 	 *
 	 * @return  boolean  Supports the extension associations
 	 *
-	 * @since  __DEPLOY_VERSION__
+	 * @since   __DEPLOY_VERSION__
 	 */
 	public function hasAssociationsSupport();
 }

From 31a0185841862428a077a43fabacd2ba9ad4213f Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Wed, 11 Jan 2017 09:23:50 +0100
Subject: [PATCH 21/35] Update associations.php

---
 .../components/com_associations/models/associations.php   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/administrator/components/com_associations/models/associations.php b/administrator/components/com_associations/models/associations.php
index 24684a1cf8f74..5ac40541f96e5 100644
--- a/administrator/components/com_associations/models/associations.php
+++ b/administrator/components/com_associations/models/associations.php
@@ -447,7 +447,10 @@ public function purge($context = '', $key = '')
 			return false;
 		}
 
-		$this->app->enqueueMessage(JText::_((int) $db->getAffectedRows() > 0 ? 'COM_ASSOCIATIONS_PURGE_SUCCESS' : 'COM_ASSOCIATIONS_PURGE_NONE'), 'message');
+		$this->app->enqueueMessage(
+			JText::_((int) $db->getAffectedRows() > 0 ? 'COM_ASSOCIATIONS_PURGE_SUCCESS' : 'COM_ASSOCIATIONS_PURGE_NONE'),
+			'message'
+		);
 
 		return true;
 	}
@@ -464,8 +467,7 @@ public function purge($context = '', $key = '')
 	 */
 	public function clean($context = '', $key = '')
 	{
-		$db  = $this->getDbo();
-
+		$db    = $this->getDbo();
 		$query = $db->getQuery(true)
 			->select($db->qn('key') . ', COUNT(*)')
 			->from($db->qn('#__associations'))

From 55dc10cb1f7a1a6e2ace7f09e11bbda081ae46d8 Mon Sep 17 00:00:00 2001
From: zero-24 <zero-24@users.noreply.github.com>
Date: Wed, 11 Jan 2017 09:24:34 +0100
Subject: [PATCH 22/35] Update associations.php

---
 .../components/com_associations/models/associations.php      | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/administrator/components/com_associations/models/associations.php b/administrator/components/com_associations/models/associations.php
index 5ac40541f96e5..ecdc9979d13b3 100644
--- a/administrator/components/com_associations/models/associations.php
+++ b/administrator/components/com_associations/models/associations.php
@@ -515,7 +515,10 @@ public function clean($context = '', $key = '')
 			$count += (int) $db->getAffectedRows();
 		}
 
-		$this->app->enqueueMessage(JText::_($count > 0 ? 'COM_ASSOCIATIONS_DELETE_ORPHANS_SUCCESS' : 'COM_ASSOCIATIONS_DELETE_ORPHANS_NONE'), 'message');
+		$this->app->enqueueMessage(
+			JText::_($count > 0 ? 'COM_ASSOCIATIONS_DELETE_ORPHANS_SUCCESS' : 'COM_ASSOCIATIONS_DELETE_ORPHANS_NONE'),
+			'message'
+		);
 
 		return true;
 	}

From 7e8422b7834730112086f456221f71a3eb3ab19a Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Wed, 11 Jan 2017 21:08:04 +0100
Subject: [PATCH 23/35] =?UTF-8?q?app=20isn=E2=80=99t=20set=20a=20model=20p?=
 =?UTF-8?q?roperty?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com_associations/models/associations.php  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/administrator/components/com_associations/models/associations.php b/administrator/components/com_associations/models/associations.php
index ecdc9979d13b3..0c3b1d8f12c01 100644
--- a/administrator/components/com_associations/models/associations.php
+++ b/administrator/components/com_associations/models/associations.php
@@ -64,11 +64,13 @@ public function __construct($config = array())
 	 */
 	protected function populateState($ordering = 'ordering', $direction = 'asc')
 	{
-		$forcedLanguage = $this->app->input->get('forcedLanguage', '', 'cmd');
-		$forcedItemType = $this->app->input->get('forcedItemType', '', 'string');
+		$app = JFactory::getApplication();
+
+		$forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
+		$forcedItemType = $app->input->get('forcedItemType', '', 'string');
 
 		// Adjust the context to support modal layouts.
-		if ($layout = $this->app->input->get('layout'))
+		if ($layout = $app->input->get('layout'))
 		{
 			$this->context .= '.' . $layout;
 		}
@@ -142,7 +144,7 @@ protected function getStoreId($id = '')
 	/**
 	 * Build an SQL query to load the list data.
 	 *
-	 * @return  JDatabaseQuery
+	 * @return  JDatabaseQuery|bool
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
@@ -419,6 +421,7 @@ protected function getListQuery()
 	 */
 	public function purge($context = '', $key = '')
 	{
+		$app   = JFactory::getApplication();
 		$db    = $this->getDbo();
 		$query = $db->getQuery(true)->delete($db->qn('#__associations'));
 
@@ -442,12 +445,12 @@ public function purge($context = '', $key = '')
 		}
 		catch (JDatabaseExceptionExecuting $e)
 		{
-			$this->app->enqueueMessage(JText::_('COM_ASSOCIATIONS_PURGE_FAILED'), 'error');
+			$app->enqueueMessage(JText::_('COM_ASSOCIATIONS_PURGE_FAILED'), 'error');
 
 			return false;
 		}
 
-		$this->app->enqueueMessage(
+		$app->enqueueMessage(
 			JText::_((int) $db->getAffectedRows() > 0 ? 'COM_ASSOCIATIONS_PURGE_SUCCESS' : 'COM_ASSOCIATIONS_PURGE_NONE'),
 			'message'
 		);
@@ -467,6 +470,7 @@ public function purge($context = '', $key = '')
 	 */
 	public function clean($context = '', $key = '')
 	{
+		$app   = JFactory::getApplication();
 		$db    = $this->getDbo();
 		$query = $db->getQuery(true)
 			->select($db->qn('key') . ', COUNT(*)')
@@ -507,7 +511,7 @@ public function clean($context = '', $key = '')
 			}
 			catch (JDatabaseExceptionExecuting $e)
 			{
-				$this->app->enqueueMessage(JText::_('COM_ASSOCIATIONS_DELETE_ORPHANS_FAILED'), 'error');
+				$app->enqueueMessage(JText::_('COM_ASSOCIATIONS_DELETE_ORPHANS_FAILED'), 'error');
 
 				return false;
 			}
@@ -515,7 +519,7 @@ public function clean($context = '', $key = '')
 			$count += (int) $db->getAffectedRows();
 		}
 
-		$this->app->enqueueMessage(
+		$app->enqueueMessage(
 			JText::_($count > 0 ? 'COM_ASSOCIATIONS_DELETE_ORPHANS_SUCCESS' : 'COM_ASSOCIATIONS_DELETE_ORPHANS_NONE'),
 			'message'
 		);

From 1ca1c8e26fe7308a707faf6e8735007a5f561aaf Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Wed, 11 Jan 2017 21:08:25 +0100
Subject: [PATCH 24/35] correct return value

---
 .../components/com_associations/controllers/associations.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_associations/controllers/associations.php b/administrator/components/com_associations/controllers/associations.php
index 93efcafb6755d..71ff7ef84bf00 100644
--- a/administrator/components/com_associations/controllers/associations.php
+++ b/administrator/components/com_associations/controllers/associations.php
@@ -34,7 +34,7 @@ class AssociationsControllerAssociations extends JControllerAdmin
 	 * @param   string  $prefix  The class prefix. Optional.
 	 * @param   array   $config  The array of possible config values. Optional.
 	 *
-	 * @return  JModel
+	 * @return  JModel|bool
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */

From dbba275f48bafd8a80e9aec62eaf5b6ff95204f5 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Wed, 11 Jan 2017 21:08:58 +0100
Subject: [PATCH 25/35] simplify code adn use helper method

---
 .../views/association/view.html.php           | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/administrator/components/com_associations/views/association/view.html.php b/administrator/components/com_associations/views/association/view.html.php
index 6ecec84a59057..033dbeacda809 100644
--- a/administrator/components/com_associations/views/association/view.html.php
+++ b/administrator/components/com_associations/views/association/view.html.php
@@ -83,24 +83,9 @@ public function display($tpl = null)
 
 		$this->extensionName = $extensionName;
 		$this->typeName      = $typeName;
+		$this->itemtype      = $extensionName . '.' . $typeName;
 
-		$extension = AssociationsHelper::getSupportedExtension($extensionName);
-		$types     = $extension->get('types');
-
-		if (array_key_exists($typeName, $types))
-		{
-			$this->type = $types[$typeName];
-		}
-
-		$this->itemtype = $extensionName . '.' . $typeName;
-		$details        = $this->type->get('details');
-
-		if (array_key_exists('fields', $details))
-		{
-			$fields = $details['fields'];
-		}
-
-		$languageField = substr($fields['language'], 2);
+		$languageField = AssociationsHelper::getTypeFieldName($extensionName, $typeName, 'language');
 		$referenceId   = $input->get('id', 0, 'int');
 		$reference     = ArrayHelper::fromObject(AssociationsHelper::getItem($extensionName, $typeName, $referenceId));
 

From fc79b46342d4f5d66e0ff18cc354bc8394edef54 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Wed, 11 Jan 2017 21:13:14 +0100
Subject: [PATCH 26/35] use typename directly

---
 .../com_associations/views/association/tmpl/edit.php      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/administrator/components/com_associations/views/association/tmpl/edit.php b/administrator/components/com_associations/views/association/tmpl/edit.php
index 1930bf1b191b8..49bee064e18f3 100644
--- a/administrator/components/com_associations/views/association/tmpl/edit.php
+++ b/administrator/components/com_associations/views/association/tmpl/edit.php
@@ -27,16 +27,16 @@
 		data-hide-reference="<?php echo JText::_('COM_ASSOCIATIONS_EDIT_HIDE_REFERENCE'); ?>"><?php echo JText::_('COM_ASSOCIATIONS_EDIT_HIDE_REFERENCE'); ?>
 </button>
 
-<form action="<?php echo JRoute::_('index.php?option=com_associations&view=association&' . http_build_query($options)); ?>" method="post" name="adminForm" id="adminForm" data-associatedview="<?php echo $this->type->get('name'); ?>">
+<form action="<?php echo JRoute::_('index.php?option=com_associations&view=association&' . http_build_query($options)); ?>" method="post" name="adminForm" id="adminForm" data-associatedview="<?php echo $this->typeName; ?>">
 	<div class="sidebyside">
 		<div class="outer-panel" id="left-panel">
 			<div class="inner-panel">
 				<h3><?php echo JText::_('COM_ASSOCIATIONS_REFERENCE_ITEM'); ?></h3>
 				<iframe id="reference-association" name="reference-association"
-					src="<?php echo JRoute::_($this->editUri . '&task=' . $this->type->get('name') . '.edit&id=' . (int) $this->referenceId); ?>"
+					src="<?php echo JRoute::_($this->editUri . '&task=' . $this->typeName . '.edit&id=' . (int) $this->referenceId); ?>"
 					height="400" width="400"
 					data-action="edit"
-					data-item="<?php echo $this->type->get('name'); ?>"
+					data-item="<?php echo $this->typeName; ?>"
 					data-id="<?php echo $this->referenceId; ?>"
 					data-language="<?php echo $this->referenceLanguage; ?>"
 					data-editurl="<?php echo JRoute::_($this->editUri); ?>">
@@ -54,7 +54,7 @@
 					src="<?php echo $this->defaultTargetSrc; ?>"
 					height="400" width="400"
 					data-action="<?php echo $this->targetAction; ?>"
-					data-item="<?php echo $this->type->get('name'); ?>"
+					data-item="<?php echo $this->typeName; ?>"
 					data-id="<?php echo $this->targetId; ?>"
 					data-language="<?php echo $this->targetLanguage; ?>"
 					data-editurl="<?php echo JRoute::_($this->editUri); ?>">

From d64c7426836d3dbd10534efcbac5e069f271bf33 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Wed, 11 Jan 2017 21:26:52 +0100
Subject: [PATCH 27/35] changed the tooltip position

---
 .../com_associations/views/associations/tmpl/modal.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_associations/views/associations/tmpl/modal.php b/administrator/components/com_associations/views/associations/tmpl/modal.php
index b245a17a58f06..d97db3616e8d2 100644
--- a/administrator/components/com_associations/views/associations/tmpl/modal.php
+++ b/administrator/components/com_associations/views/associations/tmpl/modal.php
@@ -17,7 +17,7 @@
 }
 
 JHtml::_('jquery.framework');
-JHtml::_('bootstrap.tooltip');
+JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
 JHtml::_('behavior.multiselect');
 JHtml::_('formbehavior.chosen', 'select');
 

From edccd27e13db68b201be6f9aadfd66521d4789a6 Mon Sep 17 00:00:00 2001
From: infograf768 <infografjms@gmail.com>
Date: Thu, 12 Jan 2017 11:19:16 +0100
Subject: [PATCH 28/35] Correct menu helper

---
 administrator/components/com_menus/helpers/associations.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/administrator/components/com_menus/helpers/associations.php b/administrator/components/com_menus/helpers/associations.php
index 082e17c06bce3..c1244016713a2 100644
--- a/administrator/components/com_menus/helpers/associations.php
+++ b/administrator/components/com_menus/helpers/associations.php
@@ -140,6 +140,7 @@ public function getType($typeName = '')
 					$fields['catid'] = '';
 					$fields['state'] = 'a.published';
 					$fields['created_user_id'] = '';
+					$fields['menutype'] = 'a.menutype';
 
 					$support['state'] = true;
 					$support['acl'] = true;

From 868edd4883151dfefdc47db6a43c7055733c05ff Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Thu, 12 Jan 2017 20:29:08 +0100
Subject: [PATCH 29/35] remove unreacable code

---
 .../com_associations/views/associations/view.html.php           | 2 --
 1 file changed, 2 deletions(-)

diff --git a/administrator/components/com_associations/views/associations/view.html.php b/administrator/components/com_associations/views/associations/view.html.php
index b7c108094f873..ad2334d79d45a 100644
--- a/administrator/components/com_associations/views/associations/view.html.php
+++ b/administrator/components/com_associations/views/associations/view.html.php
@@ -172,8 +172,6 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			throw new Exception(implode("\n", $errors), 500);
-
-			return false;
 		}
 
 		$this->addToolbar();

From ca50fd10fb6d6d7aea20b93e24f6c081bc25ced3 Mon Sep 17 00:00:00 2001
From: infograf768 <infografjms@gmail.com>
Date: Fri, 13 Jan 2017 08:44:28 +0100
Subject: [PATCH 30/35] correcting checked_out

---
 libraries/joomla/association/extension/helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/joomla/association/extension/helper.php b/libraries/joomla/association/extension/helper.php
index adea5107a6f91..67e55435721f4 100644
--- a/libraries/joomla/association/extension/helper.php
+++ b/libraries/joomla/association/extension/helper.php
@@ -285,7 +285,7 @@ protected function getFieldsTemplate()
 			'access'              => 'a.access',
 			'state'               => 'a.state',
 			'created_user_id'     => 'a.created_by',
-			'checked_out_user_id' => 'a.checked_out',
+			'checked_out'         => 'a.checked_out',
 			'checked_out_time'    => 'a.checked_out_time'
 		);
 	}

From 04df8c33e51033149894ec143bf46ae6e89da41e Mon Sep 17 00:00:00 2001
From: infograf768 <infografjms@gmail.com>
Date: Fri, 13 Jan 2017 08:54:36 +0100
Subject: [PATCH 31/35] com_menus

---
 .../com_associations/views/associations/view.html.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_associations/views/associations/view.html.php b/administrator/components/com_associations/views/associations/view.html.php
index ad2334d79d45a..08c81633701a9 100644
--- a/administrator/components/com_associations/views/associations/view.html.php
+++ b/administrator/components/com_associations/views/associations/view.html.php
@@ -133,7 +133,7 @@ public function display($tpl = null)
 					unset($this->activeFilters['category_id']);
 					$this->filterForm->removeField('category_id', 'filter');
 				}
-				if ($extensionName !== 'com_menu')
+				if ($extensionName !== 'com_menus')
 				{
 					unset($this->activeFilters['menutype']);
 					$this->filterForm->removeField('menutype', 'filter');

From 406d18d2428a4ea11eb2e80f4f8c997a4cc621e1 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Sun, 15 Jan 2017 11:45:15 +0100
Subject: [PATCH 32/35] fixed not supportted message

---
 administrator/components/com_associations/associations.php | 2 +-
 administrator/language/en-GB/en-GB.com_associations.ini    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_associations/associations.php b/administrator/components/com_associations/associations.php
index e9aa67f8e8336..fdc4e88837ede 100644
--- a/administrator/components/com_associations/associations.php
+++ b/administrator/components/com_associations/associations.php
@@ -27,7 +27,7 @@
 
 	if (!AssociationsHelper::hasSupport($extensionName))
 	{
-		throw new Exception(JText::_('COM_ASSOCIATIONS_COMPONENT_NOT_SUPPORTED') . ' ' . $itemType->realcomponent, 404);
+		throw new Exception(JText::sprintf('COM_ASSOCIATIONS_COMPONENT_NOT_SUPPORTED', JText::_($extensionName)), 404);
 	}
 
 	if (!JFactory::getUser()->authorise('core.manage', $extensionName))
diff --git a/administrator/language/en-GB/en-GB.com_associations.ini b/administrator/language/en-GB/en-GB.com_associations.ini
index a0657bdfd4366..56fa4ff02c1c8 100644
--- a/administrator/language/en-GB/en-GB.com_associations.ini
+++ b/administrator/language/en-GB/en-GB.com_associations.ini
@@ -7,7 +7,7 @@ COM_ASSOCIATIONS="Multilingual Associations"
 COM_ASSOCIATIONS_ADD_NEW_ASSOCIATION="Add new association"
 COM_ASSOCIATIONS_ASSOCIATED_ITEM="Target"
 COM_ASSOCIATIONS_CHANGE_TARGET="Change Target"
-COM_ASSOCIATIONS_COMPONENT_NOT_SUPPORTED="The following component doesn't support associations:"
+COM_ASSOCIATIONS_COMPONENT_NOT_SUPPORTED="The extension %s does not support multilingual associations."
 COM_ASSOCIATIONS_COMPONENT_SELECTOR_DESC="Select a component from this list"
 COM_ASSOCIATIONS_COMPONENT_SELECTOR_LABEL="Select component"
 COM_ASSOCIATIONS_CONFIGURATION="Multilingual Associations: Options"

From e4f03ee0e8b6facbd74a9b30dd7f628d5e891520 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Sun, 15 Jan 2017 20:51:02 +0100
Subject: [PATCH 33/35] installation

---
 administrator/components/com_admin/script.php          |  2 ++
 .../com_admin/sql/updates/mysql/3.7.0-2017-01-15.sql   |  2 ++
 .../sql/updates/postgresql/3.7.0-2017-01-15.sql        |  2 ++
 installation/sql/mysql/joomla.sql                      | 10 ++++++----
 installation/sql/postgresql/joomla.sql                 |  3 ++-
 installation/sql/sqlazure/joomla.sql                   |  4 +++-
 6 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-15.sql
 create mode 100644 administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-15.sql

diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index e97442633607c..811e8ca9bc2cb 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -285,6 +285,7 @@ protected function updateManifestCaches()
 			array('component', 'com_postinstall', '', 1),
 			array('component', 'com_joomlaupdate', '', 1),
 			array('component', 'com_fields', '', 1),
+            array('component', 'com_associations', '', 1),
 
 			// Libraries
 			array('library', 'phputf8', '', 0),
@@ -1816,6 +1817,7 @@ public function updateAssets()
 			'com_ajax',
 			'com_postinstall',
 			'com_fields',
+			'com_associations',
 		);
 
 		foreach ($newComponents as $component)
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-15.sql b/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-15.sql
new file mode 100644
index 0000000000000..5b309f020fa4a
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.7.0-2017-01-15.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(34, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-15.sql b/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-15.sql
new file mode 100644
index 0000000000000..f244b43bedf4e
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.7.0-2017-01-15.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(34, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index d149a35174471..796eb0f8b905a 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -516,6 +516,7 @@ INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `elem
 (31, 0, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (32, 0, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (33, 0, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(34, 0, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (102, 0, 'phputf8', 'library', 'phputf8', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (103, 0, 'Joomla! Platform', 'library', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (104, 0, 'IDNA Convert', 'library', 'idna_convert', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
@@ -1383,7 +1384,7 @@ CREATE TABLE IF NOT EXISTS `#__menu` (
 --
 
 INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES
-(1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '0000-00-00 00:00:00', 0, 0, '', 0, '', 0, 43, 0, '*', 0),
+(1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '0000-00-00 00:00:00', 0, 0, '', 0, '', 0, 45, 0, '*', 0),
 (2, 'menu', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 0, 1, 1, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 1, 10, 0, '*', 1),
 (3, 'menu', 'com_banners', 'Banners', '', 'Banners/Banners', 'index.php?option=com_banners', 'component', 0, 2, 2, 4, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners', 0, '', 2, 3, 0, '*', 1),
 (4, 'menu', 'com_banners_categories', 'Categories', '', 'Banners/Categories', 'index.php?option=com_categories&extension=com_banners', 'component', 0, 2, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:banners-cat', 0, '', 4, 5, 0, '*', 1),
@@ -1401,9 +1402,10 @@ INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link
 (17, 'menu', 'com_search', 'Basic Search', '', 'Basic Search', 'index.php?option=com_search', 'component', 0, 1, 1, 19, 0, '0000-00-00 00:00:00', 0, 0, 'class:search', 0, '', 31, 32, 0, '*', 1),
 (18, 'menu', 'com_finder', 'Smart Search', '', 'Smart Search', 'index.php?option=com_finder', 'component', 0, 1, 1, 27, 0, '0000-00-00 00:00:00', 0, 0, 'class:finder', 0, '', 33, 34, 0, '*', 1),
 (19, 'menu', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 1, 1, 1, 28, 0, '0000-00-00 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 35, 36, 0, '*', 1),
-(20, 'main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 0, 1, 1, 29, 0, '0000-00-00 00:00:00', 0, 1, 'class:tags', 0, '', 37, 38, 0, '', 1),
-(21, 'main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '0000-00-00 00:00:00', 0, 1, 'class:postinstall', 0, '', 39, 40, 0, '*', 1),
-(101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 41, 42, 1, '*', 0);
+(20, 'main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 0, 1, 1, 29, 0, '0000-00-00 00:00:00', 0, 1, 'class:tags', 0, '', 39, 40, 0, '', 1),
+(21, 'main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '0000-00-00 00:00:00', 0, 1, 'class:postinstall', 0, '', 41, 42, 0, '*', 1),
+(22, 'menu', 'com_associations', 'Multilingual Associations', '', 'Multilingual Associations', 'index.php?option=com_associations', 'component', 1, 1, 1, 28, 0, '0000-00-00 00:00:00', 0, 0, 'class:associations', 0, '', 37, 38, 0, '*', 1),
+(101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 43, 44, 1, '*', 0);
 
 -- --------------------------------------------------------
 
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index ae34c38941d98..4925076df1b62 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -504,7 +504,8 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder"
 (30, 'com_contenthistory', 'component', 'com_contenthistory', '', 1, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (31, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (32, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(33, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+(33, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(33, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
 
 -- Libraries
 INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql
index 698a2fed5e5c3..85d5e703e2bd1 100644
--- a/installation/sql/sqlazure/joomla.sql
+++ b/installation/sql/sqlazure/joomla.sql
@@ -805,7 +805,9 @@ SELECT 31, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 1, '', '', '', '',
 UNION ALL
 SELECT 32, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
 UNION ALL
-SELECT 33, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+SELECT 33, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 34, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
 
 -- Libraries
 INSERT INTO [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])

From cc61448c0ea7a6cb6c2ae5c81e62c925fb6c7742 Mon Sep 17 00:00:00 2001
From: Robert Deutz <rdeutz@googlemail.com>
Date: Sun, 15 Jan 2017 22:11:52 +0100
Subject: [PATCH 34/35] fix menu install

---
 installation/sql/mysql/joomla.sql      |  2 +-
 installation/sql/postgresql/joomla.sql | 11 ++++++-----
 installation/sql/sqlazure/joomla.sql   | 10 ++++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index 796eb0f8b905a..15623ff741b17 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -1404,7 +1404,7 @@ INSERT INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path`, `link
 (19, 'menu', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 1, 1, 1, 28, 0, '0000-00-00 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 35, 36, 0, '*', 1),
 (20, 'main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 0, 1, 1, 29, 0, '0000-00-00 00:00:00', 0, 1, 'class:tags', 0, '', 39, 40, 0, '', 1),
 (21, 'main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '0000-00-00 00:00:00', 0, 1, 'class:postinstall', 0, '', 41, 42, 0, '*', 1),
-(22, 'menu', 'com_associations', 'Multilingual Associations', '', 'Multilingual Associations', 'index.php?option=com_associations', 'component', 1, 1, 1, 28, 0, '0000-00-00 00:00:00', 0, 0, 'class:associations', 0, '', 37, 38, 0, '*', 1),
+(22, 'menu', 'com_associations', 'Multilingual Associations', '', 'Multilingual Associations', 'index.php?option=com_associations', 'component', 1, 1, 1, 34, 0, '0000-00-00 00:00:00', 0, 0, 'class:associations', 0, '', 37, 38, 0, '*', 1),
 (101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '0000-00-00 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 43, 44, 1, '*', 0);
 
 -- --------------------------------------------------------
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index 4925076df1b62..8784ebe74ad03 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -505,7 +505,7 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder"
 (31, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (32, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (33, 'com_fields', 'component', 'com_fields', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(33, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+(34, 'com_associations', 'component', 'com_associations', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
 
 -- Libraries
 INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
@@ -1329,7 +1329,7 @@ COMMENT ON COLUMN "#__menu"."home" IS 'Indicates if this menu item is the home o
 -- Dumping data for table #__menu
 --
 INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") VALUES
-(1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '1970-01-01 00:00:00', 0, 0, '', 0, '', 0, 43, 0, '*', 0),
+(1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '1970-01-01 00:00:00', 0, 0, '', 0, '', 0, 45, 0, '*', 0),
 (2, 'menu', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 0, 1, 1, 4, 0, '1970-01-01 00:00:00', 0, 0, 'class:banners', 0, '', 1, 10, 0, '*', 1),
 (3, 'menu', 'com_banners', 'Banners', '', 'Banners/Banners', 'index.php?option=com_banners', 'component', 0, 2, 2, 4, 0, '1970-01-01 00:00:00', 0, 0, 'class:banners', 0, '', 2, 3, 0, '*', 1),
 (4, 'menu', 'com_banners_categories', 'Categories', '', 'Banners/Categories', 'index.php?option=com_categories&extension=com_banners', 'component', 0, 2, 2, 6, 0, '1970-01-01 00:00:00', 0, 0, 'class:banners-cat', 0, '', 4, 5, 0, '*', 1),
@@ -1347,9 +1347,10 @@ INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link
 (17, 'menu', 'com_search', 'Basic Search', '', 'Basic Search', 'index.php?option=com_search', 'component', 0, 1, 1, 19, 0, '1970-01-01 00:00:00', 0, 0, 'class:search', 0, '', 31, 32, 0, '*', 1),
 (18, 'menu', 'com_finder', 'Smart Search', '', 'Smart Search', 'index.php?option=com_finder', 'component', 0, 1, 1, 27, 0, '1970-01-01 00:00:00', 0, 0, 'class:finder', 0, '', 33, 34, 0, '*', 1),
 (19, 'menu', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 1, 1, 1, 28, 0, '1970-01-01 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 35, 36, 0, '*', 1),
-(20, 'main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 0, 1, 1, 29, 0, '1970-01-01 00:00:00', 0, 1, 'class:tags', 0, '', 37, 38, 0, '', 1),
-(21, 'main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '1970-01-01 00:00:00', 0, 1, 'class:postinstall', 0, '', 39, 40, 0, '*', 1),
-(101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 41, 42, 1, '*', 0);
+(20, 'main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 0, 1, 1, 29, 0, '1970-01-01 00:00:00', 0, 1, 'class:tags', 0, '', 39, 40, 0, '', 1),
+(21, 'main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '1970-01-01 00:00:00', 0, 1, 'class:postinstall', 0, '', 41, 42, 0, '*', 1),
+(22, 'menu', 'com_associations', 'Multilingual Associations', '', 'Multilingual Associations', 'index.php?option=com_associations', 'component', 1, 1, 1, 34, 0, '1970-01-01 00:00:00', 0, 0, 'class:associations', 0, '', 37, 38, 0, '*', 1),
+(101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 43, 44, 1, '*', 0);
 
 SELECT setval('#__menu_id_seq', 102, false);
 
diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql
index 85d5e703e2bd1..f9d079775785e 100644
--- a/installation/sql/sqlazure/joomla.sql
+++ b/installation/sql/sqlazure/joomla.sql
@@ -2266,7 +2266,7 @@ CREATE NONCLUSTERED INDEX [idx_img] ON [#__menu]
 SET IDENTITY_INSERT [#__menu] ON;
 
 INSERT INTO [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id])
-SELECT 1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '1900-01-01 00:00:00', 0, 0, '', 0, '', 0, 43, 0, '*', 0
+SELECT 1, '', 'Menu_Item_Root', 'root', '', '', '', '', 1, 0, 0, 0, 0, '1900-01-01 00:00:00', 0, 0, '', 0, '', 0, 45, 0, '*', 0
 UNION ALL
 SELECT 2, 'menu', 'com_banners', 'Banners', '', 'Banners', 'index.php?option=com_banners', 'component', 0, 1, 1, 4, 0, '1900-01-01 00:00:00', 0, 0, 'class:banners', 0, '', 1, 10, 0, '*', 1
 UNION ALL
@@ -2302,11 +2302,13 @@ SELECT 18, 'menu', 'com_finder', 'Smart Search', '', 'Smart Search', 'index.php?
 UNION ALL
 SELECT 19, 'menu', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 1, 1, 1, 28, 0, '1900-01-01 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 35, 36, 0, '*', 1
 UNION ALL
-SELECT 20, 'menu', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 0, 1, 1, 29, 0, '1900-01-01 00:00:00', 0, 1, 'class:tags', 0, '', 37, 38, 0, '*', 1
+SELECT 20, 'menu', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 0, 1, 1, 29, 0, '1900-01-01 00:00:00', 0, 1, 'class:tags', 0, '', 39, 40, 0, '*', 1
 UNION ALL
-SELECT 21, 'menu', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '1900-01-01 00:00:00', 0, 1, 'class:postinstall', 0, '', 39, 40, 0, '*', 1
+SELECT 21, 'menu', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '1900-01-01 00:00:00', 0, 1, 'class:postinstall', 0, '', 41, 42, 0, '*', 1
 UNION ALL
-SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '1900-01-01 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 41, 42, 1, '*', 0;
+SELECT 22, 'menu', 'com_associations', 'Multilingual Associations', '', 'Multilingual Associations', 'index.php?option=com_associations', 'component', 1, 1, 1, 34, 0, '1900-01-01 00:00:00', 0, 0, 'class:associations', 0, '', 37, 38, 0, '*', 1
+UNION ALL
+SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '1900-01-01 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 43, 44, 1, '*', 0;
 
 SET IDENTITY_INSERT [#__menu] OFF;
 

From 9fd1d9b55255ecdf1b2062a7283274bf40776279 Mon Sep 17 00:00:00 2001
From: George Wilson <georgejameswilson@googlemail.com>
Date: Tue, 17 Jan 2017 11:46:09 +0000
Subject: [PATCH 35/35] Spaces -> tabs

---
 administrator/components/com_admin/script.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index dda89d2045fdb..3282cb3626a18 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -285,7 +285,7 @@ protected function updateManifestCaches()
 			array('component', 'com_postinstall', '', 1),
 			array('component', 'com_joomlaupdate', '', 1),
 			array('component', 'com_fields', '', 1),
-            array('component', 'com_associations', '', 1),
+			array('component', 'com_associations', '', 1),
 
 			// Libraries
 			array('library', 'phputf8', '', 0),