From 8dba541de324672866ceaa29bc029d0d5d168253 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 10 Jan 2019 11:13:58 +0000
Subject: [PATCH 1/2] Custom Fields - display units

It is very common to need to display a unit of measurement with a field. Currently there is no way to do this without creating custom layouts for every field and every unit when needed.

This PR adds a new param to every custom field "Suffix" which allows you to add a unit of measurement (or any other text) to be rendered after the value of the field.

The new field is disabled by default so three is no b/c issue

### To test
Apply the pr and then create a new custom field and you will see the new Suffix param in the render options.

## Example usage
### Before

### After
---
 .../com_fields/models/forms/field.xml         | 22 +++++++++++++++++++
 .../language/en-GB/en-GB.com_fields.ini       |  4 ++++
 .../com_fields/layouts/field/render.php       |  6 +++++
 3 files changed, 32 insertions(+)

diff --git a/administrator/components/com_fields/models/forms/field.xml b/administrator/components/com_fields/models/forms/field.xml
index 5de6ea4522f98..9567abf779485 100644
--- a/administrator/components/com_fields/models/forms/field.xml
+++ b/administrator/components/com_fields/models/forms/field.xml
@@ -307,6 +307,28 @@
 				showon="showlabel:1"
 			/>
 
+			<field
+				name="showsuffix"
+				type="radio"
+				label="COM_FIELDS_FIELD_SHOWSUFFIX_LABEL"
+				description="COM_FIELDS_FIELD_SHOWSUFFIX_DESC"
+				class="btn-group btn-group-yesno"
+				default="0"
+				>
+				<option value="1">JSHOW</option>
+				<option value="0">JHIDE</option>
+			</field>
+
+			<field
+				name="suffix"
+				type="text"
+				label="COM_FIELDS_FIELD_SUFFIX_LABEL"
+				description="COM_FIELDS_FIELD_SUFFIX_DESC"
+				class="input-xxlarge"
+				size="40"
+				showon="showsuffix:1"
+			/>
+
 			<field
 				name="display"
 				type="list"
diff --git a/administrator/language/en-GB/en-GB.com_fields.ini b/administrator/language/en-GB/en-GB.com_fields.ini
index 0ccf91e802336..f1e424e2d2e20 100644
--- a/administrator/language/en-GB/en-GB.com_fields.ini
+++ b/administrator/language/en-GB/en-GB.com_fields.ini
@@ -50,11 +50,15 @@ COM_FIELDS_FIELD_RENDER_CLASS_DESC="The class attributes of the field when the f
 COM_FIELDS_FIELD_RENDER_CLASS_LABEL="Render Class"
 COM_FIELDS_FIELD_REQUIRED_DESC="Is this a mandatory field?"
 COM_FIELDS_FIELD_REQUIRED_LABEL="Required"
+COM_FIELDS_FIELD_SHOWSUFFIX_DESC="Show or hide the suffix when the field renders."
+COM_FIELDS_FIELD_SHOWSUFFIX_LABEL="Show Suffix"
 COM_FIELDS_FIELD_SHOW_ON_ADMIN="Administrator"
 COM_FIELDS_FIELD_SHOW_ON_BOTH="Both"
 COM_FIELDS_FIELD_SHOW_ON_DESC="On which part of the site should the field be shown?"
 COM_FIELDS_FIELD_SHOW_ON_LABEL="Show On"
 COM_FIELDS_FIELD_SHOW_ON_SITE="Site"
+COM_FIELDS_FIELD_SUFFIX_DESC="Suffix to be displayed after the field value."
+COM_FIELDS_FIELD_SUFFIX_LABEL="Suffix"
 COM_FIELDS_FIELD_TYPE_DESC="The type of the field."
 COM_FIELDS_FIELD_TYPE_LABEL="Type"
 COM_FIELDS_FIELD_USE_GLOBAL="Use settings from Plugin"
diff --git a/components/com_fields/layouts/field/render.php b/components/com_fields/layouts/field/render.php
index 11bf5b4de422d..350bfc2538d6e 100644
--- a/components/com_fields/layouts/field/render.php
+++ b/components/com_fields/layouts/field/render.php
@@ -18,6 +18,9 @@
 $value = $field->value;
 $showLabel = $field->params->get('showlabel');
 $labelClass = $field->params->get('label_render_class');
+$showSuffix = $field->params->get('showsuffix');
+$suffix = $field->params->get('suffix');
+
 
 if ($value == '')
 {
@@ -29,3 +32,6 @@
 	<span class="field-label <?php echo $labelClass; ?>"><?php echo htmlentities($label, ENT_QUOTES | ENT_IGNORE, 'UTF-8'); ?>: </span>
 <?php endif; ?>
 <span class="field-value"><?php echo $value; ?></span>
+<?php if ($showSuffix == 1) : ?>
+	<span class="field-suffix"><?php echo htmlentities($suffix, ENT_QUOTES | ENT_IGNORE, 'UTF-8'); ?></span>
+<?php endif; ?>

From 0973b87f3a6b49945070aee77a981a18a693ea6f Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Fri, 11 Jan 2019 13:18:26 +0000
Subject: [PATCH 2/2] plurals

---
 components/com_fields/layouts/field/render.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/com_fields/layouts/field/render.php b/components/com_fields/layouts/field/render.php
index 350bfc2538d6e..a8c70ed68a0e7 100644
--- a/components/com_fields/layouts/field/render.php
+++ b/components/com_fields/layouts/field/render.php
@@ -19,7 +19,7 @@
 $showLabel = $field->params->get('showlabel');
 $labelClass = $field->params->get('label_render_class');
 $showSuffix = $field->params->get('showsuffix');
-$suffix = $field->params->get('suffix');
+$suffix = JText::plural($field->params->get('suffix'), $value);
 
 
 if ($value == '')