Skip to content

[4.0] Removing the wrong spaces in front of module/pageclass/whatever sfx #23496

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

Closed
Hackwar wants to merge 6 commits into from
Closed

[4.0] Removing the wrong spaces in front of module/pageclass/whatever sfx #23496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1786095
Removing the wrong spaces in front of module/pageclass/whatever sfx
Hackwar Jan 10, 2019
a1fbb30
Merge branch '4.0-dev' into j4sfx
infograf768 Jan 11, 2019
ef8a0ee
Merge branch '4.0-dev' into j4sfx
infograf768 Jan 12, 2019
5bf62c7
Merge branch '4.0-dev' into j4sfx
infograf768 Jan 13, 2019
c28d18a
Merge branch '4.0-dev' into j4sfx
infograf768 Jan 14, 2019
8e43b05
Merge branch '4.0-dev' into j4sfx
infograf768 Jan 14, 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
2 changes: 1 addition & 1 deletion administrator/language/en-GB/en-GB.com_modules.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ COM_MODULES_FIELD_CACHING_LABEL="Caching"
COM_MODULES_FIELD_CLIENT_ID_LABEL="Module Location"
COM_MODULES_FIELD_CONTENT_LABEL="Text"
COM_MODULES_FIELD_MODULE_LABEL="Module Type"
COM_MODULES_FIELD_MODULECLASS_SFX_LABEL="Module Class"
COM_MODULES_FIELD_MODULECLASS_SFX_LABEL="Module Class Suffix"
COM_MODULES_FIELD_NOTE_LABEL="Note"
COM_MODULES_FIELD_POSITION_LABEL="Position"
COM_MODULES_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
Expand Down
2 changes: 1 addition & 1 deletion administrator/modules/mod_stats_admin/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

defined('_JEXEC') or die;
?>
<ul class="list-group list-group-flush stats-module <?php echo $moduleclass_sfx ?>">
<ul class="list-group list-group-flush stats-module<?php echo $moduleclass_sfx ?>">
<?php foreach ($list as $item) : ?>
<li class="list-group-item"><span class="mr-2 fa-fw fa fa-<?php echo $item->icon; ?>" title="<?php echo $item->title; ?>" aria-hidden="true"></span> <?php echo $item->title; ?> <?php echo $item->data; ?></li>
<?php endforeach; ?>
Expand Down
2 changes: 1 addition & 1 deletion components/com_wrapper/tmpl/wrapper/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<?php else : ?>
title="<?php echo $this->escape($this->params->get('page_title')); ?>"
<?php endif; ?>
class="com-wrapper__iframe wrapper <?php echo $this->pageclass_sfx; ?>">
class="com-wrapper__iframe wrapper<?php echo $this->pageclass_sfx; ?>">
<?php echo JText::_('COM_WRAPPER_NO_IFRAMES'); ?>
</iframe>
</div>
2 changes: 1 addition & 1 deletion templates/cassiopeia/error.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
. ($layout ? ' layout-' . $layout : ' no-layout')
. ($task ? ' task-' . $task : ' no-task')
. ($itemid ? ' itemid-' . $itemid : '')
. ' ' . $pageclass;
. $pageclass;
echo ($this->direction == 'rtl' ? ' rtl' : '');
?>">
<header class="header full-width">
Expand Down
4 changes: 2 additions & 2 deletions templates/cassiopeia/html/modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function modChrome_default($module, &$params, &$attribs)

if ($module->content)
{
echo '<' . $moduleTag . ' class="' . $modulePos . ' card ' . htmlspecialchars($params->get('moduleclass_sfx')) . '">';
echo '<' . $moduleTag . ' class="' . $modulePos . ' card' . htmlspecialchars($params->get('moduleclass_sfx')) . '">';
if ($module->showtitle && $headerClass !== 'card-title')
{
echo '<' . $headerTag . ' class="card-header' . $headerClass . '">' . $module->title . '</' . $headerTag . '>';
Expand All @@ -68,7 +68,7 @@ function modChrome_cardGrey($module, &$params, &$attribs)

if ($module->content)
{
echo '<' . $moduleTag . ' class="' . $modulePos . ' card card-grey ' . htmlspecialchars($params->get('moduleclass_sfx')) . '">';
echo '<' . $moduleTag . ' class="' . $modulePos . ' card card-grey' . htmlspecialchars($params->get('moduleclass_sfx')) . '">';
if ($module->showtitle && $headerClass !== 'card-title')
{
echo '<' . $headerTag . ' class="card-header' . $headerClass . '">' . $module->title . '</' . $headerTag . '>';
Expand Down
2 changes: 1 addition & 1 deletion templates/cassiopeia/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
. ($layout ? ' layout-' . $layout : ' no-layout')
. ($task ? ' task-' . $task : ' no-task')
. ($itemid ? ' itemid-' . $itemid : '')
. ' ' . $pageclass;
. $pageclass;
echo ($this->direction == 'rtl' ? ' rtl' : '');
?>">
<div class="grid-child container-header full-width">
Expand Down
6 changes: 3 additions & 3 deletions templates/system/html/modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function modChrome_html5($module, &$params, &$attribs)
$headerClass = !empty($headerClass) ? ' class="' . htmlspecialchars($headerClass, ENT_COMPAT, 'UTF-8') . '"' : '';

if (!empty ($module->content)) : ?>
<<?php echo $moduleTag; ?> class="moduletable <?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">
<<?php echo $moduleTag; ?> class="moduletable<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8') . $moduleClass; ?>">

<?php if ((bool) $module->showtitle) :?>
<<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
Expand All @@ -50,7 +50,7 @@ function modChrome_html5($module, &$params, &$attribs)
*/
function modChrome_table($module, &$params, &$attribs)
{ ?>
<table cellpadding="0" cellspacing="0" class="moduletable <?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8'); ?>">
<table cellpadding="0" cellspacing="0" class="moduletable<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8'); ?>">
<?php if ((bool) $module->showtitle) : ?>
<tr>
<th>
Expand Down Expand Up @@ -112,7 +112,7 @@ function modChrome_xhtml($module, &$params, &$attribs)
*/
function modChrome_rounded($module, &$params, &$attribs)
{ ?>
<div class="module <?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8'); ?>">
<div class="module<?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT, 'UTF-8'); ?>">
<div>
<div>
<div>
Expand Down