Merge pull request #2 from C-Lodder/oldtemp

Remove Hathor and Beez3
wilsonge · Sep 16, 2016 · dabe853 · dabe853
2 parents d6134e7 + 472a886
commit dabe853
Show file tree

Hide file tree

Showing 648 changed files with 9 additions and 47,423 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,7 +28,6 @@ phpdoc-*
 
 # Patch Tester #
 /administrator/components/com_patchtester
-/administrator/templates/hathor/html/com_patchtester
 /components/com_patchtester
 /media/com_patchtester
 

diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -350,8 +350,6 @@ protected function updateManifestCaches()
 			array('plugin', 'menu', 'editors-xtd', 0),
 
 			// Templates
-			array('template', 'beez3', '', 0),
-			array('template', 'hathor', '', 1),
 			array('template', 'protostar', '', 0),
 			array('template', 'isis', '', 1),
 
@@ -1548,6 +1546,8 @@ public function deleteUnexistingFiles()
 			'/media/editors/codemirror/mode/jade',
 			// Joomla __DEPLOY_VERSION__
 			'/libraries/joomla/data',
+			'/templates/beez3',
+			'/administrator/templates/hathor',
 		);
 
 		jimport('joomla.filesystem.file');

diff --git a/administrator/components/com_templates/views/template/view.html.php b/administrator/components/com_templates/views/template/view.html.php
@@ -202,12 +202,6 @@ protected function addToolbar()
 			{
 				JToolbarHelper::custom('template.extractArchive', 'arrow-down', 'arrow-down', 'COM_TEMPLATES_BUTTON_EXTRACT_ARCHIVE', false);
 			}
-
-			// Add a copy template button (Hathor override doesn't need the button)
-			if ($app->getTemplate() != 'hathor')
-			{
-				JToolbarHelper::modal('copyModal', 'icon-copy', 'COM_TEMPLATES_BUTTON_COPY_TEMPLATE');
-			}
 		}
 
 		// Add a Template preview button
@@ -225,8 +219,8 @@ protected function addToolbar()
 			// Add a new file button
 			JToolbarHelper::modal('fileModal', 'icon-file', 'COM_TEMPLATES_BUTTON_FILE');
 
-			// Add a Rename file Button (Hathor override doesn't need the button)
-			if ($app->getTemplate() != 'hathor' && $this->type != 'home')
+			// Add a Rename file Button
+			if ($this->type != 'home')
 			{
 				JToolbarHelper::modal('renameModal', 'icon-refresh', 'COM_TEMPLATES_BUTTON_RENAME_FILE');
 			}

diff --git a/administrator/components/com_users/views/debuggroup/view.html.php b/administrator/components/com_users/views/debuggroup/view.html.php
@@ -65,10 +65,6 @@ public function display($tpl = null)
 		$this->filterForm    = $this->get('FilterForm');
 		$this->activeFilters = $this->get('ActiveFilters');
 
-		// Vars only used in hathor.
-		$this->levels        = UsersHelperDebug::getLevelsOptions();
-		$this->components    = UsersHelperDebug::getComponents();
-
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{

diff --git a/administrator/components/com_users/views/debuguser/view.html.php b/administrator/components/com_users/views/debuguser/view.html.php
@@ -65,10 +65,6 @@ public function display($tpl = null)
 		$this->filterForm    = $this->get('FilterForm');
 		$this->activeFilters = $this->get('ActiveFilters');
 
-		// Vars only used in hathor.
-		$this->levels        = UsersHelperDebug::getLevelsOptions();
-		$this->components    = UsersHelperDebug::getComponents();
-
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{

diff --git a/administrator/language/en-GB/en-GB.tpl_hathor.ini b/administrator/language/en-GB/en-GB.tpl_hathor.ini
diff --git a/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini b/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
@@ -225,8 +225,6 @@
 		<filename>en-GB.plg_user_joomla.sys.ini</filename>
 		<filename>en-GB.plg_user_profile.ini</filename>
 		<filename>en-GB.plg_user_profile.sys.ini</filename>
-		<filename>en-GB.tpl_hathor.ini</filename>
-		<filename>en-GB.tpl_hathor.sys.ini</filename>
 		<filename>en-GB.tpl_isis.ini</filename>
 		<filename>en-GB.tpl_isis.sys.ini</filename>
 		<filename file="meta">en-GB.xml</filename>