Skip to content

fix: broken wordpress notices inside the toolbar #397

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

Open
rami-elementor wants to merge 1 commit into
base: core-beta
Choose a base branch
from
Open

fix: broken wordpress notices inside the toolbar #397

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
2 changes: 2 additions & 0 deletions src/js/components/EditMenu/EditorSidebar/actions/ShortcodeInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ const ModalContent = () => {

<h2>{__('Shortcode Options', 'code-snippets')}</h2>

<hr className="wp-header-end" />

<CheckboxList
options={['php', 'format', 'shortcodes']}
checked={options}
Expand Down
66 changes: 35 additions & 31 deletions src/js/components/EditMenu/SnippetForm/page/PageHeading.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,36 +27,40 @@ export const PageHeading: React.FC = () => {
const { snippet, updateSnippet, setCurrentNotice } = useSnippetForm()

return (
<h2>
{snippet.id
? <>
{`${getPageHeading(snippet)} `}

<a
href={window.CODE_SNIPPETS?.urls.addNew}
className="page-title-action"
onClick={event => {
event.preventDefault()
updateSnippet(({ scope }) => createSnippetObject({ scope }))
setCurrentNotice(undefined)

window.document.title = window.document.title
.replace(__('Edit Snippet', 'code-snippets'), getAddNewHeading(snippet))
.replace(__('Edit Condition', 'code-snippets'), getAddNewHeading(snippet))

window.history.pushState({}, '', window.CODE_SNIPPETS?.urls.addNew)
}}
>
{_x('Add New', 'snippet', 'code-snippets')}
</a>
</>
: getAddNewHeading(snippet)}

{OPTIONS?.pageTitleActions && Object.entries(OPTIONS.pageTitleActions).map(([label, url]) =>
<>
<a key={label} href={url} className="page-title-action">{label}</a>{' '}
</>
)}
</h2>
<>
<h2>
{snippet.id
? <>
{`${getPageHeading(snippet)} `}

<a
href={window.CODE_SNIPPETS?.urls.addNew}
className="page-title-action"
onClick={event => {
event.preventDefault()
updateSnippet(({ scope }) => createSnippetObject({ scope }))
setCurrentNotice(undefined)

window.document.title = window.document.title
.replace(__('Edit Snippet', 'code-snippets'), getAddNewHeading(snippet))
.replace(__('Edit Condition', 'code-snippets'), getAddNewHeading(snippet))

window.history.pushState({}, '', window.CODE_SNIPPETS?.urls.addNew)
}}
>
{_x('Add New', 'snippet', 'code-snippets')}
</a>
</>
: getAddNewHeading(snippet)}

{OPTIONS?.pageTitleActions && Object.entries(OPTIONS.pageTitleActions).map(([label, url]) =>
<>
<a key={label} href={url} className="page-title-action">{label}</a>{' '}
</>
)}
</h2>

<hr className="wp-header-end" />
</>
)
}
2 changes: 2 additions & 0 deletions src/js/components/ImportMenu/ImportMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ export const ImportMenu: React.FC = () => {
<>
<h2>{__('Import Snippets', 'code-snippets')}</h2>

<hr className="wp-header-end" />

<nav
className="nav-tab-wrapper"
aria-label={__('Import sources', 'code-snippets')}
Expand Down
2 changes: 2 additions & 0 deletions src/js/components/ManageMenu/CommunityCloud/CommunityCloud.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ export const CommunityCloud = () => {
<>
<h2>{__('Community Cloud', 'code-snippets')}</h2>

<hr className="wp-header-end" />

<nav
className="nav-tab-wrapper"
aria-label={__('Community Cloud types', 'code-snippets')}
Expand Down
2 changes: 2 additions & 0 deletions src/js/components/ManageMenu/SnippetsTable/SnippetsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ const PageHeading = () => {
: null}
</h2>

<hr className="wp-header-end" />

<SafeModeNotice />
</>
)
Expand Down
2 changes: 2 additions & 0 deletions src/js/components/WelcomeMenu/WelcomeMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ export const WelcomeMenu = () =>
<div className="code-snippets-welcome">
<h2>{__('Resources and Updates', 'code-snippets')}</h2>

<hr className="wp-header-end" />

<div className="code-snippets-updates">
<HeroImage />
<Changelog />
Expand Down
13 changes: 5 additions & 8 deletions src/js/components/common/Toolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,10 @@ export const Toolbar = () => {
const [isUpsellDialogOpen, setIsUpsellDialogOpen] = useState(false)

return (
<>
<div className="code-snippets-toolbar">
<UpperNav setIsUpsellDialogOpen={setIsUpsellDialogOpen} />
<LowerNav setIsUpsellDialogOpen={setIsUpsellDialogOpen} />
<UpsellDialog isOpen={isUpsellDialogOpen} setIsOpen={setIsUpsellDialogOpen} />
</div>
<hr className="wp-header-end" />
</>
<div className="code-snippets-toolbar">
<UpperNav setIsUpsellDialogOpen={setIsUpsellDialogOpen} />
<LowerNav setIsUpsellDialogOpen={setIsUpsellDialogOpen} />
<UpsellDialog isOpen={isUpsellDialogOpen} setIsOpen={setIsUpsellDialogOpen} />
</div>
)
}
2 changes: 2 additions & 0 deletions src/php/Admin/Menus/Settings_Menu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@ public function render() {
?>
</h2>

<hr class="wp-header-end" />

<?php settings_errors( OPTION_NAME ); ?>

<form action="<?php echo esc_url( $update_url ); ?>" method="post">
Expand Down
Loading