From 3502c8190b16cba0efdb96431698d25d0ff9f022 Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Wed, 11 Nov 2020 07:20:29 +0100
Subject: [PATCH 1/5] [4.0] Articles List Layout vote/ratings fields xml are
 not a switcher

---
 components/com_content/tmpl/category/default.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/com_content/tmpl/category/default.xml b/components/com_content/tmpl/category/default.xml
index d2ae35ee89bdb..918593acf1cde 100644
--- a/components/com_content/tmpl/category/default.xml
+++ b/components/com_content/tmpl/category/default.xml
@@ -263,8 +263,8 @@
 				name="list_show_votes"
 				type="list"
 				label="JGLOBAL_LIST_VOTES_LABEL"
-				layout="joomla.form.field.radio.switcher"
 				useglobal="true"
+				class="custom-select-color-state"
 				validate="options"
 				>
 				<option value="0" requires="vote">JHIDE</option>
@@ -275,8 +275,8 @@
 				name="list_show_ratings"
 				type="list"
 				label="JGLOBAL_LIST_RATINGS_LABEL"
-				layout="joomla.form.field.radio.switcher"
 				useglobal="true"
+				class="custom-select-color-state"
 				validate="options"
 				>
 				<option value="0" requires="vote">JHIDE</option>

From 26f79f342afafed47ba3efc97adfb5899a9bff93 Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Thu, 12 Nov 2020 08:57:55 +0100
Subject: [PATCH 2/5] do not display vote fields when plugin is disabled

---
 .../com_content/src/Field/VotelistField.php   | 55 +++++++++++++++++++
 .../com_content/tmpl/category/default.xml     |  8 ++-
 2 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 administrator/components/com_content/src/Field/VotelistField.php

diff --git a/administrator/components/com_content/src/Field/VotelistField.php b/administrator/components/com_content/src/Field/VotelistField.php
new file mode 100644
index 0000000000000..943e80c3b09d7
--- /dev/null
+++ b/administrator/components/com_content/src/Field/VotelistField.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_content
+ *
+ * @copyright   Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Content\Administrator\Field;
+
+\defined('_JEXEC') or die;
+
+use Joomla\CMS\Form\Field\ListField;
+use Joomla\CMS\Plugin\PluginHelper;
+
+/**
+ * Voteradio Field class.
+ *
+ * @since  3.8.0
+ */
+class VotelistField extends ListField
+{
+	/**
+	 * The form field type.
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $type = 'Votelist';
+
+	/**
+	 * Method to attach a form object to the field.
+	 *
+	 * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+	 * @param   mixed              $value    The form field value to validate.
+	 * @param   string             $group    The field name group control value. This acts as as an array container for the field.
+	 *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+	 *                                       full field name would end up being "bar[foo]".
+	 *
+	 * @return  boolean  True on success.
+	 *
+	 * @since  4.0.0
+	 */
+	public function setup(\SimpleXMLElement $element, $value, $group = null)
+	{
+		// Requires vote plugin enabled
+		if (!PluginHelper::isEnabled('content', 'vote'))
+		{
+			return false;
+		}
+
+		return parent::setup($element, $value, $group);
+	}
+}
diff --git a/components/com_content/tmpl/category/default.xml b/components/com_content/tmpl/category/default.xml
index 918593acf1cde..5ac7613a331eb 100644
--- a/components/com_content/tmpl/category/default.xml
+++ b/components/com_content/tmpl/category/default.xml
@@ -173,7 +173,9 @@
 
 		</fieldset>
 
-		<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
+		<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS"
+			addfieldprefix="Joomla\Component\Content\Administrator\Field"
+		>
 			<field
 				name="show_pagination_limit"
 				type="list"
@@ -261,7 +263,7 @@
 
 			<field
 				name="list_show_votes"
-				type="list"
+				type="votelist"
 				label="JGLOBAL_LIST_VOTES_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"
@@ -273,7 +275,7 @@
 
 			<field
 				name="list_show_ratings"
-				type="list"
+				type="votelist"
 				label="JGLOBAL_LIST_RATINGS_LABEL"
 				useglobal="true"
 				class="custom-select-color-state"

From 24d358b0ca279ef95f73f57ac63ecaff4426b297 Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Thu, 12 Nov 2020 09:14:37 +0100
Subject: [PATCH 3/5] use DEPLOY_VERSION

---
 .../components/com_content/src/Field/VotelistField.php        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_content/src/Field/VotelistField.php b/administrator/components/com_content/src/Field/VotelistField.php
index 943e80c3b09d7..a1cec5066f128 100644
--- a/administrator/components/com_content/src/Field/VotelistField.php
+++ b/administrator/components/com_content/src/Field/VotelistField.php
@@ -17,7 +17,7 @@
 /**
  * Voteradio Field class.
  *
- * @since  3.8.0
+ * @since  __DEPLOY_VERSION__
  */
 class VotelistField extends ListField
 {
@@ -40,7 +40,7 @@ class VotelistField extends ListField
 	 *
 	 * @return  boolean  True on success.
 	 *
-	 * @since  4.0.0
+	 * @since  __DEPLOY_VERSION__
 	 */
 	public function setup(\SimpleXMLElement $element, $value, $group = null)
 	{

From 43062f788eaab7fccfee59c6067272625a0c9757 Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Thu, 12 Nov 2020 17:33:38 +0100
Subject: [PATCH 4/5] Votelist Field class.

---
 .../components/com_content/src/Field/VotelistField.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_content/src/Field/VotelistField.php b/administrator/components/com_content/src/Field/VotelistField.php
index a1cec5066f128..63333e5d4cb1f 100644
--- a/administrator/components/com_content/src/Field/VotelistField.php
+++ b/administrator/components/com_content/src/Field/VotelistField.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Plugin\PluginHelper;
 
 /**
- * Voteradio Field class.
+ * Votelist Field class.
  *
  * @since  __DEPLOY_VERSION__
  */

From ab8b0090e89dad5eed3fe806e0b9be61dd9eae48 Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Thu, 12 Nov 2020 17:43:07 +0100
Subject: [PATCH 5/5] Preventing display of voting field in Articles tab global
 Options when vote plugin is disabled

---
 administrator/components/com_content/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml
index 2d5c5090042cd..eeff1565ebd14 100644
--- a/administrator/components/com_content/config.xml
+++ b/administrator/components/com_content/config.xml
@@ -222,7 +222,7 @@
 
 		<field
 			name="show_vote"
-			type="radio"
+			type="voteradio"
 			label="JGLOBAL_SHOW_VOTE_LABEL"
 			layout="joomla.form.field.radio.switcher"
 			default="0"