From 3610bebc7cdcd725c2078d913374d07e6b88a21c Mon Sep 17 00:00:00 2001
From: Anurag <30978328+Anu1601CS@users.noreply.github.com>
Date: Wed, 23 May 2018 17:37:11 +0530
Subject: [PATCH 01/79] Load correct core files of override files (#2)

Start implements loadcorefile() in administrator/components/com_templates/Model/TemplateModel.php
---
 .../com_templates/Model/TemplateModel.php     | 173 ++++++++++++++++++
 .../language/en-GB/en-GB.com_templates.ini    |   2 +
 2 files changed, 175 insertions(+)

diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index f4db172ec041f..6a9663fa63061 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -12,6 +12,11 @@
 
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Date\Date;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Filesystem\File;
+use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\MVC\Model\FormModel;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\Component\Templates\Administrator\Helper\TemplateHelper;
@@ -148,6 +153,174 @@ public function getDirectoryTree($dir)
 		return $result;
 	}
 
+	/**
+	 * Method to get the core file of override file
+	 *
+	 * @param   string   $file  Override file
+	 * @param   integer  $client Client Id
+	 *
+	 * @return  string  $corefile The full path and file name for the target file, or boolean false if the file is not found in any of the paths.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getCoreFile($file, $client_id)
+	{
+		$app           = Factory::getApplication();
+		$filePath      = Path::clean($file);
+		$explodeArray  = explode(DIRECTORY_SEPARATOR, $filePath);
+
+		// Only allow html/ folder
+		if($explodeArray['1'] !== 'html')
+		{
+			$app->enqueueMessage(Text::_('COM_TEMPLATES_ERROR_ONLY_HTML_FOLDER_ALLOWED'), 'error');
+
+			return false;
+		}
+
+		$fileName = basename($filePath);
+		$type     = $explodeArray['2'];
+		$client   = ApplicationHelper::getClientInfo($client_id);
+
+		$componentPath = Path::clean($client->path . '/components/');
+		$modulePath    = Path::clean($client->path . '/modules/');
+		$layoutPath    = Path::clean(JPATH_ROOT . '/layouts/');
+
+		// For modules
+		if (stristr($type, 'mod_') !== false)
+		{
+			$folder   = $explodeArray['2'];
+			$htmlPath = Path::clean($modulePath . $folder . '/tmpl/');
+			$fileName = $this->getSafeName($fileName);
+			$coreFile = $this->findPath($htmlPath, $fileName);
+
+			return $coreFile;
+		}
+		elseif (stristr($type, 'com_') !== false)
+		{
+			// For components
+			$folder    = $explodeArray['2'];
+			$subFolder = $explodeArray['3'];
+			$fileName  = $this->getSafeName($fileName);
+
+			// The old scheme, if a view has a tmpl folder
+			$oldHtmlPath = Path::clean($componentPath . $folder . '/views/' . $subFolder . '/tmpl/');
+
+			if(!$coreFile = Path::find($oldHtmlPath, $fileName))
+			{
+				// The new scheme, the views are directly in the component/tmpl folder
+				$newHtmlPath = Path::clean($componentPath . $folder . '/tmpl/' . $subFolder . '/');
+				$coreFile    = $this->findPath($newHtmlPath, $fileName);
+
+				return $coreFile;
+			}
+
+			return $coreFile;
+		}
+		elseif (stristr($type, 'layouts') !== false)
+		{
+			// For Jlayouts
+			$subtype = $explodeArray['3'];
+
+			if(stristr($subtype, 'com_'))
+			{
+				$folder    = $explodeArray['3'];
+		 		$subFolder = array_slice($explodeArray, 4, -1);
+				$subFolder = implode(DIRECTORY_SEPARATOR, $subFolder);
+				$htmlPath  = Path::clean($componentPath . $folder . '/layouts/' . $subFolder);
+				$fileName  = $this->getSafeName($fileName);
+				$coreFile  = $this->findPath($htmlPath, $fileName);
+
+				return $coreFile;
+			}
+			elseif (stristr($subtype, 'joomla') || stristr($subtype, 'libraries') || stristr($subtype, 'plugins'))
+			{
+				$subFolder = array_slice($explodeArray, 3, -1);
+				$subFolder = implode(DIRECTORY_SEPARATOR, $subFolder);
+				$htmlPath  = Path::clean($layoutPath . $subFolder);
+				$fileName  = $this->getSafeName($fileName);
+				$coreFile  = $this->findPath($htmlPath, $fileName);
+
+				return $coreFile;
+			}
+		}
+
+		$app->enqueueMessage(Text::_('COM_TEMPLATES_ERROR_CORE_FILE_NOT_FOUND'), 'error');
+
+		return false;
+	}
+
+	/**
+	 * Creates a safe file name for the given name.
+	 *
+	 * @param   string  $name  The filename
+	 *
+	 * @return  string $fileName  The filtered name without Date
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	private function getSafeName($name)
+	{
+		if (preg_match('/[0-9]/', $name))
+		{
+			// Get the extension
+			$extension = File::getExt($name);
+
+			// Remove ( Date ) from file
+			$explodeArray = explode('-', $name);
+			$size         = count($explodeArray);
+			$date         = $explodeArray[$size-2] . '-' . str_replace('.' . $extension, '', $explodeArray[$size-1]);
+
+			if($this->validateDate($date))
+			{
+				$nameWithoutExtension = implode('-', array_slice($explodeArray, 0, -2));
+
+				//Filtered name
+				$name = $nameWithoutExtension . '.' . $extension;
+			}
+		}
+
+		return $name;
+	}
+
+	/**
+	 * Validate Date in file name.
+	 *
+	 * @param  string $date Date to validate.
+	 *
+	 * @return boolean Return true if date is valid and false if not.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	 private function validateDate($date)
+	 {
+		 $format = 'Ymd-His';
+		 $valid  = Date::createFromFormat($format, $date);
+
+		 return $valid && $valid->format($format) == $date;
+	 }
+
+	/**
+	 * Find file in given folde
+	 *
+	 * @param  string  $path An path or array of path to search.
+	 * @param  string  $file The file name to look for.
+	 *
+	 * @return mixed  $path The full path and file name for the target file, or boolean false if the file is not found in any of the paths.
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	private function findPath($paths, $file)
+	{
+		$app = Factory::getApplication();
+
+		if(!$path = Path::find($paths, $file))
+		{
+			$app->enqueueMessage(Text::_('COM_TEMPLATES_ERROR_CORE_FILE_NOT_FOUND'), 'error');
+		}
+
+		return $path;
+	}
+
 	/**
 	 * Method to auto-populate the model state.
 	 *
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index e74b635285d6b..b28de3618608b 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -43,6 +43,7 @@ COM_TEMPLATES_DIRECTORY_NOT_WRITABLE="The template folder is not writable. Some
 COM_TEMPLATES_ERR_XML="Template XML data not available"
 COM_TEMPLATES_ERROR_CANNOT_DELETE_LAST_STYLE="Can't delete the last style of a template. To uninstall/delete a template go to: Extensions-> Manage-> Manage-> Select template to be deleted-> Select 'Uninstall'."
 COM_TEMPLATES_ERROR_CANNOT_UNSET_DEFAULT_STYLE="Can't unset default style."
+COM_TEMPLATES_ERROR_CORE_FILE_NOT_FOUND="Core file not found."
 COM_TEMPLATES_ERROR_COULD_NOT_COPY="Unable to copy template files to temporary folder."
 COM_TEMPLATES_ERROR_COULD_NOT_INSTALL="Unable to install new template from temporary folder."
 COM_TEMPLATES_ERROR_COULD_NOT_WRITE="Unable to delete temporary folder."
@@ -63,6 +64,7 @@ COM_TEMPLATES_ERROR_IMAGE_FILE_NOT_FOUND="Image file not found."
 COM_TEMPLATES_ERROR_INDEX_DELETE="The file index.php can't be deleted. Make changes in the editor if you want to change the file."
 COM_TEMPLATES_ERROR_INVALID_FROM_NAME="Template to copy from can't be found."
 COM_TEMPLATES_ERROR_INVALID_TEMPLATE_NAME="Invalid template name. Please use only letters, numbers, dashes and underscores."
+COM_TEMPLATES_ERROR_ONLY_HTML_FOLDER_ALLOWED="Only html/ folder allowed."
 COM_TEMPLATES_ERROR_RENAME_INDEX="The file index.php can't be renamed."
 COM_TEMPLATES_ERROR_ROOT_DELETE="The root folder can't be deleted."
 COM_TEMPLATES_ERROR_SAVE_DISABLED_TEMPLATE="Unable to save a style associated to a disabled template."

From d4a3b55e41180b896511503646b212abbde8867c Mon Sep 17 00:00:00 2001
From: Anurag <30978328+Anu1601CS@users.noreply.github.com>
Date: Thu, 24 May 2018 02:13:02 +0530
Subject: [PATCH 02/79] CS (#3) Coding Standards

---
 .../com_templates/Model/TemplateModel.php     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index 6a9663fa63061..058a938ac0e87 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -156,8 +156,8 @@ public function getDirectoryTree($dir)
 	/**
 	 * Method to get the core file of override file
 	 *
-	 * @param   string   $file  Override file
-	 * @param   integer  $client Client Id
+	 * @param   string   $file      Override file
+	 * @param   integer  $client_id Client Id
 	 *
 	 * @return  string  $corefile The full path and file name for the target file, or boolean false if the file is not found in any of the paths.
 	 *
@@ -170,7 +170,7 @@ public function getCoreFile($file, $client_id)
 		$explodeArray  = explode(DIRECTORY_SEPARATOR, $filePath);
 
 		// Only allow html/ folder
-		if($explodeArray['1'] !== 'html')
+		if ($explodeArray['1'] !== 'html')
 		{
 			$app->enqueueMessage(Text::_('COM_TEMPLATES_ERROR_ONLY_HTML_FOLDER_ALLOWED'), 'error');
 
@@ -205,7 +205,7 @@ public function getCoreFile($file, $client_id)
 			// The old scheme, if a view has a tmpl folder
 			$oldHtmlPath = Path::clean($componentPath . $folder . '/views/' . $subFolder . '/tmpl/');
 
-			if(!$coreFile = Path::find($oldHtmlPath, $fileName))
+			if (!$coreFile = Path::find($oldHtmlPath, $fileName))
 			{
 				// The new scheme, the views are directly in the component/tmpl folder
 				$newHtmlPath = Path::clean($componentPath . $folder . '/tmpl/' . $subFolder . '/');
@@ -221,7 +221,7 @@ public function getCoreFile($file, $client_id)
 			// For Jlayouts
 			$subtype = $explodeArray['3'];
 
-			if(stristr($subtype, 'com_'))
+			if (stristr($subtype, 'com_'))
 			{
 				$folder    = $explodeArray['3'];
 		 		$subFolder = array_slice($explodeArray, 4, -1);
@@ -270,11 +270,11 @@ private function getSafeName($name)
 			$size         = count($explodeArray);
 			$date         = $explodeArray[$size-2] . '-' . str_replace('.' . $extension, '', $explodeArray[$size-1]);
 
-			if($this->validateDate($date))
+			if ($this->validateDate($date))
 			{
 				$nameWithoutExtension = implode('-', array_slice($explodeArray, 0, -2));
 
-				//Filtered name
+				// Filtered name
 				$name = $nameWithoutExtension . '.' . $extension;
 			}
 		}
@@ -300,10 +300,10 @@ private function validateDate($date)
 	 }
 
 	/**
-	 * Find file in given folde
+	 * Find file in given folder.
 	 *
-	 * @param  string  $path An path or array of path to search.
-	 * @param  string  $file The file name to look for.
+	 * @param  string  $paths An path or array of path to search.
+	 * @param  string  $file  The file name to look for.
 	 *
 	 * @return mixed  $path The full path and file name for the target file, or boolean false if the file is not found in any of the paths.
 	 *
@@ -313,7 +313,7 @@ private function findPath($paths, $file)
 	{
 		$app = Factory::getApplication();
 
-		if(!$path = Path::find($paths, $file))
+		if (!$path = Path::find($paths, $file))
 		{
 			$app->enqueueMessage(Text::_('COM_TEMPLATES_ERROR_CORE_FILE_NOT_FOUND'), 'error');
 		}

From c5a2eda0472812f54e74171d8751628b6833f251 Mon Sep 17 00:00:00 2001
From: astridx <info@astrid-guenther.de>
Date: Wed, 23 May 2018 22:53:30 +0200
Subject: [PATCH 03/79] codingstandards

---
 .../com_templates/Model/TemplateModel.php     | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index 058a938ac0e87..7cf88d6881118 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -156,8 +156,8 @@ public function getDirectoryTree($dir)
 	/**
 	 * Method to get the core file of override file
 	 *
-	 * @param   string   $file      Override file
-	 * @param   integer  $client_id Client Id
+	 * @param   string   $file       Override file
+	 * @param   integer  $client_id  Client Id
 	 *
 	 * @return  string  $corefile The full path and file name for the target file, or boolean false if the file is not found in any of the paths.
 	 *
@@ -224,7 +224,7 @@ public function getCoreFile($file, $client_id)
 			if (stristr($subtype, 'com_'))
 			{
 				$folder    = $explodeArray['3'];
-		 		$subFolder = array_slice($explodeArray, 4, -1);
+				$subFolder = array_slice($explodeArray, 4, -1);
 				$subFolder = implode(DIRECTORY_SEPARATOR, $subFolder);
 				$htmlPath  = Path::clean($componentPath . $folder . '/layouts/' . $subFolder);
 				$fileName  = $this->getSafeName($fileName);
@@ -267,8 +267,8 @@ private function getSafeName($name)
 
 			// Remove ( Date ) from file
 			$explodeArray = explode('-', $name);
-			$size         = count($explodeArray);
-			$date         = $explodeArray[$size-2] . '-' . str_replace('.' . $extension, '', $explodeArray[$size-1]);
+			$size = count($explodeArray);
+			$date = $explodeArray[$size - 2] . '-' . str_replace('.' . $extension, '', $explodeArray[$size - 1]);
 
 			if ($this->validateDate($date))
 			{
@@ -285,25 +285,25 @@ private function getSafeName($name)
 	/**
 	 * Validate Date in file name.
 	 *
-	 * @param  string $date Date to validate.
+	 * @param   string  $date  Date to validate.
 	 *
 	 * @return boolean Return true if date is valid and false if not.
 	 *
 	 * @since  __DEPLOY_VERSION__
 	 */
-	 private function validateDate($date)
-	 {
-		 $format = 'Ymd-His';
-		 $valid  = Date::createFromFormat($format, $date);
+	private function validateDate($date)
+	{
+		$format = 'Ymd-His';
+		$valid  = Date::createFromFormat($format, $date);
 
-		 return $valid && $valid->format($format) == $date;
-	 }
+		return $valid && $valid->format($format) == $date;
+	}
 
 	/**
 	 * Find file in given folder.
 	 *
-	 * @param  string  $paths An path or array of path to search.
-	 * @param  string  $file  The file name to look for.
+	 * @param   string  $paths  An path or array of path to search.
+	 * @param   string  $file   The file name to look for.
 	 *
 	 * @return mixed  $path The full path and file name for the target file, or boolean false if the file is not found in any of the paths.
 	 *

From 880c20314ccff038a7273f4695e85e5330a983c7 Mon Sep 17 00:00:00 2001
From: Astrid <astridx@users.noreply.github.com>
Date: Thu, 24 May 2018 06:45:22 +0200
Subject: [PATCH 04/79] codingstandards (#4)

---
 .../com_templates/Model/TemplateModel.php     | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index 058a938ac0e87..7cf88d6881118 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -156,8 +156,8 @@ public function getDirectoryTree($dir)
 	/**
 	 * Method to get the core file of override file
 	 *
-	 * @param   string   $file      Override file
-	 * @param   integer  $client_id Client Id
+	 * @param   string   $file       Override file
+	 * @param   integer  $client_id  Client Id
 	 *
 	 * @return  string  $corefile The full path and file name for the target file, or boolean false if the file is not found in any of the paths.
 	 *
@@ -224,7 +224,7 @@ public function getCoreFile($file, $client_id)
 			if (stristr($subtype, 'com_'))
 			{
 				$folder    = $explodeArray['3'];
-		 		$subFolder = array_slice($explodeArray, 4, -1);
+				$subFolder = array_slice($explodeArray, 4, -1);
 				$subFolder = implode(DIRECTORY_SEPARATOR, $subFolder);
 				$htmlPath  = Path::clean($componentPath . $folder . '/layouts/' . $subFolder);
 				$fileName  = $this->getSafeName($fileName);
@@ -267,8 +267,8 @@ private function getSafeName($name)
 
 			// Remove ( Date ) from file
 			$explodeArray = explode('-', $name);
-			$size         = count($explodeArray);
-			$date         = $explodeArray[$size-2] . '-' . str_replace('.' . $extension, '', $explodeArray[$size-1]);
+			$size = count($explodeArray);
+			$date = $explodeArray[$size - 2] . '-' . str_replace('.' . $extension, '', $explodeArray[$size - 1]);
 
 			if ($this->validateDate($date))
 			{
@@ -285,25 +285,25 @@ private function getSafeName($name)
 	/**
 	 * Validate Date in file name.
 	 *
-	 * @param  string $date Date to validate.
+	 * @param   string  $date  Date to validate.
 	 *
 	 * @return boolean Return true if date is valid and false if not.
 	 *
 	 * @since  __DEPLOY_VERSION__
 	 */
-	 private function validateDate($date)
-	 {
-		 $format = 'Ymd-His';
-		 $valid  = Date::createFromFormat($format, $date);
+	private function validateDate($date)
+	{
+		$format = 'Ymd-His';
+		$valid  = Date::createFromFormat($format, $date);
 
-		 return $valid && $valid->format($format) == $date;
-	 }
+		return $valid && $valid->format($format) == $date;
+	}
 
 	/**
 	 * Find file in given folder.
 	 *
-	 * @param  string  $paths An path or array of path to search.
-	 * @param  string  $file  The file name to look for.
+	 * @param   string  $paths  An path or array of path to search.
+	 * @param   string  $file   The file name to look for.
 	 *
 	 * @return mixed  $path The full path and file name for the target file, or boolean false if the file is not found in any of the paths.
 	 *

From c1241de6cdefc4994d7b4a8ebeac2b84dcfd28fb Mon Sep 17 00:00:00 2001
From: Anurag <30978328+Anu1601CS@users.noreply.github.com>
Date: Tue, 29 May 2018 14:30:26 +0530
Subject: [PATCH 05/79] Test (#6)

Phase 2 (2 part) Mechanism to find correct core file and implementation.
---
 .../com_templates/Model/TemplateModel.php     | 12 ++++++--
 .../components/com_templates/forms/source.xml | 18 +++++++++--
 .../com_templates/tmpl/template/default.php   | 30 ++++++++-----------
 .../language/en-GB/en-GB.com_templates.ini    |  5 ++--
 4 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index 7cf88d6881118..fc4e3d9ce6007 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -172,7 +172,7 @@ public function getCoreFile($file, $client_id)
 		// Only allow html/ folder
 		if ($explodeArray['1'] !== 'html')
 		{
-			$app->enqueueMessage(Text::_('COM_TEMPLATES_ERROR_ONLY_HTML_FOLDER_ALLOWED'), 'error');
+			$app->enqueueMessage(Text::_('COM_TEMPLATES_ERROR_ONLY_HTML_FOLDER_ALLOWED'), 'notice');
 
 			return false;
 		}
@@ -244,7 +244,7 @@ public function getCoreFile($file, $client_id)
 			}
 		}
 
-		$app->enqueueMessage(Text::_('COM_TEMPLATES_ERROR_CORE_FILE_NOT_FOUND'), 'error');
+		$app->enqueueMessage(Text::_('COM_TEMPLATES_ERROR_CORE_FILE_NOT_FOUND'), 'warning');
 
 		return false;
 	}
@@ -315,7 +315,7 @@ private function findPath($paths, $file)
 
 		if (!$path = Path::find($paths, $file))
 		{
-			$app->enqueueMessage(Text::_('COM_TEMPLATES_ERROR_CORE_FILE_NOT_FOUND'), 'error');
+			$app->enqueueMessage(Text::_('COM_TEMPLATES_ERROR_CORE_FILE_NOT_FOUND'), 'warning');
 		}
 
 		return $path;
@@ -630,6 +630,12 @@ public function &getSource()
 				$item->extension_id = $this->getState('extension.id');
 				$item->filename = $fileName;
 				$item->source = file_get_contents($filePath);
+
+				if ($coreFile = $this->getCoreFile($fileName, $this->template->client_id))
+				{
+					$item->coreFile = $coreFile;
+					$item->core = file_get_contents($coreFile);
+				}
 			}
 			else
 			{
diff --git a/administrator/components/com_templates/forms/source.xml b/administrator/components/com_templates/forms/source.xml
index 823841544041f..8aceade76c3d6 100644
--- a/administrator/components/com_templates/forms/source.xml
+++ b/administrator/components/com_templates/forms/source.xml
@@ -3,7 +3,7 @@
 	<fieldset>
 		<field
 			name="extension_id"
-			type="hidden" 
+			type="hidden"
 		/>
 
 		<field
@@ -21,7 +21,21 @@
 			rows="20"
 			cols="80"
 			syntax="php"
-			filter="raw" 
+			filter="raw"
+		/>
+
+		<field
+			name="core"
+			type="editor"
+			label="COM_TEMPLATES_FIELD_SOURCE_LABEL"
+			editor="codemirror|none"
+			buttons="no"
+			height="500px"
+			rows="20"
+			cols="80"
+			syntax="php"
+			filter="raw"
+		        readonly="true"
 		/>
 	</fieldset>
 </form>
diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index 6867a431da032..26f41ec8f6c4d 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -48,22 +48,6 @@
 ?>
 <?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'editor')); ?>
 <?php echo JHtml::_('bootstrap.addTab', 'myTab', 'editor', JText::_('COM_TEMPLATES_TAB_EDITOR')); ?>
-<div class="row">
-	<div class="col-md-12">
-		<?php if($this->type == 'file') : ?>
-			<p class="lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->source->filename, $this->template->element); ?></p>
-			<p class="lead path hidden"><?php echo $this->source->filename; ?></p>
-		<?php endif; ?>
-		<?php if($this->type == 'image') : ?>
-			<p class="lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->image['path'], $this->template->element); ?></p>
-			<p class="lead path hidden"><?php echo $this->image['path']; ?></p>
-		<?php endif; ?>
-		<?php if($this->type == 'font') : ?>
-			<p class="lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->font['rel_path'], $this->template->element); ?></p>
-			<p class="lead path hidden"><?php echo $this->font['rel_path']; ?></p>
-		<?php endif; ?>
-	</div>
-</div>
 <div class="row">
 	<div id="treeholder" class="col-md-3 tree-holder">
 		<?php echo $this->loadTemplate('tree'); ?>
@@ -83,6 +67,8 @@
 			</form>
 		<?php endif; ?>
 		<?php if ($this->type == 'file') : ?>
+			<p class="lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->source->filename, $this->template->element); ?></p>
+			<p class="lead path hidden"><?php echo $this->source->filename; ?></p>
 			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
 				<div class="editor-border">
 					<?php echo $this->form->getInput('source'); ?>
@@ -92,6 +78,12 @@
 				<?php echo $this->form->getInput('extension_id'); ?>
 				<?php echo $this->form->getInput('filename'); ?>
 			</form>
+			<div class="editor-border">
+				<?php if (!empty($this->source->coreFile)) : ?>
+					<p class="lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_CORE_FILENAME', $this->source->coreFile); ?></p>
+					<?php echo $this->form->getInput('core'); ?>
+				<?php endif; ?>
+			</div>
 		<?php endif; ?>
 		<?php if ($this->type == 'archive') : ?>
 			<legend><?php echo JText::_('COM_TEMPLATES_FILE_CONTENT_PREVIEW'); ?></legend>
@@ -113,6 +105,8 @@
 			</form>
 		<?php endif; ?>
 		<?php if ($this->type == 'image') : ?>
+			<p class="lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->image['path'], $this->template->element); ?></p>
+			<p class="lead path hidden"><?php echo $this->image['path']; ?></p>
 			<img id="image-crop" src="<?php echo $this->image['address'] . '?' . time(); ?>">
 			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
 				<fieldset class="adminform">
@@ -128,6 +122,8 @@
 			</form>
 		<?php endif; ?>
 		<?php if ($this->type == 'font') : ?>
+			<p class="lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->font['rel_path'], $this->template->element); ?></p>
+			<p class="lead path hidden"><?php echo $this->font['rel_path']; ?></p>
 			<div class="font-preview">
 				<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
 					<fieldset class="adminform">
@@ -352,4 +348,4 @@
 		<?php echo JLayoutHelper::render('joomla.modal.main', $resizeModalData); ?>
 		<?php echo JHtml::_('form.token'); ?>
 	</form>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index b28de3618608b..910987c91d590 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -43,7 +43,7 @@ COM_TEMPLATES_DIRECTORY_NOT_WRITABLE="The template folder is not writable. Some
 COM_TEMPLATES_ERR_XML="Template XML data not available"
 COM_TEMPLATES_ERROR_CANNOT_DELETE_LAST_STYLE="Can't delete the last style of a template. To uninstall/delete a template go to: Extensions-> Manage-> Manage-> Select template to be deleted-> Select 'Uninstall'."
 COM_TEMPLATES_ERROR_CANNOT_UNSET_DEFAULT_STYLE="Can't unset default style."
-COM_TEMPLATES_ERROR_CORE_FILE_NOT_FOUND="Core file not found."
+COM_TEMPLATES_ERROR_CORE_FILE_NOT_FOUND="Core file not found. Some of the features may not available."
 COM_TEMPLATES_ERROR_COULD_NOT_COPY="Unable to copy template files to temporary folder."
 COM_TEMPLATES_ERROR_COULD_NOT_INSTALL="Unable to install new template from temporary folder."
 COM_TEMPLATES_ERROR_COULD_NOT_WRITE="Unable to delete temporary folder."
@@ -64,7 +64,7 @@ COM_TEMPLATES_ERROR_IMAGE_FILE_NOT_FOUND="Image file not found."
 COM_TEMPLATES_ERROR_INDEX_DELETE="The file index.php can't be deleted. Make changes in the editor if you want to change the file."
 COM_TEMPLATES_ERROR_INVALID_FROM_NAME="Template to copy from can't be found."
 COM_TEMPLATES_ERROR_INVALID_TEMPLATE_NAME="Invalid template name. Please use only letters, numbers, dashes and underscores."
-COM_TEMPLATES_ERROR_ONLY_HTML_FOLDER_ALLOWED="Only html/ folder allowed."
+COM_TEMPLATES_ERROR_ONLY_HTML_FOLDER_ALLOWED="Diff view feature is only available for html folder."
 COM_TEMPLATES_ERROR_RENAME_INDEX="The file index.php can't be renamed."
 COM_TEMPLATES_ERROR_ROOT_DELETE="The root folder can't be deleted."
 COM_TEMPLATES_ERROR_SAVE_DISABLED_TEMPLATE="Unable to save a style associated to a disabled template."
@@ -198,6 +198,7 @@ COM_TEMPLATES_TAB_EDITOR="Editor"
 COM_TEMPLATES_TAB_OVERRIDES="Create Overrides"
 COM_TEMPLATES_TEMPLATE_CLOSE="Close"
 COM_TEMPLATES_TEMPLATE_COPY="Copy Template"
+COM_TEMPLATES_TEMPLATE_CORE_FILENAME="Core file &quot;%s&quot;."
 COM_TEMPLATES_TEMPLATE_DESCRIPTION="Template description."
 COM_TEMPLATES_TEMPLATE_DETAILS="%s Details and Files"
 COM_TEMPLATES_TEMPLATE_FILENAME="Editing file &quot;%s&quot; in template &quot;%s&quot;."

From bcbf86e70998feee0051dfeee2ed54719e0ffc12 Mon Sep 17 00:00:00 2001
From: Anurag <30978328+Anu1601CS@users.noreply.github.com>
Date: Sun, 3 Jun 2018 15:46:29 +0530
Subject: [PATCH 06/79] Remove Notice: Only available for html-folder

---
 administrator/components/com_templates/Model/TemplateModel.php | 2 --
 administrator/language/en-GB/en-GB.com_templates.ini           | 1 -
 2 files changed, 3 deletions(-)

diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index fc4e3d9ce6007..8c39e9ce24c49 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -172,8 +172,6 @@ public function getCoreFile($file, $client_id)
 		// Only allow html/ folder
 		if ($explodeArray['1'] !== 'html')
 		{
-			$app->enqueueMessage(Text::_('COM_TEMPLATES_ERROR_ONLY_HTML_FOLDER_ALLOWED'), 'notice');
-
 			return false;
 		}
 
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index 910987c91d590..cbc19872af569 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -64,7 +64,6 @@ COM_TEMPLATES_ERROR_IMAGE_FILE_NOT_FOUND="Image file not found."
 COM_TEMPLATES_ERROR_INDEX_DELETE="The file index.php can't be deleted. Make changes in the editor if you want to change the file."
 COM_TEMPLATES_ERROR_INVALID_FROM_NAME="Template to copy from can't be found."
 COM_TEMPLATES_ERROR_INVALID_TEMPLATE_NAME="Invalid template name. Please use only letters, numbers, dashes and underscores."
-COM_TEMPLATES_ERROR_ONLY_HTML_FOLDER_ALLOWED="Diff view feature is only available for html folder."
 COM_TEMPLATES_ERROR_RENAME_INDEX="The file index.php can't be renamed."
 COM_TEMPLATES_ERROR_ROOT_DELETE="The root folder can't be deleted."
 COM_TEMPLATES_ERROR_SAVE_DISABLED_TEMPLATE="Unable to save a style associated to a disabled template."

From f386da8302983b3cc930c9af64cfd6c79cb4a617 Mon Sep 17 00:00:00 2001
From: Anurag <30978328+Anu1601CS@users.noreply.github.com>
Date: Mon, 4 Jun 2018 23:40:17 +0530
Subject: [PATCH 07/79] Remove Warning if core file not found (#11)

Thanks.
So one part of the issue https://github.com/joomla-projects/gsoc18_override_management/issues/12 is done.
---
 .../com_templates/Model/TemplateModel.php     | 32 +++----------------
 .../language/en-GB/en-GB.com_templates.ini    |  1 -
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index 8c39e9ce24c49..a47b4513bce33 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -189,7 +189,7 @@ public function getCoreFile($file, $client_id)
 			$folder   = $explodeArray['2'];
 			$htmlPath = Path::clean($modulePath . $folder . '/tmpl/');
 			$fileName = $this->getSafeName($fileName);
-			$coreFile = $this->findPath($htmlPath, $fileName);
+			$coreFile = Path::find($htmlPath, $fileName);
 
 			return $coreFile;
 		}
@@ -207,7 +207,7 @@ public function getCoreFile($file, $client_id)
 			{
 				// The new scheme, the views are directly in the component/tmpl folder
 				$newHtmlPath = Path::clean($componentPath . $folder . '/tmpl/' . $subFolder . '/');
-				$coreFile    = $this->findPath($newHtmlPath, $fileName);
+				$coreFile    = Path::find($newHtmlPath, $fileName);
 
 				return $coreFile;
 			}
@@ -226,7 +226,7 @@ public function getCoreFile($file, $client_id)
 				$subFolder = implode(DIRECTORY_SEPARATOR, $subFolder);
 				$htmlPath  = Path::clean($componentPath . $folder . '/layouts/' . $subFolder);
 				$fileName  = $this->getSafeName($fileName);
-				$coreFile  = $this->findPath($htmlPath, $fileName);
+				$coreFile  = Path::find($htmlPath, $fileName);
 
 				return $coreFile;
 			}
@@ -236,14 +236,12 @@ public function getCoreFile($file, $client_id)
 				$subFolder = implode(DIRECTORY_SEPARATOR, $subFolder);
 				$htmlPath  = Path::clean($layoutPath . $subFolder);
 				$fileName  = $this->getSafeName($fileName);
-				$coreFile  = $this->findPath($htmlPath, $fileName);
+				$coreFile  = Path::find($htmlPath, $fileName);
 
 				return $coreFile;
 			}
 		}
 
-		$app->enqueueMessage(Text::_('COM_TEMPLATES_ERROR_CORE_FILE_NOT_FOUND'), 'warning');
-
 		return false;
 	}
 
@@ -297,28 +295,6 @@ private function validateDate($date)
 		return $valid && $valid->format($format) == $date;
 	}
 
-	/**
-	 * Find file in given folder.
-	 *
-	 * @param   string  $paths  An path or array of path to search.
-	 * @param   string  $file   The file name to look for.
-	 *
-	 * @return mixed  $path The full path and file name for the target file, or boolean false if the file is not found in any of the paths.
-	 *
-	 * @since  __DEPLOY_VERSION__
-	 */
-	private function findPath($paths, $file)
-	{
-		$app = Factory::getApplication();
-
-		if (!$path = Path::find($paths, $file))
-		{
-			$app->enqueueMessage(Text::_('COM_TEMPLATES_ERROR_CORE_FILE_NOT_FOUND'), 'warning');
-		}
-
-		return $path;
-	}
-
 	/**
 	 * Method to auto-populate the model state.
 	 *
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index cbc19872af569..54470e802161f 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -43,7 +43,6 @@ COM_TEMPLATES_DIRECTORY_NOT_WRITABLE="The template folder is not writable. Some
 COM_TEMPLATES_ERR_XML="Template XML data not available"
 COM_TEMPLATES_ERROR_CANNOT_DELETE_LAST_STYLE="Can't delete the last style of a template. To uninstall/delete a template go to: Extensions-> Manage-> Manage-> Select template to be deleted-> Select 'Uninstall'."
 COM_TEMPLATES_ERROR_CANNOT_UNSET_DEFAULT_STYLE="Can't unset default style."
-COM_TEMPLATES_ERROR_CORE_FILE_NOT_FOUND="Core file not found. Some of the features may not available."
 COM_TEMPLATES_ERROR_COULD_NOT_COPY="Unable to copy template files to temporary folder."
 COM_TEMPLATES_ERROR_COULD_NOT_INSTALL="Unable to install new template from temporary folder."
 COM_TEMPLATES_ERROR_COULD_NOT_WRITE="Unable to delete temporary folder."

From 33ea597ba1b61ba7f5174e239e9a773166eb2bed Mon Sep 17 00:00:00 2001
From: Anurag <30978328+Anu1601CS@users.noreply.github.com>
Date: Thu, 7 Jun 2018 16:27:44 +0530
Subject: [PATCH 08/79] Implement the diff view in template manager

Implement the diff view in template manager
---
 .../com_templates/layouts/diffview/core.php   |  14 ++
 .../com_templates/layouts/diffview/diff.php   |  14 ++
 .../com_templates/tmpl/template/default.php   |  79 +++++++--
 .../language/en-GB/en-GB.com_templates.ini    |   9 +-
 .../css/admin-templates-default.css           |  21 +++
 .../css/admin-templates-default.min.css       |   2 +-
 .../js/admin-template-compare.es6.js          | 150 +++++++++++++++++
 .../js/admin-template-compare.es6.min.js      |   1 +
 .../js/admin-template-compare.js              | 159 ++++++++++++++++++
 .../js/admin-template-compare.min.js          |   1 +
 10 files changed, 431 insertions(+), 19 deletions(-)
 create mode 100644 administrator/components/com_templates/layouts/diffview/core.php
 create mode 100644 administrator/components/com_templates/layouts/diffview/diff.php
 create mode 100644 media/com_templates/js/admin-template-compare.es6.js
 create mode 100644 media/com_templates/js/admin-template-compare.es6.min.js
 create mode 100644 media/com_templates/js/admin-template-compare.js
 create mode 100644 media/com_templates/js/admin-template-compare.min.js

diff --git a/administrator/components/com_templates/layouts/diffview/core.php b/administrator/components/com_templates/layouts/diffview/core.php
new file mode 100644
index 0000000000000..630f501fe31b5
--- /dev/null
+++ b/administrator/components/com_templates/layouts/diffview/core.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$title = JText::_('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE');
+?>
+<button type="button" class="btn btn-danger" onclick-task="template.show.core" title="<?php echo $title; ?>"><?php echo $title; ?></button>
diff --git a/administrator/components/com_templates/layouts/diffview/diff.php b/administrator/components/com_templates/layouts/diffview/diff.php
new file mode 100644
index 0000000000000..b250ba3959a6a
--- /dev/null
+++ b/administrator/components/com_templates/layouts/diffview/diff.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$title = JText::_('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF');
+?>
+<button type="button" class="btn btn-danger" onclick-task="template.show.diff" title="<?php echo $title; ?>"><?php echo $title; ?></button>
diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index 26f41ec8f6c4d..b3d96acebc143 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -9,9 +9,19 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Layout\FileLayout;
+
 // Include the component HTML helpers.
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 
+JText::script('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE');
+JText::script('COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE');
+JText::script('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF');
+JText::script('COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF');
+
+JHtml::_('script', 'vendor/diff/diff.min.js', array('version' => 'auto', 'relative' => true));
+JHtml::_('script', 'com_templates/admin-template-compare.min.js', array('version' => 'auto', 'relative' => true));
+
 JHtml::_('behavior.formvalidator');
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.tabstate');
@@ -48,6 +58,30 @@
 ?>
 <?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'editor')); ?>
 <?php echo JHtml::_('bootstrap.addTab', 'myTab', 'editor', JText::_('COM_TEMPLATES_TAB_EDITOR')); ?>
+<div class="row">
+	<div class="col-md-6" id="conditional-section">
+		<?php if ($this->type == 'file') : ?>
+			<p class="lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->source->filename, $this->template->element); ?></p>
+			<p class="lead path hidden"><?php echo $this->source->filename; ?></p>
+		<?php endif; ?>
+		<?php if ($this->type == 'image') : ?>
+			<p class="lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->image['path'], $this->template->element); ?></p>
+			<p class="lead path hidden"><?php echo $this->image['path']; ?></p>
+		<?php endif; ?>
+		<?php if ($this->type == 'font') : ?>
+			<p class="lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->font['rel_path'], $this->template->element); ?></p>
+			<p class="lead path hidden"><?php echo $this->font['rel_path']; ?></p>
+		<?php endif; ?>
+	</div>
+	<?php if ($this->type == 'file' && !empty($this->source->coreFile)) : ?>
+		<div class="col-md-6 text-right">
+			<?php $layout_core_button = new FileLayout('diffview.core', JPATH_COMPONENT_ADMINISTRATOR . '/layouts'); ?>
+			<?php echo $layout_core_button->render(array()); ?>
+			<?php $layout_diff_button = new FileLayout('diffview.diff', JPATH_COMPONENT_ADMINISTRATOR . '/layouts'); ?>
+			<?php echo $layout_diff_button->render(array()); ?>
+		</div>
+	<?php endif; ?>
+</div>
 <div class="row">
 	<div id="treeholder" class="col-md-3 tree-holder">
 		<?php echo $this->loadTemplate('tree'); ?>
@@ -67,21 +101,36 @@
 			</form>
 		<?php endif; ?>
 		<?php if ($this->type == 'file') : ?>
-			<p class="lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->source->filename, $this->template->element); ?></p>
-			<p class="lead path hidden"><?php echo $this->source->filename; ?></p>
-			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
-				<div class="editor-border">
-					<?php echo $this->form->getInput('source'); ?>
+			<div class="row">
+				<div class="col-md-12" id="override-pane">
+					<p class="lead"><?php echo JText::_('COM_TEMPLATES_FILE_OVERRIDE_PANE'); ?></p>
+					<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
+						<div class="editor-border">
+							<?php echo $this->form->getInput('source'); ?>
+						</div>
+						<input type="hidden" name="task" value="" />
+						<?php echo JHtml::_('form.token'); ?>
+						<?php echo $this->form->getInput('extension_id'); ?>
+						<?php echo $this->form->getInput('filename'); ?>
+					</form>
 				</div>
-				<input type="hidden" name="task" value="" />
-				<?php echo JHtml::_('form.token'); ?>
-				<?php echo $this->form->getInput('extension_id'); ?>
-				<?php echo $this->form->getInput('filename'); ?>
-			</form>
-			<div class="editor-border">
 				<?php if (!empty($this->source->coreFile)) : ?>
-					<p class="lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_CORE_FILENAME', $this->source->coreFile); ?></p>
-					<?php echo $this->form->getInput('core'); ?>
+					<?php $coreFileContent = file_get_contents($this->source->coreFile); ?>
+					<?php $overrideFileContent = file_get_contents(JPATH_SITE . '/templates/' . $this->template->element . $this->source->filename); ?>
+					<div style="display:none" class="col-md-6" id="core-pane">
+						<p class="lead"><?php echo JText::_('COM_TEMPLATES_FILE_CORE_PANE'); ?></p>
+						<div class="editor-border">
+							<?php echo $this->form->getInput('core'); ?>
+						</div>
+					</div>
+					<div class="col-md-12" style="display:none" id="diff-main">
+						<p class="lead"><?php echo JText::_('COM_TEMPLATES_FILE_COMPARE_PANE'); ?></p>
+						<div class="diff-pane">
+							<div class="diffview" style="display:none" id="original"><?php echo htmlspecialchars($coreFileContent, ENT_COMPAT, 'UTF-8'); ?></div>
+							<div class="diffview" style="display:none" id="changed"><?php echo htmlspecialchars($overrideFileContent, ENT_COMPAT, 'UTF-8'); ?></div>
+							<div id="diff"></div>
+						</div>
+					</div>
 				<?php endif; ?>
 			</div>
 		<?php endif; ?>
@@ -105,8 +154,6 @@
 			</form>
 		<?php endif; ?>
 		<?php if ($this->type == 'image') : ?>
-			<p class="lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->image['path'], $this->template->element); ?></p>
-			<p class="lead path hidden"><?php echo $this->image['path']; ?></p>
 			<img id="image-crop" src="<?php echo $this->image['address'] . '?' . time(); ?>">
 			<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
 				<fieldset class="adminform">
@@ -122,8 +169,6 @@
 			</form>
 		<?php endif; ?>
 		<?php if ($this->type == 'font') : ?>
-			<p class="lead"><?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_FILENAME', $this->font['rel_path'], $this->template->element); ?></p>
-			<p class="lead path hidden"><?php echo $this->font['rel_path']; ?></p>
 			<div class="font-preview">
 				<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
 					<fieldset class="adminform">
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index 54470e802161f..13903a7cac1a3 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -90,7 +90,9 @@ COM_TEMPLATES_FILE_ARCHIVE_EXTRACT_SUCCESS="Successfully extracted the archive f
 COM_TEMPLATES_FILE_ARCHIVE_EXTRACT_FAIL="Failed to extract the archive file."
 COM_TEMPLATES_FILE_CREATE_ERROR="An error occurred creating the file."
 COM_TEMPLATES_FILE_CREATE_SUCCESS="File created."
-COM_TEMPLATES_FILE_CONTENT_PREVIEW="File Content Preview"
+COM_TEMPLATES_FILE_COMPARE_PANE="Compare or diff view between Core and Override file."
+COM_TEMPLATES_FILE_CONTENT_PREVIEW="File Content Preview."
+COM_TEMPLATES_FILE_CORE_PANE="Core file readonly."
 COM_TEMPLATES_FILE_COPY_FAIL="Failed to copy the file."
 COM_TEMPLATES_FILE_COPY_SUCCESS="The current file was copied as %s."
 COM_TEMPLATES_FILE_CROP_ERROR="Failed to crop image."
@@ -103,6 +105,7 @@ COM_TEMPLATES_FILE_NEW_NAME_LABEL="Copied File Name"
 COM_TEMPLATES_FILE_EXISTS="File with the same name already exists."
 COM_TEMPLATES_FILE_INFO="File Information"
 COM_TEMPLATES_FILE_NAME="File Name"
+COM_TEMPLATES_FILE_OVERRIDE_PANE="Override file editable."
 COM_TEMPLATES_FILE_PERMISSIONS="The File Permissions are %s"
 COM_TEMPLATES_FILE_RENAME_ERROR="An error occurred renaming the file."
 COM_TEMPLATES_FILE_RENAME_SUCCESS="File renamed."
@@ -144,6 +147,10 @@ COM_TEMPLATES_IMAGE_WIDTH="Width"
 COM_TEMPLATES_INVALID_FILE_NAME="Invalid file name. Please choose a file name containing a-z, A-Z, 0-9, - and _."
 COM_TEMPLATES_INVALID_FILE_TYPE="File type not selected."
 COM_TEMPLATES_INVALID_FOLDER_NAME="Invalid folder name. Please choose a folder name containing a-z, A-Z, 0-9, - and _."
+COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE="Hide Core"
+COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF="Hide Diff"
+COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE="Show Core"
+COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF="Show Diff"
 COM_TEMPLATES_MANAGER_ADD_STYLE="Templates: Add Style"
 COM_TEMPLATES_MANAGER_EDIT_STYLE="Templates: Edit Style"
 COM_TEMPLATES_MANAGE_FOLDERS="Manage Folders"
diff --git a/media/com_templates/css/admin-templates-default.css b/media/com_templates/css/admin-templates-default.css
index 89f889c3df52d..0b6205f1c8921 100644
--- a/media/com_templates/css/admin-templates-default.css
+++ b/media/com_templates/css/admin-templates-default.css
@@ -7,11 +7,13 @@
 	background: #08c;
 	color: #fff;
 }
+
 .selected:hover,
 .selected:focus {
 	background: #08c !important;
 	color: #fff;
 }
+
 #deleteFolder {
 	margin: 0;
 }
@@ -29,3 +31,22 @@
 .treeselect a {
 	display: block;
 }
+
+.diffview {
+	white-space: pre-wrap;
+	word-wrap: break-word;
+	display: inline;
+	padding: 4px;
+	border-radius: .2em;
+}
+
+.diff-pane {
+	height: 350px;
+	border: 0.5px solid grey;
+	overflow: auto;
+	padding: 10px;
+}
+
+#core-pane .CodeMirror-code {
+	background-color: #F0F0EE;
+}
diff --git a/media/com_templates/css/admin-templates-default.min.css b/media/com_templates/css/admin-templates-default.min.css
index 9e43a01afbb83..36cbbdbdd9759 100644
--- a/media/com_templates/css/admin-templates-default.min.css
+++ b/media/com_templates/css/admin-templates-default.min.css
@@ -1 +1 @@
-.selected{background:#08c;color:#fff}.selected:hover,.selected:focus{background:#08c !important;color:#fff}#deleteFolder{margin:0}#image-crop{max-width:100% !important;width:auto;height:auto}.tree-holder{overflow-x:auto}.treeselect a{display:block}
\ No newline at end of file
+.selected{background:#08c;color:#fff}.selected:hover,.selected:focus{background:#08c !important;color:#fff}#deleteFolder{margin:0}#image-crop{max-width:100% !important;width:auto;height:auto}.tree-holder{overflow-x:auto}.treeselect a{display:block}.diffview{white-space:pre-wrap;word-wrap:break-word;display:inline;padding:4px;border-radius:.2em}.diff-pane{height:350px;border:.5px solid grey;overflow:auto;padding:10px}#core-pane .CodeMirror-code{background-color:#f0f0ee}
\ No newline at end of file
diff --git a/media/com_templates/js/admin-template-compare.es6.js b/media/com_templates/js/admin-template-compare.es6.js
new file mode 100644
index 0000000000000..233e348641aa1
--- /dev/null
+++ b/media/com_templates/js/admin-template-compare.es6.js
@@ -0,0 +1,150 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+(() => {
+  document.addEventListener('DOMContentLoaded', () => {
+    const decodeHtmlspecialChars = (text) => {
+      const map = {
+        '&amp;': '&',
+        '&#038;': '&',
+        '&lt;': '<',
+        '&gt;': '>',
+        '&quot;': '"',
+        '&#039;': "'",
+        '&#8217;': '’',
+        '&#8216;': '‘',
+        '&#8211;': '–',
+        '&#8212;': '—',
+        '&#8230;': '…',
+        '&#8221;': '”',
+      };
+
+      return text.replace(/\&[\w\d\#]{2,5}\;/g, (m) => { const n = map[m]; return n; });
+    };
+
+    const compare = (original, changed) => {
+      const display = changed.nextElementSibling;
+      let color = '';
+      let pre = null;
+      const diff = JsDiff.diffLines(original.innerHTML, changed.innerHTML);
+      const fragment = document.createDocumentFragment();
+
+      diff.forEach((part) => {
+        if (part.added) {
+          color = '#a6f3a6';
+        } else if (part.removed) {
+          color = '#f8cbcb';
+        } else {
+          color = '';
+        }
+        pre = document.createElement('pre');
+        pre.style.backgroundColor = color;
+        pre.className = 'diffview';
+        pre.appendChild(document.createTextNode(decodeHtmlspecialChars(part.value)));
+        fragment.appendChild(pre);
+      });
+
+      display.appendChild(fragment);
+    };
+
+    const buttonDataSelector = 'onclick-task';
+    const override = document.getElementById('override-pane');
+    const corePane = document.getElementById('core-pane');
+    const diffMain = document.getElementById('diff-main');
+
+    const toggle = (e) => {
+      const task = e.target.getAttribute(buttonDataSelector);
+      if (task === 'template.show.core') {
+        if (corePane) {
+          const { display } = corePane.style;
+          if (display === 'none') {
+            e.target.className = 'btn btn-success';
+            e.target.innerHTML = Joomla.JText._('COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE');
+            corePane.style.display = 'block';
+            override.className = 'col-md-6';
+            Joomla.editors.instances.jform_core.refresh();
+          } else {
+            e.target.className = 'btn btn-danger';
+            e.target.innerHTML = Joomla.JText._('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE');
+            corePane.style.display = 'none';
+            override.className = 'col-md-12';
+          }
+          const coreState = {
+            class: e.target.className,
+            title: e.target.innerHTML,
+            display: corePane.style.display,
+            overrideClass: override.className,
+          };
+
+          if (typeof (Storage) !== 'undefined') {
+            localStorage.setItem('coreButtonState', JSON.stringify(coreState));
+          }
+        }
+      } else if (task === 'template.show.diff') {
+        if (diffMain) {
+          const { display } = diffMain.style;
+          if (display === 'none') {
+            e.target.className = 'btn btn-success';
+            e.target.innerHTML = Joomla.JText._('COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF');
+            diffMain.style.display = 'block';
+          } else {
+            e.target.className = 'btn btn-danger';
+            e.target.innerHTML = Joomla.JText._('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF');
+            diffMain.style.display = 'none';
+          }
+          const diffState = {
+            class: e.target.className,
+            title: e.target.innerHTML,
+            display: diffMain.style.display,
+          };
+
+          if (typeof (Storage) !== 'undefined') {
+            localStorage.setItem('diffButtonState', JSON.stringify(diffState));
+          }
+        }
+      }
+    };
+
+    const buttons = [].slice.call(document.querySelectorAll(`[${buttonDataSelector}]`));
+    const conditionalSection = document.getElementById('conditional-section');
+
+    const setPrestate = () => {
+      if (typeof (Storage) !== 'undefined') {
+        const cState = JSON.parse(localStorage.getItem('coreButtonState'));
+        const dState = JSON.parse(localStorage.getItem('diffButtonState'));
+
+        if (cState !== null) {
+          buttons[0].className = cState.class;
+          buttons[0].innerHTML = cState.title;
+          corePane.style.display = cState.display;
+          override.className = cState.overrideClass;
+        }
+
+        if (dState !== null) {
+          buttons[1].className = dState.class;
+          buttons[1].innerHTML = dState.title;
+          diffMain.style.display = dState.display;
+        }
+      }
+    };
+
+    if (buttons.length !== 0) {
+      buttons.forEach((button) => {
+        button.addEventListener('click', (e) => {
+          e.preventDefault();
+          toggle(e);
+        });
+      });
+      setPrestate();
+    } else if (override && conditionalSection) {
+      conditionalSection.className = 'col-md-12';
+      override.className = 'col-md-12';
+    }
+
+    const diffs = [].slice.call(document.querySelectorAll('#original'));
+    for (let i = 0, l = diffs.length; i < l; i += 1) {
+      compare(diffs[i], diffs[i].nextElementSibling);
+    }
+  });
+})();
diff --git a/media/com_templates/js/admin-template-compare.es6.min.js b/media/com_templates/js/admin-template-compare.es6.min.js
new file mode 100644
index 0000000000000..db882c31ca462
--- /dev/null
+++ b/media/com_templates/js/admin-template-compare.es6.min.js
@@ -0,0 +1 @@
+document.addEventListener("DOMContentLoaded",()=>{const e=(e,t)=>{const a=t.nextElementSibling;let l="",n=null;const s=JsDiff.diffLines(e.innerHTML,t.innerHTML),o=document.createDocumentFragment();s.forEach(e=>{l=e.added?"#a6f3a6":e.removed?"#f8cbcb":"",(n=document.createElement("pre")).style.backgroundColor=l,n.className="diffview",n.appendChild(document.createTextNode((e=>{const t={"&amp;":"&","&#038;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#039;":"'","&#8217;":"’","&#8216;":"‘","&#8211;":"–","&#8212;":"—","&#8230;":"…","&#8221;":"”"};return e.replace(/\&[\w\d\#]{2,5}\;/g,e=>t[e])})(e.value))),o.appendChild(n)}),a.appendChild(o)},t=document.getElementById("override-pane"),a=document.getElementById("core-pane"),l=document.getElementById("diff-main"),n=[].slice.call(document.querySelectorAll("[onclick-task]")),s=document.getElementById("conditional-section");0!==n.length?(n.forEach(e=>{e.addEventListener("click",e=>{e.preventDefault(),(e=>{const n=e.target.getAttribute("onclick-task");if("template.show.core"===n){if(a){const{display:l}=a.style;"none"===l?(e.target.className="btn btn-success",e.target.innerHTML=Joomla.JText._("COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE"),a.style.display="block",t.className="col-md-6",Joomla.editors.instances.jform_core.refresh()):(e.target.className="btn btn-danger",e.target.innerHTML=Joomla.JText._("COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE"),a.style.display="none",t.className="col-md-12");const n={class:e.target.className,title:e.target.innerHTML,display:a.style.display,overrideClass:t.className};"undefined"!=typeof Storage&&localStorage.setItem("coreButtonState",JSON.stringify(n))}}else if("template.show.diff"===n&&l){const{display:t}=l.style;"none"===t?(e.target.className="btn btn-success",e.target.innerHTML=Joomla.JText._("COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF"),l.style.display="block"):(e.target.className="btn btn-danger",e.target.innerHTML=Joomla.JText._("COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF"),l.style.display="none");const a={class:e.target.className,title:e.target.innerHTML,display:l.style.display};"undefined"!=typeof Storage&&localStorage.setItem("diffButtonState",JSON.stringify(a))}})(e)})}),(()=>{if("undefined"!=typeof Storage){const e=JSON.parse(localStorage.getItem("coreButtonState")),s=JSON.parse(localStorage.getItem("diffButtonState"));null!==e&&(n[0].className=e.class,n[0].innerHTML=e.title,a.style.display=e.display,t.className=e.overrideClass),null!==s&&(n[1].className=s.class,n[1].innerHTML=s.title,l.style.display=s.display)}})()):t&&s&&(s.className="col-md-12",t.className="col-md-12");const o=[].slice.call(document.querySelectorAll("#original"));for(let t=0,a=o.length;t<a;t+=1)e(o[t],o[t].nextElementSibling)});
\ No newline at end of file
diff --git a/media/com_templates/js/admin-template-compare.js b/media/com_templates/js/admin-template-compare.js
new file mode 100644
index 0000000000000..6e028738154a6
--- /dev/null
+++ b/media/com_templates/js/admin-template-compare.js
@@ -0,0 +1,159 @@
+/**
+* PLEASE DO NOT MODIFY THIS FILE. WORK ON THE ES6 VERSION.
+* OTHERWISE YOUR CHANGES WILL BE REPLACED ON THE NEXT BUILD.
+**/
+
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+(function () {
+  document.addEventListener('DOMContentLoaded', function () {
+    var decodeHtmlspecialChars = function decodeHtmlspecialChars(text) {
+      var map = {
+        '&amp;': '&',
+        '&#038;': '&',
+        '&lt;': '<',
+        '&gt;': '>',
+        '&quot;': '"',
+        '&#039;': "'",
+        '&#8217;': '’',
+        '&#8216;': '‘',
+        '&#8211;': '–',
+        '&#8212;': '—',
+        '&#8230;': '…',
+        '&#8221;': '”'
+      };
+
+      return text.replace(/\&[\w\d\#]{2,5}\;/g, function (m) {
+        var n = map[m];return n;
+      });
+    };
+
+    var compare = function compare(original, changed) {
+      var display = changed.nextElementSibling;
+      var color = '';
+      var pre = null;
+      var diff = JsDiff.diffLines(original.innerHTML, changed.innerHTML);
+      var fragment = document.createDocumentFragment();
+
+      diff.forEach(function (part) {
+        if (part.added) {
+          color = '#a6f3a6';
+        } else if (part.removed) {
+          color = '#f8cbcb';
+        } else {
+          color = '';
+        }
+        pre = document.createElement('pre');
+        pre.style.backgroundColor = color;
+        pre.className = 'diffview';
+        pre.appendChild(document.createTextNode(decodeHtmlspecialChars(part.value)));
+        fragment.appendChild(pre);
+      });
+
+      display.appendChild(fragment);
+    };
+
+    var buttonDataSelector = 'onclick-task';
+    var override = document.getElementById('override-pane');
+    var corePane = document.getElementById('core-pane');
+    var diffMain = document.getElementById('diff-main');
+
+    var toggle = function toggle(e) {
+      var task = e.target.getAttribute(buttonDataSelector);
+      if (task === 'template.show.core') {
+        if (corePane) {
+          var display = corePane.style.display;
+
+          if (display === 'none') {
+            e.target.className = 'btn btn-success';
+            e.target.innerHTML = Joomla.JText._('COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE');
+            corePane.style.display = 'block';
+            override.className = 'col-md-6';
+            Joomla.editors.instances.jform_core.refresh();
+          } else {
+            e.target.className = 'btn btn-danger';
+            e.target.innerHTML = Joomla.JText._('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE');
+            corePane.style.display = 'none';
+            override.className = 'col-md-12';
+          }
+          var coreState = {
+            class: e.target.className,
+            title: e.target.innerHTML,
+            display: corePane.style.display,
+            overrideClass: override.className
+          };
+
+          if (typeof Storage !== 'undefined') {
+            localStorage.setItem('coreButtonState', JSON.stringify(coreState));
+          }
+        }
+      } else if (task === 'template.show.diff') {
+        if (diffMain) {
+          var _display = diffMain.style.display;
+
+          if (_display === 'none') {
+            e.target.className = 'btn btn-success';
+            e.target.innerHTML = Joomla.JText._('COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF');
+            diffMain.style.display = 'block';
+          } else {
+            e.target.className = 'btn btn-danger';
+            e.target.innerHTML = Joomla.JText._('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF');
+            diffMain.style.display = 'none';
+          }
+          var diffState = {
+            class: e.target.className,
+            title: e.target.innerHTML,
+            display: diffMain.style.display
+          };
+
+          if (typeof Storage !== 'undefined') {
+            localStorage.setItem('diffButtonState', JSON.stringify(diffState));
+          }
+        }
+      }
+    };
+
+    var buttons = [].slice.call(document.querySelectorAll('[' + buttonDataSelector + ']'));
+    var conditionalSection = document.getElementById('conditional-section');
+
+    var setPrestate = function setPrestate() {
+      if (typeof Storage !== 'undefined') {
+        var cState = JSON.parse(localStorage.getItem('coreButtonState'));
+        var dState = JSON.parse(localStorage.getItem('diffButtonState'));
+
+        if (cState !== null) {
+          buttons[0].className = cState.class;
+          buttons[0].innerHTML = cState.title;
+          corePane.style.display = cState.display;
+          override.className = cState.overrideClass;
+        }
+
+        if (dState !== null) {
+          buttons[1].className = dState.class;
+          buttons[1].innerHTML = dState.title;
+          diffMain.style.display = dState.display;
+        }
+      }
+    };
+
+    if (buttons.length !== 0) {
+      buttons.forEach(function (button) {
+        button.addEventListener('click', function (e) {
+          e.preventDefault();
+          toggle(e);
+        });
+      });
+      setPrestate();
+    } else if (override && conditionalSection) {
+      conditionalSection.className = 'col-md-12';
+      override.className = 'col-md-12';
+    }
+
+    var diffs = [].slice.call(document.querySelectorAll('#original'));
+    for (var i = 0, l = diffs.length; i < l; i += 1) {
+      compare(diffs[i], diffs[i].nextElementSibling);
+    }
+  });
+})();
diff --git a/media/com_templates/js/admin-template-compare.min.js b/media/com_templates/js/admin-template-compare.min.js
new file mode 100644
index 0000000000000..d00cde76e1945
--- /dev/null
+++ b/media/com_templates/js/admin-template-compare.min.js
@@ -0,0 +1 @@
+document.addEventListener("DOMContentLoaded",function(){var e=function(e,t){var a=t.nextElementSibling,n="",l=null,s=JsDiff.diffLines(e.innerHTML,t.innerHTML),o=document.createDocumentFragment();s.forEach(function(e){var t,a;n=e.added?"#a6f3a6":e.removed?"#f8cbcb":"",(l=document.createElement("pre")).style.backgroundColor=n,l.className="diffview",l.appendChild(document.createTextNode((t=e.value,a={"&amp;":"&","&#038;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#039;":"'","&#8217;":"’","&#8216;":"‘","&#8211;":"–","&#8212;":"—","&#8230;":"…","&#8221;":"”"},t.replace(/\&[\w\d\#]{2,5}\;/g,function(e){return a[e]})))),o.appendChild(l)}),a.appendChild(o)},t=document.getElementById("override-pane"),a=document.getElementById("core-pane"),n=document.getElementById("diff-main"),l=[].slice.call(document.querySelectorAll("[onclick-task]")),s=document.getElementById("conditional-section");0!==l.length?(l.forEach(function(e){e.addEventListener("click",function(e){e.preventDefault(),function(e){var l=e.target.getAttribute("onclick-task");if("template.show.core"===l){if(a){"none"===a.style.display?(e.target.className="btn btn-success",e.target.innerHTML=Joomla.JText._("COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE"),a.style.display="block",t.className="col-md-6",Joomla.editors.instances.jform_core.refresh()):(e.target.className="btn btn-danger",e.target.innerHTML=Joomla.JText._("COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE"),a.style.display="none",t.className="col-md-12");var s={class:e.target.className,title:e.target.innerHTML,display:a.style.display,overrideClass:t.className};"undefined"!=typeof Storage&&localStorage.setItem("coreButtonState",JSON.stringify(s))}}else if("template.show.diff"===l&&n){"none"===n.style.display?(e.target.className="btn btn-success",e.target.innerHTML=Joomla.JText._("COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF"),n.style.display="block"):(e.target.className="btn btn-danger",e.target.innerHTML=Joomla.JText._("COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF"),n.style.display="none");var o={class:e.target.className,title:e.target.innerHTML,display:n.style.display};"undefined"!=typeof Storage&&localStorage.setItem("diffButtonState",JSON.stringify(o))}}(e)})}),function(){if("undefined"!=typeof Storage){var e=JSON.parse(localStorage.getItem("coreButtonState")),s=JSON.parse(localStorage.getItem("diffButtonState"));null!==e&&(l[0].className=e.class,l[0].innerHTML=e.title,a.style.display=e.display,t.className=e.overrideClass),null!==s&&(l[1].className=s.class,l[1].innerHTML=s.title,n.style.display=s.display)}}()):t&&s&&(s.className="col-md-12",t.className="col-md-12");for(var o=[].slice.call(document.querySelectorAll("#original")),i=0,r=o.length;i<r;i+=1)e(o[i],o[i].nextElementSibling)});
\ No newline at end of file

From 15e5620fc7ad9993852c98d7b5fe43e8d794125a Mon Sep 17 00:00:00 2001
From: Astrid <astridx@users.noreply.github.com>
Date: Mon, 18 Jun 2018 13:18:01 +0200
Subject: [PATCH 09/79] coding standard (#17)

---
 administrator/components/com_templates/forms/source.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_templates/forms/source.xml b/administrator/components/com_templates/forms/source.xml
index 8aceade76c3d6..a61fdf9e711f4 100644
--- a/administrator/components/com_templates/forms/source.xml
+++ b/administrator/components/com_templates/forms/source.xml
@@ -35,7 +35,7 @@
 			cols="80"
 			syntax="php"
 			filter="raw"
-		        readonly="true"
+			readonly="true"
 		/>
 	</fieldset>
 </form>

From d370e946fb1666bf0d2d42f19370ea80f55f6986 Mon Sep 17 00:00:00 2001
From: Anurag <30978328+Anu1601CS@users.noreply.github.com>
Date: Tue, 19 Jun 2018 02:26:06 +0530
Subject: [PATCH 10/79] fix diff (#18) Fix bug in path in case of administrator
 template override.

Fix bug in path in case of administrator template override.
---
 administrator/components/com_templates/Model/TemplateModel.php  | 1 +
 .../components/com_templates/tmpl/template/default.php          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index a47b4513bce33..8fadc4f6523a8 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -604,6 +604,7 @@ public function &getSource()
 				$item->extension_id = $this->getState('extension.id');
 				$item->filename = $fileName;
 				$item->source = file_get_contents($filePath);
+				$item->filePath = $filePath;
 
 				if ($coreFile = $this->getCoreFile($fileName, $this->template->client_id))
 				{
diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index b3d96acebc143..ed53d037152ef 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -116,7 +116,7 @@
 				</div>
 				<?php if (!empty($this->source->coreFile)) : ?>
 					<?php $coreFileContent = file_get_contents($this->source->coreFile); ?>
-					<?php $overrideFileContent = file_get_contents(JPATH_SITE . '/templates/' . $this->template->element . $this->source->filename); ?>
+					<?php $overrideFileContent = file_get_contents($this->source->filePath); ?>
 					<div style="display:none" class="col-md-6" id="core-pane">
 						<p class="lead"><?php echo JText::_('COM_TEMPLATES_FILE_CORE_PANE'); ?></p>
 						<div class="editor-border">

From a94d3ba58c37ea62a6c7172d59f957894cd30ef2 Mon Sep 17 00:00:00 2001
From: Anurag <30978328+Anu1601CS@users.noreply.github.com>
Date: Fri, 22 Jun 2018 15:45:52 +0530
Subject: [PATCH 11/79] Notification after update and TEST (#16)

Find changed files of overridden files and show message.
---
 .../com_installer/Model/UpdateModel.php       |   3 +
 .../com_joomlaupdate/Model/UpdateModel.php    |  22 +-
 .../com_templates/Model/TemplateModel.php     | 166 ++++++++++++
 .../en-GB/en-GB.plg_installer_override.ini    |   8 +
 .../en-GB.plg_installer_override.sys.ini      |   7 +
 installation/sql/mysql/joomla.sql             |   1 +
 installation/sql/postgresql/joomla.sql        |   1 +
 plugins/installer/override/override.php       | 254 ++++++++++++++++++
 plugins/installer/override/override.xml       |  19 ++
 9 files changed, 478 insertions(+), 3 deletions(-)
 create mode 100644 administrator/language/en-GB/en-GB.plg_installer_override.ini
 create mode 100644 administrator/language/en-GB/en-GB.plg_installer_override.sys.ini
 create mode 100644 plugins/installer/override/override.php
 create mode 100644 plugins/installer/override/override.xml

diff --git a/administrator/components/com_installer/Model/UpdateModel.php b/administrator/components/com_installer/Model/UpdateModel.php
index ad8bb2ad26c07..b32849e83e6a9 100644
--- a/administrator/components/com_installer/Model/UpdateModel.php
+++ b/administrator/components/com_installer/Model/UpdateModel.php
@@ -397,6 +397,9 @@ public function update($uids, $minimum_stability = \JUpdater::STABILITY_STABLE)
 	 */
 	private function install($update)
 	{
+		// Load overrides plugin.
+		PluginHelper::importPlugin('installer');
+
 		$app = \JFactory::getApplication();
 
 		if (!isset($update->get('downloadurl')->_data))
diff --git a/administrator/components/com_joomlaupdate/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/Model/UpdateModel.php
index 4fcc96e30ef0a..aee8602681072 100644
--- a/administrator/components/com_joomlaupdate/Model/UpdateModel.php
+++ b/administrator/components/com_joomlaupdate/Model/UpdateModel.php
@@ -385,7 +385,8 @@ protected function downloadPackage($url, $target)
 	}
 
 	/**
-	 * Create restoration file.
+	 * Create restoration file and trigger onJoomlaBeforeUpdate event, which find the updated core files
+	 * which have changed during the update, where there are override for.
 	 *
 	 * @param   string  $basename  Optional base path to the file.
 	 *
@@ -395,11 +396,17 @@ protected function downloadPackage($url, $target)
 	 */
 	public function createRestorationFile($basename = null)
 	{
+		// Load overrides plugin.
+		\JPluginHelper::importPlugin('installer');
+
 		// Get a password
 		$password = \JUserHelper::genRandomPassword(32);
 		$app = \JFactory::getApplication();
 		$app->setUserState('com_joomlaupdate.password', $password);
 
+		// Trigger on before joomla event.
+		$app->triggerEvent('onJoomlaBeforeUpdate');
+
 		// Do we have to use FTP?
 		$method = \JFactory::getApplication()->getUserStateFromRequest('com_joomlaupdate.method', 'method', 'direct', 'cmd');
 
@@ -822,7 +829,8 @@ public function finaliseUpgrade()
 	}
 
 	/**
-	 * Removes the extracted package file.
+	 * Removes the extracted package file and trigger onJoomlaAfterUpdate event, which find the updated core files
+	 * which have changed during the update, where there are override for.
 	 *
 	 * @return  void
 	 *
@@ -830,11 +838,19 @@ public function finaliseUpgrade()
 	 */
 	public function cleanUp()
 	{
+		// Load overrides plugin.
+		\JPluginHelper::importPlugin('installer');
+
+		$app = \JFactory::getApplication();
+
+		// Trigger on before joomla event.
+		$app->triggerEvent('onJoomlaAfterUpdate');
+
 		// Remove the update package.
 		$config = \JFactory::getConfig();
 		$tempdir = $config->get('tmp_path');
 
-		$file = \JFactory::getApplication()->getUserState('com_joomlaupdate.file', null);
+		$file = $app->getUserState('com_joomlaupdate.file', null);
 		$target = $tempdir . '/' . $file;
 
 		if (!@unlink($target))
diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index 8fadc4f6523a8..ab2a039644cf5 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -67,6 +67,172 @@ protected function getFile($path, $name)
 		}
 	}
 
+	/**
+	 * Method to store file information.
+	 *
+	 * @param   string   $path      The base path.
+	 * @param   string   $name      The file name.
+	 * @param   integer  $client    The client id.
+	 * @param   string   $template  The template element.
+	 *
+	 * @return  object  StdClass object.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function storeFileInfo($path, $name, $client, $template)
+	{
+		$temp = new \stdClass;
+		$temp->name = $name;
+		$temp->id = urlencode(base64_encode($path . $name));
+		$temp->client = $client;
+		$temp->template = $template;
+
+		if ($coreFile = $this->getCoreFile($path . $name, $client))
+		{
+			$temp->modifiedDate = date("F d Y H:i:s.", filemtime($coreFile));
+			$temp->coreFile = md5_file($coreFile);
+		}
+		else
+		{
+			$temp->modifiedDate = null;
+			$temp->coreFile = null;
+		}
+
+		return $temp;
+	}
+
+	/**
+	 * Method to get all template list.
+	 *
+	 * @return  object  stdClass object
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getTemplateList()
+	{
+		// Get a db connection.
+		$db = Factory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.extension_id, a.name, a.element, a.client_id'
+			)
+		);
+
+		$query->from($db->quoteName('#__extensions', 'a'))
+			->where($db->quoteName('a.enabled') . ' = 1')
+			->where($db->quoteName('a.type') . ' = ' . $db->quote('template'));
+
+		// Reset the query.
+		$db->setQuery($query);
+
+		// Load the results as a list of stdClass objects.
+		$results = $db->loadObjectList();
+
+		return $results;
+	}
+
+	/**
+	 * Method to get a list of all the core files of override files.
+	 *
+	 * @return  array  A array of all core files.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getCoreList()
+	{
+		// Get list of all templates
+		$templates = $this->getTemplateList();
+
+		// Intialize the array variable to store core file list.
+		$this->coreFileList = array();
+
+		$app    = Factory::getApplication();
+
+		foreach ($templates as $template)
+		{
+			$client  = ApplicationHelper::getClientInfo($template->client_id);
+			$element = Path::clean($client->path . '/templates/' . $template->element . '/');
+			$path    = Path::clean($element . 'html/');
+
+			if (is_dir($path))
+			{
+				$this->prepareCoreFiles($path, $template->client_id, $element, $template->element);
+			}
+			else
+			{
+				$app->enqueueMessage(Text::_('COM_TEMPLATES_ERROR_TEMPLATE_FOLDER_NOT_FOUND'), 'error');
+
+				return false;
+			}
+		}
+
+		// Sort list of stdClass array.
+		usort(
+			$this->coreFileList,
+			function ($a, $b)
+			{
+				return strcmp($a->id, $b->id);
+			}
+		);
+
+		return $this->coreFileList;
+	}
+
+	/**
+	 * Prepare core files.
+	 *
+	 * @param   string   $dir       The path of the directory to scan.
+	 * @param   integer  $client    The client id.
+	 * @param   string   $element   The path of the template element.
+	 * @param   string   $template  The name of template.
+	 *
+	 * @return  array
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function prepareCoreFiles($dir, $client, $element, $template)
+	{
+		$dirFiles = scandir($dir);
+
+		foreach ($dirFiles as $key => $value)
+		{
+			if (in_array($value, array('.', '..', 'node_modules')))
+			{
+				continue;
+			}
+
+			if (is_dir($dir . $value))
+			{
+				$relativePath = str_replace($element, '', $dir . $value);
+				$this->prepareCoreFiles($dir . $value . '/', $client, $element, $template);
+			}
+			else
+			{
+				$ext           = pathinfo($dir . $value, PATHINFO_EXTENSION);
+				$allowedFormat = $this->checkFormat($ext);
+
+				if ($allowedFormat == true)
+				{
+					$relativePath = str_replace($element, '', $dir);
+					$info = $this->storeFileInfo('/' . $relativePath, $value, $client, $template);
+
+					if($info)
+					{
+						$this->coreFileList[] = $info;
+					}
+				}
+			}
+		}
+
+		return;
+	}
+
 	/**
 	 * Method to get a list of all the files to edit in a template.
 	 *
diff --git a/administrator/language/en-GB/en-GB.plg_installer_override.ini b/administrator/language/en-GB/en-GB.plg_installer_override.ini
new file mode 100644
index 0000000000000..85a7677121e33
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_installer_override.ini
@@ -0,0 +1,8 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 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
+
+PLG_INSTALLER_OVERRIDE="Installer - Override"
+PLG_INSTALLER_OVERRIDE_PLUGIN_XML_DESCRIPTION="The system overrides plugin enables notifications and handling of overrides after an update in case of differences."
+PLG_INSTALLER_OVERRIDE_FILE_UPDATED="%s Override(s) core file updated."
diff --git a/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini b/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini
new file mode 100644
index 0000000000000..92d49ef41f7e7
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 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
+
+PLG_INSTALLER_OVERRIDE="Installer - Override"
+PLG_INSTALLER_OVERRIDE_PLUGIN_XML_DESCRIPTION="The system overrides plugin enables notifications and handling of overrides after an update in case of differences."
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index 2bac80ad736aa..302d2e4338032 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -643,6 +643,7 @@ INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `elem
 (486, 0, 'plg_installer_webinstaller', 'plugin', 'webinstaller', 'installer', 0, 1, 1, 0, '', '{"tab_position":"1"}', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (487, 0, 'plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (488, 0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
+(489, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 4, 0, ''),
 (509, 0, 'atum', 'template', 'atum', '', 1, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (510, 0, 'cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '', '{"logoFile":"","fluidContainer":"0","sidebarLeftWidth":"3","sidebarRightWidth":"3"}', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (600, 802, 'English (en-GB)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index d49d12f5fa1ad..fb71314203043 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -655,6 +655,7 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem
 (486, 0, 'plg_installer_webinstaller', 'plugin', 'webinstaller', 'installer', 0, 1, 1, 0, '', '{"tab_position":"1"}', 0, '1970-01-01 00:00:00', 0, 0, ''),
 (487, 0, 'plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0, ''),
 (488, 0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
+(489, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 4, 0, ''),
 (600, 802, 'English (en-GB)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0, ''),
 (601, 802, 'English (en-GB)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0, ''),
 (700, 0, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0, ''),
diff --git a/plugins/installer/override/override.php b/plugins/installer/override/override.php
new file mode 100644
index 0000000000000..1f2877b2be689
--- /dev/null
+++ b/plugins/installer/override/override.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Overrides.Override
+ *
+ * @copyright   Copyright (C) 2005 - 2018 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\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Factory;
+
+/**
+ * Override Plugin
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class PlgInstallerOverride extends CMSPlugin
+{
+
+	/**
+	 * Application object.
+	 *
+	 */
+	protected $app;
+
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 *
+	 * @since  3.6.0
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Method to get com_templates model instance.
+	 *
+	 * @param   string  $name    The model name. Optional
+	 * @param   string  $prefix  The class prefix. Optional
+	 *
+	 * @return  \Joomla\CMS\MVC\Model\BaseDatabaseModel The model.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getModel($name = 'Template', $prefix = 'Administrator')
+	{
+		$app = Factory::getApplication();
+		$model = $app->bootComponent('com_templates')->createMVCFactory($app)->createModel($name, $prefix);
+
+		return $model;
+	}
+
+	/**
+	 * Purges session array.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function purge()
+	{
+		// Delete stored session value.
+		$session = Factory::getSession();
+		$session->clear('override.beforeEventFiles');
+		$session->clear('override.afterEventFiles');
+	}
+
+	/**
+	 * Method to store files before event.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function storeBeforeEventFiles()
+	{
+		// Get session instance.
+		$session = Factory::getSession();
+
+		// Delete stored session value.
+		$this->purge();
+
+		// Get list and store in session.
+		$list = $this->getOverrideCoreList();
+		$session->set('override.beforeEventFiles', $list);
+	}
+
+	/**
+	 * Method to store files after event.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function storeAfterEventFiles()
+	{
+		// Get session instance
+		$session = Factory::getSession();
+
+		// Get list and store in session.
+		$list = $this->getOverrideCoreList();
+		$session->set('override.afterEventFiles', $list);
+	}
+
+	/**
+	 * Method to prepare changed or updated core file.
+	 *
+	 * @return   array  A list of changed files.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getUpdatedFiles()
+	{
+		// Get session instance
+		$session = Factory::getSession();
+
+		$after  = $session->get('override.afterEventFiles');
+		$before = $session->get('override.beforeEventFiles');
+		$size1  = count($after);
+		$size2  = count($before);
+
+		$result = null;
+
+		if ($size1 === $size2)
+		{
+			$result = array();
+
+			for ($i = 0; $i <= $size1; $i++)
+			{
+				if ($after[$i]->coreFile !== $before[$i]->coreFile)
+				{
+					$result[] = $after[$i];
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Method to get core list of override files.
+	 *
+	 * @return   array  The list of core files.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getOverrideCoreList()
+	{
+		// Get template model
+		$templateModel = $this->getModel();
+		$result = $templateModel->getCoreList();
+
+		return $result;
+	}
+
+	/**
+	 * Event before extension update.
+	 *
+	 * @return   void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function onExtensionBeforeUpdate()
+	{
+		$this->storeBeforeEventFiles();
+	}
+
+	/**
+	 * Event after extension update.
+	 *
+	 * @return   void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function onExtensionAfterUpdate()
+	{
+		$this->storeAfterEventFiles();
+		$results = $this->getUpdatedFiles();
+		$num = count($results);
+
+		if ($num != 0)
+		{
+			$span = '<span class="badge badge-light">' . $num . '</span>';
+			$this->app->enqueueMessage(\JText::sprintf('PLG_INSTALLER_OVERRIDE_FILE_UPDATED', $span), 'notice');
+		}
+	}
+
+	/**
+	 * Event before joomla update.
+	 *
+	 * @return   void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function onJoomlaBeforeUpdate()
+	{
+		$this->storeBeforeEventFiles();
+	}
+
+	/**
+	 * Event after joomla update.
+	 *
+	 * @return   void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function onJoomlaAfterUpdate()
+	{
+		$this->storeAfterEventFiles();
+		$results = $this->getUpdatedFiles();
+		$num = count($results);
+
+		if ($num != 0)
+		{
+			$span = '<span class="badge badge-light">' . $num . '</span>';
+			$this->app->enqueueMessage(\JText::sprintf('PLG_INSTALLER_OVERRIDE_FILE_UPDATED', $span), 'notice');
+		}
+	}
+
+	/**
+	 * Event before install.
+	 *
+	 * @return   void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function onInstallerBeforeInstaller()
+	{
+		$this->storeBeforeEventFiles();
+	}
+
+	/**
+	 * Event after install.
+	 *
+	 * @return   void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function onInstallerAfterInstaller()
+	{
+		$this->storeAfterEventFiles();
+		$results = $this->getUpdatedFiles();
+		$num = count($results);
+
+		if ($num != 0)
+		{
+			$span = '<span class="badge badge-light">' . $num . '</span>';
+			$this->app->enqueueMessage(\JText::sprintf('PLG_INSTALLER_OVERRIDE_FILE_UPDATED', $span), 'notice');
+		}
+	}
+}
diff --git a/plugins/installer/override/override.xml b/plugins/installer/override/override.xml
new file mode 100644
index 0000000000000..3f4f155966b45
--- /dev/null
+++ b/plugins/installer/override/override.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="4.0" type="plugin" group="installer" method="upgrade">
+	<name>plg_installer_override</name>
+	<author>Joomla! Project</author>
+	<creationDate>June 2018</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 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>4.0.0</version>
+	<description>PLG_INSTALLER_OVERRIDE_PLUGIN_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="override">override.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_installer_override.ini</language>
+		<language tag="en-GB">en-GB.plg_installer_override.sys.ini</language>
+	</languages>
+</extension>

From 13b6e01ee115675e949c0a15416323ef260ecf4f Mon Sep 17 00:00:00 2001
From: Astrid <astridx@users.noreply.github.com>
Date: Mon, 25 Jun 2018 13:54:53 +0200
Subject: [PATCH 12/79] coding standard (#21)

---
 .../components/com_templates/Model/TemplateModel.php        | 6 +++---
 plugins/installer/override/override.php                     | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index ab2a039644cf5..08e7bfa89fd12 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -217,12 +217,12 @@ public function prepareCoreFiles($dir, $client, $element, $template)
 				$ext           = pathinfo($dir . $value, PATHINFO_EXTENSION);
 				$allowedFormat = $this->checkFormat($ext);
 
-				if ($allowedFormat == true)
+				if ($allowedFormat === true)
 				{
 					$relativePath = str_replace($element, '', $dir);
 					$info = $this->storeFileInfo('/' . $relativePath, $value, $client, $template);
 
-					if($info)
+					if ($info)
 					{
 						$this->coreFileList[] = $info;
 					}
@@ -458,7 +458,7 @@ private function validateDate($date)
 		$format = 'Ymd-His';
 		$valid  = Date::createFromFormat($format, $date);
 
-		return $valid && $valid->format($format) == $date;
+		return $valid && $valid->format($format) === $date;
 	}
 
 	/**
diff --git a/plugins/installer/override/override.php b/plugins/installer/override/override.php
index 1f2877b2be689..1c02951720562 100644
--- a/plugins/installer/override/override.php
+++ b/plugins/installer/override/override.php
@@ -19,7 +19,6 @@
  */
 class PlgInstallerOverride extends CMSPlugin
 {
-
 	/**
 	 * Application object.
 	 *

From b93b118cca7785b2619b0f956af71d9003c9df06 Mon Sep 17 00:00:00 2001
From: astridx <info@astrid-guenther.de>
Date: Mon, 25 Jun 2018 23:44:46 +0200
Subject: [PATCH 13/79] correction

---
 plugins/installer/override/override.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/installer/override/override.php b/plugins/installer/override/override.php
index 1c02951720562..40958096a7d0e 100644
--- a/plugins/installer/override/override.php
+++ b/plugins/installer/override/override.php
@@ -121,13 +121,11 @@ public function getUpdatedFiles()
 		$size1  = count($after);
 		$size2  = count($before);
 
-		$result = null;
+		$result = array();
 
 		if ($size1 === $size2)
 		{
-			$result = array();
-
-			for ($i = 0; $i <= $size1; $i++)
+			for ($i = 0; $i < $size1; $i++)
 			{
 				if ($after[$i]->coreFile !== $before[$i]->coreFile)
 				{

From fc5702aa91676c4d44fa963d86b325cad01ea30c Mon Sep 17 00:00:00 2001
From: Astrid <astridx@users.noreply.github.com>
Date: Tue, 26 Jun 2018 13:14:25 +0200
Subject: [PATCH 14/79] correction (#26)

---
 plugins/installer/override/override.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/installer/override/override.php b/plugins/installer/override/override.php
index 1c02951720562..40958096a7d0e 100644
--- a/plugins/installer/override/override.php
+++ b/plugins/installer/override/override.php
@@ -121,13 +121,11 @@ public function getUpdatedFiles()
 		$size1  = count($after);
 		$size2  = count($before);
 
-		$result = null;
+		$result = array();
 
 		if ($size1 === $size2)
 		{
-			$result = array();
-
-			for ($i = 0; $i <= $size1; $i++)
+			for ($i = 0; $i < $size1; $i++)
 			{
 				if ($after[$i]->coreFile !== $before[$i]->coreFile)
 				{

From d647097ec3cb772a55bf5547e37d5954d4012014 Mon Sep 17 00:00:00 2001
From: Astrid <astridx@users.noreply.github.com>
Date: Fri, 29 Jun 2018 16:58:17 +0200
Subject: [PATCH 15/79] Correcthtmlpath (#27)

* correction

* change oldhtml to newhtml
---
 .../components/com_templates/Model/TemplateModel.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index 08e7bfa89fd12..b53a973d5ac97 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -366,14 +366,14 @@ public function getCoreFile($file, $client_id)
 			$subFolder = $explodeArray['3'];
 			$fileName  = $this->getSafeName($fileName);
 
-			// The old scheme, if a view has a tmpl folder
-			$oldHtmlPath = Path::clean($componentPath . $folder . '/views/' . $subFolder . '/tmpl/');
+			// The new scheme, if a view has a tmpl folder
+			$newHtmlPath = Path::clean($componentPath . $folder . '/tmpl/' . $subFolder . '/');
 
-			if (!$coreFile = Path::find($oldHtmlPath, $fileName))
+			if (!$coreFile = Path::find($newHtmlPath, $fileName))
 			{
-				// The new scheme, the views are directly in the component/tmpl folder
-				$newHtmlPath = Path::clean($componentPath . $folder . '/tmpl/' . $subFolder . '/');
-				$coreFile    = Path::find($newHtmlPath, $fileName);
+				// The old scheme, the views are directly in the component/tmpl folder
+				$oldHtmlPath = Path::clean($componentPath . $folder . '/views/' . $subFolder . '/tmpl/');
+				$coreFile    = Path::find($oldHtmlPath, $fileName);
 
 				return $coreFile;
 			}

From 4d8378ab1bfcc29fb04c6eae49accbeb2158ce4c Mon Sep 17 00:00:00 2001
From: Anurag <30978328+Anu1601CS@users.noreply.github.com>
Date: Wed, 11 Jul 2018 16:23:41 +0530
Subject: [PATCH 16/79] List of updated override files. (#30)

---
 .../com_templates/Model/TemplateModel.php     |  34 ++---
 .../com_templates/View/Template/HtmlView.php  |  29 ++--
 .../com_templates/tmpl/template/default.php   |   7 +
 .../tmpl/template/default_updated_files.php   |  75 ++++++++++
 .../language/en-GB/en-GB.com_templates.ini    |   6 +
 .../en-GB/en-GB.plg_installer_override.ini    |   1 +
 .../en-GB.plg_installer_override.sys.ini      |   1 +
 installation/sql/mysql/joomla.sql             |   2 +-
 installation/sql/postgresql/joomla.sql        |   2 +-
 plugins/installer/override/override.php       | 140 +++++++++++++++---
 plugins/installer/override/override.xml       |  25 ++++
 11 files changed, 269 insertions(+), 53 deletions(-)
 create mode 100644 administrator/components/com_templates/tmpl/template/default_updated_files.php

diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index b53a973d5ac97..9523b1b864ebd 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -70,24 +70,23 @@ protected function getFile($path, $name)
 	/**
 	 * Method to store file information.
 	 *
-	 * @param   string   $path      The base path.
-	 * @param   string   $name      The file name.
-	 * @param   integer  $client    The client id.
-	 * @param   string   $template  The template element.
+	 * @param   string    $path      The base path.
+	 * @param   string    $name      The file name.
+	 * @param   stdClass  $template  The std class object of template.
 	 *
 	 * @return  object  StdClass object.
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
-	protected function storeFileInfo($path, $name, $client, $template)
+	protected function storeFileInfo($path, $name, $template)
 	{
 		$temp = new \stdClass;
-		$temp->name = $name;
-		$temp->id = urlencode(base64_encode($path . $name));
-		$temp->client = $client;
-		$temp->template = $template;
+		$temp->id = base64_encode($path . $name);
+		$temp->client = $template->client_id;
+		$temp->template = $template->element;
+		$temp->extension_id = $template->extension_id;
 
-		if ($coreFile = $this->getCoreFile($path . $name, $client))
+		if ($coreFile = $this->getCoreFile($path . $name, $template->client_id))
 		{
 			$temp->modifiedDate = date("F d Y H:i:s.", filemtime($coreFile));
 			$temp->coreFile = md5_file($coreFile);
@@ -162,7 +161,7 @@ public function getCoreList()
 
 			if (is_dir($path))
 			{
-				$this->prepareCoreFiles($path, $template->client_id, $element, $template->element);
+				$this->prepareCoreFiles($path, $element, $template);
 			}
 			else
 			{
@@ -187,16 +186,15 @@ function ($a, $b)
 	/**
 	 * Prepare core files.
 	 *
-	 * @param   string   $dir       The path of the directory to scan.
-	 * @param   integer  $client    The client id.
-	 * @param   string   $element   The path of the template element.
-	 * @param   string   $template  The name of template.
+	 * @param   string    $dir       The path of the directory to scan.
+	 * @param   string    $element   The path of the template element.
+	 * @param   stdClass  $template  The stdClass object of template.
 	 *
 	 * @return  array
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
-	public function prepareCoreFiles($dir, $client, $element, $template)
+	public function prepareCoreFiles($dir, $element, $template)
 	{
 		$dirFiles = scandir($dir);
 
@@ -210,7 +208,7 @@ public function prepareCoreFiles($dir, $client, $element, $template)
 			if (is_dir($dir . $value))
 			{
 				$relativePath = str_replace($element, '', $dir . $value);
-				$this->prepareCoreFiles($dir . $value . '/', $client, $element, $template);
+				$this->prepareCoreFiles($dir . $value . '/', $element, $template);
 			}
 			else
 			{
@@ -220,7 +218,7 @@ public function prepareCoreFiles($dir, $client, $element, $template)
 				if ($allowedFormat === true)
 				{
 					$relativePath = str_replace($element, '', $dir);
-					$info = $this->storeFileInfo('/' . $relativePath, $value, $client, $template);
+					$info = $this->storeFileInfo('/' . $relativePath, $value, $template);
 
 					if ($info)
 					{
diff --git a/administrator/components/com_templates/View/Template/HtmlView.php b/administrator/components/com_templates/View/Template/HtmlView.php
index c3d84729829a9..190c5322eb0d6 100644
--- a/administrator/components/com_templates/View/Template/HtmlView.php
+++ b/administrator/components/com_templates/View/Template/HtmlView.php
@@ -11,6 +11,7 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 
 /**
@@ -116,6 +117,15 @@ class HtmlView extends BaseHtmlView
 	 */
 	protected $archive;
 
+	/**
+	 * The state of installer override plugin.
+	 *
+	 * @var  array
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $pluginState;
+
 	/**
 	 * Execute and display a template script.
 	 *
@@ -125,15 +135,16 @@ class HtmlView extends BaseHtmlView
 	 */
 	public function display($tpl = null)
 	{
-		$app            = \JFactory::getApplication();
-		$this->file     = $app->input->get('file');
-		$this->fileName = \JFilterInput::getInstance()->clean(base64_decode($this->file), 'string');
-		$explodeArray   = explode('.', $this->fileName);
-		$ext            = end($explodeArray);
-		$this->files    = $this->get('Files');
-		$this->state    = $this->get('State');
-		$this->template = $this->get('Template');
-		$this->preview  = $this->get('Preview');
+		$app               = \JFactory::getApplication();
+		$this->file        = $app->input->get('file');
+		$this->fileName    = \JFilterInput::getInstance()->clean(base64_decode($this->file), 'string');
+		$explodeArray      = explode('.', $this->fileName);
+		$ext               = end($explodeArray);
+		$this->files       = $this->get('Files');
+		$this->state       = $this->get('State');
+		$this->template    = $this->get('Template');
+		$this->preview     = $this->get('Preview');
+		$this->pluginState = PluginHelper::isEnabled('installer', 'override');
 
 		$params       = ComponentHelper::getParams('com_templates');
 		$imageTypes   = explode(',', $params->get('image_formats'));
diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index ed53d037152ef..5377cfbf25840 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -303,6 +303,13 @@
 <?php echo JHtml::_('bootstrap.addTab', 'myTab', 'description', JText::_('COM_TEMPLATES_TAB_DESCRIPTION')); ?>
 <?php echo $this->loadTemplate('description'); ?>
 <?php echo JHtml::_('bootstrap.endTab'); ?>
+
+<?php if ($this->pluginState) : ?>
+	<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'files', JText::_('COM_TEMPLATES_TAB_UPDATED_FILES')); ?>
+	<?php echo $this->loadTemplate('updated_files'); ?>
+	<?php echo JHtml::_('bootstrap.endTab'); ?>
+<?php endif; ?>
+
 <?php echo JHtml::_('bootstrap.endTabSet'); ?>
 
 <?php // Collapse Modal
diff --git a/administrator/components/com_templates/tmpl/template/default_updated_files.php b/administrator/components/com_templates/tmpl/template/default_updated_files.php
new file mode 100644
index 0000000000000..ab836b7d2946e
--- /dev/null
+++ b/administrator/components/com_templates/tmpl/template/default_updated_files.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_templates
+ *
+ * @copyright   Copyright (C) 2005 - 2018 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\CMS\Plugin\PluginHelper;
+use Joomla\Registry\Registry;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Filesystem\Path;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Application\ApplicationHelper;
+
+$plugin = PluginHelper::getPlugin('installer', 'override');
+$params = new Registry($plugin->params);
+$result = json_decode($params->get('overridefiles'), JSON_HEX_QUOT);
+?>
+
+<div class="row">
+	<div class="col-md-12">
+		<table class="table table-striped">
+			<thead>
+				<tr>
+					<th style="width:25%">
+						<?php echo Text::_('COM_TEMPLATES_OVERRIDE_TEMPLATE_FILE'); ?>
+					</th>
+					<th>
+						<?php echo Text::_('COM_TEMPLATES_OVERRIDE_MODIFIED_DATE'); ?>
+					</th>
+					<th>
+						<?php echo Text::_('COM_TEMPLATES_OVERRIDE_ACTION'); ?>
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				<?php $flag = 0; ?>
+				<?php foreach ($result as $values) : ?>
+					<?php foreach ($values as $value) : ?>
+						<?php $client = ApplicationHelper::getClientInfo($value['client']); ?>
+						<?php $path = $client->path . '/templates/' . $value['template'] . base64_decode($value['id']); ?>
+						<?php if (file_exists($path) && $this->template->extension_id === $value['extension_id']) : ?>
+							<?php $flag = 1; ?>
+							<tr>
+								<td>
+									<a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_templates&view=template&id=' . (int) $value['extension_id'] . '&file=' . $value['id']); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?>"><?php echo base64_decode($value['id']); ?></a>
+								</td>
+								<td>
+									<?php if (empty($value['modifiedDate'])) : ?>
+										<span class="badge badge-warning"><?php echo Text::_('COM_TEMPLATES_OVERRIDE_CORE_REMOVED'); ?></span>
+									<?php else : ?>
+										<?php echo $value['modifiedDate']; ?>
+									<?php endif; ?>
+								</td>
+								<td>
+									<span class="badge badge-info"><?php echo $value['action']; ?></span>
+								</td>
+							</tr>
+						<?php endif; ?>
+					<?php endforeach; ?>
+				<?php endforeach; ?>
+			</tbody>
+		</table>
+		<?php if(!$flag || count($result) === 0) : ?>
+			<joomla-alert type="success" role="alert" class="joomla-alert--show">
+				<span class="icon-info" aria-hidden="true"></span>
+				<?php echo Text::sprintf('COM_TEMPLATES_OVERRIDE_UPTODATE', $params->get('numupdate')); ?>
+			</joomla-alert>
+		<?php endif; ?>
+	</div>
+</div>
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index 13903a7cac1a3..5104addc69e8e 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -176,9 +176,14 @@ COM_TEMPLATES_NEW_FILE_TYPE="File Type"
 COM_TEMPLATES_NO_TEMPLATE_SELECTED="No template selected."
 COM_TEMPLATES_OPTION_NONE=":: None ::"
 COM_TEMPLATES_OPTION_SELECT_MENU_ITEM="- Select Menu Item -"
+COM_TEMPLATES_OVERRIDE_ACTION="Update Action"
 COM_TEMPLATES_OVERRIDE_CREATED="Override created in "
+COM_TEMPLATES_OVERRIDE_CORE_REMOVED="Core file removed"
 COM_TEMPLATES_OVERRIDE_FAILED="Failed to create override."
+COM_TEMPLATES_OVERRIDE_MODIFIED_DATE="Modified Date"
 COM_TEMPLATES_OVERRIDE_SUCCESS="Successfully created the override."
+COM_TEMPLATES_OVERRIDE_TEMPLATE_FILE="Template File"
+COM_TEMPLATES_OVERRIDE_UPTODATE="Override files are up to date with core files. Nothing is changed in last %s extension or Joomla update."
 COM_TEMPLATES_OVERRIDES_COMPONENTS="Components"
 COM_TEMPLATES_OVERRIDES_MODULES="Modules"
 COM_TEMPLATES_OVERRIDES_LAYOUTS="Layouts"
@@ -201,6 +206,7 @@ COM_TEMPLATES_SUCCESS_HOME_UNSET="Default style unset."
 COM_TEMPLATES_TAB_DESCRIPTION="Template Description"
 COM_TEMPLATES_TAB_EDITOR="Editor"
 COM_TEMPLATES_TAB_OVERRIDES="Create Overrides"
+COM_TEMPLATES_TAB_UPDATED_FILES="Updated files"
 COM_TEMPLATES_TEMPLATE_CLOSE="Close"
 COM_TEMPLATES_TEMPLATE_COPY="Copy Template"
 COM_TEMPLATES_TEMPLATE_CORE_FILENAME="Core file &quot;%s&quot;."
diff --git a/administrator/language/en-GB/en-GB.plg_installer_override.ini b/administrator/language/en-GB/en-GB.plg_installer_override.ini
index 85a7677121e33..c8ae66c12ffef 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_override.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_override.ini
@@ -6,3 +6,4 @@
 PLG_INSTALLER_OVERRIDE="Installer - Override"
 PLG_INSTALLER_OVERRIDE_PLUGIN_XML_DESCRIPTION="The system overrides plugin enables notifications and handling of overrides after an update in case of differences."
 PLG_INSTALLER_OVERRIDE_FILE_UPDATED="%s Override(s) core file updated."
+PLG_INSTALLER_OVERRIDE_PLUGIN_FIELD_OVERRIDEFILES_LABEL="Updated core files."
diff --git a/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini b/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini
index 92d49ef41f7e7..071cf1858926e 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini
@@ -5,3 +5,4 @@
 
 PLG_INSTALLER_OVERRIDE="Installer - Override"
 PLG_INSTALLER_OVERRIDE_PLUGIN_XML_DESCRIPTION="The system overrides plugin enables notifications and handling of overrides after an update in case of differences."
+PLG_INSTALLER_OVERRIDE_PLUGIN_FIELD_NUMUPDATE="Number of previous update to store"
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index 9d56512c5aaa1..ff2eadc029388 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -662,7 +662,7 @@ INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `elem
 (487, 0, 'plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (488, 0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (489, 0, 'plg_extension_namespacemap', 'plugin', 'namespacemap', 'extension', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0, ''),
-(490, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 4, 0, ''),
+(490, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '{"numupdate":3,"overridefiles":"{}"}', 0, '0000-00-00 00:00:00', 4, 0, ''),
 (491, 0, 'plg_extension_namespacemap', 'plugin', 'namespacemap', 'extension', 0, 1, 1, 1, '', '{}', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (509, 0, 'atum', 'template', 'atum', '', 1, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (510, 0, 'cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '', '{"logoFile":"","fluidContainer":"0","sidebarLeftWidth":"3","sidebarRightWidth":"3"}', 0, '0000-00-00 00:00:00', 0, 0, ''),
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index fff8a522fcf9b..026889b819609 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -675,7 +675,7 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem
 (487, 0, 'plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0, ''),
 (488, 0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (489, 0, 'plg_extension_namespacemap', 'plugin', 'namespacemap', 'extension', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0, ''),
-(490, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 4, 0, ''),
+(490, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '{"numupdate":3,"overridefiles":"{}"}', 0, '1970-01-01 00:00:00', 4, 0, ''),
 (491, 0, 'plg_extension_namespacemap', 'plugin', 'namespacemap', 'extension', 0, 1, 1, 1, '', '{}', 0, '1970-01-01 00:00:00', 0, 0, ''),
 (600, 802, 'English (en-GB)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0, ''),
 (601, 802, 'English (en-GB)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0, ''),
diff --git a/plugins/installer/override/override.php b/plugins/installer/override/override.php
index 40958096a7d0e..f8e1ae7cdafd9 100644
--- a/plugins/installer/override/override.php
+++ b/plugins/installer/override/override.php
@@ -10,6 +10,7 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\Factory;
 
 /**
@@ -30,10 +31,18 @@ class PlgInstallerOverride extends CMSPlugin
 	 *
 	 * @var    boolean
 	 *
-	 * @since  3.6.0
+	 * @since  __DEPLOY_VERSION__
 	 */
 	protected $autoloadLanguage = true;
 
+	/**
+	 * Database object
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $db;
+
 	/**
 	 * Method to get com_templates model instance.
 	 *
@@ -107,11 +116,13 @@ public function storeAfterEventFiles()
 	/**
 	 * Method to prepare changed or updated core file.
 	 *
-	 * @return   array  A list of changed files.
+	 * @param   string  $action  The name of the action.
+	 *
+	 * @return   array   A list of changed files.
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
-	public function getUpdatedFiles()
+	public function getUpdatedFiles($action)
 	{
 		// Get session instance
 		$session = Factory::getSession();
@@ -129,6 +140,8 @@ public function getUpdatedFiles()
 			{
 				if ($after[$i]->coreFile !== $before[$i]->coreFile)
 				{
+					$after[$i]->action = $action;
+					unset($after[$i]->coreFile);
 					$result[] = $after[$i];
 				}
 			}
@@ -153,6 +166,50 @@ public function getOverrideCoreList()
 		return $result;
 	}
 
+	/**
+	 * Last process of this plugin.
+	 *
+	 * @param   array  $result  Result aray.
+	 *
+	 * @return   boolean  True/False
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function finalize($result)
+	{
+		$num = count($result);
+
+		if ($num != 0)
+		{
+			$span = '<span class="badge badge-light">' . $num . '</span>';
+			$this->app->enqueueMessage(Text::sprintf('PLG_INSTALLER_OVERRIDE_FILE_UPDATED', $span), 'notice');
+		}
+
+		$oldData = json_decode($this->params->get('overridefiles'), JSON_HEX_QUOT);
+
+		$results = array();
+		$results[] = $result;
+
+		foreach ($oldData as $value)
+		{
+			if (count($value) !== 0)
+			{
+				$results[] = $value;
+			}
+		}
+
+		$numupdate = (int) $this->params->get('numupdate');
+
+		if (count($results) > $numupdate)
+		{
+			$results = array_slice($results, 0, $numupdate);
+		}
+
+		$this->params->set('overridefiles', json_encode($results, JSON_HEX_QUOT));
+
+		return $this->saveParams();
+	}
+
 	/**
 	 * Event before extension update.
 	 *
@@ -175,14 +232,8 @@ public function onExtensionBeforeUpdate()
 	public function onExtensionAfterUpdate()
 	{
 		$this->storeAfterEventFiles();
-		$results = $this->getUpdatedFiles();
-		$num = count($results);
-
-		if ($num != 0)
-		{
-			$span = '<span class="badge badge-light">' . $num . '</span>';
-			$this->app->enqueueMessage(\JText::sprintf('PLG_INSTALLER_OVERRIDE_FILE_UPDATED', $span), 'notice');
-		}
+		$result = $this->getUpdatedFiles('Extension Update');
+		$this->finalize($result);
 	}
 
 	/**
@@ -207,14 +258,8 @@ public function onJoomlaBeforeUpdate()
 	public function onJoomlaAfterUpdate()
 	{
 		$this->storeAfterEventFiles();
-		$results = $this->getUpdatedFiles();
-		$num = count($results);
-
-		if ($num != 0)
-		{
-			$span = '<span class="badge badge-light">' . $num . '</span>';
-			$this->app->enqueueMessage(\JText::sprintf('PLG_INSTALLER_OVERRIDE_FILE_UPDATED', $span), 'notice');
-		}
+		$result = $this->getUpdatedFiles('Joomla Update');
+		$this->finalize($result);
 	}
 
 	/**
@@ -239,13 +284,60 @@ public function onInstallerBeforeInstaller()
 	public function onInstallerAfterInstaller()
 	{
 		$this->storeAfterEventFiles();
-		$results = $this->getUpdatedFiles();
-		$num = count($results);
+		$result = $this->getUpdatedFiles('Extension Install');
+		$this->finalize($result);
+	}
 
-		if ($num != 0)
+	/**
+	 * Save the plugin parameters
+	 *
+	 * @return  boolean
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	private function saveParams()
+	{
+		$query = $this->db->getQuery(true)
+				->update($this->db->quoteName('#__extensions'))
+				->set($this->db->quoteName('params') . ' = ' . $this->db->quote($this->params->toString('JSON')))
+				->where($this->db->quoteName('type') . ' = ' . $this->db->quote('plugin'))
+				->where($this->db->quoteName('folder') . ' = ' . $this->db->quote('installer'))
+				->where($this->db->quoteName('element') . ' = ' . $this->db->quote('override'));
+
+		try
 		{
-			$span = '<span class="badge badge-light">' . $num . '</span>';
-			$this->app->enqueueMessage(\JText::sprintf('PLG_INSTALLER_OVERRIDE_FILE_UPDATED', $span), 'notice');
+			// Lock the tables to prevent multiple plugin executions causing a race condition
+			$this->db->lockTable('#__extensions');
+		}
+		catch (Exception $e)
+		{
+			// If we can't lock the tables it's too risky to continue execution
+			return false;
+		}
+
+		try
+		{
+			// Update the plugin parameters
+			$result = $this->db->setQuery($query)->execute();
+		}
+		catch (Exception $exc)
+		{
+			// If we failed to execute
+			$this->db->unlockTables();
+			$result = false;
+		}
+
+		try
+		{
+			// Unlock the tables after writing
+			$this->db->unlockTables();
 		}
+		catch (Exception $e)
+		{
+			// If we can't lock the tables assume we have somehow failed
+			$result = false;
+		}
+
+		return $result;
 	}
 }
diff --git a/plugins/installer/override/override.xml b/plugins/installer/override/override.xml
index 3f4f155966b45..c941b7b661df3 100644
--- a/plugins/installer/override/override.xml
+++ b/plugins/installer/override/override.xml
@@ -16,4 +16,29 @@
 		<language tag="en-GB">en-GB.plg_installer_override.ini</language>
 		<language tag="en-GB">en-GB.plg_installer_override.sys.ini</language>
 	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="numupdate"
+					type="list"
+					label="PLG_INSTALLER_OVERRIDE_PLUGIN_FIELD_NUMUPDATE"
+					filter="integer"
+					default="3"
+					required="true"
+					>
+					<option value="3">3</option>
+					<option value="5">5</option>
+					<option value="10">10</option>
+					<option value="15">15</option>
+				</field>
+
+				<field
+					name="overridefiles"
+					type="hidden"
+					label="PLG_INSTALLER_OVERRIDE_PLUGIN_FIELD_OVERRIDEFILES_LABEL"
+				/>
+			</fieldset>
+		</fields>
+	</config>
 </extension>

From 8a7a05cdff0f71647ab22f8afa60cdc7d2d7b469 Mon Sep 17 00:00:00 2001
From: Astrid <astridx@users.noreply.github.com>
Date: Sat, 14 Jul 2018 07:37:47 +0200
Subject: [PATCH 17/79] addcss (#34)

---
 media/com_templates/css/admin-templates-default.css     | 1 +
 media/com_templates/css/admin-templates-default.min.css | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/media/com_templates/css/admin-templates-default.css b/media/com_templates/css/admin-templates-default.css
index 0b6205f1c8921..1e1e53d152f65 100644
--- a/media/com_templates/css/admin-templates-default.css
+++ b/media/com_templates/css/admin-templates-default.css
@@ -45,6 +45,7 @@
 	border: 0.5px solid grey;
 	overflow: auto;
 	padding: 10px;
+	background-color: #FFF;
 }
 
 #core-pane .CodeMirror-code {
diff --git a/media/com_templates/css/admin-templates-default.min.css b/media/com_templates/css/admin-templates-default.min.css
index 36cbbdbdd9759..770ef89830d3e 100644
--- a/media/com_templates/css/admin-templates-default.min.css
+++ b/media/com_templates/css/admin-templates-default.min.css
@@ -1 +1 @@
-.selected{background:#08c;color:#fff}.selected:hover,.selected:focus{background:#08c !important;color:#fff}#deleteFolder{margin:0}#image-crop{max-width:100% !important;width:auto;height:auto}.tree-holder{overflow-x:auto}.treeselect a{display:block}.diffview{white-space:pre-wrap;word-wrap:break-word;display:inline;padding:4px;border-radius:.2em}.diff-pane{height:350px;border:.5px solid grey;overflow:auto;padding:10px}#core-pane .CodeMirror-code{background-color:#f0f0ee}
\ No newline at end of file
+.selected{background:#08c;color:#fff}.selected:hover,.selected:focus{background:#08c !important;color:#fff}#deleteFolder{margin:0}#image-crop{max-width:100% !important;width:auto;height:auto}.tree-holder{overflow-x:auto}.treeselect a{display:block}.diffview{white-space:pre-wrap;word-wrap:break-word;display:inline;padding:4px;border-radius:.2em}.diff-pane{height:350px;border:.5px solid grey;overflow:auto;padding:10px;background-color:#FFF}#core-pane .CodeMirror-code{background-color:#f0f0ee}
\ No newline at end of file

From ef31722708c64e4266b48479158cf6181cc3782b Mon Sep 17 00:00:00 2001
From: Anurag <30978328+Anu1601CS@users.noreply.github.com>
Date: Wed, 18 Jul 2018 14:49:40 +0530
Subject: [PATCH 18/79] Final Product  (#39)

Core and Diff view
Updated override history list.
Quick icon notification plugin.
Override control plugin.
---
 .../others/mysql/utf8mb4-conversion-02.sql    |   4 +-
 .../Controller/TemplateController.php         | 109 +++++++++++
 .../com_templates/Model/TemplateModel.php     | 142 +++++++++++++-
 .../com_templates/View/Template/HtmlView.php  |   6 +
 .../com_templates/tmpl/template/default.php   |  23 ++-
 .../tmpl/template/default_updated_files.php   | 108 ++++++-----
 .../language/en-GB/en-GB.com_templates.ini    |   9 +-
 .../en-GB/en-GB.plg_installer_override.ini    |   1 -
 .../en-GB.plg_installer_override.sys.ini      |   1 -
 .../en-GB.plg_quickicon_overridecheck.ini     |  14 ++
 .../en-GB.plg_quickicon_overridecheck.sys.ini |   7 +
 .../js/toolbar-button/toolbar-button.js       |   4 +-
 installation/sql/mysql/joomla.sql             |  24 ++-
 installation/sql/postgresql/joomla.sql        |  22 ++-
 libraries/cms/html/grid.php                   |  13 +-
 libraries/cms/html/jgrid.php                  |  52 +++--
 .../src/Toolbar/Button/StandardButton.php     |  32 +++-
 libraries/src/Toolbar/ToolbarHelper.php       |   5 +-
 .../js/overridecheck.es6.js                   |  69 +++++++
 .../js/overridecheck.es6.min.js               |   1 +
 .../js/overridecheck.js                       |  74 +++++++
 .../js/overridecheck.min.js                   |   1 +
 media/system/js/core.js                       |  35 +++-
 media/system/js/core.min.js                   |   2 +-
 media/system/js/multiselect.js                |   3 +-
 media/system/js/multiselect.min.js            |   2 +-
 .../js/joomla-toolbar-button-es5.js           |   6 +-
 .../js/joomla-toolbar-button-es5.min.js       |   5 +-
 .../webcomponents/js/joomla-toolbar-button.js |   4 +-
 .../js/joomla-toolbar-button.min.js           |   2 +-
 plugins/installer/override/override.php       | 180 ++++++++++++------
 plugins/installer/override/override.xml       |  25 ---
 .../quickicon/overridecheck/overridecheck.php |  80 ++++++++
 .../quickicon/overridecheck/overridecheck.xml |  32 ++++
 34 files changed, 891 insertions(+), 206 deletions(-)
 create mode 100644 administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
 create mode 100644 administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.sys.ini
 create mode 100644 media/plg_quickicon_overridecheck/js/overridecheck.es6.js
 create mode 100644 media/plg_quickicon_overridecheck/js/overridecheck.es6.min.js
 create mode 100644 media/plg_quickicon_overridecheck/js/overridecheck.js
 create mode 100644 media/plg_quickicon_overridecheck/js/overridecheck.min.js
 create mode 100644 plugins/quickicon/overridecheck/overridecheck.php
 create mode 100644 plugins/quickicon/overridecheck/overridecheck.xml

diff --git a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql
index 4f63f989f60dc..3edcbd3e7978a 100644
--- a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql
+++ b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql
@@ -48,7 +48,7 @@ ALTER TABLE `#__users` MODIFY `name` varchar(400) NOT NULL DEFAULT '';
 --
 -- Step 2.2: Convert all tables to utf8mb4 chracter set with utf8mb4_unicode_ci collation
 -- except #__finder_xxx tables, those will have utf8mb4_general_ci collation.
--- Note: The database driver for mysql will change utf8mb4 to utf8 if utf8mb4 is not supported     
+-- Note: The database driver for mysql will change utf8mb4 to utf8 if utf8mb4 is not supported
 --
 
 ALTER TABLE `#__assets` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
@@ -108,6 +108,7 @@ ALTER TABLE `#__redirect_links` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4
 ALTER TABLE `#__schemas` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 ALTER TABLE `#__session` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 ALTER TABLE `#__tags` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__template_overrides` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 ALTER TABLE `#__template_styles` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 ALTER TABLE `#__ucm_base` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 ALTER TABLE `#__ucm_content` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
@@ -200,6 +201,7 @@ ALTER TABLE `#__redirect_links` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_un
 ALTER TABLE `#__schemas` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 ALTER TABLE `#__session` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 ALTER TABLE `#__tags` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `#__template_overrides` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 ALTER TABLE `#__template_styles` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 ALTER TABLE `#__ucm_base` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 ALTER TABLE `#__ucm_content` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
diff --git a/administrator/components/com_templates/Controller/TemplateController.php b/administrator/components/com_templates/Controller/TemplateController.php
index 11b14aaf4fdf9..36ec1d23be6a4 100644
--- a/administrator/components/com_templates/Controller/TemplateController.php
+++ b/administrator/components/com_templates/Controller/TemplateController.php
@@ -12,6 +12,12 @@
 
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\Utilities\ArrayHelper;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\Component\Installer\Administrator\Model\InstallModel;
 
 /**
@@ -38,6 +44,9 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 
 		// Apply, Save & New, and Save As copy should be standard on forms.
 		$this->registerTask('apply', 'save');
+		$this->registerTask('unpublish', 'publish');
+		$this->registerTask('publish',   'publish');
+		$this->registerTask('deleteOverrideHistory', 'publish');
 	}
 
 	/**
@@ -68,6 +77,64 @@ public function close()
 		$this->setRedirect(\JRoute::_($url, false));
 	}
 
+	/**
+	 * Marked as Checked/Unchecked of override history.
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function publish()
+	{
+		// Check for request forgeries.
+		Session::checkToken() or jexit(Text::_('JINVALID_TOKEN'));
+
+		$app  = Factory::getApplication();
+		$file = $this->input->get('file');
+		$id   = $this->input->get('id');
+
+		$ids    = $this->input->get('cid', array(), 'array');
+		$values = array('publish' => 1, 'unpublish' => 0, 'deleteOverrideHistory' => -3);
+		$task   = $this->getTask();
+		$value  = ArrayHelper::getValue($values, $task, 0, 'int');
+
+		if (empty($ids))
+		{
+			$this->setMessage(Text::_('COM_TEMPLATES_ERROR_NO_FILE_SELECTED'), 'warning');
+		}
+		else
+		{
+			/* @var \Joomla\Component\Templates\Administrator\Model\TemplateModel $model */
+			$model = $this->getModel();
+
+			// Change the state of the records.
+			if (!$model->publish($ids, $value, $id))
+			{
+				$this->setMessage(implode('<br>', $model->getErrors()), 'warning');
+			}
+			else
+			{
+				if ($value == 1)
+				{
+					$ntext = 'COM_TEMPLATES_N_OVERRIDE_CHECKED';
+				}
+				elseif ($value == 0)
+				{
+					$ntext = 'COM_TEMPLATES_N_OVERRIDE_UNCHECKED';
+				}
+				elseif ($value === -3)
+				{
+					$ntext = 'COM_TEMPLATES_N_OVERRIDE_DELEATED';
+				}
+
+				$this->setMessage(Text::plural($ntext, count($ids)));
+			}
+		}
+
+		$url  = 'index.php?option=com_templates&view=template&id=' . $id . '&file=' . $file;
+		$this->setRedirect(Route::_($url, false));
+	}
+
 	/**
 	 * Method for copying the template.
 	 *
@@ -732,4 +799,46 @@ public function extractArchive()
 			$this->setRedirect(\JRoute::_($url, false));
 		}
 	}
+
+	/**
+	 * Fetch and report updates in \JSON format, for A\JAX requests
+	 *
+	 * @return void
+	 *
+	 * @since __DEPLOY_VERSION__
+	 */
+	public function ajax()
+	{
+		$app = $this->app;
+
+		if (!Session::checkToken('get'))
+		{
+			$app->setHeader('status', 403, true);
+			$app->sendHeaders();
+			echo Text::_('JINVALID_TOKEN');
+			$app->close();
+		}
+
+		// Checks status of installer override plugin.
+		if (!PluginHelper::isEnabled('installer', 'override'))
+		{
+			$error = array('installerOverride' => 'disabled');
+
+			echo json_encode($error);
+
+			$app->close();
+		}
+
+		// Created only for test.
+		$session = Factory::getSession();
+
+		/* @var \Joomla\Component\Templates\Administrator\Model\TemplateModel $model */
+		$model = $this->getModel();
+
+		$result = $model->getUpdatedList(true, true);
+
+		echo json_encode($result);
+
+		$app->close();
+	}
 }
diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index 9523b1b864ebd..9e2722fe6d202 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -88,7 +88,7 @@ protected function storeFileInfo($path, $name, $template)
 
 		if ($coreFile = $this->getCoreFile($path . $name, $template->client_id))
 		{
-			$temp->modifiedDate = date("F d Y H:i:s.", filemtime($coreFile));
+			$temp->modifiedDate = date("y-m-d h:i:s.u", filemtime($coreFile));
 			$temp->coreFile = md5_file($coreFile);
 		}
 		else
@@ -136,6 +136,82 @@ public function getTemplateList()
 		return $results;
 	}
 
+	/**
+	 * Method to get all updated file list.
+	 *
+	 * @param   boolean  $state    The optional parameter if you want unchecked list.
+	 * @param   boolean  $all      The optional parameter if you want all list.
+	 * @param   boolean  $cleanup  The optional parameter if you want to clean record which is no more required.
+	 *
+	 * @return  object  stdClass object
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getUpdatedList($state = false, $all = false, $cleanup = false)
+	{
+		// Get a db connection.
+		$db = Factory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.template, a.hash_id, a.extension_id, a.state, a.action, a.client_id, a.created_date, a.modified_date'
+			)
+		);
+
+		$template = $this->getTemplate();
+
+		$query->from($db->quoteName('#__template_overrides', 'a'));
+
+		if (!$all)
+		{
+			$query->where('extension_id = ' . $db->quote($template->extension_id));
+		}
+
+		if ($state)
+		{
+			$query->where('state = ' . 0);
+		}
+
+		$query->order($db->quoteName('a.modified_date') . 'DESC');
+
+		// Reset the query.
+		$db->setQuery($query);
+
+		// Load the results as a list of stdClass objects.
+		$pks = $db->loadObjectList();
+
+		if ($state)
+		{
+			return $pks;
+		}
+
+		$results = array();
+
+		foreach ($pks as $pk)
+		{
+			$client = ApplicationHelper::getClientInfo($pk->client_id);
+			$path = Path::clean($client->path . '/templates/' . $pk->template . base64_decode($pk->hash_id));
+
+			if (file_exists($path))
+			{
+				$results[] = $pk;
+			}
+			elseif ($cleanup)
+			{
+				$cleanupIds = array();
+				$cleanupIds[] = $pk->hash_id;
+				$this->publish($cleanupIds, -3, $pk->extension_id);
+			}
+		}
+
+		return $results;
+	}
+
 	/**
 	 * Method to get a list of all the core files of override files.
 	 *
@@ -151,7 +227,7 @@ public function getCoreList()
 		// Intialize the array variable to store core file list.
 		$this->coreFileList = array();
 
-		$app    = Factory::getApplication();
+		$app = Factory::getApplication();
 
 		foreach ($templates as $template)
 		{
@@ -231,6 +307,65 @@ public function prepareCoreFiles($dir, $element, $template)
 		return;
 	}
 
+	/**
+	 * Method to update status of list.
+	 *
+	 * @param   array    $ids    The base path.
+	 * @param   array    $value  The file name.
+	 * @param   integer  $exid   The template extension id.
+	 *
+	 * @return  integer  Number of files changed.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function publish($ids, $value, $exid)
+	{
+		$db = Factory::getDbo();
+
+		foreach ($ids as $id)
+		{
+			if ($value === -3)
+			{
+				$deleteQuery = $db->getQuery(true)
+					->delete($db->quoteName('#__template_overrides'))
+					->where($db->quoteName('hash_id') . ' = ' . $db->quote($id))
+					->where($db->quoteName('extension_id') . ' = ' . $db->quote($exid));
+
+				try
+				{
+					// Set the query using our newly populated query object and execute it.
+					$db->setQuery($deleteQuery);
+					$result = $db->execute();
+				}
+				catch (\RuntimeException $e)
+				{
+					return $e;
+				}
+			}
+			elseif ($value === 1 || $value === 0)
+			{
+				$updateQuery = $db->getQuery(true)
+					->update($db->quoteName('#__template_overrides'))
+					->set($db->quoteName('state') . ' = ' . $db->quote($value))
+					->where($db->quoteName('hash_id') . ' = ' . $db->quote($id))
+					->where($db->quoteName('extension_id') . ' = ' . $db->quote($exid));
+
+				try
+				{
+					// Set the query using our newly populated query object and execute it.
+					$db->setQuery($updateQuery);
+					$result = $db->execute();
+				}
+				catch (\RuntimeException $e)
+				{
+					return $e;
+				}
+			}
+		}
+
+		return $result;
+	}
+
 	/**
 	 * Method to get a list of all the files to edit in a template.
 	 *
@@ -270,6 +405,9 @@ public function getFiles()
 
 				return false;
 			}
+
+			// Clean up override history
+			$this->getUpdatedList(false, true, true);
 		}
 
 		return $result;
diff --git a/administrator/components/com_templates/View/Template/HtmlView.php b/administrator/components/com_templates/View/Template/HtmlView.php
index 190c5322eb0d6..25d1b42c2a4db 100644
--- a/administrator/components/com_templates/View/Template/HtmlView.php
+++ b/administrator/components/com_templates/View/Template/HtmlView.php
@@ -145,6 +145,7 @@ public function display($tpl = null)
 		$this->template    = $this->get('Template');
 		$this->preview     = $this->get('Preview');
 		$this->pluginState = PluginHelper::isEnabled('installer', 'override');
+		$this->updatedList = $this->get('UpdatedList');
 
 		$params       = ComponentHelper::getParams('com_templates');
 		$imageTypes   = explode(',', $params->get('image_formats'));
@@ -281,6 +282,11 @@ protected function addToolbar()
 			}
 		}
 
+		if (count($this->updatedList) !== 0 && $this->pluginState)
+		{
+			\JToolbarHelper::custom('template.deleteOverrideHistory', 'delete', 'move', 'JTOOLBAR_DELETE', true, 'updateForm');
+		}
+
 		if ($this->type == 'home')
 		{
 			\JToolbarHelper::cancel('template.cancel', 'JTOOLBAR_CLOSE');
diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index 5377cfbf25840..ef5bb436e5ef4 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -10,21 +10,24 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Layout\FileLayout;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper;
 
 // Include the component HTML helpers.
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 
-JText::script('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE');
-JText::script('COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE');
-JText::script('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF');
-JText::script('COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF');
+Text::script('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE');
+Text::script('COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE');
+Text::script('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF');
+Text::script('COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF');
 
-JHtml::_('script', 'vendor/diff/diff.min.js', array('version' => 'auto', 'relative' => true));
-JHtml::_('script', 'com_templates/admin-template-compare.min.js', array('version' => 'auto', 'relative' => true));
+HTMLHelper::_('script', 'vendor/diff/diff.min.js', array('version' => 'auto', 'relative' => true));
+HTMLHelper::_('script', 'com_templates/admin-template-compare.min.js', array('version' => 'auto', 'relative' => true));
 
 JHtml::_('behavior.formvalidator');
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.tabstate');
+HTMLHelper::_('behavior.multiselect', 'updateForm');
 
 $input = JFactory::getApplication()->input;
 
@@ -118,13 +121,13 @@
 					<?php $coreFileContent = file_get_contents($this->source->coreFile); ?>
 					<?php $overrideFileContent = file_get_contents($this->source->filePath); ?>
 					<div style="display:none" class="col-md-6" id="core-pane">
-						<p class="lead"><?php echo JText::_('COM_TEMPLATES_FILE_CORE_PANE'); ?></p>
+						<p class="lead"><?php echo Text::_('COM_TEMPLATES_FILE_CORE_PANE'); ?></p>
 						<div class="editor-border">
 							<?php echo $this->form->getInput('core'); ?>
 						</div>
 					</div>
 					<div class="col-md-12" style="display:none" id="diff-main">
-						<p class="lead"><?php echo JText::_('COM_TEMPLATES_FILE_COMPARE_PANE'); ?></p>
+						<p class="lead"><?php echo Text::_('COM_TEMPLATES_FILE_COMPARE_PANE'); ?></p>
 						<div class="diff-pane">
 							<div class="diffview" style="display:none" id="original"><?php echo htmlspecialchars($coreFileContent, ENT_COMPAT, 'UTF-8'); ?></div>
 							<div class="diffview" style="display:none" id="changed"><?php echo htmlspecialchars($overrideFileContent, ENT_COMPAT, 'UTF-8'); ?></div>
@@ -305,9 +308,9 @@
 <?php echo JHtml::_('bootstrap.endTab'); ?>
 
 <?php if ($this->pluginState) : ?>
-	<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'files', JText::_('COM_TEMPLATES_TAB_UPDATED_FILES')); ?>
+	<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'files', Text::_('COM_TEMPLATES_TAB_UPDATED_FILES')); ?>
 	<?php echo $this->loadTemplate('updated_files'); ?>
-	<?php echo JHtml::_('bootstrap.endTab'); ?>
+	<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
 <?php endif; ?>
 
 <?php echo JHtml::_('bootstrap.endTabSet'); ?>
diff --git a/administrator/components/com_templates/tmpl/template/default_updated_files.php b/administrator/components/com_templates/tmpl/template/default_updated_files.php
index ab836b7d2946e..2190724fbfc76 100644
--- a/administrator/components/com_templates/tmpl/template/default_updated_files.php
+++ b/administrator/components/com_templates/tmpl/template/default_updated_files.php
@@ -9,67 +9,79 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\Registry\Registry;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Factory;
 
-$plugin = PluginHelper::getPlugin('installer', 'override');
-$params = new Registry($plugin->params);
-$result = json_decode($params->get('overridefiles'), JSON_HEX_QUOT);
+$input = Factory::getApplication()->input;
 ?>
 
-<div class="row">
-	<div class="col-md-12">
-		<table class="table table-striped">
-			<thead>
-				<tr>
-					<th style="width:25%">
-						<?php echo Text::_('COM_TEMPLATES_OVERRIDE_TEMPLATE_FILE'); ?>
-					</th>
-					<th>
-						<?php echo Text::_('COM_TEMPLATES_OVERRIDE_MODIFIED_DATE'); ?>
-					</th>
-					<th>
-						<?php echo Text::_('COM_TEMPLATES_OVERRIDE_ACTION'); ?>
-					</th>
-				</tr>
-			</thead>
-			<tbody>
-				<?php $flag = 0; ?>
-				<?php foreach ($result as $values) : ?>
-					<?php foreach ($values as $value) : ?>
-						<?php $client = ApplicationHelper::getClientInfo($value['client']); ?>
-						<?php $path = $client->path . '/templates/' . $value['template'] . base64_decode($value['id']); ?>
-						<?php if (file_exists($path) && $this->template->extension_id === $value['extension_id']) : ?>
-							<?php $flag = 1; ?>
-							<tr>
+<form action="<?php echo Route::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="updateForm" id="updateForm">
+	<div class="row">
+		<div class="col-md-12">
+			<?php if(count($this->updatedList) !== 0) : ?>
+				<table class="table">
+					<thead>
+						<tr>
+							<th style="width:5%" class="nowrap text-center">
+								<?php echo HTMLHelper::_('grid.checkall'); ?>
+							</th>
+							<th style="width:7%" class="nowrap">
+								<?php echo Text::_('JSTATUS'); ?>
+							</th>
+							<th style="width:30%">
+								<?php echo Text::_('COM_TEMPLATES_OVERRIDE_TEMPLATE_FILE'); ?>
+							</th>
+							<th>
+								<?php echo Text::_('COM_TEMPLATES_OVERRIDE_CREATED_DATE'); ?>
+							</th>
+							<th>
+								<?php echo Text::_('COM_TEMPLATES_OVERRIDE_MODIFIED_DATE'); ?>
+							</th>
+							<th>
+								<?php echo Text::_('COM_TEMPLATES_OVERRIDE_ACTION'); ?>
+							</th>
+						</tr>
+					</thead>
+					<tbody>
+						<?php foreach ($this->updatedList as $i => $value) : ?>
+							<tr class="row<?php echo $i % 2; ?>">
+								<td class="text-center">
+									<?php echo HTMLHelper::_('grid.id', $i, $value->hash_id, false, 'cid', 'cb', '', 'updateForm'); ?>
+								</td>
+								<td>
+									<?php echo HTMLHelper::_('jgrid.published', $value->state, $i, 'template.', 1, 'cb', null, null, 'updateForm'); ?>
+								</td>
+								<td>
+									<a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_templates&view=template&id=' . (int) $value->extension_id . '&file=' . $value->hash_id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?>"><?php echo base64_decode($value->hash_id); ?></a>
+								</td>
 								<td>
-									<a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_templates&view=template&id=' . (int) $value['extension_id'] . '&file=' . $value['id']); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?>"><?php echo base64_decode($value['id']); ?></a>
+									<?php echo $value->created_date; ?>
 								</td>
 								<td>
-									<?php if (empty($value['modifiedDate'])) : ?>
+									<?php if ($value->modified_date === '0000-00-00 00:00:00') : ?>
 										<span class="badge badge-warning"><?php echo Text::_('COM_TEMPLATES_OVERRIDE_CORE_REMOVED'); ?></span>
 									<?php else : ?>
-										<?php echo $value['modifiedDate']; ?>
+										<?php echo $value->modified_date; ?>
 									<?php endif; ?>
 								</td>
 								<td>
-									<span class="badge badge-info"><?php echo $value['action']; ?></span>
+									<span class="badge badge-info"><?php echo $value->action; ?></span>
 								</td>
 							</tr>
-						<?php endif; ?>
-					<?php endforeach; ?>
-				<?php endforeach; ?>
-			</tbody>
-		</table>
-		<?php if(!$flag || count($result) === 0) : ?>
-			<joomla-alert type="success" role="alert" class="joomla-alert--show">
-				<span class="icon-info" aria-hidden="true"></span>
-				<?php echo Text::sprintf('COM_TEMPLATES_OVERRIDE_UPTODATE', $params->get('numupdate')); ?>
-			</joomla-alert>
-		<?php endif; ?>
+						<?php endforeach; ?>
+					</tbody>
+				</table>
+				<input type="hidden" name="task" value="">
+				<input type="hidden" name="boxchecked" value="0">
+				<?php echo HTMLHelper::_('form.token'); ?>
+			<?php else : ?>
+				<joomla-alert type="success" role="alert" class="joomla-alert--show">
+					<span class="icon-info" aria-hidden="true"></span>
+					<?php echo Text::_('COM_TEMPLATES_OVERRIDE_UPTODATE'); ?>
+				</joomla-alert>
+			<?php endif; ?>
+		</div>
 	</div>
-</div>
+</form>
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index 5c2a0c9e483a1..be2b956b867f4 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -63,6 +63,7 @@ COM_TEMPLATES_ERROR_IMAGE_FILE_NOT_FOUND="Image file not found."
 COM_TEMPLATES_ERROR_INDEX_DELETE="The file index.php can't be deleted. Make changes in the editor if you want to change the file."
 COM_TEMPLATES_ERROR_INVALID_FROM_NAME="Template to copy from can't be found."
 COM_TEMPLATES_ERROR_INVALID_TEMPLATE_NAME="Invalid template name. Please use only letters, numbers, dashes and underscores."
+COM_TEMPLATES_ERROR_NO_FILE_SELECTED="No file selected."
 COM_TEMPLATES_ERROR_RENAME_INDEX="The file index.php can't be renamed."
 COM_TEMPLATES_ERROR_ROOT_DELETE="The root folder can't be deleted."
 COM_TEMPLATES_ERROR_SAVE_DISABLED_TEMPLATE="Unable to save a style associated to a disabled template."
@@ -169,6 +170,9 @@ COM_TEMPLATES_MSG_MANAGE_NO_STYLES="There are no styles installed matching your
 COM_TEMPLATES_MSG_MANAGE_NO_TEMPLATES="There are no templates installed matching your query."
 COM_TEMPLATES_N_ITEMS_DELETED="%d template styles deleted."
 COM_TEMPLATES_N_ITEMS_DELETED_1="Template style deleted."
+COM_TEMPLATES_N_OVERRIDE_CHECKED="%d override history marked as checked."
+COM_TEMPLATES_N_OVERRIDE_DELEATED="%d Override history deleted."
+COM_TEMPLATES_N_OVERRIDE_UNCHECKED="%d override history marked as unchecked."
 COM_TEMPLATES_NEW_FILE_HEADER="Create or Upload a new file."
 COM_TEMPLATES_NEW_FILE_NAME="New File Name"
 COM_TEMPLATES_NEW_FILE_SELECT="Select a file type"
@@ -178,12 +182,13 @@ COM_TEMPLATES_OPTION_NONE=":: None ::"
 COM_TEMPLATES_OPTION_SELECT_MENU_ITEM="- Select Menu Item -"
 COM_TEMPLATES_OVERRIDE_ACTION="Update Action"
 COM_TEMPLATES_OVERRIDE_CREATED="Override created in "
+COM_TEMPLATES_OVERRIDE_CREATED_DATE="Added to the list"
 COM_TEMPLATES_OVERRIDE_CORE_REMOVED="Core file removed"
 COM_TEMPLATES_OVERRIDE_FAILED="Failed to create override."
-COM_TEMPLATES_OVERRIDE_MODIFIED_DATE="Modified Date"
+COM_TEMPLATES_OVERRIDE_MODIFIED_DATE="Last change via Update"
 COM_TEMPLATES_OVERRIDE_SUCCESS="Successfully created the override."
 COM_TEMPLATES_OVERRIDE_TEMPLATE_FILE="Template File"
-COM_TEMPLATES_OVERRIDE_UPTODATE="Override files are up to date with core files. Nothing is changed in last %s extension or Joomla update."
+COM_TEMPLATES_OVERRIDE_UPTODATE="Override files are up to date with core files. Nothing is changed in last extension or Joomla update."
 COM_TEMPLATES_OVERRIDES_COMPONENTS="Components"
 COM_TEMPLATES_OVERRIDES_MODULES="Modules"
 COM_TEMPLATES_OVERRIDES_LAYOUTS="Layouts"
diff --git a/administrator/language/en-GB/en-GB.plg_installer_override.ini b/administrator/language/en-GB/en-GB.plg_installer_override.ini
index c8ae66c12ffef..85a7677121e33 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_override.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_override.ini
@@ -6,4 +6,3 @@
 PLG_INSTALLER_OVERRIDE="Installer - Override"
 PLG_INSTALLER_OVERRIDE_PLUGIN_XML_DESCRIPTION="The system overrides plugin enables notifications and handling of overrides after an update in case of differences."
 PLG_INSTALLER_OVERRIDE_FILE_UPDATED="%s Override(s) core file updated."
-PLG_INSTALLER_OVERRIDE_PLUGIN_FIELD_OVERRIDEFILES_LABEL="Updated core files."
diff --git a/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini b/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini
index 071cf1858926e..92d49ef41f7e7 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini
@@ -5,4 +5,3 @@
 
 PLG_INSTALLER_OVERRIDE="Installer - Override"
 PLG_INSTALLER_OVERRIDE_PLUGIN_XML_DESCRIPTION="The system overrides plugin enables notifications and handling of overrides after an update in case of differences."
-PLG_INSTALLER_OVERRIDE_PLUGIN_FIELD_NUMUPDATE="Number of previous update to store"
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
new file mode 100644
index 0000000000000..35c125f847ee3
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
@@ -0,0 +1,14 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 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
+
+PLG_QUICKICON_OVERRIDECHECK="Quick Icon - Joomla! Overrides Update Notification"
+PLG_QUICKICON_OVERRIDECHECK_CHECKING="Checking overrides ..."
+PLG_QUICKICON_OVERRIDECHECK_ERROR="Error on checking overrides."
+PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE="Enable installer override plugin."
+PLG_QUICKICON_OVERRIDECHECK_GROUP_DESC="The group of this plugin (this value is compared with the group value used in <strong>Quick Icons</strong> modules to inject icons)."
+PLG_QUICKICON_OVERRIDECHECK_GROUP_LABEL="Group"
+PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND="%s Override(s) updated."
+PLG_QUICKICON_OVERRIDECHECK_UPTODATE="Override are up to date."
+PLG_QUICKICON_OVERRIDECHECK_XML_DESCRIPTION="Checks overrides on update and enables notifications when you visit the Control Panel page.<br><strong> Warning! You must have installer override plugin enabled to see results.</strong>"
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.sys.ini b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.sys.ini
new file mode 100644
index 0000000000000..07a4836e4600a
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 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
+
+PLG_QUICKICON_OVERRIDECHECK="Quick Icon - Joomla! Overrides Update Notification"
+PLG_QUICKICON_OVERRIDECHECK_XML_DESCRIPTION="Checks overrides on update and enables notifications when you visit the Control Panel page.<br><strong> Warning! You must have installer override plugin enabled to see results.</strong>"
diff --git a/build/webcomponents/js/toolbar-button/toolbar-button.js b/build/webcomponents/js/toolbar-button/toolbar-button.js
index c8e5a8e2399d8..abb9fd8977bb0 100755
--- a/build/webcomponents/js/toolbar-button/toolbar-button.js
+++ b/build/webcomponents/js/toolbar-button/toolbar-button.js
@@ -32,8 +32,8 @@
 
     connectedCallback() {
       // Check whether we have a form
-      const formSelector = this.form || '#adminForm';
-      this.formElement = document.querySelector(formSelector);
+      const formSelector = this.form || 'adminForm';
+      this.formElement = document.getElementById(formSelector);
 
       if (this.listSelection) {
         if (!this.formElement) {
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index b7965853dcdf2..c0c3f9505b568 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -664,7 +664,8 @@ INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `elem
 (488, 0, 'plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (489, 0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (490, 0, 'plg_extension_namespacemap', 'plugin', 'namespacemap', 'extension', 0, 1, 1, 1, '', '{}', 0, '0000-00-00 00:00:00', 0, 0, ''),
-(491, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '{"numupdate":3,"overridefiles":"{}"}', 0, '0000-00-00 00:00:00', 4, 0, ''),
+(491, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 4, 0, ''),
+(492, 0, 'plg_quickicon_overridecheck', 'plugin', 'overridecheck', 'quickicon', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (509, 0, 'atum', 'template', 'atum', '', 1, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (510, 0, 'cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '', '{"logoFile":"","fluidContainer":"0","sidebarLeftWidth":"3","sidebarRightWidth":"3"}', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (600, 802, 'English (en-GB)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
@@ -1563,6 +1564,27 @@ INSERT INTO `#__tags` (`id`, `parent_id`, `lft`, `rgt`, `level`, `path`, `title`
 
 -- --------------------------------------------------------
 
+--
+-- Table structure for table `#__template_overrides`
+--
+
+CREATE TABLE IF NOT EXISTS `#__template_overrides` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `template` varchar(50) NOT NULL DEFAULT '',
+  `hash_id` varchar(255) NOT NULL DEFAULT '',
+  `extension_id` int(11) DEFAULT 0,
+  `state` tinyint(1) NOT NULL DEFAULT 0,
+  `action` varchar(50) NOT NULL DEFAULT '',
+  `client_id` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  `created_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  KEY `idx_template` (`template`),
+  KEY `idx_extension_id` (`extension_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+-- --------------------------------------------------------
+
 --
 -- Table structure for table `#__template_styles`
 --
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index 49e0629c692fa..31d80ff29ce3c 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -677,7 +677,8 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem
 (488, 0, 'plg_system_httpheaders', 'plugin', 'httpheaders', 'system', 0, 1, 1, 0, '', '{}', 0, '1970-01-01 00:00:00', 0, 0, ''),
 (489, 0, 'plg_sampledata_multilang', 'plugin', 'multilang', 'sampledata', 0, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
 (490, 0, 'plg_extension_namespacemap', 'plugin', 'namespacemap', 'extension', 0, 1, 1, 1, '', '{}', 0, '1970-01-01 00:00:00', 0, 0, ''),
-(491, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '{"numupdate":3,"overridefiles":"{}"}', 0, '1970-01-01 00:00:00', 4, 0, ''),
+(491, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 4, 0, ''),
+(492, 0, 'plg_quickicon_overridecheck', 'plugin', 'overridecheck', 'quickicon', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0, ''),
 (600, 802, 'English (en-GB)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0, ''),
 (601, 802, 'English (en-GB)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0, ''),
 (700, 0, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0, ''),
@@ -1568,6 +1569,25 @@ INSERT INTO "#__tags" ("id", "parent_id", "lft", "rgt", "level", "path", "title"
 
 SELECT setval('#__tags_id_seq', 2, false);
 
+--
+-- Table structure for table `#__template_overrides`
+--
+
+CREATE TABLE IF NOT EXISTS "#__template_overrides" (
+  "id" serial NOT NULL,
+  "template" varchar(50) DEFAULT '' NOT NULL,
+  "hash_id" varchar(255) DEFAULT '' NOT NULL,
+  "extension_id" bigint DEFAULT 0,
+  "state" smallint DEFAULT 0 NOT NULL,
+  "action" varchar(50) DEFAULT '' NOT NULL,
+  "client_id" smallint DEFAULT 0 NOT NULL,
+  "created_date" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "modified_date" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "#__template_overrides_idx_template" ON "#__template_overrides" ("template");
+CREATE INDEX "#__template_overrides_idx_extension_id" ON "#__template_overrides" ("extension_id");
+
 --
 -- Table structure for table `#__template_styles`
 --
diff --git a/libraries/cms/html/grid.php b/libraries/cms/html/grid.php
index 1752b815cac2e..ba946bf1f6851 100644
--- a/libraries/cms/html/grid.php
+++ b/libraries/cms/html/grid.php
@@ -143,15 +143,24 @@ public static function checkall($name = 'checkall-toggle', $tip = 'JGLOBAL_CHECK
 	 * @param   string   $name        The name of the form element
 	 * @param   string   $stub        The name of stub identifier
 	 * @param   string   $title       The name of the item
+	 * @param   string   $formId      An optional form selector.
 	 *
 	 * @return  mixed    String of html with a checkbox if item is not checked out, null if checked out.
 	 *
 	 * @since   1.5
 	 */
-	public static function id($rowNum, $recId, $checkedOut = false, $name = 'cid', $stub = 'cb', $title = '')
+	public static function id($rowNum, $recId, $checkedOut = false, $name = 'cid', $stub = 'cb', $title = '', $formId = null)
 	{
+		if ($formId !== null)
+		{
+			return $checkedOut ? '' : '<label for="' . $stub . $rowNum . '"><span class="sr-only">' . JText::_('JSELECT')
+				. ' ' . htmlspecialchars($title, ENT_COMPAT, 'UTF-8') . '</span></label>'
+				. '<input type="checkbox" id="' . $stub . $rowNum . '" name="' . $name . '[]" value="' . $recId
+				. '" onclick="Joomla.isChecked(this.checked, \'' . $formId . '\');">';
+		}
+
 		return $checkedOut ? '' : '<label for="' . $stub . $rowNum . '"><span class="sr-only">' . JText::_('JSELECT')
-			. ' ' . htmlspecialchars($title, ENT_COMPAT, 'UTF-8') . '</span></label>' 
+			. ' ' . htmlspecialchars($title, ENT_COMPAT, 'UTF-8') . '</span></label>'
 			. '<input type="checkbox" id="' . $stub . $rowNum . '" name="' . $name . '[]" value="' . $recId
 			. '" onclick="Joomla.isChecked(this.checked);">';
 	}
diff --git a/libraries/cms/html/jgrid.php b/libraries/cms/html/jgrid.php
index c838ef0cc0946..e47a8e77b68c7 100644
--- a/libraries/cms/html/jgrid.php
+++ b/libraries/cms/html/jgrid.php
@@ -34,14 +34,15 @@ abstract class JHtmlJGrid
 	 * @param   string        $inactive_class  An optional inactive HTML class
 	 * @param   boolean       $enabled         An optional setting for access control on the action.
 	 * @param   boolean       $translate       An optional setting for translation.
-	 * @param   string        $checkbox	       An optional prefix for checkboxes.
+	 * @param   string        $checkbox        An optional prefix for checkboxes.
+	 * @param   string        $formId          An optional form selector.
 	 *
 	 * @return  string  The HTML markup
 	 *
 	 * @since   1.6
 	 */
 	public static function action($i, $task, $prefix = '', $text = '', $active_title = '', $inactive_title = '', $tip = false, $active_class = '',
-		$inactive_class = '', $enabled = true, $translate = true, $checkbox = 'cb')
+		$inactive_class = '', $enabled = true, $translate = true, $checkbox = 'cb', $formId = null)
 	{
 		if (is_array($prefix))
 		{
@@ -67,7 +68,16 @@ public static function action($i, $task, $prefix = '', $text = '', $active_title
 		if ($enabled)
 		{
 			$html[] = '<a class="tbody-icon' . ($active_class === 'publish' ? ' active' : '') . ($tip ? ' hasTooltip' : '') . '"';
-			$html[] = ' href="javascript:void(0);" onclick="return listItemTask(\'' . $checkbox . $i . '\',\'' . $prefix . $task . '\')"';
+
+			if ($formId !== null)
+			{
+				$html[] = ' href="javascript:void(0);" onclick="return listItemTask(\'' . $checkbox . $i . '\',\'' . $prefix . $task . '\',\'' . $formId . '\')"';
+			}
+			else
+			{
+				$html[] = ' href="javascript:void(0);" onclick="return listItemTask(\'' . $checkbox . $i . '\',\'' . $prefix . $task . '\')"';
+			}
+
 			$html[] = $tip ? ' title="' . $title . '"' : '';
 			$html[] = '>';
 			$html[] = '<span class="icon-' . $active_class . '" aria-hidden="true"></span>';
@@ -108,12 +118,13 @@ public static function action($i, $task, $prefix = '', $text = '', $active_title
 	 * @param   boolean       $enabled    An optional setting for access control on the action.
 	 * @param   boolean       $translate  An optional setting for translation.
 	 * @param   string        $checkbox   An optional prefix for checkboxes.
+	 * @param   string        $formId     An optional form selector.
 	 *
 	 * @return  string  The HTML markup
 	 *
 	 * @since   1.6
 	 */
-	public static function state($states, $value, $i, $prefix = '', $enabled = true, $translate = true, $checkbox = 'cb')
+	public static function state($states, $value, $i, $prefix = '', $enabled = true, $translate = true, $checkbox = 'cb', $formId = null)
 	{
 		if (is_array($prefix))
 		{
@@ -135,7 +146,8 @@ public static function state($states, $value, $i, $prefix = '', $enabled = true,
 
 		return static::action(
 			$i, $task, $prefix, $text, $active_title, $inactive_title, $tip,
-			$active_class, $inactive_class, $enabled, $translate, $checkbox
+			$active_class, $inactive_class, $enabled, $translate, $checkbox,
+			$formId
 		);
 	}
 
@@ -149,13 +161,15 @@ public static function state($states, $value, $i, $prefix = '', $enabled = true,
 	 * @param   string        $checkbox      An optional prefix for checkboxes.
 	 * @param   string        $publish_up    An optional start publishing date.
 	 * @param   string        $publish_down  An optional finish publishing date.
+	 * @param   string        $formId        An optional form selector.
 	 *
 	 * @return  string  The HTML markup
 	 *
 	 * @see     JHtmlJGrid::state()
 	 * @since   1.6
 	 */
-	public static function published($value, $i, $prefix = '', $enabled = true, $checkbox = 'cb', $publish_up = null, $publish_down = null)
+	public static function published($value, $i, $prefix = '', $enabled = true, $checkbox = 'cb', $publish_up = null, $publish_down = null,
+		$formId = null)
 	{
 		if (is_array($prefix))
 		{
@@ -229,10 +243,10 @@ public static function published($value, $i, $prefix = '', $enabled = true, $che
 				}
 			}
 
-			return static::state($states, $value, $i, array('prefix' => $prefix, 'translate' => !$tip), $enabled, true, $checkbox);
+			return static::state($states, $value, $i, array('prefix' => $prefix, 'translate' => !$tip), $enabled, true, $checkbox, $formId);
 		}
 
-		return static::state($states, $value, $i, $prefix, $enabled, true, $checkbox);
+		return static::state($states, $value, $i, $prefix, $enabled, true, $checkbox, $formId);
 	}
 
 	/**
@@ -243,13 +257,14 @@ public static function published($value, $i, $prefix = '', $enabled = true, $che
 	 * @param   string|array  $prefix    An optional task prefix or an array of options
 	 * @param   boolean       $enabled   An optional setting for access control on the action.
 	 * @param   string        $checkbox  An optional prefix for checkboxes.
+	 * @param   string        $formId    An optional form selector.
 	 *
 	 * @return  string  The HTML markup
 	 *
 	 * @see     JHtmlJGrid::state()
 	 * @since   1.6
 	 */
-	public static function isdefault($value, $i, $prefix = '', $enabled = true, $checkbox = 'cb')
+	public static function isdefault($value, $i, $prefix = '', $enabled = true, $checkbox = 'cb', $formId = null)
 	{
 		if (is_array($prefix))
 		{
@@ -264,7 +279,7 @@ public static function isdefault($value, $i, $prefix = '', $enabled = true, $che
 			1 => array('unsetDefault', 'JDEFAULT', 'JLIB_HTML_UNSETDEFAULT_ITEM', 'JDEFAULT', 1, 'featured', 'featured'),
 		);
 
-		return static::state($states, $value, $i, $prefix, $enabled, true, $checkbox);
+		return static::state($states, $value, $i, $prefix, $enabled, true, $checkbox, $formId);
 	}
 
 	/**
@@ -321,12 +336,13 @@ public static function publishedOptions($config = array())
 	 * @param   string|array  $prefix      An optional task prefix or an array of options
 	 * @param   boolean       $enabled     True to enable the action.
 	 * @param   string        $checkbox    An optional prefix for checkboxes.
+	 * @param   string        $formId      An optional form selector.
 	 *
 	 * @return  string  The HTML markup
 	 *
 	 * @since   1.6
 	 */
-	public static function checkedout($i, $editorName, $time, $prefix = '', $enabled = false, $checkbox = 'cb')
+	public static function checkedout($i, $editorName, $time, $prefix = '', $enabled = false, $checkbox = 'cb', $formId = null)
 	{
 		if (is_array($prefix))
 		{
@@ -342,7 +358,8 @@ public static function checkedout($i, $editorName, $time, $prefix = '', $enabled
 
 		return static::action(
 			$i, 'checkin', $prefix, JText::_('JLIB_HTML_CHECKED_OUT'), html_entity_decode($active_title, ENT_QUOTES, 'UTF-8'),
-			html_entity_decode($inactive_title, ENT_QUOTES, 'UTF-8'), true, 'checkedout', 'checkedout', $enabled, false, $checkbox
+			html_entity_decode($inactive_title, ENT_QUOTES, 'UTF-8'), true, 'checkedout', 'checkedout', $enabled, false, $checkbox,
+			$formId
 		);
 	}
 
@@ -355,12 +372,13 @@ public static function checkedout($i, $editorName, $time, $prefix = '', $enabled
 	 * @param   string        $text      An optional text to display
 	 * @param   boolean       $enabled   An optional setting for access control on the action.
 	 * @param   string        $checkbox  An optional prefix for checkboxes.
+	 * @param   string        $formId    An optional form selector.
 	 *
 	 * @return  string  The HTML markup
 	 *
 	 * @since   1.6
 	 */
-	public static function orderUp($i, $task = 'orderup', $prefix = '', $text = 'JLIB_HTML_MOVE_UP', $enabled = true, $checkbox = 'cb')
+	public static function orderUp($i, $task = 'orderup', $prefix = '', $text = 'JLIB_HTML_MOVE_UP', $enabled = true, $checkbox = 'cb', $formId = null)
 	{
 		if (is_array($prefix))
 		{
@@ -371,7 +389,7 @@ public static function orderUp($i, $task = 'orderup', $prefix = '', $text = 'JLI
 			$prefix = array_key_exists('prefix', $options) ? $options['prefix'] : '';
 		}
 
-		return static::action($i, $task, $prefix, $text, $text, $text, false, 'uparrow', 'uparrow_disabled', $enabled, true, $checkbox);
+		return static::action($i, $task, $prefix, $text, $text, $text, false, 'uparrow', 'uparrow_disabled', $enabled, true, $checkbox, $formId);
 	}
 
 	/**
@@ -383,12 +401,14 @@ public static function orderUp($i, $task = 'orderup', $prefix = '', $text = 'JLI
 	 * @param   string        $text      An optional text to display
 	 * @param   boolean       $enabled   An optional setting for access control on the action.
 	 * @param   string        $checkbox  An optional prefix for checkboxes.
+	 * @param   string        $formId    An optional form selector.
 	 *
 	 * @return  string  The HTML markup
 	 *
 	 * @since   1.6
 	 */
-	public static function orderDown($i, $task = 'orderdown', $prefix = '', $text = 'JLIB_HTML_MOVE_DOWN', $enabled = true, $checkbox = 'cb')
+	public static function orderDown($i, $task = 'orderdown', $prefix = '', $text = 'JLIB_HTML_MOVE_DOWN', $enabled = true, $checkbox = 'cb',
+		$formId = null)
 	{
 		if (is_array($prefix))
 		{
@@ -399,6 +419,6 @@ public static function orderDown($i, $task = 'orderdown', $prefix = '', $text =
 			$prefix = array_key_exists('prefix', $options) ? $options['prefix'] : '';
 		}
 
-		return static::action($i, $task, $prefix, $text, $text, $text, false, 'downarrow', 'downarrow_disabled', $enabled, true, $checkbox);
+		return static::action($i, $task, $prefix, $text, $text, $text, false, 'downarrow', 'downarrow_disabled', $enabled, true, $checkbox, $formId);
 	}
 }
diff --git a/libraries/src/Toolbar/Button/StandardButton.php b/libraries/src/Toolbar/Button/StandardButton.php
index 760d0ae7e5ba0..a8d9310614748 100644
--- a/libraries/src/Toolbar/Button/StandardButton.php
+++ b/libraries/src/Toolbar/Button/StandardButton.php
@@ -62,11 +62,12 @@ protected function prepareOptions(array &$options)
 	/**
 	 * Fetch the HTML for the button
 	 *
-	 * @param   string   $type  Unused string.
-	 * @param   string   $name  The name of the button icon class.
-	 * @param   string   $text  Button text.
-	 * @param   string   $task  Task associated with the button.
-	 * @param   boolean  $list  True to allow lists
+	 * @param   string   $type    Unused string.
+	 * @param   string   $name    The name of the button icon class.
+	 * @param   string   $text    Button text.
+	 * @param   string   $task    Task associated with the button.
+	 * @param   boolean  $list    True to allow lists
+	 * @param   string   $formId  The id of action form.
 	 *
 	 * @return  string  HTML string for the button
 	 *
@@ -74,12 +75,23 @@ protected function prepareOptions(array &$options)
 	 *
 	 * @deprecated  5.0 Use render() instead.
 	 */
-	public function fetchButton($type = 'Standard', $name = '', $text = '', $task = '', $list = true)
+	public function fetchButton($type = 'Standard', $name = '', $text = '', $task = '', $list = true, $formId = null)
 	{
-		$this->name($name)
-			->text($text)
-			->task($task)
-			->listCheck($list);
+		if ($formId !== null)
+		{
+			$this->name($name)
+				->text($text)
+				->task($task)
+				->listCheck($list)
+				->form($formId);
+		}
+		else
+		{
+			$this->name($name)
+				->text($text)
+				->task($task)
+				->listCheck($list);
+		}
 
 		return $this->renderButton($this->options);
 	}
diff --git a/libraries/src/Toolbar/ToolbarHelper.php b/libraries/src/Toolbar/ToolbarHelper.php
index 6ae8f64011520..1c10406111161 100644
--- a/libraries/src/Toolbar/ToolbarHelper.php
+++ b/libraries/src/Toolbar/ToolbarHelper.php
@@ -83,12 +83,13 @@ public static function divider()
 	 * @param   string  $iconOver    The image to display when moused over.
 	 * @param   string  $alt         The alt text for the icon image.
 	 * @param   bool    $listSelect  True if required to check that a standard list item is checked.
+	 * @param   string  $formId      The id of action form.
 	 *
 	 * @return  void
 	 *
 	 * @since   1.5
 	 */
-	public static function custom($task = '', $icon = '', $iconOver = '', $alt = '', $listSelect = true)
+	public static function custom($task = '', $icon = '', $iconOver = '', $alt = '', $listSelect = true, $formId = null)
 	{
 		$bar = Toolbar::getInstance('toolbar');
 
@@ -96,7 +97,7 @@ public static function custom($task = '', $icon = '', $iconOver = '', $alt = '',
 		$icon = preg_replace('#\.[^.]*$#', '', $icon);
 
 		// Add a standard button.
-		$bar->appendButton('Standard', $icon, $alt, $task, $listSelect);
+		$bar->appendButton('Standard', $icon, $alt, $task, $listSelect, $formId);
 	}
 
 	/**
diff --git a/media/plg_quickicon_overridecheck/js/overridecheck.es6.js b/media/plg_quickicon_overridecheck/js/overridecheck.es6.js
new file mode 100644
index 0000000000000..03e3ddc1ae36d
--- /dev/null
+++ b/media/plg_quickicon_overridecheck/js/overridecheck.es6.js
@@ -0,0 +1,69 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Ajax call to get the override status.
+(() => {
+  'use strict';
+
+  // Add a listener on content loaded to initiate the check.
+
+  document.addEventListener('DOMContentLoaded', () => {
+    if (Joomla.getOptions('js-override-check')) {
+      const options = Joomla.getOptions('js-override-check');
+      Joomla.request({
+        url: options.ajaxUrl,
+        method: 'GET',
+        data: '',
+        perform: true,
+        onSuccess: (response) => {
+          const link = document.getElementById('plg_quickicon_overridecheck');
+          const linkSpan = link.querySelectorAll('span.j-links-link');
+          const updateInfoList = JSON.parse(response);
+
+          if (updateInfoList.installerOverride !== 'disabled') {
+            if (updateInfoList instanceof Array) {
+              if (updateInfoList.length === 0) {
+                // No overrides found
+                link.classList.add('success');
+                for (let i = 0, len = linkSpan.length; i < len; i += 1) {
+                  linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_UPTODATE');
+                }
+              } else {
+                // Scroll to page top
+                window.scrollTo(0, 0);
+
+                link.classList.add('danger');
+                for (let i = 0, len = linkSpan.length; i < len; i += 1) {
+                  linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND').replace('%s', `<span class="badge badge-light">${updateInfoList.length}</span>`);
+                }
+              }
+            } else {
+              // An error occurred
+              link.classList.add('danger');
+              for (let i = 0, len = linkSpan.length; i < len; i += 1) {
+                linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR');
+              }
+            }
+          } else {
+            link.classList.add('danger');
+            link.setAttribute('href', 'index.php?option=com_plugins&view=plugin&layout=edit&extension_id=491');
+            for (let i = 0, len = linkSpan.length; i < len; i += 1) {
+              linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE');
+            }
+          }
+        },
+        onError: () => {
+          // An error occurred
+          const link = document.getElementById('plg_quickicon_overridecheck');
+          const linkSpan = link.querySelectorAll('span.j-links-link');
+          link.classList.add('danger');
+          for (let i = 0, len = linkSpan.length; i < len; i += 1) {
+            linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR');
+          }
+        },
+      });
+    }
+  });
+})();
diff --git a/media/plg_quickicon_overridecheck/js/overridecheck.es6.min.js b/media/plg_quickicon_overridecheck/js/overridecheck.es6.min.js
new file mode 100644
index 0000000000000..fd34959432355
--- /dev/null
+++ b/media/plg_quickicon_overridecheck/js/overridecheck.es6.min.js
@@ -0,0 +1 @@
+(()=>{"use strict";document.addEventListener("DOMContentLoaded",()=>{if(Joomla.getOptions("js-override-check")){const e=Joomla.getOptions("js-override-check");Joomla.request({url:e.ajaxUrl,method:"GET",data:"",perform:!0,onSuccess:e=>{const t=document.getElementById("plg_quickicon_overridecheck"),n=t.querySelectorAll("span.j-links-link"),l=JSON.parse(e);if("disabled"!==l.installerOverride)if(l instanceof Array)if(0===l.length){t.classList.add("success");for(let e=0,t=n.length;e<t;e+=1)n[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_UPTODATE")}else{window.scrollTo(0,0),t.classList.add("danger");for(let e=0,t=n.length;e<t;e+=1)n[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND").replace("%s",`<span class="badge badge-light">${l.length}</span>`)}else{t.classList.add("danger");for(let e=0,t=n.length;e<t;e+=1)n[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR")}else{t.classList.add("danger"),t.setAttribute("href","index.php?option=com_plugins&view=plugin&layout=edit&extension_id=491");for(let e=0,t=n.length;e<t;e+=1)n[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE")}},onError:()=>{const e=document.getElementById("plg_quickicon_overridecheck"),t=e.querySelectorAll("span.j-links-link");e.classList.add("danger");for(let e=0,n=t.length;e<n;e+=1)t[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR")}})}})})();
\ No newline at end of file
diff --git a/media/plg_quickicon_overridecheck/js/overridecheck.js b/media/plg_quickicon_overridecheck/js/overridecheck.js
new file mode 100644
index 0000000000000..09ca7e8ea6b55
--- /dev/null
+++ b/media/plg_quickicon_overridecheck/js/overridecheck.js
@@ -0,0 +1,74 @@
+/**
+* PLEASE DO NOT MODIFY THIS FILE. WORK ON THE ES6 VERSION.
+* OTHERWISE YOUR CHANGES WILL BE REPLACED ON THE NEXT BUILD.
+**/
+
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Ajax call to get the override status.
+(function () {
+  'use strict';
+
+  // Add a listener on content loaded to initiate the check.
+
+  document.addEventListener('DOMContentLoaded', function () {
+    if (Joomla.getOptions('js-override-check')) {
+      var options = Joomla.getOptions('js-override-check');
+      Joomla.request({
+        url: options.ajaxUrl,
+        method: 'GET',
+        data: '',
+        perform: true,
+        onSuccess: function onSuccess(response) {
+          var link = document.getElementById('plg_quickicon_overridecheck');
+          var linkSpan = link.querySelectorAll('span.j-links-link');
+          var updateInfoList = JSON.parse(response);
+
+          if (updateInfoList.installerOverride !== 'disabled') {
+            if (updateInfoList instanceof Array) {
+              if (updateInfoList.length === 0) {
+                // No overrides found
+                link.classList.add('success');
+                for (var i = 0, len = linkSpan.length; i < len; i += 1) {
+                  linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_UPTODATE');
+                }
+              } else {
+                // Scroll to page top
+                window.scrollTo(0, 0);
+
+                link.classList.add('danger');
+                for (var _i = 0, _len = linkSpan.length; _i < _len; _i += 1) {
+                  linkSpan[_i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND').replace('%s', '<span class="badge badge-light">' + updateInfoList.length + '</span>');
+                }
+              }
+            } else {
+              // An error occurred
+              link.classList.add('danger');
+              for (var _i2 = 0, _len2 = linkSpan.length; _i2 < _len2; _i2 += 1) {
+                linkSpan[_i2].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR');
+              }
+            }
+          } else {
+            link.classList.add('danger');
+            link.setAttribute('href', 'index.php?option=com_plugins&view=plugin&layout=edit&extension_id=491');
+            for (var _i3 = 0, _len3 = linkSpan.length; _i3 < _len3; _i3 += 1) {
+              linkSpan[_i3].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE');
+            }
+          }
+        },
+        onError: function onError() {
+          // An error occurred
+          var link = document.getElementById('plg_quickicon_overridecheck');
+          var linkSpan = link.querySelectorAll('span.j-links-link');
+          link.classList.add('danger');
+          for (var i = 0, len = linkSpan.length; i < len; i += 1) {
+            linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR');
+          }
+        }
+      });
+    }
+  });
+})();
diff --git a/media/plg_quickicon_overridecheck/js/overridecheck.min.js b/media/plg_quickicon_overridecheck/js/overridecheck.min.js
new file mode 100644
index 0000000000000..a3ef6fb74d48b
--- /dev/null
+++ b/media/plg_quickicon_overridecheck/js/overridecheck.min.js
@@ -0,0 +1 @@
+!function(){"use strict";document.addEventListener("DOMContentLoaded",function(){if(Joomla.getOptions("js-override-check")){var e=Joomla.getOptions("js-override-check");Joomla.request({url:e.ajaxUrl,method:"GET",data:"",perform:!0,onSuccess:function(e){var n=document.getElementById("plg_quickicon_overridecheck"),o=n.querySelectorAll("span.j-links-link"),r=JSON.parse(e);if("disabled"!==r.installerOverride)if(r instanceof Array)if(0===r.length){n.classList.add("success");for(var t=0,a=o.length;t<a;t+=1)o[t].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_UPTODATE")}else{window.scrollTo(0,0),n.classList.add("danger");for(var l=0,i=o.length;l<i;l+=1)o[l].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND").replace("%s",'<span class="badge badge-light">'+r.length+"</span>")}else{n.classList.add("danger");for(var s=0,d=o.length;s<d;s+=1)o[s].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR")}else{n.classList.add("danger"),n.setAttribute("href","index.php?option=com_plugins&view=plugin&layout=edit&extension_id=491");for(var c=0,E=o.length;c<E;c+=1)o[c].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE")}},onError:function(){var e=document.getElementById("plg_quickicon_overridecheck"),n=e.querySelectorAll("span.j-links-link");e.classList.add("danger");for(var o=0,r=n.length;o<r;o+=1)n[o].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR")}})}})}();
\ No newline at end of file
diff --git a/media/system/js/core.js b/media/system/js/core.js
index 1d31d845ac9ce..1d61f096afa5a 100644
--- a/media/system/js/core.js
+++ b/media/system/js/core.js
@@ -131,6 +131,10 @@ Joomla.Modal = {
 	Joomla.submitbutton = function( task, formSelector, validate ) {
 		var form = document.querySelector( formSelector || 'form.form-validate' );
 
+		if (typeof formSelector === 'string' && form === null) {
+			var form = document.querySelector( '#' + formSelector);
+		}
+
 		if (form) {
 
 			if (validate === undefined || validate === null) {
@@ -575,6 +579,8 @@ Joomla.Modal = {
 	Joomla.isChecked = function( isitchecked, form ) {
 		if ( typeof form  === 'undefined' ) {
 			form = document.getElementById( 'adminForm' );
+		} else if (typeof form === 'string') {
+			form = document.getElementById(form);
 		}
 
 		form.boxchecked.value = isitchecked ? parseInt(form.boxchecked.value) + 1 : parseInt(form.boxchecked.value) - 1;
@@ -614,6 +620,8 @@ Joomla.Modal = {
 	Joomla.tableOrdering = function( order, dir, task, form ) {
 		if ( typeof form  === 'undefined' ) {
 			form = document.getElementById( 'adminForm' );
+		} else if ( typeof form  === 'string' ) {
+			form = document.getElementById(form);
 		}
 
 		form.filter_order.value = order;
@@ -647,12 +655,13 @@ Joomla.Modal = {
 	 *
 	 * @param id
 	 * @param task
+	 * @param form
 	 * @return
 	 *
 	 * @deprecated 4.0  Use Joomla.listItemTask() instead
 	 */
-	window.listItemTask = function ( id, task ) {
-		return Joomla.listItemTask( id, task );
+	window.listItemTask = function ( id, task, form = null ) {
+		return Joomla.listItemTask( id, task, form );
 	};
 
 	/**
@@ -663,9 +672,15 @@ Joomla.Modal = {
 	 *
 	 * @return {boolean}
 	 */
-	Joomla.listItemTask = function ( id, task ) {
-		var f = document.adminForm,
-		    i = 0, cbx,
+	Joomla.listItemTask = function ( id, task, form = null ) {
+
+		if (form !== null) {
+			var f = document.getElementById(form);
+		} else {
+			var f = document.adminForm;
+		}
+
+		var i = 0, cbx,
 		    cb = f[ id ];
 
 		if ( !cb ) return false;
@@ -682,7 +697,7 @@ Joomla.Modal = {
 
 		cb.checked = true;
 		f.boxchecked.value = 1;
-		window.submitform( task );
+		window.submitform( task, f );
 
 		return false;
 	};
@@ -692,8 +707,8 @@ Joomla.Modal = {
 	 *
 	 * @deprecated 4.0  Use Joomla.submitbutton() instead.
 	 */
-	window.submitbutton = function ( pressbutton ) {
-		Joomla.submitbutton( pressbutton );
+	window.submitbutton = function ( pressbutton, form = null ) {
+		Joomla.submitbutton( pressbutton, form );
 	};
 
 	/**
@@ -701,8 +716,8 @@ Joomla.Modal = {
 	 *
 	 * @deprecated 4.0  Use Joomla.submitform() instead.
 	 */
-	window.submitform = function ( pressbutton ) {
-		Joomla.submitform(pressbutton);
+	window.submitform = function ( pressbutton, form = null ) {
+		Joomla.submitform( pressbutton, form );
 	};
 
 	// needed for Table Column ordering
diff --git a/media/system/js/core.min.js b/media/system/js/core.min.js
index 9fa4e2dc00350..84c32f99f3531 100644
--- a/media/system/js/core.min.js
+++ b/media/system/js/core.min.js
@@ -1 +1 @@
-Joomla=window.Joomla||{},Joomla.editors=Joomla.editors||{},Joomla.editors.instances=Joomla.editors.instances||{},Joomla.Modal={current:"",setCurrent:function(e){this.current=e},getCurrent:function(){return this.current}},function(e,t){"use strict";e.submitform=function(e,n,o){n||(n=t.getElementById("adminForm")),e&&(n.task.value=e),n.noValidate=!o,o?n.hasAttribute("novalidate")&&n.removeAttribute("novalidate"):n.setAttribute("novalidate","");var r=t.createElement("input");r.style.display="none",r.type="submit",n.appendChild(r).click(),n.removeChild(r)},e.submitbutton=function(n,o,r){var s=t.querySelector(o||"form.form-validate");if(s){if(void 0===r||null===r){var i=n.split("."),a=s.getAttribute("data-cancel-task");a||(a=i[0]+".cancel"),r=n!==a}r&&!t.formvalidator.isValid(s)||e.submitform(n,s)}else e.submitform(n)},e.JText={strings:{},_:function(t,n){var o=e.getOptions("joomla.jtext");return o&&(this.load(o),e.loadOptions({"joomla.jtext":null})),n=void 0===n?"":n,t=t.toUpperCase(),void 0!==this.strings[t]?this.strings[t]:n},load:function(e){for(var t in e)e.hasOwnProperty(t)&&(this.strings[t.toUpperCase()]=e[t]);return this}},e.optionsStorage=e.optionsStorage||null,e.getOptions=function(t,n){return e.optionsStorage||e.loadOptions(),void 0!==e.optionsStorage[t]?e.optionsStorage[t]:n},e.loadOptions=function(n){if(!n){for(var o,r,s,i=t.querySelectorAll(".joomla-script-options.new"),a=0,l=0,c=i.length;l<c;l++)o=(r=i[l]).text||r.textContent,(s=JSON.parse(o))&&(e.loadOptions(s),a++),r.className=r.className.replace(" new"," loaded");if(a)return}if(e.optionsStorage){if(n)for(var d in n)n.hasOwnProperty(d)&&(null!==n[d]&&"object"==typeof e.optionsStorage[d]&&"object"==typeof n[d]?e.optionsStorage[d]=e.extend(e.optionsStorage[d],n[d]):e.optionsStorage[d]=n[d])}else e.optionsStorage=n||{}},e.replaceTokens=function(e){if(/^[0-9A-F]{32}$/i.test(e)){var n,o,r,s=t.getElementsByTagName("input");for(n=0,r=s.length;n<r;n++)"hidden"==(o=s[n]).type&&"1"==o.value&&32==o.name.length&&(o.name=e)}},e.isEmail=function(e){return/^[\w.!#$%&‚Äô*+\/=?^`{|}~-]+@[a-z0-9-]+(?:\.[a-z0-9-]{2,})+$/i.test(e)},e.checkAll=function(t,n){if(!t.form)return!1;n=n||"cb";var o,r,s,i=0;for(o=0,s=t.form.elements.length;o<s;o++)(r=t.form.elements[o]).type==t.type&&0===r.id.indexOf(n)&&(r.checked=t.checked,i+=r.checked?1:0);return t.form.boxchecked&&(t.form.boxchecked.value=i,e.Event.dispatch(t.form.boxchecked,"change")),!0},e.renderMessages=function(n,o,r,s){var i,a,l,c,d,m,u,f;for(a in i=void 0===o||o&&"#system-message-container"===o?t.getElementById("system-message-container"):t.querySelector(o),(void 0===r||r&&!1===r)&&e.removeMessages(i),n)if(n.hasOwnProperty(a)){if(l=n[a],"object"==typeof window.customElements&&"function"==typeof window.customElements.get("joomla-alert"))c=t.createElement("joomla-alert"),["notice","message","error"].indexOf(a)>-1?(f="notice"===a?"info":a,f="message"===a?"success":f,f="error"===a?"danger":f):f="info",c.setAttribute("type",f),c.setAttribute("dismiss","true"),s&&parseInt(s)>0&&c.setAttribute("autodismiss",s);else{c=t.createElement("div"),["notice","message","error"].indexOf(a)>-1?(f="notice"===a?"info":a,f="message"===a?"success":f,f="error"===a?"danger":f):f="info",c.className="alert "+f;var p=t.createElement("button");p.setAttribute("type","button"),p.setAttribute("data-dismiss","alert"),p.className="close",p.innerHTML="×",c.appendChild(p)}for(void 0!==e.JText._(a)&&((d=t.createElement("h4")).className="alert-heading",d.innerHTML=e.JText._(a)?e.JText._(a):a,c.appendChild(d)),m=l.length-1;m>=0;m--)(u=t.createElement("div")).innerHTML=l[m],c.appendChild(u);i.appendChild(c),"object"!=typeof window.customElements&&"function"!=typeof window.customElements.get("joomla-alert")&&s&&parseInt(s)>0&&setTimeout(function(){e.removeMessages(i)},s)}},e.removeMessages=function(e){var n;if(n=e||t.getElementById("system-message-container"),"object"==typeof window.customElements&&window.customElements.get("joomla-alert")){var o=n.querySelectorAll("joomla-alert");if(o.length)for(var r=0,s=o.length;r<s;r++)o[r].close()}else{for(;n.firstChild;)n.removeChild(n.firstChild);n.style.display="none",n.offsetHeight,n.style.display=""}},e.ajaxErrorsMessages=function(t,n,o){var r={};if("parsererror"===n){for(var s=t.responseText.trim(),i=[],a=s.length-1;a>=0;a--)i.unshift(["&#",s[a].charCodeAt(),";"].join(""));s=i.join(""),r.error=[e.JText._("JLIB_JS_AJAX_ERROR_PARSE").replace("%s",s)]}else"nocontent"===n?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_NO_CONTENT")]:"timeout"===n?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_TIMEOUT")]:"abort"===n?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_CONNECTION_ABORT")]:t.responseJSON&&t.responseJSON.message?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)+" <em>"+t.responseJSON.message+"</em>"]:t.statusText?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)+" <em>"+t.statusText+"</em>"]:r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)];return r},e.isChecked=function(n,o){if(void 0===o&&(o=t.getElementById("adminForm")),o.boxchecked.value=n?parseInt(o.boxchecked.value)+1:parseInt(o.boxchecked.value)-1,e.Event.dispatch(o.boxchecked,"change"),o.elements["checkall-toggle"]){var r,s,i,a=!0;for(r=0,i=o.elements.length;r<i;r++)if("checkbox"==(s=o.elements[r]).type&&"checkall-toggle"!=s.name&&!s.checked){a=!1;break}o.elements["checkall-toggle"].checked=a}},e.tableOrdering=function(n,o,r,s){void 0===s&&(s=t.getElementById("adminForm")),s.filter_order.value=n,s.filter_order_Dir.value=o,e.submitform(r,s)},window.getSelectedValue=function(e,n){var o=t[e][n],r=o.selectedIndex;return null!==r&&r>-1?o.options[r].value:null},window.listItemTask=function(t,n){return e.listItemTask(t,n)},e.listItemTask=function(e,n){var o,r=t.adminForm,s=0,i=r[e];if(!i)return!1;for(;o=r["cb"+s];)o.checked=!1,s++;return i.checked=!0,r.boxchecked.value=1,window.submitform(n),!1},window.submitbutton=function(t){e.submitbutton(t)},window.submitform=function(t){e.submitform(t)},window.saveorder=function(e,t){window.checkAll_button(e,t)},window.checkAll_button=function(n,o){var r,s;for(o=o||"saveorder",r=0;r<=n;r++){if(!(s=t.adminForm["cb"+r]))return void alert("You cannot change the order of items, as an item in the list is `Checked Out`");s.checked=!0}e.submitform(o)},e.loadingLayer=function(n,o){if(n=n||"show",o=o||t.body,"load"===n){var r=(e.getOptions("system.paths")||{}).root||"",s=t.createElement("div");s.id="loading-logo",s.style.position="fixed",s.style.top="0",s.style.left="0",s.style.width="100%",s.style.height="100%",s.style.opacity="0.8",s.style.filter="alpha(opacity=80)",s.style.overflow="hidden",s.style["z-index"]="10000",s.style.display="none",s.style["background-color"]="#fff",s.style["background-image"]='url("'+r+'/media/system/images/ajax-loader.gif")',s.style["background-position"]="center",s.style["background-repeat"]="no-repeat",s.style["background-attachment"]="fixed",o.appendChild(s)}else t.getElementById("loading-logo")||e.loadingLayer("load",o),t.getElementById("loading-logo").style.display="show"==n?"block":"none";return t.getElementById("loading-logo")},e.extend=function(e,t){for(var n in null===e&&(e={}),t)t.hasOwnProperty(n)&&(e[n]=t[n]);return e},e.request=function(t){t=e.extend({url:"",method:"GET",data:null,perform:!0},t);try{var n=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("MSXML2.XMLHTTP.3.0");if(n.open(t.method,t.url,!0),n.setRequestHeader("X-Requested-With","XMLHttpRequest"),n.setRequestHeader("X-Ajax-Engine","Joomla!"),"GET"!==t.method){var o=e.getOptions("csrf.token","");o&&n.setRequestHeader("X-CSRF-Token",o),t.headers&&t.headers["Content-Type"]||n.setRequestHeader("Content-Type","application/x-www-form-urlencoded")}if(t.headers)for(var r in t.headers)t.headers.hasOwnProperty(r)&&n.setRequestHeader(r,t.headers[r]);if(n.onreadystatechange=function(){4===n.readyState&&(200===n.status?t.onSuccess&&t.onSuccess.call(window,n.responseText,n):t.onError&&t.onError.call(window,n))},t.perform){if(t.onBefore&&!1===t.onBefore.call(window,n))return n;n.send(t.data)}}catch(e){return window.console&&console.log(e),!1}return n},e.localStorageEnabled=function(){var e="joomla-cms";try{return localStorage.setItem(e,e),localStorage.removeItem(e),!0}catch(e){return!1}},e.WebComponents=function(){var n=e.getOptions("webcomponents");if(n&&n.length){var o,r=!1,s=[],i=!1,a=function(){window.WebComponents.ready=!0,t.dispatchEvent(new CustomEvent("WebComponentsReady",{bubbles:!0})),m()},l=function(){window.customElements&&customElements.polyfillWrapFlushCallback&&customElements.polyfillWrapFlushCallback(function(e){o=e,i&&o()})},c=function(){window.HTMLTemplateElement&&HTMLTemplateElement.bootstrap&&HTMLTemplateElement.bootstrap(window.document),r=!0,d().then(a)},d=function(){i=!1;return Promise.all(s.map(function(e){return e instanceof Function?e():e})).then(function(){i=!0,s.length=0,o&&o()}).catch(function(e){console.error(e)})};window.WebComponents=window.WebComponents||{ready:!1,_batchCustomElements:l,waitFor:function(e){e&&(s.push(e),r&&d())}};var m=function(){n&&n.length&&n.forEach(function(e){if(e.match(/\.js/g)){var n,o=t.createElement("script");if(function(){try{return new Function("(a = 0) => a"),!0}catch(e){return!1}}())o.src=e;else e.match(/\.min\.js/g)?n=e.replace(/\.min\.js/g,"-es5.min.js"):e.match(/\.js/g)&&(n=e.replace(/\.js/g,"-es5.js")),o.src=n}o&&t.head.appendChild(o)})},u="core.min.js",f=t.querySelector('script[src*="'+u+'"]');if(f||(u="core.js",f=t.querySelector('script[src*="'+u+'"]')),!f)throw new Error("core(.min).js is not registered correctly!");var p=[];(!("attachShadow"in Element.prototype&&"getRootNode"in Element.prototype)||window.ShadyDOM&&window.ShadyDOM.force)&&p.push("sd"),window.customElements&&!window.customElements.forcePolyfill||p.push("ce");var h=function(){var e=t.createElement("template");if(!("content"in e))return!0;if(!(e.content.cloneNode()instanceof DocumentFragment))return!0;var n=t.createElement("template");n.content.appendChild(t.createElement("div")),e.content.appendChild(n);var o=e.cloneNode(!0);return 0===o.content.childNodes.length||0===o.content.firstChild.content.childNodes.length}();if(window.Promise&&Array.from&&window.URL&&window.Symbol&&!h||(p=["sd-ce-pf"]),p.length){var g=t.createElement("script"),w="media/vendor/webcomponentsjs/js/webcomponents-"+p.join("-")+".min.js",v=f.src.match(/\?.*/)[0],y=e.getOptions("system.paths");if(!y)throw new Error("core(.min).js is not registered correctly!");g.src=y.rootFull+w+(v||""),"loading"===t.readyState?(g.setAttribute("onload","window.WebComponents._batchCustomElements()"),t.write(g.outerHTML),t.addEventListener("DOMContentLoaded",c)):(g.addEventListener("load",function(){l(),c()}),g.addEventListener("error",function(){throw new Error("Could not load polyfill bundle"+url)}),t.head.appendChild(g))}else r=!0,"complete"===t.readyState?a():(window.addEventListener("load",c),window.addEventListener("DOMContentLoaded",function(){window.removeEventListener("load",c),c()}))}}}(Joomla,document),function(e,t){"use strict";t.Event||(t.Event={},t.Event.dispatch=function(t,n,o){var r;"string"==typeof t&&(o=n,n=t,t=e),o=o||{},e.CustomEvent&&"function"==typeof e.CustomEvent?r=new CustomEvent(n,{detail:o,bubbles:!0,cancelable:!0}):((r=document.createEvent("Event")).initEvent(n,!0,!0),r.detail=o),t.dispatchEvent(r)},t.Event.listenOnce=function(e,t,n){var o=function(r){return e.removeEventListener(t,o),n.call(e,r)};e.addEventListener(t,o)})}(window,Joomla),document.addEventListener("DOMContentLoaded",function(){Joomla.WebComponents()});
\ No newline at end of file
+Joomla=window.Joomla||{},Joomla.editors=Joomla.editors||{},Joomla.editors.instances=Joomla.editors.instances||{},Joomla.Modal={current:"",setCurrent:function(e){this.current=e},getCurrent:function(){return this.current}},function(e,t){"use strict";e.submitform=function(e,n,o){n||(n=t.getElementById("adminForm")),e&&(n.task.value=e),n.noValidate=!o,o?n.hasAttribute("novalidate")&&n.removeAttribute("novalidate"):n.setAttribute("novalidate","");var r=t.createElement("input");r.style.display="none",r.type="submit",n.appendChild(r).click(),n.removeChild(r)},e.submitbutton=function(n,o,r){var s=t.querySelector(o||"form.form-validate");if("string"==typeof o&&null===s)s=t.querySelector("#"+o);if(s){if(void 0===r||null===r){var i=n.split("."),a=s.getAttribute("data-cancel-task");a||(a=i[0]+".cancel"),r=n!==a}r&&!t.formvalidator.isValid(s)||e.submitform(n,s)}else e.submitform(n)},e.JText={strings:{},_:function(t,n){var o=e.getOptions("joomla.jtext");return o&&(this.load(o),e.loadOptions({"joomla.jtext":null})),n=void 0===n?"":n,t=t.toUpperCase(),void 0!==this.strings[t]?this.strings[t]:n},load:function(e){for(var t in e)e.hasOwnProperty(t)&&(this.strings[t.toUpperCase()]=e[t]);return this}},e.optionsStorage=e.optionsStorage||null,e.getOptions=function(t,n){return e.optionsStorage||e.loadOptions(),void 0!==e.optionsStorage[t]?e.optionsStorage[t]:n},e.loadOptions=function(n){if(!n){for(var o,r,s,i=t.querySelectorAll(".joomla-script-options.new"),a=0,l=0,c=i.length;l<c;l++)o=(r=i[l]).text||r.textContent,(s=JSON.parse(o))&&(e.loadOptions(s),a++),r.className=r.className.replace(" new"," loaded");if(a)return}if(e.optionsStorage){if(n)for(var d in n)n.hasOwnProperty(d)&&(null!==n[d]&&"object"==typeof e.optionsStorage[d]&&"object"==typeof n[d]?e.optionsStorage[d]=e.extend(e.optionsStorage[d],n[d]):e.optionsStorage[d]=n[d])}else e.optionsStorage=n||{}},e.replaceTokens=function(e){if(/^[0-9A-F]{32}$/i.test(e)){var n,o,r,s=t.getElementsByTagName("input");for(n=0,r=s.length;n<r;n++)"hidden"==(o=s[n]).type&&"1"==o.value&&32==o.name.length&&(o.name=e)}},e.isEmail=function(e){return/^[\w.!#$%&‚Äô*+\/=?^`{|}~-]+@[a-z0-9-]+(?:\.[a-z0-9-]{2,})+$/i.test(e)},e.checkAll=function(t,n){if(!t.form)return!1;n=n||"cb";var o,r,s,i=0;for(o=0,s=t.form.elements.length;o<s;o++)(r=t.form.elements[o]).type==t.type&&0===r.id.indexOf(n)&&(r.checked=t.checked,i+=r.checked?1:0);return t.form.boxchecked&&(t.form.boxchecked.value=i,e.Event.dispatch(t.form.boxchecked,"change")),!0},e.renderMessages=function(n,o,r,s){var i,a,l,c,d,u,m,f;for(a in i=void 0===o||o&&"#system-message-container"===o?t.getElementById("system-message-container"):t.querySelector(o),(void 0===r||r&&!1===r)&&e.removeMessages(i),n)if(n.hasOwnProperty(a)){if(l=n[a],"object"==typeof window.customElements&&"function"==typeof window.customElements.get("joomla-alert"))c=t.createElement("joomla-alert"),["notice","message","error"].indexOf(a)>-1?(f="notice"===a?"info":a,f="message"===a?"success":f,f="error"===a?"danger":f):f="info",c.setAttribute("type",f),c.setAttribute("dismiss","true"),s&&parseInt(s)>0&&c.setAttribute("autodismiss",s);else{c=t.createElement("div"),["notice","message","error"].indexOf(a)>-1?(f="notice"===a?"info":a,f="message"===a?"success":f,f="error"===a?"danger":f):f="info",c.className="alert "+f;var p=t.createElement("button");p.setAttribute("type","button"),p.setAttribute("data-dismiss","alert"),p.className="close",p.innerHTML="×",c.appendChild(p)}for(void 0!==e.JText._(a)&&((d=t.createElement("h4")).className="alert-heading",d.innerHTML=e.JText._(a)?e.JText._(a):a,c.appendChild(d)),u=l.length-1;u>=0;u--)(m=t.createElement("div")).innerHTML=l[u],c.appendChild(m);i.appendChild(c),"object"!=typeof window.customElements&&"function"!=typeof window.customElements.get("joomla-alert")&&s&&parseInt(s)>0&&setTimeout(function(){e.removeMessages(i)},s)}},e.removeMessages=function(e){var n;if(n=e||t.getElementById("system-message-container"),"object"==typeof window.customElements&&window.customElements.get("joomla-alert")){var o=n.querySelectorAll("joomla-alert");if(o.length)for(var r=0,s=o.length;r<s;r++)o[r].close()}else{for(;n.firstChild;)n.removeChild(n.firstChild);n.style.display="none",n.offsetHeight,n.style.display=""}},e.ajaxErrorsMessages=function(t,n,o){var r={};if("parsererror"===n){for(var s=t.responseText.trim(),i=[],a=s.length-1;a>=0;a--)i.unshift(["&#",s[a].charCodeAt(),";"].join(""));s=i.join(""),r.error=[e.JText._("JLIB_JS_AJAX_ERROR_PARSE").replace("%s",s)]}else"nocontent"===n?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_NO_CONTENT")]:"timeout"===n?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_TIMEOUT")]:"abort"===n?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_CONNECTION_ABORT")]:t.responseJSON&&t.responseJSON.message?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)+" <em>"+t.responseJSON.message+"</em>"]:t.statusText?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)+" <em>"+t.statusText+"</em>"]:r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)];return r},e.isChecked=function(n,o){if(void 0===o?o=t.getElementById("adminForm"):"string"==typeof o&&(o=t.getElementById(o)),o.boxchecked.value=n?parseInt(o.boxchecked.value)+1:parseInt(o.boxchecked.value)-1,e.Event.dispatch(o.boxchecked,"change"),o.elements["checkall-toggle"]){var r,s,i,a=!0;for(r=0,i=o.elements.length;r<i;r++)if("checkbox"==(s=o.elements[r]).type&&"checkall-toggle"!=s.name&&!s.checked){a=!1;break}o.elements["checkall-toggle"].checked=a}},e.tableOrdering=function(n,o,r,s){void 0===s?s=t.getElementById("adminForm"):"string"==typeof s&&(s=t.getElementById(s)),s.filter_order.value=n,s.filter_order_Dir.value=o,e.submitform(r,s)},window.getSelectedValue=function(e,n){var o=t[e][n],r=o.selectedIndex;return null!==r&&r>-1?o.options[r].value:null},window.listItemTask=function(t,n,o=null){return e.listItemTask(t,n,o)},e.listItemTask=function(e,n,o=null){if(null!==o)var r=t.getElementById(o);else r=t.adminForm;var s,i=0,a=r[e];if(!a)return!1;for(;s=r["cb"+i];)s.checked=!1,i++;return a.checked=!0,r.boxchecked.value=1,window.submitform(n,r),!1},window.submitbutton=function(t,n=null){e.submitbutton(t,n)},window.submitform=function(t,n=null){e.submitform(t,n)},window.saveorder=function(e,t){window.checkAll_button(e,t)},window.checkAll_button=function(n,o){var r,s;for(o=o||"saveorder",r=0;r<=n;r++){if(!(s=t.adminForm["cb"+r]))return void alert("You cannot change the order of items, as an item in the list is `Checked Out`");s.checked=!0}e.submitform(o)},e.loadingLayer=function(n,o){if(n=n||"show",o=o||t.body,"load"===n){var r=(e.getOptions("system.paths")||{}).root||"",s=t.createElement("div");s.id="loading-logo",s.style.position="fixed",s.style.top="0",s.style.left="0",s.style.width="100%",s.style.height="100%",s.style.opacity="0.8",s.style.filter="alpha(opacity=80)",s.style.overflow="hidden",s.style["z-index"]="10000",s.style.display="none",s.style["background-color"]="#fff",s.style["background-image"]='url("'+r+'/media/system/images/ajax-loader.gif")',s.style["background-position"]="center",s.style["background-repeat"]="no-repeat",s.style["background-attachment"]="fixed",o.appendChild(s)}else t.getElementById("loading-logo")||e.loadingLayer("load",o),t.getElementById("loading-logo").style.display="show"==n?"block":"none";return t.getElementById("loading-logo")},e.extend=function(e,t){for(var n in null===e&&(e={}),t)t.hasOwnProperty(n)&&(e[n]=t[n]);return e},e.request=function(t){t=e.extend({url:"",method:"GET",data:null,perform:!0},t);try{var n=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("MSXML2.XMLHTTP.3.0");if(n.open(t.method,t.url,!0),n.setRequestHeader("X-Requested-With","XMLHttpRequest"),n.setRequestHeader("X-Ajax-Engine","Joomla!"),"GET"!==t.method){var o=e.getOptions("csrf.token","");o&&n.setRequestHeader("X-CSRF-Token",o),t.headers&&t.headers["Content-Type"]||n.setRequestHeader("Content-Type","application/x-www-form-urlencoded")}if(t.headers)for(var r in t.headers)t.headers.hasOwnProperty(r)&&n.setRequestHeader(r,t.headers[r]);if(n.onreadystatechange=function(){4===n.readyState&&(200===n.status?t.onSuccess&&t.onSuccess.call(window,n.responseText,n):t.onError&&t.onError.call(window,n))},t.perform){if(t.onBefore&&!1===t.onBefore.call(window,n))return n;n.send(t.data)}}catch(e){return window.console&&console.log(e),!1}return n},e.localStorageEnabled=function(){var e="joomla-cms";try{return localStorage.setItem(e,e),localStorage.removeItem(e),!0}catch(e){return!1}},e.WebComponents=function(){var n=e.getOptions("webcomponents");if(n&&n.length){var o,r=!1,s=[],i=!1,a=function(){window.WebComponents.ready=!0,t.dispatchEvent(new CustomEvent("WebComponentsReady",{bubbles:!0})),u()},l=function(){window.customElements&&customElements.polyfillWrapFlushCallback&&customElements.polyfillWrapFlushCallback(function(e){o=e,i&&o()})},c=function(){window.HTMLTemplateElement&&HTMLTemplateElement.bootstrap&&HTMLTemplateElement.bootstrap(window.document),r=!0,d().then(a)},d=function(){i=!1;return Promise.all(s.map(function(e){return e instanceof Function?e():e})).then(function(){i=!0,s.length=0,o&&o()}).catch(function(e){console.error(e)})};window.WebComponents=window.WebComponents||{ready:!1,_batchCustomElements:l,waitFor:function(e){e&&(s.push(e),r&&d())}};var u=function(){n&&n.length&&n.forEach(function(e){if(e.match(/\.js/g)){var n,o=t.createElement("script");if(function(){try{return new Function("(a = 0) => a"),!0}catch(e){return!1}}())o.src=e;else e.match(/\.min\.js/g)?n=e.replace(/\.min\.js/g,"-es5.min.js"):e.match(/\.js/g)&&(n=e.replace(/\.js/g,"-es5.js")),o.src=n}o&&t.head.appendChild(o)})},m="core.min.js",f=t.querySelector('script[src*="'+m+'"]');if(f||(m="core.js",f=t.querySelector('script[src*="'+m+'"]')),!f)throw new Error("core(.min).js is not registered correctly!");var p=[];(!("attachShadow"in Element.prototype&&"getRootNode"in Element.prototype)||window.ShadyDOM&&window.ShadyDOM.force)&&p.push("sd"),window.customElements&&!window.customElements.forcePolyfill||p.push("ce");var h=function(){var e=t.createElement("template");if(!("content"in e))return!0;if(!(e.content.cloneNode()instanceof DocumentFragment))return!0;var n=t.createElement("template");n.content.appendChild(t.createElement("div")),e.content.appendChild(n);var o=e.cloneNode(!0);return 0===o.content.childNodes.length||0===o.content.firstChild.content.childNodes.length}();if(window.Promise&&Array.from&&window.URL&&window.Symbol&&!h||(p=["sd-ce-pf"]),p.length){var g=t.createElement("script"),w="media/vendor/webcomponentsjs/js/webcomponents-"+p.join("-")+".min.js",v=f.src.match(/\?.*/)[0],y=e.getOptions("system.paths");if(!y)throw new Error("core(.min).js is not registered correctly!");g.src=y.rootFull+w+(v||""),"loading"===t.readyState?(g.setAttribute("onload","window.WebComponents._batchCustomElements()"),t.write(g.outerHTML),t.addEventListener("DOMContentLoaded",c)):(g.addEventListener("load",function(){l(),c()}),g.addEventListener("error",function(){throw new Error("Could not load polyfill bundle"+url)}),t.head.appendChild(g))}else r=!0,"complete"===t.readyState?a():(window.addEventListener("load",c),window.addEventListener("DOMContentLoaded",function(){window.removeEventListener("load",c),c()}))}}}(Joomla,document),function(e,t){"use strict";t.Event||(t.Event={},t.Event.dispatch=function(t,n,o){var r;"string"==typeof t&&(o=n,n=t,t=e),o=o||{},e.CustomEvent&&"function"==typeof e.CustomEvent?r=new CustomEvent(n,{detail:o,bubbles:!0,cancelable:!0}):((r=document.createEvent("Event")).initEvent(n,!0,!0),r.detail=o),t.dispatchEvent(r)},t.Event.listenOnce=function(e,t,n){var o=function(r){return e.removeEventListener(t,o),n.call(e,r)};e.addEventListener(t,o)})}(window,Joomla),document.addEventListener("DOMContentLoaded",function(){Joomla.WebComponents()});
\ No newline at end of file
diff --git a/media/system/js/multiselect.js b/media/system/js/multiselect.js
index 3d7cec55dfcf3..b08ef99ef5b11 100644
--- a/media/system/js/multiselect.js
+++ b/media/system/js/multiselect.js
@@ -54,6 +54,7 @@ Joomla = window.Joomla || {};
 		if (Joomla.getOptions && typeof Joomla.getOptions === 'function' && Joomla.getOptions('js-multiselect')) {
 			if (Joomla.getOptions('js-multiselect').formName) {
 				Joomla.JMultiSelect(Joomla.getOptions('js-multiselect').formName);
+				var optionalForm = document.getElementById(Joomla.getOptions('js-multiselect').formName);
 			} else {
 				Joomla.JMultiSelect('adminForm');
 			}
@@ -96,7 +97,7 @@ Joomla = window.Joomla || {};
 					if (cbClicked) {
 						if (!(event.target.id == clicked)) {
 							cbClicked.checked = !cbClicked.checked;
-							Joomla.isChecked(cbClicked.checked);
+							Joomla.isChecked(cbClicked.checked, optionalForm);
 						}
 
 						changeBg(this, cbClicked);
diff --git a/media/system/js/multiselect.min.js b/media/system/js/multiselect.min.js
index 2416cbb62ca99..a643b68082876 100644
--- a/media/system/js/multiselect.min.js
+++ b/media/system/js/multiselect.min.js
@@ -1 +1 @@
-Joomla=window.Joomla||{},function(e){e.JMultiSelect=function(e){"use strict";var t,c,n=function(e){var n,o,i,l,r=e.target;e.shiftKey&&t.length&&(n=r.hasAttribute(":checked"),o=c.index(t),(i=c.index(r))<o&&(l=o,o=i,i=l),c.slice(o,i+1).setAttribute("checked",n)),t=r};!function(e){var t=document.querySelector(e);if(t)for(var o=0,i=(c=t.querySelectorAll("input[type=checkbox]")).length;c<i;o++)c[o].addEventListener("click",function(e){n(e)})}(e)},document.addEventListener("DOMContentLoaded",function(t){"use strict";e.getOptions&&"function"==typeof e.getOptions&&e.getOptions("js-multiselect")&&(e.getOptions("js-multiselect").formName?e.JMultiSelect(e.getOptions("js-multiselect").formName):e.JMultiSelect("adminForm"));var c=document.querySelectorAll('tr[class^="row"]');function n(e,t){t.checked?e.querySelectorAll("td").forEach(function(e){e.classList.add("row-selected")}):e.querySelectorAll("td").forEach(function(e){e.classList.remove("row-selected")})}var o=document.getElementsByName("checkall-toggle")[0];o&&o.addEventListener("click",function(e){var t=this;c.forEach(function(e,c){n(e,t)})}),c.length&&c.forEach(function(t,c){t.addEventListener("click",function(t){var o="cb"+c,i=document.getElementById(o);i&&(t.target.id!=o&&(i.checked=!i.checked,e.isChecked(i.checked)),n(this,i))})})})}(Joomla);
\ No newline at end of file
+Joomla=window.Joomla||{},function(e){e.JMultiSelect=function(e){"use strict";var t,c,n=function(e){var n,o,i,l,r=e.target;e.shiftKey&&t.length&&(n=r.hasAttribute(":checked"),o=c.index(t),(i=c.index(r))<o&&(l=o,o=i,i=l),c.slice(o,i+1).setAttribute("checked",n)),t=r};!function(e){var t=document.querySelector(e);if(t)for(var o=0,i=(c=t.querySelectorAll("input[type=checkbox]")).length;c<i;o++)c[o].addEventListener("click",function(e){n(e)})}(e)},document.addEventListener("DOMContentLoaded",function(t){"use strict";if(e.getOptions&&"function"==typeof e.getOptions&&e.getOptions("js-multiselect"))if(e.getOptions("js-multiselect").formName){e.JMultiSelect(e.getOptions("js-multiselect").formName);var c=document.getElementById(e.getOptions("js-multiselect").formName)}else e.JMultiSelect("adminForm");var n=document.querySelectorAll('tr[class^="row"]');function o(e,t){t.checked?e.querySelectorAll("td").forEach(function(e){e.classList.add("row-selected")}):e.querySelectorAll("td").forEach(function(e){e.classList.remove("row-selected")})}var i=document.getElementsByName("checkall-toggle")[0];i&&i.addEventListener("click",function(e){var t=this;n.forEach(function(e,c){o(e,t)})}),n.length&&n.forEach(function(t,n){t.addEventListener("click",function(t){var i="cb"+n,l=document.getElementById(i);l&&(t.target.id!=i&&(l.checked=!l.checked,e.isChecked(l.checked,c)),o(this,l))})})})}(Joomla);
\ No newline at end of file
diff --git a/media/system/webcomponents/js/joomla-toolbar-button-es5.js b/media/system/webcomponents/js/joomla-toolbar-button-es5.js
index 3dbffe8d28c3a..206af50329a23 100644
--- a/media/system/webcomponents/js/joomla-toolbar-button-es5.js
+++ b/media/system/webcomponents/js/joomla-toolbar-button-es5.js
@@ -1,4 +1,4 @@
-(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 'use strict';
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -76,8 +76,8 @@ function _inherits(subClass, superClass) { if (typeof superClass !== "function"
         var _this2 = this;
 
         // Check whether we have a form
-        var formSelector = this.form || '#adminForm';
-        this.formElement = document.querySelector(formSelector);
+        var formSelector = this.form || 'adminForm';
+        this.formElement = document.getElementById(formSelector);
 
         if (this.listSelection) {
           if (!this.formElement) {
diff --git a/media/system/webcomponents/js/joomla-toolbar-button-es5.min.js b/media/system/webcomponents/js/joomla-toolbar-button-es5.min.js
index e607707c05b89..00b2616cfc24f 100644
--- a/media/system/webcomponents/js/joomla-toolbar-button-es5.min.js
+++ b/media/system/webcomponents/js/joomla-toolbar-button-es5.min.js
@@ -1 +1,4 @@
-!function t(e,r,n){function o(u,s){if(!r[u]){if(!e[u]){var a="function"==typeof require&&require;if(!s&&a)return a(u,!0);if(i)return i(u,!0);var f=new Error("Cannot find module '"+u+"'");throw f.code="MODULE_NOT_FOUND",f}var c=r[u]={exports:{}};e[u][0].call(c.exports,function(t){var r=e[u][1][t];return o(r||t)},c,c.exports,t,e,r,n)}return r[u].exports}for(var i="function"==typeof require&&require,u=0;u<n.length;u++)o(n[u]);return o}({1:[function(t,e,r){"use strict";var n=function(){function t(t,e){for(var r=0;r<e.length;r++){var n=e[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}return function(e,r,n){return r&&t(e.prototype,r),n&&t(e,n),e}}();!function(t){var e=function(t){function e(){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,e);var t=function(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}(this,(e.__proto__||Object.getPrototypeOf(e)).call(this));return t.buttonElement=t.querySelector("button"),t.disabled=!1,t.listSelection&&t.setDisabled(!0),t.addEventListener("click",function(e){return t.executeTask(e)}),t}return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}(e,HTMLElement),n(e,[{key:"task",get:function(){return this.getAttribute("task")}},{key:"listSelection",get:function(){return this.hasAttribute("list-selection")}},{key:"form",get:function(){return this.getAttribute("form")}},{key:"formValidation",get:function(){return this.hasAttribute("form-validation")}},{key:"confirmMessage",get:function(){return this.getAttribute("confirm-message")}}]),n(e,[{key:"connectedCallback",value:function(){var t=this,e=this.form||"#adminForm";if(this.formElement=document.querySelector(e),this.listSelection){if(!this.formElement)throw new Error('The form "'+e+'" is required to perform the task, but the form not found on the page.');this.formElement.boxchecked.addEventListener("change",function(e){t.setDisabled(e.target.value<1)})}}},{key:"setDisabled",value:function(t){this.disabled=!!t,this.buttonElement&&(this.disabled?this.buttonElement.setAttribute("disabled",!0):this.buttonElement.removeAttribute("disabled"))}},{key:"executeTask",value:function(){if(this.disabled)return!1;if(this.confirmMessage&&!confirm(this.confirmMessage))return!1;if(!this.task)throw new Error('"task" attribute must be preset to perform an action.');return Joomla.submitbutton(this.task,this.form,this.formValidation),!0}}]),e}();t.define("joomla-toolbar-button",e)}(customElements)},{}]},{},[1]);
\ No newline at end of file
+(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+'use strict';var _createClass=function(){function a(a,b){for(var c,d=0;d<b.length;d++)c=b[d],c.enumerable=c.enumerable||!1,c.configurable=!0,'value'in c&&(c.writable=!0),Object.defineProperty(a,c.key,c)}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}();function _classCallCheck(a,b){if(!(a instanceof b))throw new TypeError('Cannot call a class as a function')}function _possibleConstructorReturn(a,b){if(!a)throw new ReferenceError('this hasn\'t been initialised - super() hasn\'t been called');return b&&('object'==typeof b||'function'==typeof b)?b:a}function _inherits(a,b){if('function'!=typeof b&&null!==b)throw new TypeError('Super expression must either be null or a function, not '+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}}),b&&(Object.setPrototypeOf?Object.setPrototypeOf(a,b):a.__proto__=b)}(function(a){'use strict';var b=function(a){function b(){_classCallCheck(this,b);var a=_possibleConstructorReturn(this,(b.__proto__||Object.getPrototypeOf(b)).call(this));return a.buttonElement=a.querySelector('button'),a.disabled=!1,a.listSelection&&a.setDisabled(!0),a.addEventListener('click',function(b){return a.executeTask(b)}),a}return _inherits(b,a),_createClass(b,[{key:'task',get:function get(){return this.getAttribute('task')}},{key:'listSelection',get:function get(){return this.hasAttribute('list-selection')}},{key:'form',get:function get(){return this.getAttribute('form')}},{key:'formValidation',get:function get(){return this.hasAttribute('form-validation')}},{key:'confirmMessage',get:function get(){return this.getAttribute('confirm-message')}}]),_createClass(b,[{key:'connectedCallback',value:function connectedCallback(){var a=this,b=this.form||'adminForm';if(this.formElement=document.getElementById(b),this.listSelection){if(!this.formElement)throw new Error('The form "'+b+'" is required to perform the task, but the form not found on the page.');this.formElement.boxchecked.addEventListener('change',function(b){a.setDisabled(1>b.target.value)})}}},{key:'setDisabled',value:function setDisabled(a){this.disabled=!!a,this.buttonElement&&(this.disabled?this.buttonElement.setAttribute('disabled',!0):this.buttonElement.removeAttribute('disabled'))}},{key:'executeTask',value:function executeTask(){if(this.disabled)return!1;if(this.confirmMessage&&!confirm(this.confirmMessage))return!1;if(this.task)Joomla.submitbutton(this.task,this.form,this.formValidation);else throw new Error('"task" attribute must be preset to perform an action.');return!0}}]),b}(HTMLElement);a.define('joomla-toolbar-button',b)})(customElements);
+
+},{}]},{},[1]);
diff --git a/media/system/webcomponents/js/joomla-toolbar-button.js b/media/system/webcomponents/js/joomla-toolbar-button.js
index c8e5a8e2399d8..abb9fd8977bb0 100644
--- a/media/system/webcomponents/js/joomla-toolbar-button.js
+++ b/media/system/webcomponents/js/joomla-toolbar-button.js
@@ -32,8 +32,8 @@
 
     connectedCallback() {
       // Check whether we have a form
-      const formSelector = this.form || '#adminForm';
-      this.formElement = document.querySelector(formSelector);
+      const formSelector = this.form || 'adminForm';
+      this.formElement = document.getElementById(formSelector);
 
       if (this.listSelection) {
         if (!this.formElement) {
diff --git a/media/system/webcomponents/js/joomla-toolbar-button.min.js b/media/system/webcomponents/js/joomla-toolbar-button.min.js
index 0063d1f1595fd..f7d3d7bf21c3b 100644
--- a/media/system/webcomponents/js/joomla-toolbar-button.min.js
+++ b/media/system/webcomponents/js/joomla-toolbar-button.min.js
@@ -1 +1 @@
-(t=>{"use strict";t.define("joomla-toolbar-button",class extends HTMLElement{get task(){return this.getAttribute("task")}get listSelection(){return this.hasAttribute("list-selection")}get form(){return this.getAttribute("form")}get formValidation(){return this.hasAttribute("form-validation")}get confirmMessage(){return this.getAttribute("confirm-message")}constructor(){super(),this.buttonElement=this.querySelector("button"),this.disabled=!1,this.listSelection&&this.setDisabled(!0),this.addEventListener("click",t=>this.executeTask(t))}connectedCallback(){const t=this.form||"#adminForm";if(this.formElement=document.querySelector(t),this.listSelection){if(!this.formElement)throw new Error(`The form "${t}" is required to perform the task, but the form not found on the page.`);this.formElement.boxchecked.addEventListener("change",t=>{this.setDisabled(t.target.value<1)})}}setDisabled(t){this.disabled=!!t,this.buttonElement&&(this.disabled?this.buttonElement.setAttribute("disabled",!0):this.buttonElement.removeAttribute("disabled"))}executeTask(){if(this.disabled)return!1;if(this.confirmMessage&&!confirm(this.confirmMessage))return!1;if(!this.task)throw new Error('"task" attribute must be preset to perform an action.');return Joomla.submitbutton(this.task,this.form,this.formValidation),!0}})})(customElements);
\ No newline at end of file
+(t=>{"use strict";t.define("joomla-toolbar-button",class extends HTMLElement{get task(){return this.getAttribute("task")}get listSelection(){return this.hasAttribute("list-selection")}get form(){return this.getAttribute("form")}get formValidation(){return this.hasAttribute("form-validation")}get confirmMessage(){return this.getAttribute("confirm-message")}constructor(){super(),this.buttonElement=this.querySelector("button"),this.disabled=!1,this.listSelection&&this.setDisabled(!0),this.addEventListener("click",t=>this.executeTask(t))}connectedCallback(){const t=this.form||"adminForm";if(this.formElement=document.getElementById(t),this.listSelection){if(!this.formElement)throw new Error(`The form "${t}" is required to perform the task, but the form not found on the page.`);this.formElement.boxchecked.addEventListener("change",t=>{this.setDisabled(t.target.value<1)})}}setDisabled(t){this.disabled=!!t,this.buttonElement&&(this.disabled?this.buttonElement.setAttribute("disabled",!0):this.buttonElement.removeAttribute("disabled"))}executeTask(){if(this.disabled)return!1;if(this.confirmMessage&&!confirm(this.confirmMessage))return!1;if(!this.task)throw new Error('"task" attribute must be preset to perform an action.');return Joomla.submitbutton(this.task,this.form,this.formValidation),!0}})})(customElements);
\ No newline at end of file
diff --git a/plugins/installer/override/override.php b/plugins/installer/override/override.php
index f8e1ae7cdafd9..7a965610ee7f4 100644
--- a/plugins/installer/override/override.php
+++ b/plugins/installer/override/override.php
@@ -183,31 +183,11 @@ public function finalize($result)
 		{
 			$span = '<span class="badge badge-light">' . $num . '</span>';
 			$this->app->enqueueMessage(Text::sprintf('PLG_INSTALLER_OVERRIDE_FILE_UPDATED', $span), 'notice');
+			$this->saveOverrides($result);
 		}
 
-		$oldData = json_decode($this->params->get('overridefiles'), JSON_HEX_QUOT);
-
-		$results = array();
-		$results[] = $result;
-
-		foreach ($oldData as $value)
-		{
-			if (count($value) !== 0)
-			{
-				$results[] = $value;
-			}
-		}
-
-		$numupdate = (int) $this->params->get('numupdate');
-
-		if (count($results) > $numupdate)
-		{
-			$results = array_slice($results, 0, $numupdate);
-		}
-
-		$this->params->set('overridefiles', json_encode($results, JSON_HEX_QUOT));
-
-		return $this->saveParams();
+		// Delete stored session value.
+		$this->purge();
 	}
 
 	/**
@@ -289,55 +269,131 @@ public function onInstallerAfterInstaller()
 	}
 
 	/**
-	 * Save the plugin parameters
+	 * Check for existing id.
 	 *
-	 * @return  boolean
+	 * @param   string   $id    Hash id of file.
+	 * @param   integer  $exid  Extension id of file.
+	 *
+	 * @return   boolean  True/False
 	 *
 	 * @since   __DEPLOY_VERSION__
 	 */
-	private function saveParams()
+	public function load($id, $exid)
 	{
-		$query = $this->db->getQuery(true)
-				->update($this->db->quoteName('#__extensions'))
-				->set($this->db->quoteName('params') . ' = ' . $this->db->quote($this->params->toString('JSON')))
-				->where($this->db->quoteName('type') . ' = ' . $this->db->quote('plugin'))
-				->where($this->db->quoteName('folder') . ' = ' . $this->db->quote('installer'))
-				->where($this->db->quoteName('element') . ' = ' . $this->db->quote('override'));
-
-		try
-		{
-			// Lock the tables to prevent multiple plugin executions causing a race condition
-			$this->db->lockTable('#__extensions');
-		}
-		catch (Exception $e)
-		{
-			// If we can't lock the tables it's too risky to continue execution
-			return false;
-		}
+		$db = Factory::getDbo();
 
-		try
-		{
-			// Update the plugin parameters
-			$result = $this->db->setQuery($query)->execute();
-		}
-		catch (Exception $exc)
-		{
-			// If we failed to execute
-			$this->db->unlockTables();
-			$result = false;
-		}
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		$query
+			->select($db->quoteName('hash_id'))
+			->from($db->quoteName('#__template_overrides'))
+			->where($db->quoteName('hash_id') . ' = ' . $db->quote($id))
+			->where($db->quoteName('extension_id') . ' = ' . $db->quote($exid));
 
-		try
+		$db->setQuery($query);
+		$results = $db->loadObjectList();
+
+		if (count($results) === 1)
 		{
-			// Unlock the tables after writing
-			$this->db->unlockTables();
+			return true;
 		}
-		catch (Exception $e)
+
+		return false;
+	}
+
+	/**
+	 * Save the updated files.
+	 *
+	 * @param   array  $pks  Updated files.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	private function saveOverrides($pks)
+	{
+		$db = Factory::getDbo();
+		$today = Factory::getDate();
+
+		// Insert columns.
+		$columns = array(
+			'template',
+			'hash_id',
+			'extension_id',
+			'state',
+			'action',
+			'client_id',
+			'created_date',
+			'modified_date'
+		);
+
+		// Create a insert query.
+		$insertQuery = $db->getQuery(true)
+			->insert($db->quoteName('#__template_overrides'))
+			->columns($db->quoteName($columns));
+
+		foreach ($pks as $pk)
 		{
-			// If we can't lock the tables assume we have somehow failed
-			$result = false;
-		}
+			$insertQuery->clear('values');
 
-		return $result;
+			$createdDate = $today->format('y-m-d h:i:s');
+
+			if (empty($pk->modifiedDate))
+			{
+				$pk->modifiedDate = '0000-00-00 00:00:00';
+			}
+
+			if ($this->load($pk->id, $pk->extension_id))
+			{
+				$updateQuery = $db->getQuery(true)
+					->update($db->quoteName('#__template_overrides'))
+					->set(
+						array($db->quoteName('modified_date') . ' = ' . $db->quote($pk->modifiedDate),
+						$db->quoteName('action') . ' = ' . $db->quote($pk->action),
+						$db->quoteName('state') . ' = ' . 0)
+						)
+					->where($db->quoteName('hash_id') . ' = ' . $db->quote($pk->id))
+					->where($db->quoteName('extension_id') . ' = ' . $db->quote($pk->extension_id));
+
+					try
+					{
+						// Set the query using our newly populated query object and execute it.
+						$db->setQuery($updateQuery);
+						$db->execute();
+					}
+					catch (\RuntimeException $e)
+					{
+						return $e;
+					}
+
+				continue;
+			}
+
+			// Insert values.
+			$values = array(
+				$db->quote($pk->template),
+				$db->quote($pk->id),
+				$db->quote($pk->extension_id),
+				0,
+				$db->quote($pk->action),
+				(int) $pk->client,
+				$db->quote($createdDate),
+				$db->quote($pk->modifiedDate)
+			);
+
+			$insertQuery->values(implode(',', $values));
+
+			try
+			{
+				// Set the query using our newly populated query object and execute it.
+				$db->setQuery($insertQuery);
+				$db->execute();
+			}
+			catch (\RuntimeException $e)
+			{
+				return $e;
+			}
+		}
 	}
 }
diff --git a/plugins/installer/override/override.xml b/plugins/installer/override/override.xml
index c941b7b661df3..3f4f155966b45 100644
--- a/plugins/installer/override/override.xml
+++ b/plugins/installer/override/override.xml
@@ -16,29 +16,4 @@
 		<language tag="en-GB">en-GB.plg_installer_override.ini</language>
 		<language tag="en-GB">en-GB.plg_installer_override.sys.ini</language>
 	</languages>
-	<config>
-		<fields name="params">
-			<fieldset name="basic">
-				<field
-					name="numupdate"
-					type="list"
-					label="PLG_INSTALLER_OVERRIDE_PLUGIN_FIELD_NUMUPDATE"
-					filter="integer"
-					default="3"
-					required="true"
-					>
-					<option value="3">3</option>
-					<option value="5">5</option>
-					<option value="10">10</option>
-					<option value="15">15</option>
-				</field>
-
-				<field
-					name="overridefiles"
-					type="hidden"
-					label="PLG_INSTALLER_OVERRIDE_PLUGIN_FIELD_OVERRIDEFILES_LABEL"
-				/>
-			</fieldset>
-		</fields>
-	</config>
 </extension>
diff --git a/plugins/quickicon/overridecheck/overridecheck.php b/plugins/quickicon/overridecheck/overridecheck.php
new file mode 100644
index 0000000000000..d8fc3f8cb61ae
--- /dev/null
+++ b/plugins/quickicon/overridecheck/overridecheck.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Quickicon.Overridecheck
+ *
+ * @copyright   Copyright (C) 2005 - 2018 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\CMS\Uri\Uri;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Plugin\CMSPlugin;
+
+/**
+ * Joomla! template override notification plugin
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class PlgQuickiconOverrideCheck extends CMSPlugin
+{
+	/**
+	 * Load the language file on instantiation.
+	 *
+	 * @var    boolean
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $autoloadLanguage = true;
+
+	/**
+	 * Returns an icon definition for an icon which looks for overrides update
+	 * via AJAX and displays a notification when such overrides are updated.
+	 *
+	 * @param   string  $context  The calling context
+	 *
+	 * @return  array  A list of icon definition associative arrays, consisting of the
+	 *                 keys link, image, text and access.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function onGetIcons($context)
+	{
+		if ($context !== $this->params->get('context', 'mod_quickicon') || !Factory::getUser()->authorise('core.manage', 'com_installer'))
+		{
+			return array();
+		}
+
+		$token    = Session::getFormToken() . '=1';
+		$options  = array(
+			'url' => Uri::base() . 'index.php?option=com_templates&view=templates',
+			'ajaxUrl' => Uri::base() . 'index.php?option=com_templates&view=templates&task=template.ajax&' . $token,
+		);
+
+		Factory::getDocument()->addScriptOptions('js-override-check', $options);
+
+		Text::script('PLG_QUICKICON_OVERRIDECHECK_ERROR', true);
+		Text::script('PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE', true);
+		Text::script('PLG_QUICKICON_OVERRIDECHECK_UPTODATE', true);
+		Text::script('PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND', true);
+
+		HTMLHelper::_('behavior.core');
+		HTMLHelper::_('script', 'plg_quickicon_overridecheck/overridecheck.js', array('version' => 'auto', 'relative' => true));
+
+		return array(
+			array(
+				'link'  => 'index.php?option=com_templates&view=templates',
+				'image' => 'fa fa-file',
+				'icon'  => '',
+				'text'  => Text::_('PLG_QUICKICON_OVERRIDECHECK_CHECKING'),
+				'id'    => 'plg_quickicon_overridecheck',
+				'group' => 'MOD_QUICKICON_MAINTENANCE'
+			)
+		);
+	}
+}
diff --git a/plugins/quickicon/overridecheck/overridecheck.xml b/plugins/quickicon/overridecheck/overridecheck.xml
new file mode 100644
index 0000000000000..1aa1b500b7cf1
--- /dev/null
+++ b/plugins/quickicon/overridecheck/overridecheck.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="4.0" type="plugin" group="quickicon" method="upgrade">
+	<name>plg_quickicon_overridecheck</name>
+	<author>Joomla! Project</author>
+	<creationDate>June 2018</creationDate>
+	<copyright>Copyright (C) 2005 - 2018 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>4.0.0</version>
+	<description>PLG_QUICKICON_OVERRIDECHECK_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="overridecheck">overridecheck.php</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_quickicon_overridecheck.ini</language>
+		<language tag="en-GB">en-GB.plg_quickicon_overridecheck.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="context"
+					type="text"
+					label="PLG_QUICKICON_OVERRIDECHECK_GROUP_LABEL"
+					description="PLG_QUICKICON_OVERRIDECHECK_GROUP_DESC"
+					default="mod_quickicon"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>

From 1a9806641e250f66959559eed60e0aa3019342ca Mon Sep 17 00:00:00 2001
From: astridx <info@astrid-guenther.de>
Date: Wed, 18 Jul 2018 11:24:39 +0200
Subject: [PATCH 19/79] save 3 lines :)

---
 .../src/Toolbar/Button/StandardButton.php      | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/libraries/src/Toolbar/Button/StandardButton.php b/libraries/src/Toolbar/Button/StandardButton.php
index a8d9310614748..9ee2adbc68078 100644
--- a/libraries/src/Toolbar/Button/StandardButton.php
+++ b/libraries/src/Toolbar/Button/StandardButton.php
@@ -77,20 +77,14 @@ protected function prepareOptions(array &$options)
 	 */
 	public function fetchButton($type = 'Standard', $name = '', $text = '', $task = '', $list = true, $formId = null)
 	{
+		$this->name($name)
+			->text($text)
+			->task($task)
+			->listCheck($list);
+
 		if ($formId !== null)
 		{
-			$this->name($name)
-				->text($text)
-				->task($task)
-				->listCheck($list)
-				->form($formId);
-		}
-		else
-		{
-			$this->name($name)
-				->text($text)
-				->task($task)
-				->listCheck($list);
+			$this->form($formId);
 		}
 
 		return $this->renderButton($this->options);

From e83c6654c4e7a711e643d6d57064c64b67f30103 Mon Sep 17 00:00:00 2001
From: Anurag <30978328+Anu1601CS@users.noreply.github.com>
Date: Thu, 19 Jul 2018 14:46:31 +0530
Subject: [PATCH 20/79] New feature show status. (#47)

show status in com_template view templates
---
 .../com_templates/Model/TemplatesModel.php    | 41 +++++++++++++++++++
 .../com_templates/View/Templates/HtmlView.php | 11 +++++
 .../com_templates/tmpl/templates/default.php  | 14 +++++++
 .../language/en-GB/en-GB.com_templates.ini    |  3 ++
 4 files changed, 69 insertions(+)

diff --git a/administrator/components/com_templates/Model/TemplatesModel.php b/administrator/components/com_templates/Model/TemplatesModel.php
index 8c798522f6952..202dc35e9a8f3 100644
--- a/administrator/components/com_templates/Model/TemplatesModel.php
+++ b/administrator/components/com_templates/Model/TemplatesModel.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\Component\Templates\Administrator\Helper\TemplatesHelper;
 
@@ -67,11 +68,51 @@ public function getItems()
 		{
 			$client = ApplicationHelper::getClientInfo($item->client_id);
 			$item->xmldata = TemplatesHelper::parseXMLTemplateFile($client->path, $item->element);
+			$num = $this->updated($item->extension_id);
+
+			if ($num)
+			{
+				$item->updated = $num;
+			}
 		}
 
 		return $items;
 	}
 
+	/**
+	 * Check if template extension have any updated override.
+	 *
+	 * @param   integer  $exid  Extension id of template.
+	 *
+	 * @return   boolean  False if records not found/else integer.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function updated($exid)
+	{
+		$db = Factory::getDbo();
+
+		// Select the required fields from the table
+		$query = $db->getQuery(true)
+			->select('a.template')
+			->from($db->quoteName('#__template_overrides', 'a'))
+			->where('extension_id = ' . $db->quote($exid))
+			->where('state = ' . 0);
+
+		// Reset the query.
+		$db->setQuery($query);
+
+		// Load the results as a list of stdClass objects.
+		$num = count($db->loadObjectList());
+
+		if ($num > 0)
+		{
+			return $num;
+		}
+
+		return false;
+	}
+
 	/**
 	 * Build an SQL query to load the list data.
 	 *
diff --git a/administrator/components/com_templates/View/Templates/HtmlView.php b/administrator/components/com_templates/View/Templates/HtmlView.php
index 374ea00249c7e..fa51d53a5fbf6 100644
--- a/administrator/components/com_templates/View/Templates/HtmlView.php
+++ b/administrator/components/com_templates/View/Templates/HtmlView.php
@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Helper\ContentHelper;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\Component\Templates\Administrator\Helper\TemplatesHelper;
 
@@ -76,6 +77,15 @@ class HtmlView extends BaseHtmlView
 	 */
 	public $preview;
 
+	/**
+	 * The state of installer override plugin.
+	 *
+	 * @var  array
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $pluginState;
+
 	/**
 	 * Execute and display a template script.
 	 *
@@ -95,6 +105,7 @@ public function display($tpl = null)
 		$this->activeFilters = $this->get('ActiveFilters');
 		$this->preview       = ComponentHelper::getParams('com_templates')->get('template_positions_display');
 		$this->file          = base64_encode('home');
+		$this->pluginState   = PluginHelper::isEnabled('installer', 'override');
 
 		TemplatesHelper::addSubmenu('templates');
 
diff --git a/administrator/components/com_templates/tmpl/templates/default.php b/administrator/components/com_templates/tmpl/templates/default.php
index 85484ee4b27d2..88f12dde40279 100644
--- a/administrator/components/com_templates/tmpl/templates/default.php
+++ b/administrator/components/com_templates/tmpl/templates/default.php
@@ -46,6 +46,11 @@
 								<th style="width:25%" class="d-none d-md-table-cell text-center">
 									<?php echo JText::_('JAUTHOR'); ?>
 								</th>
+								<?php if ($this->pluginState) : ?>
+									<th style="width:10%" class="d-none d-md-table-cell text-center">
+										<?php echo JText::_('COM_TEMPLATES_OVERRIDES'); ?>
+									</th>
+								<?php endif;?>
 							</tr>
 						</thead>
 						<tfoot>
@@ -96,6 +101,15 @@
 										<div><a href="<?php echo $this->escape($url); ?>"><?php echo $this->escape($url); ?></a></div>
 									<?php endif; ?>
 								</td>
+								<?php if ($this->pluginState) : ?>
+									<td class="d-none d-md-table-cell text-center">
+										<?php if (!empty($item->updated)) : ?>
+											<span class="badge badge-warning"><?php echo JText::sprintf('COM_TEMPLATES_UPDATED', $item->updated); ?></span>
+										<?php else : ?>
+											<span class="badge badge-success"><?php echo JText::_('COM_TEMPLATES_UPTODATE'); ?></span>
+										<?php endif; ?>
+									</td>
+								<?php endif; ?>
 							</tr>
 							<?php endforeach; ?>
 						</tbody>
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index be2b956b867f4..c3194890f4ee8 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -189,6 +189,7 @@ COM_TEMPLATES_OVERRIDE_MODIFIED_DATE="Last change via Update"
 COM_TEMPLATES_OVERRIDE_SUCCESS="Successfully created the override."
 COM_TEMPLATES_OVERRIDE_TEMPLATE_FILE="Template File"
 COM_TEMPLATES_OVERRIDE_UPTODATE="Override files are up to date with core files. Nothing is changed in last extension or Joomla update."
+COM_TEMPLATES_OVERRIDES="Overrides"
 COM_TEMPLATES_OVERRIDES_COMPONENTS="Components"
 COM_TEMPLATES_OVERRIDES_MODULES="Modules"
 COM_TEMPLATES_OVERRIDES_LAYOUTS="Layouts"
@@ -229,6 +230,8 @@ COM_TEMPLATES_TEMPLATE_PREVIEW="Preview"
 COM_TEMPLATES_TEMPLATES_FILTER_SEARCH_DESC="Search in template name or folder name."
 COM_TEMPLATES_TOGGLE_FULL_SCREEN="Press Ctrl-Q to toggle Full Screen editing."
 COM_TEMPLATES_TOOLBAR_SET_HOME="Default"
+COM_TEMPLATES_UPDATED="%s Updated"
+COM_TEMPLATES_UPTODATE="Up to date"
 COM_TEMPLATES_WARNING_FORMAT_WILL_NOT_BE_VISIBLE="You have created a new file with the extension '%s'. This is supported but as you did not have that file extension in the list of supported formats this can't be displayed. Please double check the options for Templates and add the format if needed."
 COM_TEMPLATES_XML_DESCRIPTION="This component manages templates"
 JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."

From 10c3d6d6a80d884bca80637c9603c21af6d33130 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Thu, 19 Jul 2018 21:41:12 +0530
Subject: [PATCH 21/79] link

---
 media/plg_quickicon_overridecheck/js/overridecheck.es6.js     | 2 +-
 media/plg_quickicon_overridecheck/js/overridecheck.es6.min.js | 2 +-
 media/plg_quickicon_overridecheck/js/overridecheck.js         | 2 +-
 media/plg_quickicon_overridecheck/js/overridecheck.min.js     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media/plg_quickicon_overridecheck/js/overridecheck.es6.js b/media/plg_quickicon_overridecheck/js/overridecheck.es6.js
index 03e3ddc1ae36d..a3f13493fafe2 100644
--- a/media/plg_quickicon_overridecheck/js/overridecheck.es6.js
+++ b/media/plg_quickicon_overridecheck/js/overridecheck.es6.js
@@ -48,7 +48,7 @@
             }
           } else {
             link.classList.add('danger');
-            link.setAttribute('href', 'index.php?option=com_plugins&view=plugin&layout=edit&extension_id=491');
+            link.setAttribute('href', 'index.php?option=com_plugins&task=plugin.edit&extension_id=491');
             for (let i = 0, len = linkSpan.length; i < len; i += 1) {
               linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE');
             }
diff --git a/media/plg_quickicon_overridecheck/js/overridecheck.es6.min.js b/media/plg_quickicon_overridecheck/js/overridecheck.es6.min.js
index fd34959432355..701089224ce51 100644
--- a/media/plg_quickicon_overridecheck/js/overridecheck.es6.min.js
+++ b/media/plg_quickicon_overridecheck/js/overridecheck.es6.min.js
@@ -1 +1 @@
-(()=>{"use strict";document.addEventListener("DOMContentLoaded",()=>{if(Joomla.getOptions("js-override-check")){const e=Joomla.getOptions("js-override-check");Joomla.request({url:e.ajaxUrl,method:"GET",data:"",perform:!0,onSuccess:e=>{const t=document.getElementById("plg_quickicon_overridecheck"),n=t.querySelectorAll("span.j-links-link"),l=JSON.parse(e);if("disabled"!==l.installerOverride)if(l instanceof Array)if(0===l.length){t.classList.add("success");for(let e=0,t=n.length;e<t;e+=1)n[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_UPTODATE")}else{window.scrollTo(0,0),t.classList.add("danger");for(let e=0,t=n.length;e<t;e+=1)n[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND").replace("%s",`<span class="badge badge-light">${l.length}</span>`)}else{t.classList.add("danger");for(let e=0,t=n.length;e<t;e+=1)n[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR")}else{t.classList.add("danger"),t.setAttribute("href","index.php?option=com_plugins&view=plugin&layout=edit&extension_id=491");for(let e=0,t=n.length;e<t;e+=1)n[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE")}},onError:()=>{const e=document.getElementById("plg_quickicon_overridecheck"),t=e.querySelectorAll("span.j-links-link");e.classList.add("danger");for(let e=0,n=t.length;e<n;e+=1)t[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR")}})}})})();
\ No newline at end of file
+(()=>{"use strict";document.addEventListener("DOMContentLoaded",()=>{if(Joomla.getOptions("js-override-check")){const e=Joomla.getOptions("js-override-check");Joomla.request({url:e.ajaxUrl,method:"GET",data:"",perform:!0,onSuccess:e=>{const t=document.getElementById("plg_quickicon_overridecheck"),n=t.querySelectorAll("span.j-links-link"),l=JSON.parse(e);if("disabled"!==l.installerOverride)if(l instanceof Array)if(0===l.length){t.classList.add("success");for(let e=0,t=n.length;e<t;e+=1)n[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_UPTODATE")}else{window.scrollTo(0,0),t.classList.add("danger");for(let e=0,t=n.length;e<t;e+=1)n[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND").replace("%s",`<span class="badge badge-light">${l.length}</span>`)}else{t.classList.add("danger");for(let e=0,t=n.length;e<t;e+=1)n[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR")}else{t.classList.add("danger"),t.setAttribute("href","index.php?option=com_plugins&task=plugin.edit&extension_id=491");for(let e=0,t=n.length;e<t;e+=1)n[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE")}},onError:()=>{const e=document.getElementById("plg_quickicon_overridecheck"),t=e.querySelectorAll("span.j-links-link");e.classList.add("danger");for(let e=0,n=t.length;e<n;e+=1)t[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR")}})}})})();
\ No newline at end of file
diff --git a/media/plg_quickicon_overridecheck/js/overridecheck.js b/media/plg_quickicon_overridecheck/js/overridecheck.js
index 09ca7e8ea6b55..dc184d47a9ca5 100644
--- a/media/plg_quickicon_overridecheck/js/overridecheck.js
+++ b/media/plg_quickicon_overridecheck/js/overridecheck.js
@@ -53,7 +53,7 @@
             }
           } else {
             link.classList.add('danger');
-            link.setAttribute('href', 'index.php?option=com_plugins&view=plugin&layout=edit&extension_id=491');
+            link.setAttribute('href', 'index.php?option=com_plugins&task=plugin.edit&extension_id=491');
             for (var _i3 = 0, _len3 = linkSpan.length; _i3 < _len3; _i3 += 1) {
               linkSpan[_i3].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE');
             }
diff --git a/media/plg_quickicon_overridecheck/js/overridecheck.min.js b/media/plg_quickicon_overridecheck/js/overridecheck.min.js
index a3ef6fb74d48b..dc7596b5949ea 100644
--- a/media/plg_quickicon_overridecheck/js/overridecheck.min.js
+++ b/media/plg_quickicon_overridecheck/js/overridecheck.min.js
@@ -1 +1 @@
-!function(){"use strict";document.addEventListener("DOMContentLoaded",function(){if(Joomla.getOptions("js-override-check")){var e=Joomla.getOptions("js-override-check");Joomla.request({url:e.ajaxUrl,method:"GET",data:"",perform:!0,onSuccess:function(e){var n=document.getElementById("plg_quickicon_overridecheck"),o=n.querySelectorAll("span.j-links-link"),r=JSON.parse(e);if("disabled"!==r.installerOverride)if(r instanceof Array)if(0===r.length){n.classList.add("success");for(var t=0,a=o.length;t<a;t+=1)o[t].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_UPTODATE")}else{window.scrollTo(0,0),n.classList.add("danger");for(var l=0,i=o.length;l<i;l+=1)o[l].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND").replace("%s",'<span class="badge badge-light">'+r.length+"</span>")}else{n.classList.add("danger");for(var s=0,d=o.length;s<d;s+=1)o[s].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR")}else{n.classList.add("danger"),n.setAttribute("href","index.php?option=com_plugins&view=plugin&layout=edit&extension_id=491");for(var c=0,E=o.length;c<E;c+=1)o[c].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE")}},onError:function(){var e=document.getElementById("plg_quickicon_overridecheck"),n=e.querySelectorAll("span.j-links-link");e.classList.add("danger");for(var o=0,r=n.length;o<r;o+=1)n[o].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR")}})}})}();
\ No newline at end of file
+!function(){"use strict";document.addEventListener("DOMContentLoaded",function(){if(Joomla.getOptions("js-override-check")){var e=Joomla.getOptions("js-override-check");Joomla.request({url:e.ajaxUrl,method:"GET",data:"",perform:!0,onSuccess:function(e){var n=document.getElementById("plg_quickicon_overridecheck"),r=n.querySelectorAll("span.j-links-link"),t=JSON.parse(e);if("disabled"!==t.installerOverride)if(t instanceof Array)if(0===t.length){n.classList.add("success");for(var o=0,a=r.length;o<a;o+=1)r[o].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_UPTODATE")}else{window.scrollTo(0,0),n.classList.add("danger");for(var l=0,s=r.length;l<s;l+=1)r[l].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND").replace("%s",'<span class="badge badge-light">'+t.length+"</span>")}else{n.classList.add("danger");for(var i=0,d=r.length;i<d;i+=1)r[i].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR")}else{n.classList.add("danger"),n.setAttribute("href","index.php?option=com_plugins&task=plugin.edit&extension_id=491");for(var c=0,E=r.length;c<E;c+=1)r[c].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE")}},onError:function(){var e=document.getElementById("plg_quickicon_overridecheck"),n=e.querySelectorAll("span.j-links-link");e.classList.add("danger");for(var r=0,t=n.length;r<t;r+=1)n[r].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR")}})}})}();
\ No newline at end of file

From 32c1e13516009b5b538378ba59ae207e50675d0f Mon Sep 17 00:00:00 2001
From: astridx <info@astrid-guenther.de>
Date: Fri, 20 Jul 2018 18:33:15 +0200
Subject: [PATCH 22/79] corrected namespace

---
 .../com_templates/Controller/TemplateController.php           | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/administrator/components/com_templates/Controller/TemplateController.php b/administrator/components/com_templates/Controller/TemplateController.php
index f8e0b504a6433..ad2a82a3566ff 100644
--- a/administrator/components/com_templates/Controller/TemplateController.php
+++ b/administrator/components/com_templates/Controller/TemplateController.php
@@ -19,11 +19,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\Component\Installer\Administrator\Model\InstallModel;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
 use Joomla\CMS\Client\ClientHelper;
-use Joomla\CMS\Factory;
 
 /**
  * Template style controller class.

From 30e468de832da545872131f837bffc3d260fe332 Mon Sep 17 00:00:00 2001
From: Astrid <astridx@users.noreply.github.com>
Date: Sat, 21 Jul 2018 11:04:01 +0200
Subject: [PATCH 23/79] Button to Switch (#35)

* wip add Switcher

* wip style switcher

* wip style switch make inline and change on off text

* wip start with js

* wip js

* wip delete buttons and make js more robust

* wip save to storage

* wip delete old code

* wip

* wip lint

* wip css

* set default value for switcher

* wip make switcher blue

* wip

* wip

* build

* correct names

* create new functions

* fist test code

* use onchange

* undo installer.min.js

* add forgotten new line at the end of css file

* correct align

* correct compare.es6 - only deleted the toggle part

* correct compare.js - only deleted the toggle part

* wip

* reduce timeout

* wrap in funcitons

* wip

* add use strict to both js-files(compare and toggle)

* add the timeout value of 500 again, because 200 are not enought in my case

* use css class 'active' for toggle views

* add strict

* time out for editor

* wip

* improvments use newActive and switch

* correction

* width of switcher-spans

* correct align

* do not use global

* wip

* removed timeouts

* JTEXT to TEXT

* forgotton last line

* deleted duplicated comments

* css fix align

* use unnamed functions in es6
---
 .../components/com_templates/forms/source.xml |  20 +++
 .../com_templates/layouts/diffview/core.php   |  14 --
 .../com_templates/layouts/diffview/diff.php   |  14 --
 .../com_templates/tmpl/template/default.php   |  11 +-
 .../css/admin-templates-default.css           |  32 +++++
 .../css/admin-templates-default.min.css       |   2 +-
 .../js/admin-template-compare.es6.js          |  96 +------------
 .../js/admin-template-compare.es6.min.js      |   2 +-
 .../js/admin-template-compare.js              |  98 +------------
 .../js/admin-template-compare.min.js          |   2 +-
 .../js/admin-template-toggle-switch.es6.js    | 126 +++++++++++++++++
 .../admin-template-toggle-switch.es6.min.js   |   1 +
 .../js/admin-template-toggle-switch.js        | 131 ++++++++++++++++++
 .../js/admin-template-toggle-switch.min.js    |   1 +
 14 files changed, 323 insertions(+), 227 deletions(-)
 delete mode 100644 administrator/components/com_templates/layouts/diffview/core.php
 delete mode 100644 administrator/components/com_templates/layouts/diffview/diff.php
 create mode 100644 media/com_templates/js/admin-template-toggle-switch.es6.js
 create mode 100644 media/com_templates/js/admin-template-toggle-switch.es6.min.js
 create mode 100644 media/com_templates/js/admin-template-toggle-switch.js
 create mode 100644 media/com_templates/js/admin-template-toggle-switch.min.js

diff --git a/administrator/components/com_templates/forms/source.xml b/administrator/components/com_templates/forms/source.xml
index a61fdf9e711f4..112181f0163d7 100644
--- a/administrator/components/com_templates/forms/source.xml
+++ b/administrator/components/com_templates/forms/source.xml
@@ -37,5 +37,25 @@
 			filter="raw"
 			readonly="true"
 		/>
+
+		<field
+			name="show_core"
+			type="radio"
+			class="switcher switcher-primary"
+			default="0"
+		>
+			<option value="0">COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE</option>
+			<option value="1">COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE</option>
+		</field>
+
+		<field
+			name="show_diff"
+			type="radio"
+			class="switcher switcher-primary"
+			default="0"
+		>
+			<option value="0">COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF</option>
+			<option value="1">COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF</option>
+		</field>
 	</fieldset>
 </form>
diff --git a/administrator/components/com_templates/layouts/diffview/core.php b/administrator/components/com_templates/layouts/diffview/core.php
deleted file mode 100644
index 630f501fe31b5..0000000000000
--- a/administrator/components/com_templates/layouts/diffview/core.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-$title = JText::_('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE');
-?>
-<button type="button" class="btn btn-danger" onclick-task="template.show.core" title="<?php echo $title; ?>"><?php echo $title; ?></button>
diff --git a/administrator/components/com_templates/layouts/diffview/diff.php b/administrator/components/com_templates/layouts/diffview/diff.php
deleted file mode 100644
index b250ba3959a6a..0000000000000
--- a/administrator/components/com_templates/layouts/diffview/diff.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_templates
- *
- * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-$title = JText::_('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF');
-?>
-<button type="button" class="btn btn-danger" onclick-task="template.show.diff" title="<?php echo $title; ?>"><?php echo $title; ?></button>
diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index 11e24039cff75..8d152403c4332 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -28,6 +28,7 @@
 
 HTMLHelper::_('script', 'vendor/diff/diff.min.js', array('version' => 'auto', 'relative' => true));
 HTMLHelper::_('script', 'com_templates/admin-template-compare.min.js', array('version' => 'auto', 'relative' => true));
+HTMLHelper::_('script', 'com_templates/admin-template-toggle-switch.min.js', array('version' => 'auto', 'relative' => true));
 
 HTMLHelper::_('behavior.formvalidator');
 HTMLHelper::_('behavior.keepalive');
@@ -84,10 +85,8 @@
 	</div>
 	<?php if ($this->type == 'file' && !empty($this->source->coreFile)) : ?>
 		<div class="col-md-6 text-right">
-			<?php $layout_core_button = new FileLayout('diffview.core', JPATH_COMPONENT_ADMINISTRATOR . '/layouts'); ?>
-			<?php echo $layout_core_button->render(array()); ?>
-			<?php $layout_diff_button = new FileLayout('diffview.diff', JPATH_COMPONENT_ADMINISTRATOR . '/layouts'); ?>
-			<?php echo $layout_diff_button->render(array()); ?>
+			<?php echo $this->form->getInput('show_core'); ?>
+			<?php echo $this->form->getInput('show_diff'); ?>
 		</div>
 	<?php endif; ?>
 </div>
@@ -126,13 +125,13 @@
 				<?php if (!empty($this->source->coreFile)) : ?>
 					<?php $coreFileContent = file_get_contents($this->source->coreFile); ?>
 					<?php $overrideFileContent = file_get_contents($this->source->filePath); ?>
-					<div style="display:none" class="col-md-6" id="core-pane">
+					<div class="col-md-6" id="core-pane">
 						<p class="lead"><?php echo Text::_('COM_TEMPLATES_FILE_CORE_PANE'); ?></p>
 						<div class="editor-border">
 							<?php echo $this->form->getInput('core'); ?>
 						</div>
 					</div>
-					<div class="col-md-12" style="display:none" id="diff-main">
+					<div class="col-md-12" id="diff-main">
 						<p class="lead"><?php echo Text::_('COM_TEMPLATES_FILE_COMPARE_PANE'); ?></p>
 						<div class="diff-pane">
 							<div class="diffview" style="display:none" id="original"><?php echo htmlspecialchars($coreFileContent, ENT_COMPAT, 'UTF-8'); ?></div>
diff --git a/media/com_templates/css/admin-templates-default.css b/media/com_templates/css/admin-templates-default.css
index 1e1e53d152f65..87a8f52ea4269 100644
--- a/media/com_templates/css/admin-templates-default.css
+++ b/media/com_templates/css/admin-templates-default.css
@@ -48,6 +48,38 @@
 	background-color: #FFF;
 }
 
+#diff-main.active {
+	display: block;
+}
+
+#diff-main {
+	display: none;
+}
+
+#core-pane.active {
+	display: block;
+}
+
+#core-pane {
+	display: none;
+}
+
 #core-pane .CodeMirror-code {
 	background-color: #F0F0EE;
 }
+
+#jform_show_core {
+	display: inline;
+	margin-right: 8em;
+}
+
+#jform_show_diff {
+	display: inline;
+	margin-right: 5.5em;
+}
+
+.switcher-label-0, .switcher-label-1{
+	min-width: 5em;
+	max-width: 5em;
+	text-align: left;
+}
diff --git a/media/com_templates/css/admin-templates-default.min.css b/media/com_templates/css/admin-templates-default.min.css
index 770ef89830d3e..493469c60be98 100644
--- a/media/com_templates/css/admin-templates-default.min.css
+++ b/media/com_templates/css/admin-templates-default.min.css
@@ -1 +1 @@
-.selected{background:#08c;color:#fff}.selected:hover,.selected:focus{background:#08c !important;color:#fff}#deleteFolder{margin:0}#image-crop{max-width:100% !important;width:auto;height:auto}.tree-holder{overflow-x:auto}.treeselect a{display:block}.diffview{white-space:pre-wrap;word-wrap:break-word;display:inline;padding:4px;border-radius:.2em}.diff-pane{height:350px;border:.5px solid grey;overflow:auto;padding:10px;background-color:#FFF}#core-pane .CodeMirror-code{background-color:#f0f0ee}
\ No newline at end of file
+.selected{background:#08c;color:#fff}.selected:hover,.selected:focus{background:#08c !important;color:#fff}#deleteFolder{margin:0}#image-crop{max-width:100% !important;width:auto;height:auto}.tree-holder{overflow-x:auto}.treeselect a{display:block}.diffview{white-space:pre-wrap;word-wrap:break-word;display:inline;padding:4px;border-radius:.2em}.diff-pane{height:350px;border:.5px solid grey;overflow:auto;padding:10px;background-color:#FFF}#diff-main.active{display:block}#diff-main{display:none}#core-pane.active{display:block}#core-pane{display:none}#core-pane .CodeMirror-code{background-color:#f0f0ee}#jform_show_core{display:inline;margin-right:8em}#jform_show_diff{display:inline;margin-right:5.5em}.switcher-label-0,.switcher-label-1{min-width:5em;max-width:5em;text-align:left}
\ No newline at end of file
diff --git a/media/com_templates/js/admin-template-compare.es6.js b/media/com_templates/js/admin-template-compare.es6.js
index 233e348641aa1..764e4ec67951c 100644
--- a/media/com_templates/js/admin-template-compare.es6.js
+++ b/media/com_templates/js/admin-template-compare.es6.js
@@ -3,6 +3,8 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 (() => {
+  'use strict';
+
   document.addEventListener('DOMContentLoaded', () => {
     const decodeHtmlspecialChars = (text) => {
       const map = {
@@ -48,100 +50,6 @@
       display.appendChild(fragment);
     };
 
-    const buttonDataSelector = 'onclick-task';
-    const override = document.getElementById('override-pane');
-    const corePane = document.getElementById('core-pane');
-    const diffMain = document.getElementById('diff-main');
-
-    const toggle = (e) => {
-      const task = e.target.getAttribute(buttonDataSelector);
-      if (task === 'template.show.core') {
-        if (corePane) {
-          const { display } = corePane.style;
-          if (display === 'none') {
-            e.target.className = 'btn btn-success';
-            e.target.innerHTML = Joomla.JText._('COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE');
-            corePane.style.display = 'block';
-            override.className = 'col-md-6';
-            Joomla.editors.instances.jform_core.refresh();
-          } else {
-            e.target.className = 'btn btn-danger';
-            e.target.innerHTML = Joomla.JText._('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE');
-            corePane.style.display = 'none';
-            override.className = 'col-md-12';
-          }
-          const coreState = {
-            class: e.target.className,
-            title: e.target.innerHTML,
-            display: corePane.style.display,
-            overrideClass: override.className,
-          };
-
-          if (typeof (Storage) !== 'undefined') {
-            localStorage.setItem('coreButtonState', JSON.stringify(coreState));
-          }
-        }
-      } else if (task === 'template.show.diff') {
-        if (diffMain) {
-          const { display } = diffMain.style;
-          if (display === 'none') {
-            e.target.className = 'btn btn-success';
-            e.target.innerHTML = Joomla.JText._('COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF');
-            diffMain.style.display = 'block';
-          } else {
-            e.target.className = 'btn btn-danger';
-            e.target.innerHTML = Joomla.JText._('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF');
-            diffMain.style.display = 'none';
-          }
-          const diffState = {
-            class: e.target.className,
-            title: e.target.innerHTML,
-            display: diffMain.style.display,
-          };
-
-          if (typeof (Storage) !== 'undefined') {
-            localStorage.setItem('diffButtonState', JSON.stringify(diffState));
-          }
-        }
-      }
-    };
-
-    const buttons = [].slice.call(document.querySelectorAll(`[${buttonDataSelector}]`));
-    const conditionalSection = document.getElementById('conditional-section');
-
-    const setPrestate = () => {
-      if (typeof (Storage) !== 'undefined') {
-        const cState = JSON.parse(localStorage.getItem('coreButtonState'));
-        const dState = JSON.parse(localStorage.getItem('diffButtonState'));
-
-        if (cState !== null) {
-          buttons[0].className = cState.class;
-          buttons[0].innerHTML = cState.title;
-          corePane.style.display = cState.display;
-          override.className = cState.overrideClass;
-        }
-
-        if (dState !== null) {
-          buttons[1].className = dState.class;
-          buttons[1].innerHTML = dState.title;
-          diffMain.style.display = dState.display;
-        }
-      }
-    };
-
-    if (buttons.length !== 0) {
-      buttons.forEach((button) => {
-        button.addEventListener('click', (e) => {
-          e.preventDefault();
-          toggle(e);
-        });
-      });
-      setPrestate();
-    } else if (override && conditionalSection) {
-      conditionalSection.className = 'col-md-12';
-      override.className = 'col-md-12';
-    }
-
     const diffs = [].slice.call(document.querySelectorAll('#original'));
     for (let i = 0, l = diffs.length; i < l; i += 1) {
       compare(diffs[i], diffs[i].nextElementSibling);
diff --git a/media/com_templates/js/admin-template-compare.es6.min.js b/media/com_templates/js/admin-template-compare.es6.min.js
index db882c31ca462..128bf2a1c5b4b 100644
--- a/media/com_templates/js/admin-template-compare.es6.min.js
+++ b/media/com_templates/js/admin-template-compare.es6.min.js
@@ -1 +1 @@
-document.addEventListener("DOMContentLoaded",()=>{const e=(e,t)=>{const a=t.nextElementSibling;let l="",n=null;const s=JsDiff.diffLines(e.innerHTML,t.innerHTML),o=document.createDocumentFragment();s.forEach(e=>{l=e.added?"#a6f3a6":e.removed?"#f8cbcb":"",(n=document.createElement("pre")).style.backgroundColor=l,n.className="diffview",n.appendChild(document.createTextNode((e=>{const t={"&amp;":"&","&#038;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#039;":"'","&#8217;":"’","&#8216;":"‘","&#8211;":"–","&#8212;":"—","&#8230;":"…","&#8221;":"”"};return e.replace(/\&[\w\d\#]{2,5}\;/g,e=>t[e])})(e.value))),o.appendChild(n)}),a.appendChild(o)},t=document.getElementById("override-pane"),a=document.getElementById("core-pane"),l=document.getElementById("diff-main"),n=[].slice.call(document.querySelectorAll("[onclick-task]")),s=document.getElementById("conditional-section");0!==n.length?(n.forEach(e=>{e.addEventListener("click",e=>{e.preventDefault(),(e=>{const n=e.target.getAttribute("onclick-task");if("template.show.core"===n){if(a){const{display:l}=a.style;"none"===l?(e.target.className="btn btn-success",e.target.innerHTML=Joomla.JText._("COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE"),a.style.display="block",t.className="col-md-6",Joomla.editors.instances.jform_core.refresh()):(e.target.className="btn btn-danger",e.target.innerHTML=Joomla.JText._("COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE"),a.style.display="none",t.className="col-md-12");const n={class:e.target.className,title:e.target.innerHTML,display:a.style.display,overrideClass:t.className};"undefined"!=typeof Storage&&localStorage.setItem("coreButtonState",JSON.stringify(n))}}else if("template.show.diff"===n&&l){const{display:t}=l.style;"none"===t?(e.target.className="btn btn-success",e.target.innerHTML=Joomla.JText._("COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF"),l.style.display="block"):(e.target.className="btn btn-danger",e.target.innerHTML=Joomla.JText._("COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF"),l.style.display="none");const a={class:e.target.className,title:e.target.innerHTML,display:l.style.display};"undefined"!=typeof Storage&&localStorage.setItem("diffButtonState",JSON.stringify(a))}})(e)})}),(()=>{if("undefined"!=typeof Storage){const e=JSON.parse(localStorage.getItem("coreButtonState")),s=JSON.parse(localStorage.getItem("diffButtonState"));null!==e&&(n[0].className=e.class,n[0].innerHTML=e.title,a.style.display=e.display,t.className=e.overrideClass),null!==s&&(n[1].className=s.class,n[1].innerHTML=s.title,l.style.display=s.display)}})()):t&&s&&(s.className="col-md-12",t.className="col-md-12");const o=[].slice.call(document.querySelectorAll("#original"));for(let t=0,a=o.length;t<a;t+=1)e(o[t],o[t].nextElementSibling)});
\ No newline at end of file
+(()=>{"use strict";document.addEventListener("DOMContentLoaded",()=>{const e=(e,n)=>{const t=n.nextElementSibling;let l="",d=null;const c=JsDiff.diffLines(e.innerHTML,n.innerHTML),o=document.createDocumentFragment();c.forEach(e=>{l=e.added?"#a6f3a6":e.removed?"#f8cbcb":"",(d=document.createElement("pre")).style.backgroundColor=l,d.className="diffview",d.appendChild(document.createTextNode((e=>{const n={"&amp;":"&","&#038;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#039;":"'","&#8217;":"’","&#8216;":"‘","&#8211;":"–","&#8212;":"—","&#8230;":"…","&#8221;":"”"};return e.replace(/\&[\w\d\#]{2,5}\;/g,e=>n[e])})(e.value))),o.appendChild(d)}),t.appendChild(o)},n=[].slice.call(document.querySelectorAll("#original"));for(let t=0,l=n.length;t<l;t+=1)e(n[t],n[t].nextElementSibling)})})();
\ No newline at end of file
diff --git a/media/com_templates/js/admin-template-compare.js b/media/com_templates/js/admin-template-compare.js
index 6e028738154a6..19410f7011988 100644
--- a/media/com_templates/js/admin-template-compare.js
+++ b/media/com_templates/js/admin-template-compare.js
@@ -8,6 +8,8 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 (function () {
+  'use strict';
+
   document.addEventListener('DOMContentLoaded', function () {
     var decodeHtmlspecialChars = function decodeHtmlspecialChars(text) {
       var map = {
@@ -55,102 +57,6 @@
       display.appendChild(fragment);
     };
 
-    var buttonDataSelector = 'onclick-task';
-    var override = document.getElementById('override-pane');
-    var corePane = document.getElementById('core-pane');
-    var diffMain = document.getElementById('diff-main');
-
-    var toggle = function toggle(e) {
-      var task = e.target.getAttribute(buttonDataSelector);
-      if (task === 'template.show.core') {
-        if (corePane) {
-          var display = corePane.style.display;
-
-          if (display === 'none') {
-            e.target.className = 'btn btn-success';
-            e.target.innerHTML = Joomla.JText._('COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE');
-            corePane.style.display = 'block';
-            override.className = 'col-md-6';
-            Joomla.editors.instances.jform_core.refresh();
-          } else {
-            e.target.className = 'btn btn-danger';
-            e.target.innerHTML = Joomla.JText._('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE');
-            corePane.style.display = 'none';
-            override.className = 'col-md-12';
-          }
-          var coreState = {
-            class: e.target.className,
-            title: e.target.innerHTML,
-            display: corePane.style.display,
-            overrideClass: override.className
-          };
-
-          if (typeof Storage !== 'undefined') {
-            localStorage.setItem('coreButtonState', JSON.stringify(coreState));
-          }
-        }
-      } else if (task === 'template.show.diff') {
-        if (diffMain) {
-          var _display = diffMain.style.display;
-
-          if (_display === 'none') {
-            e.target.className = 'btn btn-success';
-            e.target.innerHTML = Joomla.JText._('COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF');
-            diffMain.style.display = 'block';
-          } else {
-            e.target.className = 'btn btn-danger';
-            e.target.innerHTML = Joomla.JText._('COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF');
-            diffMain.style.display = 'none';
-          }
-          var diffState = {
-            class: e.target.className,
-            title: e.target.innerHTML,
-            display: diffMain.style.display
-          };
-
-          if (typeof Storage !== 'undefined') {
-            localStorage.setItem('diffButtonState', JSON.stringify(diffState));
-          }
-        }
-      }
-    };
-
-    var buttons = [].slice.call(document.querySelectorAll('[' + buttonDataSelector + ']'));
-    var conditionalSection = document.getElementById('conditional-section');
-
-    var setPrestate = function setPrestate() {
-      if (typeof Storage !== 'undefined') {
-        var cState = JSON.parse(localStorage.getItem('coreButtonState'));
-        var dState = JSON.parse(localStorage.getItem('diffButtonState'));
-
-        if (cState !== null) {
-          buttons[0].className = cState.class;
-          buttons[0].innerHTML = cState.title;
-          corePane.style.display = cState.display;
-          override.className = cState.overrideClass;
-        }
-
-        if (dState !== null) {
-          buttons[1].className = dState.class;
-          buttons[1].innerHTML = dState.title;
-          diffMain.style.display = dState.display;
-        }
-      }
-    };
-
-    if (buttons.length !== 0) {
-      buttons.forEach(function (button) {
-        button.addEventListener('click', function (e) {
-          e.preventDefault();
-          toggle(e);
-        });
-      });
-      setPrestate();
-    } else if (override && conditionalSection) {
-      conditionalSection.className = 'col-md-12';
-      override.className = 'col-md-12';
-    }
-
     var diffs = [].slice.call(document.querySelectorAll('#original'));
     for (var i = 0, l = diffs.length; i < l; i += 1) {
       compare(diffs[i], diffs[i].nextElementSibling);
diff --git a/media/com_templates/js/admin-template-compare.min.js b/media/com_templates/js/admin-template-compare.min.js
index d00cde76e1945..24006f7272f33 100644
--- a/media/com_templates/js/admin-template-compare.min.js
+++ b/media/com_templates/js/admin-template-compare.min.js
@@ -1 +1 @@
-document.addEventListener("DOMContentLoaded",function(){var e=function(e,t){var a=t.nextElementSibling,n="",l=null,s=JsDiff.diffLines(e.innerHTML,t.innerHTML),o=document.createDocumentFragment();s.forEach(function(e){var t,a;n=e.added?"#a6f3a6":e.removed?"#f8cbcb":"",(l=document.createElement("pre")).style.backgroundColor=n,l.className="diffview",l.appendChild(document.createTextNode((t=e.value,a={"&amp;":"&","&#038;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#039;":"'","&#8217;":"’","&#8216;":"‘","&#8211;":"–","&#8212;":"—","&#8230;":"…","&#8221;":"”"},t.replace(/\&[\w\d\#]{2,5}\;/g,function(e){return a[e]})))),o.appendChild(l)}),a.appendChild(o)},t=document.getElementById("override-pane"),a=document.getElementById("core-pane"),n=document.getElementById("diff-main"),l=[].slice.call(document.querySelectorAll("[onclick-task]")),s=document.getElementById("conditional-section");0!==l.length?(l.forEach(function(e){e.addEventListener("click",function(e){e.preventDefault(),function(e){var l=e.target.getAttribute("onclick-task");if("template.show.core"===l){if(a){"none"===a.style.display?(e.target.className="btn btn-success",e.target.innerHTML=Joomla.JText._("COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE"),a.style.display="block",t.className="col-md-6",Joomla.editors.instances.jform_core.refresh()):(e.target.className="btn btn-danger",e.target.innerHTML=Joomla.JText._("COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE"),a.style.display="none",t.className="col-md-12");var s={class:e.target.className,title:e.target.innerHTML,display:a.style.display,overrideClass:t.className};"undefined"!=typeof Storage&&localStorage.setItem("coreButtonState",JSON.stringify(s))}}else if("template.show.diff"===l&&n){"none"===n.style.display?(e.target.className="btn btn-success",e.target.innerHTML=Joomla.JText._("COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF"),n.style.display="block"):(e.target.className="btn btn-danger",e.target.innerHTML=Joomla.JText._("COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF"),n.style.display="none");var o={class:e.target.className,title:e.target.innerHTML,display:n.style.display};"undefined"!=typeof Storage&&localStorage.setItem("diffButtonState",JSON.stringify(o))}}(e)})}),function(){if("undefined"!=typeof Storage){var e=JSON.parse(localStorage.getItem("coreButtonState")),s=JSON.parse(localStorage.getItem("diffButtonState"));null!==e&&(l[0].className=e.class,l[0].innerHTML=e.title,a.style.display=e.display,t.className=e.overrideClass),null!==s&&(l[1].className=s.class,l[1].innerHTML=s.title,n.style.display=s.display)}}()):t&&s&&(s.className="col-md-12",t.className="col-md-12");for(var o=[].slice.call(document.querySelectorAll("#original")),i=0,r=o.length;i<r;i+=1)e(o[i],o[i].nextElementSibling)});
\ No newline at end of file
+!function(){"use strict";document.addEventListener("DOMContentLoaded",function(){for(var e=function(e,n){var t=n.nextElementSibling,a="",c=null,d=JsDiff.diffLines(e.innerHTML,n.innerHTML),i=document.createDocumentFragment();d.forEach(function(e){var n,t;a=e.added?"#a6f3a6":e.removed?"#f8cbcb":"",(c=document.createElement("pre")).style.backgroundColor=a,c.className="diffview",c.appendChild(document.createTextNode((n=e.value,t={"&amp;":"&","&#038;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#039;":"'","&#8217;":"’","&#8216;":"‘","&#8211;":"–","&#8212;":"—","&#8230;":"…","&#8221;":"”"},n.replace(/\&[\w\d\#]{2,5}\;/g,function(e){return t[e]})))),i.appendChild(c)}),t.appendChild(i)},n=[].slice.call(document.querySelectorAll("#original")),t=0,a=n.length;t<a;t+=1)e(n[t],n[t].nextElementSibling)})}();
\ No newline at end of file
diff --git a/media/com_templates/js/admin-template-toggle-switch.es6.js b/media/com_templates/js/admin-template-toggle-switch.es6.js
new file mode 100644
index 0000000000000..0ad9dfcf98f40
--- /dev/null
+++ b/media/com_templates/js/admin-template-toggle-switch.es6.js
@@ -0,0 +1,126 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+(() => {
+  'use strict';
+
+  const showDiffChangedOff = () => {
+    const diffMain = document.getElementById('diff-main');
+
+    if (diffMain) {
+      diffMain.classList.remove('active');
+
+      if (typeof Storage !== 'undefined') {
+        localStorage.removeItem('diffSwitchState');
+      }
+    }
+  };
+
+  const showDiffChangedOn = () => {
+    const diffMain = document.getElementById('diff-main');
+
+    if (diffMain) {
+      diffMain.classList.add('active');
+
+      if (typeof Storage !== 'undefined') {
+        localStorage.setItem('diffSwitchState', 'checked');
+      }
+    }
+  };
+
+  const showCoreChangedOff = () => {
+    const override = document.getElementById('override-pane');
+    const corePane = document.getElementById('core-pane');
+
+    if (corePane && override) {
+      corePane.classList.remove('active');
+      override.className = 'col-md-12';
+
+      if (typeof Storage !== 'undefined') {
+        localStorage.removeItem('coreSwitchState');
+      }
+    }
+  };
+
+  const showCoreChangedOn = () => {
+    const override = document.getElementById('override-pane');
+    const corePane = document.getElementById('core-pane');
+
+    if (corePane && override) {
+      corePane.classList.add('active');
+      override.className = 'col-md-6';
+
+      if (Joomla.editors.instances.jform_core) {
+        Joomla.editors.instances.jform_core.refresh();
+      }
+
+      if (typeof Storage !== 'undefined') {
+        localStorage.setItem('coreSwitchState', 'checked');
+      }
+    }
+  };
+
+  document.addEventListener('DOMContentLoaded', () => {
+    const JformShowDiff = document.getElementById('jform_show_diff');
+    const JformShowCore = document.getElementById('jform_show_core');
+
+    if (JformShowDiff) {
+      JformShowDiff.addEventListener('joomla.switcher.on', showDiffChangedOn);
+      JformShowDiff.addEventListener('joomla.switcher.off', showDiffChangedOff);
+    }
+
+    if (JformShowCore) {
+      JformShowCore.addEventListener('joomla.switcher.on', showCoreChangedOn);
+      JformShowCore.addEventListener('joomla.switcher.off', showCoreChangedOff);
+    }
+
+    // Callback executed when JformShowCore was found
+    function handleJformShowCore() {
+      JformShowCore.newActive = 1;
+      JformShowCore.switch();
+    }
+
+    if (typeof Storage !== 'undefined' && localStorage.getItem('coreSwitchState') && JformShowCore) {
+      // Set up the mutation observer
+      const observerJformShowCore = new MutationObserver(((mutations, me) => {
+        if (JformShowDiff) {
+          handleJformShowCore();
+          me.disconnect();
+        }
+      }));
+
+      // Start observing
+      observerJformShowCore.observe(JformShowCore, {
+        childList: true,
+        subtree: true,
+      });
+
+      showCoreChangedOn();
+    }
+
+    // Callback executed when JformShowDiff was found
+    function handleJformShowDiff() {
+      JformShowDiff.newActive = 1;
+      JformShowDiff.switch();
+    }
+
+    if (typeof Storage !== 'undefined' && localStorage.getItem('diffSwitchState') && JformShowDiff) {
+      // Set up the mutation observer
+      const observerJformShowDiff = new MutationObserver(((mutations, me) => {
+        if (JformShowDiff) {
+          handleJformShowDiff();
+          me.disconnect();
+        }
+      }));
+
+      // Start observing
+      observerJformShowDiff.observe(JformShowDiff, {
+        childList: true,
+        subtree: true,
+      });
+
+      showDiffChangedOn();
+    }
+  });
+})();
diff --git a/media/com_templates/js/admin-template-toggle-switch.es6.min.js b/media/com_templates/js/admin-template-toggle-switch.es6.min.js
new file mode 100644
index 0000000000000..eaad23e2574f4
--- /dev/null
+++ b/media/com_templates/js/admin-template-toggle-switch.es6.min.js
@@ -0,0 +1 @@
+(()=>{"use strict";const e=()=>{const e=document.getElementById("diff-main");e&&(e.classList.remove("active"),"undefined"!=typeof Storage&&localStorage.removeItem("diffSwitchState"))},t=()=>{const e=document.getElementById("diff-main");e&&(e.classList.add("active"),"undefined"!=typeof Storage&&localStorage.setItem("diffSwitchState","checked"))},o=()=>{const e=document.getElementById("override-pane"),t=document.getElementById("core-pane");t&&e&&(t.classList.remove("active"),e.className="col-md-12","undefined"!=typeof Storage&&localStorage.removeItem("coreSwitchState"))},n=()=>{const e=document.getElementById("override-pane"),t=document.getElementById("core-pane");t&&e&&(t.classList.add("active"),e.className="col-md-6",Joomla.editors.instances.jform_core&&Joomla.editors.instances.jform_core.refresh(),"undefined"!=typeof Storage&&localStorage.setItem("coreSwitchState","checked"))};document.addEventListener("DOMContentLoaded",()=>{const c=document.getElementById("jform_show_diff"),d=document.getElementById("jform_show_core");if(c&&(c.addEventListener("joomla.switcher.on",t),c.addEventListener("joomla.switcher.off",e)),d&&(d.addEventListener("joomla.switcher.on",n),d.addEventListener("joomla.switcher.off",o)),"undefined"!=typeof Storage&&localStorage.getItem("coreSwitchState")&&d){new MutationObserver((e,t)=>{c&&(d.newActive=1,d.switch(),t.disconnect())}).observe(d,{childList:!0,subtree:!0}),n()}if("undefined"!=typeof Storage&&localStorage.getItem("diffSwitchState")&&c){new MutationObserver((e,t)=>{c&&(c.newActive=1,c.switch(),t.disconnect())}).observe(c,{childList:!0,subtree:!0}),t()}})})();
\ No newline at end of file
diff --git a/media/com_templates/js/admin-template-toggle-switch.js b/media/com_templates/js/admin-template-toggle-switch.js
new file mode 100644
index 0000000000000..db90edb792b1c
--- /dev/null
+++ b/media/com_templates/js/admin-template-toggle-switch.js
@@ -0,0 +1,131 @@
+/**
+* PLEASE DO NOT MODIFY THIS FILE. WORK ON THE ES6 VERSION.
+* OTHERWISE YOUR CHANGES WILL BE REPLACED ON THE NEXT BUILD.
+**/
+
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+(function () {
+  'use strict';
+
+  var showDiffChangedOff = function showDiffChangedOff() {
+    var diffMain = document.getElementById('diff-main');
+
+    if (diffMain) {
+      diffMain.classList.remove('active');
+
+      if (typeof Storage !== 'undefined') {
+        localStorage.removeItem('diffSwitchState');
+      }
+    }
+  };
+
+  var showDiffChangedOn = function showDiffChangedOn() {
+    var diffMain = document.getElementById('diff-main');
+
+    if (diffMain) {
+      diffMain.classList.add('active');
+
+      if (typeof Storage !== 'undefined') {
+        localStorage.setItem('diffSwitchState', 'checked');
+      }
+    }
+  };
+
+  var showCoreChangedOff = function showCoreChangedOff() {
+    var override = document.getElementById('override-pane');
+    var corePane = document.getElementById('core-pane');
+
+    if (corePane && override) {
+      corePane.classList.remove('active');
+      override.className = 'col-md-12';
+
+      if (typeof Storage !== 'undefined') {
+        localStorage.removeItem('coreSwitchState');
+      }
+    }
+  };
+
+  var showCoreChangedOn = function showCoreChangedOn() {
+    var override = document.getElementById('override-pane');
+    var corePane = document.getElementById('core-pane');
+
+    if (corePane && override) {
+      corePane.classList.add('active');
+      override.className = 'col-md-6';
+
+      if (Joomla.editors.instances.jform_core) {
+        Joomla.editors.instances.jform_core.refresh();
+      }
+
+      if (typeof Storage !== 'undefined') {
+        localStorage.setItem('coreSwitchState', 'checked');
+      }
+    }
+  };
+
+  document.addEventListener('DOMContentLoaded', function () {
+    var JformShowDiff = document.getElementById('jform_show_diff');
+    var JformShowCore = document.getElementById('jform_show_core');
+
+    if (JformShowDiff) {
+      JformShowDiff.addEventListener('joomla.switcher.on', showDiffChangedOn);
+      JformShowDiff.addEventListener('joomla.switcher.off', showDiffChangedOff);
+    }
+
+    if (JformShowCore) {
+      JformShowCore.addEventListener('joomla.switcher.on', showCoreChangedOn);
+      JformShowCore.addEventListener('joomla.switcher.off', showCoreChangedOff);
+    }
+
+    // Callback executed when JformShowCore was found
+    function handleJformShowCore() {
+      JformShowCore.newActive = 1;
+      JformShowCore.switch();
+    }
+
+    if (typeof Storage !== 'undefined' && localStorage.getItem('coreSwitchState') && JformShowCore) {
+      // Set up the mutation observer
+      var observerJformShowCore = new MutationObserver(function (mutations, me) {
+        if (JformShowDiff) {
+          handleJformShowCore();
+          me.disconnect();
+        }
+      });
+
+      // Start observing
+      observerJformShowCore.observe(JformShowCore, {
+        childList: true,
+        subtree: true
+      });
+
+      showCoreChangedOn();
+    }
+
+    // Callback executed when JformShowDiff was found
+    function handleJformShowDiff() {
+      JformShowDiff.newActive = 1;
+      JformShowDiff.switch();
+    }
+
+    if (typeof Storage !== 'undefined' && localStorage.getItem('diffSwitchState') && JformShowDiff) {
+      // Set up the mutation observer
+      var observerJformShowDiff = new MutationObserver(function (mutations, me) {
+        if (JformShowDiff) {
+          handleJformShowDiff();
+          me.disconnect();
+        }
+      });
+
+      // Start observing
+      observerJformShowDiff.observe(JformShowDiff, {
+        childList: true,
+        subtree: true
+      });
+
+      showDiffChangedOn();
+    }
+  });
+})();
diff --git a/media/com_templates/js/admin-template-toggle-switch.min.js b/media/com_templates/js/admin-template-toggle-switch.min.js
new file mode 100644
index 0000000000000..b2f1dbb81aaa0
--- /dev/null
+++ b/media/com_templates/js/admin-template-toggle-switch.min.js
@@ -0,0 +1 @@
+!function(){"use strict";const e=function(){const e=document.getElementById("diff-main");e&&(e.classList.remove("active"),"undefined"!=typeof Storage&&localStorage.removeItem("diffSwitchState"))},t=function(){const e=document.getElementById("diff-main");e&&(e.classList.add("active"),"undefined"!=typeof Storage&&localStorage.setItem("diffSwitchState","checked"))},o=function(){const e=document.getElementById("override-pane"),t=document.getElementById("core-pane");t&&e&&(t.classList.remove("active"),e.className="col-md-12","undefined"!=typeof Storage&&localStorage.removeItem("coreSwitchState"))},n=function(){const e=document.getElementById("override-pane"),t=document.getElementById("core-pane");t&&e&&(t.classList.add("active"),e.className="col-md-6",Joomla.editors.instances.jform_core&&Joomla.editors.instances.jform_core.refresh(),"undefined"!=typeof Storage&&localStorage.setItem("coreSwitchState","checked"))};document.addEventListener("DOMContentLoaded",()=>{const c=document.getElementById("jform_show_diff"),d=document.getElementById("jform_show_core");if(c&&(c.addEventListener("joomla.switcher.on",t),c.addEventListener("joomla.switcher.off",e)),d&&(d.addEventListener("joomla.switcher.on",n),d.addEventListener("joomla.switcher.off",o)),"undefined"!=typeof Storage&&localStorage.getItem("coreSwitchState")&&d){new MutationObserver((e,t)=>{c&&(d.newActive=1,d.switch(),t.disconnect())}).observe(d,{childList:!0,subtree:!0}),n()}if("undefined"!=typeof Storage&&localStorage.getItem("diffSwitchState")&&c){new MutationObserver((e,t)=>{c&&(c.newActive=1,c.switch(),t.disconnect())}).observe(c,{childList:!0,subtree:!0}),t()}})}();
\ No newline at end of file

From 89259689293c399f7a84f6a19ee08f4e739a0a91 Mon Sep 17 00:00:00 2001
From: Astrid <astridx@users.noreply.github.com>
Date: Sat, 21 Jul 2018 11:08:06 +0200
Subject: [PATCH 24/79] Sql files for fix database (#50)

* sql files for database fix

* delete space
---
 .../sql/updates/mysql/4.0.0-2018-07-19.sql     | 18 ++++++++++++++++++
 .../updates/postgresql/4.0.0-2018-07-19.sql    | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-19.sql
 create mode 100644 administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-19.sql

diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-19.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-19.sql
new file mode 100644
index 0000000000000..93e69b0ef40bb
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-19.sql
@@ -0,0 +1,18 @@
+CREATE TABLE IF NOT EXISTS `#__template_overrides` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `template` varchar(50) NOT NULL DEFAULT '',
+  `hash_id` varchar(255) NOT NULL DEFAULT '',
+  `extension_id` int(11) DEFAULT 0,
+  `state` tinyint(1) NOT NULL DEFAULT 0,
+  `action` varchar(50) NOT NULL DEFAULT '',
+  `client_id` tinyint(1) unsigned NOT NULL DEFAULT 0,
+  `created_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `modified_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`id`),
+  KEY `idx_template` (`template`),
+  KEY `idx_extension_id` (`extension_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
+
+INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `checked_out`, `checked_out_time`, `ordering`, `state`, `namespace`) VALUES
+(491, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 4, 0, ''),
+(492, 0, 'plg_quickicon_overridecheck', 'plugin', 'overridecheck', 'quickicon', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-19.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-19.sql
new file mode 100644
index 0000000000000..67174b4a65058
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-19.sql
@@ -0,0 +1,18 @@
+CREATE TABLE IF NOT EXISTS "#__template_overrides" (
+  "id" serial NOT NULL,
+  "template" varchar(50) DEFAULT '' NOT NULL,
+  "hash_id" varchar(255) DEFAULT '' NOT NULL,
+  "extension_id" bigint DEFAULT 0,
+  "state" smallint DEFAULT 0 NOT NULL,
+  "action" varchar(50) DEFAULT '' NOT NULL,
+  "client_id" smallint DEFAULT 0 NOT NULL,
+  "created_date" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  "modified_date" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL,
+  PRIMARY KEY ("id")
+);
+CREATE INDEX "#__template_overrides_idx_template" ON "#__template_overrides" ("template");
+CREATE INDEX "#__template_overrides_idx_extension_id" ON "#__template_overrides" ("extension_id");
+
+INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state", "namespace") VALUES
+(491, 0, 'plg_installer_override', 'plugin', 'override', 'installer', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 4, 0, ''),
+(492, 0, 'plg_quickicon_overridecheck', 'plugin', 'overridecheck', 'quickicon', 0, 1, 1, 1, '', '', 0, '1970-01-01 00:00:00', 0, 0, '');

From 2c393ffef6c4f6dcab6c6beb9aa60ffe9b2a5eaa Mon Sep 17 00:00:00 2001
From: Astrid <astridx@users.noreply.github.com>
Date: Thu, 26 Jul 2018 00:38:08 +0200
Subject: [PATCH 25/79] Suggestion for displaying Dates in view updates files
 (#52)

Correct Dates and do not use date of file any more
---
 .../com_templates/Model/TemplateModel.php     |  2 --
 plugins/installer/override/override.php       | 20 ++++++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index 9f7bf39a99910..e0e04c5ce45b9 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -90,12 +90,10 @@ protected function storeFileInfo($path, $name, $template)
 
 		if ($coreFile = $this->getCoreFile($path . $name, $template->client_id))
 		{
-			$temp->modifiedDate = date("y-m-d h:i:s.u", filemtime($coreFile));
 			$temp->coreFile = md5_file($coreFile);
 		}
 		else
 		{
-			$temp->modifiedDate = null;
 			$temp->coreFile = null;
 		}
 
diff --git a/plugins/installer/override/override.php b/plugins/installer/override/override.php
index 7a965610ee7f4..2c3218d7deb17 100644
--- a/plugins/installer/override/override.php
+++ b/plugins/installer/override/override.php
@@ -12,6 +12,7 @@
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Date\Date;
 
 /**
  * Override Plugin
@@ -141,7 +142,6 @@ public function getUpdatedFiles($action)
 				if ($after[$i]->coreFile !== $before[$i]->coreFile)
 				{
 					$after[$i]->action = $action;
-					unset($after[$i]->coreFile);
 					$result[] = $after[$i];
 				}
 			}
@@ -314,7 +314,6 @@ public function load($id, $exid)
 	private function saveOverrides($pks)
 	{
 		$db = Factory::getDbo();
-		$today = Factory::getDate();
 
 		// Insert columns.
 		$columns = array(
@@ -337,11 +336,18 @@ private function saveOverrides($pks)
 		{
 			$insertQuery->clear('values');
 
-			$createdDate = $today->format('y-m-d h:i:s');
+			$tz = new \DateTimeZone(Factory::getApplication()->get('offset'));
+			$date = new Date('now');
+			$date->setTimezone($tz);
+			$createdDate = $date->toSql(true);
 
-			if (empty($pk->modifiedDate))
+			if (empty($pk->coreFile))
 			{
-				$pk->modifiedDate = '0000-00-00 00:00:00';
+				$modifiedDate = $db->getNullDate();
+			}
+			else
+			{
+				$modifiedDate = $createdDate;
 			}
 
 			if ($this->load($pk->id, $pk->extension_id))
@@ -349,7 +355,7 @@ private function saveOverrides($pks)
 				$updateQuery = $db->getQuery(true)
 					->update($db->quoteName('#__template_overrides'))
 					->set(
-						array($db->quoteName('modified_date') . ' = ' . $db->quote($pk->modifiedDate),
+						array($db->quoteName('modified_date') . ' = ' . $db->quote($modifiedDate),
 						$db->quoteName('action') . ' = ' . $db->quote($pk->action),
 						$db->quoteName('state') . ' = ' . 0)
 						)
@@ -379,7 +385,7 @@ private function saveOverrides($pks)
 				$db->quote($pk->action),
 				(int) $pk->client,
 				$db->quote($createdDate),
-				$db->quote($pk->modifiedDate)
+				$db->quote($modifiedDate)
 			);
 
 			$insertQuery->values(implode(',', $values));

From 71fc7bb1f422dae84bbc0a1d65375f0c09fb920c Mon Sep 17 00:00:00 2001
From: Astrid <astridx@users.noreply.github.com>
Date: Sat, 28 Jul 2018 06:57:46 +0200
Subject: [PATCH 26/79] Store Date as UTC and show it in server time zone (#57)

* modified and created date are created and stored in UTC

* convert dates for displaying in model

* spar a loop

* normalize timezone in view

* use language constants for dateformat
---
 .../com_templates/tmpl/template/default_updated_files.php   | 6 ++++--
 plugins/installer/override/override.php                     | 4 +---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/administrator/components/com_templates/tmpl/template/default_updated_files.php b/administrator/components/com_templates/tmpl/template/default_updated_files.php
index 2190724fbfc76..902da3706f33e 100644
--- a/administrator/components/com_templates/tmpl/template/default_updated_files.php
+++ b/administrator/components/com_templates/tmpl/template/default_updated_files.php
@@ -57,13 +57,15 @@
 									<a class="hasTooltip" href="<?php echo Route::_('index.php?option=com_templates&view=template&id=' . (int) $value->extension_id . '&file=' . $value->hash_id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?>"><?php echo base64_decode($value->hash_id); ?></a>
 								</td>
 								<td>
-									<?php echo $value->created_date; ?>
+									<?php $created_date = $value->created_date; ?>
+									<?php echo $created_date > 0 ? HTMLHelper::_('date', $created_date, Text::_('DATE_FORMAT_FILTER_DATETIME')) : '-'; ?>
 								</td>
 								<td>
 									<?php if ($value->modified_date === '0000-00-00 00:00:00') : ?>
 										<span class="badge badge-warning"><?php echo Text::_('COM_TEMPLATES_OVERRIDE_CORE_REMOVED'); ?></span>
 									<?php else : ?>
-										<?php echo $value->modified_date; ?>
+										<?php $modified_date = $value->modified_date; ?>
+										<?php echo $modified_date > 0 ? HTMLHelper::_('date', $modified_date, Text::_('DATE_FORMAT_FILTER_DATETIME')) : '-'; ?>
 									<?php endif; ?>
 								</td>
 								<td>
diff --git a/plugins/installer/override/override.php b/plugins/installer/override/override.php
index 2c3218d7deb17..ed8edc950a446 100644
--- a/plugins/installer/override/override.php
+++ b/plugins/installer/override/override.php
@@ -336,10 +336,8 @@ private function saveOverrides($pks)
 		{
 			$insertQuery->clear('values');
 
-			$tz = new \DateTimeZone(Factory::getApplication()->get('offset'));
 			$date = new Date('now');
-			$date->setTimezone($tz);
-			$createdDate = $date->toSql(true);
+			$createdDate = $date->toSql();
 
 			if (empty($pk->coreFile))
 			{

From 173474b42a9c89ae3b1bbaa36efffa7628d34cb2 Mon Sep 17 00:00:00 2001
From: astridx <info@astrid-guenther.de>
Date: Wed, 1 Aug 2018 16:02:24 +0200
Subject: [PATCH 27/79] JToolbarHelper to ToolbarHelper

---
 .../components/com_templates/View/Template/HtmlView.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_templates/View/Template/HtmlView.php b/administrator/components/com_templates/View/Template/HtmlView.php
index 0a0b1342f8d03..0f055053682e3 100644
--- a/administrator/components/com_templates/View/Template/HtmlView.php
+++ b/administrator/components/com_templates/View/Template/HtmlView.php
@@ -290,7 +290,7 @@ protected function addToolbar()
 
 		if (count($this->updatedList) !== 0 && $this->pluginState)
 		{
-			\JToolbarHelper::custom('template.deleteOverrideHistory', 'delete', 'move', 'JTOOLBAR_DELETE', true, 'updateForm');
+			ToolbarHelper::custom('template.deleteOverrideHistory', 'delete', 'move', 'JTOOLBAR_DELETE', true, 'updateForm');
 		}
 
 		if ($this->type == 'home')

From 5cb273682562236720a66c160c1d1184fef8d25f Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Wed, 1 Aug 2018 19:55:10 +0530
Subject: [PATCH 28/79] CS

---
 .../com_templates/Controller/TemplateController.php           | 4 ++--
 administrator/language/en-GB/en-GB.com_templates.ini          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/components/com_templates/Controller/TemplateController.php b/administrator/components/com_templates/Controller/TemplateController.php
index ad2a82a3566ff..7ddd3eb2fdd87 100644
--- a/administrator/components/com_templates/Controller/TemplateController.php
+++ b/administrator/components/com_templates/Controller/TemplateController.php
@@ -115,11 +115,11 @@ public function publish()
 			}
 			else
 			{
-				if ($value == 1)
+				if ($value === 1)
 				{
 					$ntext = 'COM_TEMPLATES_N_OVERRIDE_CHECKED';
 				}
-				elseif ($value == 0)
+				elseif ($value === 0)
 				{
 					$ntext = 'COM_TEMPLATES_N_OVERRIDE_UNCHECKED';
 				}
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index c3194890f4ee8..8091f87d886db 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -230,7 +230,7 @@ COM_TEMPLATES_TEMPLATE_PREVIEW="Preview"
 COM_TEMPLATES_TEMPLATES_FILTER_SEARCH_DESC="Search in template name or folder name."
 COM_TEMPLATES_TOGGLE_FULL_SCREEN="Press Ctrl-Q to toggle Full Screen editing."
 COM_TEMPLATES_TOOLBAR_SET_HOME="Default"
-COM_TEMPLATES_UPDATED="%s Updated"
+COM_TEMPLATES_UPDATED="%s Conflict found."
 COM_TEMPLATES_UPTODATE="Up to date"
 COM_TEMPLATES_WARNING_FORMAT_WILL_NOT_BE_VISIBLE="You have created a new file with the extension '%s'. This is supported but as you did not have that file extension in the list of supported formats this can't be displayed. Please double check the options for Templates and add the format if needed."
 COM_TEMPLATES_XML_DESCRIPTION="This component manages templates"

From b8155c5cb60b89b4f6027211543c2b2f03fd3e80 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Sun, 5 Aug 2018 18:12:23 +0530
Subject: [PATCH 29/79] namespace

---
 .../components/com_joomlaupdate/Model/UpdateModel.php      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/administrator/components/com_joomlaupdate/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/Model/UpdateModel.php
index 45f7ee6f1030a..bff765693da95 100644
--- a/administrator/components/com_joomlaupdate/Model/UpdateModel.php
+++ b/administrator/components/com_joomlaupdate/Model/UpdateModel.php
@@ -26,6 +26,7 @@
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Http\HttpFactory;
 use Joomla\CMS\Installer\Installer;
+use Joomla\CMS\Plugin\PluginHelper;
 
 jimport('joomla.filesystem.folder');
 jimport('joomla.filesystem.file');
@@ -408,7 +409,7 @@ protected function downloadPackage($url, $target)
 	public function createRestorationFile($basename = null)
 	{
 		// Load overrides plugin.
-		\JPluginHelper::importPlugin('installer');
+		PluginHelper::importPlugin('installer');
 
 		// Get a password
 		$password = UserHelper::genRandomPassword(32);
@@ -850,9 +851,9 @@ public function finaliseUpgrade()
 	public function cleanUp()
 	{
 		// Load overrides plugin.
-		\JPluginHelper::importPlugin('installer');
+		PluginHelper::importPlugin('installer');
 
-		$app = \JFactory::getApplication();
+		$app = Factory::getApplication();
 
 		// Trigger on before joomla event.
 		$app->triggerEvent('onJoomlaAfterUpdate');

From 9a5b1776e587931b064a645b0457c0f69dc0cdda Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 6 Aug 2018 21:37:02 +0530
Subject: [PATCH 30/79] plural

---
 .../components/com_templates/tmpl/templates/default.php        | 2 +-
 administrator/language/en-GB/en-GB.com_templates.ini           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_templates/tmpl/templates/default.php b/administrator/components/com_templates/tmpl/templates/default.php
index 38e9e060d8abb..eb12da5d3153d 100644
--- a/administrator/components/com_templates/tmpl/templates/default.php
+++ b/administrator/components/com_templates/tmpl/templates/default.php
@@ -97,7 +97,7 @@
 								<?php if ($this->pluginState) : ?>
 									<td class="d-none d-md-table-cell text-center">
 										<?php if (!empty($item->updated)) : ?>
-											<span class="badge badge-warning"><?php echo JText::sprintf('COM_TEMPLATES_UPDATED', $item->updated); ?></span>
+											<span class="badge badge-warning"><?php echo JText::plural('COM_TEMPLATES_N_CONFLICT', $item->updated); ?></span>
 										<?php else : ?>
 											<span class="badge badge-success"><?php echo JText::_('COM_TEMPLATES_UPTODATE'); ?></span>
 										<?php endif; ?>
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index 8091f87d886db..b101371d378a1 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -230,7 +230,8 @@ COM_TEMPLATES_TEMPLATE_PREVIEW="Preview"
 COM_TEMPLATES_TEMPLATES_FILTER_SEARCH_DESC="Search in template name or folder name."
 COM_TEMPLATES_TOGGLE_FULL_SCREEN="Press Ctrl-Q to toggle Full Screen editing."
 COM_TEMPLATES_TOOLBAR_SET_HOME="Default"
-COM_TEMPLATES_UPDATED="%s Conflict found."
+COM_TEMPLATES_N_CONFLICT="%d Conflicts found."
+COM_TEMPLATES_N_CONFLICT_1="Conflict found."
 COM_TEMPLATES_UPTODATE="Up to date"
 COM_TEMPLATES_WARNING_FORMAT_WILL_NOT_BE_VISIBLE="You have created a new file with the extension '%s'. This is supported but as you did not have that file extension in the list of supported formats this can't be displayed. Please double check the options for Templates and add the format if needed."
 COM_TEMPLATES_XML_DESCRIPTION="This component manages templates"

From 5d502985135ae1bb82ab83a09b3bb87f6865614a Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 6 Aug 2018 21:43:01 +0530
Subject: [PATCH 31/79] name

---
 .../com_templates/tmpl/templates/default.php  | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/administrator/components/com_templates/tmpl/templates/default.php b/administrator/components/com_templates/tmpl/templates/default.php
index eb12da5d3153d..c6fe721869051 100644
--- a/administrator/components/com_templates/tmpl/templates/default.php
+++ b/administrator/components/com_templates/tmpl/templates/default.php
@@ -9,17 +9,23 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\Factory;
+
 // Include the component HTML helpers.
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 
-JHtml::_('behavior.multiselect');
+HTMLHelper::_('behavior.multiselect');
 
-$user      = JFactory::getUser();
+$user      = Factory::getUser();
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 ?>
 
-<form action="<?php echo JRoute::_('index.php?option=com_templates&view=templates'); ?>" method="post" name="adminForm" id="adminForm">
+<form action="<?php echo Route::_('index.php?option=com_templates&view=templates'); ?>" method="post" name="adminForm" id="adminForm">
 	<div class="row">
 		<div id="j-sidebar-container" class="col-md-2">
 			<?php echo $this->sidebar; ?>
@@ -32,23 +38,23 @@
 						<thead>
 							<tr>
 								<th scope="col" class="col1template d-none d-md-table-cell" style="width:20%">
-									<?php echo JText::_('COM_TEMPLATES_HEADING_IMAGE'); ?>
+									<?php echo Text::_('COM_TEMPLATES_HEADING_IMAGE'); ?>
 								</th>
 								<th scope="col" style="width:30%">
-									<?php echo JHtml::_('searchtools.sort', 'COM_TEMPLATES_HEADING_TEMPLATE', 'a.element', $listDirn, $listOrder); ?>
+									<?php echo HTMLHelper::_('searchtools.sort', 'COM_TEMPLATES_HEADING_TEMPLATE', 'a.element', $listDirn, $listOrder); ?>
 								</th>
 								<th scope="col" style="width:10%" class="d-none d-md-table-cell text-center">
-									<?php echo JText::_('JVERSION'); ?>
+									<?php echo Text::_('JVERSION'); ?>
 								</th>
 								<th scope="col" style="width:10%" class="d-none d-md-table-cell text-center">
-									<?php echo JText::_('JDATE'); ?>
+									<?php echo Text::_('JDATE'); ?>
 								</th>
 								<th scope="col" style="width:25%" class="d-none d-md-table-cell text-center">
-									<?php echo JText::_('JAUTHOR'); ?>
+									<?php echo Text::_('JAUTHOR'); ?>
 								</th>
 								<?php if ($this->pluginState) : ?>
 									<th style="width:10%" class="d-none d-md-table-cell text-center">
-										<?php echo JText::_('COM_TEMPLATES_OVERRIDES'); ?>
+										<?php echo Text::_('COM_TEMPLATES_OVERRIDES'); ?>
 									</th>
 								<?php endif;?>
 							</tr>
@@ -57,21 +63,21 @@
 						<?php foreach ($this->items as $i => $item) : ?>
 							<tr class="row<?php echo $i % 2; ?>">
 								<td class="text-center d-none d-md-table-cell">
-									<?php echo JHtml::_('templates.thumb', $item->element, $item->client_id); ?>
-									<?php echo JHtml::_('templates.thumbModal', $item->element, $item->client_id); ?>
+									<?php echo HTMLHelper::_('templates.thumb', $item->element, $item->client_id); ?>
+									<?php echo HTMLHelper::_('templates.thumbModal', $item->element, $item->client_id); ?>
 								</td>
 								<th scope="row" class="template-name">
-									<a href="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . (int) $item->extension_id . '&file=' . $this->file); ?>">
-										<?php echo JText::sprintf('COM_TEMPLATES_TEMPLATE_DETAILS', ucfirst($item->name)); ?></a>
+									<a href="<?php echo Route::_('index.php?option=com_templates&view=template&id=' . (int) $item->extension_id . '&file=' . $this->file); ?>">
+										<?php echo Text::sprintf('COM_TEMPLATES_TEMPLATE_DETAILS', ucfirst($item->name)); ?></a>
 									<div>
 									<?php if ($this->preview && $item->client_id == '0') : ?>
-										<a href="<?php echo JRoute::_(JUri::root() . 'index.php?tp=1&template=' . $item->element); ?>" target="_blank">
-										<?php echo JText::_('COM_TEMPLATES_TEMPLATE_PREVIEW'); ?>
+										<a href="<?php echo Route::_(Uri::root() . 'index.php?tp=1&template=' . $item->element); ?>" target="_blank">
+										<?php echo Text::_('COM_TEMPLATES_TEMPLATE_PREVIEW'); ?>
 										</a>
 									<?php elseif ($item->client_id == '1') : ?>
-										<?php echo JText::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW_ADMIN'); ?>
+										<?php echo Text::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW_ADMIN'); ?>
 									<?php else : ?>
-										<span class="hasTooltip" title="<?php echo JHtml::_('tooltipText', 'COM_TEMPLATES_TEMPLATE_NO_PREVIEW_DESC'); ?>"><?php echo JText::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?></span>
+										<span class="hasTooltip" title="<?php echo HTMLHelper::_('tooltipText', 'COM_TEMPLATES_TEMPLATE_NO_PREVIEW_DESC'); ?>"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_NO_PREVIEW'); ?></span>
 									<?php endif; ?>
 									</div>
 								</th>
@@ -97,9 +103,9 @@
 								<?php if ($this->pluginState) : ?>
 									<td class="d-none d-md-table-cell text-center">
 										<?php if (!empty($item->updated)) : ?>
-											<span class="badge badge-warning"><?php echo JText::plural('COM_TEMPLATES_N_CONFLICT', $item->updated); ?></span>
+											<span class="badge badge-warning"><?php echo Text::plural('COM_TEMPLATES_N_CONFLICT', $item->updated); ?></span>
 										<?php else : ?>
-											<span class="badge badge-success"><?php echo JText::_('COM_TEMPLATES_UPTODATE'); ?></span>
+											<span class="badge badge-success"><?php echo Text::_('COM_TEMPLATES_UPTODATE'); ?></span>
 										<?php endif; ?>
 									</td>
 								<?php endif; ?>
@@ -115,7 +121,7 @@
 
 				<input type="hidden" name="task" value="">
 				<input type="hidden" name="boxchecked" value="0">
-				<?php echo JHtml::_('form.token'); ?>
+				<?php echo HTMLHelper::_('form.token'); ?>
 			</div>
 		</div>
 	</div>

From 30bddaf35df54d6d64cf6fae55c65bd2090e3d22 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 6 Aug 2018 21:55:54 +0530
Subject: [PATCH 32/79] clean

---
 administrator/language/en-GB/en-GB.plg_installer_override.ini | 3 ++-
 plugins/installer/override/override.php                       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.plg_installer_override.ini b/administrator/language/en-GB/en-GB.plg_installer_override.ini
index 85a7677121e33..0481dc524b40a 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_override.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_override.ini
@@ -5,4 +5,5 @@
 
 PLG_INSTALLER_OVERRIDE="Installer - Override"
 PLG_INSTALLER_OVERRIDE_PLUGIN_XML_DESCRIPTION="The system overrides plugin enables notifications and handling of overrides after an update in case of differences."
-PLG_INSTALLER_OVERRIDE_FILE_UPDATED="%s Override(s) core file updated."
+PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED="%d Overrides core file updated."
+PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED_1="Override core file updated."
diff --git a/plugins/installer/override/override.php b/plugins/installer/override/override.php
index ed8edc950a446..4d86044631a2c 100644
--- a/plugins/installer/override/override.php
+++ b/plugins/installer/override/override.php
@@ -182,7 +182,7 @@ public function finalize($result)
 		if ($num != 0)
 		{
 			$span = '<span class="badge badge-light">' . $num . '</span>';
-			$this->app->enqueueMessage(Text::sprintf('PLG_INSTALLER_OVERRIDE_FILE_UPDATED', $span), 'notice');
+			$this->app->enqueueMessage(Text::plural('PLG_INSTALLER_OVERRIDE_FILE_UPDATED', $span), 'notice');
 			$this->saveOverrides($result);
 		}
 

From 666127d92b949d2d5efc90a436b116793ed73421 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 6 Aug 2018 22:02:40 +0530
Subject: [PATCH 33/79] text

---
 administrator/language/en-GB/en-GB.com_templates.ini | 4 ++--
 plugins/installer/override/override.php              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index b101371d378a1..d48ad1b4fdcc9 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -230,8 +230,8 @@ COM_TEMPLATES_TEMPLATE_PREVIEW="Preview"
 COM_TEMPLATES_TEMPLATES_FILTER_SEARCH_DESC="Search in template name or folder name."
 COM_TEMPLATES_TOGGLE_FULL_SCREEN="Press Ctrl-Q to toggle Full Screen editing."
 COM_TEMPLATES_TOOLBAR_SET_HOME="Default"
-COM_TEMPLATES_N_CONFLICT="%d Conflicts found."
-COM_TEMPLATES_N_CONFLICT_1="Conflict found."
+COM_TEMPLATES_N_CONFLICT="%d Conflicts found"
+COM_TEMPLATES_N_CONFLICT_1="Conflict found"
 COM_TEMPLATES_UPTODATE="Up to date"
 COM_TEMPLATES_WARNING_FORMAT_WILL_NOT_BE_VISIBLE="You have created a new file with the extension '%s'. This is supported but as you did not have that file extension in the list of supported formats this can't be displayed. Please double check the options for Templates and add the format if needed."
 COM_TEMPLATES_XML_DESCRIPTION="This component manages templates"
diff --git a/plugins/installer/override/override.php b/plugins/installer/override/override.php
index 4d86044631a2c..8bbca326bec1c 100644
--- a/plugins/installer/override/override.php
+++ b/plugins/installer/override/override.php
@@ -182,7 +182,7 @@ public function finalize($result)
 		if ($num != 0)
 		{
 			$span = '<span class="badge badge-light">' . $num . '</span>';
-			$this->app->enqueueMessage(Text::plural('PLG_INSTALLER_OVERRIDE_FILE_UPDATED', $span), 'notice');
+			$this->app->enqueueMessage(Text::plural('PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED', $span), 'notice');
 			$this->saveOverrides($result);
 		}
 

From 29ec5923ef3b22cc7de46bc9e0be0d55ddc95c46 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 6 Aug 2018 22:06:58 +0530
Subject: [PATCH 34/79] fx

---
 administrator/language/en-GB/en-GB.plg_installer_override.ini | 2 +-
 plugins/installer/override/override.php                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.plg_installer_override.ini b/administrator/language/en-GB/en-GB.plg_installer_override.ini
index 0481dc524b40a..5b7e1c171375b 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_override.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_override.ini
@@ -5,5 +5,5 @@
 
 PLG_INSTALLER_OVERRIDE="Installer - Override"
 PLG_INSTALLER_OVERRIDE_PLUGIN_XML_DESCRIPTION="The system overrides plugin enables notifications and handling of overrides after an update in case of differences."
-PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED="%d Overrides core file updated."
+PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED="%s Overrides core file updated."
 PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED_1="Override core file updated."
diff --git a/plugins/installer/override/override.php b/plugins/installer/override/override.php
index 8bbca326bec1c..4d86044631a2c 100644
--- a/plugins/installer/override/override.php
+++ b/plugins/installer/override/override.php
@@ -182,7 +182,7 @@ public function finalize($result)
 		if ($num != 0)
 		{
 			$span = '<span class="badge badge-light">' . $num . '</span>';
-			$this->app->enqueueMessage(Text::plural('PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED', $span), 'notice');
+			$this->app->enqueueMessage(Text::plural('PLG_INSTALLER_OVERRIDE_FILE_UPDATED', $span), 'notice');
 			$this->saveOverrides($result);
 		}
 

From 07ede1713f98387d7b925887656f0e7df2ca3c1d Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 6 Aug 2018 22:08:25 +0530
Subject: [PATCH 35/79] sin

---
 plugins/installer/override/override.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/installer/override/override.php b/plugins/installer/override/override.php
index 4d86044631a2c..8bbca326bec1c 100644
--- a/plugins/installer/override/override.php
+++ b/plugins/installer/override/override.php
@@ -182,7 +182,7 @@ public function finalize($result)
 		if ($num != 0)
 		{
 			$span = '<span class="badge badge-light">' . $num . '</span>';
-			$this->app->enqueueMessage(Text::plural('PLG_INSTALLER_OVERRIDE_FILE_UPDATED', $span), 'notice');
+			$this->app->enqueueMessage(Text::plural('PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED', $span), 'notice');
 			$this->saveOverrides($result);
 		}
 

From c5ca74fa6389ef71e2b1ded2a308103ae101aeed Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 6 Aug 2018 22:15:20 +0530
Subject: [PATCH 36/79] files

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

diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index d48ad1b4fdcc9..d64f1f183e300 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -189,7 +189,7 @@ COM_TEMPLATES_OVERRIDE_MODIFIED_DATE="Last change via Update"
 COM_TEMPLATES_OVERRIDE_SUCCESS="Successfully created the override."
 COM_TEMPLATES_OVERRIDE_TEMPLATE_FILE="Template File"
 COM_TEMPLATES_OVERRIDE_UPTODATE="Override files are up to date with core files. Nothing is changed in last extension or Joomla update."
-COM_TEMPLATES_OVERRIDES="Overrides"
+COM_TEMPLATES_OVERRIDES="Overrides files"
 COM_TEMPLATES_OVERRIDES_COMPONENTS="Components"
 COM_TEMPLATES_OVERRIDES_MODULES="Modules"
 COM_TEMPLATES_OVERRIDES_LAYOUTS="Layouts"

From 80b2c9283b38c24433c60df64adbbbd8ee689a23 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 6 Aug 2018 22:16:44 +0530
Subject: [PATCH 37/79] s

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

diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index d64f1f183e300..ab2268ad39783 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -189,7 +189,7 @@ COM_TEMPLATES_OVERRIDE_MODIFIED_DATE="Last change via Update"
 COM_TEMPLATES_OVERRIDE_SUCCESS="Successfully created the override."
 COM_TEMPLATES_OVERRIDE_TEMPLATE_FILE="Template File"
 COM_TEMPLATES_OVERRIDE_UPTODATE="Override files are up to date with core files. Nothing is changed in last extension or Joomla update."
-COM_TEMPLATES_OVERRIDES="Overrides files"
+COM_TEMPLATES_OVERRIDES="Override files"
 COM_TEMPLATES_OVERRIDES_COMPONENTS="Components"
 COM_TEMPLATES_OVERRIDES_MODULES="Modules"
 COM_TEMPLATES_OVERRIDES_LAYOUTS="Layouts"

From 8e8d85e547c6946e1b5949529f0b526140e296d6 Mon Sep 17 00:00:00 2001
From: Astrid <astridx@users.noreply.github.com>
Date: Sun, 12 Aug 2018 21:44:58 +0200
Subject: [PATCH 38/79] Suggestion for language strings (#60)

* language strings

* correct typo
---
 .../com_templates/Controller/TemplateController.php        | 2 +-
 .../components/com_templates/View/Template/HtmlView.php    | 2 +-
 administrator/language/en-GB/en-GB.com_templates.ini       | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/administrator/components/com_templates/Controller/TemplateController.php b/administrator/components/com_templates/Controller/TemplateController.php
index 38ac661770c8c..b934008320c0f 100644
--- a/administrator/components/com_templates/Controller/TemplateController.php
+++ b/administrator/components/com_templates/Controller/TemplateController.php
@@ -126,7 +126,7 @@ public function publish()
 				}
 				elseif ($value === -3)
 				{
-					$ntext = 'COM_TEMPLATES_N_OVERRIDE_DELEATED';
+					$ntext = 'COM_TEMPLATES_N_OVERRIDE_DELETED';
 				}
 
 				$this->setMessage(Text::plural($ntext, count($ids)));
diff --git a/administrator/components/com_templates/View/Template/HtmlView.php b/administrator/components/com_templates/View/Template/HtmlView.php
index cc1a271e16c5a..d4bb05c48c5ef 100644
--- a/administrator/components/com_templates/View/Template/HtmlView.php
+++ b/administrator/components/com_templates/View/Template/HtmlView.php
@@ -291,7 +291,7 @@ protected function addToolbar()
 
 		if (count($this->updatedList) !== 0 && $this->pluginState)
 		{
-			ToolbarHelper::custom('template.deleteOverrideHistory', 'delete', 'move', 'JTOOLBAR_DELETE', true, 'updateForm');
+			ToolbarHelper::custom('template.deleteOverrideHistory', 'delete', 'move', 'COM_TEMPLATES_BUTTON_DELETE_LIST_ENTRY', true, 'updateForm');
 		}
 
 		if ($this->type == 'home')
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index ab2268ad39783..f8a14bc4ad777 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -14,6 +14,7 @@ COM_TEMPLATES_BUTTON_CREATE="Create"
 COM_TEMPLATES_BUTTON_CROP="Crop"
 COM_TEMPLATES_BUTTON_DELETE="Delete"
 COM_TEMPLATES_BUTTON_DELETE_FILE="Delete File"
+COM_TEMPLATES_BUTTON_DELETE_LIST_ENTRY="Delete List Entry"
 COM_TEMPLATES_BUTTON_EXTRACT_ARCHIVE="Extract Here"
 COM_TEMPLATES_BUTTON_FILE="New File"
 COM_TEMPLATES_BUTTON_FOLDERS="Manage Folders"
@@ -170,9 +171,9 @@ COM_TEMPLATES_MSG_MANAGE_NO_STYLES="There are no styles installed matching your
 COM_TEMPLATES_MSG_MANAGE_NO_TEMPLATES="There are no templates installed matching your query."
 COM_TEMPLATES_N_ITEMS_DELETED="%d template styles deleted."
 COM_TEMPLATES_N_ITEMS_DELETED_1="Template style deleted."
-COM_TEMPLATES_N_OVERRIDE_CHECKED="%d override history marked as checked."
-COM_TEMPLATES_N_OVERRIDE_DELEATED="%d Override history deleted."
-COM_TEMPLATES_N_OVERRIDE_UNCHECKED="%d override history marked as unchecked."
+COM_TEMPLATES_N_OVERRIDE_CHECKED="%d Updated files list entry marked as checked."
+COM_TEMPLATES_N_OVERRIDE_DELETED="%d Updated files list entry deleted."
+COM_TEMPLATES_N_OVERRIDE_UNCHECKED="%d Updated files list entry marked as unchecked."
 COM_TEMPLATES_NEW_FILE_HEADER="Create or Upload a new file."
 COM_TEMPLATES_NEW_FILE_NAME="New File Name"
 COM_TEMPLATES_NEW_FILE_SELECT="Select a file type"

From 4048f3da6d1fedaf7e41660d67fdb1ff926a0eab Mon Sep 17 00:00:00 2001
From: astridx <info@astrid-guenther.de>
Date: Thu, 16 Aug 2018 21:09:24 +0200
Subject: [PATCH 39/79] delete media folder plg_quickicon

---
 .../js/overridecheck.es6.js                   | 69 -----------------
 .../js/overridecheck.es6.min.js               |  1 -
 .../js/overridecheck.js                       | 74 -------------------
 .../js/overridecheck.min.js                   |  1 -
 4 files changed, 145 deletions(-)
 delete mode 100644 media/plg_quickicon_overridecheck/js/overridecheck.es6.js
 delete mode 100644 media/plg_quickicon_overridecheck/js/overridecheck.es6.min.js
 delete mode 100644 media/plg_quickicon_overridecheck/js/overridecheck.js
 delete mode 100644 media/plg_quickicon_overridecheck/js/overridecheck.min.js

diff --git a/media/plg_quickicon_overridecheck/js/overridecheck.es6.js b/media/plg_quickicon_overridecheck/js/overridecheck.es6.js
deleted file mode 100644
index a3f13493fafe2..0000000000000
--- a/media/plg_quickicon_overridecheck/js/overridecheck.es6.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// Ajax call to get the override status.
-(() => {
-  'use strict';
-
-  // Add a listener on content loaded to initiate the check.
-
-  document.addEventListener('DOMContentLoaded', () => {
-    if (Joomla.getOptions('js-override-check')) {
-      const options = Joomla.getOptions('js-override-check');
-      Joomla.request({
-        url: options.ajaxUrl,
-        method: 'GET',
-        data: '',
-        perform: true,
-        onSuccess: (response) => {
-          const link = document.getElementById('plg_quickicon_overridecheck');
-          const linkSpan = link.querySelectorAll('span.j-links-link');
-          const updateInfoList = JSON.parse(response);
-
-          if (updateInfoList.installerOverride !== 'disabled') {
-            if (updateInfoList instanceof Array) {
-              if (updateInfoList.length === 0) {
-                // No overrides found
-                link.classList.add('success');
-                for (let i = 0, len = linkSpan.length; i < len; i += 1) {
-                  linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_UPTODATE');
-                }
-              } else {
-                // Scroll to page top
-                window.scrollTo(0, 0);
-
-                link.classList.add('danger');
-                for (let i = 0, len = linkSpan.length; i < len; i += 1) {
-                  linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND').replace('%s', `<span class="badge badge-light">${updateInfoList.length}</span>`);
-                }
-              }
-            } else {
-              // An error occurred
-              link.classList.add('danger');
-              for (let i = 0, len = linkSpan.length; i < len; i += 1) {
-                linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR');
-              }
-            }
-          } else {
-            link.classList.add('danger');
-            link.setAttribute('href', 'index.php?option=com_plugins&task=plugin.edit&extension_id=491');
-            for (let i = 0, len = linkSpan.length; i < len; i += 1) {
-              linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE');
-            }
-          }
-        },
-        onError: () => {
-          // An error occurred
-          const link = document.getElementById('plg_quickicon_overridecheck');
-          const linkSpan = link.querySelectorAll('span.j-links-link');
-          link.classList.add('danger');
-          for (let i = 0, len = linkSpan.length; i < len; i += 1) {
-            linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR');
-          }
-        },
-      });
-    }
-  });
-})();
diff --git a/media/plg_quickicon_overridecheck/js/overridecheck.es6.min.js b/media/plg_quickicon_overridecheck/js/overridecheck.es6.min.js
deleted file mode 100644
index 701089224ce51..0000000000000
--- a/media/plg_quickicon_overridecheck/js/overridecheck.es6.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(()=>{"use strict";document.addEventListener("DOMContentLoaded",()=>{if(Joomla.getOptions("js-override-check")){const e=Joomla.getOptions("js-override-check");Joomla.request({url:e.ajaxUrl,method:"GET",data:"",perform:!0,onSuccess:e=>{const t=document.getElementById("plg_quickicon_overridecheck"),n=t.querySelectorAll("span.j-links-link"),l=JSON.parse(e);if("disabled"!==l.installerOverride)if(l instanceof Array)if(0===l.length){t.classList.add("success");for(let e=0,t=n.length;e<t;e+=1)n[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_UPTODATE")}else{window.scrollTo(0,0),t.classList.add("danger");for(let e=0,t=n.length;e<t;e+=1)n[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND").replace("%s",`<span class="badge badge-light">${l.length}</span>`)}else{t.classList.add("danger");for(let e=0,t=n.length;e<t;e+=1)n[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR")}else{t.classList.add("danger"),t.setAttribute("href","index.php?option=com_plugins&task=plugin.edit&extension_id=491");for(let e=0,t=n.length;e<t;e+=1)n[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE")}},onError:()=>{const e=document.getElementById("plg_quickicon_overridecheck"),t=e.querySelectorAll("span.j-links-link");e.classList.add("danger");for(let e=0,n=t.length;e<n;e+=1)t[e].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR")}})}})})();
\ No newline at end of file
diff --git a/media/plg_quickicon_overridecheck/js/overridecheck.js b/media/plg_quickicon_overridecheck/js/overridecheck.js
deleted file mode 100644
index dc184d47a9ca5..0000000000000
--- a/media/plg_quickicon_overridecheck/js/overridecheck.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
-* PLEASE DO NOT MODIFY THIS FILE. WORK ON THE ES6 VERSION.
-* OTHERWISE YOUR CHANGES WILL BE REPLACED ON THE NEXT BUILD.
-**/
-
-/**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// Ajax call to get the override status.
-(function () {
-  'use strict';
-
-  // Add a listener on content loaded to initiate the check.
-
-  document.addEventListener('DOMContentLoaded', function () {
-    if (Joomla.getOptions('js-override-check')) {
-      var options = Joomla.getOptions('js-override-check');
-      Joomla.request({
-        url: options.ajaxUrl,
-        method: 'GET',
-        data: '',
-        perform: true,
-        onSuccess: function onSuccess(response) {
-          var link = document.getElementById('plg_quickicon_overridecheck');
-          var linkSpan = link.querySelectorAll('span.j-links-link');
-          var updateInfoList = JSON.parse(response);
-
-          if (updateInfoList.installerOverride !== 'disabled') {
-            if (updateInfoList instanceof Array) {
-              if (updateInfoList.length === 0) {
-                // No overrides found
-                link.classList.add('success');
-                for (var i = 0, len = linkSpan.length; i < len; i += 1) {
-                  linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_UPTODATE');
-                }
-              } else {
-                // Scroll to page top
-                window.scrollTo(0, 0);
-
-                link.classList.add('danger');
-                for (var _i = 0, _len = linkSpan.length; _i < _len; _i += 1) {
-                  linkSpan[_i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND').replace('%s', '<span class="badge badge-light">' + updateInfoList.length + '</span>');
-                }
-              }
-            } else {
-              // An error occurred
-              link.classList.add('danger');
-              for (var _i2 = 0, _len2 = linkSpan.length; _i2 < _len2; _i2 += 1) {
-                linkSpan[_i2].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR');
-              }
-            }
-          } else {
-            link.classList.add('danger');
-            link.setAttribute('href', 'index.php?option=com_plugins&task=plugin.edit&extension_id=491');
-            for (var _i3 = 0, _len3 = linkSpan.length; _i3 < _len3; _i3 += 1) {
-              linkSpan[_i3].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE');
-            }
-          }
-        },
-        onError: function onError() {
-          // An error occurred
-          var link = document.getElementById('plg_quickicon_overridecheck');
-          var linkSpan = link.querySelectorAll('span.j-links-link');
-          link.classList.add('danger');
-          for (var i = 0, len = linkSpan.length; i < len; i += 1) {
-            linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR');
-          }
-        }
-      });
-    }
-  });
-})();
diff --git a/media/plg_quickicon_overridecheck/js/overridecheck.min.js b/media/plg_quickicon_overridecheck/js/overridecheck.min.js
deleted file mode 100644
index dc7596b5949ea..0000000000000
--- a/media/plg_quickicon_overridecheck/js/overridecheck.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(){"use strict";document.addEventListener("DOMContentLoaded",function(){if(Joomla.getOptions("js-override-check")){var e=Joomla.getOptions("js-override-check");Joomla.request({url:e.ajaxUrl,method:"GET",data:"",perform:!0,onSuccess:function(e){var n=document.getElementById("plg_quickicon_overridecheck"),r=n.querySelectorAll("span.j-links-link"),t=JSON.parse(e);if("disabled"!==t.installerOverride)if(t instanceof Array)if(0===t.length){n.classList.add("success");for(var o=0,a=r.length;o<a;o+=1)r[o].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_UPTODATE")}else{window.scrollTo(0,0),n.classList.add("danger");for(var l=0,s=r.length;l<s;l+=1)r[l].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND").replace("%s",'<span class="badge badge-light">'+t.length+"</span>")}else{n.classList.add("danger");for(var i=0,d=r.length;i<d;i+=1)r[i].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR")}else{n.classList.add("danger"),n.setAttribute("href","index.php?option=com_plugins&task=plugin.edit&extension_id=491");for(var c=0,E=r.length;c<E;c+=1)r[c].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE")}},onError:function(){var e=document.getElementById("plg_quickicon_overridecheck"),n=e.querySelectorAll("span.j-links-link");e.classList.add("danger");for(var r=0,t=n.length;r<t;r+=1)n[r].innerHTML=Joomla.JText._("PLG_QUICKICON_OVERRIDECHECK_ERROR")}})}})}();
\ No newline at end of file

From 9a6c9eb5365e4357578b6931e41f175af9f0fd53 Mon Sep 17 00:00:00 2001
From: astridx <info@astrid-guenther.de>
Date: Thu, 16 Aug 2018 21:11:43 +0200
Subject: [PATCH 40/79] add folder plg_quickicon to build/media_src

---
 .../js/overridecheck.es6.js                   | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 build/media_src/plg_quickicon_overridecheck/js/overridecheck.es6.js

diff --git a/build/media_src/plg_quickicon_overridecheck/js/overridecheck.es6.js b/build/media_src/plg_quickicon_overridecheck/js/overridecheck.es6.js
new file mode 100644
index 0000000000000..a3f13493fafe2
--- /dev/null
+++ b/build/media_src/plg_quickicon_overridecheck/js/overridecheck.es6.js
@@ -0,0 +1,69 @@
+/**
+ * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// Ajax call to get the override status.
+(() => {
+  'use strict';
+
+  // Add a listener on content loaded to initiate the check.
+
+  document.addEventListener('DOMContentLoaded', () => {
+    if (Joomla.getOptions('js-override-check')) {
+      const options = Joomla.getOptions('js-override-check');
+      Joomla.request({
+        url: options.ajaxUrl,
+        method: 'GET',
+        data: '',
+        perform: true,
+        onSuccess: (response) => {
+          const link = document.getElementById('plg_quickicon_overridecheck');
+          const linkSpan = link.querySelectorAll('span.j-links-link');
+          const updateInfoList = JSON.parse(response);
+
+          if (updateInfoList.installerOverride !== 'disabled') {
+            if (updateInfoList instanceof Array) {
+              if (updateInfoList.length === 0) {
+                // No overrides found
+                link.classList.add('success');
+                for (let i = 0, len = linkSpan.length; i < len; i += 1) {
+                  linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_UPTODATE');
+                }
+              } else {
+                // Scroll to page top
+                window.scrollTo(0, 0);
+
+                link.classList.add('danger');
+                for (let i = 0, len = linkSpan.length; i < len; i += 1) {
+                  linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND').replace('%s', `<span class="badge badge-light">${updateInfoList.length}</span>`);
+                }
+              }
+            } else {
+              // An error occurred
+              link.classList.add('danger');
+              for (let i = 0, len = linkSpan.length; i < len; i += 1) {
+                linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR');
+              }
+            }
+          } else {
+            link.classList.add('danger');
+            link.setAttribute('href', 'index.php?option=com_plugins&task=plugin.edit&extension_id=491');
+            for (let i = 0, len = linkSpan.length; i < len; i += 1) {
+              linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE');
+            }
+          }
+        },
+        onError: () => {
+          // An error occurred
+          const link = document.getElementById('plg_quickicon_overridecheck');
+          const linkSpan = link.querySelectorAll('span.j-links-link');
+          link.classList.add('danger');
+          for (let i = 0, len = linkSpan.length; i < len; i += 1) {
+            linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR');
+          }
+        },
+      });
+    }
+  });
+})();

From b4023330b6a9c84378dcb5c9965694785e3bcb3e Mon Sep 17 00:00:00 2001
From: astridx <info@astrid-guenther.de>
Date: Thu, 16 Aug 2018 22:20:16 +0200
Subject: [PATCH 41/79] delete files in media folder

---
 .../css/admin-templates-default.css           |   2 +-
 .../js/admin-template-compare.es6.js          |   0
 .../js/admin-template-toggle-switch.es6.js    |   0
 .../css/admin-templates-default.min.css       |   1 -
 .../js/admin-template-compare.es6.min.js      |   1 -
 .../js/admin-template-compare.js              |  65 ---------
 .../js/admin-template-compare.min.js          |   1 -
 .../admin-template-toggle-switch.es6.min.js   |   1 -
 .../js/admin-template-toggle-switch.js        | 131 ------------------
 .../js/admin-template-toggle-switch.min.js    |   1 -
 10 files changed, 1 insertion(+), 202 deletions(-)
 rename {media => build/media_src}/com_templates/js/admin-template-compare.es6.js (100%)
 rename {media => build/media_src}/com_templates/js/admin-template-toggle-switch.es6.js (100%)
 delete mode 100644 media/com_templates/css/admin-templates-default.min.css
 delete mode 100644 media/com_templates/js/admin-template-compare.es6.min.js
 delete mode 100644 media/com_templates/js/admin-template-compare.js
 delete mode 100644 media/com_templates/js/admin-template-compare.min.js
 delete mode 100644 media/com_templates/js/admin-template-toggle-switch.es6.min.js
 delete mode 100644 media/com_templates/js/admin-template-toggle-switch.js
 delete mode 100644 media/com_templates/js/admin-template-toggle-switch.min.js

diff --git a/build/media/com_templates/css/admin-templates-default.css b/build/media/com_templates/css/admin-templates-default.css
index 87a8f52ea4269..a52cb53670ea2 100644
--- a/build/media/com_templates/css/admin-templates-default.css
+++ b/build/media/com_templates/css/admin-templates-default.css
@@ -78,7 +78,7 @@
 	margin-right: 5.5em;
 }
 
-.switcher-label-0, .switcher-label-1{
+.switcher-label-0, .switcher-label-1 {
 	min-width: 5em;
 	max-width: 5em;
 	text-align: left;
diff --git a/media/com_templates/js/admin-template-compare.es6.js b/build/media_src/com_templates/js/admin-template-compare.es6.js
similarity index 100%
rename from media/com_templates/js/admin-template-compare.es6.js
rename to build/media_src/com_templates/js/admin-template-compare.es6.js
diff --git a/media/com_templates/js/admin-template-toggle-switch.es6.js b/build/media_src/com_templates/js/admin-template-toggle-switch.es6.js
similarity index 100%
rename from media/com_templates/js/admin-template-toggle-switch.es6.js
rename to build/media_src/com_templates/js/admin-template-toggle-switch.es6.js
diff --git a/media/com_templates/css/admin-templates-default.min.css b/media/com_templates/css/admin-templates-default.min.css
deleted file mode 100644
index 493469c60be98..0000000000000
--- a/media/com_templates/css/admin-templates-default.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.selected{background:#08c;color:#fff}.selected:hover,.selected:focus{background:#08c !important;color:#fff}#deleteFolder{margin:0}#image-crop{max-width:100% !important;width:auto;height:auto}.tree-holder{overflow-x:auto}.treeselect a{display:block}.diffview{white-space:pre-wrap;word-wrap:break-word;display:inline;padding:4px;border-radius:.2em}.diff-pane{height:350px;border:.5px solid grey;overflow:auto;padding:10px;background-color:#FFF}#diff-main.active{display:block}#diff-main{display:none}#core-pane.active{display:block}#core-pane{display:none}#core-pane .CodeMirror-code{background-color:#f0f0ee}#jform_show_core{display:inline;margin-right:8em}#jform_show_diff{display:inline;margin-right:5.5em}.switcher-label-0,.switcher-label-1{min-width:5em;max-width:5em;text-align:left}
\ No newline at end of file
diff --git a/media/com_templates/js/admin-template-compare.es6.min.js b/media/com_templates/js/admin-template-compare.es6.min.js
deleted file mode 100644
index 128bf2a1c5b4b..0000000000000
--- a/media/com_templates/js/admin-template-compare.es6.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(()=>{"use strict";document.addEventListener("DOMContentLoaded",()=>{const e=(e,n)=>{const t=n.nextElementSibling;let l="",d=null;const c=JsDiff.diffLines(e.innerHTML,n.innerHTML),o=document.createDocumentFragment();c.forEach(e=>{l=e.added?"#a6f3a6":e.removed?"#f8cbcb":"",(d=document.createElement("pre")).style.backgroundColor=l,d.className="diffview",d.appendChild(document.createTextNode((e=>{const n={"&amp;":"&","&#038;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#039;":"'","&#8217;":"’","&#8216;":"‘","&#8211;":"–","&#8212;":"—","&#8230;":"…","&#8221;":"”"};return e.replace(/\&[\w\d\#]{2,5}\;/g,e=>n[e])})(e.value))),o.appendChild(d)}),t.appendChild(o)},n=[].slice.call(document.querySelectorAll("#original"));for(let t=0,l=n.length;t<l;t+=1)e(n[t],n[t].nextElementSibling)})})();
\ No newline at end of file
diff --git a/media/com_templates/js/admin-template-compare.js b/media/com_templates/js/admin-template-compare.js
deleted file mode 100644
index 19410f7011988..0000000000000
--- a/media/com_templates/js/admin-template-compare.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
-* PLEASE DO NOT MODIFY THIS FILE. WORK ON THE ES6 VERSION.
-* OTHERWISE YOUR CHANGES WILL BE REPLACED ON THE NEXT BUILD.
-**/
-
-/**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-(function () {
-  'use strict';
-
-  document.addEventListener('DOMContentLoaded', function () {
-    var decodeHtmlspecialChars = function decodeHtmlspecialChars(text) {
-      var map = {
-        '&amp;': '&',
-        '&#038;': '&',
-        '&lt;': '<',
-        '&gt;': '>',
-        '&quot;': '"',
-        '&#039;': "'",
-        '&#8217;': '’',
-        '&#8216;': '‘',
-        '&#8211;': '–',
-        '&#8212;': '—',
-        '&#8230;': '…',
-        '&#8221;': '”'
-      };
-
-      return text.replace(/\&[\w\d\#]{2,5}\;/g, function (m) {
-        var n = map[m];return n;
-      });
-    };
-
-    var compare = function compare(original, changed) {
-      var display = changed.nextElementSibling;
-      var color = '';
-      var pre = null;
-      var diff = JsDiff.diffLines(original.innerHTML, changed.innerHTML);
-      var fragment = document.createDocumentFragment();
-
-      diff.forEach(function (part) {
-        if (part.added) {
-          color = '#a6f3a6';
-        } else if (part.removed) {
-          color = '#f8cbcb';
-        } else {
-          color = '';
-        }
-        pre = document.createElement('pre');
-        pre.style.backgroundColor = color;
-        pre.className = 'diffview';
-        pre.appendChild(document.createTextNode(decodeHtmlspecialChars(part.value)));
-        fragment.appendChild(pre);
-      });
-
-      display.appendChild(fragment);
-    };
-
-    var diffs = [].slice.call(document.querySelectorAll('#original'));
-    for (var i = 0, l = diffs.length; i < l; i += 1) {
-      compare(diffs[i], diffs[i].nextElementSibling);
-    }
-  });
-})();
diff --git a/media/com_templates/js/admin-template-compare.min.js b/media/com_templates/js/admin-template-compare.min.js
deleted file mode 100644
index 24006f7272f33..0000000000000
--- a/media/com_templates/js/admin-template-compare.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(){"use strict";document.addEventListener("DOMContentLoaded",function(){for(var e=function(e,n){var t=n.nextElementSibling,a="",c=null,d=JsDiff.diffLines(e.innerHTML,n.innerHTML),i=document.createDocumentFragment();d.forEach(function(e){var n,t;a=e.added?"#a6f3a6":e.removed?"#f8cbcb":"",(c=document.createElement("pre")).style.backgroundColor=a,c.className="diffview",c.appendChild(document.createTextNode((n=e.value,t={"&amp;":"&","&#038;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#039;":"'","&#8217;":"’","&#8216;":"‘","&#8211;":"–","&#8212;":"—","&#8230;":"…","&#8221;":"”"},n.replace(/\&[\w\d\#]{2,5}\;/g,function(e){return t[e]})))),i.appendChild(c)}),t.appendChild(i)},n=[].slice.call(document.querySelectorAll("#original")),t=0,a=n.length;t<a;t+=1)e(n[t],n[t].nextElementSibling)})}();
\ No newline at end of file
diff --git a/media/com_templates/js/admin-template-toggle-switch.es6.min.js b/media/com_templates/js/admin-template-toggle-switch.es6.min.js
deleted file mode 100644
index eaad23e2574f4..0000000000000
--- a/media/com_templates/js/admin-template-toggle-switch.es6.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(()=>{"use strict";const e=()=>{const e=document.getElementById("diff-main");e&&(e.classList.remove("active"),"undefined"!=typeof Storage&&localStorage.removeItem("diffSwitchState"))},t=()=>{const e=document.getElementById("diff-main");e&&(e.classList.add("active"),"undefined"!=typeof Storage&&localStorage.setItem("diffSwitchState","checked"))},o=()=>{const e=document.getElementById("override-pane"),t=document.getElementById("core-pane");t&&e&&(t.classList.remove("active"),e.className="col-md-12","undefined"!=typeof Storage&&localStorage.removeItem("coreSwitchState"))},n=()=>{const e=document.getElementById("override-pane"),t=document.getElementById("core-pane");t&&e&&(t.classList.add("active"),e.className="col-md-6",Joomla.editors.instances.jform_core&&Joomla.editors.instances.jform_core.refresh(),"undefined"!=typeof Storage&&localStorage.setItem("coreSwitchState","checked"))};document.addEventListener("DOMContentLoaded",()=>{const c=document.getElementById("jform_show_diff"),d=document.getElementById("jform_show_core");if(c&&(c.addEventListener("joomla.switcher.on",t),c.addEventListener("joomla.switcher.off",e)),d&&(d.addEventListener("joomla.switcher.on",n),d.addEventListener("joomla.switcher.off",o)),"undefined"!=typeof Storage&&localStorage.getItem("coreSwitchState")&&d){new MutationObserver((e,t)=>{c&&(d.newActive=1,d.switch(),t.disconnect())}).observe(d,{childList:!0,subtree:!0}),n()}if("undefined"!=typeof Storage&&localStorage.getItem("diffSwitchState")&&c){new MutationObserver((e,t)=>{c&&(c.newActive=1,c.switch(),t.disconnect())}).observe(c,{childList:!0,subtree:!0}),t()}})})();
\ No newline at end of file
diff --git a/media/com_templates/js/admin-template-toggle-switch.js b/media/com_templates/js/admin-template-toggle-switch.js
deleted file mode 100644
index db90edb792b1c..0000000000000
--- a/media/com_templates/js/admin-template-toggle-switch.js
+++ /dev/null
@@ -1,131 +0,0 @@
-/**
-* PLEASE DO NOT MODIFY THIS FILE. WORK ON THE ES6 VERSION.
-* OTHERWISE YOUR CHANGES WILL BE REPLACED ON THE NEXT BUILD.
-**/
-
-/**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-(function () {
-  'use strict';
-
-  var showDiffChangedOff = function showDiffChangedOff() {
-    var diffMain = document.getElementById('diff-main');
-
-    if (diffMain) {
-      diffMain.classList.remove('active');
-
-      if (typeof Storage !== 'undefined') {
-        localStorage.removeItem('diffSwitchState');
-      }
-    }
-  };
-
-  var showDiffChangedOn = function showDiffChangedOn() {
-    var diffMain = document.getElementById('diff-main');
-
-    if (diffMain) {
-      diffMain.classList.add('active');
-
-      if (typeof Storage !== 'undefined') {
-        localStorage.setItem('diffSwitchState', 'checked');
-      }
-    }
-  };
-
-  var showCoreChangedOff = function showCoreChangedOff() {
-    var override = document.getElementById('override-pane');
-    var corePane = document.getElementById('core-pane');
-
-    if (corePane && override) {
-      corePane.classList.remove('active');
-      override.className = 'col-md-12';
-
-      if (typeof Storage !== 'undefined') {
-        localStorage.removeItem('coreSwitchState');
-      }
-    }
-  };
-
-  var showCoreChangedOn = function showCoreChangedOn() {
-    var override = document.getElementById('override-pane');
-    var corePane = document.getElementById('core-pane');
-
-    if (corePane && override) {
-      corePane.classList.add('active');
-      override.className = 'col-md-6';
-
-      if (Joomla.editors.instances.jform_core) {
-        Joomla.editors.instances.jform_core.refresh();
-      }
-
-      if (typeof Storage !== 'undefined') {
-        localStorage.setItem('coreSwitchState', 'checked');
-      }
-    }
-  };
-
-  document.addEventListener('DOMContentLoaded', function () {
-    var JformShowDiff = document.getElementById('jform_show_diff');
-    var JformShowCore = document.getElementById('jform_show_core');
-
-    if (JformShowDiff) {
-      JformShowDiff.addEventListener('joomla.switcher.on', showDiffChangedOn);
-      JformShowDiff.addEventListener('joomla.switcher.off', showDiffChangedOff);
-    }
-
-    if (JformShowCore) {
-      JformShowCore.addEventListener('joomla.switcher.on', showCoreChangedOn);
-      JformShowCore.addEventListener('joomla.switcher.off', showCoreChangedOff);
-    }
-
-    // Callback executed when JformShowCore was found
-    function handleJformShowCore() {
-      JformShowCore.newActive = 1;
-      JformShowCore.switch();
-    }
-
-    if (typeof Storage !== 'undefined' && localStorage.getItem('coreSwitchState') && JformShowCore) {
-      // Set up the mutation observer
-      var observerJformShowCore = new MutationObserver(function (mutations, me) {
-        if (JformShowDiff) {
-          handleJformShowCore();
-          me.disconnect();
-        }
-      });
-
-      // Start observing
-      observerJformShowCore.observe(JformShowCore, {
-        childList: true,
-        subtree: true
-      });
-
-      showCoreChangedOn();
-    }
-
-    // Callback executed when JformShowDiff was found
-    function handleJformShowDiff() {
-      JformShowDiff.newActive = 1;
-      JformShowDiff.switch();
-    }
-
-    if (typeof Storage !== 'undefined' && localStorage.getItem('diffSwitchState') && JformShowDiff) {
-      // Set up the mutation observer
-      var observerJformShowDiff = new MutationObserver(function (mutations, me) {
-        if (JformShowDiff) {
-          handleJformShowDiff();
-          me.disconnect();
-        }
-      });
-
-      // Start observing
-      observerJformShowDiff.observe(JformShowDiff, {
-        childList: true,
-        subtree: true
-      });
-
-      showDiffChangedOn();
-    }
-  });
-})();
diff --git a/media/com_templates/js/admin-template-toggle-switch.min.js b/media/com_templates/js/admin-template-toggle-switch.min.js
deleted file mode 100644
index b2f1dbb81aaa0..0000000000000
--- a/media/com_templates/js/admin-template-toggle-switch.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(){"use strict";const e=function(){const e=document.getElementById("diff-main");e&&(e.classList.remove("active"),"undefined"!=typeof Storage&&localStorage.removeItem("diffSwitchState"))},t=function(){const e=document.getElementById("diff-main");e&&(e.classList.add("active"),"undefined"!=typeof Storage&&localStorage.setItem("diffSwitchState","checked"))},o=function(){const e=document.getElementById("override-pane"),t=document.getElementById("core-pane");t&&e&&(t.classList.remove("active"),e.className="col-md-12","undefined"!=typeof Storage&&localStorage.removeItem("coreSwitchState"))},n=function(){const e=document.getElementById("override-pane"),t=document.getElementById("core-pane");t&&e&&(t.classList.add("active"),e.className="col-md-6",Joomla.editors.instances.jform_core&&Joomla.editors.instances.jform_core.refresh(),"undefined"!=typeof Storage&&localStorage.setItem("coreSwitchState","checked"))};document.addEventListener("DOMContentLoaded",()=>{const c=document.getElementById("jform_show_diff"),d=document.getElementById("jform_show_core");if(c&&(c.addEventListener("joomla.switcher.on",t),c.addEventListener("joomla.switcher.off",e)),d&&(d.addEventListener("joomla.switcher.on",n),d.addEventListener("joomla.switcher.off",o)),"undefined"!=typeof Storage&&localStorage.getItem("coreSwitchState")&&d){new MutationObserver((e,t)=>{c&&(d.newActive=1,d.switch(),t.disconnect())}).observe(d,{childList:!0,subtree:!0}),n()}if("undefined"!=typeof Storage&&localStorage.getItem("diffSwitchState")&&c){new MutationObserver((e,t)=>{c&&(c.newActive=1,c.switch(),t.disconnect())}).observe(c,{childList:!0,subtree:!0}),t()}})}();
\ No newline at end of file

From 5eb7fb2a7d9eaf990abde9bc800dd367b6bc60f5 Mon Sep 17 00:00:00 2001
From: Anurag <30978328+Anu1601CS@users.noreply.github.com>
Date: Mon, 20 Aug 2018 11:56:42 +0530
Subject: [PATCH 42/79] Move media folder - System (#66)

* multi

* cs
---
 build/media_src/system/js/multiselect.es6.js | 2 +-
 libraries/cms/html/jgrid.php                 | 5 +++--
 media/system/js/core.min.js                  | 1 -
 media/system/js/multiselect.min.js           | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 media/system/js/core.min.js
 delete mode 100644 media/system/js/multiselect.min.js

diff --git a/build/media_src/system/js/multiselect.es6.js b/build/media_src/system/js/multiselect.es6.js
index 5437726e043c0..1b86f9562d64c 100644
--- a/build/media_src/system/js/multiselect.es6.js
+++ b/build/media_src/system/js/multiselect.es6.js
@@ -77,7 +77,7 @@
 
           this.boxes[currentCheckBox].checked = !this.boxes[currentCheckBox].checked;
           isChecked = this.boxes[currentCheckBox].checked;
-          Joomla.isChecked(this.boxes[currentCheckBox].checked);
+          Joomla.isChecked(this.boxes[currentCheckBox].checked, this.tableEl.id);
         }
 
         this.changeBg(this.rows[currentCheckBox - 1], isChecked);
diff --git a/libraries/cms/html/jgrid.php b/libraries/cms/html/jgrid.php
index 79a3aa1392357..13cc6ada89b41 100644
--- a/libraries/cms/html/jgrid.php
+++ b/libraries/cms/html/jgrid.php
@@ -72,11 +72,12 @@ public static function action($i, $task, $prefix = '', $text = '', $active_title
 
 			if ($formId !== null)
 			{
-				$html[] = ' href="javascript:void(0);" onclick="return Joomla.listItemTask(\'' . $checkbox . $i . '\',\'' . $prefix . $task . '\',\'' . $formId . '\')"';
+				$html[] = 'href="javascript:void(0);" onclick="return Joomla.listItemTask(\'' . $checkbox . $i . '\',\'' . $prefix .
+					$task . '\',\'' . $formId . '\')"';
 			}
 			else
 			{
-				$html[] = ' href="javascript:void(0);" onclick="return Joomla.listItemTask(\'' . $checkbox . $i . '\',\'' . $prefix . $task . '\')"';
+				$html[] = 'href="javascript:void(0);" onclick="return Joomla.listItemTask(\'' . $checkbox . $i . '\',\'' . $prefix . $task . '\')"';
 			}
 
 			$html[] = $tip ? ' title="' . $title . '"' : '';
diff --git a/media/system/js/core.min.js b/media/system/js/core.min.js
deleted file mode 100644
index 1728a0f97c1b2..0000000000000
--- a/media/system/js/core.min.js
+++ /dev/null
@@ -1 +0,0 @@
-Joomla=window.Joomla||{},Joomla.editors=Joomla.editors||{},Joomla.editors.instances=Joomla.editors.instances||{},Joomla.Modal={current:"",setCurrent:function(e){this.current=e},getCurrent:function(){return this.current}},function(e,t){"use strict";e.submitform=function(e,n,o){n||(n=t.getElementById("adminForm")),e&&(n.task.value=e),n.noValidate=!o,o?n.hasAttribute("novalidate")&&n.removeAttribute("novalidate"):n.setAttribute("novalidate","");var r=t.createElement("input");r.style.display="none",r.type="submit",n.appendChild(r).click(),n.removeChild(r)},e.submitbutton=function(n,o,r){var s=t.querySelector(o||"form.form-validate");if("string"==typeof o&&null===s)s=t.querySelector("#"+o);if(s){if(void 0===r||null===r){var i=n.split("."),a=s.getAttribute("data-cancel-task");a||(a=i[0]+".cancel"),r=n!==a}r&&!t.formvalidator.isValid(s)||e.submitform(n,s)}else e.submitform(n)},e.JText={strings:{},_:function(t,n){var o=e.getOptions("joomla.jtext");return o&&(this.load(o),e.loadOptions({"joomla.jtext":null})),n=void 0===n?"":n,t=t.toUpperCase(),void 0!==this.strings[t]?this.strings[t]:n},load:function(e){for(var t in e)e.hasOwnProperty(t)&&(this.strings[t.toUpperCase()]=e[t]);return this}},e.optionsStorage=e.optionsStorage||null,e.getOptions=function(t,n){return e.optionsStorage||e.loadOptions(),void 0!==e.optionsStorage[t]?e.optionsStorage[t]:n},e.loadOptions=function(n){if(!n){for(var o,r,s,i=t.querySelectorAll(".joomla-script-options.new"),a=0,l=0,c=i.length;l<c;l++)o=(r=i[l]).text||r.textContent,(s=JSON.parse(o))&&(e.loadOptions(s),a++),r.className=r.className.replace(" new"," loaded");if(a)return}if(e.optionsStorage){if(n)for(var d in n)n.hasOwnProperty(d)&&(null!==n[d]&&"object"==typeof e.optionsStorage[d]&&"object"==typeof n[d]?e.optionsStorage[d]=e.extend(e.optionsStorage[d],n[d]):e.optionsStorage[d]=n[d])}else e.optionsStorage=n||{}},e.replaceTokens=function(e){if(/^[0-9A-F]{32}$/i.test(e)){var n,o,r,s=t.getElementsByTagName("input");for(n=0,r=s.length;n<r;n++)"hidden"==(o=s[n]).type&&"1"==o.value&&32==o.name.length&&(o.name=e)}},e.checkAll=function(t,n){if(!t.form)return!1;n=n||"cb";var o,r,s,i=0;for(o=0,s=t.form.elements.length;o<s;o++)(r=t.form.elements[o]).type==t.type&&0===r.id.indexOf(n)&&(r.checked=t.checked,i+=r.checked?1:0);return t.form.boxchecked&&(t.form.boxchecked.value=i,e.Event.dispatch(t.form.boxchecked,"change")),!0},e.renderMessages=function(n,o,r,s){var i,a,l,c,d,m,u,f;for(a in i=void 0===o||o&&"#system-message-container"===o?t.getElementById("system-message-container"):t.querySelector(o),(void 0===r||r&&!1===r)&&e.removeMessages(i),n)if(n.hasOwnProperty(a)){if(l=n[a],"object"==typeof window.customElements&&"function"==typeof window.customElements.get("joomla-alert"))c=t.createElement("joomla-alert"),["notice","message","error"].indexOf(a)>-1?(f="notice"===a?"info":a,f="message"===a?"success":f,f="error"===a?"danger":f):f="info",c.setAttribute("type",f),c.setAttribute("dismiss","true"),s&&parseInt(s)>0&&c.setAttribute("autodismiss",s);else{c=t.createElement("div"),["notice","message","error"].indexOf(a)>-1?(f="notice"===a?"info":a,f="message"===a?"success":f,f="error"===a?"danger":f):f="info",c.className="alert "+f;var p=t.createElement("button");p.setAttribute("type","button"),p.setAttribute("data-dismiss","alert"),p.className="close",p.innerHTML="×",c.appendChild(p)}for(void 0!==e.JText._(a)&&((d=t.createElement("h4")).className="alert-heading",d.innerHTML=e.JText._(a)?e.JText._(a):a,c.appendChild(d)),m=l.length-1;m>=0;m--)(u=t.createElement("div")).innerHTML=l[m],c.appendChild(u);i.appendChild(c),"object"!=typeof window.customElements&&"function"!=typeof window.customElements.get("joomla-alert")&&s&&parseInt(s)>0&&setTimeout(function(){e.removeMessages(i)},s)}},e.removeMessages=function(e){var n;if(n=e||t.getElementById("system-message-container"),"object"==typeof window.customElements&&window.customElements.get("joomla-alert")){var o=n.querySelectorAll("joomla-alert");if(o.length)for(var r=0,s=o.length;r<s;r++)o[r].close()}else{for(;n.firstChild;)n.removeChild(n.firstChild);n.style.display="none",n.offsetHeight,n.style.display=""}},e.ajaxErrorsMessages=function(t,n,o){var r={};if("parsererror"===n){for(var s=t.responseText.trim(),i=[],a=s.length-1;a>=0;a--)i.unshift(["&#",s[a].charCodeAt(),";"].join(""));s=i.join(""),r.error=[e.JText._("JLIB_JS_AJAX_ERROR_PARSE").replace("%s",s)]}else"nocontent"===n?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_NO_CONTENT")]:"timeout"===n?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_TIMEOUT")]:"abort"===n?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_CONNECTION_ABORT")]:t.responseJSON&&t.responseJSON.message?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)+" <em>"+t.responseJSON.message+"</em>"]:t.statusText?r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)+" <em>"+t.statusText+"</em>"]:r.error=[e.JText._("JLIB_JS_AJAX_ERROR_OTHER").replace("%s",t.status)];return r},e.isChecked=function(n,o){if(void 0===o?o=t.getElementById("adminForm"):"string"==typeof o&&(o=t.getElementById(o)),o.boxchecked.value=n?parseInt(o.boxchecked.value)+1:parseInt(o.boxchecked.value)-1,e.Event.dispatch(o.boxchecked,"change"),o.elements["checkall-toggle"]){var r,s,i,a=!0;for(r=0,i=o.elements.length;r<i;r++)if("checkbox"==(s=o.elements[r]).type&&"checkall-toggle"!=s.name&&!s.checked){a=!1;break}o.elements["checkall-toggle"].checked=a}},e.tableOrdering=function(n,o,r,s){void 0===s?s=t.getElementById("adminForm"):"string"==typeof s&&(s=t.getElementById(s)),s.filter_order.value=n,s.filter_order_Dir.value=o,e.submitform(r,s)},window.getSelectedValue=function(e,n){var o=t[e][n],r=o.selectedIndex;return null!==r&&r>-1?o.options[r].value:null},window.listItemTask=function(t,n,o=null){return e.listItemTask(t,n,o)},e.listItemTask=function(e,n,o=null){if(null!==o)var r=t.getElementById(o);else r=t.adminForm;var s,i=0,a=r[e];if(!a)return!1;for(;s=r["cb"+i];)s.checked=!1,i++;return a.checked=!0,r.boxchecked.value=1,window.submitform(n,r),!1},window.submitbutton=function(t,n=null){e.submitbutton(t,n)},window.submitform=function(t,n=null){e.submitform(t,n)},window.saveorder=function(e,t){window.checkAll_button(e,t)},window.checkAll_button=function(n,o){var r,s;for(o=o||"saveorder",r=0;r<=n;r++){if(!(s=t.adminForm["cb"+r]))return void alert("You cannot change the order of items, as an item in the list is `Checked Out`");s.checked=!0}e.submitform(o)},e.loadingLayer=function(n,o){if(n=n||"show",o=o||t.body,"load"===n){var r=(e.getOptions("system.paths")||{}).root||"",s=t.createElement("div");s.id="loading-logo",s.style.position="fixed",s.style.top="0",s.style.left="0",s.style.width="100%",s.style.height="100%",s.style.opacity="0.8",s.style.filter="alpha(opacity=80)",s.style.overflow="hidden",s.style["z-index"]="10000",s.style.display="none",s.style["background-color"]="#fff",s.style["background-image"]='url("'+r+'/media/system/images/ajax-loader.gif")',s.style["background-position"]="center",s.style["background-repeat"]="no-repeat",s.style["background-attachment"]="fixed",o.appendChild(s)}else t.getElementById("loading-logo")||e.loadingLayer("load",o),t.getElementById("loading-logo").style.display="show"==n?"block":"none";return t.getElementById("loading-logo")},e.extend=function(e,t){for(var n in null===e&&(e={}),t)t.hasOwnProperty(n)&&(e[n]=t[n]);return e},e.request=function(t){t=e.extend({url:"",method:"GET",data:null,perform:!0},t);try{var n=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("MSXML2.XMLHTTP.3.0");if(n.open(t.method,t.url,!0),n.setRequestHeader("X-Requested-With","XMLHttpRequest"),n.setRequestHeader("X-Ajax-Engine","Joomla!"),"GET"!==t.method){var o=e.getOptions("csrf.token","");o&&n.setRequestHeader("X-CSRF-Token",o),t.headers&&t.headers["Content-Type"]||n.setRequestHeader("Content-Type","application/x-www-form-urlencoded")}if(t.headers)for(var r in t.headers)t.headers.hasOwnProperty(r)&&n.setRequestHeader(r,t.headers[r]);if(n.onreadystatechange=function(){4===n.readyState&&(200===n.status?t.onSuccess&&t.onSuccess.call(window,n.responseText,n):t.onError&&t.onError.call(window,n))},t.perform){if(t.onBefore&&!1===t.onBefore.call(window,n))return n;n.send(t.data)}}catch(e){return window.console&&console.log(e),!1}return n},e.localStorageEnabled=function(){var e="joomla-cms";try{return localStorage.setItem(e,e),localStorage.removeItem(e),!0}catch(e){return!1}},e.WebComponents=function(){var n=e.getOptions("webcomponents");if(n&&n.length){var o,r=!1,s=[],i=!1,a=function(){window.WebComponents.ready=!0,t.dispatchEvent(new CustomEvent("WebComponentsReady",{bubbles:!0})),m()},l=function(){window.customElements&&customElements.polyfillWrapFlushCallback&&customElements.polyfillWrapFlushCallback(function(e){o=e,i&&o()})},c=function(){window.HTMLTemplateElement&&HTMLTemplateElement.bootstrap&&HTMLTemplateElement.bootstrap(window.document),r=!0,d().then(a)},d=function(){i=!1;return Promise.all(s.map(function(e){return e instanceof Function?e():e})).then(function(){i=!0,s.length=0,o&&o()}).catch(function(e){console.error(e)})};window.WebComponents=window.WebComponents||{ready:!1,_batchCustomElements:l,waitFor:function(e){e&&(s.push(e),r&&d())}};var m=function(){n&&n.length&&n.forEach(function(e){if(e.match(/\.js/g)){var n,o=t.createElement("script");if(function(){try{return new Function("(a = 0) => a"),!0}catch(e){return!1}}())o.src=e;else e.match(/\.min\.js/g)?n=e.replace(/\.min\.js/g,"-es5.min.js"):e.match(/\.js/g)&&(n=e.replace(/\.js/g,"-es5.js")),o.src=n}o&&t.head.appendChild(o)})},u="core.min.js",f=t.querySelector('script[src*="'+u+'"]');if(f||(u="core.js",f=t.querySelector('script[src*="'+u+'"]')),!f)throw new Error("core(.min).js is not registered correctly!");var p=[];(!("attachShadow"in Element.prototype&&"getRootNode"in Element.prototype)||window.ShadyDOM&&window.ShadyDOM.force)&&p.push("sd"),window.customElements&&!window.customElements.forcePolyfill||p.push("ce");var h=function(){var e=t.createElement("template");if(!("content"in e))return!0;if(!(e.content.cloneNode()instanceof DocumentFragment))return!0;var n=t.createElement("template");n.content.appendChild(t.createElement("div")),e.content.appendChild(n);var o=e.cloneNode(!0);return 0===o.content.childNodes.length||0===o.content.firstChild.content.childNodes.length}();if(window.Promise&&Array.from&&window.URL&&window.Symbol&&!h||(p=["sd-ce-pf"]),p.length){var g=t.createElement("script"),w="media/vendor/webcomponentsjs/js/webcomponents-"+p.join("-")+".min.js",v=f.src.match(/\?.*/)[0],y=e.getOptions("system.paths");if(!y)throw new Error("core(.min).js is not registered correctly!");g.src=y.rootFull+w+(v||""),"loading"===t.readyState?(g.setAttribute("onload","window.WebComponents._batchCustomElements()"),t.write(g.outerHTML),t.addEventListener("DOMContentLoaded",c)):(g.addEventListener("load",function(){l(),c()}),g.addEventListener("error",function(){throw new Error("Could not load polyfill bundle"+url)}),t.head.appendChild(g))}else r=!0,"complete"===t.readyState?a():(window.addEventListener("load",c),window.addEventListener("DOMContentLoaded",function(){window.removeEventListener("load",c),c()}))}}}(Joomla,document),function(e,t){"use strict";t.Event||(t.Event={},t.Event.dispatch=function(t,n,o){var r;"string"==typeof t&&(o=n,n=t,t=e),o=o||{},e.CustomEvent&&"function"==typeof e.CustomEvent?r=new CustomEvent(n,{detail:o,bubbles:!0,cancelable:!0}):((r=document.createEvent("Event")).initEvent(n,!0,!0),r.detail=o),t.dispatchEvent(r)},t.Event.listenOnce=function(e,t,n){var o=function(r){return e.removeEventListener(t,o),n.call(e,r)};e.addEventListener(t,o)})}(window,Joomla),document.addEventListener("DOMContentLoaded",function(){Joomla.WebComponents()});
\ No newline at end of file
diff --git a/media/system/js/multiselect.min.js b/media/system/js/multiselect.min.js
deleted file mode 100644
index 961d20919c290..0000000000000
--- a/media/system/js/multiselect.min.js
+++ /dev/null
@@ -1 +0,0 @@
-Joomla=window.Joomla||{},function(e){e.JMultiSelect=function(e){"use strict";var t,c,n=function(e){var n,o,l,i,r=e.target;e.shiftKey&&t.length&&(n=r.hasAttribute(":checked"),o=c.index(t),(l=c.index(r))<o&&(i=o,o=l,l=i),c.slice(o,l+1).setAttribute("checked",n)),t=r};!function(e){var t=document.querySelector(e);if(t)for(var o=0,l=(c=t.querySelectorAll("input[type=checkbox]")).length;c<l;o++)c[o].addEventListener("click",function(e){n(e)})}(e)},document.addEventListener("DOMContentLoaded",function(t){"use strict";if(e.getOptions&&"function"==typeof e.getOptions&&e.getOptions("js-multiselect"))if(e.getOptions("js-multiselect").formName){e.JMultiSelect(e.getOptions("js-multiselect").formName);var c=document.getElementById(e.getOptions("js-multiselect").formName)}else e.JMultiSelect("adminForm");var n=document.querySelectorAll('tr[class^="row"]');function o(e,t){t.checked?(e.querySelectorAll("td").forEach(function(e){e.classList.add("row-selected")}),e.querySelectorAll("th").forEach(function(e){e.classList.add("row-selected")})):(e.querySelectorAll("td").forEach(function(e){e.classList.remove("row-selected")}),e.querySelectorAll("th").forEach(function(e){e.classList.remove("row-selected")}))}var l=document.getElementsByName("checkall-toggle")[0];l&&l.addEventListener("click",function(e){var t=this;n.forEach(function(e,c){o(e,t)})}),n.length&&n.forEach(function(t,n){t.addEventListener("click",function(t){var l="cb"+n,i=document.getElementById(l);i&&(t.target.id!=l&&(i.checked=!i.checked,e.isChecked(i.checked,c)),o(this,i))})})})}(Joomla);
\ No newline at end of file

From 7ad3837f7a9690ed2dd15e1d6fde18906e24b2b0 Mon Sep 17 00:00:00 2001
From: Astrid <astridx@users.noreply.github.com>
Date: Tue, 21 Aug 2018 19:59:16 +0200
Subject: [PATCH 43/79] delete files in media folder for joomla toolbar (#67)

---
 .../js/joomla-toolbar-button-es5.js           | 136 ------------------
 .../js/joomla-toolbar-button-es5.min.js       |   4 -
 .../webcomponents/js/joomla-toolbar-button.js |  85 -----------
 .../js/joomla-toolbar-button.min.js           |   1 -
 4 files changed, 226 deletions(-)
 delete mode 100644 media/system/webcomponents/js/joomla-toolbar-button-es5.js
 delete mode 100644 media/system/webcomponents/js/joomla-toolbar-button-es5.min.js
 delete mode 100644 media/system/webcomponents/js/joomla-toolbar-button.js
 delete mode 100644 media/system/webcomponents/js/joomla-toolbar-button.min.js

diff --git a/media/system/webcomponents/js/joomla-toolbar-button-es5.js b/media/system/webcomponents/js/joomla-toolbar-button-es5.js
deleted file mode 100644
index 206af50329a23..0000000000000
--- a/media/system/webcomponents/js/joomla-toolbar-button-es5.js
+++ /dev/null
@@ -1,136 +0,0 @@
-(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
-'use strict';
-
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
-
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
-
-/**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-(function (customElements) {
-  'use strict';
-
-  var JoomlaToolbarButton = function (_HTMLElement) {
-    _inherits(JoomlaToolbarButton, _HTMLElement);
-
-    _createClass(JoomlaToolbarButton, [{
-      key: 'task',
-
-      // Attribute getters
-      get: function get() {
-        return this.getAttribute('task');
-      }
-    }, {
-      key: 'listSelection',
-      get: function get() {
-        return this.hasAttribute('list-selection');
-      }
-    }, {
-      key: 'form',
-      get: function get() {
-        return this.getAttribute('form');
-      }
-    }, {
-      key: 'formValidation',
-      get: function get() {
-        return this.hasAttribute('form-validation');
-      }
-    }, {
-      key: 'confirmMessage',
-      get: function get() {
-        return this.getAttribute('confirm-message');
-      }
-    }]);
-
-    function JoomlaToolbarButton() {
-      _classCallCheck(this, JoomlaToolbarButton);
-
-      // We need a button to support button behavior,
-      // because we cannot currently extend HTMLButtonElement
-      var _this = _possibleConstructorReturn(this, (JoomlaToolbarButton.__proto__ || Object.getPrototypeOf(JoomlaToolbarButton)).call(this));
-
-      _this.buttonElement = _this.querySelector('button');
-      _this.disabled = false;
-
-      // If list selection are required, set button to disabled by default
-      if (_this.listSelection) {
-        _this.setDisabled(true);
-      }
-
-      _this.addEventListener('click', function (e) {
-        return _this.executeTask(e);
-      });
-      return _this;
-    }
-
-    _createClass(JoomlaToolbarButton, [{
-      key: 'connectedCallback',
-      value: function connectedCallback() {
-        var _this2 = this;
-
-        // Check whether we have a form
-        var formSelector = this.form || 'adminForm';
-        this.formElement = document.getElementById(formSelector);
-
-        if (this.listSelection) {
-          if (!this.formElement) {
-            throw new Error('The form "' + formSelector + '" is required to perform the task, but the form not found on the page.');
-          }
-
-          // Watch on list selection
-          this.formElement.boxchecked.addEventListener('change', function (event) {
-            // Check whether we have selected something
-            _this2.setDisabled(event.target.value < 1);
-          });
-        }
-      }
-    }, {
-      key: 'setDisabled',
-      value: function setDisabled(disabled) {
-        // Make sure we have a boolean value
-        this.disabled = !!disabled;
-
-        if (this.buttonElement) {
-          if (this.disabled) {
-            this.buttonElement.setAttribute('disabled', true);
-          } else {
-            this.buttonElement.removeAttribute('disabled');
-          }
-        }
-      }
-    }, {
-      key: 'executeTask',
-      value: function executeTask() {
-        if (this.disabled) {
-          return false;
-        }
-
-        // eslint-disable-next-line no-restricted-globals
-        if (this.confirmMessage && !confirm(this.confirmMessage)) {
-          return false;
-        }
-
-        if (this.task) {
-          Joomla.submitbutton(this.task, this.form, this.formValidation);
-        } else {
-          throw new Error('"task" attribute must be preset to perform an action.');
-        }
-
-        return true;
-      }
-    }]);
-
-    return JoomlaToolbarButton;
-  }(HTMLElement);
-
-  customElements.define('joomla-toolbar-button', JoomlaToolbarButton);
-})(customElements);
-
-},{}]},{},[1]);
diff --git a/media/system/webcomponents/js/joomla-toolbar-button-es5.min.js b/media/system/webcomponents/js/joomla-toolbar-button-es5.min.js
deleted file mode 100644
index 00b2616cfc24f..0000000000000
--- a/media/system/webcomponents/js/joomla-toolbar-button-es5.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
-'use strict';var _createClass=function(){function a(a,b){for(var c,d=0;d<b.length;d++)c=b[d],c.enumerable=c.enumerable||!1,c.configurable=!0,'value'in c&&(c.writable=!0),Object.defineProperty(a,c.key,c)}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}();function _classCallCheck(a,b){if(!(a instanceof b))throw new TypeError('Cannot call a class as a function')}function _possibleConstructorReturn(a,b){if(!a)throw new ReferenceError('this hasn\'t been initialised - super() hasn\'t been called');return b&&('object'==typeof b||'function'==typeof b)?b:a}function _inherits(a,b){if('function'!=typeof b&&null!==b)throw new TypeError('Super expression must either be null or a function, not '+typeof b);a.prototype=Object.create(b&&b.prototype,{constructor:{value:a,enumerable:!1,writable:!0,configurable:!0}}),b&&(Object.setPrototypeOf?Object.setPrototypeOf(a,b):a.__proto__=b)}(function(a){'use strict';var b=function(a){function b(){_classCallCheck(this,b);var a=_possibleConstructorReturn(this,(b.__proto__||Object.getPrototypeOf(b)).call(this));return a.buttonElement=a.querySelector('button'),a.disabled=!1,a.listSelection&&a.setDisabled(!0),a.addEventListener('click',function(b){return a.executeTask(b)}),a}return _inherits(b,a),_createClass(b,[{key:'task',get:function get(){return this.getAttribute('task')}},{key:'listSelection',get:function get(){return this.hasAttribute('list-selection')}},{key:'form',get:function get(){return this.getAttribute('form')}},{key:'formValidation',get:function get(){return this.hasAttribute('form-validation')}},{key:'confirmMessage',get:function get(){return this.getAttribute('confirm-message')}}]),_createClass(b,[{key:'connectedCallback',value:function connectedCallback(){var a=this,b=this.form||'adminForm';if(this.formElement=document.getElementById(b),this.listSelection){if(!this.formElement)throw new Error('The form "'+b+'" is required to perform the task, but the form not found on the page.');this.formElement.boxchecked.addEventListener('change',function(b){a.setDisabled(1>b.target.value)})}}},{key:'setDisabled',value:function setDisabled(a){this.disabled=!!a,this.buttonElement&&(this.disabled?this.buttonElement.setAttribute('disabled',!0):this.buttonElement.removeAttribute('disabled'))}},{key:'executeTask',value:function executeTask(){if(this.disabled)return!1;if(this.confirmMessage&&!confirm(this.confirmMessage))return!1;if(this.task)Joomla.submitbutton(this.task,this.form,this.formValidation);else throw new Error('"task" attribute must be preset to perform an action.');return!0}}]),b}(HTMLElement);a.define('joomla-toolbar-button',b)})(customElements);
-
-},{}]},{},[1]);
diff --git a/media/system/webcomponents/js/joomla-toolbar-button.js b/media/system/webcomponents/js/joomla-toolbar-button.js
deleted file mode 100644
index abb9fd8977bb0..0000000000000
--- a/media/system/webcomponents/js/joomla-toolbar-button.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-((customElements) => {
-  'use strict';
-
-  class JoomlaToolbarButton extends HTMLElement {
-    // Attribute getters
-    get task() { return this.getAttribute('task'); }
-    get listSelection() { return this.hasAttribute('list-selection'); }
-    get form() { return this.getAttribute('form'); }
-    get formValidation() { return this.hasAttribute('form-validation'); }
-    get confirmMessage() { return this.getAttribute('confirm-message'); }
-
-    constructor() {
-      super();
-
-      // We need a button to support button behavior,
-      // because we cannot currently extend HTMLButtonElement
-      this.buttonElement = this.querySelector('button');
-      this.disabled = false;
-
-      // If list selection are required, set button to disabled by default
-      if (this.listSelection) {
-        this.setDisabled(true);
-      }
-
-      this.addEventListener('click', e => this.executeTask(e));
-    }
-
-    connectedCallback() {
-      // Check whether we have a form
-      const formSelector = this.form || 'adminForm';
-      this.formElement = document.getElementById(formSelector);
-
-      if (this.listSelection) {
-        if (!this.formElement) {
-          throw new Error(`The form "${formSelector}" is required to perform the task, but the form not found on the page.`);
-        }
-
-        // Watch on list selection
-        this.formElement.boxchecked.addEventListener('change', (event) => {
-          // Check whether we have selected something
-          this.setDisabled(event.target.value < 1);
-        });
-      }
-    }
-
-    setDisabled(disabled) {
-      // Make sure we have a boolean value
-      this.disabled = !!disabled;
-
-      if (this.buttonElement) {
-        if (this.disabled) {
-          this.buttonElement.setAttribute('disabled', true);
-        } else {
-          this.buttonElement.removeAttribute('disabled');
-        }
-      }
-    }
-
-    executeTask() {
-      if (this.disabled) {
-        return false;
-      }
-
-      // eslint-disable-next-line no-restricted-globals
-      if (this.confirmMessage && !confirm(this.confirmMessage)) {
-        return false;
-      }
-
-      if (this.task) {
-        Joomla.submitbutton(this.task, this.form, this.formValidation);
-      } else {
-        throw new Error('"task" attribute must be preset to perform an action.');
-      }
-
-      return true;
-    }
-  }
-
-  customElements.define('joomla-toolbar-button', JoomlaToolbarButton);
-})(customElements);
diff --git a/media/system/webcomponents/js/joomla-toolbar-button.min.js b/media/system/webcomponents/js/joomla-toolbar-button.min.js
deleted file mode 100644
index f7d3d7bf21c3b..0000000000000
--- a/media/system/webcomponents/js/joomla-toolbar-button.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(t=>{"use strict";t.define("joomla-toolbar-button",class extends HTMLElement{get task(){return this.getAttribute("task")}get listSelection(){return this.hasAttribute("list-selection")}get form(){return this.getAttribute("form")}get formValidation(){return this.hasAttribute("form-validation")}get confirmMessage(){return this.getAttribute("confirm-message")}constructor(){super(),this.buttonElement=this.querySelector("button"),this.disabled=!1,this.listSelection&&this.setDisabled(!0),this.addEventListener("click",t=>this.executeTask(t))}connectedCallback(){const t=this.form||"adminForm";if(this.formElement=document.getElementById(t),this.listSelection){if(!this.formElement)throw new Error(`The form "${t}" is required to perform the task, but the form not found on the page.`);this.formElement.boxchecked.addEventListener("change",t=>{this.setDisabled(t.target.value<1)})}}setDisabled(t){this.disabled=!!t,this.buttonElement&&(this.disabled?this.buttonElement.setAttribute("disabled",!0):this.buttonElement.removeAttribute("disabled"))}executeTask(){if(this.disabled)return!1;if(this.confirmMessage&&!confirm(this.confirmMessage))return!1;if(!this.task)throw new Error('"task" attribute must be preset to perform an action.');return Joomla.submitbutton(this.task,this.form,this.formValidation),!0}})})(customElements);
\ No newline at end of file

From 292c1d1b291cbfea593a4b973126156f7a9f16c1 Mon Sep 17 00:00:00 2001
From: Anurag <30978328+Anu1601CS@users.noreply.github.com>
Date: Fri, 24 Aug 2018 05:51:26 +0530
Subject: [PATCH 44/79] Fix button switchers style. (#70)

* button

* CS
---
 .../com_templates/tmpl/template/default.php           |  6 ++++--
 .../com_templates/css/admin-templates-default.css     | 11 ++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index 8d152403c4332..3fc591e6d39a9 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -85,8 +85,10 @@
 	</div>
 	<?php if ($this->type == 'file' && !empty($this->source->coreFile)) : ?>
 		<div class="col-md-6 text-right">
-			<?php echo $this->form->getInput('show_core'); ?>
-			<?php echo $this->form->getInput('show_diff'); ?>
+			<div id="toggle-buttons">
+				<?php echo $this->form->getInput('show_core'); ?>
+				<?php echo $this->form->getInput('show_diff'); ?>
+			</div>
 		</div>
 	<?php endif; ?>
 </div>
diff --git a/build/media/com_templates/css/admin-templates-default.css b/build/media/com_templates/css/admin-templates-default.css
index a52cb53670ea2..18cba450a533c 100644
--- a/build/media/com_templates/css/admin-templates-default.css
+++ b/build/media/com_templates/css/admin-templates-default.css
@@ -70,16 +70,17 @@
 
 #jform_show_core {
 	display: inline;
-	margin-right: 8em;
 }
 
 #jform_show_diff {
 	display: inline;
-	margin-right: 5.5em;
+	margin-left: 3.5em;
+}
+
+#toggle-buttons {
+	margin-right: 5em;
 }
 
 .switcher-label-0, .switcher-label-1 {
-	min-width: 5em;
-	max-width: 5em;
-	text-align: left;
+	white-space: nowrap;
 }

From 7f868bbd0a7647f4a3a0efaceed729a552cba2d7 Mon Sep 17 00:00:00 2001
From: astridx <info@astrid-guenther.de>
Date: Fri, 24 Aug 2018 02:35:00 +0200
Subject: [PATCH 45/79] changed uitab.addTab for updated files

---
 .../components/com_templates/tmpl/template/default.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index 3acee2a94aafd..db9e684192e9a 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -316,9 +316,9 @@
 <?php echo HTMLHelper::_('uitab.endTab'); ?>
 
 <?php if ($this->pluginState) : ?>
-	<?php echo HTMLHelper::_('bootstrap.addTab', 'myTab', 'files', Text::_('COM_TEMPLATES_TAB_UPDATED_FILES')); ?>
+	<?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'files', Text::_('COM_TEMPLATES_TAB_UPDATED_FILES')); ?>
 	<?php echo $this->loadTemplate('updated_files'); ?>
-	<?php echo HTMLHelper::_('bootstrap.endTab'); ?>
+	<?php echo HTMLHelper::_('uitab.endTab'); ?>
 <?php endif; ?>
 
 <?php echo HTMLHelper::_('uitab.endTabSet'); ?>

From 8d6d8bb25f2e4374bf01a837880138efbbb17055 Mon Sep 17 00:00:00 2001
From: Anurag <30978328+Anu1601CS@users.noreply.github.com>
Date: Fri, 24 Aug 2018 10:11:53 +0530
Subject: [PATCH 46/79] Bring back core.js changes. (#69)

* core.js

* const

* fix

* form
---
 build/media_src/system/js/core.es6.js | 29 ++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/build/media_src/system/js/core.es6.js b/build/media_src/system/js/core.es6.js
index 1483e9e7816b7..541803398cd00 100644
--- a/build/media_src/system/js/core.es6.js
+++ b/build/media_src/system/js/core.es6.js
@@ -161,9 +161,13 @@ Joomla.Modal = {
    * @returns {void}
    */
   Joomla.submitbutton = (task, formSelector, validate) => {
-    const form = document.querySelector(formSelector || 'form.form-validate');
+    let form = document.querySelector(formSelector || 'form.form-validate');
     let newValidate = validate;
 
+    if (typeof formSelector === 'string' && form === null) {
+      form = document.querySelector(`#${formSelector}`);
+    }
+
     if (form) {
       if (newValidate === undefined || newValidate === null) {
         const pressbutton = task.split('.');
@@ -596,6 +600,8 @@ Joomla.Modal = {
     let newForm = form;
     if (typeof newForm === 'undefined') {
       newForm = document.getElementById('adminForm');
+    } else if (typeof form === 'string') {
+      newForm = document.getElementById(form);
     }
 
     newForm.boxchecked.value = isitchecked
@@ -643,6 +649,8 @@ Joomla.Modal = {
     let newForm = form;
     if (typeof newForm === 'undefined') {
       newForm = document.getElementById('adminForm');
+    } else if (typeof form === 'string') {
+      newForm = document.getElementById(form);
     }
 
     newForm.filter_order.value = order;
@@ -655,12 +663,19 @@ Joomla.Modal = {
    *
    * @param  {string}  id    The id
    * @param  {string}  task  The task
+   * @param  {string}  form  The optional form
    *
    * @return {boolean}
    */
-  Joomla.listItemTask = (id, task) => {
-    const form = document.adminForm;
-    const cb = form[id];
+  Joomla.listItemTask = (id, task, form = null) => {
+    let newForm = form;
+    if (form !== null) {
+      newForm = document.getElementById(form);
+    } else {
+      newForm = document.adminForm;
+    }
+
+    const cb = newForm[id];
     let i = 0;
     let cbx;
 
@@ -671,7 +686,7 @@ Joomla.Modal = {
 
     // eslint-disable-next-line no-constant-condition
     while (true) {
-      cbx = form[`cb${i}`];
+      cbx = newForm[`cb${i}`];
 
       if (!cbx) {
         break;
@@ -683,8 +698,8 @@ Joomla.Modal = {
     }
 
     cb.checked = true;
-    form.boxchecked.value = 1;
-    Joomla.submitform(task);
+    newForm.boxchecked.value = 1;
+    Joomla.submitform(task, newForm);
 
     return false;
   };

From 09620806ee503f64589d5021602ca6c3b199315e Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Sun, 26 Aug 2018 15:02:03 +0530
Subject: [PATCH 47/79] core

---
 build/media/system/js/core.js | 1327 ---------------------------------
 1 file changed, 1327 deletions(-)
 delete mode 100644 build/media/system/js/core.js

diff --git a/build/media/system/js/core.js b/build/media/system/js/core.js
deleted file mode 100644
index b5466fe41cb6f..0000000000000
--- a/build/media/system/js/core.js
+++ /dev/null
@@ -1,1327 +0,0 @@
-/**
- * @copyright  Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// Only define the Joomla namespace if not defined.
-Joomla = window.Joomla || {};
-
-// Only define editors if not defined
-Joomla.editors = Joomla.editors || {};
-
-// An object to hold each editor instance on page, only define if not defined.
-Joomla.editors.instances = Joomla.editors.instances || {
-	/**
-	 * *****************************************************************
-	 * All Editors MUST register, per instance, the following callbacks:
-	 * *****************************************************************
-	 *
-	 * getValue         Type  Function  Should return the complete data from the editor
-	 *                                  Example: function () { return this.element.value; }
-	 * setValue         Type  Function  Should replace the complete data of the editor
-	 *                                  Example: function (text) { return this.element.value = text; }
-	 * replaceSelection Type  Function  Should replace the selected text of the editor
-	 *                                  If nothing selected, will insert the data at the cursor
-	 *                                  Example: function (text) { return insertAtCursor(this.element, text); }
-	 *
-	 * USAGE (assuming that jform_articletext is the textarea id)
-	 * {
-	 *   To get the current editor value:
-	 *      Joomla.editors.instances['jform_articletext'].getValue();
-	 *   To set the current editor value:
-	 *      Joomla.editors.instances['jform_articletext'].setValue('Joomla! rocks');
-	 *   To replace(selection) or insert a value at  the current editor cursor:
-	 *      replaceSelection: Joomla.editors.instances['jform_articletext'].replaceSelection('Joomla! rocks')
-	 * }
-	 *
-	 * *********************************************************
-	 * ANY INTERACTION WITH THE EDITORS SHOULD USE THE ABOVE API
-	 * *********************************************************
-	 *
-	 * jInsertEditorText() @deprecated 4.0
-	 */
-};
-
-Joomla.Modal = {
-	/**
-	 * *****************************************************************
-	 * Modals should implement
-	 * *****************************************************************
-	 *
-	 * getCurrent  Type  Function  Should return the modal element
-	 * setCurrent  Type  Function  Should set the modal element
-	 * current     Type  {node}    The modal element
-	 *
-	 * USAGE (assuming that exampleId is the modal id)
-	 *   To get the current modal element:
-	 *      Joomla.Modal.current; // Returns node element, eg: document.getElementById('exampleId')
-	 *   To set the current modal element:
-	 *      Joomla.Modal.setCurrent(document.getElementById('exampleId'));
-	 *
-	 * *************************************************************
-	 * Joomla's UI modal uses `element.close();` to close the modal
-	 * and `element.open();` to open the modal
-	 * If you are using another modal make sure the same
-	 * functionality is bound to the modal element
-	 * @see media/legacy/bootstrap.init.js
-	 * *************************************************************
-	 */
-	current: '',
-	setCurrent: function(element) {
-		this.current = element;
-	},
-	getCurrent: function() {
-		return this.current;
-	},
-};
-
-(function( Joomla, document ) {
-	"use strict";
-
-	/**
-	 * Generic submit form
-	 *
-	 * @param  {String}  task      The given task
-	 * @param  {node}    form      The form element
-	 * @param  {bool}    validate  The form element
-	 *
-	 * @returns  {void}
-	 */
-	Joomla.submitform = function(task, form, validate) {
-
-		if (!form) {
-			form = document.getElementById('adminForm');
-		}
-
-		if (task) {
-			form.task.value = task;
-		}
-
-		// Toggle HTML5 validation
-		form.noValidate = !validate;
-
-		if (!validate) {
-			form.setAttribute('novalidate', '');
-		} else if (form.hasAttribute('novalidate')) {
-			form.removeAttribute('novalidate');
-		}
-
-		// Submit the form.
-		// Create the input type="submit"
-		var button = document.createElement('input');
-		button.style.display = 'none';
-		button.type = 'submit';
-
-		// Append it and click it
-		form.appendChild(button).click();
-
-		// If "submit" was prevented, make sure we don't get a build up of buttons
-		form.removeChild(button);
-	};
-
-	/**
-	 * Default function. Can be overriden by the component to add custom logic
-	 *
-	 * @param  {String}  task            The given task
-	 * @param  {String}  formSelector    The form selector eg '#adminForm'
-	 * @param  {bool}    validate        The form element
-	 *
-	 * @returns {void}
-	 */
-	Joomla.submitbutton = function( task, formSelector, validate ) {
-		var form = document.querySelector( formSelector || 'form.form-validate' );
-
-		if (typeof formSelector === 'string' && form === null) {
-			var form = document.querySelector( '#' + formSelector);
-		}
-
-		if (form) {
-
-			if (validate === undefined || validate === null) {
-				var pressbutton = task.split('.'),
-					cancelTask = form.getAttribute('data-cancel-task');
-
-				if (!cancelTask) {
-					cancelTask = pressbutton[0] + '.cancel';
-				}
-
-				validate = task !== cancelTask;
-			}
-
-			if (!validate || document.formvalidator.isValid( form )) {
-				Joomla.submitform( task, form );
-			}
-
-		} else {
-			Joomla.submitform( task );
-		}
-	};
-
-	/**
-	 * Custom behavior for JavaScript I18N in Joomla! 1.6
-	 *
-	 * @type {{}}
-	 *
-	 * Allows you to call Joomla.JText._() to get a translated JavaScript string pushed in with JText::script() in Joomla.
-	 */
-	Joomla.JText = {
-		strings:   {},
-
-		/**
-		 * Translates a string into the current language.
-		 *
-		 * @param {String} key   The string to translate
-		 * @param {String} def   Default string
-		 *
-		 * @returns {String}
-		 */
-		'_': function( key, def ) {
-
-			// Check for new strings in the optionsStorage, and load them
-			var newStrings = Joomla.getOptions('joomla.jtext');
-			if ( newStrings ) {
-				this.load(newStrings);
-
-				// Clean up the optionsStorage from useless data
-				Joomla.loadOptions({'joomla.jtext': null});
-			}
-
-			def = def === undefined ? '' : def;
-			key = key.toUpperCase();
-
-			return this.strings[ key ] !== undefined ? this.strings[ key ] : def;
-		},
-
-		/**
-		 * Load new strings in to Joomla.JText
-		 *
-		 * @param {Object} object  Object with new strings
-		 * @returns {Joomla.JText}
-		 */
-		load: function( object ) {
-			for ( var key in object ) {
-				if (!object.hasOwnProperty(key)) continue;
-				this.strings[ key.toUpperCase() ] = object[ key ];
-			}
-
-			return this;
-		}
-	};
-
-	/**
-	 * Joomla options storage
-	 *
-	 * @type {{}}
-	 *
-	 * @since 3.7.0
-	 */
-	Joomla.optionsStorage = Joomla.optionsStorage || null;
-
-	/**
-	 * Get script(s) options
-	 *
-	 * @param  {String}  key  Name in Storage
-	 * @param  {mixed}   def  Default value if nothing found
-	 *
-	 * @return {mixed}
-	 *
-	 * @since 3.7.0
-	 */
-	Joomla.getOptions = function( key, def ) {
-		// Load options if they not exists
-		if (!Joomla.optionsStorage) {
-			Joomla.loadOptions();
-		}
-
-		return Joomla.optionsStorage[key] !== undefined ? Joomla.optionsStorage[key] : def;
-	};
-
-	/**
-	 * Load new options from given options object or from Element
-	 *
-	 * @param  {Object|undefined}  options  The options object to load. Eg {"com_foobar" : {"option1": 1, "option2": 2}}
-	 *
-	 * @since 3.7.0
-	 */
-	Joomla.loadOptions = function( options ) {
-		// Load form the script container
-		if (!options) {
-			var elements = document.querySelectorAll('.joomla-script-options.new'),
-			    str, element, option, counter = 0;
-
-			for (var i = 0, l = elements.length; i < l; i++) {
-				element = elements[i];
-				str     = element.text || element.textContent;
-				option  = JSON.parse(str);
-
-				if (option) {
-					Joomla.loadOptions(option);
-					counter++;
-				}
-
-				element.className = element.className.replace(' new', ' loaded');
-			}
-
-			if (counter) {
-				return;
-			}
-		}
-
-		// Initial loading
-		if (!Joomla.optionsStorage) {
-			Joomla.optionsStorage = options || {};
-		}
-		// Merge with existing
-		else if ( options ) {
-			for (var p in options) {
-				if (options.hasOwnProperty(p)) {
-					/**
-					 * If both existing and new options are objects, merge them with Joomla.extend().  But test for new
-					 * option being null, as null is an object, but we want to allow clearing of options with ...
-					 *
-					 * Joomla.loadOptions({'joomla.jtext': null});
-					 */
-					if (options[p] !== null && typeof Joomla.optionsStorage[p] === 'object' && typeof options[p] === 'object') {
-						Joomla.optionsStorage[p] = Joomla.extend(Joomla.optionsStorage[p], options[p]);
-					} else {
-						Joomla.optionsStorage[p] = options[p];
-					}
-				}
-			}
-		}
-	};
-
-	/**
-	 * Method to replace all request tokens on the page with a new one.
-	 *
-	 * @param {String}  newToken  The token
-	 *
-	 * Used in Joomla Installation
-	 */
-	Joomla.replaceTokens = function( newToken ) {
-		if (!/^[0-9A-F]{32}$/i.test(newToken)) { return; }
-
-		var els = document.getElementsByTagName( 'input' ),
-		    i, el, n;
-
-		for ( i = 0, n = els.length; i < n; i++ ) {
-			el = els[i];
-
-			if ( el.type == 'hidden' && el.value == '1' && el.name.length == 32 ) {
-				el.name = newToken;
-			}
-		}
-	};
-
-	/**
-	 * USED IN: all list forms.
-	 *
-	 * Toggles the check state of a group of boxes
-	 *
-	 * Checkboxes must have an id attribute in the form cb0, cb1...
-	 *
-	 * @param   {mixed}   checkbox  The number of box to 'check', for a checkbox element
-	 * @param   {string}  stub      An alternative field name
-	 *
-	 * @return  {boolean}
-	 */
-	Joomla.checkAll = function( checkbox, stub ) {
-		if (!checkbox.form) return false;
-
-		stub = stub ? stub : 'cb';
-
-		var c = 0,
-		    i, e, n;
-
-		for ( i = 0, n = checkbox.form.elements.length; i < n; i++ ) {
-			e = checkbox.form.elements[ i ];
-
-			if ( e.type == checkbox.type && e.id.indexOf( stub ) === 0 ) {
-				e.checked = checkbox.checked;
-				c += e.checked ? 1 : 0;
-			}
-		}
-
-		if ( checkbox.form.boxchecked ) {
-			checkbox.form.boxchecked.value = c;
-			Joomla.Event.dispatch(checkbox.form.boxchecked, 'change');
-		}
-
-		return true;
-	};
-
-	/**
-	 * Toggles the check state of a group of boxes
-	 *
-	 * Checkboxes must have an id attribute in the form cb0, cb1...
-	 *
-	 * @param   {node}     item      The form
-	 * @param   {string}   stub      An alternative field name
-	 *
-	 * @return  {boolean}
-	 */
-	Joomla.uncheckAll = function( item, stub ) {
-		if (!item.form) return false;
-
-		stub = stub ? stub : 'cb';
-
-		var c = 0,
-			i, e, n;
-
-		for ( i = 0, n = item.form.elements.length; i < n; i++ ) {
-			e = item.form.elements[ i ];
-
-			if ( e.type === 'checkbox' && e.id.indexOf( stub ) === 0 ) {
-				e.checked = false;
-			}
-		}
-
-		if ( item.form.boxchecked ) {
-			item.form.boxchecked.value = c;
-		}
-
-		return true;
-	};
-
-	/**
-	 * Toggles the check state of a group of boxes
-	 *
-	 * Checkboxes must have an id attribute in the form cb0, cb1...
-	 *
-	 * @param   {node}     el        The form item
-	 * @param   {bool}     cond      An alternative value to set checkbox
-	 *
-	 * @return  {boolean}
-	 */
-	Joomla.toggleOne = function( el, cond ) {
-		if (!el.form) return false;
-
-		var item = el;
-
-		while (item = item.parentNode) {
-			if (item.tagName.toLowerCase() === 'tr') {
-				break;
-			}
-		}
-
-		var checkbox = item.querySelector('input[name="cid[]"]');
-
-		if (checkbox) {
-			checkbox.checked = cond ? cond : !checkbox.checked;
-			if (checkbox.checked) {
-				cond = checkbox.checked;
-			}
-		}
-
-		if ( el.form.boxchecked && cond) {
-			el.form.boxchecked.value = parseInt(el.form.boxchecked.value) + 1;
-		}
-
-		return true;
-	};
-
-	/**
-	 * Render messages send via JSON
-	 * Used by some javascripts such as validate.js
-	 *
-	 * @param   {object}  messages    JavaScript object containing the messages to render. Example:
-	 *                              var messages = {
-	 *                                  "message": ["Message one", "Message two"],
-	 *                                  "error": ["Error one", "Error two"]
-	 *                              };
-	 * @param  {string} selector     The selector of the container where the message will be rendered
-	 * @param  {bool}   keepOld      If we shall discard old messages
-	 * @param  {int}    timeout      The milliseconds before the message self destruct
-	 * @return  void
-	 */
-	Joomla.renderMessages = function( messages, selector, keepOld, timeout ) {
-		var messageContainer, type, typeMessages, messagesBox, title, titleWrapper, i, messageWrapper, alertClass;
-
-		if (typeof selector === 'undefined' || selector && selector === '#system-message-container') {
-			messageContainer = document.getElementById( 'system-message-container' );
-		} else {
-			messageContainer = document.querySelector( selector );
-		}
-
-		if (typeof keepOld === 'undefined' || keepOld && keepOld === false) {
-			Joomla.removeMessages( messageContainer );
-		}
-
-		for ( type in messages ) {
-			if ( !messages.hasOwnProperty( type ) ) { continue; }
-			// Array of messages of this type
-			typeMessages = messages[ type ];
-
-			if (typeof window.customElements === 'object' && typeof window.customElements.get('joomla-alert') === 'function') {
-				messagesBox = document.createElement( 'joomla-alert' );
-
-				if (['notice','message', 'error'].indexOf(type) > -1) {
-					alertClass = (type === 'notice') ? 'info' : type;
-					alertClass = (type === 'message') ? 'success' : alertClass;
-					alertClass = (type === 'error') ? 'danger' : alertClass;
-				} else {
-					alertClass = 'info';
-				}
-
-				messagesBox.setAttribute('type', alertClass);
-				messagesBox.setAttribute('dismiss', 'true');
-
-				if (timeout && parseInt(timeout) > 0) {
-					messagesBox.setAttribute('autodismiss', timeout);
-				}
-			} else {
-				// Create the alert box
-				messagesBox = document.createElement( 'div' );
-
-				// Message class
-				if (['notice','message', 'error'].indexOf(type) > -1) {
-					alertClass = (type === 'notice') ? 'info' : type;
-					alertClass = (type === 'message') ? 'success' : alertClass;
-					alertClass = (type === 'error') ? 'danger' : alertClass;
-				} else {
-					alertClass = 'info';
-				}
-
-				messagesBox.className = 'alert ' + alertClass;
-
-				// Close button
-				var buttonWrapper = document.createElement( 'button' );
-				buttonWrapper.setAttribute('type', 'button');
-				buttonWrapper.setAttribute('data-dismiss', 'alert');
-				buttonWrapper.className = 'close';
-				buttonWrapper.innerHTML = '×';
-				messagesBox.appendChild( buttonWrapper );
-			}
-
-			// Title
-			title = Joomla.JText._( type );
-
-			// Skip titles with untranslated strings
-			if ( typeof title != 'undefined' ) {
-				titleWrapper = document.createElement( 'h4' );
-				titleWrapper.className = 'alert-heading';
-				titleWrapper.innerHTML = Joomla.JText._( type ) ? Joomla.JText._( type ) : type;
-				messagesBox.appendChild( titleWrapper );
-			}
-
-			// Add messages to the message box
-			for ( i = typeMessages.length - 1; i >= 0; i-- ) {
-				messageWrapper = document.createElement( 'div' );
-				messageWrapper.innerHTML = typeMessages[ i ];
-				messagesBox.appendChild( messageWrapper );
-			}
-
-			messageContainer.appendChild( messagesBox );
-
-			if (typeof window.customElements !== 'object' && typeof window.customElements.get('joomla-alert') !== 'function') {
-				if (timeout && parseInt(timeout) > 0) {
-					setTimeout(function () {
-						Joomla.removeMessages(messageContainer);
-					}, timeout);
-				}
-			}
-		}
-	};
-
-
-	/**
-	 * Remove messages
-	 *
-	 * @param  {element} container    The element of the container of the message to be removed
-	 *
-	 * @return  {void}
-	 */
-	Joomla.removeMessages = function( container ) {
-		var messageContainer;
-
-		if (container) {
-			messageContainer = container;
-		} else {
-			messageContainer = document.getElementById( 'system-message-container' );
-		}
-
-		if (typeof window.customElements === 'object' && window.customElements.get('joomla-alert')) {
-			var messages = messageContainer.querySelectorAll('joomla-alert');
-			if (messages.length) {
-				for (var i = 0, l = messages.length; i < l; i++) {
-					messages[i].close();
-				}
-			}
-		} else {
-			// Empty container with a while for Chrome performance issues
-			while ( messageContainer.firstChild ) messageContainer.removeChild( messageContainer.firstChild );
-
-			// Fix Chrome bug not updating element height
-			messageContainer.style.display = 'none';
-			messageContainer.offsetHeight;
-			messageContainer.style.display = '';
-		}
-	};
-
-	/**
-	 * Treat AJAX errors.
-	 * Used by some javascripts such as sendtestmail.js and permissions.js
-	 *
-	 * @param   {object}  xhr         XHR object.
-	 * @param   {string}  textStatus  Type of error that occurred.
-	 * @param   {string}  error       Textual portion of the HTTP status.
-	 *
-	 * @return  {object}  JavaScript object containing the system error message.
-	 *
-	 * @since  3.6.0
-	 */
-	Joomla.ajaxErrorsMessages = function( xhr, textStatus, error ) {
-		var msg = {};
-
-		// For jQuery jqXHR
-		if (textStatus === 'parsererror')
-		{
-			// Html entity encode.
-			var encodedJson = xhr.responseText.trim();
-
-			var buf = [];
-			for (var i = encodedJson.length-1; i >= 0; i--) {
-				buf.unshift( [ '&#', encodedJson[i].charCodeAt(), ';' ].join('') );
-			}
-
-			encodedJson = buf.join('');
-
-			msg.error = [ Joomla.JText._('JLIB_JS_AJAX_ERROR_PARSE').replace('%s', encodedJson) ];
-		}
-		else if (textStatus === 'nocontent')
-		{
-			msg.error = [ Joomla.JText._('JLIB_JS_AJAX_ERROR_NO_CONTENT') ];
-		}
-		else if (textStatus === 'timeout')
-		{
-			msg.error = [ Joomla.JText._('JLIB_JS_AJAX_ERROR_TIMEOUT') ];
-		}
-		else if (textStatus === 'abort')
-		{
-			msg.error = [ Joomla.JText._('JLIB_JS_AJAX_ERROR_CONNECTION_ABORT') ];
-		}
-		// For vannila XHR
-		else if (xhr.responseJSON && xhr.responseJSON.message)
-		{
-			msg.error = [ Joomla.JText._('JLIB_JS_AJAX_ERROR_OTHER').replace('%s', xhr.status) + ' <em>' + xhr.responseJSON.message + '</em>' ];
-		}
-		else if (xhr.statusText)
-		{
-			msg.error = [ Joomla.JText._('JLIB_JS_AJAX_ERROR_OTHER').replace('%s', xhr.status) + ' <em>' + xhr.statusText + '</em>' ];
-		}
-		else
-		{
-			msg.error = [ Joomla.JText._('JLIB_JS_AJAX_ERROR_OTHER').replace('%s', xhr.status) ];
-		}
-
-		return msg;
-	};
-
-	/**
-	 * USED IN: administrator/components/com_cache/views/cache/tmpl/default.php
-	 * administrator/components/com_installer/views/discover/tmpl/default_item.php
-	 * administrator/components/com_installer/views/update/tmpl/default_item.php
-	 * administrator/components/com_languages/helpers/html/languages.php
-	 * libraries/joomla/html/html/grid.php
-	 *
-	 * @param  {boolean}  isitchecked  Flag for checked
-	 * @param  {node}     form         The form
-	 *
-	 * @return  {void}
-	 */
-	Joomla.isChecked = function( isitchecked, form ) {
-		if ( typeof form  === 'undefined' ) {
-			form = document.getElementById( 'adminForm' );
-		} else if (typeof form === 'string') {
-			form = document.getElementById(form);
-		}
-
-		form.boxchecked.value = isitchecked ? parseInt(form.boxchecked.value) + 1 : parseInt(form.boxchecked.value) - 1;
-
-		Joomla.Event.dispatch(form.boxchecked, 'change');
-
-		// If we don't have a checkall-toggle, done.
-		if ( !form.elements[ 'checkall-toggle' ] ) return;
-
-		// Toggle main toggle checkbox depending on checkbox selection
-		var c = true,
-		    i, e, n;
-
-		for ( i = 0, n = form.elements.length; i < n; i++ ) {
-			e = form.elements[ i ];
-
-			if ( e.type == 'checkbox' && e.name != 'checkall-toggle' && !e.checked ) {
-				c = false;
-				break;
-			}
-		}
-
-		form.elements[ 'checkall-toggle' ].checked = c;
-	};
-
-	/**
-	 * USED IN: libraries/joomla/html/html/grid.php
-	 * In other words, on any reorderable table
-	 *
-	 * @param  {string}  order  The order value
-	 * @param  {string}  dir    The direction
-	 * @param  {string}  task   The task
-	 * @param  {node}    form   The form
-	 *
-	 * return  {void}
-	 */
-	Joomla.tableOrdering = function( order, dir, task, form ) {
-		if ( typeof form  === 'undefined' ) {
-			form = document.getElementById( 'adminForm' );
-		} else if ( typeof form  === 'string' ) {
-			form = document.getElementById(form);
-		}
-
-		form.filter_order.value = order;
-		form.filter_order_Dir.value = dir;
-		Joomla.submitform( task, form );
-	};
-
-	/**
-	 * USED IN: administrator/components/com_users/views/mail/tmpl/default.php
-	 * Let's get rid of this and kill it
-	 *
-	 * @param frmName
-	 * @param srcListName
-	 * @return
-	 *
-	 * @deprecated  4.0 No replacement
-	 */
-	window.getSelectedValue = function ( frmName, srcListName ) {
-		var srcList = document[ frmName ][ srcListName ],
-		    i = srcList.selectedIndex;
-
-		if ( i !== null && i > -1 ) {
-			return srcList.options[ i ].value;
-		} else {
-			return null;
-		}
-	};
-
-	/**
-	 * USED IN: all over :)
-	 *
-	 * @param id
-	 * @param task
-	 * @param form
-	 * @return
-	 *
-	 * @deprecated 4.0  Use Joomla.listItemTask() instead
-	 */
-	window.listItemTask = function ( id, task, form = null ) {
-		return Joomla.listItemTask( id, task, form );
-	};
-
-	/**
-	 * USED IN: all over :)
-	 *
-	 * @param  {string}  id    The id
-	 * @param  {string}  task  The task
-	 *
-	 * @return {boolean}
-	 */
-	Joomla.listItemTask = function ( id, task, form = null ) {
-
-		if (form !== null) {
-			var f = document.getElementById(form);
-		} else {
-			var f = document.adminForm;
-		}
-
-		var i = 0, cbx,
-		    cb = f[ id ];
-
-		if ( !cb ) return false;
-
-		while ( true ) {
-			cbx = f[ 'cb' + i ];
-
-			if ( !cbx ) break;
-
-			cbx.checked = false;
-
-			i++;
-		}
-
-		cb.checked = true;
-		f.boxchecked.value = 1;
-		window.submitform( task, f );
-
-		return false;
-	};
-
-	/**
-	 * Default function. Usually would be overriden by the component
-	 *
-	 * @deprecated 4.0  Use Joomla.submitbutton() instead.
-	 */
-	window.submitbutton = function ( pressbutton, form = null ) {
-		Joomla.submitbutton( pressbutton, form );
-	};
-
-	/**
-	 * Submit the admin form
-	 *
-	 * @deprecated 4.0  Use Joomla.submitform() instead.
-	 */
-	window.submitform = function ( pressbutton, form = null ) {
-		Joomla.submitform( pressbutton, form );
-	};
-
-	// needed for Table Column ordering
-	/**
-	 * USED IN: libraries/joomla/html/html/grid.php
-	 * There's a better way to do this now, can we try to kill it?
-	 *
-	 * @deprecated 4.0  No replacement
-	 */
-	window.saveorder = function ( n, task ) {
-		window.checkAll_button( n, task );
-	};
-
-	/**
-	 * Checks all the boxes unless one is missing then it assumes it's checked out.
-	 * Weird. Probably only used by ^saveorder
-	 *
-	 * @param   {int}      n     The total number of checkboxes expected
-	 * @param   {string}   task  The task to perform
-	 *
-	 * @return  void
-	 *
-	 * @deprecated 4.0  No replacement
-	 */
-	window.checkAll_button = function ( n, task ) {
-		task = task ? task : 'saveorder';
-
-		var j, box;
-
-		for ( j = 0; j <= n; j++ ) {
-			box = document.adminForm[ 'cb' + j ];
-
-			if ( box ) {
-				box.checked = true;
-			} else {
-				alert( "You cannot change the order of items, as an item in the list is `Checked Out`" );
-				return;
-			}
-		}
-
-		Joomla.submitform( task );
-	};
-
-	/**
-	 * Add Joomla! loading image layer.
-	 *
-	 * Used in: /administrator/components/com_installer/views/languages/tmpl/default.php
-	 *          /installation/template/js/installation.js
-	 *
-	 * @param   {String}       task           The task to do [load, show, hide] (defaults to show).
-	 * @param   {HTMLElement}  parentElement  The HTML element where we are appending the layer (defaults to body).
-	 *
-	 * @return  {HTMLElement}  The HTML loading layer element.
-	 *
-	 * @since  3.6.0
-	 */
-	Joomla.loadingLayer = function(task, parentElement) {
-		// Set default values.
-		task          = task || 'show';
-		parentElement = parentElement || document.body;
-
-		// Create the loading layer (hidden by default).
-		if (task === 'load')
-		{
-			// Gets the site base path
-			var systemPaths = Joomla.getOptions('system.paths') || {},
-			    basePath    = systemPaths.root || '';
-
-			var loadingDiv = document.createElement('div');
-
-			loadingDiv.id = 'loading-logo';
-
-			// The loading layer CSS styles are JS hardcoded so they can be used without adding CSS.
-
-			// Loading layer style and positioning.
-			loadingDiv.style['position']              = 'fixed';
-			loadingDiv.style['top']                   = '0';
-			loadingDiv.style['left']                  = '0';
-			loadingDiv.style['width']                 = '100%';
-			loadingDiv.style['height']                = '100%';
-			loadingDiv.style['opacity']               = '0.8';
-			loadingDiv.style['filter']                = 'alpha(opacity=80)';
-			loadingDiv.style['overflow']              = 'hidden';
-			loadingDiv.style['z-index']               = '10000';
-			loadingDiv.style['display']               = 'none';
-			loadingDiv.style['background-color']      = '#fff';
-
-			// Loading logo positioning.
-			loadingDiv.style['background-image']      = 'url("' + basePath + '/media/system/images/ajax-loader.gif")';
-			loadingDiv.style['background-position']   = 'center';
-			loadingDiv.style['background-repeat']     = 'no-repeat';
-			loadingDiv.style['background-attachment'] = 'fixed';
-
-			parentElement.appendChild(loadingDiv);
-		}
-		// Show or hide the layer.
-		else
-		{
-			if (!document.getElementById('loading-logo'))
-			{
-				Joomla.loadingLayer('load', parentElement);
-			}
-
-			document.getElementById('loading-logo').style['display'] = (task == 'show') ? 'block' : 'none';
-		}
-
-		return document.getElementById('loading-logo');
-	};
-
-	/**
-	 * Method to Extend Objects
-	 *
-	 * @param  {Object}  destination
-	 * @param  {Object}  source
-	 *
-	 * @return Object
-	 */
-	Joomla.extend = function (destination, source) {
-		/**
-		 * Technically null is an object, but trying to treat the destination as one in this context will error out.
-		 * So emulate jQuery.extend(), and treat a destination null as an empty object.
-		 */
-		if (destination === null) {
-			destination = {};
-		}
-		for (var p in source) {
-			if (source.hasOwnProperty(p)) {
-				destination[p] = source[p];
-			}
-		}
-
-		return destination;
-	};
-
-	/**
-	 * Method to perform AJAX request
-	 *
-	 * @param {Object} options   Request options:
-	 * {
-	 *    url:       'index.php',  // Request URL
-	 *    method:    'GET',        // Request method GET (default), POST
-	 *    data:      null,         // Data to be sent, see https://developer.mozilla.org/docs/Web/API/XMLHttpRequest/send
-	 *    perform:   true,         // Perform the request immediately, or return XMLHttpRequest instance and perform it later
-	 *    headers:   null,         // Object of custom headers, eg {'X-Foo': 'Bar', 'X-Bar': 'Foo'}
-	 *
-	 *    onBefore:  function(xhr){}            // Callback on before the request
-	 *    onSuccess: function(response, xhr){}, // Callback on the request success
-	 *    onError:   function(xhr){},           // Callback on the request error
-	 * }
-	 *
-	 * @return XMLHttpRequest|Boolean
-	 *
-	 * @example
-	 *
-	 * 	Joomla.request({
-	 *		url: 'index.php?option=com_example&view=example',
-	 *		onSuccess: function(response, xhr){
-	 *			console.log(response);
-	 *		}
-	 * 	})
-	 *
-	 * @see    https://developer.mozilla.org/docs/Web/API/XMLHttpRequest
-	 */
-	Joomla.request = function (options) {
-
-		// Prepare the options
-		options = Joomla.extend({
-			url:    '',
-			method: 'GET',
-			data:    null,
-			perform: true
-		}, options);
-
-		// Set up XMLHttpRequest instance
-		try{
-			var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject('MSXML2.XMLHTTP.3.0');
-
-			xhr.open(options.method, options.url, true);
-
-			// Set the headers
-			xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-			xhr.setRequestHeader('X-Ajax-Engine', 'Joomla!');
-
-			if (options.method !== 'GET') {
-				var token = Joomla.getOptions('csrf.token', '');
-
-				if (token) {
-					xhr.setRequestHeader('X-CSRF-Token', token);
-				}
-
-				if (!options.headers || !options.headers['Content-Type']) {
-					xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
-				}
-			}
-
-			// Custom headers
-			if (options.headers){
-				for (var p in options.headers) {
-					if (options.headers.hasOwnProperty(p)) {
-						xhr.setRequestHeader(p, options.headers[p]);
-					}
-				}
-			}
-
-			xhr.onreadystatechange = function () {
-				// Request not finished
-				if (xhr.readyState !== 4) return;
-
-				// Request finished and response is ready
-				if (xhr.status === 200) {
-					if(options.onSuccess) {
-						options.onSuccess.call(window, xhr.responseText, xhr);
-					}
-				} else if(options.onError) {
-					options.onError.call(window, xhr);
-				}
-			};
-
-			// Do request
-			if (options.perform) {
-				if (options.onBefore && options.onBefore.call(window, xhr) === false) {
-					// Request interrupted
-					return xhr;
-				}
-
-				xhr.send(options.data);
-			}
-
-		} catch (error) {
-			window.console ? console.log(error) : null;
-			return false;
-		}
-
-		return xhr;
-	};
-
-	/**
-	 * Check if HTML5 localStorage enabled on the browser
-	 *
-	 * @since   4.0.0
-	 */
-	Joomla.localStorageEnabled = function() {
-		var test = 'joomla-cms';
-		try {
-			localStorage.setItem(test, test);
-			localStorage.removeItem(test);
-			return true;
-		} catch(e) {
-			return false;
-		}
-	};
-
-	/**
-	 * Loads any needed polyfill for web components and async load any web components
-	 *
-	 * Parts of the WebComponents method belong to The Polymer Project Authors. License http://polymer.github.io/LICENSE.txt
-	 *
-	 * @since   4.0.0
-	 */
-	Joomla.WebComponents = function() {
-		var wc = Joomla.getOptions('webcomponents');
-
-		// Return early
-		if (!wc || !wc.length) {
-			return;
-		}
-
-		var polyfillsLoaded = false;
-		var whenLoadedFns = [];
-		var allowUpgrades = false;
-		var flushFn;
-
-		var fireEvent = function() {
-			window.WebComponents.ready = true;
-			document.dispatchEvent(new CustomEvent('WebComponentsReady', { bubbles: true }));
-			loadWC();
-		};
-
-		var batchCustomElements = function() {
-			if (window.customElements && customElements.polyfillWrapFlushCallback) {
-				customElements.polyfillWrapFlushCallback(function (flushCallback) {
-					flushFn = flushCallback;
-					if (allowUpgrades) {
-						flushFn();
-					}
-				});
-			}
-		};
-
-		var asyncReady = function() {
-			batchCustomElements();
-			ready();
-		};
-
-		var ready = function() {
-			// bootstrap <template> elements before custom elements
-			if (window.HTMLTemplateElement && HTMLTemplateElement.bootstrap) {
-				HTMLTemplateElement.bootstrap(window.document);
-			}
-			polyfillsLoaded = true;
-			runWhenLoadedFns().then(fireEvent);
-		};
-
-		var runWhenLoadedFns = function() {
-			allowUpgrades = false;
-			var done = function() {
-				allowUpgrades = true;
-				whenLoadedFns.length = 0;
-				flushFn && flushFn();
-			};
-			return Promise.all(whenLoadedFns.map(function(fn) {
-				return fn instanceof Function ? fn() : fn;
-			})).then(function() {
-				done();
-			}).catch(function(err) {
-				console.error(err);
-			});
-		}
-
-		window.WebComponents = window.WebComponents || {
-			ready: false,
-			_batchCustomElements: batchCustomElements,
-			waitFor: function(waitFn) {
-				if (!waitFn) {
-					return;
-				}
-				whenLoadedFns.push(waitFn);
-				if (polyfillsLoaded) {
-					runWhenLoadedFns();
-				}
-			}
-		};
-
-		/* Check if ES6 then apply the shim */
-		var checkES6 = function () {
-			try {
-				new Function("(a = 0) => a");
-				return true;
-			}
-			catch (err) {
-				return false;
-			}
-		};
-
-		/* Load web components async */
-		var loadWC = function () {
-			if (wc && wc.length) {
-				wc.forEach(function(component) {
-					if (component.match(/\.js/g)) {
-						var el = document.createElement('script');
-						if (!checkES6()) {
-							var es5;
-							// Browser is not ES6!
-							if (component.match(/\.min\.js/g)) {
-								es5 = component.replace(/\.min\.js/g, '-es5.min.js')
-							} else if (component.match(/\.js/g)) {
-								es5 = component.replace(/\.js/g, '-es5.js')
-							}
-							el.src = es5;
-						} else {
-							el.src = component;
-						}
-					}
-					if (el) {
-						document.head.appendChild(el);
-					}
-				});
-			}
-		};
-
-		// Get the core.js src attribute
-		var name = "core.min.js";
-		var script = document.querySelector('script[src*="' + name + '"]');
-
-		if (!script) {
-			name = "core.js";
-			script = document.querySelector('script[src*="' + name + '"]')
-		}
-
-		if (!script) {
-			throw new Error('core(.min).js is not registered correctly!')
-		}
-
-		// Feature detect which polyfill needs to be imported.
-		var polyfills = [];
-		if (!('attachShadow' in Element.prototype && 'getRootNode' in Element.prototype) ||
-			(window.ShadyDOM && window.ShadyDOM.force)) {
-			polyfills.push('sd');
-		}
-		if (!window.customElements || window.customElements.forcePolyfill) {
-			polyfills.push('ce');
-		}
-
-		var needsTemplate = (function() {
-			// no real <template> because no `content` property (IE and older browsers)
-			var t = document.createElement('template');
-			if (!('content' in t)) {
-				return true;
-			}
-			// broken doc fragment (older Edge)
-			if (!(t.content.cloneNode() instanceof DocumentFragment)) {
-				return true;
-			}
-			// broken <template> cloning (Edge up to at least version 17)
-			var t2 = document.createElement('template');
-			t2.content.appendChild(document.createElement('div'));
-			t.content.appendChild(t2);
-			var clone = t.cloneNode(true);
-			return (clone.content.childNodes.length === 0 ||
-				clone.content.firstChild.content.childNodes.length === 0);
-		})();
-
-		// NOTE: any browser that does not have template or ES6 features
-		// must load the full suite of polyfills.
-		if (!window.Promise || !Array.from || !window.URL || !window.Symbol || needsTemplate) {
-			polyfills = ['sd-ce-pf'];
-		}
-
-		if (polyfills.length) {
-			var newScript = document.createElement('script');
-			// Load it from the right place.
-			var replacement = 'media/vendor/webcomponentsjs/js/webcomponents-' + polyfills.join('-') + '.min.js';
-
-			var mediaVersion = script.src.match(/\?.*/)[0];
-			var base = Joomla.getOptions('system.paths');
-
-			if (!base) {
-				throw new Error('core(.min).js is not registered correctly!')
-			}
-
-			newScript.src = base.rootFull + replacement + (mediaVersion ? mediaVersion : '');
-
-			// if readyState is 'loading', this script is synchronous
-			if (document.readyState === 'loading') {
-				// make sure custom elements are batched whenever parser gets to the injected script
-				newScript.setAttribute('onload', 'window.WebComponents._batchCustomElements()');
-				document.write(newScript.outerHTML);
-				document.addEventListener('DOMContentLoaded', ready);
-			} else {
-				newScript.addEventListener('load', function () {
-					asyncReady();
-				});
-				newScript.addEventListener('error', function () {
-					throw new Error('Could not load polyfill bundle' + url);
-				});
-				document.head.appendChild(newScript);
-			}
-		} else {
-			polyfillsLoaded = true;
-			if (document.readyState === 'complete') {
-				fireEvent()
-			} else {
-				// this script may come between DCL and load, so listen for both, and cancel load listener if DCL fires
-				window.addEventListener('load', ready);
-				window.addEventListener('DOMContentLoaded', function() {
-					window.removeEventListener('load', ready);
-					ready();
-				})
-			}
-		}
-	};
-}( Joomla, document ));
-
-/**
- * Joomla! Custom events
- *
- * @since  4.0.0
- */
-(function( window, Joomla ) {
-	"use strict";
-
-	if (Joomla.Event) {
-		return;
-	}
-
-	Joomla.Event = {};
-
-	/**
-	 * Dispatch custom event.
-	 *
-	 * An event name convention:
-	 * 		The event name has at least two part, separated ":", eg `foo:bar`. Where the first part is an "event supporter",
-	 * 		and second part is the event name which happened.
-	 * 		Which is allow us to avoid possible collisions with another scripts and native DOM events.
-	 * 		Joomla! CMS standard events should start from `joomla:`.
-	 *
-	 * Joomla! events:
-	 * 		`joomla:updated`  Dispatch it over the changed container, example after the content was updated via ajax
-	 * 		`joomla:removed`  The container was removed
-	 *
-	 * @param {HTMLElement|string}  element  DOM element, the event target. Or the event name, then the target will be a Window
-	 * @param {String|Object}       name     The event name, or an optional parameters in case when "element" is an event name
-	 * @param {Object}              params   An optional parameters. Allow to send a custom data through the event.
-	 *
-	 * @example
-	 *
-	 * 	Joomla.Event.dispatch(myElement, 'joomla:updated', {for: 'bar', foo2: 'bar2'}); // Will dispatch event to myElement
-	 * 	or:
-	 * 	Joomla.Event.dispatch('joomla:updated', {for: 'bar', foo2: 'bar2'}); // Will dispatch event to Window
-	 *
-	 * @since   4.0.0
-	 */
-	Joomla.Event.dispatch = function(element, name, params) {
-		if (typeof element === 'string') {
-			params  = name;
-			name    = element;
-			element = window;
-		}
-		params = params || {};
-
-		var event;
-
-		if (window.CustomEvent && typeof(window.CustomEvent) === 'function') {
-			event = new CustomEvent(name, {
-				detail:     params,
-				bubbles:    true,
-				cancelable: true
-			});
-		}
-		// IE trap
-		else {
-			event = document.createEvent('Event');
-			event.initEvent(name, true, true);
-			event.detail = params;
-		}
-
-		element.dispatchEvent(event);
-	};
-
-	/**
-	 * Once listener. Add EventListener to the Element and auto-remove it after the event was dispatched.
-	 *
-	 * @param {HTMLElement}  element   DOM element
-	 * @param {String}       name      The event name
-	 * @param {Function}     callback  The event callback
-	 *
-	 * @since   4.0.0
-	 */
-	Joomla.Event.listenOnce = function (element, name, callback) {
-		var onceCallback = function(event){
-			element.removeEventListener(name, onceCallback);
-			return callback.call(element, event)
-		};
-
-		element.addEventListener(name, onceCallback);
-	};
-})( window, Joomla );
-
-/**
- * Load any web components and any polyfills required
- */
-document.addEventListener('DOMContentLoaded', function() {
-	Joomla.WebComponents();
-});

From 711defce75bc1db43a503de0db986a9a60a91063 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Sun, 26 Aug 2018 15:10:05 +0530
Subject: [PATCH 48/79] hound

---
 build/media_src/com_templates/js/admin-template-compare.es6.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build/media_src/com_templates/js/admin-template-compare.es6.js b/build/media_src/com_templates/js/admin-template-compare.es6.js
index 764e4ec67951c..1b7245d6419bd 100644
--- a/build/media_src/com_templates/js/admin-template-compare.es6.js
+++ b/build/media_src/com_templates/js/admin-template-compare.es6.js
@@ -22,6 +22,7 @@
         '&#8221;': '”',
       };
 
+      /* eslint-disable */
       return text.replace(/\&[\w\d\#]{2,5}\;/g, (m) => { const n = map[m]; return n; });
     };
 
@@ -32,6 +33,8 @@
       const diff = JsDiff.diffLines(original.innerHTML, changed.innerHTML);
       const fragment = document.createDocumentFragment();
 
+      /* eslint-enable */
+
       diff.forEach((part) => {
         if (part.added) {
           color = '#a6f3a6';

From 22edf9c6f58499658f7c36ab66fbf608f35d8eb2 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Sun, 26 Aug 2018 17:54:19 +0530
Subject: [PATCH 49/79] CS

---
 .../com_templates/Controller/TemplateController.php           | 3 ---
 .../components/com_templates/Model/TemplatesModel.php         | 2 +-
 administrator/components/com_templates/forms/source.xml       | 4 ++--
 .../components/com_templates/tmpl/template/default.php        | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/administrator/components/com_templates/Controller/TemplateController.php b/administrator/components/com_templates/Controller/TemplateController.php
index b934008320c0f..873f46f011232 100644
--- a/administrator/components/com_templates/Controller/TemplateController.php
+++ b/administrator/components/com_templates/Controller/TemplateController.php
@@ -831,9 +831,6 @@ public function ajax()
 			$app->close();
 		}
 
-		// Created only for test.
-		$session = Factory::getSession();
-
 		/* @var \Joomla\Component\Templates\Administrator\Model\TemplateModel $model */
 		$model = $this->getModel();
 
diff --git a/administrator/components/com_templates/Model/TemplatesModel.php b/administrator/components/com_templates/Model/TemplatesModel.php
index 8ad39c6aac889..7d6c7deb8b577 100644
--- a/administrator/components/com_templates/Model/TemplatesModel.php
+++ b/administrator/components/com_templates/Model/TemplatesModel.php
@@ -98,7 +98,7 @@ public function updated($exid)
 			->select('a.template')
 			->from($db->quoteName('#__template_overrides', 'a'))
 			->where('extension_id = ' . $db->quote($exid))
-			->where('state = ' . 0);
+			->where('state = 0');
 
 		// Reset the query.
 		$db->setQuery($query);
diff --git a/administrator/components/com_templates/forms/source.xml b/administrator/components/com_templates/forms/source.xml
index 112181f0163d7..c6493937c37e7 100644
--- a/administrator/components/com_templates/forms/source.xml
+++ b/administrator/components/com_templates/forms/source.xml
@@ -43,7 +43,7 @@
 			type="radio"
 			class="switcher switcher-primary"
 			default="0"
-		>
+			>
 			<option value="0">COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE</option>
 			<option value="1">COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE</option>
 		</field>
@@ -53,7 +53,7 @@
 			type="radio"
 			class="switcher switcher-primary"
 			default="0"
-		>
+			>
 			<option value="0">COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF</option>
 			<option value="1">COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF</option>
 		</field>
diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index db9e684192e9a..b8b9ed7c14a11 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -119,7 +119,7 @@
 							<?php echo $this->form->getInput('source'); ?>
 						</div>
 						<input type="hidden" name="task" value="" />
-						<?php echo JHtml::_('form.token'); ?>
+						<?php echo HTMLHelper::_('form.token'); ?>
 						<?php echo $this->form->getInput('extension_id'); ?>
 						<?php echo $this->form->getInput('filename'); ?>
 					</form>

From 471ea78ebc15dcc69d61858cef7d22d98b3c9e23 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Sun, 26 Aug 2018 17:58:07 +0530
Subject: [PATCH 50/79] scopr

---
 .../tmpl/template/default_updated_files.php          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/administrator/components/com_templates/tmpl/template/default_updated_files.php b/administrator/components/com_templates/tmpl/template/default_updated_files.php
index 902da3706f33e..3f182a207cf19 100644
--- a/administrator/components/com_templates/tmpl/template/default_updated_files.php
+++ b/administrator/components/com_templates/tmpl/template/default_updated_files.php
@@ -24,22 +24,22 @@
 				<table class="table">
 					<thead>
 						<tr>
-							<th style="width:5%" class="nowrap text-center">
+							<th scope="col" style="width:5%" class="nowrap text-center">
 								<?php echo HTMLHelper::_('grid.checkall'); ?>
 							</th>
-							<th style="width:7%" class="nowrap">
+							<th scope="col" style="width:7%" class="nowrap">
 								<?php echo Text::_('JSTATUS'); ?>
 							</th>
-							<th style="width:30%">
+							<th scope="col" style="width:30%">
 								<?php echo Text::_('COM_TEMPLATES_OVERRIDE_TEMPLATE_FILE'); ?>
 							</th>
-							<th>
+							<th scope="col">
 								<?php echo Text::_('COM_TEMPLATES_OVERRIDE_CREATED_DATE'); ?>
 							</th>
-							<th>
+							<th scope="col">
 								<?php echo Text::_('COM_TEMPLATES_OVERRIDE_MODIFIED_DATE'); ?>
 							</th>
-							<th>
+							<th scope="col">
 								<?php echo Text::_('COM_TEMPLATES_OVERRIDE_ACTION'); ?>
 							</th>
 						</tr>

From dd302a1278419cf64a48c3612fdccb32550af3ef Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Sun, 26 Aug 2018 18:25:27 +0530
Subject: [PATCH 51/79] grid

---
 .../com_templates/tmpl/template/default_updated_files.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_templates/tmpl/template/default_updated_files.php b/administrator/components/com_templates/tmpl/template/default_updated_files.php
index 3f182a207cf19..88b8977f96057 100644
--- a/administrator/components/com_templates/tmpl/template/default_updated_files.php
+++ b/administrator/components/com_templates/tmpl/template/default_updated_files.php
@@ -24,9 +24,9 @@
 				<table class="table">
 					<thead>
 						<tr>
-							<th scope="col" style="width:5%" class="nowrap text-center">
+							<td style="width:5%" class="nowrap text-center">
 								<?php echo HTMLHelper::_('grid.checkall'); ?>
-							</th>
+							</td>
 							<th scope="col" style="width:7%" class="nowrap">
 								<?php echo Text::_('JSTATUS'); ?>
 							</th>

From f9fadf0342364ffab39c4ac675bd6955321b925a Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 27 Aug 2018 00:03:59 +0530
Subject: [PATCH 52/79] alpha

---
 .../com_templates/Controller/TemplateController.php  | 12 ++++++------
 .../components/com_templates/Model/TemplateModel.php |  8 ++++----
 .../com_templates/Model/TemplatesModel.php           |  2 +-
 .../com_templates/View/Template/HtmlView.php         |  8 ++++----
 .../com_templates/View/Templates/HtmlView.php        |  6 +++---
 .../com_templates/tmpl/template/default.php          |  8 ++++----
 .../tmpl/template/default_updated_files.php          |  4 ++--
 .../com_templates/tmpl/templates/default.php         |  4 ++--
 8 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/administrator/components/com_templates/Controller/TemplateController.php b/administrator/components/com_templates/Controller/TemplateController.php
index 873f46f011232..7809eea0c9509 100644
--- a/administrator/components/com_templates/Controller/TemplateController.php
+++ b/administrator/components/com_templates/Controller/TemplateController.php
@@ -11,16 +11,16 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Client\ClientHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
-use Joomla\Utilities\ArrayHelper;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
 use Joomla\Component\Installer\Administrator\Model\InstallModel;
-use Joomla\CMS\Client\ClientHelper;
+use Joomla\Utilities\ArrayHelper;
 
 /**
  * Template style controller class.
diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index f735338a5b3e3..893a9be51a6c0 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -13,16 +13,16 @@
 
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Date\Date;
-use Joomla\CMS\Language\Text;
+use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\File;
+use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Filesystem\Path;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\FormModel;
 use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\Component\Templates\Administrator\Helper\TemplateHelper;
 use Joomla\CMS\Uri\Uri;
-use Joomla\CMS\Filesystem\Folder;
+use Joomla\Component\Templates\Administrator\Helper\TemplateHelper;
 
 /**
  * Template model class.
diff --git a/administrator/components/com_templates/Model/TemplatesModel.php b/administrator/components/com_templates/Model/TemplatesModel.php
index 7d6c7deb8b577..bcb54866fa55a 100644
--- a/administrator/components/com_templates/Model/TemplatesModel.php
+++ b/administrator/components/com_templates/Model/TemplatesModel.php
@@ -13,9 +13,9 @@
 
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Component\Templates\Administrator\Helper\TemplatesHelper;
 
 /**
diff --git a/administrator/components/com_templates/View/Template/HtmlView.php b/administrator/components/com_templates/View/Template/HtmlView.php
index d4bb05c48c5ef..adde38c1eaf31 100644
--- a/administrator/components/com_templates/View/Template/HtmlView.php
+++ b/administrator/components/com_templates/View/Template/HtmlView.php
@@ -12,14 +12,14 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Uri\Uri;
-use Joomla\CMS\Factory;
-use Joomla\CMS\Filter\InputFilter;
 
 /**
  * View to edit a template style.
diff --git a/administrator/components/com_templates/View/Templates/HtmlView.php b/administrator/components/com_templates/View/Templates/HtmlView.php
index a8cf7f5eb75f3..1214cfbd867aa 100644
--- a/administrator/components/com_templates/View/Templates/HtmlView.php
+++ b/administrator/components/com_templates/View/Templates/HtmlView.php
@@ -13,11 +13,11 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Helper\ContentHelper;
-use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\Component\Templates\Administrator\Helper\TemplatesHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\Component\Templates\Administrator\Helper\TemplatesHelper;
 
 /**
  * View class for a list of template styles.
diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index b8b9ed7c14a11..ca969e2da5e51 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -9,13 +9,13 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\FileLayout;
-use Joomla\CMS\Router\Route;
 use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
-use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\HTML\HTMLHelper;
 
 // Include the component HTML helpers.
 HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html');
diff --git a/administrator/components/com_templates/tmpl/template/default_updated_files.php b/administrator/components/com_templates/tmpl/template/default_updated_files.php
index 88b8977f96057..5901e93272b95 100644
--- a/administrator/components/com_templates/tmpl/template/default_updated_files.php
+++ b/administrator/components/com_templates/tmpl/template/default_updated_files.php
@@ -9,10 +9,10 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Factory;
 
 $input = Factory::getApplication()->input;
 ?>
diff --git a/administrator/components/com_templates/tmpl/templates/default.php b/administrator/components/com_templates/tmpl/templates/default.php
index c6fe721869051..dfa74edb07812 100644
--- a/administrator/components/com_templates/tmpl/templates/default.php
+++ b/administrator/components/com_templates/tmpl/templates/default.php
@@ -9,11 +9,11 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Language\Text;
+use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
-use Joomla\CMS\Factory;
 
 // Include the component HTML helpers.
 HTMLHelper::addIncludePath(JPATH_COMPONENT . '/helpers/html');

From f0563eed525621d1111d1168354b1e15bc066757 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 27 Aug 2018 09:18:29 +0530
Subject: [PATCH 53/79] cs

---
 .../components/com_templates/Controller/TemplateController.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_templates/Controller/TemplateController.php b/administrator/components/com_templates/Controller/TemplateController.php
index 7809eea0c9509..171f6d0310f57 100644
--- a/administrator/components/com_templates/Controller/TemplateController.php
+++ b/administrator/components/com_templates/Controller/TemplateController.php
@@ -803,7 +803,7 @@ public function extractArchive()
 	}
 
 	/**
-	 * Fetch and report updates in \JSON format, for A\JAX requests
+	 * Fetch and report updates in \JSON format, for AJAX requests
 	 *
 	 * @return void
 	 *

From af87954f2169b2a61f61837c6889266a3b47396e Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 27 Aug 2018 17:41:11 +0530
Subject: [PATCH 54/79] lang

---
 .../components/com_templates/tmpl/template/default.php      | 6 +++---
 administrator/language/en-GB/en-GB.com_templates.ini        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index ca969e2da5e51..a969d855ac1e2 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -113,7 +113,7 @@
 		<?php if ($this->type == 'file') : ?>
 			<div class="row">
 				<div class="col-md-12" id="override-pane">
-					<p class="lead"><?php echo JText::_('COM_TEMPLATES_FILE_OVERRIDE_PANE'); ?></p>
+					<h2><?php echo JText::_('COM_TEMPLATES_FILE_OVERRIDE_PANE'); ?></h2>
 					<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
 						<div class="editor-border">
 							<?php echo $this->form->getInput('source'); ?>
@@ -128,13 +128,13 @@
 					<?php $coreFileContent = file_get_contents($this->source->coreFile); ?>
 					<?php $overrideFileContent = file_get_contents($this->source->filePath); ?>
 					<div class="col-md-6" id="core-pane">
-						<p class="lead"><?php echo Text::_('COM_TEMPLATES_FILE_CORE_PANE'); ?></p>
+						<h2><?php echo Text::_('COM_TEMPLATES_FILE_CORE_PANE'); ?></h2>
 						<div class="editor-border">
 							<?php echo $this->form->getInput('core'); ?>
 						</div>
 					</div>
 					<div class="col-md-12" id="diff-main">
-						<p class="lead"><?php echo Text::_('COM_TEMPLATES_FILE_COMPARE_PANE'); ?></p>
+						<h2><?php echo Text::_('COM_TEMPLATES_FILE_COMPARE_PANE'); ?></h2>
 						<div class="diff-pane">
 							<div class="diffview" style="display:none" id="original"><?php echo htmlspecialchars($coreFileContent, ENT_COMPAT, 'UTF-8'); ?></div>
 							<div class="diffview" style="display:none" id="changed"><?php echo htmlspecialchars($overrideFileContent, ENT_COMPAT, 'UTF-8'); ?></div>
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index f8a14bc4ad777..bdd7b92604554 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -92,9 +92,9 @@ COM_TEMPLATES_FILE_ARCHIVE_EXTRACT_SUCCESS="Successfully extracted the archive f
 COM_TEMPLATES_FILE_ARCHIVE_EXTRACT_FAIL="Failed to extract the archive file."
 COM_TEMPLATES_FILE_CREATE_ERROR="An error occurred creating the file."
 COM_TEMPLATES_FILE_CREATE_SUCCESS="File created."
-COM_TEMPLATES_FILE_COMPARE_PANE="Compare or diff view between Core and Override file."
+COM_TEMPLATES_FILE_COMPARE_PANE="Diff between Core and Overriden file"
 COM_TEMPLATES_FILE_CONTENT_PREVIEW="File Content Preview."
-COM_TEMPLATES_FILE_CORE_PANE="Core file readonly."
+COM_TEMPLATES_FILE_CORE_PANE="Core file (readonly)"
 COM_TEMPLATES_FILE_COPY_FAIL="Failed to copy the file."
 COM_TEMPLATES_FILE_COPY_SUCCESS="The current file was copied as %s."
 COM_TEMPLATES_FILE_CROP_ERROR="Failed to crop image."
@@ -107,7 +107,7 @@ COM_TEMPLATES_FILE_NEW_NAME_LABEL="Copied File Name"
 COM_TEMPLATES_FILE_EXISTS="File with the same name already exists."
 COM_TEMPLATES_FILE_INFO="File Information"
 COM_TEMPLATES_FILE_NAME="File Name"
-COM_TEMPLATES_FILE_OVERRIDE_PANE="Override file editable."
+COM_TEMPLATES_FILE_OVERRIDE_PANE="Overriden file (editable)"
 COM_TEMPLATES_FILE_PERMISSIONS="The File Permissions are %s"
 COM_TEMPLATES_FILE_RENAME_ERROR="An error occurred renaming the file."
 COM_TEMPLATES_FILE_RENAME_SUCCESS="File renamed."

From 8052186f9fcd7964852d6adf1ec0da2309841ff5 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 27 Aug 2018 17:50:47 +0530
Subject: [PATCH 55/79] only override file

---
 .../components/com_templates/tmpl/template/default.php       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index a969d855ac1e2..27d77b7cc4e2d 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -113,7 +113,10 @@
 		<?php if ($this->type == 'file') : ?>
 			<div class="row">
 				<div class="col-md-12" id="override-pane">
-					<h2><?php echo JText::_('COM_TEMPLATES_FILE_OVERRIDE_PANE'); ?></h2>
+					<?php $overrideCheck  = explode(DIRECTORY_SEPARATOR, $this->source->filename); ?>
+					<?php if ($overrideCheck['1'] === 'html') : ?>
+						<h2><?php echo JText::_('COM_TEMPLATES_FILE_OVERRIDE_PANE'); ?></h2>
+					<?php endif; ?>
 					<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
 						<div class="editor-border">
 							<?php echo $this->form->getInput('source'); ?>

From a8a320a7f9beadb355d7a80d830de8b586bde253 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 27 Aug 2018 17:55:05 +0530
Subject: [PATCH 56/79] lang

---
 administrator/language/en-GB/en-GB.com_templates.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index bdd7b92604554..feafc8ffb4701 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -92,7 +92,7 @@ COM_TEMPLATES_FILE_ARCHIVE_EXTRACT_SUCCESS="Successfully extracted the archive f
 COM_TEMPLATES_FILE_ARCHIVE_EXTRACT_FAIL="Failed to extract the archive file."
 COM_TEMPLATES_FILE_CREATE_ERROR="An error occurred creating the file."
 COM_TEMPLATES_FILE_CREATE_SUCCESS="File created."
-COM_TEMPLATES_FILE_COMPARE_PANE="Diff between Core and Overriden file"
+COM_TEMPLATES_FILE_COMPARE_PANE="Diff between Core and Overridden file"
 COM_TEMPLATES_FILE_CONTENT_PREVIEW="File Content Preview."
 COM_TEMPLATES_FILE_CORE_PANE="Core file (readonly)"
 COM_TEMPLATES_FILE_COPY_FAIL="Failed to copy the file."
@@ -107,7 +107,7 @@ COM_TEMPLATES_FILE_NEW_NAME_LABEL="Copied File Name"
 COM_TEMPLATES_FILE_EXISTS="File with the same name already exists."
 COM_TEMPLATES_FILE_INFO="File Information"
 COM_TEMPLATES_FILE_NAME="File Name"
-COM_TEMPLATES_FILE_OVERRIDE_PANE="Overriden file (editable)"
+COM_TEMPLATES_FILE_OVERRIDE_PANE="Overridden file (editable)"
 COM_TEMPLATES_FILE_PERMISSIONS="The File Permissions are %s"
 COM_TEMPLATES_FILE_RENAME_ERROR="An error occurred renaming the file."
 COM_TEMPLATES_FILE_RENAME_SUCCESS="File renamed."

From d7f77d1bcb7a8144d91b9d240bedd9aa21bb1b4e Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 27 Aug 2018 17:59:29 +0530
Subject: [PATCH 57/79] override lang installer

---
 administrator/language/en-GB/en-GB.com_templates.ini            | 2 +-
 administrator/language/en-GB/en-GB.plg_installer_override.ini   | 2 +-
 .../language/en-GB/en-GB.plg_installer_override.sys.ini         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index feafc8ffb4701..9be65c3e3d159 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -92,7 +92,7 @@ COM_TEMPLATES_FILE_ARCHIVE_EXTRACT_SUCCESS="Successfully extracted the archive f
 COM_TEMPLATES_FILE_ARCHIVE_EXTRACT_FAIL="Failed to extract the archive file."
 COM_TEMPLATES_FILE_CREATE_ERROR="An error occurred creating the file."
 COM_TEMPLATES_FILE_CREATE_SUCCESS="File created."
-COM_TEMPLATES_FILE_COMPARE_PANE="Diff between Core and Overridden file"
+COM_TEMPLATES_FILE_COMPARE_PANE="Diff between core and overridden file"
 COM_TEMPLATES_FILE_CONTENT_PREVIEW="File Content Preview."
 COM_TEMPLATES_FILE_CORE_PANE="Core file (readonly)"
 COM_TEMPLATES_FILE_COPY_FAIL="Failed to copy the file."
diff --git a/administrator/language/en-GB/en-GB.plg_installer_override.ini b/administrator/language/en-GB/en-GB.plg_installer_override.ini
index 5b7e1c171375b..f01bf9621a020 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_override.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_override.ini
@@ -4,6 +4,6 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_INSTALLER_OVERRIDE="Installer - Override"
-PLG_INSTALLER_OVERRIDE_PLUGIN_XML_DESCRIPTION="The system overrides plugin enables notifications and handling of overrides after an update in case of differences."
+PLG_INSTALLER_OVERRIDE_PLUGIN_XML_DESCRIPTION="This plugin enables notifications and handling of overrides after an update in case of changes."
 PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED="%s Overrides core file updated."
 PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED_1="Override core file updated."
diff --git a/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini b/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini
index 92d49ef41f7e7..dd8e2244f22f6 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_override.sys.ini
@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_INSTALLER_OVERRIDE="Installer - Override"
-PLG_INSTALLER_OVERRIDE_PLUGIN_XML_DESCRIPTION="The system overrides plugin enables notifications and handling of overrides after an update in case of differences."
+PLG_INSTALLER_OVERRIDE_PLUGIN_XML_DESCRIPTION="This plugin enables notifications and handling of overrides after an update in case of changes."

From b2459ce0f25210c75a6421457384d45d98ffa909 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 27 Aug 2018 20:20:50 +0530
Subject: [PATCH 58/79] Cs

---
 .../components/com_templates/tmpl/template/default.php      | 2 +-
 plugins/installer/override/override.php                     | 6 +++---
 plugins/quickicon/overridecheck/overridecheck.php           | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index 27d77b7cc4e2d..6c3634636c9e6 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -113,7 +113,7 @@
 		<?php if ($this->type == 'file') : ?>
 			<div class="row">
 				<div class="col-md-12" id="override-pane">
-					<?php $overrideCheck  = explode(DIRECTORY_SEPARATOR, $this->source->filename); ?>
+					<?php $overrideCheck = explode(DIRECTORY_SEPARATOR, $this->source->filename); ?>
 					<?php if ($overrideCheck['1'] === 'html') : ?>
 						<h2><?php echo JText::_('COM_TEMPLATES_FILE_OVERRIDE_PANE'); ?></h2>
 					<?php endif; ?>
diff --git a/plugins/installer/override/override.php b/plugins/installer/override/override.php
index 8bbca326bec1c..2bfcf8176004c 100644
--- a/plugins/installer/override/override.php
+++ b/plugins/installer/override/override.php
@@ -9,10 +9,10 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Date\Date;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Plugin\CMSPlugin;
 
 /**
  * Override Plugin
diff --git a/plugins/quickicon/overridecheck/overridecheck.php b/plugins/quickicon/overridecheck/overridecheck.php
index d8fc3f8cb61ae..3efb076c2dbc5 100644
--- a/plugins/quickicon/overridecheck/overridecheck.php
+++ b/plugins/quickicon/overridecheck/overridecheck.php
@@ -9,12 +9,12 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Session\Session;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Uri\Uri;
 
 /**
  * Joomla! template override notification plugin

From 9060688cdbb6bc9e49be84bb7dc08a36e74339c1 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Tue, 28 Aug 2018 01:45:54 +0530
Subject: [PATCH 59/79] sub

---
 plugins/installer/override/override.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/installer/override/override.php b/plugins/installer/override/override.php
index 2bfcf8176004c..830cd6ceefd3d 100644
--- a/plugins/installer/override/override.php
+++ b/plugins/installer/override/override.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Plugin
- * @subpackage  Overrides.Override
+ * @subpackage  Installer.override
  *
  * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

From 5ec9ffb9458f5aa6a902547da44c74c2595e0563 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 28 Aug 2018 13:50:30 +0100
Subject: [PATCH 60/79] Update list of core extensions (#71)

---
 libraries/src/Extension/ExtensionHelper.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libraries/src/Extension/ExtensionHelper.php b/libraries/src/Extension/ExtensionHelper.php
index 26f63dbc9f423..e2d67389450f7 100644
--- a/libraries/src/Extension/ExtensionHelper.php
+++ b/libraries/src/Extension/ExtensionHelper.php
@@ -197,6 +197,7 @@ class ExtensionHelper
 
 		// Core plugin extensions - installer
 		array('plugin', 'folderinstaller', 'installer', 0),
+		array('plugin', 'override', 'installer', 0),
 		array('plugin', 'packageinstaller', 'installer', 0),
 		array('plugin', 'urlinstaller', 'installer', 0),
 		array('plugin', 'webinstaller', 'installer', 0),
@@ -209,6 +210,7 @@ class ExtensionHelper
 		// Core plugin extensions - quickicon
 		array('plugin', 'extensionupdate', 'quickicon', 0),
 		array('plugin', 'joomlaupdate', 'quickicon', 0),
+		array('plugin', 'overridecheck', 'quickicon', 0),
 		array('plugin', 'phpversioncheck', 'quickicon', 0),
 
 		// Core plugin extensions - sample data

From bce28b93015e180ba967a3785522f533e573bdbe Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 28 Aug 2018 13:51:09 +0100
Subject: [PATCH 61/79] Language changes (#76)

* update

* Update en-GB.com_templates.ini

* override JLIB_HTML_PUBLISH_ITEM

this is the hover text on the publish icon in the list of files
---
 administrator/language/en-GB/en-GB.com_templates.ini | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index f8a14bc4ad777..45934c3a7ac9b 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -189,7 +189,7 @@ COM_TEMPLATES_OVERRIDE_FAILED="Failed to create override."
 COM_TEMPLATES_OVERRIDE_MODIFIED_DATE="Last change via Update"
 COM_TEMPLATES_OVERRIDE_SUCCESS="Successfully created the override."
 COM_TEMPLATES_OVERRIDE_TEMPLATE_FILE="Template File"
-COM_TEMPLATES_OVERRIDE_UPTODATE="Override files are up to date with core files. Nothing is changed in last extension or Joomla update."
+COM_TEMPLATES_OVERRIDE_UPTODATE="Overriden files are up to date. Nothing has been changed in the last extension or Joomla update."
 COM_TEMPLATES_OVERRIDES="Override files"
 COM_TEMPLATES_OVERRIDES_COMPONENTS="Components"
 COM_TEMPLATES_OVERRIDES_MODULES="Modules"
@@ -213,7 +213,7 @@ COM_TEMPLATES_SUCCESS_HOME_UNSET="Default style unset."
 COM_TEMPLATES_TAB_DESCRIPTION="Template Description"
 COM_TEMPLATES_TAB_EDITOR="Editor"
 COM_TEMPLATES_TAB_OVERRIDES="Create Overrides"
-COM_TEMPLATES_TAB_UPDATED_FILES="Updated files"
+COM_TEMPLATES_TAB_UPDATED_FILES="Updated Files"
 COM_TEMPLATES_TEMPLATE_CLOSE="Close"
 COM_TEMPLATES_TEMPLATE_COPY="Copy Template"
 COM_TEMPLATES_TEMPLATE_CORE_FILENAME="Core file &quot;%s&quot;."
@@ -231,9 +231,11 @@ COM_TEMPLATES_TEMPLATE_PREVIEW="Preview"
 COM_TEMPLATES_TEMPLATES_FILTER_SEARCH_DESC="Search in template name or folder name."
 COM_TEMPLATES_TOGGLE_FULL_SCREEN="Press Ctrl-Q to toggle Full Screen editing."
 COM_TEMPLATES_TOOLBAR_SET_HOME="Default"
-COM_TEMPLATES_N_CONFLICT="%d Conflicts found"
-COM_TEMPLATES_N_CONFLICT_1="Conflict found"
+COM_TEMPLATES_N_CONFLICT="%d Changes found"
+COM_TEMPLATES_N_CONFLICT_1="Change found"
 COM_TEMPLATES_UPTODATE="Up to date"
 COM_TEMPLATES_WARNING_FORMAT_WILL_NOT_BE_VISIBLE="You have created a new file with the extension '%s'. This is supported but as you did not have that file extension in the list of supported formats this can't be displayed. Please double check the options for Templates and add the format if needed."
 COM_TEMPLATES_XML_DESCRIPTION="This component manages templates"
+JLIB_HTML_PUBLISH_ITEM="Mark as checked"
+JLIB_HTML_UNPUBLISH_ITEM="Mark as not checked"
 JLIB_RULES_SETTING_NOTES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."

From 6dbf560c8e345e0c2ae3bc997e1cbff176dec29e Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 28 Aug 2018 13:51:44 +0100
Subject: [PATCH 62/79] Change icon (#74)

change the icon to use an outline for more consistency
---
 plugins/quickicon/overridecheck/overridecheck.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/quickicon/overridecheck/overridecheck.php b/plugins/quickicon/overridecheck/overridecheck.php
index d8fc3f8cb61ae..65c4db007b5c8 100644
--- a/plugins/quickicon/overridecheck/overridecheck.php
+++ b/plugins/quickicon/overridecheck/overridecheck.php
@@ -69,7 +69,7 @@ public function onGetIcons($context)
 		return array(
 			array(
 				'link'  => 'index.php?option=com_templates&view=templates',
-				'image' => 'fa fa-file',
+				'image' => 'fa fa-file-o',
 				'icon'  => '',
 				'text'  => Text::_('PLG_QUICKICON_OVERRIDECHECK_CHECKING'),
 				'id'    => 'plg_quickicon_overridecheck',

From 55390d11704f5f6ff43b5bb5fb82e2ea0ea78eff Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Wed, 29 Aug 2018 00:01:14 +0530
Subject: [PATCH 63/79] lang

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

diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
index 35c125f847ee3..b342b70952493 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
@@ -9,6 +9,6 @@ PLG_QUICKICON_OVERRIDECHECK_ERROR="Error on checking overrides."
 PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE="Enable installer override plugin."
 PLG_QUICKICON_OVERRIDECHECK_GROUP_DESC="The group of this plugin (this value is compared with the group value used in <strong>Quick Icons</strong> modules to inject icons)."
 PLG_QUICKICON_OVERRIDECHECK_GROUP_LABEL="Group"
-PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND="%s Override(s) updated."
+PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND="%s Override(s) to check."
 PLG_QUICKICON_OVERRIDECHECK_UPTODATE="Override are up to date."
 PLG_QUICKICON_OVERRIDECHECK_XML_DESCRIPTION="Checks overrides on update and enables notifications when you visit the Control Panel page.<br><strong> Warning! You must have installer override plugin enabled to see results.</strong>"

From 2e3bd86f5f93569f095ddef4472b22d04b590b8a Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Tue, 28 Aug 2018 19:38:59 +0100
Subject: [PATCH 64/79] not core (#75)

* not core

* Update en-GB.plg_installer_override.ini
---
 administrator/language/en-GB/en-GB.plg_installer_override.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.plg_installer_override.ini b/administrator/language/en-GB/en-GB.plg_installer_override.ini
index 5b7e1c171375b..ed5aa7c63e612 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_override.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_override.ini
@@ -5,5 +5,5 @@
 
 PLG_INSTALLER_OVERRIDE="Installer - Override"
 PLG_INSTALLER_OVERRIDE_PLUGIN_XML_DESCRIPTION="The system overrides plugin enables notifications and handling of overrides after an update in case of differences."
-PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED="%s Overrides core file updated."
-PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED_1="Override core file updated."
+PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED="%s Overridden files have changed."
+PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED_1="Overridden file has changed."

From 3c585efe55c1bc5e26af96f8cf2f8cb45a5fe392 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Wed, 29 Aug 2018 02:27:53 +0530
Subject: [PATCH 65/79] namespace

---
 .../components/com_templates/tmpl/template/default.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index 6c3634636c9e6..48a676f969563 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -115,9 +115,9 @@
 				<div class="col-md-12" id="override-pane">
 					<?php $overrideCheck = explode(DIRECTORY_SEPARATOR, $this->source->filename); ?>
 					<?php if ($overrideCheck['1'] === 'html') : ?>
-						<h2><?php echo JText::_('COM_TEMPLATES_FILE_OVERRIDE_PANE'); ?></h2>
+						<h2><?php echo Text::_('COM_TEMPLATES_FILE_OVERRIDE_PANE'); ?></h2>
 					<?php endif; ?>
-					<form action="<?php echo JRoute::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
+					<form action="<?php echo Route::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="adminForm" id="adminForm">
 						<div class="editor-border">
 							<?php echo $this->form->getInput('source'); ?>
 						</div>

From 01826554ba1368c67076e72f3106eb2923e61c41 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Wed, 29 Aug 2018 20:20:03 +0530
Subject: [PATCH 66/79] cs

---
 .../components/com_templates/tmpl/templates/default.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_templates/tmpl/templates/default.php b/administrator/components/com_templates/tmpl/templates/default.php
index dfa74edb07812..a363b2bfb2e64 100644
--- a/administrator/components/com_templates/tmpl/templates/default.php
+++ b/administrator/components/com_templates/tmpl/templates/default.php
@@ -56,7 +56,7 @@
 									<th style="width:10%" class="d-none d-md-table-cell text-center">
 										<?php echo Text::_('COM_TEMPLATES_OVERRIDES'); ?>
 									</th>
-								<?php endif;?>
+								<?php endif; ?>
 							</tr>
 						</thead>
 						<tbody>

From 730240e8d921f148e2924b117f39b5158b45cf98 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sun, 2 Sep 2018 16:08:08 +0100
Subject: [PATCH 67/79] Updated files (#82)

* Update default_updated_files.php

* Update en-GB.com_templates.ini
---
 .../com_templates/tmpl/template/default_updated_files.php       | 2 +-
 administrator/language/en-GB/en-GB.com_templates.ini            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/administrator/components/com_templates/tmpl/template/default_updated_files.php b/administrator/components/com_templates/tmpl/template/default_updated_files.php
index 5901e93272b95..7ee5eb4dabf4e 100644
--- a/administrator/components/com_templates/tmpl/template/default_updated_files.php
+++ b/administrator/components/com_templates/tmpl/template/default_updated_files.php
@@ -28,7 +28,7 @@
 								<?php echo HTMLHelper::_('grid.checkall'); ?>
 							</td>
 							<th scope="col" style="width:7%" class="nowrap">
-								<?php echo Text::_('JSTATUS'); ?>
+								<?php echo Text::_('COM_TEMPLATES_OVERRIDE_CHECKED'); ?>
 							</th>
 							<th scope="col" style="width:30%">
 								<?php echo Text::_('COM_TEMPLATES_OVERRIDE_TEMPLATE_FILE'); ?>
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index 2c56734e3e95c..45f4c6f5b4a0a 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -182,6 +182,7 @@ COM_TEMPLATES_NO_TEMPLATE_SELECTED="No template selected."
 COM_TEMPLATES_OPTION_NONE=":: None ::"
 COM_TEMPLATES_OPTION_SELECT_MENU_ITEM="- Select Menu Item -"
 COM_TEMPLATES_OVERRIDE_ACTION="Update Action"
+COM_TEMPLATES_OVERRIDE_CHECKED="Checked"
 COM_TEMPLATES_OVERRIDE_CREATED="Override created in "
 COM_TEMPLATES_OVERRIDE_CREATED_DATE="Added to the list"
 COM_TEMPLATES_OVERRIDE_CORE_REMOVED="Core file removed"

From bef1a9cde99b10abd441d1d3f7729aab0654b671 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sun, 2 Sep 2018 16:09:36 +0100
Subject: [PATCH 68/79] Update en-GB.com_templates.ini (#81)

---
 administrator/language/en-GB/en-GB.com_templates.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index 45f4c6f5b4a0a..ce00d4f1a9746 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -94,7 +94,7 @@ COM_TEMPLATES_FILE_CREATE_ERROR="An error occurred creating the file."
 COM_TEMPLATES_FILE_CREATE_SUCCESS="File created."
 COM_TEMPLATES_FILE_COMPARE_PANE="Diff between core and overridden file"
 COM_TEMPLATES_FILE_CONTENT_PREVIEW="File Content Preview."
-COM_TEMPLATES_FILE_CORE_PANE="Core file (readonly)"
+COM_TEMPLATES_FILE_CORE_PANE="Original file (readonly)"
 COM_TEMPLATES_FILE_COPY_FAIL="Failed to copy the file."
 COM_TEMPLATES_FILE_COPY_SUCCESS="The current file was copied as %s."
 COM_TEMPLATES_FILE_CROP_ERROR="Failed to crop image."
@@ -149,9 +149,9 @@ COM_TEMPLATES_IMAGE_WIDTH="Width"
 COM_TEMPLATES_INVALID_FILE_NAME="Invalid file name. Please choose a file name with a-z, A-Z, 0-9, - and _."
 COM_TEMPLATES_INVALID_FILE_TYPE="File type not selected."
 COM_TEMPLATES_INVALID_FOLDER_NAME="Invalid folder name. Please choose a folder name with a-z, A-Z, 0-9, - and _."
-COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE="Hide Core"
+COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE="Hide Original"
 COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF="Hide Diff"
-COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE="Show Core"
+COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE="Show Original"
 COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF="Show Diff"
 COM_TEMPLATES_MANAGER_ADD_STYLE="Templates: Add Style"
 COM_TEMPLATES_MANAGER_EDIT_STYLE="Templates: Edit Style"

From 93b511394d63aeb22317992915fe5ab14d84d184 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sun, 2 Sep 2018 16:11:00 +0100
Subject: [PATCH 69/79] Update en-GB.plg_quickicon_overridecheck.ini (#80)

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

diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
index b342b70952493..0cf55fd6dbf29 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
@@ -10,5 +10,5 @@ PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE="Enable installer override plugin."
 PLG_QUICKICON_OVERRIDECHECK_GROUP_DESC="The group of this plugin (this value is compared with the group value used in <strong>Quick Icons</strong> modules to inject icons)."
 PLG_QUICKICON_OVERRIDECHECK_GROUP_LABEL="Group"
 PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND="%s Override(s) to check."
-PLG_QUICKICON_OVERRIDECHECK_UPTODATE="Override are up to date."
+PLG_QUICKICON_OVERRIDECHECK_UPTODATE="Overrides are up to date."
 PLG_QUICKICON_OVERRIDECHECK_XML_DESCRIPTION="Checks overrides on update and enables notifications when you visit the Control Panel page.<br><strong> Warning! You must have installer override plugin enabled to see results.</strong>"

From 90594e7f5970ad33e85550cc42db954566ee2c28 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sun, 2 Sep 2018 16:11:35 +0100
Subject: [PATCH 70/79] Update en-GB.plg_quickicon_overridecheck.ini (#79)

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

diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
index 0cf55fd6dbf29..85b83e46f52b9 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
@@ -6,7 +6,7 @@
 PLG_QUICKICON_OVERRIDECHECK="Quick Icon - Joomla! Overrides Update Notification"
 PLG_QUICKICON_OVERRIDECHECK_CHECKING="Checking overrides ..."
 PLG_QUICKICON_OVERRIDECHECK_ERROR="Error on checking overrides."
-PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE="Enable installer override plugin."
+PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE="Enable <strong>Installer - override</strong> plugin."
 PLG_QUICKICON_OVERRIDECHECK_GROUP_DESC="The group of this plugin (this value is compared with the group value used in <strong>Quick Icons</strong> modules to inject icons)."
 PLG_QUICKICON_OVERRIDECHECK_GROUP_LABEL="Group"
 PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND="%s Override(s) to check."

From 5dbe6e251c94fa6548bf3a35d7e592f6d5bebdbe Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sun, 2 Sep 2018 16:14:28 +0100
Subject: [PATCH 71/79] remove space (#78)

* Update en-GB.plg_quickicon_overridecheck.ini

* Update en-GB.plg_quickicon_overridecheck.sys.ini
---
 .../language/en-GB/en-GB.plg_quickicon_overridecheck.ini        | 2 +-
 .../language/en-GB/en-GB.plg_quickicon_overridecheck.sys.ini    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
index 85b83e46f52b9..83f535b2cb816 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
@@ -11,4 +11,4 @@ PLG_QUICKICON_OVERRIDECHECK_GROUP_DESC="The group of this plugin (this value is
 PLG_QUICKICON_OVERRIDECHECK_GROUP_LABEL="Group"
 PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND="%s Override(s) to check."
 PLG_QUICKICON_OVERRIDECHECK_UPTODATE="Overrides are up to date."
-PLG_QUICKICON_OVERRIDECHECK_XML_DESCRIPTION="Checks overrides on update and enables notifications when you visit the Control Panel page.<br><strong> Warning! You must have installer override plugin enabled to see results.</strong>"
+PLG_QUICKICON_OVERRIDECHECK_XML_DESCRIPTION="Checks overrides on update and enables notifications when you visit the Control Panel page.<br><strong>Warning! You must have installer override plugin enabled to see results.</strong>"
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.sys.ini b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.sys.ini
index 07a4836e4600a..b48f637a51985 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.sys.ini
@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_QUICKICON_OVERRIDECHECK="Quick Icon - Joomla! Overrides Update Notification"
-PLG_QUICKICON_OVERRIDECHECK_XML_DESCRIPTION="Checks overrides on update and enables notifications when you visit the Control Panel page.<br><strong> Warning! You must have installer override plugin enabled to see results.</strong>"
+PLG_QUICKICON_OVERRIDECHECK_XML_DESCRIPTION="Checks overrides on update and enables notifications when you visit the Control Panel page.<br><strong>Warning! You must have installer override plugin enabled to see results.</strong>"

From ca8dc673f3d56ededa083095d9f85296d390f8c7 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Sun, 2 Sep 2018 21:47:30 +0530
Subject: [PATCH 72/79] remove hardcoded id

---
 .../js/overridecheck.es6.js                   |  2 +-
 .../quickicon/overridecheck/overridecheck.php | 34 +++++++++++++++++--
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/build/media_src/plg_quickicon_overridecheck/js/overridecheck.es6.js b/build/media_src/plg_quickicon_overridecheck/js/overridecheck.es6.js
index a3f13493fafe2..721f3db425897 100644
--- a/build/media_src/plg_quickicon_overridecheck/js/overridecheck.es6.js
+++ b/build/media_src/plg_quickicon_overridecheck/js/overridecheck.es6.js
@@ -48,7 +48,7 @@
             }
           } else {
             link.classList.add('danger');
-            link.setAttribute('href', 'index.php?option=com_plugins&task=plugin.edit&extension_id=491');
+            link.setAttribute('href', `index.php?option=com_plugins&task=plugin.edit&extension_id=${options.pluginId}`);
             for (let i = 0, len = linkSpan.length; i < len; i += 1) {
               linkSpan[i].innerHTML = Joomla.JText._('PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE');
             }
diff --git a/plugins/quickicon/overridecheck/overridecheck.php b/plugins/quickicon/overridecheck/overridecheck.php
index 2ff9e522755a6..5f311766f8250 100644
--- a/plugins/quickicon/overridecheck/overridecheck.php
+++ b/plugins/quickicon/overridecheck/overridecheck.php
@@ -52,8 +52,9 @@ public function onGetIcons($context)
 
 		$token    = Session::getFormToken() . '=1';
 		$options  = array(
-			'url' => Uri::base() . 'index.php?option=com_templates&view=templates',
-			'ajaxUrl' => Uri::base() . 'index.php?option=com_templates&view=templates&task=template.ajax&' . $token,
+			'url'      => Uri::base() . 'index.php?option=com_templates&view=templates',
+			'ajaxUrl'  => Uri::base() . 'index.php?option=com_templates&view=templates&task=template.ajax&' . $token,
+			'pluginId' => $this->getOverridePluginId()
 		);
 
 		Factory::getDocument()->addScriptOptions('js-override-check', $options);
@@ -77,4 +78,33 @@ public function onGetIcons($context)
 			)
 		);
 	}
+
+	/**
+	 * Gets the installer override plugin extension id.
+	 *
+	 * @return  integer  The installer override plugin extension id.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function getOverridePluginId()
+	{
+		$db    = \JFactory::getDbo();
+		$query = $db->getQuery(true)
+			->select($db->quoteName('extension_id'))
+			->from($db->quoteName('#__extensions'))
+			->where($db->quoteName('folder') . ' = ' . $db->quote('installer'))
+			->where($db->quoteName('element') . ' = ' . $db->quote('override'));
+		$db->setQuery($query);
+
+		try
+		{
+			$result = (int) $db->loadResult();
+		}
+		catch (\RuntimeException $e)
+		{
+			\JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+		}
+
+		return $result;
+	}
 }

From 7eb7ff1adae823b27a9492d619cffcea379e0394 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 3 Sep 2018 21:50:37 +0530
Subject: [PATCH 73/79] null get function

---
 .../com_templates/tmpl/template/default_updated_files.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_templates/tmpl/template/default_updated_files.php b/administrator/components/com_templates/tmpl/template/default_updated_files.php
index 7ee5eb4dabf4e..342b0c41525bf 100644
--- a/administrator/components/com_templates/tmpl/template/default_updated_files.php
+++ b/administrator/components/com_templates/tmpl/template/default_updated_files.php
@@ -61,7 +61,7 @@
 									<?php echo $created_date > 0 ? HTMLHelper::_('date', $created_date, Text::_('DATE_FORMAT_FILTER_DATETIME')) : '-'; ?>
 								</td>
 								<td>
-									<?php if ($value->modified_date === '0000-00-00 00:00:00') : ?>
+									<?php if ($value->modified_date === Factory::getDbo()->getNullDate()) : ?>
 										<span class="badge badge-warning"><?php echo Text::_('COM_TEMPLATES_OVERRIDE_CORE_REMOVED'); ?></span>
 									<?php else : ?>
 										<?php $modified_date = $value->modified_date; ?>

From 8422f5a731047087b775a05f76a557b0779b9eac Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 3 Sep 2018 21:54:15 +0530
Subject: [PATCH 74/79] state

---
 administrator/components/com_templates/Model/TemplateModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index 893a9be51a6c0..752f04d2e94ad 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -175,7 +175,7 @@ public function getUpdatedList($state = false, $all = false, $cleanup = false)
 
 		if ($state)
 		{
-			$query->where('state = ' . 0);
+			$query->where('state = 0');
 		}
 
 		$query->order($db->quoteName('a.modified_date') . 'DESC');

From 8dca90c70e714ea17a9a90f8bc237b936535d85b Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Mon, 3 Sep 2018 22:01:01 +0530
Subject: [PATCH 75/79] clean

---
 .../components/com_templates/Model/TemplateModel.php          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index 752f04d2e94ad..b2143f2deb554 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -900,9 +900,9 @@ public function &getSource()
 			if (file_exists($filePath))
 			{
 				$item->extension_id = $this->getState('extension.id');
-				$item->filename = $fileName;
+				$item->filename = Path::clean($fileName);
 				$item->source = file_get_contents($filePath);
-				$item->filePath = $filePath;
+				$item->filePath = Path::clean($filePath);
 
 				if ($coreFile = $this->getCoreFile($fileName, $this->template->client_id))
 				{

From f034475e7ff1d62c282ec578912f3098d259e94e Mon Sep 17 00:00:00 2001
From: Richard Fath <richard67@users.noreply.github.com>
Date: Mon, 3 Sep 2018 22:29:08 +0200
Subject: [PATCH 76/79] More changes "core" to "original" (#85)

---
 administrator/language/en-GB/en-GB.com_templates.ini | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index ce00d4f1a9746..e9e2ac01e13d7 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -92,7 +92,7 @@ COM_TEMPLATES_FILE_ARCHIVE_EXTRACT_SUCCESS="Successfully extracted the archive f
 COM_TEMPLATES_FILE_ARCHIVE_EXTRACT_FAIL="Failed to extract the archive file."
 COM_TEMPLATES_FILE_CREATE_ERROR="An error occurred creating the file."
 COM_TEMPLATES_FILE_CREATE_SUCCESS="File created."
-COM_TEMPLATES_FILE_COMPARE_PANE="Diff between core and overridden file"
+COM_TEMPLATES_FILE_COMPARE_PANE="Diff between original and overridden file"
 COM_TEMPLATES_FILE_CONTENT_PREVIEW="File Content Preview."
 COM_TEMPLATES_FILE_CORE_PANE="Original file (readonly)"
 COM_TEMPLATES_FILE_COPY_FAIL="Failed to copy the file."
@@ -185,7 +185,7 @@ COM_TEMPLATES_OVERRIDE_ACTION="Update Action"
 COM_TEMPLATES_OVERRIDE_CHECKED="Checked"
 COM_TEMPLATES_OVERRIDE_CREATED="Override created in "
 COM_TEMPLATES_OVERRIDE_CREATED_DATE="Added to the list"
-COM_TEMPLATES_OVERRIDE_CORE_REMOVED="Core file removed"
+COM_TEMPLATES_OVERRIDE_CORE_REMOVED="Original file removed"
 COM_TEMPLATES_OVERRIDE_FAILED="Failed to create override."
 COM_TEMPLATES_OVERRIDE_MODIFIED_DATE="Last change via Update"
 COM_TEMPLATES_OVERRIDE_SUCCESS="Successfully created the override."
@@ -217,7 +217,7 @@ COM_TEMPLATES_TAB_OVERRIDES="Create Overrides"
 COM_TEMPLATES_TAB_UPDATED_FILES="Updated Files"
 COM_TEMPLATES_TEMPLATE_CLOSE="Close"
 COM_TEMPLATES_TEMPLATE_COPY="Copy Template"
-COM_TEMPLATES_TEMPLATE_CORE_FILENAME="Core file &quot;%s&quot;."
+COM_TEMPLATES_TEMPLATE_CORE_FILENAME="Original file &quot;%s&quot;."
 COM_TEMPLATES_TEMPLATE_DESCRIPTION="Template description."
 COM_TEMPLATES_TEMPLATE_DETAILS="%s Details and Files"
 COM_TEMPLATES_TEMPLATE_FILENAME="Editing file &quot;%s&quot; in template &quot;%s&quot;."

From dedfcf4463a0056ab5e15b31b6a09440830f85b1 Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Tue, 4 Sep 2018 17:44:55 +0530
Subject: [PATCH 77/79] cs

---
 .../components/com_joomlaupdate/Model/UpdateModel.php  |  4 ++--
 .../components/com_templates/Model/TemplateModel.php   | 10 +++++-----
 .../components/com_templates/tmpl/template/default.php |  4 ++--
 .../tmpl/template/default_updated_files.php            |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/administrator/components/com_joomlaupdate/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/Model/UpdateModel.php
index 07f04d98f6ef8..d951cd1056420 100644
--- a/administrator/components/com_joomlaupdate/Model/UpdateModel.php
+++ b/administrator/components/com_joomlaupdate/Model/UpdateModel.php
@@ -409,7 +409,7 @@ public function createRestorationFile($basename = null)
 		$app = Factory::getApplication();
 		$app->setUserState('com_joomlaupdate.password', $password);
 
-		// Trigger on before joomla event.
+		// Trigger event before joomla.
 		$app->triggerEvent('onJoomlaBeforeUpdate');
 
 		// Do we have to use FTP?
@@ -848,7 +848,7 @@ public function cleanUp()
 
 		$app = Factory::getApplication();
 
-		// Trigger on before joomla event.
+		// Trigger event after joomla update.
 		$app->triggerEvent('onJoomlaAfterUpdate');
 
 		// Remove the update package.
diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
index b2143f2deb554..ddabf0cf0b256 100644
--- a/administrator/components/com_templates/Model/TemplateModel.php
+++ b/administrator/components/com_templates/Model/TemplateModel.php
@@ -178,7 +178,7 @@ public function getUpdatedList($state = false, $all = false, $cleanup = false)
 			$query->where('state = 0');
 		}
 
-		$query->order($db->quoteName('a.modified_date') . 'DESC');
+		$query->order($db->quoteName('a.modified_date') . ' DESC');
 
 		// Reset the query.
 		$db->setQuery($query);
@@ -225,7 +225,7 @@ public function getCoreList()
 		// Get list of all templates
 		$templates = $this->getTemplateList();
 
-		// Intialize the array variable to store core file list.
+		// Initialize the array variable to store core file list.
 		$this->coreFileList = array();
 
 		$app = Factory::getApplication();
@@ -467,9 +467,9 @@ public function getDirectoryTree($dir)
 	 */
 	public function getCoreFile($file, $client_id)
 	{
-		$app           = Factory::getApplication();
-		$filePath      = Path::clean($file);
-		$explodeArray  = explode(DIRECTORY_SEPARATOR, $filePath);
+		$app          = Factory::getApplication();
+		$filePath     = Path::clean($file);
+		$explodeArray = explode(DIRECTORY_SEPARATOR, $filePath);
 
 		// Only allow html/ folder
 		if ($explodeArray['1'] !== 'html')
diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index 48a676f969563..90b0a1b8f6251 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -139,8 +139,8 @@
 					<div class="col-md-12" id="diff-main">
 						<h2><?php echo Text::_('COM_TEMPLATES_FILE_COMPARE_PANE'); ?></h2>
 						<div class="diff-pane">
-							<div class="diffview" style="display:none" id="original"><?php echo htmlspecialchars($coreFileContent, ENT_COMPAT, 'UTF-8'); ?></div>
-							<div class="diffview" style="display:none" id="changed"><?php echo htmlspecialchars($overrideFileContent, ENT_COMPAT, 'UTF-8'); ?></div>
+							<div class="diffview d-none" id="original"><?php echo htmlspecialchars($coreFileContent, ENT_COMPAT, 'UTF-8'); ?></div>
+							<div class="diffview d-none" id="changed"><?php echo htmlspecialchars($overrideFileContent, ENT_COMPAT, 'UTF-8'); ?></div>
 							<div id="diff"></div>
 						</div>
 					</div>
diff --git a/administrator/components/com_templates/tmpl/template/default_updated_files.php b/administrator/components/com_templates/tmpl/template/default_updated_files.php
index 342b0c41525bf..2e0a5137ad2e9 100644
--- a/administrator/components/com_templates/tmpl/template/default_updated_files.php
+++ b/administrator/components/com_templates/tmpl/template/default_updated_files.php
@@ -20,7 +20,7 @@
 <form action="<?php echo Route::_('index.php?option=com_templates&view=template&id=' . $input->getInt('id') . '&file=' . $this->file); ?>" method="post" name="updateForm" id="updateForm">
 	<div class="row">
 		<div class="col-md-12">
-			<?php if(count($this->updatedList) !== 0) : ?>
+			<?php if (count($this->updatedList) !== 0) : ?>
 				<table class="table">
 					<thead>
 						<tr>

From 0abf60642315845e57b5ab89745efd9ba44c5d3c Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Tue, 4 Sep 2018 17:46:20 +0530
Subject: [PATCH 78/79] update

---
 administrator/components/com_joomlaupdate/Model/UpdateModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_joomlaupdate/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/Model/UpdateModel.php
index d951cd1056420..98393e0e114a9 100644
--- a/administrator/components/com_joomlaupdate/Model/UpdateModel.php
+++ b/administrator/components/com_joomlaupdate/Model/UpdateModel.php
@@ -409,7 +409,7 @@ public function createRestorationFile($basename = null)
 		$app = Factory::getApplication();
 		$app->setUserState('com_joomlaupdate.password', $password);
 
-		// Trigger event before joomla.
+		// Trigger event before joomla update.
 		$app->triggerEvent('onJoomlaBeforeUpdate');
 
 		// Do we have to use FTP?

From 9adaa465e6b8e78d1044a781583e96cb0771db7f Mon Sep 17 00:00:00 2001
From: Anu1601CS <anuragvns1111@gmail.com>
Date: Thu, 6 Sep 2018 14:17:36 +0530
Subject: [PATCH 79/79] plural

---
 plugins/installer/override/override.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/installer/override/override.php b/plugins/installer/override/override.php
index 830cd6ceefd3d..bd65446a5e2dd 100644
--- a/plugins/installer/override/override.php
+++ b/plugins/installer/override/override.php
@@ -181,8 +181,7 @@ public function finalize($result)
 
 		if ($num != 0)
 		{
-			$span = '<span class="badge badge-light">' . $num . '</span>';
-			$this->app->enqueueMessage(Text::plural('PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED', $span), 'notice');
+			$this->app->enqueueMessage(Text::plural('PLG_INSTALLER_N_OVERRIDE_FILE_UPDATED', $num), 'notice');
 			$this->saveOverrides($result);
 		}