From 2cba42be6879d36c7c3d9ab21a952b75e9c3ec21 Mon Sep 17 00:00:00 2001
From: ciar4n <ciaran@joomla51.com>
Date: Thu, 13 Jul 2017 12:07:44 +0100
Subject: [PATCH 1/4] Remove from views

---
 .../com_content/tmpl/article/default.php      |  7 --
 .../tmpl/article/default_links.php            | 79 -------------------
 components/com_content/tmpl/form/edit.php     | 21 -----
 3 files changed, 107 deletions(-)
 delete mode 100644 components/com_content/tmpl/article/default_links.php

diff --git a/components/com_content/tmpl/article/default.php b/components/com_content/tmpl/article/default.php
index ad02519dc3a86..6643191f2503e 100644
--- a/components/com_content/tmpl/article/default.php
+++ b/components/com_content/tmpl/article/default.php
@@ -94,10 +94,6 @@
 	<?php // Content is generated by content plugin event "onContentBeforeDisplay" ?>
 	<?php echo $this->item->event->beforeDisplayContent; ?>
 
-	<?php if (isset($urls) && ((!empty($urls->urls_position) && ($urls->urls_position == '0')) || ($params->get('urls_position') == '0' && empty($urls->urls_position)))
-		|| (empty($urls->urls_position) && (!$params->get('urls_position')))) : ?>
-	<?php echo $this->loadTemplate('links'); ?>
-	<?php endif; ?>
 	<?php if ($params->get('access-view')) : ?>
 	<?php echo JLayoutHelper::render('joomla.content.full_image', $this->item); ?>
 	<?php
@@ -128,9 +124,6 @@
 		echo $this->item->pagination;
 	?>
 	<?php endif; ?>
-	<?php if (isset($urls) && ((!empty($urls->urls_position) && ($urls->urls_position == '1')) || ($params->get('urls_position') == '1'))) : ?>
-	<?php echo $this->loadTemplate('links'); ?>
-	<?php endif; ?>
 	<?php // Optional teaser intro text for guests ?>
 	<?php elseif ($params->get('show_noauth') == true && $user->get('guest')) : ?>
 	<?php echo JLayoutHelper::render('joomla.content.intro_image', $this->item); ?>
diff --git a/components/com_content/tmpl/article/default_links.php b/components/com_content/tmpl/article/default_links.php
deleted file mode 100644
index 7fd5fe433de4c..0000000000000
--- a/components/com_content/tmpl/article/default_links.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * @package     Joomla.Site
- * @subpackage  com_content
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-// Create shortcut
-$urls = json_decode($this->item->urls);
-
-// Create shortcuts to some parameters.
-$params = $this->item->params;
-if ($urls && (!empty($urls->urla) || !empty($urls->urlb) || !empty($urls->urlc))) :
-?>
-<div class="content-links">
-	<ul class="nav nav-tabs nav-stacked">
-		<?php
-			$urlarray = array(
-			array($urls->urla, $urls->urlatext, $urls->targeta, 'a'),
-			array($urls->urlb, $urls->urlbtext, $urls->targetb, 'b'),
-			array($urls->urlc, $urls->urlctext, $urls->targetc, 'c')
-			);
-			foreach ($urlarray as $url) :
-				$link = $url[0];
-				$label = $url[1];
-				$target = $url[2];
-				$id = $url[3];
-
-				if ( ! $link) :
-					continue;
-				endif;
-
-				// If no label is present, take the link
-				$label = $label ?: $link;
-
-				// If no target is present, use the default
-				$target = $target ?: $params->get('target' . $id);
-				?>
-			<li class="content-links-<?php echo $id; ?>">
-				<?php
-					// Compute the correct link
-
-					switch ($target)
-					{
-						case 1:
-							// Open in a new window
-							echo '<a href="' . htmlspecialchars($link, ENT_COMPAT, 'UTF-8') . '" target="_blank" rel="nofollow noopener noreferrer">' .
-								htmlspecialchars($label, ENT_COMPAT, 'UTF-8') . '</a>';
-							break;
-
-						case 2:
-							// Open in a popup window
-							$attribs = 'toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes,width=600,height=600';
-							echo "<a href=\"" . htmlspecialchars($link, ENT_COMPAT, 'UTF-8') . "\" onclick=\"window.open(this.href, 'targetWindow', '" . $attribs . "'); return false;\" rel=\"noopener noreferrer\">" .
-								htmlspecialchars($label, ENT_COMPAT, 'UTF-8') . '</a>';
-							break;
-						case 3:
-							// Open in a modal window
-							JHtml::_('behavior.modal', 'a.modal');
-							echo '<a class="modal" href="' . htmlspecialchars($link, ENT_COMPAT, 'UTF-8') . '"  rel="{handler: \'iframe\', size: {x:600, y:600}} noopener noreferrer">' .
-								htmlspecialchars($label, ENT_COMPAT, 'UTF-8') . ' </a>';
-							break;
-
-						default:
-							// Open in parent window
-							echo '<a href="' . htmlspecialchars($link, ENT_COMPAT, 'UTF-8') . '" rel="nofollow">' .
-								htmlspecialchars($label, ENT_COMPAT, 'UTF-8') . ' </a>';
-							break;
-					}
-				?>
-				</li>
-		<?php endforeach; ?>
-	</ul>
-</div>
-<?php endif; ?>
diff --git a/components/com_content/tmpl/form/edit.php b/components/com_content/tmpl/form/edit.php
index c3a7fc2b55492..11ae9e8686fc8 100644
--- a/components/com_content/tmpl/form/edit.php
+++ b/components/com_content/tmpl/form/edit.php
@@ -75,27 +75,6 @@
 				<?php echo $this->form->renderField('image_fulltext_alt', 'images'); ?>
 				<?php echo $this->form->renderField('image_fulltext_caption', 'images'); ?>
 				<?php echo $this->form->renderField('float_fulltext', 'images'); ?>
