New show_info option (hide/show) in com_contact and some minor changes (

#8607) * several improvments * lang changes * minor changes * fix conflicts * fix conflicts 2 * revert * fix conflicts final
joomla · Oct 3, 2016 · d1fc5f9 · d1fc5f9
1 parent 33d7bd9
commit d1fc5f9
Show file tree

Hide file tree

Showing 9 changed files with 255 additions and 118 deletions.
diff --git a/administrator/components/com_contact/config.xml b/administrator/components/com_contact/config.xml
@@ -75,6 +75,31 @@
 			<option value="plain">COM_CONTACT_FIELD_VALUE_PLAIN</option>
 		</field>
 
+		<field
+			name="show_tags"
+			type="radio"
+			label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
+			description="COM_CONTACT_FIELD_SHOW_TAGS_DESC"
+			id="show_tags"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
+		<field
+			name="show_info"
+			type="radio"
+			label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
+			description="COM_CONTACT_FIELD_SHOW_INFO_DESC"
+			default="1"
+			class="btn-group btn-group-yesno"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
 		<field
 			name="show_name"
 			type="radio"
@@ -220,10 +245,10 @@
 		</field>
 
 		<field
-			name="show_misc"
+			name="show_image"
 			type="radio"
-			label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
-			description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"
+			label="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_DESC"
 			default="1"
 			class="btn-group btn-group-yesno"
 			>
@@ -232,10 +257,10 @@
 		</field>
 
 		<field
-			name="show_image"
+			name="show_misc"
 			type="radio"
-			label="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_LABEL"
-			description="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_DESC"
+			label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
+			description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"
 			default="1"
 			class="btn-group btn-group-yesno"
 			>
@@ -369,18 +394,6 @@
 			showon="show_links:1"
 		/>
 
-		<field
-			name="show_tags"
-			type="radio"
-			label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
-			description="COM_CONTACT_FIELD_SHOW_TAGS_DESC"
-			id="show_tags"
-			default="1"
-			class="btn-group btn-group-yesno"
-			>
-			<option value="1">JSHOW</option>
-			<option value="0">JHIDE</option>
-		</field>
 	</fieldset>
 
 	<fieldset

diff --git a/administrator/components/com_contact/models/forms/contact.xml b/administrator/components/com_contact/models/forms/contact.xml
@@ -475,6 +475,18 @@
 				<option value="1">JSHOW</option>
 			</field>
 
+			<field
+				name="show_info"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_INFO_DESC"
+				class="chzn-color"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
 			<field
 				name="show_name"
 				type="list"
@@ -620,10 +632,10 @@
 			</field>
 
 			<field
-				name="show_misc"
+				name="show_image"
 				type="list"
-				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
-				description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"
+				label="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_DESC"
 				class="chzn-color"
 				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
@@ -632,10 +644,10 @@
 			</field>
 
 			<field
-				name="show_image"
+				name="show_misc"
 				type="list"
-				label="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_LABEL"
-				description="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_DESC"
+				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"
 				class="chzn-color"
 				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>

diff --git a/administrator/language/en-GB/en-GB.com_contact.ini b/administrator/language/en-GB/en-GB.com_contact.ini
@@ -83,7 +83,7 @@ COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL="Show Contact List"
 COM_CONTACT_FIELD_CREATED_BY_ALIAS_DESC="Enter an alias to be displayed instead of the name of the user who created the contact."
 COM_CONTACT_FIELD_CREATED_BY_ALIAS_LABEL="Created By Alias"
 COM_CONTACT_FIELD_CREATED_BY_DESC="Select the name of the user who created the contact."
-COM_CONTACT_FIELD_CREATED_DESC="Date contact was created."
+COM_CONTACT_FIELD_CREATED_DESC="Date when the contact was created."
 COM_CONTACT_FIELD_CREATED_LABEL="Created Date"
 COM_CONTACT_FIELD_EMAIL_BANNED_EMAIL_DESC="Email addresses not allowed to submit contact form."
 COM_CONTACT_FIELD_EMAIL_BANNED_EMAIL_LABEL="Banned Email"
@@ -93,8 +93,8 @@ COM_CONTACT_FIELD_EMAIL_BANNED_TEXT_DESC="Text not allowed in contact form body.
 COM_CONTACT_FIELD_EMAIL_BANNED_TEXT_LABEL="Banned Text"
 COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_DESC="Hide or Show checkbox to allow copy of email to be sent to submitter."
 COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_LABEL="Send Copy to Submitter"
-COM_CONTACT_FIELD_EMAIL_SHOW_FORM_DESC="Show or hide contact form."
-COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL="Show Contact Form"
+COM_CONTACT_FIELD_EMAIL_SHOW_FORM_DESC="Show or hide the contact form."
+COM_CONTACT_FIELD_EMAIL_SHOW_FORM_LABEL="Contact Form"
 COM_CONTACT_FIELD_FEATURED_DESC="If marked yes, will be displayed in featured view."
 COM_CONTACT_FIELD_FEEDLINK_DESC="Show or hide a feed link for this contact category."
 COM_CONTACT_FIELD_FEEDLINK_LABEL="Feed Link"
@@ -178,10 +178,10 @@ COM_CONTACT_FIELD_PARAMS_FAX_LABEL="Fax"
 COM_CONTACT_FIELD_PARAMS_IMAGE_DESC="Select or upload the contact image."
 COM_CONTACT_FIELD_PARAMS_IMAGE_LABEL="Image"
 COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC="Show or hide miscellaneous information."
-COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL="Misc. Information"
+COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL="Miscellaneous Information"
 COM_CONTACT_FIELD_PARAMS_MOBILE_DESC="Show or hide mobile number."
 COM_CONTACT_FIELD_PARAMS_MOBILE_LABEL="Mobile Phone"
-COM_CONTACT_FIELD_PARAMS_NAME_DESC="Show name of the contact."
+COM_CONTACT_FIELD_PARAMS_NAME_DESC="Show or hide name of the contact."
 COM_CONTACT_FIELD_PARAMS_NAME_LABEL="Name"
 COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_DESC="Show or hide postal or zip code."
 COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_LABEL="Postal Code"
@@ -201,21 +201,23 @@ COM_CONTACT_FIELD_PARAMS_WEBPAGE_DESC="Show or hide webpage."
 COM_CONTACT_FIELD_PARAMS_WEBPAGE_LABEL="Webpage"
 COM_CONTACT_FIELD_PRESENTATION_DESC="Determines the style used to display sections of the contact form."
 COM_CONTACT_FIELD_PRESENTATION_LABEL="Display Format"
-COM_CONTACT_FIELD_PROFILE_SHOW_DESC="If this contact is mapped to a user, and if this is set to Show, then the profile of this user will show."
-COM_CONTACT_FIELD_PROFILE_SHOW_LABEL="Show Profile"
+COM_CONTACT_FIELD_PROFILE_SHOW_DESC="If the contact is mapped to a user and this option is set to Show, then the profile of the user will be shown in the contact details."
+COM_CONTACT_FIELD_PROFILE_SHOW_LABEL="User Profile"
 COM_CONTACT_FIELD_PUBLISH_DOWN_DESC="An optional date to Finish Publishing the contact."
 COM_CONTACT_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
 COM_CONTACT_FIELD_PUBLISH_UP_DESC="An optional date to Start Publishing the contact."
 COM_CONTACT_FIELD_PUBLISH_UP_LABEL="Start Publishing"
 COM_CONTACT_FIELD_SHOW_CAT_ITEMS_DESC="Show or hide the number of contacts in category."
 COM_CONTACT_FIELD_SHOW_CAT_ITEMS_LABEL="# Contacts in Category"
 COM_CONTACT_FIELD_SHOW_CATEGORY_DESC="Displays the category."
-COM_CONTACT_FIELD_SHOW_LINKS_DESC="Show or hide the links."
-COM_CONTACT_FIELD_SHOW_LINKS_LABEL="Show Links"
-COM_CONTACT_FIELD_SHOW_CAT_TAGS_DESC="Show the tags for a contact category."
-COM_CONTACT_FIELD_SHOW_CAT_TAGS_LABEL="Show Tags"
-COM_CONTACT_FIELD_SHOW_TAGS_DESC="Show the tags for a contact."
-COM_CONTACT_FIELD_SHOW_TAGS_LABEL="Show Tags"
+COM_CONTACT_FIELD_SHOW_LINKS_DESC="Show or hide the contact links."
+COM_CONTACT_FIELD_SHOW_LINKS_LABEL="Contact Links"
+COM_CONTACT_FIELD_SHOW_CAT_TAGS_DESC="Show or hide the tags for a contact category."
+COM_CONTACT_FIELD_SHOW_CAT_TAGS_LABEL="Category Tags"
+COM_CONTACT_FIELD_SHOW_TAGS_DESC="Show or hide the tags for a contact."
+COM_CONTACT_FIELD_SHOW_TAGS_LABEL="Tags"
+COM_CONTACT_FIELD_SHOW_INFO_LABEL="Contact Information"
+COM_CONTACT_FIELD_SHOW_INFO_DESC="Show or hide the contact infomation."
 COM_CONTACT_FIELD_SORTNAME1_DESC="The part of the name to use as the first sort field."
 COM_CONTACT_FIELD_SORTNAME1_LABEL="First Sort Field"
 COM_CONTACT_FIELD_SORTNAME2_DESC="The part of the name to use as the second sort field."

diff --git a/components/com_contact/models/forms/form.xml b/components/com_contact/models/forms/form.xml
@@ -265,6 +265,28 @@
 	<fields name="params">
 		<fieldset name="options" label="CONTACT_PARAMETERS">
 
+			<field
+				name="show_tags"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_TAGS_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_info"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_INFO_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
 		<field name="show_name" type="list"
 			description="CONTACT_PARAMS_NAME_DESC"
 			label="CONTACT_PARAMS_NAME_LABEL"
@@ -373,15 +395,6 @@
 			<option value="1">JSHOW</option>
 		</field>
 
-		<field name="show_misc" type="list"
-			description="CONTACT_PARAMS_NAME_DESC"
-			label="CONTACT_PARAMS_MISC_INFO_LABEL"
-		>
-			<option value="">JGLOBAL_USE_GLOBAL</option>
-			<option value="0">JHIDE</option>
-			<option value="1">JSHOW</option>
-		</field>
-
 		<field name="show_image" type="list"
 			description="CONTACT_PARAMS_NAME_DESC"
 			label="CONTACT_PARAMS_IMAGE_LABEL"
@@ -400,6 +413,17 @@
 			<option value="1">JSHOW</option>
 		</field>
 
+		<field
+			name="show_misc"
+			type="list"
+			label="CONTACT_PARAMS_MISC_INFO_LABEL"
+			description="CONTACT_PARAMS_NAME_DESC"
+			>
+			<option value="">JGLOBAL_USE_GLOBAL</option>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
 		<field name="show_articles" type="list"
 			description="CONTACT_SHOW_ARTICLES_DESC"
 			label="CONTACT_SHOW_ARTICLES_LABEL"

diff --git a/components/com_contact/views/categories/tmpl/default.xml b/components/com_contact/views/categories/tmpl/default.xml
@@ -325,6 +325,28 @@
 				<option value="1">JSHOW</option>
 			</field>
 
+			<field
+				name="show_tags"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_TAGS_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_info"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_INFO_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
 			<field name="show_name"
 				type="list"
 				description="COM_CONTACT_FIELD_PARAMS_NAME_DESC"
@@ -446,16 +468,6 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field name="show_misc"
-				type="list"
-				description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"
-				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
-			>
-				<option value="">JGLOBAL_USE_GLOBAL</option>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
-			</field>
-
 			<field name="show_image"
 				type="list"
 				description="COM_CONTACT_FIELD_PARAMS_IMAGE_DESC"
@@ -476,6 +488,16 @@
 				<option value="1">JSHOW</option>
 			</field>
 
+			<field name="show_misc"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
 			<field name="show_articles"
 				type="list"
 				description="COM_CONTACT_FIELD_ARTICLES_SHOW_DESC"

diff --git a/components/com_contact/views/category/tmpl/default.xml b/components/com_contact/views/category/tmpl/default.xml
@@ -298,6 +298,28 @@
 				<option value="1">JSHOW</option>
 			</field>
 
+			<field
+				name="show_tags"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_TAGS_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
+			<field
+				name="show_info"
+				type="list"
+				label="COM_CONTACT_FIELD_SHOW_INFO_LABEL"
+				description="COM_CONTACT_FIELD_SHOW_INFO_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
 			<field name="show_name"
 				type="list"
 				description="COM_CONTACT_FIELD_PARAMS_NAME_DESC"
@@ -419,16 +441,6 @@
 				<option value="1">JSHOW</option>
 			</field>
 
-			<field name="show_misc"
-				type="list"
-				description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"
-				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
-			>
-				<option value="">JGLOBAL_USE_GLOBAL</option>
-				<option value="0">JHIDE</option>
-				<option value="1">JSHOW</option>
-			</field>
-
 			<field name="show_image"
 				type="list"
 				description="COM_CONTACT_FIELD_PARAMS_IMAGE_DESC"
@@ -449,6 +461,17 @@
 				<option value="1">JSHOW</option>
 			</field>
 
+			<field
+				name="show_misc"
+				type="list"
+				label="COM_CONTACT_FIELD_PARAMS_MISC_INFO_LABEL"
+				description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"
+				>
+				<option value="">JGLOBAL_USE_GLOBAL</option>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
 			<field name="show_articles"
 				type="list"
 				description="COM_CONTACT_FIELD_ARTICLES_SHOW_DESC"