Skip to content

Commit c25d898

Browse files
jissereitsmajissereitsma
committed
Remove CSS util again
1 parent 9b4c88c commit c25d898

25 files changed

Lines changed: 141 additions & 161 deletions

‎view/adminhtml/templates/form.phtml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@ if (!isset($viewModel)) {
2020
throw new RuntimeException('Did you make sure to declare the block "'.$block->getNameInLayout().'" as a Loki Component via "etc/loki_components.xml"?');
2121
}
2222
?>
23-
<div class="<?= $css('loki-form form') ?>">
23+
<div class="loki-form form">
2424
<?= /* @noEscape */ $blockRenderer->html(
2525
$block,
2626
'loki-admin.form.actions',
2727
['view_model' => $viewModel]
2828
) ?>
2929

30-
<div class="<?= $css('page-columns', 'columns') ?>">
31-
<div class="<?= $css('main-col', 'main-col') ?>">
30+
<div class="page-columns">
31+
<div class="main-col">
3232
<?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.form.spinner') ?>
3333
<?= /* @noEscape */ $blockRenderer->html($block, 'loki-admin.form.inner') ?>
3434

35-
<div class="<?= $css('entry-edit form-inline', 'form') ?>">
36-
<div class="<?= $css('fieldset-wrapper', 'field-wrapper') ?>">
35+
<div class="entry-edit form-inline">
36+
<div class="fieldset-wrapper">
3737
<h1><?= $escaper->escapeHtml($block->getLabel()) ?></h1>
38-
<div class="<?= $css('admin__fieldset-wrapper-content', 'wrapper-content') ?>">
39-
<fieldset class="<?= $css('admin__fieldset', 'fieldset') ?>">
38+
<div class="admin__fieldset-wrapper-content">
39+
<fieldset class="admin__fieldset">
4040
<?php foreach ($viewModel->getFields() as $field) : ?>
4141
<?= /* @noEscape */ $templateRenderer->html(
4242
$block,

‎view/adminhtml/templates/form/actions.phtml‎

Lines changed: 15 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -22,60 +22,44 @@ $buttons = $viewModel->getButtons();
2222
$mainSaveAction = false;
2323
$otherSaveActions = [];
2424
?>
25-
<div class="<?= $css('page-main-actions') ?>">
26-
<div class="<?= $css('page-actions-placeholder', 'placeholder') ?>"></div>
25+
<div class="page-main-actions">
26+
<div class="page-actions-placeholder"></div>
2727

28-
<div class="<?= $css('page-actions', 'actions') ?>">
29-
<div class="<?= $css('page-actions-inner', 'actions-inner') ?>">
30-
<div class="<?= $css('page-actions-buttons', 'actions-buttons') ?>">
28+
<div class="page-actions">
29+
<div class="page-actions-inner">
30+
<div class="page-actions-buttons">
3131
<?php foreach ($buttons as $button) : ?>
3232
<?php $subButtons = $button->getSubButtons(); ?>
3333
<button
34-
@click="<?= $escaper->escapeHtml(
35-
$button->getMethod()
36-
) ?>"
37-
title="<?= $escaper->escapeHtml(
38-
__($button->getLabel())
39-
) ?>"
34+
@click="<?= $escaper->escapeHtml($button->getMethod()) ?>"
35+
title="<?= $escaper->escapeHtml(__($button->getLabel())) ?>"
4036
type="button"
41-
class="action- scalable <?= $escaper->escapeHtml(
42-
$button->getCssClass()
43-
) ?>">
44-
<span><?= $escaper->escapeHtml(
45-
__($button->getLabel())
46-
) ?></span>
37+
class="action- scalable <?= $escaper->escapeHtml($button->getCssClass()) ?>">
38+
<span><?= $escaper->escapeHtml(__($button->getLabel())) ?></span>
4739
</button>
4840
<?php endforeach; ?>
4941

5042
<?php if (!empty($otherSaveActions)) : ?>
5143
<div
5244
title="Save and Continue"
53-
class="<?= $css(
54-
'actions-split save primary', 'button-container'
55-
) ?>"
45+
class="actions-split save primary"
5646
>
5747
<button
5848
@click="saveAndContinueAction"
5949
title="Save and Continue"
60-
class="<?= $css(
61-
'action-default primary',
62-
'button-save-and-continue'
63-
) ?>"
50+
class="action-default primary"
6451
>
6552
<span>Save and Continue</span>
6653
</button>
6754