-				<?php echo $this->form->renderField('urla', 'urls'); ?>
-				<?php echo $this->form->renderField('urlatext', 'urls'); ?>
-				<div class="control-group">
-					<div class="controls">
-						<?php echo $this->form->getInput('targeta', 'urls'); ?>
-					</div>
-				</div>
-				<?php echo $this->form->renderField('urlb', 'urls'); ?>
-				<?php echo $this->form->renderField('urlbtext', 'urls'); ?>
-				<div class="control-group">
-					<div class="controls">
-						<?php echo $this->form->getInput('targetb', 'urls'); ?>
-					</div>
-				</div>
-				<?php echo $this->form->renderField('urlc', 'urls'); ?>
-				<?php echo $this->form->renderField('urlctext', 'urls'); ?>
-				<div class="control-group">
-					<div class="controls">
-						<?php echo $this->form->getInput('targetc', 'urls'); ?>
-					</div>
-				</div>
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 			<?php endif; ?>
 

From 217f1b438c8e3763867c09681972927d92b38040 Mon Sep 17 00:00:00 2001
From: ciar4n <ciaran@joomla51.com>
Date: Thu, 13 Jul 2017 13:48:03 +0100
Subject: [PATCH 2/4] Remove from xml

---
 .../components/com_content/config.xml         |  10 --
 .../components/com_content/forms/article.xml  | 124 ------------------
 .../com_content/tmpl/article/default.xml      |  10 --
 3 files changed, 144 deletions(-)

diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml
index afd7619ae0e57..fc5a106730704 100644
--- a/administrator/components/com_content/config.xml
+++ b/administrator/components/com_content/config.xml
@@ -362,16 +362,6 @@
 			<option value="1">JYES</option>
 		</field>
 
-		<field
-			name="urls_position"
-			type="list"
-			label="COM_CONTENT_FIELD_URLSPOSITION_LABEL"
-			description="COM_CONTENT_FIELD_URLSPOSITION_DESC"
-			default="0"
-			>
-			<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
-			<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
-		</field>
 	</fieldset>
 
 	<fieldset 
diff --git a/administrator/components/com_content/forms/article.xml b/administrator/components/com_content/forms/article.xml
index 270af842ad886..9d742aede8b1b 100644
--- a/administrator/components/com_content/forms/article.xml
+++ b/administrator/components/com_content/forms/article.xml
@@ -538,17 +538,6 @@
 				<option value="1">JYES</option>
 			</field>
 
