Skip to content

Commit 4656add

Browse files
zero-24Quyrichard67
authored
[3.10] Make sure we follow the inline php cs rules for template files (#32937)
* Make sure we follow the inline php cs rules for template files * Update administrator/components/com_joomlaupdate/views/default/tmpl/default_preupdatecheck.php Co-authored-by: Quy <[email protected]> * Update administrator/components/com_joomlaupdate/views/default/tmpl/default_preupdatecheck.php Co-authored-by: Quy <[email protected]> * Update administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php Co-authored-by: Quy <[email protected]> * Update administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php Co-authored-by: Quy <[email protected]> * Update administrator/components/com_joomlaupdate/views/default/tmpl/default_preupdatecheck.php Co-authored-by: Quy <[email protected]> * Update administrator/components/com_joomlaupdate/views/default/tmpl/default_preupdatecheck.php Co-authored-by: Quy <[email protected]> * Update administrator/components/com_joomlaupdate/views/default/tmpl/default_preupdatecheck.php Co-authored-by: Quy <[email protected]> * Update administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php Co-authored-by: Quy <[email protected]> * Update administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php Co-authored-by: Quy <[email protected]> * Apply suggestions from code review * Apply suggestions from code review * Remove space Co-authored-by: Quy <[email protected]> Co-authored-by: Richard Fath <[email protected]>
1 parent 618e2c3 commit 4656add

File tree

2 files changed

+58
-60
lines changed

2 files changed

+58
-60
lines changed

‎administrator/components/com_joomlaupdate/views/default/tmpl/default_preupdatecheck.php‎

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212
/** @var JoomlaupdateViewDefault $this */
1313

1414
// JText::script doesn't have a sprintf equivalent so work around this
15-
JFactory::getDocument()->addScriptDeclaration("var COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION = '" . JText::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION', '<span class="icon-chevron-right large-icon" style="font-size:0.85rem"></span>', true) . "';");
16-
JFactory::getDocument()->addScriptDeclaration("var COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION = '" . JText::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION', '<span class="icon-chevron-up large-icon" style="font-size:0.85rem"></span>', true) . "';");
17-
15+
JFactory::getDocument()->addScriptDeclaration("var COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION = '" . JText::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION', '<span class="icon-chevron-right small"></span>', true) . "';");
16+
JFactory::getDocument()->addScriptDeclaration("var COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION = '" . JText::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_LESS_COMPATIBILITY_INFORMATION', '<span class="icon-chevron-up small"></span>', true) . "';");
1817
JFactory::getDocument()->addScriptDeclaration("var nonCoreCriticalPlugins = '" . json_encode($this->nonCoreCriticalPlugins) . "';");
1918

2019
$compatibilityTypes = array(
@@ -54,22 +53,22 @@
5453
</p>
5554
<div class="row-fluid">
5655
<fieldset class="span6 ">
57-
<?php
58-
$labelClass = 'success';
59-
foreach ($this->phpOptions as $option) :
60-
if (!$option->state)
61-
{
62-
$labelClass = 'important';
63-
break;
64-
}
65-
endforeach;
66-
?>
56+
<?php $labelClass = 'success'; ?>
57+
<?php foreach ($this->phpOptions as $option) : ?>
58+
<?php if (!$option->state) : ?>
59+
<?php $labelClass = 'important'; ?>
60+
<?php break; ?>
61+
<?php endif; ?>
62+
<?php endforeach; ?>
6763
<legend class="label label-<?php echo $labelClass;?>">
6864
<h3>
69-
<?php
70-
echo $labelClass === 'important' ? JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_REQUIRED_SETTINGS_WARNING') : JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_REQUIRED_SETTINGS_PASSED');
71-
?>
72-
<div class="settingstoggle" data-state="closed"><?php echo JText::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION', '<span class="icon-chevron-right large-icon" style="font-size:0.85rem"></span>'); ?></div>
65+
<?php echo $labelClass === 'important' ? JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_REQUIRED_SETTINGS_WARNING') : JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_REQUIRED_SETTINGS_PASSED'); ?>
66+
<div class="settingstoggle" data-state="closed">
67+
<?php echo JText::sprintf(
68+
'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION',
69+
'<span class="icon-chevron-right small"></span>'
70+
); ?>
71+
</div>
7372
</h3>
7473
</legend>
7574
<div class="settingsInfo hidden" >
@@ -104,24 +103,23 @@
104103
</table>
105104
</div>
106105
</fieldset>
107-
<fieldset class="span6 ">
108-
<?php
109-
$labelClass = 'success';
110-
foreach ($this->phpSettings as $setting) :
111-
if ($setting->state !== $setting->recommended)
112-
{
113-
$labelClass = 'warning';
114-
break;
115-
}
116-
endforeach;
117-
?>
118-
119-
<legend class="label label-<?php echo $labelClass;?>">
106+
<fieldset class="span6">
107+
<?php $labelClass = 'success'; ?>
108+
<?php foreach ($this->phpSettings as $setting) : ?>
109+
<?php if ($setting->state !== $setting->recommended) : ?>
110+
<?php $labelClass = 'warning'; ?>
111+
<?php break; ?>
112+
<?php endif; ?>
113+
<?php endforeach; ?>
114+
<legend class="label label-<?php echo $labelClass; ?>">
120115
<h3>
121-
<?php
122-
echo $labelClass === 'warning' ? JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS_WARNING') : JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS_PASSED');
123-
?>
124-
<div class="settingstoggle" data-state="closed"><?php echo JText::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION', '<span class="icon-chevron-right large-icon" style="font-size:0.85rem"></span>'); ?></div>
116+
<?php echo $labelClass === 'warning' ? JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS_WARNING') : JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_RECOMMENDED_SETTINGS_PASSED'); ?>
117+
<div class="settingstoggle" data-state="closed">
118+
<?php echo JText::sprintf(
119+
'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION',
120+
'<span class="icon-chevron-right small"></span>'
121+
); ?>
122+
</div>
125123
</h3>
126124
</legend>
127125
<div class="settingsInfo hidden" >
@@ -173,10 +171,15 @@
173171
<?php $compatibilityDisplayNotes = $compatibilityData['notes']; ?>
174172
<?php $compatibilityTypeGroup = $compatibilityData['group']; ?>
175173
<fieldset id="compatibilitytype<?php echo $compatibilityTypeGroup;?>" class="span12 compatibilitytypes">
176-
<legend class="label <?php echo $compatibilityDisplayClass;?>">
174+
<legend class="label <?php echo $compatibilityDisplayClass; ?>">
177175
<h3>
178176
<?php if ($compatibilityType !== "COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_RUNNING_PRE_UPDATE_CHECKS") : ?>
179-
<div class="compatibilitytoggle" data-state="closed"><?php echo JText::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION', '<span class="icon-chevron-right large-icon" style="font-size:0.85rem"></span>'); ?></div>
177+
<div class="compatibilitytoggle" data-state="closed">
178+
<?php echo JText::sprintf(
179+
'COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_SHOW_MORE_COMPATIBILITY_INFORMATION',
180+
'<span class="icon-chevron-right small"></span>'
181+
); ?>
182+
</div>
180183
<?php endif; ?>
181184
<?php echo JText::_($compatibilityType); ?>
182185
</h3>

‎administrator/components/com_joomlaupdate/views/default/tmpl/default_update.php‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<tfoot>
117117
<tr id="preupdateCheckWarning">
118118
<td colspan="2">
119-
<div class="alert ">
119+
<div class="alert">
120120
<h4 class="alert-heading">
121121
<?php echo JText::_('WARNING'); ?>
122122
</h4>
@@ -130,7 +130,7 @@
130130
</tr>
131131
<tr id="preupdateCheckCompleteProblems" class="hidden">
132132
<td colspan="2">
133-
<div class="alert ">
133+
<div class="alert">
134134
<h4 class="alert-heading">
135135
<?php echo JText::_('WARNING'); ?>
136136
</h4>
@@ -196,31 +196,26 @@
196196
</td>
197197
<?php endif; ?>
198198
<?php endforeach; ?>
199-
<?php endif;?>
199+
<?php endif; ?>
200200
</td>
201201
<td>
202-
<?php
203-
$authorURL = "";
204-
if (isset($nonCoreCriticalPlugin->manifest_cache->authorUrl))
205-
{
206-
$authorURL = $nonCoreCriticalPlugin->manifest_cache->authorUrl;
207-
}
208-
elseif ($nonCoreCriticalPlugin->package_id > 0)
209-
{
210-
foreach ($this->nonCoreExtensions as $nonCoreExtension)
211-
{
212-
if ($nonCoreCriticalPlugin->package_id == $nonCoreExtension->extension_id)
213-
{
214-
$authorURL = $nonCoreExtension->manifest_cache->authorUrl;
215-
}
216-
}
217-
}
218-
?>
202+
<?php $authorURL = ''; ?>
203+
<?php if (isset($nonCoreCriticalPlugin->manifest_cache->authorUrl)) : ?>
204+
<?php $authorURL = $nonCoreCriticalPlugin->manifest_cache->authorUrl; ?>
205+
<?php elseif ($nonCoreCriticalPlugin->package_id > 0) : ?>
206+
<?php foreach ($this->nonCoreExtensions as $nonCoreExtension) : ?>
207+
<?php if ($nonCoreCriticalPlugin->package_id == $nonCoreExtension->extension_id) : ?>
208+
<?php $authorURL = $nonCoreExtension->manifest_cache->authorUrl; ?>
209+
<?php endif; ?>
210+
<?php endforeach; ?>
211+
<?php endif; ?>
219212
<?php if (!empty($authorURL)) : ?>
220-
<a href="<?php echo $authorURL; ?>" target="_blank" >
213+
<a href="<?php echo $authorURL; ?>" target="_blank">
221214
<?php echo $authorURL; ?>
222215
<span class="icon-out-2" aria-hidden="true"></span>
223-
<span class="element-invisible"><?php echo JText::_('JBROWSERTARGET_NEW'); ?></span>
216+
<span class="element-invisible">
217+
<?php echo JText::_('JBROWSERTARGET_NEW'); ?>
218+
</span>
224219
</a>
225220
<?php endif;?>
226221
</td>
@@ -240,10 +235,10 @@
240235
</tr>
241236

242237
<tr>
243-
<td >
238+
<td>
244239
&nbsp;
245240
</td>
246-
<td >
241+
<td>
247242
<button class="btn btn-primary disabled submitupdate" type="submit" disabled>
248243
<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_INSTALLUPDATE'); ?>
249244
</button>

0 commit comments

Comments
 (0)