#40 - Remove beez3 site template

joomlatools · May 25, 2015 · 88cab9e · 88cab9e
1 parent 8dcf8ea
commit 88cab9e
Show file tree

Hide file tree

Showing 159 changed files with 3 additions and 9,568 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -187,7 +187,6 @@ protected function updateManifestCaches()
 		$extensions[] = array('plugin', 'totp', 'twofactorauth', 0);
 
 		// Templates
-		$extensions[] = array('template', 'beez3', '', 0);
 		$extensions[] = array('template', 'protostar', '', 0);
 		$extensions[] = array('template', 'isis', '', 1);
 

diff --git a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
@@ -21,7 +21,7 @@ PLG_TINY_FIELD_CONTEXTMENU_DESC="Turn on/off Context menu"
 PLG_TINY_FIELD_CONTEXTMENU_LABEL="Context menu"
 PLG_TINY_FIELD_CSS_DESC="By default the Plugin looks for an editor.css file. If it cannot find one in the default template css folder, it loads the editor.css file from the system template."
 PLG_TINY_FIELD_CSS_LABEL="Template CSS classes"
-PLG_TINY_FIELD_CUSTOM_CSS_DESC="Optional CSS file that will override the standard editor.css file. Enter a file name to point to a file in the CSS folder of the default template (for example, templates/beez3/css/). Or enter a full URL path to the custom CSS file. If you enter a value in this field, this file will be used instead of the editor.css file."
+PLG_TINY_FIELD_CUSTOM_CSS_DESC="Optional CSS file that will override the standard editor.css file. Enter a file name to point to a file in the CSS folder of the default template. Or enter a full URL path to the custom CSS file. If you enter a value in this field, this file will be used instead of the editor.css file."
 PLG_TINY_FIELD_CUSTOM_CSS_LABEL="Custom CSS classes"
 PLG_TINY_FIELD_CUSTOMBUTTON_DESC="Add custom button(s)"
 PLG_TINY_FIELD_CUSTOMBUTTON_LABEL="Custom button"

diff --git a/build/generatecss.php b/build/generatecss.php
@@ -46,7 +46,6 @@ public function doExecute()
 			JPATH_ADMINISTRATOR . '/templates/isis/less/template.less' => JPATH_ADMINISTRATOR . '/templates/isis/css/template.css',
 			JPATH_ADMINISTRATOR . '/templates/isis/less/template-rtl.less' => JPATH_ADMINISTRATOR . '/templates/isis/css/template-rtl.css',
 			JPATH_SITE . '/templates/protostar/less/template.less' => JPATH_SITE . '/templates/protostar/css/template.css',
-			JPATH_SITE . '/templates/beez3/css/turq.less' => JPATH_SITE . '/templates/beez3/css/turq.css',
 			// Below files are to recompile the default Bootstrap CSS files
 			__DIR__ . '/less/bootstrap-extended.less' => JPATH_SITE . '/media/jui/css/bootstrap-extended.css',
 			__DIR__ . '/less/bootstrap-rtl.less' => JPATH_SITE . '/media/jui/css/bootstrap-rtl.css'

diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
@@ -412,7 +412,6 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
 (449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (451, 'plg_search_tags', 'plugin', 'tags', 'search', 0, 1, 1, 0, '', '{"search_limit":"50","show_tagged_items":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(503, 'beez3', 'template', 'beez3', '', 0, 1, 1, 0, '', '{"wrapperSmall":"53","wrapperLarge":"72","sitetitle":"","sitedescription":"","navposition":"center","templatecolor":"nature"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (506, 'protostar', 'template', 'protostar', '', 0, 1, 1, 0, '', '{"templateColor":"","logoFile":"","googleFont":"1","googleFontName":"Open+Sans","fluidContainer":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (507, 'isis', 'template', 'isis', '', 1, 1, 1, 0, '', '{"templateColor":"","logoFile":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (600, 'English (United Kingdom)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
@@ -1285,7 +1284,6 @@ CREATE TABLE IF NOT EXISTS `#__template_styles` (
 --
 
 INSERT INTO `#__template_styles` (`id`, `template`, `client_id`, `home`, `title`, `params`) VALUES
-(4, 'beez3', 0, '0', 'Beez3 - Default', '{"wrapperSmall":"53","wrapperLarge":"72","logo":"images\\/joomla_black.gif","sitetitle":"Joomla!","sitedescription":"Open Source Content Management","navposition":"left","templatecolor":"personal","html5":"0"}'),
 (7, 'protostar', 0, '1', 'protostar - Default', '{"templateColor":"","logoFile":"","googleFont":"1","googleFontName":"Open+Sans","fluidContainer":"0"}'),
 (8, 'isis', 1, '1', 'isis - Default', '{"templateColor":"","logoFile":""}');
 

diff --git a/language/en-GB/en-GB.tpl_beez3.ini b/language/en-GB/en-GB.tpl_beez3.ini
diff --git a/language/en-GB/en-GB.tpl_beez3.sys.ini b/language/en-GB/en-GB.tpl_beez3.sys.ini
diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
@@ -75,8 +75,6 @@
 		<filename>en-GB.mod_users_latest.sys.ini</filename>
 		<filename>en-GB.mod_whosonline.ini</filename>
 		<filename>en-GB.mod_whosonline.sys.ini</filename>
-		<filename>en-GB.tpl_beez3.ini</filename>
-		<filename>en-GB.tpl_beez3.sys.ini</filename>
 		<filename>en-GB.tpl_protostar.ini</filename>
 		<filename>en-GB.tpl_protostar.sys.ini</filename>
 		<filename>index.html</filename>

diff --git a/libraries/cms/application/site.php b/libraries/cms/application/site.php
@@ -524,15 +524,6 @@ public function getTemplate($params = false)
 			// Try to find data for 'beez3' template
 			$original_tmpl = $template->template;
 
-			foreach ($templates as $tmpl)
-			{
-				if ($tmpl->template == 'beez3')
-				{
-					$template = $tmpl;
-					break;
-				}
-			}
-
 			// Check, the data were found and if template really exists
 			if (!file_exists(JPATH_THEMES . '/' . $template->template . '/index.php'))
 			{

diff --git a/templates/beez3/component.php b/templates/beez3/component.php