-			<field
-				name="urls_position"
-				type="list"
-				label="COM_CONTENT_FIELD_URLSPOSITION_LABEL"
-				description="COM_CONTENT_FIELD_URLSPOSITION_DESC"
-				useglobal="true"
-				>
-				<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
-				<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
-			</field>
-
 			<field
 				name="spacer2"
 				type="spacer"
@@ -860,119 +849,6 @@
 			size="20"
 		/>
 	</fields>
-	<fields name="urls" label="COM_CONTENT_FIELD_URLS_OPTIONS">
-		<field
-			name="urla"
-			type="url"
-			label="COM_CONTENT_FIELD_URLA_LABEL"
-			description="COM_CONTENT_FIELD_URL_DESC"
-			validate="url"
-			filter="url"
-			relative="true"
-		/>
-
-		<field 
-			name="urlatext"
-			type="text"
-			label="COM_CONTENT_FIELD_URLA_LINK_TEXT_LABEL"
-			description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
-			size="20"
-		/>
-
-		<field
-			name="targeta"
-			type="list"
-			label="COM_CONTENT_URL_FIELD_BROWSERNAV_LABEL"
-			description="COM_CONTENT_URL_FIELD_BROWSERNAV_DESC"
-			default=""
-			filter="options"
-			useglobal="true"
-			>
-			<option value="0">JBROWSERTARGET_PARENT</option>
-			<option value="1">JBROWSERTARGET_NEW</option>
-			<option value="2">JBROWSERTARGET_POPUP</option>
-			<option value="3">JBROWSERTARGET_MODAL</option>
-		</field>
-
-		<field
-			name="spacer3"
-			type="spacer"
-			hr="true"
-		/>
-
-		<field
-			name="urlb"
-			type="url"
-			label="COM_CONTENT_FIELD_URLB_LABEL"
-			description="COM_CONTENT_FIELD_URL_DESC"
-			validate="url"
-			filter="url"
-			relative="true"
-		/>
-
-		<field 
-			name="urlbtext"
-			type="text"
-			label="COM_CONTENT_FIELD_URLB_LINK_TEXT_LABEL"
-			description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
-			size="20"
-		/>
-
-		<field
-			name="targetb"
-			type="list"
-			label="COM_CONTENT_URL_FIELD_BROWSERNAV_LABEL"
-			description="COM_CONTENT_URL_FIELD_BROWSERNAV_DESC"
-			default=""
-			filter="options"
-			useglobal="true"
-			>
-			<option value="0">JBROWSERTARGET_PARENT</option>
-			<option value="1">JBROWSERTARGET_NEW</option>
-			<option value="2">JBROWSERTARGET_POPUP</option>
-			<option value="3">JBROWSERTARGET_MODAL</option>
-		</field>
-
-		<field
-			name="spacer4"
-			type="spacer"
-			hr="true"
-		/>
-
-		<field
-			name="urlc"
-			type="url"
-			label="COM_CONTENT_FIELD_URLC_LABEL"
-			description="COM_CONTENT_FIELD_URL_DESC"
-			validate="url"
-			filter="url"
-			relative="true"
-		/>
-
-		<field
-			name="urlctext"
-			type="text"
-			label="COM_CONTENT_FIELD_URLC_LINK_TEXT_LABEL"
-			description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
-			size="20"
-		/>
-
-		<field
-			name="targetc"
-			type="list"
-			label="COM_CONTENT_URL_FIELD_BROWSERNAV_LABEL"
-			description="COM_CONTENT_URL_FIELD_BROWSERNAV_DESC"
-			default=""
-			filter="options"
-			useglobal="true"
-			>
-			<option value="0">JBROWSERTARGET_PARENT</option>
-			<option value="1">JBROWSERTARGET_NEW</option>
-			<option value="2">JBROWSERTARGET_POPUP</option>
-			<option value="3">JBROWSERTARGET_MODAL</option>
-		</field>
-
-	</fields>
 
 	<fields name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
 		<fieldset name="jmetadata"
