From 620cee018df64034165124d583df437a51d99aa5 Mon Sep 17 00:00:00 2001 From: lukasz_ostafin Date: Thu, 21 Jan 2021 11:47:19 +0100 Subject: [PATCH 1/9] EZP-32179: Add footer to platform when user is logged in --- .../Resources/public/img/ibexa-wordmark.svg | 20 ++ .../Resources/public/scss/_dashboard.scss | 2 + src/bundle/Resources/public/scss/_footer.scss | 46 +++++ .../Resources/public/scss/_general.scss | 26 ++- .../Resources/public/scss/_main-row.scss | 2 + .../Resources/public/scss/ezplatform.scss | 1 + .../scss/ui/modules/sub-items-list/_main.scss | 1 + .../Resources/translations/forms.en.xliff | 195 ------------------ .../Resources/translations/messages.en.xliff | 20 ++ .../admin/account/bookmarks/list.html.twig | 3 + .../admin/content/draft/draft_list.html.twig | 4 + .../themes/admin/content/edit/base.html.twig | 2 + .../admin/content/location_view.html.twig | 152 +++++++------- .../views/themes/admin/ui/footer.html.twig | 11 + .../views/themes/admin/ui/layout.html.twig | 6 + 15 files changed, 219 insertions(+), 272 deletions(-) create mode 100644 src/bundle/Resources/public/img/ibexa-wordmark.svg create mode 100644 src/bundle/Resources/public/scss/_footer.scss create mode 100644 src/bundle/Resources/views/themes/admin/ui/footer.html.twig diff --git a/src/bundle/Resources/public/img/ibexa-wordmark.svg b/src/bundle/Resources/public/img/ibexa-wordmark.svg new file mode 100644 index 0000000000..f508580c94 --- /dev/null +++ b/src/bundle/Resources/public/img/ibexa-wordmark.svg @@ -0,0 +1,20 @@ + + + Ibexa_responsive_wordmark + + + + + + + + + + + + + + + + + diff --git a/src/bundle/Resources/public/scss/_dashboard.scss b/src/bundle/Resources/public/scss/_dashboard.scss index cf4b227c3f..64ed8ed1c9 100644 --- a/src/bundle/Resources/public/scss/_dashboard.scss +++ b/src/bundle/Resources/public/scss/_dashboard.scss @@ -1,4 +1,6 @@ .ez-dashboard { + padding-bottom: calculateRem(65px); + &__header { display: grid; grid-template-columns: auto calculateRem(120px); diff --git a/src/bundle/Resources/public/scss/_footer.scss b/src/bundle/Resources/public/scss/_footer.scss new file mode 100644 index 0000000000..04b602f461 --- /dev/null +++ b/src/bundle/Resources/public/scss/_footer.scss @@ -0,0 +1,46 @@ +.ez-footer { + position: absolute; + bottom: 0; + display: flex; + align-items: center; + justify-content: space-between; + width: 100%; + height: calculateRem(50px); + margin-top: calculateRem(24px); + padding: 0 calculateRem(24px); + background-color: $ibexa-white; + font-size: calculateRem(14px); + color: $ibexa-color-font-pale; + + &__brand-img { + margin-right: calculateRem(16px); + } + + &__link { + display: inline-block; + margin-left: calculateRem(24px); + font-size: calculateRem(14px); + color: $ibexa-color-font-pale; + } +} + +.ez-bookmark-list-view, +.ez-drafts-list-view { + .ez-main-row { + .ez-content-container { + .ez-footer { + margin: auto 0 0; + } + } + } +} + +.ez-main-row { + .ez-content-container { + .ez-footer { + position: relative; + width: auto; + margin: auto calculateRem(15px) 0; + } + } +} \ No newline at end of file diff --git a/src/bundle/Resources/public/scss/_general.scss b/src/bundle/Resources/public/scss/_general.scss index b95eb0f4bb..7732eded14 100644 --- a/src/bundle/Resources/public/scss/_general.scss +++ b/src/bundle/Resources/public/scss/_general.scss @@ -1,11 +1,12 @@ html { - height: 100%; + min-height: 100vh; width: 100%; font-size: $base-font-size; } body { - height: 100%; + position: relative; + min-height: 100vh; } a { @@ -80,7 +81,7 @@ img { .ez-login-view { .ez-main-container { - height: 100%; + height: 100vh; } } @@ -145,6 +146,25 @@ select { background-color: $ibexa-color-base-pale; } +.ez-info-view, +.ez-section-list-view, +.ez-section-view, +.ez-role-list-view, +.ez-role-view, +.ez-language-list-view, +.ez-language-view, +.ez-content-type-group-list-view, +.ez-content-type-view, +.ez-object-state-group-list-view, +.ez-object-state-group-view, +.ez-workflow-list-view, +.ez-url-management, +.ez-segment-group-list-view, +.ez-segmentation-group-view, +.ez-user-settings-list-view { + padding-bottom: calculateRem(65px); +} + .ez-sticky-container { position: -webkit-sticky; position: sticky; diff --git a/src/bundle/Resources/public/scss/_main-row.scss b/src/bundle/Resources/public/scss/_main-row.scss index afbd9fb098..2b2deddd50 100644 --- a/src/bundle/Resources/public/scss/_main-row.scss +++ b/src/bundle/Resources/public/scss/_main-row.scss @@ -20,6 +20,8 @@ } .ez-content-container { + display: flex; + flex-direction: column; flex: 1 1 auto; } } diff --git a/src/bundle/Resources/public/scss/ezplatform.scss b/src/bundle/Resources/public/scss/ezplatform.scss index 8387034aa0..efa3aa95bc 100644 --- a/src/bundle/Resources/public/scss/ezplatform.scss +++ b/src/bundle/Resources/public/scss/ezplatform.scss @@ -85,3 +85,4 @@ @import 'trash-search-form'; @import 'inputs'; @import 'links'; +@import 'footer'; diff --git a/src/bundle/Resources/public/scss/ui/modules/sub-items-list/_main.scss b/src/bundle/Resources/public/scss/ui/modules/sub-items-list/_main.scss index a72d4d821f..c02a2e4668 100644 --- a/src/bundle/Resources/public/scss/ui/modules/sub-items-list/_main.scss +++ b/src/bundle/Resources/public/scss/ui/modules/sub-items-list/_main.scss @@ -1,5 +1,6 @@ .m-sub-items { margin-top: calculateRem(24px); + margin-bottom: calculateRem(24px); padding: calculateRem(16px); background: $ibexa-white; border-radius: $ibexa-border-radius; diff --git a/src/bundle/Resources/translations/forms.en.xliff b/src/bundle/Resources/translations/forms.en.xliff index ccd8004776..7c4df2e724 100644 --- a/src/bundle/Resources/translations/forms.en.xliff +++ b/src/bundle/Resources/translations/forms.en.xliff @@ -556,201 +556,6 @@ Setup / System info key: role.policy.setup.system_info - - Siso control center - Siso control center - key: role.policy.siso_control_center - - - Siso control center / All functions - Siso control center / All functions - key: role.policy.siso_control_center.all_functions - - - Siso control center / Api econtent - Siso control center / Api econtent - key: role.policy.siso_control_center.api_econtent - - - Siso control center / Api erp - Siso control center / Api erp - key: role.policy.siso_control_center.api_erp - - - Siso control center / Api jobs - Siso control center / Api jobs - key: role.policy.siso_control_center.api_jobs - - - Siso control center / Manage emails - Siso control center / Manage emails - key: role.policy.siso_control_center.manage_emails - - - Siso control center / Manage erp - Siso control center / Manage erp - key: role.policy.siso_control_center.manage_erp - - - Siso control center / Manage erp logs - Siso control center / Manage erp logs - key: role.policy.siso_control_center.manage_erp_logs - - - Siso control center / Manage exports - Siso control center / Manage exports - key: role.policy.siso_control_center.manage_exports - - - Siso control center / Manage imports - Siso control center / Manage imports - key: role.policy.siso_control_center.manage_imports - - - Siso control center / Manage jobs - Siso control center / Manage jobs - key: role.policy.siso_control_center.manage_jobs - - - Siso policy - Siso policy - key: role.policy.siso_policy - - - Siso policy / All functions - Siso policy / All functions - key: role.policy.siso_policy.all_functions - - - Siso policy / Checkout - Siso policy / Checkout - key: role.policy.siso_policy.checkout - - - Siso policy / Configuration list - Siso policy / Configuration list - key: role.policy.siso_policy.configuration_list - - - Siso policy / Dashboard view - Siso policy / Dashboard view - key: role.policy.siso_policy.dashboard_view - - - Siso policy / Delegate - Siso policy / Delegate - key: role.policy.siso_policy.delegate - - - Siso policy / Edit delivery - Siso policy / Edit delivery - key: role.policy.siso_policy.edit_delivery - - - Siso policy / Edit invoice - Siso policy / Edit invoice - key: role.policy.siso_policy.edit_invoice - - - Siso policy / Forms profile edit - Siso policy / Forms profile edit - key: role.policy.siso_policy.forms_profile_edit - - - Siso policy / Lostorder list - Siso policy / Lostorder list - key: role.policy.siso_policy.lostorder_list - - - Siso policy / Lostorder manage - Siso policy / Lostorder manage - key: role.policy.siso_policy.lostorder_manage - - - Siso policy / Lostorder process - Siso policy / Lostorder process - key: role.policy.siso_policy.lostorder_process - - - Siso policy / Manage config - Siso policy / Manage config - key: role.policy.siso_policy.manage_config - - - Siso policy / Manage orders - Siso policy / Manage orders - key: role.policy.siso_policy.manage_orders - - - Siso policy / Manage prices - Siso policy / Manage prices - key: role.policy.siso_policy.manage_prices - - - Siso policy / Manage rating - Siso policy / Manage rating - key: role.policy.siso_policy.manage_rating - - - Siso policy / Manage shipping costs - Siso policy / Manage shipping costs - key: role.policy.siso_policy.manage_shipping_costs - - - Siso policy / Manage stock - Siso policy / Manage stock - key: role.policy.siso_policy.manage_stock - - - Siso policy / Order list - Siso policy / Order list - key: role.policy.siso_policy.order_list - - - Siso policy / Orderhistory view - Siso policy / Orderhistory view - key: role.policy.siso_policy.orderhistory_view - - - Siso policy / Quickorder - Siso policy / Quickorder - key: role.policy.siso_policy.quickorder - - - Siso policy / Rating review - Siso policy / Rating review - key: role.policy.siso_policy.rating_review - - - Siso policy / Read basket - Siso policy / Read basket - key: role.policy.siso_policy.read_basket - - - Siso policy / Read customers and orders - Siso policy / Read customers and orders - key: role.policy.siso_policy.read_customers_and_orders - - - Siso policy / See product price - Siso policy / See product price - key: role.policy.siso_policy.see_product_price - - - Siso policy / Translations - Siso policy / Translations - key: role.policy.siso_policy.translations - - - Siso policy / Update exchange rates - Siso policy / Update exchange rates - key: role.policy.siso_policy.update_exchange_rates - - - Siso policy / Write basket - Siso policy / Write basket - key: role.policy.siso_policy.write_basket - Site Site diff --git a/src/bundle/Resources/translations/messages.en.xliff b/src/bundle/Resources/translations/messages.en.xliff index 94f5cb88fb..ad18992cae 100644 --- a/src/bundle/Resources/translations/messages.en.xliff +++ b/src/bundle/Resources/translations/messages.en.xliff @@ -304,6 +304,26 @@ log in to eZ Platform.]]> key: ezplatform.reset_user_password.success + + + + key: footer.copyright + + + Documentation + Documentation + key: footer.ibexa_documentation + + + Ibexa DXP + Ibexa DXP + key: footer.ibexa_dxp + + + Support + Support + key: footer.ibexa_support + Cancel Cancel diff --git a/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig b/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig index b16d0b580b..99ca7c91c1 100644 --- a/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig @@ -106,6 +106,7 @@ } %} {% endif %} + {% include '@ezdesign/ui/footer.html.twig' %} {{ form_start(form_edit, { @@ -117,6 +118,8 @@ {% endblock %} +{% block footer %}{% endblock %} + {% block react_modules %} {{ encore_entry_script_tags('ezplatform-admin-ui-content-tree-js', null, 'ezplatform') }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig b/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig index 9555c27196..baf71c95ad 100644 --- a/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig @@ -128,6 +128,7 @@ } %} {% endif %} + {{ form_widget(form_remove.remove, { 'attr': { 'hidden': true @@ -135,12 +136,15 @@ }) }} {{ form_end(form_remove) }} + {% include '@ezdesign/ui/footer.html.twig' %} {% include '@ezdesign/content/modal/version_conflict.html.twig' %} {% endblock %} +{% block footer %}{% endblock %} + {% block react_modules %} {{ encore_entry_script_tags('ezplatform-admin-ui-content-tree-js', null, 'ezplatform') }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/content/edit/base.html.twig b/src/bundle/Resources/views/themes/admin/content/edit/base.html.twig index caaad97e4e..eb67d65d08 100644 --- a/src/bundle/Resources/views/themes/admin/content/edit/base.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/edit/base.html.twig @@ -95,6 +95,8 @@ {% endblock %} +{% block footer %}{% endblock %} + {% block javascripts %} {% include '@ezdesign/content/edit/javascripts.html.twig' %} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/content/location_view.html.twig b/src/bundle/Resources/views/themes/admin/content/location_view.html.twig index e07cf9ddf9..1813c54597 100644 --- a/src/bundle/Resources/views/themes/admin/content/location_view.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/location_view.html.twig @@ -28,84 +28,86 @@ {{ parent() }} {% endblock left_sidebar %} -
-
-
- {% set items = [] %} - {% for path_location in path_locations %} - {% if not loop.last %} - {% set items = items|merge([{ - 'value': ez_content_name(path_location.contentInfo), - 'url': path('_ez_content_view', { - 'contentId': path_location.contentId, - 'locationId': path_location.id - }) - }]) %} - {% endif %} - {% endfor %} - - {% set items = items|merge([{ 'value': ez_content_name(content) }]) %} - - {% include '@ezdesign/ui/breadcrumbs.html.twig' with { items: items } %} - - {% include '@ezdesign/ui/page_title.html.twig' with { - title: ez_content_name(content), - icon_name: content_type.identifier, - content_type_name: content_type.name - } %} - - {% if location.hidden or location.invisible %} -
-
- - - - {{ 'content.hidden.message'|trans()|desc('This Content item or its Location is hidden.') }} -
-
+
+
+
+ {% set items = [] %} + {% for path_location in path_locations %} + {% if not loop.last %} + {% set items = items|merge([{ + 'value': ez_content_name(path_location.contentInfo), + 'url': path('_ez_content_view', { + 'contentId': path_location.contentId, + 'locationId': path_location.id + }) + }]) %} {% endif %} - {{ ez_render_component_group( - 'location-view-content-alerts', - { - 'versionInfo': content.versionInfo, - 'location': location, - } - ) }} -
-
-
-
- {{ ez_render_component_group('location-view-tab-groups', { - 'content': content, - 'location': location, - 'contentType': content_type, - 'draft_pagination_params': draft_pagination_params, - 'reverse_relation_pagination_params': reverse_relation_pagination_params, - 'custom_urls_pagination_params': custom_urls_pagination_params, - 'system_urls_pagination_params': system_urls_pagination_params, - 'roles_pagination_params': roles_pagination_params, - 'policies_pagination_params': policies_pagination_params, - 'is_location_visible': is_location_visible, - }) }} - - {% if content_type.isContainer %} - {{ form_start(form_subitems_content_edit, { 'action': path('ezplatform.content.edit'), 'attr': { 'hidden': 'hidden' }}) }} - {{ form_end(form_subitems_content_edit) }} -
- {% set udwConfigSingle = ez_udw_config('single_container', {}) %} -
- {% include '@ezdesign/content/modal/location_bulk_action_failed.html.twig' only %} + {% endfor %} + + {% set items = items|merge([{ 'value': ez_content_name(content) }]) %} + + {% include '@ezdesign/ui/breadcrumbs.html.twig' with { items: items } %} + + {% include '@ezdesign/ui/page_title.html.twig' with { + title: ez_content_name(content), + icon_name: content_type.identifier, + content_type_name: content_type.name + } %} + + {% if location.hidden or location.invisible %} +
+
+ + + + {{ 'content.hidden.message'|trans()|desc('This Content item or its Location is hidden.') }} +
- {% endif %} + {% endif %} + {{ ez_render_component_group( + 'location-view-content-alerts', + { + 'versionInfo': content.versionInfo, + 'location': location, + } + ) }} +
+
+
+
+ {{ ez_render_component_group('location-view-tab-groups', { + 'content': content, + 'location': location, + 'contentType': content_type, + 'draft_pagination_params': draft_pagination_params, + 'reverse_relation_pagination_params': reverse_relation_pagination_params, + 'custom_urls_pagination_params': custom_urls_pagination_params, + 'system_urls_pagination_params': system_urls_pagination_params, + 'roles_pagination_params': roles_pagination_params, + 'policies_pagination_params': policies_pagination_params, + 'is_location_visible': is_location_visible, + }) }} + + {% if content_type.isContainer %} + {{ form_start(form_subitems_content_edit, { 'action': path('ezplatform.content.edit'), 'attr': { 'hidden': 'hidden' }}) }} + {{ form_end(form_subitems_content_edit) }} +
+ {% set udwConfigSingle = ez_udw_config('single_container', {}) %} +
+ {% include '@ezdesign/content/modal/location_bulk_action_failed.html.twig' only %}
+ {% endif %}
+
+ + {% include '@ezdesign/ui/footer.html.twig' %}
@@ -140,6 +142,8 @@ {% endblock %} +{% block footer %}{% endblock %} + {% block stylesheets %} {{ encore_entry_link_tags('ezplatform-admin-ui-location-view-css', null, 'ezplatform') }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/ui/footer.html.twig b/src/bundle/Resources/views/themes/admin/ui/footer.html.twig new file mode 100644 index 0000000000..157ff25f4e --- /dev/null +++ b/src/bundle/Resources/views/themes/admin/ui/footer.html.twig @@ -0,0 +1,11 @@ +
+
+ Ibexa + {{ 'footer.copyright'|trans({'%year%': "now"|date('Y')})|desc('Copyright © %year% Ibexa. All right reserved')|raw }} +
+
+ {{ 'footer.ibexa_dxp'|trans|desc('Ibexa DXP') }} + {{ 'footer.ibexa_support'|trans|desc('Support') }} + {{ 'footer.ibexa_documentation'|trans|desc('Documentation') }} +
+
diff --git a/src/bundle/Resources/views/themes/admin/ui/layout.html.twig b/src/bundle/Resources/views/themes/admin/ui/layout.html.twig index e8e3fec562..0606b20026 100644 --- a/src/bundle/Resources/views/themes/admin/ui/layout.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/layout.html.twig @@ -130,6 +130,7 @@
{% endblock %} +
{% block content %} @@ -148,6 +149,11 @@ {% endblock content %}
+ + {% block footer %} + {% include '@ezdesign/ui/footer.html.twig' %} + {% endblock %} +
Date: Thu, 21 Jan 2021 15:22:08 +0100 Subject: [PATCH 2/9] After CR --- src/bundle/Resources/public/scss/_footer.scss | 2 +- .../Resources/translations/forms.en.xliff | 195 ++++++++++++++++++ 2 files changed, 196 insertions(+), 1 deletion(-) diff --git a/src/bundle/Resources/public/scss/_footer.scss b/src/bundle/Resources/public/scss/_footer.scss index 04b602f461..c44ab723c1 100644 --- a/src/bundle/Resources/public/scss/_footer.scss +++ b/src/bundle/Resources/public/scss/_footer.scss @@ -43,4 +43,4 @@ margin: auto calculateRem(15px) 0; } } -} \ No newline at end of file +} diff --git a/src/bundle/Resources/translations/forms.en.xliff b/src/bundle/Resources/translations/forms.en.xliff index 7c4df2e724..ccd8004776 100644 --- a/src/bundle/Resources/translations/forms.en.xliff +++ b/src/bundle/Resources/translations/forms.en.xliff @@ -556,6 +556,201 @@ Setup / System info key: role.policy.setup.system_info + + Siso control center + Siso control center + key: role.policy.siso_control_center + + + Siso control center / All functions + Siso control center / All functions + key: role.policy.siso_control_center.all_functions + + + Siso control center / Api econtent + Siso control center / Api econtent + key: role.policy.siso_control_center.api_econtent + + + Siso control center / Api erp + Siso control center / Api erp + key: role.policy.siso_control_center.api_erp + + + Siso control center / Api jobs + Siso control center / Api jobs + key: role.policy.siso_control_center.api_jobs + + + Siso control center / Manage emails + Siso control center / Manage emails + key: role.policy.siso_control_center.manage_emails + + + Siso control center / Manage erp + Siso control center / Manage erp + key: role.policy.siso_control_center.manage_erp + + + Siso control center / Manage erp logs + Siso control center / Manage erp logs + key: role.policy.siso_control_center.manage_erp_logs + + + Siso control center / Manage exports + Siso control center / Manage exports + key: role.policy.siso_control_center.manage_exports + + + Siso control center / Manage imports + Siso control center / Manage imports + key: role.policy.siso_control_center.manage_imports + + + Siso control center / Manage jobs + Siso control center / Manage jobs + key: role.policy.siso_control_center.manage_jobs + + + Siso policy + Siso policy + key: role.policy.siso_policy + + + Siso policy / All functions + Siso policy / All functions + key: role.policy.siso_policy.all_functions + + + Siso policy / Checkout + Siso policy / Checkout + key: role.policy.siso_policy.checkout + + + Siso policy / Configuration list + Siso policy / Configuration list + key: role.policy.siso_policy.configuration_list + + + Siso policy / Dashboard view + Siso policy / Dashboard view + key: role.policy.siso_policy.dashboard_view + + + Siso policy / Delegate + Siso policy / Delegate + key: role.policy.siso_policy.delegate + + + Siso policy / Edit delivery + Siso policy / Edit delivery + key: role.policy.siso_policy.edit_delivery + + + Siso policy / Edit invoice + Siso policy / Edit invoice + key: role.policy.siso_policy.edit_invoice + + + Siso policy / Forms profile edit + Siso policy / Forms profile edit + key: role.policy.siso_policy.forms_profile_edit + + + Siso policy / Lostorder list + Siso policy / Lostorder list + key: role.policy.siso_policy.lostorder_list + + + Siso policy / Lostorder manage + Siso policy / Lostorder manage + key: role.policy.siso_policy.lostorder_manage + + + Siso policy / Lostorder process + Siso policy / Lostorder process + key: role.policy.siso_policy.lostorder_process + + + Siso policy / Manage config + Siso policy / Manage config + key: role.policy.siso_policy.manage_config + + + Siso policy / Manage orders + Siso policy / Manage orders + key: role.policy.siso_policy.manage_orders + + + Siso policy / Manage prices + Siso policy / Manage prices + key: role.policy.siso_policy.manage_prices + + + Siso policy / Manage rating + Siso policy / Manage rating + key: role.policy.siso_policy.manage_rating + + + Siso policy / Manage shipping costs + Siso policy / Manage shipping costs + key: role.policy.siso_policy.manage_shipping_costs + + + Siso policy / Manage stock + Siso policy / Manage stock + key: role.policy.siso_policy.manage_stock + + + Siso policy / Order list + Siso policy / Order list + key: role.policy.siso_policy.order_list + + + Siso policy / Orderhistory view + Siso policy / Orderhistory view + key: role.policy.siso_policy.orderhistory_view + + + Siso policy / Quickorder + Siso policy / Quickorder + key: role.policy.siso_policy.quickorder + + + Siso policy / Rating review + Siso policy / Rating review + key: role.policy.siso_policy.rating_review + + + Siso policy / Read basket + Siso policy / Read basket + key: role.policy.siso_policy.read_basket + + + Siso policy / Read customers and orders + Siso policy / Read customers and orders + key: role.policy.siso_policy.read_customers_and_orders + + + Siso policy / See product price + Siso policy / See product price + key: role.policy.siso_policy.see_product_price + + + Siso policy / Translations + Siso policy / Translations + key: role.policy.siso_policy.translations + + + Siso policy / Update exchange rates + Siso policy / Update exchange rates + key: role.policy.siso_policy.update_exchange_rates + + + Siso policy / Write basket + Siso policy / Write basket + key: role.policy.siso_policy.write_basket + Site Site From 25c1c7989bee01eddd56ddf8ebda98493185a3a7 Mon Sep 17 00:00:00 2001 From: lukasz_ostafin Date: Fri, 22 Jan 2021 13:36:35 +0100 Subject: [PATCH 3/9] After CR --- .../Resources/public/scss/_dashboard.scss | 2 -- src/bundle/Resources/public/scss/_footer.scss | 4 ++++ .../Resources/public/scss/_general.scss | 19 ------------------- .../admin/account/settings/list.html.twig | 2 +- .../content_type_group/index.html.twig | 2 +- .../content_type_group/list.html.twig | 2 +- .../themes/admin/content_type/index.html.twig | 2 +- .../themes/admin/language/index.html.twig | 2 +- .../themes/admin/language/list.html.twig | 2 +- .../object_state_group/list.html.twig | 2 +- .../object_state_group/view.html.twig | 2 +- .../views/themes/admin/section/list.html.twig | 2 +- .../views/themes/admin/section/view.html.twig | 2 +- .../admin/ui/dashboard/dashboard.html.twig | 2 +- .../url_management/url_management.html.twig | 2 +- .../themes/admin/user/role/index.html.twig | 2 +- .../themes/admin/user/role/list.html.twig | 2 +- 17 files changed, 18 insertions(+), 35 deletions(-) diff --git a/src/bundle/Resources/public/scss/_dashboard.scss b/src/bundle/Resources/public/scss/_dashboard.scss index 64ed8ed1c9..cf4b227c3f 100644 --- a/src/bundle/Resources/public/scss/_dashboard.scss +++ b/src/bundle/Resources/public/scss/_dashboard.scss @@ -1,6 +1,4 @@ .ez-dashboard { - padding-bottom: calculateRem(65px); - &__header { display: grid; grid-template-columns: auto calculateRem(120px); diff --git a/src/bundle/Resources/public/scss/_footer.scss b/src/bundle/Resources/public/scss/_footer.scss index c44ab723c1..d0c00b1db1 100644 --- a/src/bundle/Resources/public/scss/_footer.scss +++ b/src/bundle/Resources/public/scss/_footer.scss @@ -1,3 +1,7 @@ +.ez-has-full-width-footer { + padding-bottom: calculateRem(65px); +} + .ez-footer { position: absolute; bottom: 0; diff --git a/src/bundle/Resources/public/scss/_general.scss b/src/bundle/Resources/public/scss/_general.scss index 7732eded14..87966f8f1a 100644 --- a/src/bundle/Resources/public/scss/_general.scss +++ b/src/bundle/Resources/public/scss/_general.scss @@ -146,25 +146,6 @@ select { background-color: $ibexa-color-base-pale; } -.ez-info-view, -.ez-section-list-view, -.ez-section-view, -.ez-role-list-view, -.ez-role-view, -.ez-language-list-view, -.ez-language-view, -.ez-content-type-group-list-view, -.ez-content-type-view, -.ez-object-state-group-list-view, -.ez-object-state-group-view, -.ez-workflow-list-view, -.ez-url-management, -.ez-segment-group-list-view, -.ez-segmentation-group-view, -.ez-user-settings-list-view { - padding-bottom: calculateRem(65px); -} - .ez-sticky-container { position: -webkit-sticky; position: sticky; diff --git a/src/bundle/Resources/views/themes/admin/account/settings/list.html.twig b/src/bundle/Resources/views/themes/admin/account/settings/list.html.twig index 343e898965..32f76806aa 100644 --- a/src/bundle/Resources/views/themes/admin/account/settings/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/settings/list.html.twig @@ -27,7 +27,7 @@ {% endblock %} -{% block body_class %}ez-user-settings-list-view{% endblock %} +{% block body_class %}ez-user-settings-list-view ez-has-full-width-footer{% endblock %} {% block content %}
diff --git a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/index.html.twig b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/index.html.twig index 867fb74b1a..fa42d43c21 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/index.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/index.html.twig @@ -2,7 +2,7 @@ {% trans_default_domain 'content_type' %} -{% block body_class %}ez-content-type-group-list-view{% endblock %} +{% block body_class %}ez-content-type-group-list-view ez-has-full-width-footer{% endblock %} {% block breadcrumbs %} {% include '@ezdesign/ui/breadcrumbs.html.twig' with { items: [ diff --git a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/list.html.twig b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/list.html.twig index f6577ac644..98c53434ac 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/content_type_group/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/content_type_group/list.html.twig @@ -4,7 +4,7 @@ {% trans_default_domain 'content_type' %} -{% block body_class %}ez-content-type-group-list-view{% endblock %} +{% block body_class %}ez-content-type-group-list-view ez-has-full-width-footer{% endblock %} {% block breadcrumbs %} {% include '@ezdesign/ui/breadcrumbs.html.twig' with { items: [ diff --git a/src/bundle/Resources/views/themes/admin/content_type/index.html.twig b/src/bundle/Resources/views/themes/admin/content_type/index.html.twig index faa40a3c0a..47312be9f7 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/index.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/index.html.twig @@ -2,7 +2,7 @@ {% trans_default_domain 'content_type' %} -{% block body_class %}ez-content-type-view{% endblock %} +{% block body_class %}ez-content-type-view ez-has-full-width-footer{% endblock %} {% set language_code = content_type.mainLanguageCode %} diff --git a/src/bundle/Resources/views/themes/admin/language/index.html.twig b/src/bundle/Resources/views/themes/admin/language/index.html.twig index 0dbe6e7859..504567ec7b 100644 --- a/src/bundle/Resources/views/themes/admin/language/index.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/index.html.twig @@ -4,7 +4,7 @@ {% trans_default_domain 'language' %} -{% block body_class %}ez-language-view{% endblock %} +{% block body_class %}ez-language-view ez-has-full-width-footer{% endblock %} {% block breadcrumbs %} {% include '@ezdesign/ui/breadcrumbs.html.twig' with { items: [ diff --git a/src/bundle/Resources/views/themes/admin/language/list.html.twig b/src/bundle/Resources/views/themes/admin/language/list.html.twig index d844faae8c..0096d106ce 100644 --- a/src/bundle/Resources/views/themes/admin/language/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/language/list.html.twig @@ -4,7 +4,7 @@ {% trans_default_domain 'language' %} -{% block body_class %}ez-language-list-view{% endblock %} +{% block body_class %}ez-language-list-view ez-has-full-width-footer{% endblock %} {% block breadcrumbs %} {% include '@ezdesign/ui/breadcrumbs.html.twig' with { items: [ diff --git a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/list.html.twig b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/list.html.twig index 7c3c5b634c..93dd6819f8 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/list.html.twig @@ -4,7 +4,7 @@ {% trans_default_domain 'object_state' %} -{% block body_class %}ez-object-state-group-list-view{% endblock %} +{% block body_class %}ez-object-state-group-list-view ez-has-full-width-footer{% endblock %} {% block breadcrumbs %} {% include '@ezdesign/ui/breadcrumbs.html.twig' with { items: [ diff --git a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/view.html.twig b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/view.html.twig index acd679771c..47d3fe1b0a 100644 --- a/src/bundle/Resources/views/themes/admin/object_state/object_state_group/view.html.twig +++ b/src/bundle/Resources/views/themes/admin/object_state/object_state_group/view.html.twig @@ -2,7 +2,7 @@ {% trans_default_domain 'object_state' %} -{% block body_class %}ez-object-state-group-view{% endblock %} +{% block body_class %}ez-object-state-group-view ez-has-full-width-footer{% endblock %} {% block breadcrumbs %} {% include '@ezdesign/ui/breadcrumbs.html.twig' with { items: [ diff --git a/src/bundle/Resources/views/themes/admin/section/list.html.twig b/src/bundle/Resources/views/themes/admin/section/list.html.twig index 4673b71e46..012f2d8559 100644 --- a/src/bundle/Resources/views/themes/admin/section/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/section/list.html.twig @@ -5,7 +5,7 @@ {% trans_default_domain 'section' %} -{% block body_class %}ez-section-list-view{% endblock %} +{% block body_class %}ez-section-list-view ez-has-full-width-footer{% endblock %} {% block breadcrumbs %} {% include '@ezdesign/ui/breadcrumbs.html.twig' with { items: [ diff --git a/src/bundle/Resources/views/themes/admin/section/view.html.twig b/src/bundle/Resources/views/themes/admin/section/view.html.twig index 8aaa5a0aa7..39fe1c7e54 100644 --- a/src/bundle/Resources/views/themes/admin/section/view.html.twig +++ b/src/bundle/Resources/views/themes/admin/section/view.html.twig @@ -2,7 +2,7 @@ {% trans_default_domain 'section' %} -{% block body_class %}ez-section-view{% endblock %} +{% block body_class %}ez-section-view ez-has-full-width-footer{% endblock %} {% block breadcrumbs %} {% include '@ezdesign/ui/breadcrumbs.html.twig' with { items: [ diff --git a/src/bundle/Resources/views/themes/admin/ui/dashboard/dashboard.html.twig b/src/bundle/Resources/views/themes/admin/ui/dashboard/dashboard.html.twig index a4336d87d1..c8723f2b95 100644 --- a/src/bundle/Resources/views/themes/admin/ui/dashboard/dashboard.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/dashboard/dashboard.html.twig @@ -2,7 +2,7 @@ {% trans_default_domain 'dashboard' %} -{% block body_class %}ez-dashboard{% endblock %} +{% block body_class %}ez-dashboard ez-has-full-width-footer{% endblock %} {% block content %}
diff --git a/src/bundle/Resources/views/themes/admin/url_management/url_management.html.twig b/src/bundle/Resources/views/themes/admin/url_management/url_management.html.twig index 81db56a763..b528b85bd0 100644 --- a/src/bundle/Resources/views/themes/admin/url_management/url_management.html.twig +++ b/src/bundle/Resources/views/themes/admin/url_management/url_management.html.twig @@ -2,7 +2,7 @@ {% trans_default_domain 'ezplatform_url_management' %} -{% block body_class %}ez-url-management{% endblock %} +{% block body_class %}ez-url-management ez-has-full-width-footer{% endblock %} {% block breadcrumbs %} {% include '@ezdesign/ui/breadcrumbs.html.twig' with { items: [ diff --git a/src/bundle/Resources/views/themes/admin/user/role/index.html.twig b/src/bundle/Resources/views/themes/admin/user/role/index.html.twig index 80ad94bfe1..d738b04957 100644 --- a/src/bundle/Resources/views/themes/admin/user/role/index.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role/index.html.twig @@ -2,7 +2,7 @@ {% trans_default_domain 'role' %} -{% block body_class %}ez-role-view{% endblock %} +{% block body_class %}ez-role-view ez-has-full-width-footer{% endblock %} {% block breadcrumbs %} {% include '@ezdesign/ui/breadcrumbs.html.twig' with { items: [ diff --git a/src/bundle/Resources/views/themes/admin/user/role/list.html.twig b/src/bundle/Resources/views/themes/admin/user/role/list.html.twig index 80b141840a..d990cd7a31 100644 --- a/src/bundle/Resources/views/themes/admin/user/role/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/role/list.html.twig @@ -4,7 +4,7 @@ {% form_theme form_roles_delete '@ezdesign/ui/form_fields.html.twig' %} -{% block body_class %}ez-role-list-view{% endblock %} +{% block body_class %}ez-role-list-view ez-has-full-width-footer{% endblock %} {% block breadcrumbs %} {% include '@ezdesign/ui/breadcrumbs.html.twig' with { items: [ From 031643be6a21fac1e6f7a3c0ce093412673730a0 Mon Sep 17 00:00:00 2001 From: lukasz_ostafin Date: Fri, 22 Jan 2021 13:40:26 +0100 Subject: [PATCH 4/9] After CR --- src/bundle/Resources/views/themes/admin/ui/footer.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bundle/Resources/views/themes/admin/ui/footer.html.twig b/src/bundle/Resources/views/themes/admin/ui/footer.html.twig index 157ff25f4e..daff25e328 100644 --- a/src/bundle/Resources/views/themes/admin/ui/footer.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/footer.html.twig @@ -1,6 +1,6 @@
- Ibexa + {{ 'footer.ibexa_dxp'|trans|desc('Ibexa DXP') }} {{ 'footer.copyright'|trans({'%year%': "now"|date('Y')})|desc('Copyright © %year% Ibexa. All right reserved')|raw }}
From 2925de7735b12e4dbcc051c8b42daea085347f65 Mon Sep 17 00:00:00 2001 From: lukasz_ostafin Date: Tue, 26 Jan 2021 14:24:56 +0100 Subject: [PATCH 5/9] After QA --- .../views/themes/admin/account/bookmarks/list.html.twig | 5 +---- .../views/themes/admin/content/location_view.html.twig | 6 +----- .../Resources/views/themes/admin/user/policy/edit.html.twig | 1 + 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig b/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig index 99ca7c91c1..e5a17c299c 100644 --- a/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig @@ -4,7 +4,7 @@ {% form_theme form_remove '@ezdesign/ui/form_fields.html.twig' %} -{% block body_class %}ez-bookmark-list-view ez-has-two-sidebars{% endblock %} +{% block body_class %}ez-bookmark-list-view ez-has-two-sidebars ez-has-full-width-footer{% endblock %} {% block content %}
@@ -106,7 +106,6 @@ } %} {% endif %}
- {% include '@ezdesign/ui/footer.html.twig' %}
{{ form_start(form_edit, { @@ -118,8 +117,6 @@
{% endblock %} -{% block footer %}{% endblock %} - {% block react_modules %} {{ encore_entry_script_tags('ezplatform-admin-ui-content-tree-js', null, 'ezplatform') }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/content/location_view.html.twig b/src/bundle/Resources/views/themes/admin/content/location_view.html.twig index 1813c54597..831a9f83ff 100644 --- a/src/bundle/Resources/views/themes/admin/content/location_view.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/location_view.html.twig @@ -13,7 +13,7 @@ {% endif %} {% form_theme form_content_create '@ezdesign/ui/form_fields.html.twig' %} -{% block body_class %}ez-content-view ez-has-two-sidebars{% endblock %} +{% block body_class %}ez-content-view ez-has-two-sidebars ez-has-full-width-footer{% endblock %} {% block content %}
- - {% include '@ezdesign/ui/footer.html.twig' %}
@@ -142,8 +140,6 @@ {% endblock %} -{% block footer %}{% endblock %} - {% block stylesheets %} {{ encore_entry_link_tags('ezplatform-admin-ui-location-view-css', null, 'ezplatform') }} {% endblock %} diff --git a/src/bundle/Resources/views/themes/admin/user/policy/edit.html.twig b/src/bundle/Resources/views/themes/admin/user/policy/edit.html.twig index c14988c885..53385fd257 100644 --- a/src/bundle/Resources/views/themes/admin/user/policy/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/user/policy/edit.html.twig @@ -1,6 +1,7 @@ {% extends "@ezdesign/user/policy/base.html.twig" %} {% form_theme form '@ezdesign/ui/form_fields.html.twig' %} +{% block body_class %}ez-has-full-width-footer{% endblock %} {% trans_default_domain 'role' %} From 843d28a734ac0614e62ee4a003fa6df73306742c Mon Sep 17 00:00:00 2001 From: lukasz_ostafin Date: Wed, 27 Jan 2021 10:00:50 +0100 Subject: [PATCH 6/9] After QA --- .../Resources/views/themes/admin/content_type/edit.html.twig | 2 +- src/bundle/Resources/views/themes/admin/trash/list.html.twig | 2 +- .../Resources/views/themes/admin/ui/search/index.html.twig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bundle/Resources/views/themes/admin/content_type/edit.html.twig b/src/bundle/Resources/views/themes/admin/content_type/edit.html.twig index 62b1a6235d..069036c5fd 100644 --- a/src/bundle/Resources/views/themes/admin/content_type/edit.html.twig +++ b/src/bundle/Resources/views/themes/admin/content_type/edit.html.twig @@ -3,7 +3,7 @@ {% trans_default_domain 'content_type' %} {% form_theme form '@ezdesign/ui/form_fields.html.twig' %} -{% block body_class %}ez-admin-edit{% endblock %} +{% block body_class %}ez-admin-edit ez-has-full-width-footer{% endblock %} {% block breadcrumbs_admin %} {% include '@ezdesign/ui/breadcrumbs.html.twig' with { items: [ diff --git a/src/bundle/Resources/views/themes/admin/trash/list.html.twig b/src/bundle/Resources/views/themes/admin/trash/list.html.twig index 294651c7f8..e322188f1f 100644 --- a/src/bundle/Resources/views/themes/admin/trash/list.html.twig +++ b/src/bundle/Resources/views/themes/admin/trash/list.html.twig @@ -8,7 +8,7 @@ {% form_theme form_trash_item_delete '@ezdesign/ui/form_fields.html.twig' %} {% form_theme form_search '@ezdesign/ui/form_fields.html.twig' %} -{% block body_class %}ez-trash-list-view ez-has-two-sidebars{% endblock %} +{% block body_class %}ez-trash-list-view ez-has-two-sidebars ez-has-full-width-footer{% endblock %} {% block content %} {% set trashSearchParams = app.request.get('trash_search') %} diff --git a/src/bundle/Resources/views/themes/admin/ui/search/index.html.twig b/src/bundle/Resources/views/themes/admin/ui/search/index.html.twig index 1780b229d7..03b08e87cd 100644 --- a/src/bundle/Resources/views/themes/admin/ui/search/index.html.twig +++ b/src/bundle/Resources/views/themes/admin/ui/search/index.html.twig @@ -4,7 +4,7 @@ {% block page_title %}{% endblock %} -{% block body_class %}ez-search-view ez-has-two-sidebars{% endblock %} +{% block body_class %}ez-search-view ez-has-two-sidebars ez-has-full-width-footer{% endblock %} {% block title %}{{ 'search'|trans|desc('Search') }}{% endblock %} From 32583975b09719eb64ec5c1e149c74ef2dcf219f Mon Sep 17 00:00:00 2001 From: lukasz_ostafin Date: Wed, 27 Jan 2021 11:11:16 +0100 Subject: [PATCH 7/9] Added fixed logotype for footer --- .../Resources/public/img/ibexa-wordmark.svg | 39 +++++++++---------- src/bundle/Resources/public/scss/_footer.scss | 1 + 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/bundle/Resources/public/img/ibexa-wordmark.svg b/src/bundle/Resources/public/img/ibexa-wordmark.svg index f508580c94..6a5e5b6b3b 100644 --- a/src/bundle/Resources/public/img/ibexa-wordmark.svg +++ b/src/bundle/Resources/public/img/ibexa-wordmark.svg @@ -1,20 +1,19 @@ - - - Ibexa_responsive_wordmark - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/bundle/Resources/public/scss/_footer.scss b/src/bundle/Resources/public/scss/_footer.scss index d0c00b1db1..9c00a26a6b 100644 --- a/src/bundle/Resources/public/scss/_footer.scss +++ b/src/bundle/Resources/public/scss/_footer.scss @@ -18,6 +18,7 @@ &__brand-img { margin-right: calculateRem(16px); + max-width: calculateRem(32px); } &__link { From b009c36534a56c14064765d1367b39175eed47b2 Mon Sep 17 00:00:00 2001 From: lukasz_ostafin Date: Wed, 27 Jan 2021 11:36:57 +0100 Subject: [PATCH 8/9] Fixed footer for draft list --- .../views/themes/admin/content/draft/draft_list.html.twig | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig b/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig index baf71c95ad..f68ce7f1e4 100644 --- a/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/draft/draft_list.html.twig @@ -8,7 +8,7 @@ {% block title %}{{ 'drafts.list'|trans|desc('Drafts') }} - {{ parent() }}{% endblock %} -{% block body_class %}ez-drafts-list-view{% endblock %} +{% block body_class %}ez-drafts-list-view ez-has-full-width-footer{% endblock %} {% block content %}
@@ -136,15 +136,12 @@ }) }} {{ form_end(form_remove) }}
- {% include '@ezdesign/ui/footer.html.twig' %}
{% include '@ezdesign/content/modal/version_conflict.html.twig' %} {% endblock %} -{% block footer %}{% endblock %} - {% block react_modules %} {{ encore_entry_script_tags('ezplatform-admin-ui-content-tree-js', null, 'ezplatform') }} {% endblock %} From 7b732be69e8ef18b82e772f59d7549cf7523d612 Mon Sep 17 00:00:00 2001 From: lukasz_ostafin Date: Wed, 27 Jan 2021 12:28:23 +0100 Subject: [PATCH 9/9] Removed footer form content preview --- .../views/themes/admin/content/content_preview.html.twig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig b/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig index 0ba456e939..9e128d790d 100644 --- a/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig +++ b/src/bundle/Resources/views/themes/admin/content/content_preview.html.twig @@ -69,6 +69,8 @@
{% endblock %} +{% block footer %}{% endblock %} + {% block javascripts %} {{ encore_entry_script_tags('ezplatform-admin-ui-content-preview-js', null, 'ezplatform') }} {% endblock %}