Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EZP-30064: As an editor I would like to view a content tree in location view #814

Merged
merged 2 commits into from
Jan 30, 2019
Merged

EZP-30064: As an editor I would like to view a content tree in location view #814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d271716
EZP-30064: As an editor I would like to view a content tree in locati…
Jan 29, 2019
e41fc5e
fixup
Jan 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/bundle/Resources/public/js/scripts/admin.location.content.tree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(function(doc, React, ReactDOM, eZ) {
const contentTreeContainer = doc.querySelector('.ez-content-tree-container');

ReactDOM.render(React.createElement(eZ.modules.ContentTree, {}), contentTreeContainer);
})(window.document, window.React, window.ReactDOM, window.eZ);
14 changes: 14 additions & 0 deletions src/bundle/Resources/public/scss/_view-content.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.ez-content-view {
.ez-content-container {
display: flex;
}

.ez-content-tree-container {
min-width: calculateRem(250px);
color: inherit;
}

.ez-location-view-container {
flex: 1 1 auto;
}
}
4 changes: 2 additions & 2 deletions src/bundle/Resources/public/scss/core/_custom.dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@

&--selected,
&--selected:hover,
&&--selected[disabled],
&&--selected[disabled]:hover {
&--selected[disabled],
&--selected[disabled]:hover {
background: $ez-ground-primary;
}

Expand Down
1 change: 1 addition & 0 deletions src/bundle/Resources/public/scss/ezplatform.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,4 @@
@import 'admin.section-view';
@import 'admin.content-type-view';
@import 'main-row';
@import 'view-content';
103 changes: 54 additions & 49 deletions src/bundle/Resources/views/content/locationview.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,57 +26,60 @@
{% endblock left_sidebar %}

<div class="px-0 pb-4 ez-content-container">
<div class="ez-header">
<div class="container">
{% set items = [] %}
{% for pathLocation in pathLocations %}
{% if not loop.last %}
{% set items = items|merge([{
'value': pathLocation.contentInfo.name,
'url': path('_ezpublishLocation', {'locationId': pathLocation.id})
}]) %}
{% endif %}
{% endfor %}
{% set items = items|merge([{ 'value': content.name }]) %}
{% include '@ezdesign/parts/breadcrumbs.html.twig' with { items: items } %}
<div class="ez-content-tree-container"></div>
<div class="ez-location-view-container">
<div class="ez-header">
<div class="container">
{% set items = [] %}
{% for pathLocation in pathLocations %}
{% if not loop.last %}
{% set items = items|merge([{
'value': pathLocation.contentInfo.name,
'url': path('_ezpublishLocation', {'locationId': pathLocation.id})
}]) %}
{% endif %}
{% endfor %}
{% set items = items|merge([{ 'value': content.name }]) %}
{% include '@ezdesign/parts/breadcrumbs.html.twig' with { items: items } %}

{% include '@ezdesign/parts/page_title.html.twig' with {
title: content.name,
iconName: contentType.identifier,
contentTypeName: contentType.name
} %}
{% include '@ezdesign/parts/page_title.html.twig' with {
title: content.name,
iconName: contentType.identifier,
contentTypeName: contentType.name
} %}
</div>
</div>
</div>
<div class="panel panel-primary">
<div class="panel-body">
{{ ez_platform_tabs('location-view', {
'content': content,
'location': location,
'contentType': contentType,
'draft_pagination_params': draft_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
}, '@ezdesign/parts/tab/locationview.html.twig') }}
<div class="panel panel-primary">
<div class="panel-body">
{{ ez_platform_tabs('location-view', {
'content': content,
'location': location,
'contentType': contentType,
'draft_pagination_params': draft_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
}, '@ezdesign/parts/tab/locationview.html.twig') }}

{% if contentType.isContainer %}
{{ form_start(form_subitems_content_edit, { 'action': path('ezplatform.content.edit'), 'attr': { 'hidden': 'hidden' }}) }}
{{ form_end(form_subitems_content_edit) }}
<div class="container px-5">
<section class="ez-fieldgroup">
<h2 class="ez-fieldgroup__name">{{ 'content.view.subitems'|trans|desc('Sub-items') }}</h2>
<div class="ez-sil"
data-location="{{ location.id }}"
data-mfu-create-permissions-config="{{ subitems_module.content_create_permissions_for_mfu|json_encode() }}"
data-items="{{ subitems_module.items }}"
data-content-types="{{ subitems_module.content_type_info_list }}"
data-udw-config-bulk-move-items="{{ ez_udw_config('single_container', {}) }}"
></div>
</section>
{% include '@ezdesign/content/modal_location_bulk_action_failed.html.twig' only %}
{% if contentType.isContainer %}
{{ form_start(form_subitems_content_edit, { 'action': path('ezplatform.content.edit'), 'attr': { 'hidden': 'hidden' }}) }}
{{ form_end(form_subitems_content_edit) }}
<div class="container px-5">
<section class="ez-fieldgroup">
<h2 class="ez-fieldgroup__name">{{ 'content.view.subitems'|trans|desc('Sub-items') }}</h2>
<div class="ez-sil"
data-location="{{ location.id }}"
data-mfu-create-permissions-config="{{ subitems_module.content_create_permissions_for_mfu|json_encode() }}"
data-items="{{ subitems_module.items }}"
data-content-types="{{ subitems_module.content_type_info_list }}"
data-udw-config-bulk-move-items="{{ ez_udw_config('single_container', {}) }}"
></div>
</section>
{% include '@ezdesign/content/modal_location_bulk_action_failed.html.twig' only %}
</div>
{% endif %}
</div>
{% endif %}
</div>
</div>
</div>
Expand Down Expand Up @@ -138,8 +141,9 @@

{% block react_modules %}
{% javascripts
'bundles/ezplatformadminuimodules/js/SubItems.module.js'
'bundles/ezplatformadminuimodules/js/MultiFileUpload.module.js'
'@EzPlatformAdminUiModulesBundle/Resources/public/js/SubItems.module.js'
'@EzPlatformAdminUiModulesBundle/Resources/public/js/MultiFileUpload.module.js'
'@EzPlatformAdminUiModulesBundle/Resources/public/js/ContentTree.module.js'
%}
<script src="{{ asset_url }}"></script>
{% endjavascripts %}
Expand All @@ -148,6 +152,7 @@
{% block javascripts %}
{% javascripts
'@EzPlatformAdminUiBundle/Resources/public/js/scripts/admin.location.change.language.js'
'@EzPlatformAdminUiBundle/Resources/public/js/scripts/admin.location.content.tree.js'
'@EzPlatformAdminUiBundle/Resources/public/js/scripts/admin.location.view.js'
'@EzPlatformAdminUiBundle/Resources/public/js/scripts/admin.location.tab.js'
'@EzPlatformAdminUiBundle/Resources/public/js/scripts/admin.location.visibility.js'
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/views/layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,11 @@
{{ ezplatform_admin_ui_component_group('custom-admin-ui-modules') }}
{{ ezplatform_admin_ui_component_group('custom-admin-ui-config') }}
{% javascripts
'@EzPlatformAdminUiModulesBundle/Resources/public/js/UniversalDiscovery.module.js'
'@EzPlatformAdminUiBundle/Resources/public/js/scripts/helpers/request.helper.js'
'@EzPlatformAdminUiBundle/Resources/public/js/scripts/helpers/notification.helper.js'
'@EzPlatformAdminUiBundle/Resources/public/js/scripts/helpers/timezone.helper.js'
'@EzPlatformAdminUiBundle/Resources/public/js/scripts/admin.notifications.js'
'@EzPlatformAdminUiModulesBundle/Resources/public/js/UniversalDiscovery.module.js'
'@EzPlatformAdminUiBundle/Resources/public/js/scripts/button.trigger.js'
'@EzPlatformAdminUiBundle/Resources/public/js/scripts/button.prevent.default.js'
'@EzPlatformAdminUiBundle/Resources/public/js/scripts/udw/browse.js'
Expand Down
48 changes: 23 additions & 25 deletions src/bundle/Resources/views/parts/tab/locationview.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,26 @@
<div>
<div class="ez-header px-4">
<div class="container">
<ul class="nav nav-tabs ez-tabs" role="tablist" id="ez-tab-list-{{ group }}">
{% for tab in tabs %}
{% set id = group ~ '-' ~ tab.identifier %}
{% set active = loop.first %}
<li class="nav-item">
<a class="nav-link{% if active %} active{% endif %}" id="ez-tab-label-{{ group }}"
data-toggle="tab" href="#ez-tab-{{ id }}" role="tab" aria-controls="ez-tab-{{ id }}"
aria-expanded="{{ active }}">{{ tab.name }}</a>
</li>
{% endfor %}
</ul>
</div>
<div class="ez-header px-4">
<div class="container">
<ul class="nav nav-tabs ez-tabs" role="tablist" id="ez-tab-list-{{ group }}">
{% for tab in tabs %}
{% set id = group ~ '-' ~ tab.identifier %}
{% set active = loop.first %}
<li class="nav-item">
<a class="nav-link{% if active %} active{% endif %}" id="ez-tab-label-{{ group }}"
data-toggle="tab" href="#ez-tab-{{ id }}" role="tab" aria-controls="ez-tab-{{ id }}"
aria-expanded="{{ active }}">{{ tab.name }}</a>
</li>
{% endfor %}
</ul>
</div>
<div class="tab-content container mt-4 px-5" id="ez-tab-list-content-{{ group }}">
{% for tab in tabs %}
{% set id = group ~ '-' ~ tab.identifier %}
{% set active = loop.first %}
</div>
<div class="tab-content container mt-4 px-5" id="ez-tab-list-content-{{ group }}">
{% for tab in tabs %}
{% set id = group ~ '-' ~ tab.identifier %}
{% set active = loop.first %}

<div class="tab-pane{% if active %} active{% endif %}" id="ez-tab-{{ id }}" role="tabpanel"
aria-labelledby="ez-tab-label-{{ group }}">
{{ tab.view|raw }}
</div>
{% endfor %}
</div>
<div class="tab-pane{% if active %} active{% endif %}" id="ez-tab-{{ id }}" role="tabpanel"
aria-labelledby="ez-tab-label-{{ group }}">
{{ tab.view|raw }}
</div>
{% endfor %}
</div>