From a953c793fb6f5f694edc778c6ff6079d8c6aeeea Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Wed, 3 Apr 2019 13:04:05 +0100
Subject: [PATCH] none config

---
 .../components/com_content/forms/article.xml  |   1 +
 layouts/joomla/form/field/radio/switcher.php  | 185 +++++++++---------
 libraries/src/Form/FormField.php              |   2 +-
 3 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/administrator/components/com_content/forms/article.xml b/administrator/components/com_content/forms/article.xml
index 0684232883feb..fef4a86b2d6df 100644
--- a/administrator/components/com_content/forms/article.xml
+++ b/administrator/components/com_content/forms/article.xml
@@ -224,6 +224,7 @@
 			type="radio"
 			label="JFEATURED"
 			class="switcher"
+			required="true"
 			default="0"
 			>
 			<option value="0">JNO</option>
diff --git a/layouts/joomla/form/field/radio/switcher.php b/layouts/joomla/form/field/radio/switcher.php
index 05f73c9219c4c..b630f7fe0bfbe 100644
--- a/layouts/joomla/form/field/radio/switcher.php
+++ b/layouts/joomla/form/field/radio/switcher.php
@@ -9,9 +9,9 @@
 
 defined('JPATH_BASE') or die;
 
-use Joomla\CMS\Language\Text;
+use Joomla\CMS\HTML\HTMLHelper;
 
-extract($displayData);
+extract($displayData, null);
 
 /**
  * Layout variables
@@ -55,31 +55,51 @@
  *     %3 - value
  *     %4 = any other attributes
  */
-$format     = '<input type="radio" id="%1$s" name="%2$s" value="%3$s" %4$s>';
-$alt        = preg_replace('/[^a-zA-Z0-9_\-]/', '_', $name);
+$input    = '<input type="radio" id="%1$s" name="%2$s" value="%3$s" %4$s>';
+$alt      = preg_replace('/[^a-zA-Z0-9_\-]/', '_', $name);
 
-?>
-<style>
+// HTMLHelper::_('stylesheet', 'system/fields/joomla-field-switcher.css', ['version' => 'auto', 'relative' => true]);
+
+
+
+// Set the type of switcher
+$type = '';
+
+if ($pos = strpos($class, 'switcher-'))
+{
+	$type = 'type="' . strtok(substr($class, $pos + 9), ' ') . '"';
+}
+
+// Add the attributes of the fieldset in an array
+$attribs = [
+	'id="' . $id . '"',
+	$type,
+	'off-text="' . $options[0]->text . '"',
+	'on-text="' . $options[1]->text . '"',
+];
 
