From 2ebe811b6046052f32d2f90e6239032da151dcf8 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Thu, 31 Aug 2017 18:56:12 +0100
Subject: [PATCH] xml code-style (#363)

* xml code-style

* fixes

* oops
---
 .../com_weblinks/models/forms/weblink.xml     |  38 +-
 .../com_weblinks/models/forms/weblink.xml     |  26 +-
 .../views/categories/tmpl/default.xml         | 419 ++++++++++--------
 .../views/category/tmpl/default.xml           | 206 +++++----
 src/modules/mod_weblinks/mod_weblinks.xml     |  69 +--
 src/plugins/search/weblinks/weblinks.xml      |  14 +-
 6 files changed, 422 insertions(+), 350 deletions(-)

diff --git a/src/administrator/components/com_weblinks/models/forms/weblink.xml b/src/administrator/components/com_weblinks/models/forms/weblink.xml
index 9acd378..b80840a 100644
--- a/src/administrator/components/com_weblinks/models/forms/weblink.xml
+++ b/src/administrator/components/com_weblinks/models/forms/weblink.xml
@@ -6,38 +6,38 @@
 		<field
 			name="id"
 			type="text"
-			default="0"
 			label="JGLOBAL_FIELD_ID_LABEL"
+			description="JGLOBAL_FIELD_ID_DESC"
 			readonly="true"
 			class="readonly"
-			description="JGLOBAL_FIELD_ID_DESC"
+			default="0"
 		/>
 
 		<field
 			name="title"
 			type="text"
-			class="input-xxlarge input-large-text"
-			size="40"
 			label="JGLOBAL_TITLE"
 			description="COM_WEBLINKS_FIELD_TITLE_DESC"
+			class="input-xxlarge input-large-text"
+			size="40"
 			required="true"
 		/>
 
 		<field
 			name="alias"
 			type="text"
-			size="40"
 			label="JFIELD_ALIAS_LABEL"
 			description="COM_WEBLINKS_FIELD_ALIAS_DESC"
+			size="40"
 			hint="JFIELD_ALIAS_PLACEHOLDER"
 		/>
 
 		<field
 			name="catid"
 			type="categoryedit"
-			extension="com_weblinks"
 			label="JCATEGORY"
 			description="COM_WEBLINKS_FIELD_CATEGORY_DESC"
+			extension="com_weblinks"
 			required="true"
 			default=""
 		/>
@@ -45,31 +45,31 @@
 		<field
 			name="url"
 			type="url"
+			label="COM_WEBLINKS_FIELD_URL_LABEL"
+			description="COM_WEBLINKS_FIELD_URL_DESC"
 			class="span12"
 			filter="url"
 			size="40"
-			label="COM_WEBLINKS_FIELD_URL_LABEL"
-			description="COM_WEBLINKS_FIELD_URL_DESC"
 			required="true"
 		/>
 
 		<field
 			name="description"
 			type="editor"
+			label="JGLOBAL_DESCRIPTION"
+			description="COM_WEBLINKS_FIELD_DESCRIPTION_DESC"
 			buttons="true"
 			hide="pagebreak,readmore"
 			filter="JComponentHelper::filterText"
-			label="JGLOBAL_DESCRIPTION"
-			description="COM_WEBLINKS_FIELD_DESCRIPTION_DESC"
 		/>
 
 		<field
 			name="hits"
 			type="text"
-			class="readonly"
-			size="6"
 			label="JGLOBAL_HITS"
 			description="COM_WEBLINKS_HITS_DESC"
+			class="readonly"
+			size="6"
 			readonly="true"
 			filter="unset"
 		/>
@@ -160,9 +160,9 @@
 		<field
 			name="modified"
 			type="calendar"
-			class="readonly"
 			label="JGLOBAL_FIELD_MODIFIED_LABEL"
 			description="COM_WEBLINKS_FIELD_MODIFIED_DESC"
+			class="readonly"
 			size="22"
 			readonly="true"
 			format="%Y-%m-%d %H:%M:%S"
@@ -213,10 +213,10 @@
 		<field
 			name="version"
 			type="text"
-			class="readonly"
 			label="COM_WEBLINKS_FIELD_VERSION_LABEL"
-			size="6"
 			description="COM_WEBLINKS_FIELD_VERSION_DESC"
+			class="readonly"
+			size="6"
 			readonly="true"
 			filter="unset"
 		/>
@@ -259,9 +259,9 @@
 			<field
 				name="target"
 				type="list"
-				default=""
 				label="COM_WEBLINKS_FIELD_TARGET_LABEL"
 				description="COM_WEBLINKS_FIELD_TARGET_DESC"
+				default=""
 				useglobal="true"
 				>
 				<option value="0">JBROWSERTARGET_PARENT</option>
@@ -273,25 +273,25 @@
 			<field
 				name="width"
 				type="text"
-				class="validate-numeric"
 				label="COM_WEBLINKS_FIELD_WIDTH_LABEL"
 				description="COM_WEBLINKS_FIELD_WIDTH_DESC"
+				class="validate-numeric"
 			/>
 
 			<field
 				name="height"
 				type="text"
-				class="validate-numeric"
 				label="COM_WEBLINKS_FIELD_HEIGHT_LABEL"
 				description="COM_WEBLINKS_FIELD_HEIGHT_DESC"
+				class="validate-numeric"
 			/>
 
 			<field
 				name="count_clicks"
 				type="list"
-				class="chzn-color"
 				label="COM_WEBLINKS_FIELD_COUNTCLICKS_LABEL"
 				description="COM_WEBLINKS_FIELD_COUNTCLICKS_DESC"
+				class="chzn-color"
 				useglobal="true"
 				>
 				<option value="0">JNO</option>
diff --git a/src/components/com_weblinks/models/forms/weblink.xml b/src/components/com_weblinks/models/forms/weblink.xml
index 4145369..34478a3 100644
--- a/src/components/com_weblinks/models/forms/weblink.xml
+++ b/src/components/com_weblinks/models/forms/weblink.xml
@@ -22,8 +22,8 @@
 		<field
 			name="title"
 			type="text"
-			description="COM_WEBLINKS_FIELD_TITLE_DESC"
 			label="JGLOBAL_TITLE"
+			description="COM_WEBLINKS_FIELD_TITLE_DESC"
 			required="true"
 			size="30"
 		/>
@@ -31,8 +31,8 @@
 		<field
 			name="alias"
 			type="text"
-			description="COM_WEBLINKS_FIELD_ALIAS_DESC"
 			label="JFIELD_ALIAS_LABEL"
+			description="COM_WEBLINKS_FIELD_ALIAS_DESC"
 			hint="JFIELD_ALIAS_PLACEHOLDER"
 			size="45"
 		/>
@@ -40,20 +40,20 @@
 		<field
 			name="description"
 			type="editor"
+			label="JGLOBAL_DESCRIPTION"
+			description="COM_WEBLINKS_FIELD_DESCRIPTION_DESC"
 			buttons="true"
 			hide="pagebreak,readmore"
-			description="COM_WEBLINKS_FIELD_DESCRIPTION_DESC"
 			filter="safehtml"
-			label="JGLOBAL_DESCRIPTION"
 			asset_id="com_weblinks"
 		/>
 
 		<field
 			name="state"
 			type="list"
-			default="1"
-			description="JFIELD_PUBLISHED_DESC"
 			label="JSTATUS"
+			description="JFIELD_PUBLISHED_DESC"
+			default="1"
 			size="1"
 			>
 			<option value="1">JPUBLISHED</option>
@@ -63,18 +63,18 @@
 		<field
 			name="catid"
 			type="categoryedit"
+			label="JCATEGORY"
 			description="COM_WEBLINKS_FIELD_CATEGORY_DESC"
 			extension="com_weblinks"
-			label="JCATEGORY"
 			required="true"
 		/>
 
 		<field
 			name="url"
 			type="url"
-			filter="url"
-			description="COM_WEBLINKS_FIELD_URL_DESC"
 			label="COM_WEBLINKS_FIELD_URL_LABEL"
+			description="COM_WEBLINKS_FIELD_URL_DESC"
+			filter="url"
 			required="true"
 			size="45"
 		/>
@@ -126,9 +126,9 @@
 			<field
 				name="robots"
 				type="hidden"
-				filter="unset"
 				label="JFIELD_METADATA_ROBOTS_LABEL"
 				description="JFIELD_METADATA_ROBOTS_DESC"
+				filter="unset"
 				labelclass="control-label"
 				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
@@ -141,9 +141,9 @@
 			<field
 				name="author"
 				type="hidden"
-				filter="unset"
 				label="JAUTHOR"
 				description="JFIELD_METADATA_AUTHOR_DESC"
+				filter="unset"
 				size="20"
 				labelclass="control-label"
 			/>
@@ -152,8 +152,8 @@
 				name="rights"
 				type="hidden"
 				label="JFIELD_META_RIGHTS_LABEL"
-				filter="unset"
 				description="JFIELD_META_RIGHTS_DESC"
+				filter="unset"
 				required="false"
 				labelclass="control-label"
 			/>
@@ -161,9 +161,9 @@
 			<field
 				name="xreference"
 				type="hidden"
-				filter="unset"
 				label="COM_CONTENT_FIELD_XREFERENCE_LABEL"
 				description="COM_CONTENT_FIELD_XREFERENCE_DESC"
+				filter="unset"
 				class="inputbox"
 				size="20"
 				labelclass="control-label"
diff --git a/src/components/com_weblinks/views/categories/tmpl/default.xml b/src/components/com_weblinks/views/categories/tmpl/default.xml
index 1717632..6a290c8 100644
--- a/src/components/com_weblinks/views/categories/tmpl/default.xml
+++ b/src/components/com_weblinks/views/categories/tmpl/default.xml
@@ -13,10 +13,12 @@
 	<fields name="request">
 		<fieldset name="request"
 		>
-			<field name="id" type="category"
+			<field 
+				name="id" 
+				type="category"
+				label="JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL"
 				description="JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_DESC"
 				extension="com_weblinks"
-				label="JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL"
 				show_root="true"
 				required="true"
 			/>
@@ -25,136 +27,162 @@
 
 	<!-- Add fields to the parameters object for the layout. -->
 <fields name="params">
-<fieldset name="basic" label="JGLOBAL_CATEGORIES_OPTIONS">
-
-			<field name="show_base_description" type="list"
-				label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
-				description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"
-				useglobal="true"
-			>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
-			</field>
-
-			<field name="categories_description" type="textarea"
-				description="JGLOBAL_FIELD_CATEGORIES_DESC_DESC"
-				label="JGLOBAL_FIELD_CATEGORIES_DESC_LABEL"
-				cols="25"
-				rows="5"
-			/>
-
-			<field name="maxLevelcat" type="list"
-				description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
-				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
-				useglobal="true"
-			>
-				<option value="-1">JALL</option>
-				<option value="1">J1</option>
-				<option value="2">J2</option>
-				<option value="3">J3</option>
-				<option value="4">J4</option>
-				<option value="5">J5</option>
-
-			</field>
-
-			<field name="show_empty_categories_cat" type="list"
-				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
-				description="COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC"
-				useglobal="true"
-			>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
-			</field>
-
-			<field name="show_subcat_desc_cat" type="list"
-			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
-			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
-				useglobal="true"
-			>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
-			</field>
-
-			<field name="show_cat_num_links_cat" type="list"
-			description="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC"
-			label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
-				useglobal="true"
-			>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
-			</field>
-
-	</fieldset>
-
-	<fieldset name="category" label="JGLOBAL_CATEGORY_OPTIONS">
-			<field name="spacer1" type="spacer" class="text"
-					label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
-			/>
-
-			<field name="show_category_title" type="list"
-				label="JGLOBAL_SHOW_CATEGORY_TITLE"
-				description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
-				useglobal="true"
-			>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
-			</field>
-
-			<field name="show_description" type="list"
-				description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
-				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
-				useglobal="true"
-			>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
-			</field>
-
-			<field name="show_description_image" type="list"
-				description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
-				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
-				useglobal="true"
-			>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
-			</field>
-
-			<field name="maxLevel" type="list"
-				description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
-				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
-				useglobal="true"
-			>
-				<option value="0">JNONE</option>
-				<option value="-1">JALL</option>
-				<option value="1">J1</option>
-				<option value="2">J2</option>
-				<option value="3">J3</option>
-				<option value="4">J4</option>
-				<option value="5">J5</option>
-
-			</field>
-
-			<field name="show_empty_categories" type="list"
-				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
-				description="COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC"
-				useglobal="true"
-			>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
-			</field>
-
-			<field name="show_subcat_desc" type="list"
-			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
-			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
-				useglobal="true"
+	<fieldset name="basic" label="JGLOBAL_CATEGORIES_OPTIONS">
+		<field 
+			name="show_base_description" 
+			type="list"
+			label="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL"
+			description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"
+			useglobal="true"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
 		</field>
 
-			<field name="show_cat_num_links" type="list"
-			description="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC"
+		<field 
+			name="categories_description" 
+			type="textarea"
+			label="JGLOBAL_FIELD_CATEGORIES_DESC_LABEL"
+			description="JGLOBAL_FIELD_CATEGORIES_DESC_DESC"
+			cols="25"
+			rows="5"
+		/>
+
+		<field 
+			name="maxLevelcat" 
+			type="list"
+			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+			description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+			useglobal="true"
+			>
+			<option value="-1">JALL</option>
+			<option value="1">J1</option>
+			<option value="2">J2</option>
+			<option value="3">J3</option>
+			<option value="4">J4</option>
+			<option value="5">J5</option>
+
+		</field>
+
+		<field 
+			name="show_empty_categories_cat" 
+			type="list"
+			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+			description="COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_subcat_desc_cat" 
+			type="list"
+			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_cat_num_links_cat" 
+			type="list"
 			label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
-				useglobal="true"
+			description="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+	</fieldset>
+
+	<fieldset name="category" label="JGLOBAL_CATEGORY_OPTIONS">
+		<field 
+			name="spacer1" 
+			type="spacer" 
+			label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+			class="text"
+		/>
+
+		<field 
+			name="show_category_title" 
+			type="list"
+			label="JGLOBAL_SHOW_CATEGORY_TITLE"
+			description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_description" 
+			type="list"
+			label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_description_image" 
+			type="list"
+			label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+			description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="maxLevel" 
+			type="list"
+			label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+			description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+			useglobal="true"
+			>
+			<option value="0">JNONE</option>
+			<option value="-1">JALL</option>
+			<option value="1">J1</option>
+			<option value="2">J2</option>
+			<option value="3">J3</option>
+			<option value="4">J4</option>
+			<option value="5">J5</option>
+		</field>
+
+		<field 
+			name="show_empty_categories" 
+			type="list"
+			label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
+			description="COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_subcat_desc" 
+			type="list"
+			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_cat_num_links" 
+			type="list"
+			label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
+			description="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC"
+			useglobal="true"
 			>
 			<option value="0">JHIDE</option>
 			<option value="1">JSHOW</option>
@@ -163,77 +191,90 @@
 	</fieldset>
 
 	<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
-			<field name="spacer2" type="spacer" class="text"
-					label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
-			/>
-			<field
-				name="filter_field"
-				type="list"
-				default=""
-				description="JGLOBAL_FILTER_FIELD_DESC"
-				label="JGLOBAL_FILTER_FIELD_LABEL"
-				useglobal="true"
-			>
-				<option value="hide">JHIDE</option>
-				<option value="1">JSHOW</option>
-			</field>
+		<field 
+			name="spacer2" 
+			type="spacer" 
+			label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+			class="text"
+		/>
 
-			<field	name="show_pagination_limit" type="list"
-				label="JGLOBAL_DISPLAY_SELECT_LABEL"
-				description="JGLOBAL_DISPLAY_SELECT_DESC"
-				useglobal="true"
-			>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
-			</field>
-
-			<field name="show_headings" type="list"
-				description="JGLOBAL_SHOW_HEADINGS_DESC"
-				label="JGLOBAL_SHOW_HEADINGS_LABEL"
-				useglobal="true"
-			>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
-			</field>
-
-			<field name="show_link_description" type="list"
-
-			description="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_DESC"
-			label="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL"
-				useglobal="true"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
-
-		<field name="show_link_hits" type="list"
-
-			description="COM_WEBLINKS_FIELD_CONFIG_HITS_DESC"
-			label="JGLOBAL_HITS"
+		<field
+			name="filter_field"
+			type="list"
+			label="JGLOBAL_FILTER_FIELD_LABEL"
+			description="JGLOBAL_FILTER_FIELD_DESC"
+			default=""
 			useglobal="true"
-		>
-			<option value="0">JHIDE</option>
+			>
+			<option value="hide">JHIDE</option>
 			<option value="1">JSHOW</option>
-
 		</field>
 
-			<field name="show_pagination" type="list"
-				description="JGLOBAL_PAGINATION_DESC"
-				label="JGLOBAL_PAGINATION_LABEL"
-				useglobal="true"
+		<field	
+			name="show_pagination_limit" 
+			type="list"
+			label="JGLOBAL_DISPLAY_SELECT_LABEL"
+			description="JGLOBAL_DISPLAY_SELECT_DESC"
+			useglobal="true"
 			>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
-				<option value="2">JGLOBAL_AUTO</option>
-			</field>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
 
-			<field name="show_pagination_results" type="list"
-				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
-				description="JGLOBAL_PAGINATION_RESULTS_DESC"
-				useglobal="true"
+		<field 
+			name="show_headings" 
+			type="list"
+			label="JGLOBAL_SHOW_HEADINGS_LABEL"
+			description="JGLOBAL_SHOW_HEADINGS_DESC"
+			useglobal="true"
 			>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_link_description" 
+			type="list"
+			label="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL"
+			description="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_link_hits" 
+			type="list"
+			label="JGLOBAL_HITS"
+			description="COM_WEBLINKS_FIELD_CONFIG_HITS_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
+		<field 
+			name="show_pagination" 
+			type="list"
+			label="JGLOBAL_PAGINATION_LABEL"
+			description="JGLOBAL_PAGINATION_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+			<option value="2">JGLOBAL_AUTO</option>
+		</field>
+
+		<field 
+			name="show_pagination_results" 
+			type="list"
+			label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+			description="JGLOBAL_PAGINATION_RESULTS_DESC"
+			useglobal="true"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
 		</field>
 	</fieldset>
 
diff --git a/src/components/com_weblinks/views/category/tmpl/default.xml b/src/components/com_weblinks/views/category/tmpl/default.xml
index d54ab0b..e883551 100644
--- a/src/components/com_weblinks/views/category/tmpl/default.xml
+++ b/src/components/com_weblinks/views/category/tmpl/default.xml
@@ -13,55 +13,68 @@
 	<fields name="request">
 		<fieldset name="request">
 
-			<field name="id" type="category"
-				default="0"
-				description="COM_WEBLINKS_FIELD_SELECT_CATEGORY_DESC"
-				extension="com_weblinks"
+			<field 
+				name="id" 
+				type="category"
 				label="COM_WEBLINKS_FIELD_SELECT_CATEGORY_LABEL"
+				description="COM_WEBLINKS_FIELD_SELECT_CATEGORY_DESC"
+				default="0"
+				extension="com_weblinks"
 				required="true"
 			/>
 		</fieldset>
 	</fields>
 
 	<!-- Add fields to the parameters object for the layout. -->
-<fields name="params">
-<fieldset name="basic" label="JGLOBAL_CATEGORY_OPTIONS">
-			<field name="spacer1" type="spacer" class="text"
-					label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+	<fields name="params">
+		<fieldset name="basic" label="JGLOBAL_CATEGORY_OPTIONS">
+			<field 
+				name="spacer1" 
+				type="spacer" 
+				label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+				class="text"
 			/>
 
-			<field name="show_category_title" type="list"
+			<field 
+				name="show_category_title" 
+				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_TITLE"
 				description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"
 				useglobal="true"
-			>
+				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field name="show_description" type="list"
-				description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
+			<field 
+				name="show_description" 
+				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC"
 				useglobal="true"
-			>
+				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field name="show_description_image" type="list"
-				description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
+			<field 
+				name="show_description_image" 
+				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"
+				description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"
 				useglobal="true"
-			>
+				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field name="maxLevel" type="list"
-				description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
+			<field 
+				name="maxLevel" 
+				type="list"
 				label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"
+				description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC"
 				useglobal="true"
-			>
+				>
 				<option value="0">JNONE</option>
 				<option value="-1">JALL</option>
 				<option value="1">J1</option>
@@ -72,124 +85,141 @@
 
 			</field>
 
-			<field name="show_empty_categories" type="list"
+			<field 
+				name="show_empty_categories" 
+				type="list"
 				label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL"
 				description="COM_WEBLINKS_SHOW_EMPTY_CATEGORIES_DESC"
 				useglobal="true"
-			>
+				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field name="show_subcat_desc" type="list"
-			description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
-			label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+			<field 
+				name="show_subcat_desc" 
+				type="list"
+				label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"
+				description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"
 				useglobal="true"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-			<field name="show_cat_num_links" type="list"
-			description="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC"
-			label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
+			<field 
+				name="show_cat_num_links" 
+				type="list"
+				label="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_LABEL"
+				description="COM_WEBLINKS_FIELD_CONFIG_CAT_SHOWNUMBERS_DESC"
 				useglobal="true"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-	</fieldset>
+		</fieldset>
 
-	<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
-			<field name="spacer2" type="spacer" class="text"
-					label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+		<fieldset name="advanced" label="JGLOBAL_LIST_LAYOUT_OPTIONS">
+			<field 
+				name="spacer2" 
+				type="spacer" 
+				label="JGLOBAL_SUBSLIDER_DRILL_CATEGORIES_LABEL"
+				class="text"
 			/>
 
 			<field
 				name="filter_field"
 				type="list"
-				default=""
-				description="JGLOBAL_FILTER_FIELD_DESC"
 				label="JGLOBAL_FILTER_FIELD_LABEL"
+				description="JGLOBAL_FILTER_FIELD_DESC"
+				default=""
 				useglobal="true"
-			>
+				>
 				<option value="hide">JHIDE</option>
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field	name="show_pagination_limit" type="list"
+			<field	
+				name="show_pagination_limit" 
+				type="list"
 				label="JGLOBAL_DISPLAY_SELECT_LABEL"
 				description="JGLOBAL_DISPLAY_SELECT_DESC"
 				useglobal="true"
-			>
+				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field name="show_headings" type="list"
-				description="JGLOBAL_SHOW_HEADINGS_DESC"
+			<field 
+				name="show_headings" 
+				type="list"
 				label="JGLOBAL_SHOW_HEADINGS_LABEL"
+				description="JGLOBAL_SHOW_HEADINGS_DESC"
 				useglobal="true"
-			>
+				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field name="show_link_description" type="list"
-
-			description="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_DESC"
-			label="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL"
+			<field 
+				name="show_link_description" 
+				type="list"
+				label="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_LABEL"
+				description="COM_WEBLINKS_FIELD_CONFIG_LINKDESCRIPTION_DESC"
 				useglobal="true"
-			>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-		<field name="show_link_hits" type="list"
+			<field 
+				name="show_link_hits" 
+				type="list"
+				label="JGLOBAL_HITS"
+				description="COM_WEBLINKS_FIELD_CONFIG_HITS_DESC"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
 
-			description="COM_WEBLINKS_FIELD_CONFIG_HITS_DESC"
-			label="JGLOBAL_HITS"
-			useglobal="true"
-		>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-
-		</field>
-
-			<field name="show_pagination" type="list"
-				description="JGLOBAL_PAGINATION_DESC"
+			<field 
+				name="show_pagination" 
+				type="list"
 				label="JGLOBAL_PAGINATION_LABEL"
+				description="JGLOBAL_PAGINATION_DESC"
 				useglobal="true"
-			>
+				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 				<option value="2">JGLOBAL_AUTO</option>
 			</field>
 
-			<field name="show_pagination_results" type="list"
-
-			label="JGLOBAL_PAGINATION_RESULTS_LABEL"
-			description="JGLOBAL_PAGINATION_RESULTS_DESC"
+			<field 
+				name="show_pagination_results" 
+				type="list"
+				label="JGLOBAL_PAGINATION_RESULTS_LABEL"
+				description="JGLOBAL_PAGINATION_RESULTS_DESC"
 				useglobal="true"
-			>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
-		</field>
-	</fieldset>
-
-		<fieldset name="integration"
-		>
-
-			<field name="show_feed_link" type="list"
-				description="JGLOBAL_SHOW_FEED_LINK_DESC"
-				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
-				useglobal="true"
-			>
+				>
 				<option value="0">JHIDE</option>
 				<option value="1">JSHOW</option>
 			</field>
-			
 		</fieldset>
-</fields>
+
+		<fieldset name="integration">
+
+			<field 
+				name="show_feed_link" 
+				type="list"
+				label="JGLOBAL_SHOW_FEED_LINK_LABEL"
+				description="JGLOBAL_SHOW_FEED_LINK_DESC"
+				useglobal="true"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>			
+		</fieldset>
+	</fields>
 </metadata>
diff --git a/src/modules/mod_weblinks/mod_weblinks.xml b/src/modules/mod_weblinks/mod_weblinks.xml
index c096e13..65b9398 100644
--- a/src/modules/mod_weblinks/mod_weblinks.xml
+++ b/src/modules/mod_weblinks/mod_weblinks.xml
@@ -22,20 +22,20 @@
 				<field
 					name="catid"
 					type="category"
-					extension="com_weblinks"
-					required="true"
 					label="JCATEGORY"
 					description="MOD_WEBLINKS_FIELD_CATEGORY_DESC"
+					extension="com_weblinks"
+					required="true"
 				/>
 
 				<field
 					name="groupby"
 					type="radio"
-					class="btn-group btn-group-yesno"
-					default="0"
 					label="MOD_WEBLINKS_FIELD_GROUPBY_LABEL"
 					description="MOD_WEBLINKS_FIELD_GROUPBY_DESC"
-				>
+					class="btn-group btn-group-yesno"
+					default="0"
+					>
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
@@ -43,12 +43,12 @@
 				<field
 					name="groupby_showtitle"
 					type="radio"
-					class="btn-group btn-group-yesno"
-					default="1"
 					label="MOD_WEBLINKS_FIELD_GROUPBYSHOWTITLE_LABEL"
 					description="MOD_WEBLINKS_FIELD_GROUPBYSHOWTITLE_DESC"
+					class="btn-group btn-group-yesno"
+					default="1"
 					showon="groupby:1"
-				>
+					>
 					<option value="1">JYES</option>
 					<option value="0">JNO</option>
 				</field>
@@ -56,11 +56,11 @@
 				<field
 					name="groupby_ordering"
 					type="list"
-					default="c.lft"
 					label="MOD_WEBLINKS_FIELD_GROUPBYORDERING_LABEL"
 					description="MOD_WEBLINKS_FIELD_GROUPBYORDERING_DESC"
+					default="c.lft"
 					showon="groupby:1"
-				>
+					>
 					<option value="c.title">JGLOBAL_TITLE</option>
 					<option value="c.lft">MOD_WEBLINKS_FIELD_VALUE_ORDER</option>
 				</field>
@@ -68,11 +68,11 @@
 				<field
 					name="groupby_direction"
 					type="list"
-					default="asc"
 					label="MOD_WEBLINKS_FIELD_GROUPBYDIRECTION_LABEL"
 					description="MOD_WEBLINKS_FIELD_GROUPBYDIRECTION_DESC"
+					default="asc"
 					showon="groupby:1"
-				>
+					>
 					<option value="asc">MOD_WEBLINKS_FIELD_VALUE_ASCENDING</option>
 					<option value="desc">MOD_WEBLINKS_FIELD_VALUE_DESCENDING</option>
 				</field>
@@ -80,10 +80,10 @@
 				<field
 					name="groupby_columns"
 					type="list"
-					default="3"
 					label="MOD_WEBLINKS_FIELD_COLUMNS_LABEL"
 					description="MOD_WEBLINKS_FIELD_COLUMNS_DESC"
-				>
+					default="3"
+					>
 					<option value="1">J1</option>
                     <option value="2">J2</option>
 					<option value="3">J3</option>
@@ -94,18 +94,18 @@
 				<field
 					name="count"
 					type="text"
-					default="5"
 					label="MOD_WEBLINKS_FIELD_COUNT_LABEL"
 					description="MOD_WEBLINKS_FIELD_COUNT_DESC"
+					default="5"
 				/>
 
 				<field
 					name="ordering"
 					type="list"
-					default="title"
 					label="MOD_WEBLINKS_FIELD_ORDERING_LABEL"
 					description="MOD_WEBLINKS_FIELD_ORDERING_DESC"
-				>
+					default="title"
+					>
 					<option value="title">JGLOBAL_TITLE</option>
 					<option value="order">MOD_WEBLINKS_FIELD_VALUE_ORDER</option>
 					<option value="hits">MOD_WEBLINKS_FIELD_VALUE_HITS</option>
@@ -114,10 +114,10 @@
 				<field
 					name="direction"
 					type="list"
-					default="asc"
 					label="MOD_WEBLINKS_FIELD_ORDERDIRECTION_LABEL"
 					description="MOD_WEBLINKS_FIELD_ORDERDIRECTION_DESC"
-				>
+					default="asc"
+					>
 					<option value="asc">MOD_WEBLINKS_FIELD_VALUE_ASCENDING</option>
 					<option value="desc">MOD_WEBLINKS_FIELD_VALUE_DESCENDING</option>
 				</field>
@@ -125,10 +125,10 @@
 				<field
 					name="follow"
 					type="list"
-					default="0"
 					label="MOD_WEBLINKS_FIELD_FOLLOW_LABEL"
 					description="MOD_WEBLINKS_FIELD_FOLLOW_DESC"
-				>
+					default="0"
+					>
 					<option value="follow">MOD_WEBLINKS_FIELD_VALUE_FOLLOW</option>
 					<option value="nofollow">MOD_WEBLINKS_FIELD_VALUE_NOFOLLOW</option>
 				</field>
@@ -136,11 +136,11 @@
 				<field
 					name="description"
 					type="radio"
-					class="btn-group btn-group-yesno"
-					default="0"
 					label="MOD_WEBLINKS_FIELD_DESCRIPTION_LABEL"
 					description="MOD_WEBLINKS_FIELD_DESCRIPTION_DESC"
-				>
+					class="btn-group btn-group-yesno"
+					default="0"
+					>
 					<option value="1">JSHOW</option>
 					<option value="0">JHIDE</option>
 				</field>
@@ -148,11 +148,11 @@
 				<field
 					name="hits"
 					type="radio"
-					class="btn-group btn-group-yesno"
-					default="0"
 					label="MOD_WEBLINKS_FIELD_HITS_LABEL"
 					description="MOD_WEBLINKS_FIELD_HITS_DESC"
-				>
+					class="btn-group btn-group-yesno"
+					default="0"
+					>
 					<option value="1">JSHOW</option>
 					<option value="0">JHIDE</option>
 				</field>
@@ -160,16 +160,17 @@
 				<field
 					name="count_clicks"
 					type="list"
-					class="chzn-color"
-					default="0"
 					label="MOD_WEBLINKS_FIELD_COUNTCLICKS_LABEL"
 					description="MOD_WEBLINKS_FIELD_COUNTCLICKS_DESC"
-				>
+					class="chzn-color"
+					default="0"
+					>
 					<option value="">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
 			</fieldset>
+
 			<fieldset name="advanced">
 				<field
 					name="layout"
@@ -181,18 +182,18 @@
 				<field
 					name="moduleclass_sfx"
 					type="textarea"
-					rows="3"
 					label="COM_MODULES_FIELD_MODULECLASS_SFX_LABEL"
 					description="COM_MODULES_FIELD_MODULECLASS_SFX_DESC"
+					rows="3"
 				/>
 
 				<field
 					name="cache"
 					type="list"
-					default="1"
 					label="COM_MODULES_FIELD_CACHING_LABEL"
 					description="COM_MODULES_FIELD_CACHING_DESC"
-				>
+					default="1"
+					>
 					<option value="1">JGLOBAL_USE_GLOBAL</option>
 					<option value="0">COM_MODULES_FIELD_VALUE_NOCACHING</option>
 				</field>
@@ -200,9 +201,9 @@
 				<field
 					name="cache_time"
 					type="text"
-					default="900"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
 					description="COM_MODULES_FIELD_CACHE_TIME_DESC"
+					default="900"
 				/>
 
 				<field
diff --git a/src/plugins/search/weblinks/weblinks.xml b/src/plugins/search/weblinks/weblinks.xml
index 51066a8..0ae5306 100644
--- a/src/plugins/search/weblinks/weblinks.xml
+++ b/src/plugins/search/weblinks/weblinks.xml
@@ -21,20 +21,20 @@
 				<field
 					name="search_limit"
 					type="text"
-					default="50"
 					description="JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC"
 					label="JFIELD_PLG_SEARCH_SEARCHLIMIT_LABEL"
+					default="50"
 					size="5"
 				/>
 
 				<field
 					name="search_content"
 					type="radio"
+					label="JFIELD_PLG_SEARCH_ALL_LABEL"
+					description="JFIELD_PLG_SEARCH_ALL_DESC"
 					class="btn-group btn-group-yesno"
 					default="0"
-					description="JFIELD_PLG_SEARCH_ALL_DESC"
-					label="JFIELD_PLG_SEARCH_ALL_LABEL"
-				>
+					>
 					<option value="1">JON</option>
 					<option value="0">JOFF</option>
 				</field>
@@ -42,11 +42,11 @@
 				<field
 					name="search_archived"
 					type="radio"
+					label="JFIELD_PLG_SEARCH_ARCHIVED_LABEL"
+					description="JFIELD_PLG_SEARCH_ARCHIVED_DESC"
 					class="btn-group btn-group-yesno"
 					default="0"
-					description="JFIELD_PLG_SEARCH_ARCHIVED_DESC"
-					label="JFIELD_PLG_SEARCH_ARCHIVED_LABEL"
-				>
+					>
 					<option value="1">JON</option>
 					<option value="0">JOFF</option>
 				</field>