Skip to content

Commit 57629ce

Browse files
VowowVowow
authored
Merge pull request #2 from sherlockode/feature/improve-content-form-display
Improve Content form display
2 parents 7d2f493 + 9c54182 commit 57629ce

File tree

8 files changed

+95
-2
lines changed

8 files changed

+95
-2
lines changed

‎src/Resources/config/admin_routing.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,14 @@ sherlockode_sylius_acb_admin_content:
1515
resource: |
1616
alias: sherlockode_sylius_acb.content
1717
section: admin
18-
templates: '@SherlockodeSyliusAdvancedContentPlugin\admin'
18+
templates: '@SyliusAdmin\\Crud'
1919
except: ['show']
2020
redirect: update
2121
grid: sherlockode_sylius_acb_admin_content
2222
vars:
2323
index:
2424
icon: 'sticky note outline'
25+
all:
26+
templates:
27+
form: "@SherlockodeSyliusAdvancedContentPlugin/admin/Content/_form.html.twig"
2528
type: sylius.resource

‎src/Resources/config/config.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ imports:
22
- { resource: "sylius_grid.yaml" }
33
- { resource: "sylius_resource.yaml" }
44
- { resource: "services.yaml" }
5+
- { resource: "events.yaml" }

‎src/Resources/config/events.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
sylius_ui:
2+
events:
3+
sherlockode_sylius_acb.admin.content.create.stylesheets:
4+
blocks:
5+
sylius_acb:
6+
template: "@SherlockodeSyliusAdvancedContentPlugin/admin/stylesheets.html.twig"
7+
8+
sherlockode_sylius_acb.admin.content.update.stylesheets:
9+
blocks:
10+
sylius_acb:
11+
template: "@SherlockodeSyliusAdvancedContentPlugin/admin/stylesheets.html.twig"

‎src/Resources/translations/messages.en.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@ sherlockode_sylius_acb:
88
edit_page: Edit content page
99
new_content: New content block
1010
new_page: New content page
11+
form:
12+
general: General
13+
content: Content
14+
history: Version history
15+
scope: Scope

‎src/Resources/translations/messages.fr.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@ sherlockode_sylius_acb:
88
edit_page: Modifier une page de contenu
99
new_content: Ajouter un bloc de contenu
1010
new_page: Ajouter une page de contenu
11+
form:
12+
general: Général
13+
content: Contenu
14+
history: Historique des versions
15+
scope: Scope

‎src/Resources/views/AdvancedContentBundle/Form/theme.html.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
{% set addedClass = addedClass ~ ' ' ~ 'acb-field-element-compound' %}
1414
{% endif %}
1515
{% set row_attr = row_attr|default({})|merge({'class': row_attr.class|default('') ~ ' ' ~ addedClass}) %}
16-
<div class="{{ row_attr.class }}">
16+
<div {% with {attr: row_attr} %}{{ block('attributes') }}{% endwith %}>
1717
{{- form_label(form) -}}
1818
{{- form_widget(form) -}}
1919
{{- form_help(form) -}}

‎src/Resources/views/admin/Content/_form.html.twig

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{% form_theme form with [
2+
'@SyliusAdmin/Form/theme.html.twig',
3+
'@SherlockodeAdvancedContent/Form/content.html.twig',
4+
'@SherlockodeAdvancedContent/Form/translations.html.twig'
5+
] %}
6+
7+
{% set content = form.vars.data %}
8+
{{ form_errors(form) }}
9+
<div class="ui grid">
10+
<div class="twelve wide column">
11+
<div class="ui fluid styled accordion">
12+
<div class="active title">
13+
<i class="dropdown icon"></i>
14+
{{ 'sherlockode_sylius_acb.form.general'|trans }}
15+
</div>
16+
<div class="active content">
17+
{{ form_row(form.name) }}
18+
{{ form_row(form.slug) }}
19+
</div>
20+
</div>
21+
<div class="ui fluid styled accordion">
22+
<div class="active title">
23+
<i class="dropdown icon"></i>
24+
{{ 'sherlockode_sylius_acb.form.content'|trans }}
25+
</div>
26+
<div class="active content">
27+
{{ form_row(form.data) }}
28+
</div>
29+
</div>
30+
{% if content.id %}
31+
<div class="ui fluid styled accordion">
32+
<div class="active title">
33+
<i class="dropdown icon"></i>
34+
{{ 'sherlockode_sylius_acb.form.history'|trans }}
35+
</div>
36+
<div class="active content">
37+
{{ include('@SherlockodeAdvancedContent/ContentVersion/list.html.twig', {'content': content}) }}
38+
</div>
39+
</div>
40+
{% endif %}
41+
</div>
42+
<div class="four wide column">
43+
{% if form.locale is defined %}
44+
<div class="ui fluid styled accordion">
45+
<div class="active title">
46+
<i class="dropdown icon"></i>
47+
{{ 'sherlockode_sylius_acb.form.scope'|trans }}
48+
</div>
49+
<div class="active content">
50+
{{ form_row(form.locale) }}
51+
</div>
52+
</div>
53+
{% endif %}
54+
<div class="ui segment center aligned">
55+
<div class="ui buttons">
56+
<button class="ui labeled icon primary button" type="submit">
57+
{% if content.id %}
58+
<i class="save icon"></i> {{ 'sylius.ui.save_changes'|trans }}
59+
{% else %}
60+
<i class="plus icon"></i> {{ 'sylius.ui.create'|trans }}
61+
{% endif %}
62+
</button>
63+
</div>
64+
</div>
65+
</div>
66+
</div>

‎src/Resources/views/admin/stylesheets.html.twig

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap-grid.min.css"/>
2+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css"/>

0 commit comments

Comments
 (0)