From 728dd7ea9b9819199858cd8d3ca6f120e631e44d Mon Sep 17 00:00:00 2001 From: Simon Krull Date: Thu, 29 Feb 2024 19:52:12 +0100 Subject: [PATCH 1/5] BUGFIX: #15938 add spacing between choose file button and uploaded image in image_widget --- .../Bundle/AdminBundle/Resources/private/sass/_ui.scss | 4 ++++ .../UiBundle/Resources/views/Form/imagesTheme.html.twig | 6 +++++- .../Bundle/UiBundle/Resources/views/Form/theme.html.twig | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Sylius/Bundle/AdminBundle/Resources/private/sass/_ui.scss b/src/Sylius/Bundle/AdminBundle/Resources/private/sass/_ui.scss index 6c909008be..dd98858ab0 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/private/sass/_ui.scss +++ b/src/Sylius/Bundle/AdminBundle/Resources/private/sass/_ui.scss @@ -48,6 +48,10 @@ a { padding-left: .2em; } +.ui-media-upload-button { + margin-bottom: 1em; +} + // ---------------------------------- // ------------ Forms // ---------------------------------- diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Form/imagesTheme.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Form/imagesTheme.html.twig index 73226c596c..7f4a416570 100644 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Form/imagesTheme.html.twig +++ b/src/Sylius/Bundle/UiBundle/Resources/views/Form/imagesTheme.html.twig @@ -58,7 +58,9 @@ {% block sylius_product_image_widget %} {% apply spaceless %} {{ form_row(form.type) }} - +
+ +
{% if form.vars.value.path|default(null) is not null %} {{ form.vars.value.type }} {% endif %} @@ -78,7 +80,9 @@ {% apply spaceless %} {{ form_row(form.type) }} {% if form.vars.value.path|default(null) is null %} +
+
{% else %} {{ form.vars.value.type }} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Form/theme.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Form/theme.html.twig index 0b12e82a76..b0f8b1874b 100644 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Form/theme.html.twig +++ b/src/Sylius/Bundle/UiBundle/Resources/views/Form/theme.html.twig @@ -238,7 +238,9 @@ {% block sylius_image_widget %} {% apply spaceless %} {{ form_row(form.type) }} - +
+ +
{% if form.vars.value.path|default(null) is not null %} {{ form.vars.value.type }} {% endif %} From 036043698125b52a77750053788aa78c6afed555 Mon Sep 17 00:00:00 2001 From: Simon Krull Date: Fri, 1 Mar 2024 14:24:09 +0100 Subject: [PATCH 2/5] TASK: adjust naming of css class --- src/Sylius/Bundle/AdminBundle/Resources/private/sass/_ui.scss | 2 +- .../UiBundle/Resources/views/Form/imagesTheme.html.twig | 4 ++-- .../Bundle/UiBundle/Resources/views/Form/theme.html.twig | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Sylius/Bundle/AdminBundle/Resources/private/sass/_ui.scss b/src/Sylius/Bundle/AdminBundle/Resources/private/sass/_ui.scss index dd98858ab0..59b1485980 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/private/sass/_ui.scss +++ b/src/Sylius/Bundle/AdminBundle/Resources/private/sass/_ui.scss @@ -48,7 +48,7 @@ a { padding-left: .2em; } -.ui-media-upload-button { +.ui-element-spacer { margin-bottom: 1em; } diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Form/imagesTheme.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Form/imagesTheme.html.twig index 7f4a416570..e835ea55fb 100644 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Form/imagesTheme.html.twig +++ b/src/Sylius/Bundle/UiBundle/Resources/views/Form/imagesTheme.html.twig @@ -58,7 +58,7 @@ {% block sylius_product_image_widget %} {% apply spaceless %} {{ form_row(form.type) }} -
+
{% if form.vars.value.path|default(null) is not null %} @@ -80,7 +80,7 @@ {% apply spaceless %} {{ form_row(form.type) }} {% if form.vars.value.path|default(null) is null %} -
+
{% else %} diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Form/theme.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Form/theme.html.twig index b0f8b1874b..1ca7d15927 100644 --- a/src/Sylius/Bundle/UiBundle/Resources/views/Form/theme.html.twig +++ b/src/Sylius/Bundle/UiBundle/Resources/views/Form/theme.html.twig @@ -238,7 +238,7 @@ {% block sylius_image_widget %} {% apply spaceless %} {{ form_row(form.type) }} -
+
{% if form.vars.value.path|default(null) is not null %} From c1fe6f1e62bbe94223f724e7624439557b78cca4 Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Fri, 8 Mar 2024 07:16:24 +0100 Subject: [PATCH 3/5] [Admin] Remove info about forum from Admin panel --- .../AdminBundle/Resources/views/Layout/_support.html.twig | 4 ---- .../Bundle/UiBundle/Resources/translations/messages.en.yml | 1 - 2 files changed, 5 deletions(-) diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_support.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_support.html.twig index 6419303489..1901bbe51b 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_support.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_support.html.twig @@ -10,10 +10,6 @@ {{ 'sylius.ui.join_slack'|trans }} - - - {{ 'sylius.ui.join_forum'|trans }} - {{ 'sylius.ui.issue_tracker'|trans }} diff --git a/src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml b/src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml index e7d38b466a..e5a4e3e095 100644 --- a/src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml +++ b/src/Sylius/Bundle/UiBundle/Resources/translations/messages.en.yml @@ -420,7 +420,6 @@ sylius: items: 'Items' items_total: 'Items total' join_slack: 'Join Slack' - join_forum: 'Join Forum' jump_to_page: 'Jump to page' label: 'Label' last_login: 'Last login' From ef3c486fff0211e523d6da55eea5a55b8529fcef Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Fri, 8 Mar 2024 07:17:10 +0100 Subject: [PATCH 4/5] [Documentation] Remove remaining info about forum --- docs/book/introduction/introduction.rst | 2 +- docs/getting-started-with-sylius/summary.rst | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/book/introduction/introduction.rst b/docs/book/introduction/introduction.rst index 1c1412598e..fcb991fe05 100644 --- a/docs/book/introduction/introduction.rst +++ b/docs/book/introduction/introduction.rst @@ -62,7 +62,7 @@ Roadmap ------- Are you wondering about Sylius plans for the next releases? If so then you should follow our `Roadmap `_. -Through our :doc:`Slack and Forum ` you can contribute by conversation and votes on the most desired features and improvements. +Through our :doc:`Slack ` you can contribute by conversation and votes on the most desired features and improvements. Final Thoughts -------------- diff --git a/docs/getting-started-with-sylius/summary.rst b/docs/getting-started-with-sylius/summary.rst index e3f20ac038..f233f2d1f7 100644 --- a/docs/getting-started-with-sylius/summary.rst +++ b/docs/getting-started-with-sylius/summary.rst @@ -12,9 +12,9 @@ There are a few tips at the end of this tutorial: - if you want to share your work with the Community, check out the :doc:`Sylius Plugins` chapter -And the most important - if you want to become a part of our collectivity, join our `Slack `_, -`Forum `_ and follow `our repository `_ to be always up-to-date -with the newest Sylius releases. If you have any ideas about how to make Sylius better and want to support us on catalyzing -trade with technology - open issues, pull requests and join discussions on Github. Sylius is only strong with the Community :) +And the most important - if you want to become a part of our collectivity, join our `Slack `_ +and follow `our repository `_ to be always up-to-date with the newest Sylius releases. +If you have any ideas about how to make Sylius better and want to support us on catalyzing trade with +technology - open issues, pull requests and join discussions on Github. Sylius is only strong with the Community :) Good luck! From e41d1081b1dfc1c11655325b0a3690f6bc4267b2 Mon Sep 17 00:00:00 2001 From: Magdalena Sadowska Date: Fri, 8 Mar 2024 12:01:46 +0100 Subject: [PATCH 5/5] [Docs] refactor information about GUS --- docs/book/installation/installation.rst | 9 --------- .../configuration/disabling-admin-notifications.rst | 7 +++++++ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/docs/book/installation/installation.rst b/docs/book/installation/installation.rst index 49748e354f..0e1291af9e 100644 --- a/docs/book/installation/installation.rst +++ b/docs/book/installation/installation.rst @@ -10,15 +10,6 @@ for your custom e-commerce application. To create your Sylius-based application, first make sure you use PHP 8.0 or higher and have `Composer`_ installed. -.. note:: - - In order to inform you about newest Sylius releases and be aware of shops based on Sylius, - the Core Team uses an internal statistical service called GUS. - The only data that is collected and stored in its database are hostname, user agent, locale, - environment (test, dev or prod), current Sylius version and the date of last contact. - If you do not want your shop to send requests to GUS, please visit :doc:`this guide ` - for further instructions. - Initiating A New Sylius Project ------------------------------- diff --git a/docs/cookbook/configuration/disabling-admin-notifications.rst b/docs/cookbook/configuration/disabling-admin-notifications.rst index 5783bb3d71..55108c7c45 100644 --- a/docs/cookbook/configuration/disabling-admin-notifications.rst +++ b/docs/cookbook/configuration/disabling-admin-notifications.rst @@ -4,6 +4,13 @@ How to disable admin version notifications? By default Sylius sends checks from the admin whether you are running the latest version. In case you are not running the latest version, a notification will be shown in the admin panel (top right). +.. note:: + + In order to inform you about the newest Sylius releases and for us to be aware of shops based on Sylius, + we are using an internal statistical service called **GUS**. + The only data that is collected and stored in the database of GUS are hostname, user agent, locale, + app environment (test, dev or prod), current Sylius version and the date of last contact. + This guide will instruct you how to disable this check & notification. How to disable notifications?