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

[5.1] Adding notice to global configuration for additional options in SEF plugin #42832

Merged
merged 7 commits into from Feb 28, 2024
Merged

[5.1] Adding notice to global configuration for additional options in SEF plugin #42832

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
21a2521
Adding notice to global configuration for additional options in SEF p…
LadySolveig Feb 18, 2024
e42c9d5
Update layouts/joomla/content/options_default.php
LadySolveig Feb 18, 2024
0a7916a
Update layouts/joomla/content/options_default.php
LadySolveig Feb 19, 2024
e8f9963
rework to support the existing rendering logic for description in glo…
LadySolveig Feb 19, 2024
ce6e7f6
Merge branch '5.1-dev' into 5.1/patch/note-config-sef
Quy Feb 20, 2024
c9f426a
Merge branch '5.1-dev' into 5.1/patch/note-config-sef
Quy Feb 23, 2024
be37bfc
Merge branch '5.1-dev' into 5.1/patch/note-config-sef
bembelimen Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion administrator/components/com_config/forms/application.xml
View file
Open in desktop
Expand Up @@ -684,7 +684,8 @@

<fieldset
name="seo"
label="CONFIG_SEO_SETTINGS_LABEL">
label="CONFIG_SEO_SETTINGS_LABEL"
description="COM_CONFIG_SEO_SETTINGS_DESC">

<field
name="sef"
Expand Down
1 change: 1 addition & 0 deletions administrator/language/en-GB/com_config.ini
View file
Open in desktop
Expand Up @@ -239,6 +239,7 @@ COM_CONFIG_SENDMAIL_METHOD_SMTP="SMTP"
COM_CONFIG_SENDMAIL_SUBJECT="Test mail from {SITENAME}"
COM_CONFIG_SENDMAIL_SUCCESS="The email was sent to <strong>%s</strong> using <strong>%s</strong>. You should check that you've received the test email."
COM_CONFIG_SENDMAIL_SUCCESS_FALLBACK="The email was sent to <strong>%s</strong> but using <strong>%s</strong> as fallback. You should check that you've received the test email."
COM_CONFIG_SEO_SETTINGS_DESC="Additional settings can be found in the \"System - SEF\" plugin."
COM_CONFIG_SEO_SETTINGS="SEO"
COM_CONFIG_SERVER="Server"
COM_CONFIG_SERVER_SETTINGS="Server"
Expand Down
9 changes: 9 additions & 0 deletions layouts/joomla/content/options_default.php
View file
Open in desktop
Expand Up @@ -12,10 +12,13 @@

use Joomla\CMS\Factory;
use Joomla\CMS\Form\FormHelper;
use Joomla\CMS\Language\Text;

/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
$wa = Factory::getApplication()->getDocument()->getWebAssetManager();

$fieldsets = $displayData->form->getFieldsets();

?>

<fieldset class="<?php echo !empty($displayData->formclass) ? $displayData->formclass : ''; ?>">
Expand All @@ -26,6 +29,12 @@
<?php $fieldsnames = explode(',', $displayData->fieldsname); ?>
<div class="form-grid">
<?php foreach ($fieldsnames as $fieldname) : ?>
<?php if (array_key_exists($fieldname, $fieldsets) && (property_exists($fieldsets[$fieldname], 'description') && (!empty($fieldsets[$fieldname]->description)))) : ?>
LadySolveig marked this conversation as resolved.
Show resolved Hide resolved
<div class="tab-description alert alert-info">
<span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
<?php echo Text::_($fieldsets[$fieldname]->description); ?>
</div>
<?php endif; ?>
<?php foreach ($displayData->form->getFieldset($fieldname) as $field) : ?>
<?php $datashowon = ''; ?>
<?php $groupClass = $field->type === 'Spacer' ? ' field-spacer' : ''; ?>
Expand Down