Skip to content

Commit 5a64293

Browse files
committed
Merge branch 'release/1.10.47'
2 parents 1c5f763 + 8cfb62d commit 5a64293

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# v1.10.47
2+
## 10/22/2024
3+
4+
1. [](#improved)
5+
* Added missing `show_label` logic in list field
6+
* Use plugin's selected icon when in plugin properties
7+
18
# v1.10.46
29
## 05/15/2024
310

blueprints.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Admin Panel
22
slug: admin
33
type: plugin
4-
version: 1.10.46
4+
version: 1.10.47
55
description: Adds an advanced administration panel to manage your site
66
icon: empire
77
author:

themes/grav/templates/forms/fields/list/list.html.twig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<label for="toggleable_{{ field.name }}"></label>
2020
</span>
2121
{% endif %}
22+
{% if show_label %}
2223
<label{{ (field.toggleable ? ' class="toggleable ' ~ field.labelclasses ~ '" for="toggleable_' ~ field.name ~ '"' : ' class="' ~ field.labelclasses ~ '"')|raw }}>
2324
{% if field.help %}
2425
{% if field.markdown %}
@@ -31,6 +32,7 @@
3132
{% endif %}
3233
{{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
3334
</label>
35+
{% endif %}
3436
{% if field.description %}
3537
<div class="form-extra-wrapper {{ field.wrapper_classes }}">
3638
<span class="form-description">{{ field.description|t|markdown(false)|raw }}</span>

themes/grav/templates/plugins.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
</div>
6969
{% endif %}
7070

71-
<h1><i class="fa fa-fw fa-plug"></i> {{ "PLUGIN_ADMIN.PLUGIN"|t }}: {{ plugin.name }}</h1>
71+
<h1><i class="fa fa-fw fa-{{ plugin.icon ?? 'plug' }}"></i> {{ "PLUGIN_ADMIN.PLUGIN"|t }}: {{ plugin.name }}</h1>
7272
{% endif %}
7373
{% endblock %}
7474

0 commit comments

Comments
 (0)