Renamed keys from options to values

joomla · Apr 5, 2016 · d25b627 · d25b627
2 parents 085caa5 + 7eb0b39
commit d25b627
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 32 deletions.
diff --git a/administrator/components/com_fields/models/types/forms/checkboxes.xml b/administrator/components/com_fields/models/types/forms/checkboxes.xml
@@ -2,15 +2,15 @@
 <form>
 	<fields name="fieldparams" label="COM_FIELDS_FIELD_BASIC_LABEL">
 		<fieldset name="fieldparams">
-			<field name="options" type="Repeatable" icon="list" required="true"
-				description="COM_FIELDS_FIELD_LIST_MULTIPLE_VALUES_DESC"
-				label="COM_FIELDS_FIELD_LIST_MULTIPLE_VALUES_LABEL">
+			<field name="options" type="Repeatable" icon="list"
+				description="COM_FIELDS_FIELD_CHECKBOX_MULTIPLE_VALUES_DESC"
+				label="COM_FIELDS_FIELD_CHECKBOX_MULTIPLE_VALUES_LABEL">
 				<fieldset hidden="true" name="list_templates_modal" repeat="true">
 					<field name="key"
-						label="COM_FIELDS_FIELD_LIST_MULTIPLE_VALUES_KEY_LABEL"
+						label="COM_FIELDS_FIELD_CHECKBOX_MULTIPLE_VALUES_KEY_LABEL"
 						size="30" type="text" />
 					<field name="value"
-						label="COM_FIELDS_FIELD_LIST_MULTIPLE_VALUES_VALUE_LABEL"
+						label="COM_FIELDS_FIELD_CHECKBOX_MULTIPLE_VALUES_VALUE_LABEL"
 						size="30" type="text" />
 				</fieldset>
 			</field>

diff --git a/administrator/components/com_fields/models/types/forms/gallery.xml b/administrator/components/com_fields/models/types/forms/gallery.xml
@@ -2,6 +2,10 @@
 <form>
 	<fields name="fieldparams" label="COM_FIELDS_FIELD_BASIC_LABEL">
 		<fieldset name="fieldparams">
+			<field name="directory" type="text" default="images" class="input-xxlarge"
+				required="true"
+				label="COM_FIELDS_FIELD_IMAGELIST_DIRECTORY_LABEL"
+				description="COM_FIELDS_FIELD_IMAGELIST_DIRECTORY_DESC" />
 			<field name="thumbnail_width" type="text" default="64" class=""
 				label="COM_FIELDS_FIELD_GALLERY_THUMBNAIL_WIDTH_LABEL"
 				description="COM_FIELDS_FIELD_GALLERY_THUMBNAIL_WIDTH_DESC"
@@ -20,9 +24,6 @@
 				<option value="1">JYES</option>
 				<option value="0">JNO</option>
 			</field>
-			<field name="directory" type="text" default="images" class="input-xxlarge"
-				label="COM_FIELDS_FIELD_IMAGELIST_DIRECTORY_LABEL"
-				description="COM_FIELDS_FIELD_IMAGELIST_DIRECTORY_DESC" />
 		</fieldset>
 	</fields>
 </form>
diff --git a/administrator/components/com_fields/models/types/forms/imagelist.xml b/administrator/components/com_fields/models/types/forms/imagelist.xml
@@ -2,14 +2,15 @@
 <form>
 	<fields name="fieldparams" label="COM_FIELDS_FIELD_BASIC_LABEL">
 		<fieldset name="fieldparams">
+			<field name="directory" type="text" default="images" class="input-xxlarge"
+				required="true"
+				label="COM_FIELDS_FIELD_IMAGELIST_DIRECTORY_LABEL"
+				description="COM_FIELDS_FIELD_IMAGELIST_DIRECTORY_DESC" />
 			<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="directory" type="text" default="images" class="input-xxlarge"
-				label="COM_FIELDS_FIELD_IMAGELIST_DIRECTORY_LABEL"
-				description="COM_FIELDS_FIELD_IMAGELIST_DIRECTORY_DESC" />
 			<field name="image_class" type="textarea"
 				label="COM_FIELDS_FIELD_MEDIA_IMAGE_CLASS_LABEL" description="COM_FIELDS_FIELD_MEDIA_IMAGE_CLASS_DESC"
 				class="input-xxlarge" size="40" />

diff --git a/administrator/components/com_fields/models/types/forms/list.xml b/administrator/components/com_fields/models/types/forms/list.xml
@@ -2,13 +2,7 @@
 <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" required="true"
+			<field name="options" type="Repeatable" icon="list"
 				description="COM_FIELDS_FIELD_LIST_MULTIPLE_VALUES_DESC"
 				label="COM_FIELDS_FIELD_LIST_MULTIPLE_VALUES_LABEL">
 				<fieldset hidden="true" name="list_templates_modal" repeat="true">