diff --git a/components/com_content/tmpl/article/default.xml b/components/com_content/tmpl/article/default.xml
index dc4fcffe0bd23..0b2cfe02d738b 100644
--- a/components/com_content/tmpl/article/default.xml
+++ b/components/com_content/tmpl/article/default.xml
@@ -288,16 +288,6 @@
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
-		<field
-			name="urls_position"
-			type="list"
-			label="COM_CONTENT_FIELD_URLSPOSITION_LABEL"
-			description="COM_CONTENT_FIELD_URLSPOSITION_DESC"
-			useglobal="true"
-			>
-			<option value="0">COM_CONTENT_FIELD_OPTION_ABOVE</option>
-			<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
-		</field>
 		</fieldset>
 	</fields>
 </metadata>

From ca7f481e20bdfe5c77c9ac74a4ab7acfec32ce0d Mon Sep 17 00:00:00 2001
From: ciar4n <ciaran@joomla51.com>
Date: Thu, 13 Jul 2017 13:48:30 +0100
Subject: [PATCH 3/4] Remove from edit.php

---
 administrator/components/com_content/tmpl/article/edit.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/administrator/components/com_content/tmpl/article/edit.php b/administrator/components/com_content/tmpl/article/edit.php
index eae4cf2fad716..35f2c97b31b18 100644
--- a/administrator/components/com_content/tmpl/article/edit.php
+++ b/administrator/components/com_content/tmpl/article/edit.php
@@ -64,17 +64,12 @@
 		<?php if ($params->get('show_urls_images_backend') == 1) : ?>
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'images', JText::_('COM_CONTENT_FIELDSET_URLS_AND_IMAGES')); ?>
 			<div class="row">
-				<div class="col-md-6">
+				<div class="col-md-12">
 					<?php echo $this->form->renderField('images'); ?>
 					<?php foreach ($this->form->getGroup('images') as $field) : ?>
 						<?php echo $field->renderField(); ?>
 					<?php endforeach; ?>
 				</div>
-				<div class="col-md-6">
-					<?php foreach ($this->form->getGroup('urls') as $field) : ?>
-						<?php echo $field->renderField(); ?>
-					<?php endforeach; ?>
-				</div>
 			</div>
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 		<?php endif; ?>

From 6474da1a71a35b444a250a9043769a9ff0b474d3 Mon Sep 17 00:00:00 2001
From: ciar4n <ciaran@joomla51.com>
Date: Thu, 13 Jul 2017 14:01:47 +0100
Subject: [PATCH 4/4] Languages strings and some missed bits

---
 .../components/com_content/config.xml         |  8 +--
 .../components/com_content/forms/article.xml  |  8 +--
 .../language/en-GB/en-GB.com_content.ini      | 21 ++----
 components/com_content/forms/article.xml      | 72 -------------------
 4 files changed, 13 insertions(+), 96 deletions(-)

diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml
index fc5a106730704..42cf80d01d820 100644
--- a/administrator/components/com_content/config.xml
+++ b/administrator/components/com_content/config.xml
@@ -432,8 +432,8 @@
 		<field
 			name="show_urls_images_frontend"
 			type="radio"
-			label="COM_CONTENT_SHOW_IMAGES_URLS_FRONT_LABEL"
-			description="COM_CONTENT_SHOW_IMAGES_URLS_FRONT_DESC"
+			label="COM_CONTENT_SHOW_IMAGES_FRONT_LABEL"
+			description="COM_CONTENT_SHOW_IMAGES_FRONT_DESC"
 			class="switcher"
 			default="0"
 			>
@@ -444,8 +444,8 @@
 		<field
 			name="show_urls_images_backend"
 			type="radio"
-			label="COM_CONTENT_SHOW_IMAGES_URLS_BACK_LABEL"
-			description="COM_CONTENT_SHOW_IMAGES_URLS_BACK_DESC"
+			label="COM_CONTENT_SHOW_IMAGES_BACK_LABEL"
+			description="COM_CONTENT_SHOW_IMAGES_BACK_DESC"
 			class="switcher"
 			default="0"
 			>
