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-2230: [UDW] Hide footer buttons on "Create" from dashboard; Change border in search to blue; Allow creating content from search #309

Merged
merged 1 commit into from
Feb 4, 2022
Merged

IBX-2230: [UDW] Hide footer buttons on "Create" from dashboard; Change border in search to blue; Allow creating content from search #309

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
4 changes: 2 additions & 2 deletions src/bundle/Resources/public/scss/ui/modules/universal-discovery/_content.table.item.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
cursor: pointer;

.ibexa-table__cell.ibexa-table__cell {
border: calculateRem(2px) solid transparent;
border: calculateRem(1px) solid transparent;
transition: all $ibexa-admin-transition-duration $ibexa-admin-transition;

&:not(:first-child) {
Expand All @@ -20,7 +20,7 @@
box-shadow: calculateRem(4px) calculateRem(22px) calculateRem(47px) 0 rgba($ibexa-color-info, 0.05);

.ibexa-table__cell.ibexa-table__cell {
border-color: $ibexa-color-light;
border-color: $ibexa-color-info;
background-color: $ibexa-color-white;
}
}
Expand Down
52 changes: 32 additions & 20 deletions src/bundle/ui-dev/src/modules/universal-discovery/components/actions-menu/actions.menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,41 @@ const ActionsMenu = () => {
{},
'universal_discovery_widget'
);
const isConfirmDisabled = !allowConfirmation || selectedLocations.length === 0;
const isConfirmDisabled = selectedLocations.length === 0;
const renderActionsContent = () => {
if (!allowConfirmation) {
return null;
}

return (
<>
<span className="c-actions-menu__confirm-btn-wrapper">
<button
className="c-actions-menu__confirm-btn btn ibexa-btn ibexa-btn--primary"
type="button"
onClick={() => onConfirm()}
disabled={isConfirmDisabled}
>
{confirmLabel}
</button>
</span>
<span className="c-actions-menu__cancel-btn-wrapper">
<button
className="c-actions-menu__cancel-btn btn ibexa-btn ibexa-btn--secondary"
type="button"
onClick={cancelUDW}
>
{cancelLabel}
</button>
</span>
</>
);
};


return (
<div className="c-actions-menu">
<span className="c-actions-menu__confirm-btn-wrapper">
<button
className="c-actions-menu__confirm-btn btn ibexa-btn ibexa-btn--primary"
type="button"
onClick={() => onConfirm()}
disabled={isConfirmDisabled}
>
{confirmLabel}
</button>
</span>
<span className="c-actions-menu__cancel-btn-wrapper">
<button
className="c-actions-menu__cancel-btn btn ibexa-btn ibexa-btn--secondary"
type="button"
onClick={cancelUDW}
>
{cancelLabel}
</button>
</span>
{renderActionsContent()}
</div>
);
};
Expand Down
2 changes: 1 addition & 1 deletion src/bundle/ui-dev/src/modules/universal-discovery/search.tab.module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { TabsConfigContext } from './universal.discovery.module';
const SearchTabModule = () => {
const tabsConfig = useContext(TabsConfigContext);
const actionsDisabledMap = {
'content-create-button': true,
'content-create-button': false,
'sort-switcher': true,
'view-switcher': true,
};
Expand Down