diff --git a/framework/core/js/admin/src/components/AddExtensionModal.js b/framework/core/js/admin/src/components/AddExtensionModal.js index 323202e89..6173211d3 100644 --- a/framework/core/js/admin/src/components/AddExtensionModal.js +++ b/framework/core/js/admin/src/components/AddExtensionModal.js @@ -1,3 +1,12 @@ +/* + * This file is part of Flarum. + * + * (c) Toby Zerner + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + import Modal from 'flarum/components/Modal'; export default class AddExtensionModal extends Modal { @@ -14,7 +23,7 @@ export default class AddExtensionModal extends Modal {

One day in the not-too-distant future, this dialog will allow you to add an extension to your forum with ease. We're building an ecosystem as we speak!

In the meantime, if you manage to get your hands on a new extension, simply drop it in your forum's extensions directory.

-

If you're a developer, you can read the docs and have a go at building your own.

+

If you're a developer, you can read the docs and have a go at building your own.

); } diff --git a/framework/core/js/admin/src/components/AdminLinkButton.js b/framework/core/js/admin/src/components/AdminLinkButton.js index 38a643bb4..99c417192 100644 --- a/framework/core/js/admin/src/components/AdminLinkButton.js +++ b/framework/core/js/admin/src/components/AdminLinkButton.js @@ -1,3 +1,12 @@ +/* + * This file is part of Flarum. + * + * (c) Toby Zerner + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + import LinkButton from 'flarum/components/LinkButton'; export default class AdminLinkButton extends LinkButton { diff --git a/framework/core/js/admin/src/components/AdminNav.js b/framework/core/js/admin/src/components/AdminNav.js index 41827fd01..90ba70ba1 100644 --- a/framework/core/js/admin/src/components/AdminNav.js +++ b/framework/core/js/admin/src/components/AdminNav.js @@ -1,3 +1,12 @@ +/* + * This file is part of Flarum. + * + * (c) Toby Zerner + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + import Component from 'flarum/Component'; import AdminLinkButton from 'flarum/components/AdminLinkButton'; import SelectDropdown from 'flarum/components/SelectDropdown'; @@ -6,13 +15,20 @@ import ItemList from 'flarum/utils/ItemList'; export default class AdminNav extends Component { view() { - return SelectDropdown.component({ - className: 'AdminNav App-titleControl', - buttonClassName: 'Button', - children: this.items().toArray() - }); + return ( + + ); } + /** + * Build an item list of links to show in the admin navigation. + * + * @return {ItemList} + */ items() { const items = new ItemList(); diff --git a/framework/core/js/lib/Component.js b/framework/core/js/lib/Component.js index fabd74da2..1174599b0 100644 --- a/framework/core/js/lib/Component.js +++ b/framework/core/js/lib/Component.js @@ -1,3 +1,12 @@ +/* + * This file is part of Flarum. + * + * (c) Toby Zerner + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + /** * The `Component` class defines a user interface 'building block'. A component * can generate a virtual DOM to be rendered on each redraw. diff --git a/framework/core/js/lib/components/Alert.js b/framework/core/js/lib/components/Alert.js index 745b14707..82e48268e 100644 --- a/framework/core/js/lib/components/Alert.js +++ b/framework/core/js/lib/components/Alert.js @@ -35,11 +35,12 @@ export default class Alert extends Component { const dismissControl = []; if (dismissible || dismissible === undefined) { - dismissControl.push(Button.component({ - icon: 'times', - className: 'Button Button--link Button--icon Alert-dismiss', - onclick: ondismiss - })); + dismissControl.push( +