diff --git a/administrator/components/com_content/forms/article.xml b/administrator/components/com_content/forms/article.xml
index 9d742aede8b1b..d0c070937dba5 100644
--- a/administrator/components/com_content/forms/article.xml
+++ b/administrator/components/com_content/forms/article.xml
@@ -589,8 +589,8 @@
 			<field
 				name="show_urls_images_backend"
 				type="list"
-				label="COM_CONTENT_SHOW_IMAGES_URLS_BACK_LABEL"
-				description="COM_CONTENT_SHOW_IMAGES_URLS_BACK_DESC"
+				label="COM_CONTENT_SHOW_IMAGES_BACK_LABEL"
+				description="COM_CONTENT_SHOW_IMAGES_BACK_DESC"
 				useglobal="true"
 				default=""
 				>
@@ -601,8 +601,8 @@
 			<field
 				name="show_urls_images_frontend"
 				type="list"
-				label="COM_CONTENT_SHOW_IMAGES_URLS_FRONT_LABEL"
-				description="COM_CONTENT_SHOW_IMAGES_URLS_FRONT_DESC"
+				label="COM_CONTENT_SHOW_IMAGES_FRONT_LABEL"
+				description="COM_CONTENT_SHOW_IMAGES_FRONT_DESC"
 				useglobal="true"
 				default=""
 				>
diff --git a/administrator/language/en-GB/en-GB.com_content.ini b/administrator/language/en-GB/en-GB.com_content.ini
index 30631ec46c4df..8c59db4f0e91c 100644
--- a/administrator/language/en-GB/en-GB.com_content.ini
+++ b/administrator/language/en-GB/en-GB.com_content.ini
@@ -85,17 +85,6 @@ COM_CONTENT_FIELD_SHOW_CAT_TAGS_DESC="Show the tags for the category."
 COM_CONTENT_FIELD_SHOW_CAT_TAGS_LABEL="Show Tags"
 COM_CONTENT_FIELD_SHOW_TAGS_DESC="Show the tags for each article."
 COM_CONTENT_FIELD_SHOW_TAGS_LABEL="Show Tags"
-COM_CONTENT_FIELD_URL_DESC="The actual link to which users will be redirected."
-COM_CONTENT_FIELD_URL_LINK_TEXT_DESC="Text to display for the link."
-COM_CONTENT_FIELD_URLA_LABEL="Link A"
-COM_CONTENT_FIELD_URLA_LINK_TEXT_LABEL="Link A Text"
-COM_CONTENT_FIELD_URLB_LABEL="Link B"
-COM_CONTENT_FIELD_URLB_LINK_TEXT_LABEL="Link B Text"
-COM_CONTENT_FIELD_URLC_LABEL="Link C"
-COM_CONTENT_FIELD_URLC_LINK_TEXT_LABEL="Link C Text"
-COM_CONTENT_FIELD_URLS_OPTIONS="URL Options"
-COM_CONTENT_FIELD_URLSPOSITION_LABEL="Positioning of the Links"
-COM_CONTENT_FIELD_URLSPOSITION_DESC="Display the links above or below the content."
 COM_CONTENT_FIELD_VALUE_USE_ARTICLE_SETTINGS="Use Article Settings"
 COM_CONTENT_FIELD_VERSION_DESC="A count of the number of times this article has been revised."
 COM_CONTENT_FIELD_VERSION_LABEL="Revision"
@@ -107,7 +96,7 @@ COM_CONTENT_FIELDS_ARTICLE_FIELD_EDIT_TITLE="Articles: Edit Field"
 COM_CONTENT_FIELDS_TYPE_MODAL_ARTICLE="Article"
 COM_CONTENT_FIELDSET_PUBLISHING="Publishing"
 COM_CONTENT_FIELDSET_RULES="Permissions"
-COM_CONTENT_FIELDSET_URLS_AND_IMAGES="Images and Links"
+COM_CONTENT_FIELDSET_URLS_AND_IMAGES="Images"
 COM_CONTENT_FILTER_SEARCH_DESC="Search in title and alias. Prefix with ID: or AUTHOR: to search for an article ID or article author."
 COM_CONTENT_FILTER_SEARCH_LABEL="Search Articles"
 COM_CONTENT_FLOAT_DESC="Controls placement of the image."