-fieldset {
-	border:none;
+if (!empty($disabled))
+{
+	$attribs[] = 'disabled';
 }
-legend {
-		float: left;
-    width: 220px;
+
+if (!empty($onclick))
+{
+	$attribs[] = 'onclick="' . $onclick . '()"';
 }
 
-/* imported */
-*,
-*:before,
-*:after {
-  box-sizing: border-box;
+if (!empty($onchange))
+{
+	$attribs[] = 'onchange="' . $onchange . '()"';
 }
 
+?>
+<style>
+
 .switcher {
-  margin: 4rem auto;
-  width: 24rem;
   position: relative;
+  width: 18rem;
+  height: 3rem;
 }
 .switcher input {
   position: absolute;
@@ -87,101 +107,80 @@
   z-index: 2;
   opacity: 0;
   cursor: pointer;
+  height: 3rem;
+  width: 6rem;
+  margin: 0;
 }
 .switcher input:checked {
   z-index: 1;
 }
-
+.switcher input:checked + label {
+  opacity: 1;
+}
 .switcher input:not(:checked) + label {
-  visibility:hidden;
+  opacity: 0;
+}
+.switcher label {
+  line-height: 3rem;
+  display: inline-block;
+  width: 6rem;
+  height: 100%;
+  margin-left: 6.5em;
+  text-align: left;
+  position: absolute;
+  transition: opacity 0.25s ease;
 }
 .switcher .toggle-outside {
   height: 100%;
   padding: 0.25rem;
   overflow: hidden;
   transition: 0.25s ease all;
-}
-.switcher .toggle-inside {
-  background: #4a4a4a;
+  background: green;
   position: absolute;
-  transition: 0.25s ease all;
-}
-.switcher--horizontal {
-  width: 18rem;
-  height: 3rem;
-  margin: 0 auto;
-  font-size: 0;
-  margin-bottom: 1rem;
-
-}
-.switcher--horizontal input {
-  height: 3rem;
   width: 6rem;
-  left: 6rem;
-  margin: 0;
-}
-.switcher--horizontal label {
-  font-size: 1.5rem;
-  line-height: 3rem;
-  height: 100%;
-  text-align: left;
-	float:right;
-}
+  box-sizing: border-box;
 
-.switcher--horizontal .toggle-outside {
-  background: #fff;
-  position: absolute;
-  width: 6rem;
-  left: 6rem;
-	border:solid 1px;
 }
-.switcher--horizontal .toggle-inside {
+.switcher .toggle-inside {
   height: 2.5rem;
-  width: 2.5rem;
-	background: #000;
+  width: 2.5rem;  
+  background: white;
+  position: absolute;
+  transition: 0.25s ease all;
 }
-.switcher--horizontal input:checked ~ .toggle-outside .toggle-inside {
+.switcher input:checked ~ .toggle-outside .toggle-inside {
   left: 0.25rem;
 }
-.switcher--horizontal input ~ input:checked ~ .toggle-outside .toggle-inside {
+.switcher input ~ input:checked ~ .toggle-outside .toggle-inside {
   left: 3.25rem;
 }
+.switcher__legend {
+ margin-bottom: 1rem;
+ font-size: 1rem;
+ font-weight: 400;
+}
 
 </style>
-<fieldset id="<?php echo $id; ?>" class="<?php echo trim($class . ' radio'); ?>"
-	<?php echo $disabled ? 'disabled' : ''; ?>
-	<?php echo $required ? 'required' : ''; ?>
-	<?php echo $autofocus ? 'autofocus' : ''; ?>>
-<legend><?php echo htmlspecialchars($label, ENT_COMPAT, 'UTF-8'); ?></legend>
-<div class="switcher switcher--horizontal">
-	<?php if (!empty($options)) : ?>
-		<?php foreach ($options as $i => $option) : ?>
-			<?php
-				// Initialize some option attributes.
-				$checked     = ((string) $option->value === $value) ? 'checked="checked"' : '';
-				$optionClass = !empty($option->class) ? 'class="' . $option->class . '"' : '';
-				$disabled    = !empty($option->disable) || ($disabled && !$checked) ? 'disabled' : '';
-
-				// Initialize some JavaScript option attributes.
-				$onclick    = !empty($option->onclick) ? 'onclick="' . $option->onclick . '"' : '';
-				$onchange   = !empty($option->onchange) ? 'onchange="' . $option->onchange . '"' : '';
-				$oid        = $id . $i;
-				$ovalue     = htmlspecialchars($option->value, ENT_COMPAT, 'UTF-8');
-				$attributes = array_filter(array($checked, $optionClass, $disabled, $onchange, $onclick));
-			?>
-			<?php if ($required) : ?>
-				<?php $attributes[] = 'required'; ?>
-			<?php endif; ?>
-			<div class="radio m-b-0">
-				<?php echo sprintf($format, $oid, $name, $ovalue, implode(' ', $attributes)); ?>
-				<label for="<?php echo $oid; ?>" <?php echo $optionClass; ?>>
-					<?php echo Text::alt($option->text, $alt); ?>
-				</label>
-			</div>
-		<?php endforeach; ?>
-	<?php endif; ?>
-	<span class="toggle-outside">
-		<span class="toggle-inside"></span>
-	</span>
-</div>	
-</fieldset>
\ No newline at end of file
+<fieldset>
+  <legend class="switcher__legend">
+    <?php echo htmlspecialchars($label, ENT_COMPAT, 'UTF-8'); ?>
+  </legend>
+  <div class="switcher" role="switch">
+  <?php foreach ($options as $i => $option) : ?>
+    <?php
+    // Initialize some option attributes.
+    $checked = ((string) $option->value == $value) ? 'checked="checked"' : '';
+    $active  = ((string) $option->value == $value) ? 'class="active"' : '';
+
+    // Initialize some option attributes.
+    $oid        = $id . $i;
+    $ovalue     = htmlspecialchars($option->value, ENT_COMPAT, 'UTF-8');
+    $attributes = array_filter(array($checked, $active, null));
+    $text       = $options[$i]->text;
+    ?>
+    <?php echo sprintf($input, $oid, $name, $ovalue, implode(' ', $attributes)); ?>
+    <?php echo '<label for="' . $oid . '">' . $text . '</label>'; ?>
+	<?php endforeach; ?>
+  <span class="toggle-outside"><span class="toggle-inside"></span></span>
+  </div>
+</fieldset>
diff --git a/libraries/src/Form/FormField.php b/libraries/src/Form/FormField.php
index 4ce7d5b10ce52..c7dd92429f9cd 100644
--- a/libraries/src/Form/FormField.php
+++ b/libraries/src/Form/FormField.php
@@ -948,7 +948,7 @@ public function renderField($options = array())
 
 		$options['rel'] = '';
 
-		if (empty($options['hiddenLabel']) && $this->getAttribute('hiddenLabel'))
+		if (empty($options['hiddenLabel']) && $this->getAttribute('hiddenLabel') || $this->class === 'switcher')
 		{
 			$options['hiddenLabel'] = true;
 		}