Skip to content

[4.0] Cassiopeia - update card mod chrome #30716

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
Scrabble96 wants to merge 20 commits into from
Closed

[4.0] Cassiopeia - update card mod chrome #30716

Changes from 18 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
65c24cf
Update cardGrey.php
Scrabble96 Sep 21, 2020
a769fd9
Update default.php
Scrabble96 Sep 21, 2020
d83e024
Create noTitle.php
Scrabble96 Sep 21, 2020
606ffc0
Update templates/cassiopeia/html/layouts/chromes/default.php
Scrabble96 Sep 21, 2020
a117c2c
Update templates/cassiopeia/html/layouts/chromes/cardGrey.php
Scrabble96 Sep 21, 2020
6e099a7
Update cardGrey.php
Scrabble96 Sep 21, 2020
c5a19f0
Update default.php
Scrabble96 Sep 21, 2020
9bda833
Update cardGrey.php
Scrabble96 Sep 22, 2020
0d175a5
Update default.php
Scrabble96 Sep 22, 2020
a329003
Update cardGrey.php
Scrabble96 Sep 22, 2020
40e6022
Update default.php
Scrabble96 Sep 22, 2020
ff19173
Update cardGrey.php
Scrabble96 Sep 22, 2020
4f6d35a
Delete noTitle.php
Scrabble96 Sep 22, 2020
b8f8d33
Rename default.php to card.php
Scrabble96 Sep 23, 2020
445f0e6
Merge branch '4.0-dev' into 4.0-Cassiopeia-update-mod-chromes-and-add…
richard67 Sep 23, 2020
c614e23
Merge remote-tracking branch 'upstream/4.0-dev' into 4.0-Cassiopeia-u…
richard67 Sep 24, 2020
2bb9e0c
Update card.php
Scrabble96 Sep 25, 2020
6bdab92
Update templates/cassiopeia/html/layouts/chromes/card.php
Scrabble96 Sep 25, 2020
5ace129
Update templates/cassiopeia/html/layouts/chromes/card.php
Scrabble96 Sep 27, 2020
64bde14
Update card.php
Scrabble96 Sep 28, 2020
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
40 changes: 12 additions & 28 deletions templates/cassiopeia/html/layouts/chromes/card.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,34 +21,18 @@
}

$moduleTag = $params->get('module_tag', 'div');
$moduleAttribs = [];
$moduleAttribs['class'] = $module->position . ' card ' . htmlspecialchars($params->get('moduleclass_sfx'), ENT_QUOTES, 'UTF-8');
$headerTag = htmlspecialchars($params->get('header_tag', 'h4'), ENT_QUOTES, 'UTF-8');
$modId = 'mod-' . $module->id;
$headerTag = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');
$headerClass = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8');
$headerAttribs = [];
$headerAttribs['class'] = $headerClass;

if ($module->showtitle) :
$moduleAttribs['aria-labelledby'] = 'mod-' . $module->id;
$headerAttribs['id'] = 'mod-' . $module->id;

if ($headerClass !== 'card-title') :
$headerAttribs['class'] .= 'card-header ' . $headerClass;
endif;
else:
$moduleAttribs['aria-label'] = $module->title;
endif;

$header = '<' . $headerTag . ' ' . ArrayHelper::toString($headerAttribs) . '>' . $module->title . '</' . $headerTag . '>';
?>
<<?php echo $moduleTag; ?> <?php echo ArrayHelper::toString($moduleAttribs); ?>>
<?php if ($module->showtitle && $headerClass !== 'card-title') : ?>
<?php echo $header; ?>
<?php endif; ?>
<div class="card-body">
<?php if ($module->showtitle && $headerClass === 'card-title') : ?>
<?php echo $header; ?>
<?php endif; ?>
<?php echo $module->content; ?>
</div>
</<?php echo $moduleTag; ?>>
if ($module->showtitle) : ?>
<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-labelledby="<?php echo $module->title; ?>">
Comment thread
Scrabble96 marked this conversation as resolved.
Outdated
<<?php echo $headerTag; ?> class="card-header <?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
<div class="card-body"><?php echo $module->content; ?></div>
</<?php echo $moduleTag; ?>>
<?php else : ?>
<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-label="<?php echo $module->title; ?>">
<div class="card-body"><?php echo $module->content; ?></div>
</<?php echo $moduleTag; ?>>
<?php endif; ?>