Skip to content

Correcting RTL in Postinstall #25604

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
merged 7 commits into from
Jul 31, 2019
Merged

Correcting RTL in Postinstall #25604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
91a9137
[staging] Correcting RTL in Postinstall
infograf768 Jul 17, 2019
444bbad
JFactory to Factory
infograf768 Jul 17, 2019
0e91a57
cs
infograf768 Jul 18, 2019
ce28993
some corrections
infograf768 Jul 20, 2019
5346788
Merge branch 'staging' into postinstall_rtl
infograf768 Jul 23, 2019
0317860
Update administrator/components/com_postinstall/views/messages/tmpl/d…
infograf768 Jul 25, 2019
45ccf65
Merge branch 'staging' into postinstall_rtl
infograf768 Jul 26, 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
10 changes: 7 additions & 3 deletions administrator/components/com_postinstall/views/messages/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@

defined('_JEXEC') or die;

$renderer = JFactory::getDocument()->loadRenderer('module');
use Joomla\CMS\Factory;

$lang = Factory::getLanguage();
$renderer = Factory::getDocument()->loadRenderer('module');
$options = array('style' => 'raw');
$mod = JModuleHelper::getModule('mod_feed');
$param = array(
Expand All @@ -19,6 +22,7 @@
'rssimage' => 1,
'rssitems' => 5,
'rssitemdesc' => 1,
'rssrtl' => $lang->isRtl() ? 1 : 0,
'word_count' => 200,
'cache' => 0,
);
Expand Down Expand Up @@ -61,7 +65,7 @@
<?php echo JText::_($item->action_key); ?>
</a>
<?php endif; ?>
<?php if (JFactory::getUser()->authorise('core.edit.state', 'com_postinstall')) : ?>
<?php if (Factory::getUser()->authorise('core.edit.state', 'com_postinstall')) : ?>
<a href="index.php?option=com_postinstall&amp;view=message&amp;task=unpublish&amp;id=<?php echo $item->postinstall_message_id; ?>&amp;<?php echo $this->token; ?>=1" class="btn btn-inverse btn-small">
<?php echo JText::_('COM_POSTINSTALL_BTN_HIDE'); ?>
</a>
Expand All @@ -72,7 +76,7 @@
<?php endif; ?>
<?php if ($this->eid == 700) : ?>
</div>
<div class="span4">
<div class="span4"<?php if ($lang->isRtl()) : ?> style="padding-right: 20px;"<?php endif; ?>>
<h2><?php echo JText::_('COM_POSTINSTALL_LBL_RELEASENEWS'); ?></h2>
<?php echo $renderer->render($mod, $params, $options); ?>
</div>
Expand Down
8 changes: 7 additions & 1 deletion administrator/modules/mod_feed/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,13 @@

<!-- Show items -->
<?php if (!empty($feed)) : ?>
<ul class="newsfeed<?php echo $params->get('moduleclass_sfx'); ?>">
<?php // postinstall override ?>
<?php if ($rssurl === 'https://www.joomla.org/announcements/release-news.feed?type=rss') : ?>
<?php $style = 'style="direction: ltr; text-align: left !important;"'; ?>
<ul class="newsfeed" <?php echo $style; ?>>
<?php else : ?>
<ul class="newsfeed<?php echo $params->get('moduleclass_sfx'); ?>">
<?php endif; ?>
<?php for ($i = 0; $i < $params->get('rssitems', 3); $i++) :

if (!$feed->offsetExists($i)) :
Expand Down