Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[4.0] com_content - Remove 'Links' feature from 'Images and Links' #17109

Closed
wants to merge 4 commits into from
Closed

[4.0] com_content - Remove 'Links' feature from 'Images and Links' #17109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cba42b
Remove from views
ciar4n Jul 13, 2017
217f1b4
Remove from xml
ciar4n Jul 13, 2017
ca7f481
Remove from edit.php
ciar4n Jul 13, 2017
6474da1
Languages strings and some missed bits
ciar4n Jul 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions administrator/components/com_content/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -442,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"
>
Expand All @@ -454,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"
>
Expand Down
132 changes: 4 additions & 128 deletions administrator/components/com_content/forms/article.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -600,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=""
>
Expand All @@ -612,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=""
>
Expand Down Expand Up @@ -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"
Expand Down
7 changes: 1 addition & 6 deletions administrator/components/com_content/tmpl/article/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; ?>
Expand Down
21 changes: 5 additions & 16 deletions administrator/language/en-GB/en-GB.com_content.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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."
Expand Down Expand Up @@ -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"
Expand Down
72 changes: 0 additions & 72 deletions components/com_content/forms/article.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 0 additions & 7 deletions components/com_content/tmpl/article/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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); ?>
Expand Down
10 changes: 0 additions & 10 deletions components/com_content/tmpl/article/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Loading