Merge pull request #56 from brianteeman/list-radio

Unique strings for radio, list, checkbox

administrator/components/com_fields/models/types/forms/checkboxes.xml

@@ -3,14 +3,14 @@
 	<fields name="fieldparams" label="COM_FIELDS_FIELD_BASIC_LABEL">
 		<fieldset name="fieldparams">
 			<field name="options" type="Repeatable" icon="list"
-				description="COM_FIELDS_FIELD_LIST_MULTIPLE_OPTIONS_DESC"
-				label="COM_FIELDS_FIELD_LIST_MULTIPLE_OPTIONS_LABEL">
+				description="COM_FIELDS_FIELD_CHECKBOX_MULTIPLE_OPTIONS_DESC"
+				label="COM_FIELDS_FIELD_CHECKBOX_MULTIPLE_OPTIONS_LABEL">
 				<fieldset hidden="true" name="list_templates_modal" repeat="true">
 					<field name="key"
-						label="COM_FIELDS_FIELD_LIST_MULTIPLE_OPTIONS_KEY_LABEL"
+						label="COM_FIELDS_FIELD_CHECKBOX_MULTIPLE_OPTIONS_KEY_LABEL"
 						size="30" type="text" />
 					<field name="value"
-						label="COM_FIELDS_FIELD_LIST_MULTIPLE_OPTIONS_VALUE_LABEL"
+						label="COM_FIELDS_FIELD_CHECKBOX_MULTIPLE_OPTIONS_VALUE_LABEL"
 						size="30" type="text" />
 				</fieldset>
 			</field>

administrator/components/com_fields/models/types/forms/list.xml

@@ -2,12 +2,6 @@
 <form>
 	<fields name="fieldparams" label="COM_FIELDS_FIELD_BASIC_LABEL">
 		<fieldset name="fieldparams">
-			<field name="multiple" type="radio" class="btn-group" default="0"
-				label="COM_FIELDS_FIELD_LIST_MULTIPLE_LABEL" description="COM_FIELDS_FIELD_LIST_MULTIPLE_DESC">
-				<option value="1">JYES</option>
-				<option value="0">JNO</option>
-			</field>
-
 			<field name="options" type="Repeatable" icon="list"
 				description="COM_FIELDS_FIELD_LIST_MULTIPLE_OPTIONS_DESC"
 				label="COM_FIELDS_FIELD_LIST_MULTIPLE_OPTIONS_LABEL">
@@ -20,6 +14,11 @@
 						size="30" type="text" />
 				</fieldset>
 			</field>
+			<field name="multiple" type="radio" class="btn-group" default="0"
+				label="COM_FIELDS_FIELD_LIST_MULTIPLE_LABEL" description="COM_FIELDS_FIELD_LIST_MULTIPLE_DESC">
+				<option value="1">JYES</option>
+				<option value="0">JNO</option>
+			</field>
 		</fieldset>
 	</fields>
 </form>

administrator/components/com_fields/models/types/forms/radio.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
-	<field name="class" type="textarea" label="COM_FIELDS_FIELD_CLASS_LABEL"
-		class="input-xxlarge" description="COM_FIELDS_FIELD_CLASS_DESC"
-		default="btn-group" size="40" />
 	<fields name="fieldparams" label="COM_FIELDS_FIELD_BASIC_LABEL">
 		<fieldset name="fieldparams">
 			<field name="options" type="Repeatable" icon="list"
-				description="COM_FIELDS_FIELD_LIST_MULTIPLE_OPTIONS_DESC"
-				label="COM_FIELDS_FIELD_LIST_MULTIPLE_OPTIONS_LABEL">
+				description="COM_FIELDS_FIELD_RADIO_MULTIPLE_OPTIONS_DESC"
+				label="COM_FIELDS_FIELD_RADIO_MULTIPLE_OPTIONS_LABEL">
 				<fieldset hidden="true" name="list_templates_modal" repeat="true">
 					<field name="key"
-						label="COM_FIELDS_FIELD_LIST_MULTIPLE_OPTIONS_KEY_LABEL"
+						label="COM_FIELDS_FIELD_RADIO_MULTIPLE_OPTIONS_KEY_LABEL"
 						size="30" type="text" />
 					<field name="value"
