diff --git a/administrator/components/com_contact/config.xml b/administrator/components/com_contact/config.xml index 51b8d06d33273..fba83e93daabe 100644 --- a/administrator/components/com_contact/config.xml +++ b/administrator/components/com_contact/config.xml @@ -75,6 +75,31 @@ + + + + + + + + + + @@ -232,10 +257,10 @@ @@ -369,18 +394,6 @@ showon="show_links:1" /> - - - -
JSHOW + + + + + + @@ -632,10 +644,10 @@ diff --git a/administrator/language/en-GB/en-GB.com_contact.ini b/administrator/language/en-GB/en-GB.com_contact.ini index b7420ecf9b3fd..3019c447f3fcc 100644 --- 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,8 +201,8 @@ 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." @@ -210,12 +210,14 @@ 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 index e271905182e86..97c2d2e9f847b 100644 --- a/components/com_contact/models/forms/form.xml +++ b/components/com_contact/models/forms/form.xml @@ -265,6 +265,28 @@
+ + + + + + + + + + + + JSHOW - - - - - - JSHOW + + + + + + JSHOW + + + + + + + + + + + + JSHOW - - - - - - JSHOW + + + + + + JSHOW + + + + + + + + + + + + JSHOW - - - - - - JSHOW + + + + + + get('presentation_style'); ?> - - 'basic-details')); ?> - - - 'basic-details')); ?> - - - ' . JText::_('COM_CONTACT_DETAILS') . ''; ?> - + params->get('show_info', 1)) : ?> + + 'basic-details')); ?> + + + 'basic-details')); ?> + + + ' . JText::_('COM_CONTACT_DETAILS') . ''; ?> + - contact->image && $tparams->get('show_image')) : ?> -
- contact->image, $this->contact->name, array('align' => 'middle', 'itemprop' => 'image')); ?> -
- + contact->image && $tparams->get('show_image')) : ?> +
+ contact->image, $this->contact->name, array('align' => 'middle', 'itemprop' => 'image')); ?> +
+ - contact->con_position && $tparams->get('show_position')) : ?> -
-
- contact->con_position; ?> -
-
- + contact->con_position && $tparams->get('show_position')) : ?> +
+
+ contact->con_position; ?> +
+
+ - loadTemplate('address'); ?> + loadTemplate('address'); ?> - get('allow_vcard')) : ?> - - - - + get('allow_vcard')) : ?> + + + + - - - - + + + + + get('show_email_form') && ($this->contact->email_to || $this->contact->user_id)) : ?> diff --git a/components/com_contact/views/contact/tmpl/default.xml b/components/com_contact/views/contact/tmpl/default.xml index ad9a930317b94..391513adaf8c7 100644 --- a/components/com_contact/views/contact/tmpl/default.xml +++ b/components/com_contact/views/contact/tmpl/default.xml @@ -65,10 +65,23 @@ - + > + + + + + + @@ -195,16 +208,6 @@ - - - - - - JSHOW + + + + + + COM_CONTACT_FIELD_VALUE_TABS + + + + + + + + + + + + + JSHOW - - - - - - JSHOW + + + + + +