Merge pull request #55 from brianteeman/field-order

Field order and set some required fields
joomla · Apr 5, 2016 · 7168f62 · 7168f62
2 parents 07b1418 + 9fbd9f5
commit 7168f62
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
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/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/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>