Merge pull request #88 from C-Lodder/sampledata

Simplify the sample data options
joomla · Oct 27, 2016 · 8e376d5 · 8e376d5
2 parents f850c5f + b789b92
commit 8e376d5
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 4,975 deletions.
diff --git a/installation/form/field/sample.php b/installation/form/field/sample.php
@@ -8,14 +8,14 @@
 
 defined('JPATH_BASE') or die;
 
-JFormHelper::loadFieldClass('radiobasic');
+JFormHelper::loadFieldClass('radio');
 
 /**
  * Sample data Form Field class.
  *
  * @since  1.6
  */
-class InstallationFormFieldSample extends JFormFieldRadioBasic
+class InstallationFormFieldSample extends JFormFieldRadio
 {
 	/**
 	 * The form field type.
@@ -52,7 +52,7 @@ protected function getOptions()
 
 		// Add option to not install sample data.
 		$options[] = JHtml::_('select.option', '',
-			JHtml::_('tooltip', JText::_('INSTL_SITE_INSTALL_SAMPLE_NONE_DESC'), '', '', JText::_('INSTL_SITE_INSTALL_SAMPLE_NONE'))
+			JHtml::_('tooltip', JText::_('INSTL_SITE_INSTALL_SAMPLE_NONE_DESC'), '', '', JText::_('JNO'))
 		);
 
 		// Build the options list from the list of files.
@@ -62,7 +62,7 @@ protected function getOptions()
 			{
 				$options[] = JHtml::_('select.option', $file, JFactory::getLanguage()->hasKey($key = 'INSTL_' . ($file = JFile::stripExt($file)) . '_SET') ?
 					JHtml::_('tooltip', JText::_('INSTL_' . strtoupper($file = JFile::stripExt($file)) . '_SET_DESC'), '', '',
-						JText::_('INSTL_' . ($file = JFile::stripExt($file)) . '_SET')
+						JText::_('JYES')
 					) : $file
 				);
 			}
@@ -97,6 +97,11 @@ protected function getInput()
 			}
 		}
 
-		return parent::getInput();
+		if (empty($this->layout))
+		{
+			throw new UnexpectedValueException(sprintf('%s has no layout assigned.', $this->name));
+		}
+
+		return $this->getRenderer($this->layout)->render($this->getLayoutData());
 	}
 }
diff --git a/installation/model/forms/summary.xml b/installation/model/forms/summary.xml
@@ -29,7 +29,7 @@
 		<field
 			name="sample_file"
 			type="installation.sample"
-			class="form-control"
+			class="radio btn-group btn-group-reverse"
 			label="INSTL_SITE_INSTALL_SAMPLE_LABEL"
 		/>
 	</fieldset>

diff --git a/installation/sql/mysql/sample_blog.sql b/installation/sql/mysql/sample_blog.sql
diff --git a/installation/sql/mysql/sample_brochure.sql b/installation/sql/mysql/sample_brochure.sql
diff --git a/installation/sql/mysql/sample_data.sql b/installation/sql/mysql/sample_data.sql
diff --git a/installation/sql/mysql/sample_learn.sql b/installation/sql/mysql/sample_learn.sql
diff --git a/installation/sql/postgresql/sample_blog.sql b/installation/sql/postgresql/sample_blog.sql
diff --git a/installation/sql/postgresql/sample_data.sql b/installation/sql/postgresql/sample_data.sql
diff --git a/installation/sql/postgresql/sample_learn.sql b/installation/sql/postgresql/sample_learn.sql
diff --git a/installation/sql/sqlazure/sample_blog.sql b/installation/sql/sqlazure/sample_blog.sql
diff --git a/installation/sql/sqlazure/sample_brochure.sql b/installation/sql/sqlazure/sample_brochure.sql
diff --git a/installation/sql/sqlazure/sample_data.sql b/installation/sql/sqlazure/sample_data.sql
diff --git a/installation/sql/sqlazure/sample_learn.sql b/installation/sql/sqlazure/sample_learn.sql
diff --git a/installation/template/index.php b/installation/template/index.php
@@ -117,7 +117,15 @@ function initElements()
 							{
 								if (input.val() == '')
 								{
-									label.addClass('active btn-primary');
+									// Check for the sample data "No" button
+									if (input.attr('id') == 'jform_sample_file0')
+									{
+										label.addClass('active btn-danger');
+									}
+									else
+									{
+										label.addClass('active btn-primary');
+									}
 								}
 								else if (input.val() == 0)
 								{