6855
<button @click="toggleOtherActions"
6956
title="Save and Continue"
70-
class="<?= $css(
71-
'action-toggle primary save',
72-
'button-toggle-actions'
73-
) ?>">
57+
class="action-toggle primary save">
7458
<span>Select</span>
7559
</button>
7660

7761
<ul
78-
class="<?= $css('dropdown-menu', 'listing') ?>"
62+
class="dropdown-menu"
7963
x-cloak x-show="showOtherActions"
8064
>
8165
<?php foreach (
@@ -85,11 +69,9 @@ $otherSaveActions = [];
8569
<span
8670
@click="saveAndDuplicateAction"
8771
title="Save &amp; Duplicate"
88-
class="<?= $css(
89-
'item', 'action-label'
90-
) ?>"
72+
class="item"
9173
>
92-
Save &amp; Duplicate
74+
Save &amp;amp; Duplicate
9375
</span>
9476
</li>
9577
<?php endforeach; ?>

‎view/adminhtml/templates/form/field.phtml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ if (false === $field instanceof Field) {
2222
$field = $fieldViewModel->getField($block);
2323
}
2424
?>
25-
<div class="<?= $css('admin__field', '@todo') ?>">
26-
<div class="<?= $css('admin__field-label', '@todo') ?>">
25+
<div class="admin__field">
26+
<div class="admin__field-label">
2727
<label for="<?= $escaper->escapeHtml($field->getCode()) ?>">
2828
<span><?= $escaper->escapeHtml($field->getLabel()) ?></span>
2929
</label>
3030
</div>
3131

32-
<div class="<?= $css('admin__field-control', '@todo') ?>">
32+
<div class="admin__field-control">
3333
<?= /* @noEscape */ $templateRenderer->html(
3434
$block,
3535
$field->getFieldType()->getTemplate(),

‎view/adminhtml/templates/form/field_type/from_to.phtml‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,21 @@ use Loki\Components\Util\Block\TemplateRenderer;
1818
$field = $block->getField();
1919
$fieldType = $field->getFieldType();
2020
?>
21-
<div class="<?= $css('') ?>">
22-
<div class="<?= $css('admin__form-field', 'field-container') ?>">
23-
<label class="<?= $css('admin__form-field-label', 'label') ?>">
21+
<div class="">
22+
<div class="admin__form-field">
23+
<label class="admin__form-field-label">
2424
<span>from</span>
2525
</label>
2626

27-
<div class="<?= $css('admin__form-field-control', 'field-control') ?>">
27+
<div class="admin__form-field-control">
2828
<input
29-
class="<?= $css('admin__control-text', 'field') ?>"
29+
class="admin__control-text"
3030
type="text"
3131
data-name="<?= $escaper->escapeHtml($field->getCode()) ?>"
3232
maxlength="<?= $escaper->escapeHtml(
3333
$fieldType->getMaximumLength()
3434
) ?>"
35-
:value="<?= $escaper->escapeHtml(
36-
$field->getScope()
37-
) ?>.<?= $escaper->escapeHtml($field->getCode()) ?>"
35+
:value="<?= $escaper->escapeHtml($field->getScope()) ?>.<?= $escaper->escapeHtml($field->getCode()) ?>"
3836
@change="setValue"
3937
placeholder="<?= $escaper->escapeHtml(
4038
$field->getBlock()->getPlaceholder()
@@ -43,14 +41,14 @@ $fieldType = $field->getFieldType();
4341
</div>
4442
</div>
4543

46-
<div class="<?= $css('admin__form-field', 'field-container') ?>">
47-
<label class="<?= $css('admin__form-field-label', 'label') ?>">
44+
<div class="admin__form-field">
45+
<label class="admin__form-field-label">
4846
<span>to</span>
4947
</label>
5048

51-
<div class="<?= $css('admin__form-field-control', 'field-control') ?>">
49+
<div class="admin__form-field-control">
5250
<input
53-
class="<?= $css('admin__control-text', 'field') ?>"
51+
class="admin__control-text"
5452
type="text"
5553
data-name="<?= $escaper->escapeHtml($field->getCode()) ?>"
5654
maxlength="<?= $escaper->escapeHtml(

‎view/adminhtml/templates/form/field_type/select.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ $fieldType = $field->getFieldType();
2525
?>
2626
<select
2727
aria-label="<?= $escaper->escapeHtml($field->getLabel()) ?>"
28-
class="<?= $css('admin__control-select', '@todo') ?>"
28+
class="admin__control-select"
2929
name="<?= $escaper->escapeHtml($field->getCode()) ?>"
3030
data-name="<?= $escaper->escapeHtml($field->getCode()) ?>"
3131
<?php if ($parentBlock->getMultiple()) : ?>multiple<?php endif; ?>

