TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-01 13:54:35 +03:00
Code Issues Projects Releases Wiki Activity

Updated default icon handling for portal settings

Browse Source 
no issue

- Adds mapping for default svg icons to keys
- Updates custom icon check to not include default icons
- Updated settings update to save default icon key on update
This commit is contained in:
Rish 2020-07-21 22:42:55 +05:30 committed by Rishabh Garg
parent c6a42a925c
commit b9e9265c45
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ghost/admin/app/components/modal-members-modal-settings.hbs
View File

@ -174,15 +174,17 @@
<h4 class="gh-portal-setting-title">Icon</h4>
<GhUploader
@extensions={{this.iconExtensions}}
@paramsHash={{hash purpose="icon"}}
@onComplete={{action "imageUploaded" "icon"}}
@paramsHash={{hash purpose="image"}}
@onComplete={{action "imageUploaded" "buttonIcon"}}
as
|uploader|
>
<div class="flex items-center justify-between mt2 br3 ba b--whitegrey bg-white">
<div class="gh-portal-settings-icons">
{{#each this.defaultButtonIcons as |imgIcon| }}
<span class="gh-portal-button-icon {{if (eq this.buttonIcon imgIcon) "selected-icon"}}" onclick={{action "selectDefaultIcon" imgIcon}}>{{svg-jar imgIcon}}</span>
<span class="gh-portal-button-icon {{if (eq this.buttonIcon imgIcon.value) "selected-icon"}}" onclick={{action "selectDefaultIcon" imgIcon.value}}>
{{svg-jar imgIcon.icon}}
</span>
{{/each}}
{{#if uploader.isUploading}}
{{uploader.progressBar}}

38
ghost/admin/app/components/modal-members-modal-settings.js
View File

@ -8,7 +8,30 @@ import {htmlSafe} from '@ember/string';
import {run} from '@ember/runloop';
import {inject as service} from '@ember/service';
import {task, timeout} from 'ember-concurrency';
const ICON_EXTENSIONS = ['ico', 'png', 'svg', 'jpg', 'jpeg'];
const ICON_EXTENSIONS = ['gif', 'jpg', 'jpeg', 'png', 'svg'];
const ICON_MAPPING = [
{
icon: 'user-circle',
value: 'icon-1'
},
{
icon: 'ambulance',
value: 'icon-2'
},
{
icon: 'book-open',
value: 'icon-3'
},
{
icon: 'store',
value: 'icon-4'
},
{
icon: 'gift',
value: 'icon-5'
}
];
export default ModalComponent.extend({
settings: service(),
@ -108,17 +131,12 @@ export default ModalComponent.extend({
{name: 'icon-only', label: 'Icon only'},
{name: 'text-only', label: 'Text only'}
];
this.defaultButtonIcons = [
'user-circle',
'ambulance',
'book-open',
'store',
'gift'
];
this.defaultButtonIcons = ICON_MAPPING;
this.iconExtensions = ICON_EXTENSIONS;
const portalButtonIcon = this.settings.get('portalButtonIcon') || '';
if (portalButtonIcon && !portalButtonIcon.includes('githubusercontent')) {
return this.set('customIcon', this.settings.get('portalButtonIcon'));
const defaultIconKeys = this.defaultButtonIcons.map(buttonIcon => buttonIcon.value);
if (portalButtonIcon && !defaultIconKeys.includes(portalButtonIcon)) {
this.set('customIcon', this.settings.get('portalButtonIcon'));
}
},