Release 2.3.0 (#4412)
- move user-preferences to edit submenu - unify user preferences with other forms - use light fieldset for all user-edit-forms - support offcanvas elements - allow to dynamically inject toolbar buttons (via plugins) - use interface for formatting dates - improve docker issue template - bump version and composer packages
This commit is contained in:
@@ -100,6 +100,10 @@
|
||||
{% if is_granted('view_own_timesheet') %}
|
||||
{% include 'partials/recent-activities.html.twig' %}
|
||||
{% endif %}
|
||||
{% block navbar_extensions_after %}
|
||||
{% set event = trigger(constant('App\\Event\\ThemeEvent::TOOLBAR')) %}
|
||||
{{ event.content|raw }}
|
||||
{% endblock %}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
{{ form_row(form._token) }}
|
||||
|
||||
<fieldset class="form-fieldset">
|
||||
<fieldset class="form-fieldset form-fieldset-light">
|
||||
<legend>{{ 'work_times_should'|trans }}</legend>
|
||||
<div class="form-text mb-3 help-text">{{ 'work_times_should.help'|trans }}</div>
|
||||
{{ form_row(form.workHoursMonday) }}
|
||||
@@ -18,7 +18,7 @@
|
||||
{{ form_row(form.workHoursSunday) }}
|
||||
</fieldset>
|
||||
|
||||
<fieldset class="form-fieldset">
|
||||
<fieldset class="form-fieldset form-fieldset-light">
|
||||
{{- form_rest(form) -}}
|
||||
</fieldset>
|
||||
|
||||
|
||||
@@ -2,18 +2,19 @@
|
||||
|
||||
{% block profile_content %}
|
||||
|
||||
{% import "user/actions.html.twig" as actions %}
|
||||
{% set event = actions(app.user, 'user_forms', tab, {'user': user}) %}
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
{% block form_header %}
|
||||
<ul class="nav nav-pills card-header-pills" data-bs-toggle="tabs">
|
||||
{% import "user/actions.html.twig" as actions %}
|
||||
{% set event = actions(app.user, 'user_forms', tab, {'user': user}) %}
|
||||
{% for name, settings in event.actions %}
|
||||
<li class="nav-item" role="presentation">
|
||||
<a href="{{ settings.url }}" class="nav-link{% if tab == name %} active{% endif %}" role="tab">{{ settings.title|trans({}, settings.translation_domain ?? 'messages') }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endblock %}
|
||||
</div>
|
||||
{% block form_body %}
|
||||
{{ form_start(form) }}
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
{% extends 'user/layout.html.twig' %}
|
||||
{% from "macros/widgets.html.twig" import form_errors %}
|
||||
{% extends 'user/form.html.twig' %}
|
||||
|
||||
{% block profile_content %}
|
||||
{% block form_content %}
|
||||
|
||||
{% form_theme form 'form/horizontal.html.twig' %}
|
||||
|
||||
{{ form_start(form) }}
|
||||
{{ form_errors(form) }}
|
||||
{% for section in sections %}
|
||||
|
||||
{% set show = false %}
|
||||
@@ -15,17 +14,13 @@
|
||||
{% endfor %}
|
||||
|
||||
{% if show %}
|
||||
{% embed '@theme/embeds/card.html.twig' %}
|
||||
{% block box_body %}
|
||||
{% for pref in form.children.preferences|filter(pref => pref.vars.data.section == section)|sort((a, b) => a.vars.data.order <=> b.vars.data.order) %}
|
||||
{{ form_widget(pref) }}
|
||||
{% endfor %}
|
||||
{% endblock %}
|
||||
{% endembed %}
|
||||
<fieldset class="form-fieldset form-fieldset-light mb-3">
|
||||
{% for pref in form.children.preferences|filter(pref => pref.vars.data.section == section)|sort((a, b) => a.vars.data.order <=> b.vars.data.order) %}
|
||||
{{ form_widget(pref) }}
|
||||
{% endfor %}
|
||||
</fieldset>
|
||||
{% endif %}
|
||||
|
||||
{% endfor %}
|
||||
<input type="submit" value="{{ 'action.save'|trans }}" class="btn btn-primary" />
|
||||
{{ form_end(form) }}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
Reference in New Issue
Block a user