Skip to content

[4.0] Fixing iframes missing assets #27187

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

Merged
wilsonge merged 9 commits into from
Dec 3, 2019
Merged

[4.0] Fixing iframes missing assets #27187

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
25cadbb
Fixing 26077 iframes part
dgrammatiko Dec 1, 2019
70b42fa
Typo
dgrammatiko Dec 2, 2019
bd7aea6
Update administrator/templates/atum/component.php
dgrammatiko Dec 2, 2019
462671b
Merge branch '4.0-dev' into patch-3
infograf768 Dec 2, 2019
de4482b
Merge branch '4.0-dev' into patch-3
infograf768 Dec 3, 2019
9cff525
Update administrator/templates/atum/component.php
dgrammatiko Dec 3, 2019
d007eeb
Update administrator/templates/atum/component.php
dgrammatiko Dec 3, 2019
a9c46be
Update administrator/templates/atum/component.php
dgrammatiko Dec 3, 2019
898b15b
Merge branch '4.0-dev' into patch-3
infograf768 Dec 3, 2019
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
20 changes: 10 additions & 10 deletions administrator/templates/atum/component.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@
/** @var JDocumentHtml $this */

$lang = Factory::getLanguage();
$wa = $this->getWebAssetManager();

// Add JavaScript Frameworks
HTMLHelper::_('script', 'vendor/focus-visible/focus-visible.min.js', ['version' => 'auto', 'relative' => true]);
// Enable assets
$wa->enableAsset('template.atum.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr'));
$wa->enableAsset('fontawesome-free');

// Load template CSS file
HTMLHelper::_('stylesheet', 'bootstrap.css', ['version' => 'auto', 'relative' => true]);
HTMLHelper::_('stylesheet', 'vendor/fontawesome-free/fontawesome.min.css', ['version' => 'auto', 'relative' => true]);
HTMLHelper::_('stylesheet', 'template' . ($this->direction === 'rtl' ? '-rtl' : '') . '.css', ['version' => 'auto', 'relative' => true]);
// Load specific language related CSS
HTMLHelper::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', ['version' => 'auto']);

// Load custom CSS file
HTMLHelper::_('stylesheet', 'user.css', array('version' => 'auto', 'relative' => true));
// Load custom stylesheet if available
HTMLHelper::_('stylesheet', 'custom.css', ['version' => 'auto', 'relative' => true]);

// Load specific language related CSS
HTMLHelper::_('stylesheet', 'administrator/language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', array('version' => 'auto'));
// TODO: remove the following line whenever the assets are fixed to respect the overrides
HTMLHelper::_('stylesheet', 'vendor/choicesjs/choices.css', ['version' => 'auto', 'relative' => true]);
?>

<!DOCTYPE html>
Expand Down