@@ -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>
diff --git a/administrator/components/com_fields/models/types/forms/media.xml b/administrator/components/com_fields/models/types/forms/media.xml
@@ -3,6 +3,7 @@
 	<fields name="fieldparams" label="COM_FIELDS_FIELD_BASIC_LABEL">
 		<fieldset name="fieldparams">
 			<field name="directory" type="text" default="" class="input-xxlarge"
+				required="true"
 				label="COM_FIELDS_FIELD_IMAGELIST_DIRECTORY_LABEL"
 				description="COM_FIELDS_FIELD_IMAGELIST_DIRECTORY_DESC" />
 			<field name="preview" type="list" class="btn-group" default="tooltip"

diff --git a/administrator/components/com_fields/models/types/forms/radio.xml b/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" required="true"
-				description="COM_FIELDS_FIELD_LIST_MULTIPLE_VALUES_DESC"
-				label="COM_FIELDS_FIELD_LIST_MULTIPLE_VALUES_LABEL">
+			<field name="options" type="Repeatable" icon="list"
+				description="COM_FIELDS_FIELD_RADIO_MULTIPLE_VALUES_DESC"
+				label="COM_FIELDS_FIELD_RADIO_MULTIPLE_VALUES_LABEL">
 				<fieldset hidden="true" name="list_templates_modal" repeat="true">
 					<field name="key"
-						label="COM_FIELDS_FIELD_LIST_MULTIPLE_VALUES_KEY_LABEL"
+						label="COM_FIELDS_FIELD_RADIO_MULTIPLE_VALUES_KEY_LABEL"
 						size="30" type="text" />
 					<field name="value"
-						label="COM_FIELDS_FIELD_LIST_MULTIPLE_VALUES_VALUE_LABEL"
+						label="COM_FIELDS_FIELD_RADIO_MULTIPLE_VALUES_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>
diff --git a/administrator/components/com_fields/models/types/forms/sql.xml b/administrator/components/com_fields/models/types/forms/sql.xml
@@ -2,15 +2,15 @@
 <form>
 	<fields name="fieldparams" label="COM_FIELDS_FIELD_BASIC_LABEL">
 		<fieldset name="fieldparams">
+			<field name="query" type="textarea" filter="raw"
+				default="select id as value, name as text from #__users" label="COM_FIELDS_FIELD_SQL_QUERY_LABEL"
+				description="COM_FIELDS_FIELD_SQL_QUERY_DESC" class="input-xxlarge"
+				rows="10" />
 			<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="query" type="textarea" filter="raw"
-				default="select id as value, name as text from #__users" label="COM_FIELDS_FIELD_SQL_QUERY_LABEL"
-				description="COM_FIELDS_FIELD_SQL_QUERY_DESC" class="input-xxlarge"
-				rows="10" />
 		</fieldset>
 	</fields>
 </form>
diff --git a/administrator/language/en-GB/en-GB.com_fields.ini b/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_VALUES_DESC="The options of the list."
+COM_FIELDS_FIELD_CHECKBOX_MULTIPLE_VALUES_KEY_LABEL="Key"
+COM_FIELDS_FIELD_CHECKBOX_MULTIPLE_VALUES_LABEL="Checkbox Values"
+COM_FIELDS_FIELD_CHECKBOX_MULTIPLE_VALUES_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"
@@ -117,8 +124,8 @@ COM_FIELDS_FIELD_INTEGER_STEP_LABEL="Step"
 
 COM_FIELDS_FIELD_LIST_MULTIPLE_DESC="Allow multiple values to be selected."
 COM_FIELDS_FIELD_LIST_MULTIPLE_LABEL="Multiple"
-COM_FIELDS_FIELD_LIST_MULTIPLE_VALUES_DESC="The values of the list."
-COM_FIELDS_FIELD_LIST_MULTIPLE_VALUES_LABEL="Values"
+COM_FIELDS_FIELD_LIST_MULTIPLE_VALUES_DESC="The options of the list."
+COM_FIELDS_FIELD_LIST_MULTIPLE_VALUES_LABEL="List Values"
 COM_FIELDS_FIELD_LIST_MULTIPLE_VALUES_KEY_LABEL="Key"
 COM_FIELDS_FIELD_LIST_MULTIPLE_VALUES_VALUE_LABEL="Value"
 
@@ -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_VALUES_DESC="The options of the list."
+COM_FIELDS_FIELD_RADIO_MULTIPLE_VALUES_KEY_LABEL="Key"
+COM_FIELDS_FIELD_RADIO_MULTIPLE_VALUES_LABEL="Radio Values"
+COM_FIELDS_FIELD_RADIO_MULTIPLE_VALUES_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"