@@ -168,10 +157,10 @@ COM_CONTENT_SHARED_LABEL="Shared"
 COM_CONTENT_SHOW_ARTICLE_OPTIONS_DESC="Show or hide article options slider in the Backend article edit view. These options allow overriding of the global options."
 COM_CONTENT_SHOW_ARTICLE_OPTIONS_LABEL="Show Article Options"
 COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC="If Show, empty categories will display. A category is only empty if it has no articles or subcategories."
-COM_CONTENT_SHOW_IMAGES_URLS_BACK_DESC="Show or hide fields to insert images and links in the Administrator."
-COM_CONTENT_SHOW_IMAGES_URLS_BACK_LABEL="Administrator Images and Links"
-COM_CONTENT_SHOW_IMAGES_URLS_FRONT_DESC="Show or hide fields to insert images and links when Frontend editing."
-COM_CONTENT_SHOW_IMAGES_URLS_FRONT_LABEL="Frontend Images and Links"
+COM_CONTENT_SHOW_IMAGES_BACK_DESC="Show or hide fields to insert images in the Administrator."
+COM_CONTENT_SHOW_IMAGES_BACK_LABEL="Administrator Images"
+COM_CONTENT_SHOW_IMAGES_FRONT_DESC="Show or hide fields to insert images when Frontend editing."
+COM_CONTENT_SHOW_IMAGES_FRONT_LABEL="Frontend Images"
 COM_CONTENT_SHOW_PUBLISHING_OPTIONS_DESC="Show or hide the publishing options slider in the article edit view. These options allow changes in dates and author identities."
 COM_CONTENT_SHOW_PUBLISHING_OPTIONS_LABEL="Show Publishing Options"
 COM_CONTENT_SLIDER_EDITOR_CONFIG="Configure Edit Screen"
diff --git a/components/com_content/forms/article.xml b/components/com_content/forms/article.xml
index a65f6117a7b49..023e3fbe595d5 100644
--- a/components/com_content/forms/article.xml
+++ b/components/com_content/forms/article.xml
@@ -300,79 +300,7 @@
 			</field>
 		</fieldset>
 	</fields>
-	<fields name="urls">
-		<field
-			name="urla"
-			type="url"
-			label="COM_CONTENT_FIELD_URLA_LABEL"
-			description="COM_CONTENT_FIELD_URL_DESC"
-			validate="url"
-			filter="url"
-			relative="true"
-		/>
-
-		<field 
-			name="urlatext"
-			type="text"
-			label="COM_CONTENT_FIELD_URLA_LINK_TEXT_LABEL"
-			description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
-			class="inputbox"
-			size="20" 
-		/>
-		
-		<field
-			name="targeta"
-			type="hidden"
-		/>
-
-		<field
-			name="urlb"
-			type="url"
-			label="COM_CONTENT_FIELD_URLB_LABEL"
-			description="COM_CONTENT_FIELD_URL_DESC"
-			validate="url"
-			filter="url"
-			relative="true"
-		/>
-
-		<field 
-			name="urlbtext"
-			type="text"
-			label="COM_CONTENT_FIELD_URLB_LINK_TEXT_LABEL"
-			description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
-			class="inputbox"
-			size="20" 
-		/>
-		
-		<field
-			name="targetb"
-			type="hidden"
-		/>
-		
-		<field
-			name="urlc"
-			type="url"
-			label="COM_CONTENT_FIELD_URLC_LABEL"
-			description="COM_CONTENT_FIELD_URL_DESC"
- 			validate="url"
-			filter="url"
-			relative="true"
-		/>
 
-		<field
-			name="urlctext"
-			type="text"
-			label="COM_CONTENT_FIELD_URLC_LINK_TEXT_LABEL"
-			description="COM_CONTENT_FIELD_URL_LINK_TEXT_DESC"
-			class="inputbox"
-			size="20" 
-		/>
-		
-		<field
-			name="targetc"
-			type="hidden"
-		/>
-	</fields>
 	<fields name="metadata">
 		<fieldset 
 			name="jmetadata"