Merge pull request #24 from nooku/feature/23-hathor

Remove hathor administrator template
joomlatools · May 25, 2015 · 11ccbbf · 11ccbbf
2 parents b1a58ff + 3909d5a
commit 11ccbbf
Show file tree

Hide file tree

Showing 564 changed files with 6 additions and 31,828 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,5 @@ phpdoc-*
 
 # Patch Tester
 administrator/components/com_patchtester/
-administrator/templates/hathor/html/com_patchtester
 components/com_patchtester/
 
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -206,7 +206,6 @@ protected function updateManifestCaches()
 
 		// Templates
 		$extensions[] = array('template', 'beez3', '', 0);
-		$extensions[] = array('template', 'hathor', '', 1);
 		$extensions[] = array('template', 'protostar', '', 0);
 		$extensions[] = array('template', 'isis', '', 1);
 
@@ -362,9 +361,6 @@ public function deleteUnexistingFiles()
 			'/administrator/includes/router.php',
 			'/administrator/manifests/packages/pkg_joomla.xml',
 			'/administrator/modules/mod_submenu/helper.php',
-			'/administrator/templates/hathor/css/ie6.css',
-			'/administrator/templates/hathor/html/mod_submenu/index.html',
-			'/administrator/templates/hathor/html/mod_submenu/default.php',
 			'/components/com_media/controller.php',
 			'/components/com_media/helpers/index.html',
 			'/components/com_media/helpers/media.php',

diff --git a/administrator/components/com_templates/views/template/view.html.php b/administrator/components/com_templates/views/template/view.html.php
@@ -213,15 +213,6 @@ protected function addToolbar()
 			}
 		}
 
-		// Add a copy template button (Hathor override doesn't need the button)
-		if ($app->getTemplate() != 'hathor')
-		{
-			if ($showButton)
-			{
-				JToolbarHelper::modal('collapseModal', 'icon-copy', 'COM_TEMPLATES_BUTTON_COPY_TEMPLATE');
-			}
-		}
-
 		// Add a Template preview button
 		if ($this->preview->client_id == 0)
 		{
@@ -240,15 +231,6 @@ protected function addToolbar()
 			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')
-		{
-			if ($showButton && $this->type != 'home')
-			{
-				JToolbarHelper::modal('renameModal', 'icon-refresh', 'COM_TEMPLATES_BUTTON_RENAME_FILE');
-			}
-		}
-
 		// Add a Delete file Button
 		if ($showButton && $this->type != 'home')
 		{

diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
@@ -179,8 +179,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>index.html</filename>

diff --git a/administrator/templates/hathor/LICENSE.txt b/administrator/templates/hathor/LICENSE.txt
diff --git a/administrator/templates/hathor/component.php b/administrator/templates/hathor/component.php
diff --git a/administrator/templates/hathor/cpanel.php b/administrator/templates/hathor/cpanel.php
diff --git a/administrator/templates/hathor/css/boldtext.css b/administrator/templates/hathor/css/boldtext.css