diff --git a/src/Sylius/Bundle/WebBundle/Resources/public/css/backend.css b/src/Sylius/Bundle/WebBundle/Resources/public/css/backend.css index f23e60dd68..3ea0f719a6 100644 --- a/src/Sylius/Bundle/WebBundle/Resources/public/css/backend.css +++ b/src/Sylius/Bundle/WebBundle/Resources/public/css/backend.css @@ -422,6 +422,23 @@ form.form-signin .btn-success:hover { border: 0; } +/* Tabs */ +.tab-container { + border-bottom: 1px solid #ddd; + margin-bottom: 20px; +} + +.tab-content { + margin-top: 20px; +} + +.nav-tabs > li > span { + position: relative; + display: block; + padding: 10px 15px; + font-weight: bold; +} + /* Hide button text on small devices, as well remove some other margin/padding */ @media (max-width: 992px) { .row { diff --git a/src/Sylius/Bundle/WebBundle/Resources/translations/messages.en.yml b/src/Sylius/Bundle/WebBundle/Resources/translations/messages.en.yml index b609d31935..a83748bd4c 100644 --- a/src/Sylius/Bundle/WebBundle/Resources/translations/messages.en.yml +++ b/src/Sylius/Bundle/WebBundle/Resources/translations/messages.en.yml @@ -693,6 +693,7 @@ sylius: total_registrations: 'Total registrations' tracking_code: 'Tracking Code' tracking_number: 'Tracking number' + translations: Translations type: Type unavailable: Unavailable unit_price: 'Unit price' diff --git a/src/Sylius/Bundle/WebBundle/Resources/views/Common/forms.html.twig b/src/Sylius/Bundle/WebBundle/Resources/views/Common/forms.html.twig index 9f35e1d342..f9a1289c89 100644 --- a/src/Sylius/Bundle/WebBundle/Resources/views/Common/forms.html.twig +++ b/src/Sylius/Bundle/WebBundle/Resources/views/Common/forms.html.twig @@ -164,13 +164,36 @@ {% endspaceless %} {% endblock %} +{% block sylius_translations_row %} + {{ form_widget(form) }} +{% endblock %} + {% block sylius_translations_widget %} - {% for translation in form %} -
- {{ form_label(translation, translation.vars.name) }} -
- {{ form_widget(translation) }} -
+ {{ form_errors(form) }} +
+ + +
+ {% for translationsFields in form %} + {% set locale = translationsFields.vars.name %} + +
+ {{ form_errors(translationsFields) }} + {{ form_widget(translationsFields) }} +
+ {% endfor %}
- {% endfor %} -{% endblock %} +
+{% endblock %}