Skip to content

Commit

Permalink
Merge branch 'feature/105762' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ofrankowska committed Apr 24, 2024
2 parents 6a216cf + 83871d3 commit bdd978d
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased]
### Added
- `width` and `height` attributes to menu node images (DEV-102271)
- Snowdog branding in admin panel (DEV-105762)

## [2.26.0] - 2024-03-29
### Fixed
Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Menu/Edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function execute(): ResultInterface
$resultPage = $this->resultPageFactory->create();
$title = $menuId ? __('Edit Menu %1', $menu->getTitle()) : __('New Menu');
$this->initPage($resultPage)->addBreadcrumb($title, $title);
$resultPage->getConfig()->getTitle()->prepend(__('Menus'));
$resultPage->getConfig()->getTitle()->prepend(__('Snowdog Menus'));
$resultPage->getConfig()->getTitle()->prepend($menu->getId() ? $menu->getTitle() : __('New Menu'));

return $resultPage;
Expand Down
1 change: 1 addition & 0 deletions Controller/Adminhtml/Menu/Import.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public function execute()
$this->messageManager->addNoticeMessage($this->importExportHelper->getMaxUploadSizeMessage());

$resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
$resultPage->getConfig()->getTitle()->prepend(__('Snowdog Menus'));
$resultPage->getConfig()->getTitle()->prepend(__('Menu Import'));

return $resultPage;
Expand Down
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Menu/Index.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Index extends Action
public function execute()
{
$resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
$resultPage->getConfig()->getTitle()->prepend(__('Menus'));
$resultPage->getConfig()->getTitle()->prepend(__('Snowdog Menus'));
return $resultPage;
}
}
2 changes: 2 additions & 0 deletions view/adminhtml/web/css/source/_module.less
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@
@import './blocks/_vue-treeselect.less';
@import './blocks/_var.less';
@import './blocks/_vddl-base.less';

@import 'module/menu/_menu';
9 changes: 9 additions & 0 deletions view/adminhtml/web/css/source/module/menu/_menu.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.admin__menu [data-ui-id^='menu-snowdog-menu-menus'] span:before {
background: url('@{baseDir}Snowdog_Menu/images/logo-menu.svg') no-repeat center;
content: '';
display: inline-block;
margin-right: 10px;
vertical-align: top;
width: 19px;
height: 19px;
}
1 change: 1 addition & 0 deletions view/adminhtml/web/images/logo-menu.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit bdd978d

Please sign in to comment.