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

Jump to bottom

IBX-2871: Wrong spacing on some admin pages #421

Merged
merged 1 commit into from
May 17, 2022
Merged

IBX-2871: Wrong spacing on some admin pages #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 0 additions & 9 deletions src/bundle/Resources/public/scss/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@
&,
& + .container {
padding: 0;
margin-right: calculateRem(15px);
margin-left: calculateRem(15px);
}

.container {
margin: 0;
padding: 0;
position: relative;
max-width: none;
}

&--light {
Expand Down
4 changes: 2 additions & 2 deletions src/bundle/Resources/public/scss/_tabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,9 @@
}

.ibexa-tab-content {
width: calc(100% - #{calculateRem(30px)});
width: 100%;
padding: 0;
margin: calculateRem(-1px) calculateRem(15px) calculateRem(15px);
margin: calculateRem(-1px) 0 calculateRem(15px);
border: calculateRem(1px) solid $ibexa-color-light;
border-radius: 0 calculateRem(10px) calculateRem(10px) calculateRem(10px);
overflow: hidden;
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/Resources/public/scss/ui/modules/sub-items-list/_main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.m-sub-items {
margin-top: calculateRem(72px);
margin-bottom: calculateRem(24px);
padding: calculateRem(16px);
padding: calculateRem(16px) 0;
background: $ibexa-color-white;
border-radius: $ibexa-border-radius;

Expand Down
176 changes: 87 additions & 89 deletions src/bundle/Resources/views/themes/admin/account/bookmarks/list.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,96 +13,94 @@
{% endblock %}

{% block content %}
<div class="row align-items-stretch ibexa-main-row">
<div class="container ibexa-content-container">
<section class="container ibexa-container">
{% set body_rows = [] %}
{% for bookmark in pager.currentPageResults %}
{% set body_row_cols = [] %}

{% set col_checkbox %}
{{ form_widget(form_remove.bookmarks[bookmark.id]) }}
{% endset %}

{% set col_icon %}
<svg class="ibexa-icon ibexa-icon--small">
<use xlink:href="{{ ibexa_content_type_icon(bookmark.contentType.identifier) }}"></use>
</svg>
{% endset %}

{% set col_name %}
<a href="{{ path('ibexa.content.view', { 'contentId': bookmark.contentInfo.id, 'locationId': bookmark.id }) }}">
{{ ibexa_content_name(bookmark.contentInfo) }}
</a>
{% endset %}

{% set col_path %}
{% if bookmark.pathLocations|length > 1 %}
{% for location in bookmark.pathLocations %}
{% if loop.revindex > 1 %}
<a href="{{ path('ibexa.content.view', { 'contentId': location.contentId, 'locationId': location.id}) }}">
{{ ibexa_content_name(location.contentInfo) }}
</a>
{% if loop.revindex > 2 %}/{% endif %}
{% endif %}
{% endfor %}
{% else %}
-
{% endif %}
{% endset %}

{% set col_action_btns %}
{% if bookmark.userCanEdit %}
<button
class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text ibexa-btn--content-edit"
title="{{ 'bookmark.list.content.edit'|trans|desc('Edit content') }}"
data-content-id="{{ bookmark.contentInfo.id }}"
data-language-code="{{ bookmark.contentInfo.mainLanguageCode }}"
>
<svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
<use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
</svg>
</button>
{% endif %}
{% endset %}

{% set body_rows = body_rows|merge([{ cols: [
{ has_checkbox: true, content: col_checkbox, raw: true },
{ has_icon: true, content: col_icon, raw: true },
{ content: col_name, raw: true},
{ content: bookmark.contentType.name },
{ content: col_path, raw: true },
{ has_action_btns: true, content: col_action_btns, raw: true },
]}]) %}
{% endfor %}

{{ form_start(form_remove, {
'action': path('ibexa.bookmark.remove'),
'attr': { 'class': 'ibexa-toggle-btn-state', 'data-toggle-button-id': '#bookmark_remove_remove' }
}) }}
{% include '@ibexadesign/ui/component/table/table.html.twig' with {
headline: 'bookmark.table.header'|trans|desc('Bookmarks') ~ ' (' ~ pager.count ~ ')',
head_cols: [
{ has_checkbox: true },
{ has_icon: true },
{ content: 'bookmark.list.name'|trans|desc('Name') },
{ content: 'bookmark.list.content_type'|trans|desc('Content Type') },
{ content: 'bookmark.list.path'|trans|desc('Path') },
{ },
],
body_rows,
actions: form_widget(form_remove.remove, {'attr': {'class': 'btn ibexa-btn ibexa-btn--ghost ibexa-btn--small', 'disabled': true}}),
empty_table_info_text: 'bookmark.list.empty'|trans|desc('You have no bookmarks yet. Your bookmarks will show up here.'),
<div class="align-items-stretch ibexa-main-row">
<section class="container ibexa-container">
{% set body_rows = [] %}
{% for bookmark in pager.currentPageResults %}
{% set body_row_cols = [] %}

{% set col_checkbox %}
{{ form_widget(form_remove.bookmarks[bookmark.id]) }}
{% endset %}

{% set col_icon %}
<svg class="ibexa-icon ibexa-icon--small">
<use xlink:href="{{ ibexa_content_type_icon(bookmark.contentType.identifier) }}"></use>
</svg>
{% endset %}

{% set col_name %}
<a href="{{ path('ibexa.content.view', { 'contentId': bookmark.contentInfo.id, 'locationId': bookmark.id }) }}">
{{ ibexa_content_name(bookmark.contentInfo) }}
</a>
{% endset %}

{% set col_path %}
{% if bookmark.pathLocations|length > 1 %}
{% for location in bookmark.pathLocations %}
{% if loop.revindex > 1 %}
<a href="{{ path('ibexa.content.view', { 'contentId': location.contentId, 'locationId': location.id}) }}">
{{ ibexa_content_name(location.contentInfo) }}
</a>
{% if loop.revindex > 2 %}/{% endif %}
{% endif %}
{% endfor %}
{% else %}
-
{% endif %}
{% endset %}

{% set col_action_btns %}
{% if bookmark.userCanEdit %}
<button
class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text ibexa-btn--content-edit"
title="{{ 'bookmark.list.content.edit'|trans|desc('Edit content') }}"
data-content-id="{{ bookmark.contentInfo.id }}"
data-language-code="{{ bookmark.contentInfo.mainLanguageCode }}"
>
<svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
<use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
</svg>
</button>
{% endif %}
{% endset %}

{% set body_rows = body_rows|merge([{ cols: [
{ has_checkbox: true, content: col_checkbox, raw: true },
{ has_icon: true, content: col_icon, raw: true },
{ content: col_name, raw: true},
{ content: bookmark.contentType.name },
{ content: col_path, raw: true },
{ has_action_btns: true, content: col_action_btns, raw: true },
]}]) %}
{% endfor %}

{{ form_start(form_remove, {
'action': path('ibexa.bookmark.remove'),
'attr': { 'class': 'ibexa-toggle-btn-state', 'data-toggle-button-id': '#bookmark_remove_remove' }
}) }}
{% include '@ibexadesign/ui/component/table/table.html.twig' with {
headline: 'bookmark.table.header'|trans|desc('Bookmarks') ~ ' (' ~ pager.count ~ ')',
head_cols: [
{ has_checkbox: true },
{ has_icon: true },
{ content: 'bookmark.list.name'|trans|desc('Name') },
{ content: 'bookmark.list.content_type'|trans|desc('Content Type') },
{ content: 'bookmark.list.path'|trans|desc('Path') },
{ },
],
body_rows,
actions: form_widget(form_remove.remove, {'attr': {'class': 'btn ibexa-btn ibexa-btn--ghost ibexa-btn--small', 'disabled': true}}),
empty_table_info_text: 'bookmark.list.empty'|trans|desc('You have no bookmarks yet. Your bookmarks will show up here.'),
} %}
{{ form_end(form_remove) }}

{% if pager.haveToPaginate %}
{% include '@ibexadesign/ui/pagination.html.twig' with {
'pager': pager
} %}
{{ form_end(form_remove) }}

{% if pager.haveToPaginate %}
{% include '@ibexadesign/ui/pagination.html.twig' with {
'pager': pager
} %}
{% endif %}
</section>
</div>
{% endif %}
</section>

{{ form_start(form_edit, {
'action': path('ibexa.content.edit'),
Expand Down
16 changes: 6 additions & 10 deletions src/bundle/Resources/views/themes/admin/account/settings/list.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,15 @@
{% trans_default_domain 'user_settings' %}

{% block breadcrumbs %}
<div class="container">
{% include '@ibexadesign/ui/breadcrumbs.html.twig' with { items: [
{ value: 'list.title'|trans|desc('User Settings') }
]} %}
</div>
{% include '@ibexadesign/ui/breadcrumbs.html.twig' with { items: [
{ value: 'list.title'|trans|desc('User Settings') }
]} %}
{% endblock %}

{% block header %}
<div class="container">
{% include '@ibexadesign/ui/page_title.html.twig' with {
title: 'list.title'|trans|desc('User Settings'),
} %}
</div>
{% include '@ibexadesign/ui/page_title.html.twig' with {
title: 'list.title'|trans|desc('User Settings'),
} %}
{% endblock %}

{% block body_class %}ibexa-user-settings-list-view{% endblock %}
Expand Down
Loading