Skip to content

Commit b7a2c1b

Browse files
committed
IMP: allow empty values
1 parent 13a00f7 commit b7a2c1b

File tree

3 files changed

+26
-18
lines changed

3 files changed

+26
-18
lines changed

view/frontend/templates/hyva/about.phtml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ $storeMenus = $viewModels->require(StoreInfoMenus::class);
2020

2121
$menu = $storeMenus->getAboutMenu();
2222

23-
$classList = $block->getClassList() ?: 'pr-4 lg:w-1/4 md:w-1/2';
24-
$classListTitle = $block->getClassListTitle() ?: 'text-md leading-5 font-semibold tracking-wider uppercase';
25-
$classListMenu = $block->getClassListMenu() ?: 'mt-4 space-y-4 hover:[&_a]:underline';
2623
$title = $block->getTitle() !== null ? $block->getTitle() : "About";
24+
$classList = $block->getClassList() !== null ? $block->getClassList() : 'pr-4 lg:w-1/4 md:w-1/2';
25+
$classListTitle = $block->getClassListTitle() !== null ? $block->getClassListTitle() : 'text-md leading-5 font-semibold tracking-wider uppercase';
26+
$classListMenu = $block->getClassListMenu() !== null ? $block->getClassListMenu() : 'mt-4 space-y-4';
27+
$classListMenuItem = $block->getClassListMenuItem() !== null ? $block->getClassListMenuItem() : 'underline';
2728

2829
if (count($menu) === 0) {
2930
return '';
@@ -41,9 +42,10 @@ if (count($menu) === 0) {
4142
<ul class="<?= $escaper->escapeHtmlAttr($classListMenu) ?>">
4243
<?php foreach ($menu as $item): ?>
4344
<li>
44-
<a href="<?= $escaper->escapeUrl($block->getUrl($item['url'])); ?>">
45-
<?= $escaper->escapeHtml($item['text']); ?>
46-
</a>
45+
<a
46+
href="<?= $escaper->escapeUrl($block->getUrl($item['url'])); ?>"
47+
class="<?= $escaper->escapeHtmlAttr($classListMenuItem) ?>"
48+
><?= $escaper->escapeHtml($item['text']); ?></a>
4749
</li>
4850
<?php endforeach ?>
4951
</ul>

view/frontend/templates/hyva/legal.phtml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ $storeMenus = $viewModels->require(StoreInfoMenus::class);
2020

2121
$menu = $storeMenus->getLegalMenu();
2222

23-
$classList = $block->getClassList() ?: 'pr-4 lg:w-1/4 md:w-1/2';
24-
$classListTitle = $block->getClassListTitle() ?: 'text-md leading-5 font-semibold tracking-wider uppercase';
25-
$classListMenu = $block->getClassListMenu() ?: 'mt-4 space-y-4 hover:[&_a]:underline';
23+
$title = $block->getTitle() !== null ? $block->getTitle() : "Legal";
24+
$classList = $block->getClassList() !== null ? $block->getClassList() : 'pr-4 lg:w-1/4 md:w-1/2';
25+
$classListTitle = $block->getClassListTitle() !== null ? $block->getClassListTitle() : 'text-md leading-5 font-semibold tracking-wider uppercase';
26+
$classListMenu = $block->getClassListMenu() !== null ? $block->getClassListMenu() : 'mt-4 space-y-4';
27+
$classListMenuItem = $block->getClassListMenuItem() !== null ? $block->getClassListMenuItem() : 'underline';
2628

2729
if (count($menu) === 0) {
2830
return '';
@@ -40,9 +42,10 @@ if (count($menu) === 0) {
4042
<ul class="<?= $escaper->escapeHtmlAttr($classListMenu) ?>">
4143
<?php foreach ($menu as $item): ?>
4244
<li>
43-
<a href="<?= $escaper->escapeUrl($block->getUrl($item['url'])); ?>">
44-
<?= $escaper->escapeHtml($item['text']); ?>
45-
</a>
45+
<a
46+
href="<?= $escaper->escapeUrl($block->getUrl($item['url'])); ?>"
47+
class="<?= $escaper->escapeHtmlAttr($classListMenuItem) ?>"
48+
><?= $escaper->escapeHtml($item['text']); ?></a>
4649
</li>
4750
<?php endforeach ?>
4851
</ul>

view/frontend/templates/hyva/services.phtml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ $storeMenus = $viewModels->require(StoreInfoMenus::class);
2020

2121
$menu = $storeMenus->getServicesMenu();
2222

23-
$classList = $block->getClassList() ?: 'pr-4 lg:w-1/4 md:w-1/2';
24-
$classListTitle = $block->getClassListTitle() ?: 'text-md leading-5 font-semibold tracking-wider uppercase';
25-
$classListMenu = $block->getClassListMenu() ?: 'mt-4 space-y-4 hover:[&_a]:underline';
2623
$title = $block->getTitle() !== null ? $block->getTitle() : "Services";
24+
$classList = $block->getClassList() !== null ? $block->getClassList() : 'pr-4 lg:w-1/4 md:w-1/2';
25+
$classListTitle = $block->getClassListTitle() !== null ? $block->getClassListTitle() : 'text-md leading-5 font-semibold tracking-wider uppercase';
26+
$classListMenu = $block->getClassListMenu() !== null ? $block->getClassListMenu() : 'mt-4 space-y-4';
27+
$classListMenuItem = $block->getClassListMenuItem() !== null ? $block->getClassListMenuItem() : 'underline';
2728

2829
if (count($menu) === 0) {
2930
return '';
@@ -41,10 +42,12 @@ if (count($menu) === 0) {
4142
<ul class="<?= $escaper->escapeHtmlAttr($classListMenu) ?>">
4243
<?php foreach ($menu as $item): ?>
4344
<li>
44-
<a href="<?= $escaper->escapeUrl($block->getUrl($item['url'])); ?>">
45-
<?= $escaper->escapeHtml($item['text']); ?>
46-
</a>
45+
<a
46+
href="<?= $escaper->escapeUrl($block->getUrl($item['url'])); ?>"
47+
class="<?= $escaper->escapeHtmlAttr($classListMenuItem) ?>"
48+
><?= $escaper->escapeHtml($item['text']); ?></a>
4749
</li>
4850
<?php endforeach ?>
4951
</ul>
5052
</nav>
53+

0 commit comments

Comments
 (0)