From 21756c3e5590eb2194052cf2bffcd313ba179848 Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Fri, 4 Mar 2016 19:26:18 +0200
Subject: [PATCH] Fixed the bug for the image display on install, it was
 missing the component name.

---
 admin/compiler/joomla_3/JControllerLegacyHelp.php      | 4 ++--
 admin/compiler/joomla_3/JControllerLegacyHelp_site.php | 4 ++--
 admin/controllers/help.php                             | 4 ++--
 admin/helpers/compiler/e_Interpretation.php            | 3 +++
 script.php                                             | 4 ++--
 site/controllers/help.php                              | 4 ++--
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/admin/compiler/joomla_3/JControllerLegacyHelp.php b/admin/compiler/joomla_3/JControllerLegacyHelp.php
index f1c1932f9..e529e76ea 100644
--- a/admin/compiler/joomla_3/JControllerLegacyHelp.php
+++ b/admin/compiler/joomla_3/JControllerLegacyHelp.php
@@ -117,10 +117,10 @@ class ###Component###ControllerHelp extends JControllerLegacy
 			$text[] = '<div class="uk-container uk-container-center uk-grid-collapse">';
 			$text[] = '<div class="uk-panel uk-width-1-1 uk-panel-box uk-panel-box-primary">';
 			// build the help text
-			$text[] = '<h3 class="uk-panel-title">'.$document->title."</h3>";
+			$text[] = '<h1 class="uk-panel-title">'.$document->title."</h1>";
 			$text[] = str_replace(array_keys($images),array_values($images),$document->content);
 			// end template
-			$text[] = '</div>';
+			$text[] = '</div><br /><br />';
 			$text[] = '</div>';
 			$text[] = "</body>";
 			$text[] = "</html>";
diff --git a/admin/compiler/joomla_3/JControllerLegacyHelp_site.php b/admin/compiler/joomla_3/JControllerLegacyHelp_site.php
index 6c709416a..c3fa7208b 100644
--- a/admin/compiler/joomla_3/JControllerLegacyHelp_site.php
+++ b/admin/compiler/joomla_3/JControllerLegacyHelp_site.php
@@ -118,10 +118,10 @@ class ###Component###ControllerHelp extends JControllerLegacy
 			$text[] = '<div class="uk-container uk-container-center uk-grid-collapse">';
 			$text[] = '<div class="uk-panel uk-width-1-1 uk-panel-box uk-panel-box-primary">';
 			// build the help text
-			$text[] = '<h3 class="uk-panel-title">'.$document->title."</h3>";
+			$text[] = '<h1 class="uk-panel-title">'.$document->title."</h1>";
 			$text[] = str_replace(array_keys($images),array_values($images),$document->content);
 			// end template
-			$text[] = '</div>';
+			$text[] = '</div><br /><br />';
 			$text[] = '</div>';
 			$text[] = "</body>";
 			$text[] = "</html>";
diff --git a/admin/controllers/help.php b/admin/controllers/help.php
index dfb663688..fa62f1e3f 100644
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@@ -115,10 +115,10 @@ class ComponentbuilderControllerHelp extends JControllerLegacy
 			$text[] = '<div class="uk-container uk-container-center uk-grid-collapse">';
 			$text[] = '<div class="uk-panel uk-width-1-1 uk-panel-box uk-panel-box-primary">';
 			// build the help text
-			$text[] = '<h3 class="uk-panel-title">'.$document->title."</h3>";
+			$text[] = '<h1 class="uk-panel-title">'.$document->title."</h1>";
 			$text[] = str_replace(array_keys($images),array_values($images),$document->content);
 			// end template
-			$text[] = '</div>';
+			$text[] = '</div><br /><br />';
 			$text[] = '</div>';
 			$text[] = "</body>";
 			$text[] = "</html>";
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index a6c7979e3..e09b1a31c 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -3624,6 +3624,9 @@ class Interpretation extends Fields
 	{
 		// reset script
 		$script = $this->setComponentToContentTypes('install');
+		
+		// set the component name
+		$component = $this->fileContentStatic['###component###'];
 
 		if (isset($this->paramsBuilder) && ComponentbuilderHelper::checkString($this->paramsBuilder))
 		{
diff --git a/script.php b/script.php
index 3d1d20543..7c7c4ef01 100644
--- a/script.php
+++ b/script.php
@@ -1417,14 +1417,14 @@ class com_componentbuilderInstallerScript
 
 			// Condition.
 			$conditions = array(
-				$db->quoteName('element') . ' = ' . $db->quote('com_')
+				$db->quoteName('element') . ' = ' . $db->quote('com_componentbuilder')
 			);
 
 			$query->update($db->quoteName('#__extensions'))->set($fields)->where($conditions);
 			$db->setQuery($query);
 			$allDone = $db->execute();
 			echo '<a target="_blank" href="https://www.vdm.io/joomla-component-builder" title="Component Builder">
-				<img src="components/com_/assets/images/component-300.png"/>
+				<img src="components/com_componentbuilder/assets/images/component-300.png"/>
 				</a>';
 		}
 		// do any updates needed
diff --git a/site/controllers/help.php b/site/controllers/help.php
index 8d193322f..4d8d65a22 100644
--- a/site/controllers/help.php
+++ b/site/controllers/help.php
@@ -116,10 +116,10 @@ class ComponentbuilderControllerHelp extends JControllerLegacy
 			$text[] = '<div class="uk-container uk-container-center uk-grid-collapse">';
 			$text[] = '<div class="uk-panel uk-width-1-1 uk-panel-box uk-panel-box-primary">';
 			// build the help text
-			$text[] = '<h3 class="uk-panel-title">'.$document->title."</h3>";
+			$text[] = '<h1 class="uk-panel-title">'.$document->title."</h1>";
 			$text[] = str_replace(array_keys($images),array_values($images),$document->content);
 			// end template
-			$text[] = '</div>';
+			$text[] = '</div><br /><br />';
 			$text[] = '</div>';
 			$text[] = "</body>";
 			$text[] = "</html>";