‎view/adminhtml/templates/form/field_type/switch.phtml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@ $parentBlock = $field->getBlock();
2222
$options = $parentBlock->getOptions();
2323
$fieldType = $field->getFieldType();
2424
?>
25-
<div class="<?= $css('admin__actions-switch', '@todo') ?>">
25+
<div class="admin__actions-switch">
2626
<input
2727
type="checkbox"
2828
name="<?= $escaper->escapeHtml($field->getCode()) ?>"
29-
class="<?= $css('admin__actions-switch-checkbox', '@todo') ?>"
29+
class="admin__actions-switch-checkbox"
3030
:checked="<?= $escaper->escapeHtml($field->getScope()) ?>.<?= $escaper->escapeHtml($field->getCode()) ?>"
3131
@change="setValue"
3232
>
3333
<label
34-
class="<?= $css('admin__actions-switch-label', '@todo') ?>"
34+
class="admin__actions-switch-label"
3535
@click="toggleValueByClick"
3636
data-name="<?= $escaper->escapeHtml($field->getCode()) ?>"
3737
data-value="<?= $escaper->escapeHtml($field->getScope()) ?>.<?= $escaper->escapeHtml($field->getCode()) ?>"
3838
>
39-
<span class="<?= $css('admin__actions-switch-text', '@todo') ?>" x-show="item.<?= $escaper->escapeHtml($field->getCode()) ?>">Yes</span>
40-
<span class="<?= $css('admin__actions-switch-text', '@todo') ?>" x-show="!item.<?= $escaper->escapeHtml($field->getCode()) ?>">No</span>
39+
<span class="admin__actions-switch-text" x-show="item.<?= $escaper->escapeHtml($field->getCode()) ?>">Yes</span>
40+
<span class="admin__actions-switch-text" x-show="!item.<?= $escaper->escapeHtml($field->getCode()) ?>">No</span>
4141
</label>
4242
</div>

‎view/adminhtml/templates/form/field_type/text.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if (isset($htmlAttributes['type'])) {
2525
}
2626
?>
2727
<input
28-
class="<?= $css('admin__control-text', '@todo') ?>"
28+
class="admin__control-text"
2929
type="<?= $escaper->escapeHtml($inputType) ?>"
3030
name="<?= $escaper->escapeHtml($field->getCode()) ?>"
3131
data-name="<?= $escaper->escapeHtml($field->getCode()) ?>"

‎view/adminhtml/templates/form/field_type/textarea.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ $htmlAttributes = $field->getHtmlAttributes();
2020
$fieldType = $field->getFieldType();
2121
?>
2222
<textarea
23-
class="<?= $css('admin__control-text', '@todo') ?>"
23+
class="admin__control-text"
2424
name="<?= $escaper->escapeHtml($field->getCode()) ?>"
2525
data-name="<?= $escaper->escapeHtml($field->getCode()) ?>"
2626
<?php foreach ($htmlAttributes as $htmlAttributeName => $htmlAttributeValue) : ?>

‎view/adminhtml/templates/form/fieldset.phtml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ use Magento\Framework\View\Element\Template;
99
/** @var Escaper $escaper */
1010
/** @var Template $block */
1111
?>
12-
<div class="<?= $css('entry-edit form-inline') ?>">
13-
<div class="<?= $css('fieldset-wrapper', 'wrapper') ?>">
12+
<div class="entry-edit form-inline">
13+
<div class="fieldset-wrapper">
1414
<h1><?= $escaper->escapeHtml($block->getLabel()) ?></h1>
1515

16-
<div class="<?= $css('admin__fieldset-wrapper-content', 'wrapper-content') ?>">
17-
<fieldset class="<?= $css('admin__fieldset', 'fieldset') ?>">
16+
<div class="admin__fieldset-wrapper-content">
17+
<fieldset class="admin__fieldset">
1818
<?= /* @noEscape */ $block->getChildHtml() ?>
1919
</fieldset>
2020
</div>

‎view/adminhtml/templates/form/inner.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ use Magento\Framework\View\Element\Template;
88
/** @var Template $block */
99

1010
?>
11-
<div class="<?= $css('form-inner') ?>">
11+
<div class="form-inner">
1212
<?= /* @noEscape */ $block->getChildHtml() ?>
1313
</div>

0 commit comments

Comments
 (0)