Skip to content

Commit e340698

Browse files
committed
requested changes
Signed-off-by: MarioRadu <magda_marior@yahoo.com>
1 parent 2f199a4 commit e340698

File tree

6 files changed

+7
-14
lines changed

6 files changed

+7
-14
lines changed

src/Admin/templates/admin/list-logins.html.twig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@
177177
{% endblock %}
178178

179179
{% block javascript %}
180+
{{ parent() }}
180181
<script>
181182
const tableId = '#admin-logins-table';
182183
const storeSettingsUrl = '{{ path('setting', {action: 'store-setting', identifier: identifier}) }}';

src/Admin/templates/admin/list.html.twig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130
{% endblock %}
131131

132132
{% block javascript %}
133+
{{ parent() }}
133134
<script>
134135
const tableId = '#admin-table';
135136
const storeSettingsUrl = '{{ path('setting', {action: 'store-setting', identifier: identifier}) }}';

src/App/src/ConfigProvider.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,10 @@ public function getTemplates(): array
7676
{
7777
return [
7878
'paths' => [
79-
'app' => [__DIR__ . '/../templates/app'],
80-
'error' => [__DIR__ . '/../templates/error'],
81-
'layout' => [__DIR__ . '/../templates/layout'],
82-
'partial' => [__DIR__ . '/../templates/partial'],
83-
'language' => [__DIR__ . '/../templates/language'],
79+
'app' => [__DIR__ . '/../templates/app'],
80+
'error' => [__DIR__ . '/../templates/error'],
81+
'layout' => [__DIR__ . '/../templates/layout'],
82+
'partial' => [__DIR__ . '/../templates/partial'],
8483
],
8584
];
8685
}

src/App/templates/language/translate-text.html.twig

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/App/templates/layout/default.html.twig

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@
1414
<title>{% block title %}{% endblock %} - Dotkernel</title>
1515

1616
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
17-
18-
<!--[if lt IE 9]>
19-
<script src="{{ asset('js/html5shiv.js') }}"></script>
20-
<script src="{{ asset('js/respond.min.js') }}"></script>
21-
<![endif]-->
2217
</head>
2318
<body class="app">
2419

@@ -36,9 +31,8 @@
3631
<footer class="bdT ta-c p-30 lh-0 fsz-sm c-grey-600"></footer>
3732
</div>
3833

39-
<script src="{{ asset('js/app.js') }}"></script>
40-
4134
{% block javascript %}
35+
<script src="{{ asset('js/app.js') }}"></script>
4236
{% endblock %}
4337

4438
</body>

test/Unit/App/ConfigProviderTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,5 @@ public function testGetTemplates(): void
7474
$this->assertArrayHasKey('error', $this->config['templates']['paths']);
7575
$this->assertArrayHasKey('layout', $this->config['templates']['paths']);
7676
$this->assertArrayHasKey('partial', $this->config['templates']['paths']);
77-
$this->assertArrayHasKey('language', $this->config['templates']['paths']);
7877
}
7978
}

0 commit comments

Comments
 (0)