[imp] Rename the install app JHtml helper. Closes #7017.

joomla · Jun 12, 2015 · e692048 · e692048
1 parent b121b4d
commit e692048
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 12 deletions.
diff --git a/installation/controller/default.php b/installation/controller/default.php
@@ -93,9 +93,6 @@ public function execute()
 			$app->redirect('index.php');
 		}
 
-		// Include the component HTML helpers.
-		JHtml::addIncludePath(JPATH_COMPONENT . '/helper/html');
-
 		// Register the layout paths for the view
 		$paths = new SplPriorityQueue;
 		$paths->insert(JPATH_INSTALLATION . '/view/' . $vName . '/tmpl', 'normal');

diff --git a/installation/helper/html/installation.php → installation/html/helper.php b/installation/helper/html/installation.php → installation/html/helper.php
@@ -11,10 +11,9 @@
 /**
  * HTML utility class for the installation application
  *
- * @package  Joomla.Installation
- * @since    1.6
+ * @since  1.6
  */
-class JHtmlInstallation
+class InstallationHtmlHelper
 {
 	/**
 	 * Method to generate the side bar.

diff --git a/installation/view/database/tmpl/default.php b/installation/view/database/tmpl/default.php
@@ -11,7 +11,7 @@
 
 /* @var InstallationViewDefault $this */
 ?>
-<?php echo JHtml::_('installation.stepbar'); ?>
+<?php echo JHtml::_('InstallationHtml.helper.stepbar'); ?>
 <form action="index.php" method="post" id="adminForm" class="form-validate form-horizontal">
 	<div class="btn-toolbar">
 		<div class="btn-group pull-right">

diff --git a/installation/view/defaultlanguage/tmpl/default.php b/installation/view/defaultlanguage/tmpl/default.php
@@ -9,7 +9,7 @@
 defined('_JEXEC') or die;
 
 ?>
-<?php echo JHtml::_('installation.stepbarlanguages'); ?>
+<?php echo JHtml::_('InstallationHtml.helper.stepbarlanguages'); ?>
 <form action="index.php" method="post" id="adminForm" class="form-validate form-horizontal">
 	<div class="btn-toolbar">
 		<div class="btn-group pull-right">

diff --git a/installation/view/ftp/tmpl/default.php b/installation/view/ftp/tmpl/default.php
@@ -10,7 +10,7 @@
 
 /* @var InstallationViewDefault $this */
 ?>
-<?php echo JHtml::_('installation.stepbar'); ?>
+<?php echo JHtml::_('InstallationHtml.helper.stepbar'); ?>
 <form action="index.php" method="post" id="adminForm" class="form-validate form-horizontal">
 	<div class="btn-toolbar">
 		<div class="btn-group pull-right">

diff --git a/installation/view/languages/tmpl/default.php b/installation/view/languages/tmpl/default.php
@@ -23,7 +23,7 @@ function installLanguages() {
 	}
 </script>
 
-<?php echo JHtml::_('installation.stepbarlanguages'); ?>
+<?php echo JHtml::_('InstallationHtml.helper.stepbarlanguages'); ?>
 <form action="index.php" method="post" id="adminForm" class="form-validate form-horizontal">
 	<div class="btn-toolbar">
 		<div class="btn-group pull-right">

diff --git a/installation/view/site/tmpl/default.php b/installation/view/site/tmpl/default.php
@@ -11,7 +11,7 @@
 
 /* @var InstallationViewDefault $this */
 ?>
-<?php echo JHtml::_('installation.stepbar'); ?>
+<?php echo JHtml::_('InstallationHtml.helper.stepbar'); ?>
 <div class="btn-toolbar">
 	<div class="btn-group pull-right">
 		<a href="#" class="btn btn-primary" onclick="Install.submitform();" rel="next" title="<?php echo JText::_('JNext'); ?>"><span class="icon-arrow-right icon-white"></span> <?php echo JText::_('JNext'); ?></a>

diff --git a/installation/view/summary/tmpl/default.php b/installation/view/summary/tmpl/default.php
@@ -16,7 +16,7 @@
 $useftp = (file_exists($path)) ? !is_writable($path) : !is_writable(JPATH_CONFIGURATION . '/');
 $prev = $useftp ? 'ftp' : 'database';
 ?>
-<?php echo JHtml::_('installation.stepbar'); ?>
+<?php echo JHtml::_('InstallationHtml.helper.stepbar'); ?>
 <form action="index.php" method="post" id="adminForm" class="form-validate form-horizontal">
 	<div class="btn-toolbar">
 		<div class="btn-group pull-right">