mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-01 14:10:37 +02:00
Code Issues Releases Wiki Activity

Finish admin permissions page and clean up everything

Browse Source
This commit is contained in:
Toby Zerner
2015-07-31 20:16:47 +09:30
parent 5706c71c86
commit fde7afd3e2
33 changed files with 766 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/forum/src/components/ChangeEmailModal.js
View File

@@ -37,9 +37,9 @@ export default class ChangeEmailModal extends Modal {
return (
<div className="Modal-body">
<div class="Form Form--centered">
<p class="helpText">{m.trust(app.trans('core.confirmation_email_sent', {email: <strong>{this.email()}</strong>}))}</p>
<div class="Form-group">
<div className="Form Form--centered">
<p className="helpText">{m.trust(app.trans('core.confirmation_email_sent', {email: <strong>{this.email()}</strong>}))}</p>
<div className="Form-group">
<a href={'http://' + emailProviderName} className="Button Button--primary Button--block">
{app.trans('core.go_to', {location: emailProviderName})}
</a>
@@ -51,15 +51,15 @@ export default class ChangeEmailModal extends Modal {
return (
<div className="Modal-body">
<div class="Form Form--centered">
<div class="Form-group">
<div className="Form Form--centered">
<div className="Form-group">
<input type="email" name="email" className="FormControl"
placeholder={app.session.user.email()}
value={this.email()}
onchange={m.withAttr('value', this.email)}
disabled={this.loading}/>
</div>
<div class="Form-group">
<div className="Form-group">
<button type="submit" className="Button Button--primary Button--block" disabled={this.loading}>
{app.trans('core.save_changes')}
</button>

3
js/forum/src/components/Post.js
View File

@@ -49,7 +49,8 @@ export default class Post extends Component {
children: controls,
className: 'Post-controls',
buttonClassName: 'Button Button--icon Button--flat',
menuClassName: 'Dropdown-menu--right'
menuClassName: 'Dropdown-menu--right',
icon: 'ellipsis-v'
}) : ''}
{this.content()}

2
js/forum/src/components/SessionDropdown.js
View File

@@ -62,7 +62,7 @@ export default class SessionDropdown extends Dropdown {
50
);
if (user.groups().some(group => Number(group.id()) === Group.ADMINISTRATOR_ID)) {
if (user.groups().some(group => group.id() === Group.ADMINISTRATOR_ID)) {
items.add('administration',
LinkButton.component({
icon: 'wrench',