Merge branch 'develop' of github.com:getgrav/grav-plugin-admin into develop

This commit is contained in:
Andy Miller
2024-02-03 13:26:42 -07:00
3 changed files with 22 additions and 5 deletions

View File

@@ -42,7 +42,7 @@
<label for="toggleable_{{ field.name }}"></label>
</span>
{% endif %}
<label{{ (toggleable ? ' class="toggleable" for="toggleable_' ~ field.name ~ '"')|raw }}>
<label{{ (field.toggleable ? ' class="toggleable ' ~ field.classes ~ '" for="toggleable_' ~ field.name ~ '"' : ' class="' ~ field.classes ~ '"')|raw }}>
{% block label %}
{% if field.help %}
{% if field.markdown %}

View File

@@ -19,14 +19,32 @@
<label for="toggleable_{{ field.name }}"></label>
</span>
{% endif %}
<label{{ (field.toggleable ? ' class="toggleable" for="toggleable_' ~ field.name ~ '"')|raw }}>
<label{{ (field.toggleable ? ' class="toggleable ' ~ field.classes ~ '" for="toggleable_' ~ field.name ~ '"' : ' class="' ~ field.classes ~ '"')|raw }}>
{% if field.help %}
<span class="hint--bottom" data-hint="{{ field.help|t }}">{{ field.label|t }}</span>
{% if field.markdown %}
<span class="hint--bottom" data-hint="{{ field.help|t|markdown(false) }}">{{ field.label|t|markdown(false)|raw }} <i class="hint-icon fa fa-question-circle" aria-hidden="true"></i></span>
{% else %}
<span class="hint--bottom" data-hint="{{ field.help|t }}">{{ field.label|t|raw }} <i class="hint-icon fa fa-question-circle" aria-hidden="true"></i></span>
{% endif %}
{% else %}
{{ field.label|t }}
{% endif %}
{{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
</label>
{% if field.description %}
<div class="form-extra-wrapper">
<span class="form-description">{{ field.description|t|markdown(false)|raw }}</span>
</div>
{% endif %}
{% if field.sublabel %}
<div class="form-sublabel">
{% if field.markdown %}
{{ field.sublabel|t|markdown(false)|raw }}
{% else %}
{{ field.sublabel|t|raw }}
{% endif %}
</div>
{% endif %}
</div>
<div class="form-data{% if not vertical %} block size-2-3 pure-u-2-3{% endif %}"
{% block global_attributes %}
@@ -185,4 +203,3 @@
</div>
</div>
{% endblock %}

View File

@@ -1,6 +1,6 @@
{% if uri.extension() == 'json' %}{% include 'default.json.twig' %}{% else %}
<!DOCTYPE html>
<html lang="en">
<html lang="{{ user.language|default( 'en' ) }}">
<head>
{% block head %}
<meta charset="utf-8" />