Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-18 02:21:47 -05:00
Code Issues Activity

Updated AdminX settings to link from the usual footer button (#17567)

Browse source 
refs https://github.com/TryGhost/Product/issues/3349

Now that we're a bit further, we can open AdminX settings from the usual
gearwheel button when the Labs flag is enabled instead of having a
separate navigation item
This commit is contained in:
Jono M 2023-08-02 10:43:06 +01:00 • committed by GitHub
parent 8000df963b
commit 64d52d736a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/admin-x-settings/src/components/Settings.tsx
View file

@ -12,6 +12,9 @@ const Settings: React.FC = () => {
<SiteSettings />
<MembershipSettings />
<EmailSettings />
<div className='mt-40 text-sm'>
<a className='text-green' href="/ghost/#/settings">Click here</a> to open the original Admin settings.
</div>
</>
);
};

6
ghost/admin/app/components/gh-nav-menu/footer.hbs
View file

@ -100,7 +100,11 @@
</div>
<div class="flex items-center pe-all">
{{#if (gh-user-can-admin this.session.user)}}
<LinkTo class="gh-nav-bottom-tabicon" @route="settings" @current-when={{this.isSettingsRoute}} data-test-nav="settings">{{svg-jar "settings"}}</LinkTo>
{{#if (feature "adminXSettings")}}
<LinkTo class="gh-nav-bottom-tabicon" @route="settings-x" @current-when={{this.isSettingsRoute}} data-test-nav="settings">{{svg-jar "settings"}}</LinkTo>
{{else}}
<LinkTo class="gh-nav-bottom-tabicon" @route="settings" @current-when={{this.isSettingsRoute}} data-test-nav="settings">{{svg-jar "settings"}}</LinkTo>
{{/if}}
{{/if}}
{{#if this.session.user.isEditor}}
<LinkTo class="gh-nav-bottom-tabicon" @route="settings.staff" @current-when={{this.isSettingsRoute}} data-test-nav="settings">{{svg-jar "settings"}}</LinkTo>

5
ghost/admin/app/components/gh-nav-menu/main.hbs
View file

@ -120,11 +120,6 @@
</li>
{{/if}}
{{/if}}
{{#if (and (gh-user-can-admin this.session.user) (feature "adminXSettings"))}}
<li>
<LinkTo @route="settings-x" @current-when={{this.isSettingsRoute}} data-test-nav="settings">{{svg-jar "settings"}} AdminX Settings</LinkTo>
</li>
{{/if}}
</ul>
{{#if this.session.user.isOwnerOnly}}