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

Merge branch 'master' into 1236-database-changes

Browse Source 
# Conflicts:
#	src/Forum/Controller/IndexController.php
#	src/User/UserMetadataUpdater.php
This commit is contained in:
Toby Zerner
2018-07-21 21:37:49 +09:30
parent d42f33971a c562302161
commit 677a7dd2d3
101 changed files with 3073 additions and 2272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
js/src/forum/components/IndexPage.js
View File

@@ -71,15 +71,17 @@ export default class IndexPage extends Page {
<div className="IndexPage">
{this.hero()}
<div className="container">
<nav className="IndexPage-nav sideNav">
<ul>{listItems(this.sidebarItems().toArray())}</ul>
</nav>
<div className="IndexPage-results sideNavOffset">
<div className="IndexPage-toolbar">
<ul className="IndexPage-toolbar-view">{listItems(this.viewItems().toArray())}</ul>
<ul className="IndexPage-toolbar-action">{listItems(this.actionItems().toArray())}</ul>
<div className="sideNavContainer">
<nav className="IndexPage-nav sideNav">
<ul>{listItems(this.sidebarItems().toArray())}</ul>
</nav>
<div className="IndexPage-results sideNavOffset">
<div className="IndexPage-toolbar">
<ul className="IndexPage-toolbar-view">{listItems(this.viewItems().toArray())}</ul>
<ul className="IndexPage-toolbar-action">{listItems(this.actionItems().toArray())}</ul>
</div>
{app.cache.discussionList.render()}
</div>
{app.cache.discussionList.render()}
</div>
</div>
</div>

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

@@ -40,11 +40,13 @@ export default class UserPage extends Page {
controlsButtonClassName: 'Button'
}),
<div className="container">
<nav className="sideNav UserPage-nav" config={affixSidebar}>
<ul>{listItems(this.sidebarItems().toArray())}</ul>
</nav>
<div className="sideNavOffset UserPage-content">
{this.content()}
<div className="sideNavContainer">
<nav className="sideNav UserPage-nav" config={affixSidebar}>
<ul>{listItems(this.sidebarItems().toArray())}</ul>
</nav>
<div className="sideNavOffset UserPage-content">
{this.content()}
</div>
</div>
</div>
] : [

4
js/src/forum/utils/PostControls.js
View File

@@ -82,7 +82,7 @@ export default {
const items = new ItemList();
if (post.contentType() === 'comment' && !post.isHidden()) {
if (post.canEdit()) {
if (post.canHide()) {
items.add('hide', Button.component({
icon: 'far fa-trash-alt',
children: app.translator.trans('core.forum.post_controls.delete_button'),
@@ -90,7 +90,7 @@ export default {
}));
}
} else {
if (post.contentType() === 'comment' && post.canEdit()) {
if (post.contentType() === 'comment' && post.canHide()) {
items.add('restore', Button.component({
icon: 'fas fa-reply',
children: app.translator.trans('core.forum.post_controls.restore_button'),