mirror of
https://github.com/flarum/core.git
synced 2025-08-20 23:31:27 +02:00
Adapt to FontAwesome v5.0.6 icon name changes (#47)
This commit is contained in:
@@ -29,7 +29,7 @@
|
|||||||
"flarum-extension": {
|
"flarum-extension": {
|
||||||
"title": "Tags",
|
"title": "Tags",
|
||||||
"icon": {
|
"icon": {
|
||||||
"name": "tags",
|
"name": "fa fa-tags",
|
||||||
"backgroundColor": "#F28326",
|
"backgroundColor": "#F28326",
|
||||||
"color": "#fff"
|
"color": "#fff"
|
||||||
}
|
}
|
||||||
|
@@ -5,7 +5,7 @@ import SettingDropdown from 'flarum/components/SettingDropdown';
|
|||||||
export default function() {
|
export default function() {
|
||||||
extend(PermissionGrid.prototype, 'startItems', items => {
|
extend(PermissionGrid.prototype, 'startItems', items => {
|
||||||
items.add('allowTagChange', {
|
items.add('allowTagChange', {
|
||||||
icon: 'tag',
|
icon: 'fa fa-tag',
|
||||||
label: app.translator.trans('flarum-tags.admin.permissions.allow_edit_tags_label'),
|
label: app.translator.trans('flarum-tags.admin.permissions.allow_edit_tags_label'),
|
||||||
setting: () => {
|
setting: () => {
|
||||||
const minutes = parseInt(app.data.settings.allow_tag_change, 10);
|
const minutes = parseInt(app.data.settings.allow_tag_change, 10);
|
||||||
|
@@ -4,7 +4,7 @@ import PermissionGrid from 'flarum/components/PermissionGrid';
|
|||||||
export default function() {
|
export default function() {
|
||||||
extend(PermissionGrid.prototype, 'moderateItems', items => {
|
extend(PermissionGrid.prototype, 'moderateItems', items => {
|
||||||
items.add('tag', {
|
items.add('tag', {
|
||||||
icon: 'tag',
|
icon: 'fa fa-tag',
|
||||||
label: app.translator.trans('flarum-tags.admin.permissions.tag_discussions_label'),
|
label: app.translator.trans('flarum-tags.admin.permissions.tag_discussions_label'),
|
||||||
permission: 'discussion.tag'
|
permission: 'discussion.tag'
|
||||||
}, 95);
|
}, 95);
|
||||||
|
@@ -12,7 +12,7 @@ export default function() {
|
|||||||
extend(AdminNav.prototype, 'items', items => {
|
extend(AdminNav.prototype, 'items', items => {
|
||||||
items.add('tags', AdminLinkButton.component({
|
items.add('tags', AdminLinkButton.component({
|
||||||
href: app.route('tags'),
|
href: app.route('tags'),
|
||||||
icon: 'tags',
|
icon: 'fa fa-tags',
|
||||||
children: app.translator.trans('flarum-tags.admin.nav.tags_button'),
|
children: app.translator.trans('flarum-tags.admin.nav.tags_button'),
|
||||||
description: app.translator.trans('flarum-tags.admin.nav.tags_text')
|
description: app.translator.trans('flarum-tags.admin.nav.tags_text')
|
||||||
}));
|
}));
|
||||||
|
@@ -11,7 +11,7 @@ import sortTags from 'flarum/tags/utils/sortTags';
|
|||||||
export default function() {
|
export default function() {
|
||||||
override(app, 'getRequiredPermissions', (original, permission) => {
|
override(app, 'getRequiredPermissions', (original, permission) => {
|
||||||
const tagPrefix = permission.match(/^tag\d+\./);
|
const tagPrefix = permission.match(/^tag\d+\./);
|
||||||
|
|
||||||
if (tagPrefix) {
|
if (tagPrefix) {
|
||||||
const globalPermission = permission.substr(tagPrefix[0].length);
|
const globalPermission = permission.substr(tagPrefix[0].length);
|
||||||
|
|
||||||
@@ -19,7 +19,7 @@ export default function() {
|
|||||||
|
|
||||||
return required.map(required => tagPrefix[0] + required);
|
return required.map(required => tagPrefix[0] + required);
|
||||||
}
|
}
|
||||||
|
|
||||||
return original(permission);
|
return original(permission);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -52,7 +52,7 @@ export default function() {
|
|||||||
className: 'Dropdown--restrictByTag',
|
className: 'Dropdown--restrictByTag',
|
||||||
buttonClassName: 'Button Button--text',
|
buttonClassName: 'Button Button--text',
|
||||||
label: app.translator.trans('flarum-tags.admin.permissions.restrict_by_tag_heading'),
|
label: app.translator.trans('flarum-tags.admin.permissions.restrict_by_tag_heading'),
|
||||||
icon: 'plus',
|
icon: 'fa fa-plus',
|
||||||
caretIcon: null,
|
caretIcon: null,
|
||||||
children: tags.map(tag => Button.component({
|
children: tags.map(tag => Button.component({
|
||||||
icon: true,
|
icon: true,
|
||||||
|
@@ -14,7 +14,7 @@ function tagItem(tag) {
|
|||||||
<span className="TagListItem-name">{tag.name()}</span>
|
<span className="TagListItem-name">{tag.name()}</span>
|
||||||
{Button.component({
|
{Button.component({
|
||||||
className: 'Button Button--link',
|
className: 'Button Button--link',
|
||||||
icon: 'pencil',
|
icon: 'fa fa-pencil-alt',
|
||||||
onclick: () => app.modal.show(new EditTagModal({tag}))
|
onclick: () => app.modal.show(new EditTagModal({tag}))
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
@@ -40,7 +40,7 @@ export default class TagsPage extends Page {
|
|||||||
</p>
|
</p>
|
||||||
{Button.component({
|
{Button.component({
|
||||||
className: 'Button Button--primary',
|
className: 'Button Button--primary',
|
||||||
icon: 'plus',
|
icon: 'fa fa-plus',
|
||||||
children: app.translator.trans('flarum-tags.admin.tags.create_tag_button'),
|
children: app.translator.trans('flarum-tags.admin.tags.create_tag_button'),
|
||||||
onclick: () => app.modal.show(new EditTagModal())
|
onclick: () => app.modal.show(new EditTagModal())
|
||||||
})}
|
})}
|
||||||
|
@@ -10,7 +10,7 @@ export default function() {
|
|||||||
if (discussion.canTag()) {
|
if (discussion.canTag()) {
|
||||||
items.add('tags', Button.component({
|
items.add('tags', Button.component({
|
||||||
children: app.translator.trans('flarum-tags.forum.discussion_controls.edit_tags_button'),
|
children: app.translator.trans('flarum-tags.forum.discussion_controls.edit_tags_button'),
|
||||||
icon: 'tag',
|
icon: 'fa fa-tag',
|
||||||
onclick: () => app.modal.show(new TagDiscussionModal({discussion}))
|
onclick: () => app.modal.show(new TagDiscussionModal({discussion}))
|
||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
@@ -12,7 +12,7 @@ export default function() {
|
|||||||
// to the index page's sidebar.
|
// to the index page's sidebar.
|
||||||
extend(IndexPage.prototype, 'navItems', function(items) {
|
extend(IndexPage.prototype, 'navItems', function(items) {
|
||||||
items.add('tags', LinkButton.component({
|
items.add('tags', LinkButton.component({
|
||||||
icon: 'th-large',
|
icon: 'fa fa-th-large',
|
||||||
children: app.translator.trans('flarum-tags.forum.index.tags_link'),
|
children: app.translator.trans('flarum-tags.forum.index.tags_link'),
|
||||||
href: app.route('tags')
|
href: app.route('tags')
|
||||||
}), -10);
|
}), -10);
|
||||||
|
@@ -19,7 +19,7 @@ export default class DiscussionTaggedPost extends EventPost {
|
|||||||
}
|
}
|
||||||
|
|
||||||
icon() {
|
icon() {
|
||||||
return 'tag';
|
return 'fa fa-tag';
|
||||||
}
|
}
|
||||||
|
|
||||||
descriptionKey() {
|
descriptionKey() {
|
||||||
|
@@ -177,7 +177,7 @@ export default class TagDiscussionModal extends Modal {
|
|||||||
type: 'submit',
|
type: 'submit',
|
||||||
className: 'Button Button--primary',
|
className: 'Button Button--primary',
|
||||||
disabled: primaryCount < this.minPrimary || secondaryCount < this.minSecondary,
|
disabled: primaryCount < this.minPrimary || secondaryCount < this.minSecondary,
|
||||||
icon: 'check',
|
icon: 'fa fa-check',
|
||||||
children: app.translator.trans('flarum-tags.forum.choose_tags.submit_button')
|
children: app.translator.trans('flarum-tags.forum.choose_tags.submit_button')
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
|
@@ -12,7 +12,7 @@ export default class TagsPage extends Component {
|
|||||||
this.tags = sortTags(app.store.all('tags').filter(tag => !tag.parent()));
|
this.tags = sortTags(app.store.all('tags').filter(tag => !tag.parent()));
|
||||||
|
|
||||||
app.current = this;
|
app.current = this;
|
||||||
app.history.push('tags', icon('th-large'));
|
app.history.push('tags', icon('fa fa-th-large'));
|
||||||
app.drawer.hide();
|
app.drawer.hide();
|
||||||
app.modal.close();
|
app.modal.close();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user