-						label="COM_FIELDS_FIELD_LIST_MULTIPLE_OPTIONS_VALUE_LABEL"
+						label="COM_FIELDS_FIELD_RADIO_MULTIPLE_OPTIONS_VALUE_LABEL"
 						size="30" type="text" />
 				</fieldset>
 			</field>
 		</fieldset>
 	</fields>
+	<field name="class" type="textarea" label="COM_FIELDS_FIELD_CLASS_LABEL"
+		class="input-xxlarge" description="COM_FIELDS_FIELD_CLASS_DESC"
+		default="btn-group" size="40" />
 </form>

administrator/language/en-GB/en-GB.com_fields.ini

@@ -90,6 +90,13 @@ COM_FIELDS_FIELD_TYPE_LABEL="Type"
 COM_FIELDS_FIELD_CALENDAR_FORMAT_DESC="The date format to be used. This is in the format used by PHP to specify date string formats (see below). If no format argument is given, '%Y-%m-%d' is assumed (giving dates like '2008-04-16')."
 COM_FIELDS_FIELD_CALENDAR_FORMAT_LABEL="Format"
 
+COM_FIELDS_FIELD_CHECKBOX_MULTIPLE_DESC="Allow multiple values to be selected."
+COM_FIELDS_FIELD_CHECKBOX_MULTIPLE_LABEL="Multiple"
+COM_FIELDS_FIELD_CHECKBOX_MULTIPLE_OPTIONS_DESC="The options of the list."
+COM_FIELDS_FIELD_CHECKBOX_MULTIPLE_OPTIONS_KEY_LABEL="Key"
+COM_FIELDS_FIELD_CHECKBOX_MULTIPLE_OPTIONS_LABEL="Checkbox Values"
+COM_FIELDS_FIELD_CHECKBOX_MULTIPLE_OPTIONS_VALUE_LABEL="Value"
+
 COM_FIELDS_FIELD_EDITOR_BUTTONS_HIDE_DESC="Hide the buttons in the comma separated list."
 COM_FIELDS_FIELD_EDITOR_BUTTONS_HIDE_LABEL="Hide Buttons"
 COM_FIELDS_FIELD_EDITOR_HEIGHT_DESC="Defines the height (in pixels) of the WYSIWYG editor and defaults to 250px"
@@ -119,7 +126,7 @@ COM_FIELDS_FIELD_LIST_MULTIPLE_DESC="Allow multiple values to be selected."
 COM_FIELDS_FIELD_LIST_MULTIPLE_LABEL="Multiple"
 COM_FIELDS_FIELD_LIST_MULTIPLE_OPTIONS_DESC="The options of the list."
 COM_FIELDS_FIELD_LIST_MULTIPLE_OPTIONS_KEY_LABEL="Key"
-COM_FIELDS_FIELD_LIST_MULTIPLE_OPTIONS_LABEL="Options"
+COM_FIELDS_FIELD_LIST_MULTIPLE_OPTIONS_LABEL="List Values"
 COM_FIELDS_FIELD_LIST_MULTIPLE_OPTIONS_VALUE_LABEL="Value"
 
 COM_FIELDS_FIELD_MEDIA_IMAGE_CLASS_DESC="The class which is added to the image (src tag)."
@@ -129,6 +136,13 @@ COM_FIELDS_FIELD_MEDIA_PREVIEW_INLINE="Inline"
 COM_FIELDS_FIELD_MEDIA_PREVIEW_LABEL="Preview"
 COM_FIELDS_FIELD_MEDIA_PREVIEW_TOOLTIP="Tooltip"
 
+COM_FIELDS_FIELD_RADIO_MULTIPLE_DESC="Allow multiple values to be selected."
+COM_FIELDS_FIELD_RADIO_MULTIPLE_LABEL="Multiple"
+COM_FIELDS_FIELD_RADIO_MULTIPLE_OPTIONS_DESC="The options of the list."
+COM_FIELDS_FIELD_RADIO_MULTIPLE_OPTIONS_KEY_LABEL="Key"
+COM_FIELDS_FIELD_RADIO_MULTIPLE_OPTIONS_LABEL="Radio Values"
+COM_FIELDS_FIELD_RADIO_MULTIPLE_OPTIONS_VALUE_LABEL="Value"
+
 COM_FIELDS_FIELD_SQL_QUERY_DESC="The SQL query which will provide the data for the drop-down list. The query must return two columns; one called 'value' which will hold the values of the list items; the other called 'text' containing the text in the drop-down list."
 COM_FIELDS_FIELD_SQL_QUERY_LABEL="Query"