Skip to content

[4.0] Change all #30089

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
Quy merged 1 commit into from
Jul 13, 2020
Merged

[4.0] Change all #30089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions administrator/components/com_installer/tmpl/update/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@
<?php if($item->isMissingDownloadKey): ?>
<span class="badge badge-warning">
<span class="hasPopover"
title="<?= Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_LABEL') ?>"
data-content="<?= Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_TIP') ?>"
title="<?php echo Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_LABEL') ?>"
data-content="<?php echo Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_TIP') ?>"
>
<?php echo Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_LABEL'); ?>
</span>
Expand Down
8 changes: 4 additions & 4 deletions administrator/components/com_installer/tmpl/updatesites/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@
<?php if ($canEdit) : ?>
<a class="hasPopover"
href="<?php echo Route::_('index.php?option=com_installer&task=updatesite.edit&update_site_id=' . (int) $item->update_site_id); ?>"
title="<?= Text::_('COM_INSTALLER_UPDATESITE_EDIT_TITLE') ?>"
data-content="<?= Text::sprintf('COM_INSTALLER_UPDATESITE_EDIT_TIP', $item->update_site_name, $item->name) ?>"
title="<?php echo Text::_('COM_INSTALLER_UPDATESITE_EDIT_TITLE') ?>"
data-content="<?php echo Text::sprintf('COM_INSTALLER_UPDATESITE_EDIT_TIP', $item->update_site_name, $item->name) ?>"
>
<?php echo Text::_($item->update_site_name); ?>
</a>
Expand All @@ -117,8 +117,8 @@
<?php elseif ($item->downloadKey['supported']) : ?>
<span class="badge badge-warning">
<span class="hasPopover"
title="<?= Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_LABEL') ?>"
data-content="<?= Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_TIP') ?>"
title="<?php echo Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_LABEL') ?>"
data-content="<?php echo Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_TIP') ?>"
>
<?php echo Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_LABEL'); ?>
</span>
Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_modules/tmpl/select/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@
<div class="col-sm-6 offset-sm-2 col-md-4 offset-sm-4 offset-md-5 offset-lg-4">
<div class="form-inline">
<label class="sr-only" for="comModulesSelectSearch">
<?= Text::_('COM_MODULES_TYPE_CHOOSE'); ?>
<?php echo Text::_('COM_MODULES_TYPE_CHOOSE'); ?>
</label>
<div class="input-group mb-5 mr-sm-2">
<input type="text" value=""
class="form-control" id="comModulesSelectSearch"
placeholder="<?= Text::_('JSEARCH_FILTER'); ?>"
placeholder="<?php echo Text::_('JSEARCH_FILTER'); ?>"
>
<div class="input-group-append" aria-hidden="true">
<div class="input-group-text">
Expand Down
14 changes: 7 additions & 7 deletions administrator/modules/mod_login/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,24 +108,24 @@ class="form-control"
?>
<div class="form-group">
<button type="button"
class="btn btn-secondary btn-block mt-4 <?= $button['class'] ?? '' ?>"
class="btn btn-secondary btn-block mt-4 <?php echo $button['class'] ?? '' ?>"
<?php foreach ($dataAttributeKeys as $key): ?>
<?php echo $key ?>="<?php echo $button[$key] ?>"
<?php endforeach; ?>
<?php if ($button['onclick']): ?>
onclick="<?= $button['onclick'] ?>"
onclick="<?php echo $button['onclick'] ?>"
<?php endif; ?>
title="<?= Text::_($button['label']) ?>"
id="<?= $button['id'] ?>"
title="<?php echo Text::_($button['label']) ?>"
id="<?php echo $button['id'] ?>"
>
<?php if (!empty($button['icon'])): ?>
<span class="<?= $button['icon'] ?>"></span>
<span class="<?php echo $button['icon'] ?>"></span>
<?php elseif (!empty($button['image'])): ?>
<?= HTMLHelper::_('image', $button['image'], Text::_($button['tooltip'] ?? ''), [
<?php echo HTMLHelper::_('image', $button['image'], Text::_($button['tooltip'] ?? ''), [
'class' => 'icon',
], true) ?>
<?php endif; ?>
<?= Text::_($button['label']) ?>
<?php echo Text::_($button['label']) ?>
</button>
</div>
<?php endforeach; ?>
Expand Down
14 changes: 7 additions & 7 deletions components/com_users/tmpl/login/default_login.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,24 +76,24 @@
<div class="com-users-login__submit control-group">
<div class="controls">
<button type="button"
class="btn btn-secondary <?= $button['class'] ?? '' ?>"
class="btn btn-secondary <?php echo $button['class'] ?? '' ?>"
<?php foreach ($dataAttributeKeys as $key): ?>
<?php echo $key ?>="<?php echo $button[$key] ?>"
<?php endforeach; ?>
<?php if ($button['onclick']): ?>
onclick="<?= $button['onclick'] ?>"
onclick="<?php echo $button['onclick'] ?>"
<?php endif; ?>
title="<?= Text::_($button['label']) ?>"
id="<?= $button['id'] ?>"
title="<?php echo Text::_($button['label']) ?>"
id="<?php echo $button['id'] ?>"
>
<?php if (!empty($button['icon'])): ?>
<span class="<?= $button['icon'] ?>"></span>
<span class="<?php echo $button['icon'] ?>"></span>
<?php elseif (!empty($button['image'])): ?>
<?= HTMLHelper::_('image', $button['image'], Text::_($button['tooltip'] ?? ''), [
<?php echo HTMLHelper::_('image', $button['image'], Text::_($button['tooltip'] ?? ''), [
'class' => 'icon',
], true) ?>
<?php endif; ?>
<?= Text::_($button['label']) ?>
<?php echo Text::_($button['label']) ?>
</button>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions modules/mod_login/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class="btn btn-secondary <?php echo $button['class'] ?? '' ?>"
<?php echo $key ?>="<?php echo $button[$key] ?>"
<?php endforeach; ?>
<?php if ($button['onclick']): ?>
onclick="<?= $button['onclick'] ?>"
onclick="<?php echo $button['onclick'] ?>"
<?php endif; ?>
title="<?php echo Text::_($button['label']) ?>"
id="<?php echo $button['id'] ?>"
Expand All @@ -129,7 +129,7 @@ class="btn btn-secondary <?php echo $button['class'] ?? '' ?>"
'class' => 'icon',
], true) ?>
<?php endif; ?>
<?= Text::_($button['label']) ?>
<?php echo Text::_($button['label']) ?>
</button>
</div>
<?php endforeach; ?>
Expand Down